8 files changed, 111 insertions, 51 deletions

diff --git a/x11-wm/fluxbox-devel/Makefile b/x11-wm/fluxbox-devel/Makefile
index 22329404bd07..5e822e280a90 100644
--- a/x11-wm/fluxbox-devel/Makefile
+++ b/x11-wm/fluxbox-devel/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	fluxbox
-PORTVERSION=	0.9.6
+PORTVERSION=	0.9.7
 CATEGORIES=	x11-wm
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	fluxbox
@@ -20,6 +20,7 @@ RUN_DEPENDS=	bsetbg:${PORTSDIR}/x11-wm/boxtools \
 		xterm:${PORTSDIR}/x11/XFree86-4-clients
 BUILD_DEPENDS=	xterm:${PORTSDIR}/x11/XFree86-4-clients
 
+USE_BZIP2=	yes
 USE_X_PREFIX=	yes
 GNU_CONFIGURE=	yes
 WANT_GNOME=	yes
@@ -38,7 +39,7 @@ CONFIGURE_ARGS+=	--enable-xinerama
 
 MAN1=		fluxbox-devel.1
 
-.if ${HAVE_GNOME:Mgnomelibs}!="" || defined(PACKAGE_BUILDING)
+.if ${HAVE_GNOME:Mlibgnome}!="" || defined(PACKAGE_BUILDING)
 CONFIGURE_ARGS+=	--enable-gnome
 .else
 CONFIGURE_ARGS+=	--disable-gnome
@@ -46,7 +47,7 @@ CONFIGURE_ARGS+=	--disable-gnome
 
 NLSMAKEFILES=	nls nls/C nls/da_DK nls/es_ES nls/et_EE nls/fr_FR nls/pt_BR \
 				nls/ru_RU nls/sv_SE nls/tr_TR nls/pt_PT nls/bg_BG nls/ja_JP \
-				nls/lv_LV nls/it_IT nls/de_DE
+				nls/lv_LV nls/it_IT nls/de_DE nls/nl_NL
 
 pre-everything::
 	@${ECHO_CMD} ""
@@ -63,7 +64,7 @@ post-patch::
 	@${REINPLACE_CMD} -e 's|PACKAGE=fluxbox|PACKAGE=fluxbox-devel|g' \
 		${WRKSRC}/configure
 	@${REINPLACE_CMD} -e 's|%%PREFIX%%|${PREFIX}|g' \
-		${WRKSRC}/data/startup.in
+		${WRKSRC}/util/startfluxbox.in
 	@${REINPLACE_CMD} -e 's|fluxbox-generate_menu|fluxbox-generate_menu-devel|g; \
 		s|fbrun|fbrun-devel|g; s|%%LOCALBASE%%|${LOCALBASE}|g; s|%%X11BASE%%|${X11BASE}|g' \
 		${WRKSRC}/util/fluxbox-generate_menu.in
diff --git a/x11-wm/fluxbox-devel/distinfo b/x11-wm/fluxbox-devel/distinfo
index ea0dec9a1162..22956a2fb5a8 100644
--- a/x11-wm/fluxbox-devel/distinfo
+++ b/x11-wm/fluxbox-devel/distinfo
@@ -1 +1 @@
-MD5 (fluxbox-0.9.6.tar.gz) = d8b04654097fcf5d97c63787ba5d0d35
+MD5 (fluxbox-0.9.7.tar.bz2) = 74577beaa9da41b7a6c11d893bc776e4
diff --git a/x11-wm/fluxbox-devel/files/patch-data::startup.in b/x11-wm/fluxbox-devel/files/patch-data::startup.in
deleted file mode 100644
index 47c4683e4125..000000000000
--- a/x11-wm/fluxbox-devel/files/patch-data::startup.in
+++ /dev/null
@@ -1,25 +0,0 @@
---- data/startup.in.orig	Mon Nov 17 02:11:52 2003
-+++ data/startup.in	Mon Nov 17 02:13:49 2003
-@@ -12,7 +12,7 @@
- @pkgbindir@/bsetroot -solid black
- 
- # This shows the fluxbox-splash-screen
--# fbsetbg -C /usr/share/fluxbox/splash.jpg
-+# fbsetbg -C %%PREFIX%%/share/fluxbox-devel/splash.jpg
- 
- # Other examples. Check man xset for details.
- #
-@@ -41,9 +41,9 @@
- # wmsmixer -w &
- # idesk &
- 
--# And last but not least we start fluxbox.
-+# And last but not least we start fluxbox-devel.
- # Because it is the last app you have to run it with ``exec'' before it.
- 
--exec @pkgbindir@/fluxbox
-+exec @pkgbindir@/fluxbox-devel
- # or if you want to keep a log:
--# exec @pkgbindir@/fluxbox -log ~/.fluxbox/log
-\ No newline at end of file
-+# exec @pkgbindir@/fluxbox-devel -log ~/.fluxbox/log
diff --git a/x11-wm/fluxbox-devel/files/patch-doc::Makefile.in b/x11-wm/fluxbox-devel/files/patch-doc::Makefile.in
index 15aeeb68086d..6f58d9af1785 100644
--- a/x11-wm/fluxbox-devel/files/patch-doc::Makefile.in
+++ b/x11-wm/fluxbox-devel/files/patch-doc::Makefile.in
@@ -1,6 +1,6 @@
---- doc/Makefile.in.orig	Mon Nov 17 01:38:46 2003
-+++ doc/Makefile.in	Mon Nov 17 01:39:36 2003
-@@ -100,8 +100,8 @@
+--- doc/Makefile.in.orig	Mon Jan  5 14:58:48 2004
++++ doc/Makefile.in	Mon Jan  5 14:59:01 2004
+@@ -94,8 +94,8 @@
  
  CLEANFILES = fluxbox.1
  MAINTAINERCLEANFILES = Makefile.in
