move fluxbox from rc to full release and fix dependency bug

[openwrt/svn-archive/archive.git] / XOrg / app / fluxbox / Makefile

diff --git a/XOrg/app/fluxbox/Makefile b/XOrg/app/fluxbox/Makefile
index 1a5ec994d7997fcaeee5be4a385187ed49d9dd1e..414be921bd810934409ec1f2d05c81cfecd63c2f 100644 (file)
--- a/XOrg/app/fluxbox/Makefile
+++ b/XOrg/app/fluxbox/Makefile
@@ -9,26 +9,37 @@
 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:=http://switch.dl.sourceforge.net/sourceforge/fluxbox/
 
 EXTRA_LDFLAGS:="-Wl,-rpath-link=$(STAGING_DIR)/usr/lib"
 
 include $(INCLUDE_DIR)/package.mk
 
-CONFIGURE_VARS+=LIBS="-nodefaultlibs -luClibc++ -Wl,-Bstatic,-lstdc++,-Bdynamic -lm" \
-               CXXLD="$(TARGET_CC)" 
+CONFIGURE_VARS+=LIBS="-nodefaultlibs -luClibc++ -Wl,-Bstatic,-lstdc++,-Bdynamic -lm -lImlib2" \
+               CXXLD="$(TARGET_CC)"
 
 CONFIGURE_ARGS+=--disable-xmb
 
-define Package/fluxbox
+define Package/fluxbox/Default
   SECTION:=xorg-wm
   CATEGORY:=Xorg
-  DEPENDS:=+xorg-server-X11R7.2-essentials +uclibcxx +xterm @TARGET_x86
+endef
+
+define Package/fluxbox
+$(call Package/fluxbox/Default)
+  DEPENDS:=+xorg-server-essentials +uclibcxx +xterm +imlib2 @DISPLAY_SUPPORT
   TITLE:=fluxbox window manager
+  MENU:=1
+endef
+
+define Package/fbrun
+$(call Package/fluxbox/Default)
+  DEPENDS:=fluxbox
+  TITLE:=fluxbox tool to run applications
 endef
 
 define Build/Configure
@@ -51,10 +62,27 @@ endef
 define Package/fluxbox/install
        $(INSTALL_DIR) $(1)/usr/bin
        $(INSTALL_DIR) $(1)/usr/share/fluxbox/styles/
-       $(CP) $(PKG_INSTALL_DIR)/usr/bin/{fluxbox,fbsetbg} $(1)/usr/bin/
-       $(CP) $(PKG_INSTALL_DIR)/usr/share/fluxbox/{init,keys} $(1)/usr/share/fluxbox/
+       $(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/bin/fluxbox $(1)/usr/bin/
+       $(CP) $(PKG_INSTALL_DIR)/usr/share/fluxbox/keys $(1)/usr/share/fluxbox/
        $(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/
 endef
 
+define Package/fbsetbg/install
+       $(INSTALL_DIR) $(1)/usr/bin
+       $(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/bin/fbsetbg $(1)/usr/bin/
+endef
+
+define Package/fbsetroot/install
+       $(INSTALL_DIR) $(1)/usr/bin
+       $(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/bin/fbsetroot $(1)/usr/bin/
+endef
+
+define Package/fbrun/install
+       $(INSTALL_DIR) $(1)/usr/bin
+       $(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/bin/fbrun $(1)/usr/bin/
+endef
+
+$(eval $(call BuildPackage,fbrun))
 $(eval $(call BuildPackage,fluxbox))