[packages] libidn: update to 1.16

[openwrt/svn-archive/archive.git] / Xorg / wm / fluxbox / Makefile

diff --git a/Xorg/wm/fluxbox/Makefile b/Xorg/wm/fluxbox/Makefile
index d1ed3fa67bd29566eaf8d753e0bd57556a04bbd9..30a205718f837b737a430bef9b5def478a057bdd 100644 (file)
--- a/Xorg/wm/fluxbox/Makefile
+++ b/Xorg/wm/fluxbox/Makefile
@@ -9,11 +9,12 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=fluxbox
-PKG_VERSION:=1.0rc3
+PKG_VERSION:=1.0.0
 PKG_RELEASE:=1
 
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2
-PKG_SOURCE_URL:=http://prdownloads.sourceforge.net/fluxbox/
+PKG_SOURCE_URL:=@SF/fluxbox
+PKG_MD5SUM:=990e276ead0d04421dce4080f485caca
 
 EXTRA_LDFLAGS:="-Wl,-rpath-link=$(STAGING_DIR)/usr/lib"
 
@@ -32,7 +33,7 @@ endef
 
 define Package/fluxbox
 $(call Package/fluxbox/Default)
-  DEPENDS:=+uclibcxx +libXt
+  DEPENDS:=+uclibcxx +libXt +libXpm
   TITLE:=fluxbox window manager
   MENU:=1
 endef
@@ -68,9 +69,10 @@ define Package/fluxbox/install
        $(CP) $(PKG_INSTALL_DIR)/usr/share/fluxbox/styles/* $(1)/usr/share/fluxbox/styles/
        $(CP) files/init $(1)/usr/share/fluxbox/
        $(CP) files/menu $(1)/usr/share/fluxbox/
-       echo "#!/bin/sh" > $(1)/usr/bin/WM
-       echo "/usr/bin/fluxbox" >> $(1)/usr/bin/WM
-       chmod +x $(1)/usr/bin/WM
+       $(INSTALL_DIR) $(1)/etc/uci-defaults
+       $(INSTALL_DATA) \
+               ./files/uci-defaults/x11 \
+               $(1)/etc/uci-defaults/
 endef
 
 define Package/fbsetbg/install
@@ -88,5 +90,12 @@ define Package/fbrun/install
        $(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/bin/fbrun $(1)/usr/bin/
 endef
 
+define Package/fluxbox/postinst
+       #!/bin/sh
+       [ -n "$${IPKG_INSTROOT}" ] && exit
+       . /etc/functions.sh
+       uci_apply_defaults
+endef
+
 $(eval $(call BuildPackage,fbrun))
 $(eval $(call BuildPackage,fluxbox))