# HG changeset patch
# User Christophe Lincoln <pankso@slitaz.org>
# Date 1330436170 -3600
# Node ID 80044994b6f954f8f7c60cc717b93dc7f89b7226
# Parent  b7568c3f7659e0fd884f7bcad30b000043c332a4
fluxbox: Improve package integration

diff -r b7568c3f7659 -r 80044994b6f9 fluxbox/receipt
--- a/fluxbox/receipt	Tue Feb 28 14:35:10 2012 +0100
+++ b/fluxbox/receipt	Tue Feb 28 14:36:10 2012 +0100
@@ -1,37 +1,41 @@
 # SliTaz package receipt.
 
 PACKAGE="fluxbox"
-VERSION="1.3.1"
+VERSION="1.3.2"
 CATEGORY="x-window"
-SHORT_DESC="Fluxbox is a windowmanager for X. It is very light on resources and easy to handle but yet full of features."
-MAINTAINER="mallory@sweetpeople.org"
-DEPENDS="fontconfig imlib2 xorg-libICE xorg-libSM xorg-libX11 \
-xorg-libXau xorg-libXdmcp xorg-libXext xorg-libXft xorg-libXinerama \
-xorg-libXpm xorg-libXrandr xorg-libXrender gcc-lib-base"
+SHORT_DESC="Fluxbox is a light and fast window manager for X."
+MAINTAINER="pankso@slitaz.org"
 TARBALL="$PACKAGE-$VERSION.tar.bz2"
 WEB_SITE="http://www.fluxbox.org/"
 WGET_URL="$SF_MIRROR/$PACKAGE/$TARBALL"
 TAGS="wm window-manager"
 
+DEPENDS="xorg fontconfig imlib2"
+BUILD_DEPENDS="xorg fontconfig imlib2"
+
 # Rules to configure and make the package.
 compile_rules()
 {
 	cd $src
-	patch -p1 < $stuff/fluxbox-gcc-4.3.3.diff
-	./configure \
-		--prefix=/usr \
-		--infodir=/usr/share/info \
-		--mandir=/usr/share/man \
-		$CONFIGURE_ARGS &&
-	make && make DESTDIR=$PWD/_pkg install
+	#patch -p1 < $stuff/fluxbox-gcc-4.3.3.diff
+	./configure $CONFIGURE_ARGS &&
+	make && make install
 }
 
 # Rules to gen a SliTaz package suitable for Tazpkg.
 genpkg_rules()
 {
-	mkdir -p $fs/usr
-	cp -a $_pkg/usr/bin $fs/usr
-	cp -a $_pkg/usr/share $fs/usr
+	mkdir -p $fs/usr/share/fluxbox/styles
+	cp -a $install/usr/bin $fs/usr
+	for f in apps keys overlay windowmenu init menu
+	do
+		cp -a $install/usr/share/fluxbox/$f $fs/usr/share/fluxbox
+	done
+	for s in Shade Flux bloe Results
+	do
+		cp -a $install/usr/share/fluxbox/styles/$s \
+			$fs/usr/share/fluxbox/styles
+	done
 }
 
 post_install()
diff -r b7568c3f7659 -r 80044994b6f9 fluxbox/stuff/slitaz.menu
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/fluxbox/stuff/slitaz.menu	Tue Feb 28 14:36:10 2012 +0100
@@ -0,0 +1,32 @@
+# SliTaz GNU/Linux Fluxbox default menu.
+#
+[begin] (Fluxbox)
+[encoding] {UTF-8}
+      [exec] (Xterm) {xterm} 
+      [exec] (Midori) {midori} 
+      [exec]   (Run) {fbrun} 
+[submenu] (Terminals)
+      [exec]   (Xterm) {xterm}
+      [exec]   (Sakura) {sakura}
+[end]
+[workspaces] (Workspace List)
+[submenu] (Fluxbox menu)
+      [config] (Configure) 
+[submenu] (System Styles) {Choose a style...}
+      [stylesdir] (/usr/share/fluxbox/styles) 
+[end]
+[submenu] (User Styles) {Choose a style...}
+      [stylesdir] (~/.fluxbox/styles) 
+[end]
+[submenu] (Window Managers)
+      [restart] (openbox) {openbox} 
+[end]
+      [commanddialog] (Fluxbox Command) 
+      [reconfig] (Reload config) 
+      [restart] (Restart) 
+      
+[end]
+[separator] 
+[exit] (Exit) 
+[endencoding]
+[end]
diff -r b7568c3f7659 -r 80044994b6f9 fluxbox/stuff/startup
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/fluxbox/stuff/startup	Tue Feb 28 14:36:10 2012 +0100
@@ -0,0 +1,14 @@
+#!/bin/sh
+#
+# SliTaz GNU/Linux Fluxbox start up script.
+#
+
+# DBUS message bus (automount removable devices)
+dbus-launch --sh-syntax --exit-with-session &
+
+# Start PCmanFM as daemon for Wallpaper and desktop icons.
+pcmanfm -d &
+
+# Now we start fluxbox itself. To keep a log you can use:
+# exec fluxbox -log "/home/pankso/.fluxbox/log"
+exec fluxbox