diff --git a/x11-wm/fluxbox-devel/files/patch-util::Makefile.in b/x11-wm/fluxbox-devel/files/patch-util::Makefile.in
index 95c87460af8c..2735f0106d4c 100644
--- a/x11-wm/fluxbox-devel/files/patch-util::Makefile.in
+++ b/x11-wm/fluxbox-devel/files/patch-util::Makefile.in
@@ -1,6 +1,6 @@
---- util/Makefile.in.orig	Mon Nov 17 01:40:36 2003
-+++ util/Makefile.in	Mon Nov 17 01:41:48 2003
-@@ -100,7 +100,7 @@
+--- util/Makefile.in.orig	Mon Jan  5 15:00:04 2004
++++ util/Makefile.in	Mon Jan  5 15:00:31 2004
+@@ -95,7 +95,7 @@
  SUBDIRS = fbrun
  INCLUDES = -I../src/FbTk/
  bin_SCRIPTS = fbsetbg fluxbox-generate_menu startfluxbox
@@ -9,7 +9,7 @@
  bsetroot_SOURCES = bsetroot.cc bsetroot.hh
  bsetroot_LDADD = ../src/FbRootWindow.o ../src/I18n.o \
  			../src/FbAtoms.o ../src/FbTk/libFbTk.a
-@@ -114,7 +114,7 @@
+@@ -109,7 +109,7 @@
  mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
  CONFIG_HEADER = $(top_builddir)/config.h
  CONFIG_CLEAN_FILES =
diff --git a/x11-wm/fluxbox-devel/files/patch-util::fluxbox-generate_menu.in b/x11-wm/fluxbox-devel/files/patch-util::fluxbox-generate_menu.in
index f7dbd6720e43..d4ef59d6b191 100644
--- a/x11-wm/fluxbox-devel/files/patch-util::fluxbox-generate_menu.in
+++ b/x11-wm/fluxbox-devel/files/patch-util::fluxbox-generate_menu.in
@@ -1,5 +1,5 @@
---- util/fluxbox-generate_menu.in.orig	Mon Nov 17 01:50:53 2003
-+++ util/fluxbox-generate_menu.in	Mon Nov 17 02:00:42 2003
+--- util/fluxbox-generate_menu.in.orig	Mon Jan  5 16:00:08 2004
++++ util/fluxbox-generate_menu.in	Mon Jan  5 16:09:15 2004
 @@ -45,7 +45,7 @@
  
  
@@ -20,7 +20,7 @@
      -q  KDE-prefix; idem dito
  
  
-@@ -592,7 +592,7 @@
+@@ -599,7 +599,7 @@
  # Name of the outputfile
  # MENUFILENAME=${HOME}/.fluxbox/menu
  
@@ -29,7 +29,7 @@
  
  # standard url for console-browsers
  # HOMEPAGE=fluxbox.org
