Update xset to 1.0.4

SVN-Revision: 13322

diff --git a/Xorg/app/xset/Makefile b/Xorg/app/xset/Makefile
index 42e06b2a96f550f160d69f289607ef0c7419b67c..c43527c31d801dab2ae4f2be5ee94561d3eb4574 100644 (file)
--- a/Xorg/app/xset/Makefile
+++ b/Xorg/app/xset/Makefile
@@ -1,23 +1,26 @@
-# 
-# Copyright (C) 2007 OpenWrt.org
+#
+# Copyright (C) 2007-2008 OpenWrt.org
 #
 # This is free software, licensed under the GNU General Public License v2.
 # See /LICENSE for more information.
 #
-# blogic@openwrt.org 
+# blogic@openwrt.org
 
 include $(TOPDIR)/rules.mk
 
-PKG_BASE_NAME:=xset
 PKG_NAME:=xset
-PKG_RELEASE:=2
-PKG_VERSION:=1.0.3
-PKG_SOURCE_URL:=http://xorg.freedesktop.org/releases/X11R7.3/src/app
+PKG_RELEASE:=1
+PKG_VERSION:=1.0.4
+PKG_SOURCE_URL:=http://xorg.freedesktop.org/releases/X11R7.4/src/app
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2
 PKG_BUILD_DIR=$(BUILD_DIR)/Xorg/$(_CATEGORY)/$(PKG_NAME)-$(PKG_VERSION)/
 
 include $(INCLUDE_DIR)/package.mk
 
+PKG_INSTALL:=1
+
+TARGET_LDFLAGS+=-Wl,-rpath-link=$(STAGING_DIR)/usr/lib
+
 define Package/xset
   SECTION:=xorg-app
   CATEGORY:=Xorg
@@ -27,20 +30,11 @@ define Package/xset
   URL:=http://xorg.freedesktop.org/
 endef
 
-CONFIGURE_ARGS+=LIBS="-Wl,-rpath-link=$(STAGING_DIR)/usr/lib" 
-
-define Build/Compile
-       DESTDIR=$(PKG_INSTALL_DIR) make -C $(PKG_BUILD_DIR) install
-endef
-
 define Package/xset/install
-       $(INSTALL_DIR) $(1)
-       $(CP) $(PKG_INSTALL_DIR)/* $(1)/
-       rm -rf $(1)/usr/man/
-endef
-
-define Build/InstallDev
-       $(CP) $(PKG_INSTALL_DIR)/* $(1)/
+       $(INSTALL_DIR) $(1)/usr/bin
+       $(INSTALL_DATA) \
+               $(PKG_INSTALL_DIR)/usr/bin/* \
+               $(1)/usr/bin
 endef
 
 $(eval $(call BuildPackage,xset))