include $(TOPDIR)/rules.mk
PKG_NAME:=xbitmaps
-PKG_RELEASE:=2
-PKG_VERSION:=1.0.1
+PKG_RELEASE:=1
+PKG_VERSION:=1.1.0
-PKG_SOURCE_URL:=http://xorg.freedesktop.org/releases/X11R7.4/src/data/
+PKG_SOURCE_URL:=http://xorg.freedesktop.org/releases/X11R7.5/src/data/
PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2
-PKG_BUILD_DIR=$(BUILD_DIR)/Xorg/$(_CATEGORY)/$(PKG_NAME)-$(PKG_VERSION)/
-PKG_MD5SUM:=b28a9840cde3c38d7c09716372fea257
+PKG_BUILD_DIR:=$(BUILD_DIR)/Xorg/$(PKG_NAME)-$(PKG_VERSION)/
+
+PKG_MD5SUM:=f9ddd4e70a5375508b3acaf17be0d0ab
PKG_INSTALL:=1
include $(INCLUDE_DIR)/package.mk
$(1)/usr/include/X11/bitmaps/
endef
-define Package/xbitmaps/install/Default
+define Package/xbitmaps/install
$(INSTALL_DIR) $(1)/usr/include/X11/bitmaps
$(INSTALL_DATA) \
$(PKG_INSTALL_DIR)/usr/include/X11/bitmaps/* \
--- /dev/null
+#
+# Copyright (C) 2008 OpenWrt.org
+#
+# This is free software, licensed under the GNU General Public License v2.
+# See /LICENSE for more information.
+#
+
+include $(TOPDIR)/rules.mk
+
+PKG_NAME:=xkbdata
+PKG_RELEASE:=1
+PKG_VERSION:=1.0.1
+
+PKG_SOURCE_URL:=http://xorg.freedesktop.org/releases/individual/data/
+PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2
+PKG_BUILD_DIR:=$(BUILD_DIR)/Xorg/$(PKG_NAME)-$(PKG_VERSION)/
+PKG_MD5SUM:=9bf179be9a195953dc5f4c15e23ab7f0
+
+PKG_INSTALL:=1
+
+include $(INCLUDE_DIR)/package.mk
+
+define Package/xkbdata
+ SECTION:=xorg-data
+ CATEGORY:=Xorg
+ SUBMENU:=data
+ TITLE:=xkbdata
+ URL:=http://xorg.freedesktop.org/
+endef
+
+define Package/xkbdata/install
+ $(INSTALL_DIR) $(1)/usr/share/X11/xkb/{rules,types,keycodes,geometry,compat}
+ $(INSTALL_DATA) \
+ $(PKG_INSTALL_DIR)/usr/share/X11/xkb/rules/xorg \
+ $(1)/usr/share/X11/xkb/rules/base
+ $(INSTALL_DATA) \
+ $(PKG_INSTALL_DIR)/usr/share/X11/xkb/rules/xorg.lst \
+ $(1)/usr/share/X11/xkb/rules/base.lst
+
+ $(INSTALL_DATA) \
+ $(PKG_INSTALL_DIR)/usr/share/X11/xkb/types/* \
+ $(1)/usr/share/X11/xkb/types/
+
+ $(INSTALL_DATA) \
+ $(PKG_INSTALL_DIR)/usr/share/X11/xkb/keycodes/{aliases,xfree86} \
+ $(1)/usr/share/X11/xkb/keycodes/
+
+ $(INSTALL_DATA) \
+ $(PKG_INSTALL_DIR)/usr/share/X11/xkb/geometry/pc \
+ $(1)/usr/share/X11/xkb/geometry/
+
+ $(INSTALL_DATA) \
+ $(PKG_INSTALL_DIR)/usr/share/X11/xkb/compat/* \
+ $(1)/usr/share/X11/xkb/compat/
+endef
+
+$(eval $(call BuildPackage,xkbdata))