-@@ -604,19 +604,19 @@
+@@ -611,19 +611,19 @@
  # FBRUNOPTIONS='-font 10x20 -fg grey -bg black -title run'
  
  # --- PREFIX'es
@@ -56,7 +56,7 @@
  
  
  # --- Boolean variables.
-@@ -734,12 +734,12 @@
+@@ -741,12 +741,12 @@
  # prefix
  PREFIX="${PREFIX:=@PREFIX@}"
  if [  -z "${PREFIX}" -o ! -d "${PREFIX}" ]; then
@@ -71,7 +71,7 @@
      if [ -n "${GNOME_PREFIX}" -a -d "$GNOME_PREFIX/share/gnome" ]; then
          break;
      fi
-@@ -747,7 +747,7 @@
+@@ -754,7 +754,7 @@
  # Will remain $PREFIX if all else fails
  
  # kde prefix
@@ -80,7 +80,7 @@
      if [ -n "${KDE_PREFIX}" -a -d "$KDE_PREFIX/share/applnk" ]; then
          break;
      fi
-@@ -755,7 +755,7 @@
+@@ -762,7 +762,7 @@
  
  # directory for the backgrounds
  if [ -z "$BACKGROUND_DIRS" ]; then
@@ -89,7 +89,7 @@
  fi
  
  # find the default terminal
-@@ -830,7 +830,7 @@
+@@ -837,7 +837,7 @@
      links|w3m|lynx)  append "[exec] (${DEFAULT_BROWSERNAME}) {${DEFAULT_TERM} -e ${DEFAULT_BROWSER} ${HOMEPAGE}}" ;;
      firebird|mozilla|phoenix|galeon|dillo|netscape) append "[exec] (${DEFAULT_BROWSERNAME}) {${DEFAULT_BROWSER}}" ;;
      konqueror) append "[exec] (konqueror) {kfmclient openProfile webbrowsing}" ;;
@@ -98,7 +98,7 @@
      MozillaFirebird) append "[exec] (firebird) {MozillaFirebird}" ;;
      *) append "[exec] ($DEFAULT_BROWSERNAME) {$DEFAULT_BROWSER}" ;;
  esac
-@@ -846,7 +846,7 @@
+@@ -853,7 +853,7 @@
  append_submenu "${NETMENU}"
      append_submenu "${BROWSERMENU}"
          normal_find mozilla-firebird MozillaFirebird galeon mozilla dillo netscape
@@ -107,7 +107,7 @@
          find_it konqueror   append "[exec]   (konqueror) {kfmclient openProfile webbrowsing}"
          find_it links       append "[exec]   (links) {${DEFAULT_TERM} -e links ${HOMEPAGE}}"
          find_it w3m         append "[exec]   (w3m) {${DEFAULT_TERM} -e w3m ${HOMEPAGE}}"
-@@ -990,7 +990,7 @@
+@@ -996,7 +996,7 @@
      append "[config] (${CONFIGUREMENU})"
  
      append_menu "[submenu] (${SYSTEMSTYLES}) {${STYLEMENUTITLE}}"
@@ -116,3 +116,21 @@
      append_menu_end
  
      append_menu "[submenu] (${USERSTYLES}) {${STYLEMENUTITLE}}"
+@@ -1006,7 +1006,7 @@
+     # Backgroundmenu
+     addbackground() {
+                 picturename=`basename "$1"`
+-                append "[exec] (${picturename%.???}) {fbsetbg -a \"$1\" }"
++                append "[exec] (${picturename%.???}) {fbsetbg-devel -a \"$1\" }"
+     }
+ 
+     if [ "$BACKGROUNDMENUITEM" = yes ]; then
+@@ -1014,7 +1014,7 @@
+         NUMBER_OF_BACKGROUNDS=`find $BACKGROUND_DIRS -follow -type f 2> /dev/null|wc -l`
+         if [ "$NUMBER_OF_BACKGROUNDS" -gt 0 ]; then
+             append_menu "[submenu] (${BACKGROUNDMENU}) {${BACKGROUNDMENUTITLE}}"
+-            append "[exec] (random background) {fbsetbg -r ${HOME}/.fluxbox/backgrounds}"
++            append "[exec] (random background) {fbsetbg-devel -r ${HOME}/.fluxbox/backgrounds}"
+             if [ "$NUMBER_OF_BACKGROUNDS" -gt 30 ]; then
+                 menucounter=1 ; counter=1
+                 append_menu "[submenu] (${BACKGROUNDMENU} $menucounter) {${BACKGROUNDMENUTITLE}}"
diff --git a/x11-wm/fluxbox-devel/files/patch-util::startfluxbox.in b/x11-wm/fluxbox-devel/files/patch-util::startfluxbox.in
new file mode 100644
index 000000000000..afeadf16b869
--- /dev/null
+++ b/x11-wm/fluxbox-devel/files/patch-util::startfluxbox.in
@@ -0,0 +1,23 @@
+--- util/startfluxbox.in.orig	Mon Jan  5 15:36:53 2004
++++ util/startfluxbox.in	Mon Jan  5 15:38:20 2004
+@@ -24,7 +24,7 @@
+ @pkgbindir@/bsetroot -solid black
+ 
+ # This shows the fluxbox-splash-screen
+-# fbsetbg -C /usr/share/fluxbox/splash.jpg
++# fbsetbg-devel -C %%PREFIX%%/share/fluxbox-devel/splash.jpg
+ 
+ # Other examples. Check man xset for details.
+ #
+@@ -56,9 +56,9 @@
+ # And last but not least we start fluxbox.
+ # Because it is the last app you have to run it with ''exec'' before it.
+ 
+-exec @pkgbindir@/fluxbox
++exec @pkgbindir@/fluxbox-devel
+ # or if you want to keep a log:
+-# exec @pkgbindir@/fluxbox -log ~/.fluxbox/log
++# exec @pkgbindir@/fluxbox-devel -log ~/.fluxbox/log
+ EOF
+     fi
+     chmod 755 ~/.fluxbox/startup
diff --git a/x11-wm/fluxbox-devel/pkg-plist b/x11-wm/fluxbox-devel/pkg-plist
index 6c3cf2fd8b34..f4e4984dce24 100644
--- a/x11-wm/fluxbox-devel/pkg-plist
+++ b/x11-wm/fluxbox-devel/pkg-plist
@@ -16,19 +16,58 @@ share/fluxbox-devel/nls/fr_FR/fluxbox.cat
 share/fluxbox-devel/nls/it_IT/fluxbox.cat
 share/fluxbox-devel/nls/ja_JP/fluxbox.cat
 share/fluxbox-devel/nls/lv_LV/fluxbox.cat
+share/fluxbox-devel/nls/nl_NL/fluxbox.cat
 share/fluxbox-devel/nls/pt_BR/fluxbox.cat
 share/fluxbox-devel/nls/pt_PT/fluxbox.cat
 share/fluxbox-devel/nls/ru_RU/fluxbox.cat
 share/fluxbox-devel/nls/sv_SE/fluxbox.cat
 share/fluxbox-devel/nls/tr_TR/fluxbox.cat
-share/fluxbox-devel/startup
 share/fluxbox-devel/styles/Artwiz
-share/fluxbox-devel/styles/Blue
+share/fluxbox-devel/styles/BlueFlux/pixmaps/button_close_active.xpm
+share/fluxbox-devel/styles/BlueFlux/pixmaps/button_close_pressed.xpm
+share/fluxbox-devel/styles/BlueFlux/pixmaps/button_close_unfocus.xpm
+share/fluxbox-devel/styles/BlueFlux/pixmaps/button_max_active.xpm
+share/fluxbox-devel/styles/BlueFlux/pixmaps/button_max_pressed.xpm
+share/fluxbox-devel/styles/BlueFlux/pixmaps/button_max_unfocus.xpm
+share/fluxbox-devel/styles/BlueFlux/pixmaps/button_min_active.xpm
+share/fluxbox-devel/styles/BlueFlux/pixmaps/button_min_pressed.xpm
+share/fluxbox-devel/styles/BlueFlux/pixmaps/button_min_unfocus.xpm
+share/fluxbox-devel/styles/BlueFlux/pixmaps/button_stick_active.xpm
+share/fluxbox-devel/styles/BlueFlux/pixmaps/button_stick_pressed.xpm
+share/fluxbox-devel/styles/BlueFlux/pixmaps/button_stick_unfocus.xpm
+share/fluxbox-devel/styles/BlueFlux/pixmaps/button_stuck.xpm
+share/fluxbox-devel/styles/BlueFlux/pixmaps/button_stuck_unfocus.xpm
+share/fluxbox-devel/styles/BlueFlux/pixmaps/button_toolbar.xpm
+share/fluxbox-devel/styles/BlueFlux/pixmaps/button_toolbar_pressed.xpm
+share/fluxbox-devel/styles/BlueFlux/pixmaps/menu_frame.xpm
+share/fluxbox-devel/styles/BlueFlux/pixmaps/title_bar.xpm
+share/fluxbox-devel/styles/BlueFlux/pixmaps/title_bar_unfocus.xpm
+share/fluxbox-devel/styles/BlueFlux/pixmaps/toolbar.xpm
+share/fluxbox-devel/styles/BlueFlux/pixmaps/toolbar_label.xpm
+share/fluxbox-devel/styles/BlueFlux/theme.cfg
 share/fluxbox-devel/styles/BlueNight
 share/fluxbox-devel/styles/Carbondioxide
 share/fluxbox-devel/styles/Clean
-share/fluxbox-devel/styles/CleanColor
 share/fluxbox-devel/styles/Cthulhain
+share/fluxbox-devel/styles/Emerge/pixmaps/bullet.xpm
+share/fluxbox-devel/styles/Emerge/pixmaps/close-pressed.xpm
+share/fluxbox-devel/styles/Emerge/pixmaps/close-unfocus.xpm
+share/fluxbox-devel/styles/Emerge/pixmaps/close.xpm
+share/fluxbox-devel/styles/Emerge/pixmaps/icon-pressed.xpm
+share/fluxbox-devel/styles/Emerge/pixmaps/icon-unfocus.xpm
+share/fluxbox-devel/styles/Emerge/pixmaps/icon.xpm
+share/fluxbox-devel/styles/Emerge/pixmaps/max-pressed.xpm
+share/fluxbox-devel/styles/Emerge/pixmaps/max-unfocus.xpm
+share/fluxbox-devel/styles/Emerge/pixmaps/max.xpm
+share/fluxbox-devel/styles/Emerge/pixmaps/selected.xpm
+share/fluxbox-devel/styles/Emerge/pixmaps/stick-pressed.xpm
+share/fluxbox-devel/styles/Emerge/pixmaps/stick-unfocus.xpm
+share/fluxbox-devel/styles/Emerge/pixmaps/stick.xpm
+share/fluxbox-devel/styles/Emerge/pixmaps/stuck-pressed.xpm
+share/fluxbox-devel/styles/Emerge/pixmaps/stuck-unfocus.xpm
+share/fluxbox-devel/styles/Emerge/pixmaps/stuck.xpm
+share/fluxbox-devel/styles/Emerge/pixmaps/unselected.xpm
+share/fluxbox-devel/styles/Emerge/theme.cfg
 share/fluxbox-devel/styles/Flux
 share/fluxbox-devel/styles/LemonSpace
 share/fluxbox-devel/styles/Makro
@@ -39,7 +78,6 @@ share/fluxbox-devel/styles/Nyz
 share/fluxbox-devel/styles/Operation
 share/fluxbox-devel/styles/Outcomes
 share/fluxbox-devel/styles/Rampage
-share/fluxbox-devel/styles/Rancor
 share/fluxbox-devel/styles/Results
 share/fluxbox-devel/styles/Shade
 share/fluxbox-devel/styles/Spiff
@@ -59,12 +97,17 @@ share/fluxbox-devel/styles/qnx-photon
 @exec ln -s C %D/share/fluxbox-devel/nls/en
 @exec ln -s C %D/share/fluxbox-devel/nls/US_ASCII
 @exec ln -s C %D/share/fluxbox-devel/nls/POSIX
+@dirrm share/fluxbox-devel/styles/Emerge/pixmaps
+@dirrm share/fluxbox-devel/styles/Emerge
+@dirrm share/fluxbox-devel/styles/BlueFlux/pixmaps
+@dirrm share/fluxbox-devel/styles/BlueFlux
 @dirrm share/fluxbox-devel/styles
 @dirrm share/fluxbox-devel/nls/tr_TR
 @dirrm share/fluxbox-devel/nls/sv_SE
 @dirrm share/fluxbox-devel/nls/ru_RU
 @dirrm share/fluxbox-devel/nls/pt_PT
 @dirrm share/fluxbox-devel/nls/pt_BR
+@dirrm share/fluxbox-devel/nls/nl_NL
 @dirrm share/fluxbox-devel/nls/lv_LV
 @dirrm share/fluxbox-devel/nls/ja_JP
 @dirrm share/fluxbox-devel/nls/it_IT