6 files changed, 147 insertions, 95 deletions

diff --git a/x11-wm/fluxbox-devel/Makefile b/x11-wm/fluxbox-devel/Makefile
index 931fba4a694d..4cfa818bafdd 100644
--- a/x11-wm/fluxbox-devel/Makefile
+++ b/x11-wm/fluxbox-devel/Makefile
@@ -6,41 +6,61 @@
 #
 
 PORTNAME=	fluxbox
-PORTVERSION=	0.9.8
-PORTREVISION=	1
+PORTVERSION=	0.9.9
 CATEGORIES=	x11-wm
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	fluxbox
 PKGNAMESUFFIX=	-devel
 
-MAINTAINER=	mezz7@cox.net
+PATCH_SITES=	http://fluxbox.org/download/
+PATCHFILES=	fluxbox-0.9.9-gcc3.4.patch
+
+MAINTAINER=	mezz@FreeBSD.org
 COMMENT=	A small and fast window manager based on BlackBox
 
+BUILD_DEPENDS=	xterm:${PORTSDIR}/x11/XFree86-4-clients
 LIB_DEPENDS=	Xft.2:${PORTSDIR}/x11-fonts/libXft
 RUN_DEPENDS=	bsetbg:${PORTSDIR}/x11-wm/boxtools \
 		xterm:${PORTSDIR}/x11/XFree86-4-clients
-BUILD_DEPENDS=	xterm:${PORTSDIR}/x11/XFree86-4-clients
 
 CONFLICTS=	fluxbox-0.1.*
 
 USE_BZIP2=	yes
-USE_X_PREFIX=	yes
-GNU_CONFIGURE=	yes
 WANT_GNOME=	yes
+USE_X_PREFIX=	yes
 USE_REINPLACE=	yes
-CONFIGURE_ARGS=		--enable-nls
+GNU_CONFIGURE=	yes
 
-.if defined(WITH_KDE) || defined(PACKAGE_BUILDING)
-CONFIGURE_ARGS+=	--enable-kde
+MAN1=		fbrun.1 fbsetbg.1 fluxbox.1 fluxstyle.1 startfluxbox.1
+
+NLSMAKEFILES=	nls nls/C nls/bg_BG nls/da_DK nls/de_DE nls/es_ES nls/et_EE \
+		nls/fr_FR nls/it_IT nls/ja_JP nls/lv_LV nls/nl_NL nls/pl_PL \
+		nls/pt_BR nls/pt_PT nls/ru_RU nls/sl_SI nls/sv_SE nls/tr_TR
+
+.if defined(WITH_DEBUG)
+CONFIGURE_ARGS+=	--enable-debug
 .endif
 
 .if defined(WITH_XINERAMA) || defined(PACKAGE_BUILDING)
 CONFIGURE_ARGS+=	--enable-xinerama
 .endif
 
-.include <bsd.port.pre.mk>
+.if defined(WITH_KDE) || defined(PACKAGE_BUILDING)
+CONFIGURE_ARGS+=	--enable-kde
+.else
+CONFIGURE_ARGS+=	--disable-kde
+.endif
 
-MAN1=		fluxbox.1
+.if !defined(WITHOUT_NLS)
+USE_GETTEXT=		yes
+CONFIGURE_ARGS+=	--enable-nls
+PLIST_SUB=		NLS:=""
+.else
+CONFIGURE_ARGS+=	--disable-nls
+PLIST_SUB=		NLS:="@comment "
+.endif
+
+.include <bsd.port.pre.mk>
 
 .if ${HAVE_GNOME:Mlibgnome}!="" || defined(PACKAGE_BUILDING)
 CONFIGURE_ARGS+=	--enable-gnome
@@ -48,31 +68,36 @@ CONFIGURE_ARGS+=	--enable-gnome
 CONFIGURE_ARGS+=	--disable-gnome
 .endif
 
-NLSMAKEFILES=	nls nls/C nls/bg_BG nls/da_DK nls/de_DE nls/es_ES nls/et_EE \
-			nls/fr_FR nls/it_IT nls/ja_JP nls/lv_LV nls/nl_NL nls/pt_BR \
-			nls/pt_PT nls/ru_RU nls/sv_SE nls/tr_TR
-
 pre-everything::
 	@${ECHO_CMD} ""
 	@${ECHO_CMD} "Definable build options"
 	@${ECHO_CMD} "-----------------------"
+.if !defined(WITH_DEBUG)
+	@${ECHO_CMD} "WITH_DEBUG=yes		Build with debugging symbols"
+.endif
 .if !defined(WITH_XINERAMA)
-	@${ECHO_CMD} "WITH_XINERAMA	- Enable Xinerama support"
+	@${ECHO_CMD} "WITH_XINERAMA=yes	Enable Xinerama support"
 .endif
 .if !defined(WITH_KDE)
-	@${ECHO_CMD} "WITH_KDE	- Enable KDE slit support"
+	@${ECHO_CMD} "WITH_KDE=yes		Enable KDE slit support"
+.endif
+.if !defined(WITH_GNOME)
+	@${ECHO_CMD} "WITH_GNOME=yes		Enable GNOME support"
+.endif
+.if !defined(WITHOUT_NLS)
+	@${ECHO_CMD} "WITH_NLS=yes		Enable NLS support"
 .endif
 
-post-patch::
+post-patch:
 	@${REINPLACE_CMD} -e 's|%%LOCALBASE%%|${LOCALBASE}|g; s|%%X11BASE%%|${X11BASE}|g' \
 		${WRKSRC}/util/fluxbox-generate_menu.in
-
-post-configure::
+.if !defined(WITHOUT_NLS)
 .for i in ${NLSMAKEFILES}
-	@${REINPLACE_CMD} -e 's|@NLS@|-DNLS|' ${WRKSRC}/${i}/Makefile
+	@${REINPLACE_CMD} -e 's|@NLS@|-DNLS|' ${WRKSRC}/${i}/Makefile.in
 .endfor
+.endif
 
-post-install::
+post-install:
 	@${CAT} ${PKGMESSAGE}
 
 .include <bsd.port.post.mk>
diff --git a/x11-wm/fluxbox-devel/distinfo b/x11-wm/fluxbox-devel/distinfo
index a1aadd45e44d..dbdb1ee852a2 100644
--- a/x11-wm/fluxbox-devel/distinfo
+++ b/x11-wm/fluxbox-devel/distinfo
@@ -1,2 +1,4 @@
-MD5 (fluxbox-0.9.8.tar.bz2) = 1f8192b768355b010ff8ae7a694bcf0c
-SIZE (fluxbox-0.9.8.tar.bz2) = 506099
+MD5 (fluxbox-0.9.9.tar.bz2) = b96f9b23b6605274bf0f7c3f84d080f1
+SIZE (fluxbox-0.9.9.tar.bz2) = 536673
+MD5 (fluxbox-0.9.9-gcc3.4.patch) = 8d626eb9d87864d51db64832dcc6a023
+SIZE (fluxbox-0.9.9-gcc3.4.patch) = 847
diff --git a/x11-wm/fluxbox-devel/files/patch-doc::Makefile.in b/x11-wm/fluxbox-devel/files/patch-doc::Makefile.in
index 6f58d9af1785..6ec707a411db 100644
--- a/x11-wm/fluxbox-devel/files/patch-doc::Makefile.in
+++ b/x11-wm/fluxbox-devel/files/patch-doc::Makefile.in
@@ -1,13 +1,15 @@
---- 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 @@
+--- doc/Makefile.in.orig	Fri Apr 30 01:32:42 2004
++++ doc/Makefile.in	Fri Apr 30 01:33:50 2004
+@@ -93,10 +93,10 @@
  
  CLEANFILES = fluxbox.1
  MAINTAINERCLEANFILES = Makefile.in
--man_MANS = fluxbox.1 bsetroot.1
--EXTRA_DIST = fluxbox.1.in bsetroot.1 Coding_style
-+man_MANS = fluxbox.1
-+EXTRA_DIST = fluxbox.1.in Coding_style
+-man_MANS = fluxbox.1 bsetroot.1 fbrun.1 fbsetbg.1 \
++man_MANS = fluxbox.1 fbrun.1 fbsetbg.1 \
+ 	startfluxbox.1 fluxstyle.1 fbrun.1
+ 
+-EXTRA_DIST = fluxbox.1.in bsetroot.1 fbrun.1 startfluxbox.1 fbsetbg.1 \
++EXTRA_DIST = fluxbox.1.in fbrun.1 startfluxbox.1 fbsetbg.1 \
+ 	fluxstyle.1 Coding_style
+ 
  subdir = doc
- mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
- CONFIG_HEADER = $(top_builddir)/config.h
diff --git a/x11-wm/fluxbox-devel/files/patch-util::Makefile.in b/x11-wm/fluxbox-devel/files/patch-util::Makefile.in
index 2735f0106d4c..c42a1bc013d2 100644
--- a/x11-wm/fluxbox-devel/files/patch-util::Makefile.in
+++ b/x11-wm/fluxbox-devel/files/patch-util::Makefile.in
@@ -1,15 +1,15 @@
---- 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 @@
+--- util/Makefile.in.orig	Fri Apr 30 01:35:18 2004
++++ util/Makefile.in	Fri Apr 30 01:36:19 2004
+@@ -94,7 +94,7 @@
  SUBDIRS = fbrun
- INCLUDES = -I../src/FbTk/
+ INCLUDES = -I$(top_srcdir)/src -I$(top_srcdir)/src/FbTk
  bin_SCRIPTS = fbsetbg fluxbox-generate_menu startfluxbox
 -bin_PROGRAMS = bsetroot
 +bin_PROGRAMS = 
  bsetroot_SOURCES = bsetroot.cc bsetroot.hh
  bsetroot_LDADD = ../src/FbRootWindow.o ../src/I18n.o \
  			../src/FbAtoms.o ../src/FbTk/libFbTk.a
-@@ -109,7 +109,7 @@
+@@ -108,7 +108,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 00b921b55f0b..22c8650a62b0 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	Mon Jan 12 13:14:55 2004
-+++ util/fluxbox-generate_menu.in	Sun Mar 14 12:02:01 2004
+--- util/fluxbox-generate_menu.in.orig	Sun Apr 25 12:15:49 2004
++++ util/fluxbox-generate_menu.in	Fri Apr 30 03:29:05 2004
 @@ -45,7 +45,7 @@
  
  
@@ -29,7 +29,7 @@
          }
  
          find_it_options() {
-@@ -614,19 +614,19 @@
+@@ -796,19 +796,19 @@
  # FBRUNOPTIONS='-font 10x20 -fg grey -bg black -title run'
  
  # --- PREFIX'es
@@ -56,7 +56,7 @@
  
  
  # --- Boolean variables.
-@@ -749,7 +749,7 @@
+@@ -931,7 +931,7 @@
  
  
  # gnome prefix
@@ -65,7 +65,7 @@
      if [ -n "${GNOME_PREFIX}" -a -d "$GNOME_PREFIX/share/gnome" ]; then
          break;
      fi
-@@ -757,7 +757,7 @@
+@@ -939,7 +939,7 @@
  # Will remain $PREFIX if all else fails
  
  # kde prefix
@@ -74,21 +74,40 @@
      if [ -n "${KDE_PREFIX}" -a -d "$KDE_PREFIX/share/applnk" ]; then
          break;
      fi
-@@ -840,7 +840,7 @@
+@@ -984,7 +984,7 @@
+ else
+     [ -n "$MY_BROWSER" ] && echo "Warning: you chose an invalid browser." >&2
+     #The precise order is up for debate.
+-    for browser in firefox mozilla-firebird MozillaFirebird opera skipstone mozilla galeon konqueror dillo netscape w3m links lynx; do
++    for browser in firefox mozilla-firebird MozillaFirebird linux-opera opera skipstone mozilla galeon konqueror dillo netscape w3m links lynx; do
+         if find_it $browser; then
+             DEFAULT_BROWSER=$browser
+             break
+@@ -1024,7 +1024,8 @@
      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}}" ;;
+     firefox|firebird|mozilla|phoenix|galeon|dillo|netscape) append "[exec] (${DEFAULT_BROWSERNAME}) {${DEFAULT_BROWSER}}" ;;
      konqueror) append "[exec] (konqueror) {kfmclient openProfile webbrowsing}" ;;
 -    opera) append "[exec] (opera) {env QT_XFT=true opera}" ;;
++    linux-opera) append "[exec] (linux-opera) {linux-opera}" ;;
 +    opera) append "[exec] (opera) {opera}" ;;
      MozillaFirebird) append "[exec] (firebird) {MozillaFirebird}" ;;
+     MozillaFirefox) append "[exec] (firefox) {MozillaFirefox}" ;;
      *) append "[exec] ($DEFAULT_BROWSERNAME) {$DEFAULT_BROWSER}" ;;
- esac
-@@ -856,7 +856,7 @@
+@@ -1041,7 +1042,8 @@
  append_submenu "${NETMENU}"
      append_submenu "${BROWSERMENU}"
-         normal_find mozilla-firebird MozillaFirebird galeon mozilla dillo netscape
+         normal_find firefox mozilla-firefox MozillaFirefox galeon mozilla dillo netscape
 -        find_it opera       append "[exec]   (opera) {env QT_XFT=true opera}"
++        find_it linux-opera append "[exec]   (linux-opera) {linux-opera}"
 +        find_it opera       append "[exec]   (opera) {opera}"
          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}}"
+@@ -1199,7 +1201,6 @@
+ 
+     append_menu "[submenu] (${SYSTEMSTYLES}) {${STYLEMENUTITLE}}"
+         append "[stylesdir] (${PREFIX}/share/fluxbox/styles)"
+-	append "[stylesdir] (/usr/share/commonbox/styles/)"
+     append_menu_end
+ 
+     append_menu "[submenu] (${USERSTYLES}) {${STYLEMENUTITLE}}"
diff --git a/x11-wm/fluxbox-devel/pkg-plist b/x11-wm/fluxbox-devel/pkg-plist
index 5b953c9bbd9e..46b682263174 100644
--- a/x11-wm/fluxbox-devel/pkg-plist
+++ b/x11-wm/fluxbox-devel/pkg-plist
@@ -6,22 +6,24 @@ bin/startfluxbox
 share/fluxbox/init
 share/fluxbox/keys
 share/fluxbox/menu
-share/fluxbox/nls/C/fluxbox.cat
-share/fluxbox/nls/bg_BG/fluxbox.cat
-share/fluxbox/nls/da_DK/fluxbox.cat
-share/fluxbox/nls/de_DE/fluxbox.cat
-share/fluxbox/nls/es_ES/fluxbox.cat
-share/fluxbox/nls/et_EE/fluxbox.cat
-share/fluxbox/nls/fr_FR/fluxbox.cat
-share/fluxbox/nls/it_IT/fluxbox.cat
-share/fluxbox/nls/ja_JP/fluxbox.cat
-share/fluxbox/nls/lv_LV/fluxbox.cat
-share/fluxbox/nls/nl_NL/fluxbox.cat
-share/fluxbox/nls/pt_BR/fluxbox.cat
-share/fluxbox/nls/pt_PT/fluxbox.cat
-share/fluxbox/nls/ru_RU/fluxbox.cat
-share/fluxbox/nls/sv_SE/fluxbox.cat
-share/fluxbox/nls/tr_TR/fluxbox.cat
+%%NLS:%%share/fluxbox/nls/C/fluxbox.cat
+%%NLS:%%share/fluxbox/nls/bg_BG/fluxbox.cat
+%%NLS:%%share/fluxbox/nls/da_DK/fluxbox.cat
+%%NLS:%%share/fluxbox/nls/de_DE/fluxbox.cat
+%%NLS:%%share/fluxbox/nls/es_ES/fluxbox.cat
+%%NLS:%%share/fluxbox/nls/et_EE/fluxbox.cat
+%%NLS:%%share/fluxbox/nls/fr_FR/fluxbox.cat
+%%NLS:%%share/fluxbox/nls/it_IT/fluxbox.cat
+%%NLS:%%share/fluxbox/nls/ja_JP/fluxbox.cat
+%%NLS:%%share/fluxbox/nls/lv_LV/fluxbox.cat
+%%NLS:%%share/fluxbox/nls/nl_NL/fluxbox.cat
+%%NLS:%%share/fluxbox/nls/pl_PL/fluxbox.cat
+%%NLS:%%share/fluxbox/nls/pt_BR/fluxbox.cat
+%%NLS:%%share/fluxbox/nls/pt_PT/fluxbox.cat
+%%NLS:%%share/fluxbox/nls/ru_RU/fluxbox.cat
+%%NLS:%%share/fluxbox/nls/sl_SI/fluxbox.cat
+%%NLS:%%share/fluxbox/nls/sv_SE/fluxbox.cat
+%%NLS:%%share/fluxbox/nls/tr_TR/fluxbox.cat
 share/fluxbox/styles/Artwiz
 share/fluxbox/styles/BlueFlux/pixmaps/button_close_active.xpm
 share/fluxbox/styles/BlueFlux/pixmaps/button_close_pressed.xpm
@@ -83,40 +85,42 @@ share/fluxbox/styles/Shade
 share/fluxbox/styles/Spiff
 share/fluxbox/styles/Twice
 share/fluxbox/styles/qnx-photon
-@unexec rm %D/share/fluxbox/nls/lv 2>&1 >/dev/null || true
-@unexec rm %D/share/fluxbox/nls/fr 2>&1 >/dev/null || true
-@unexec rm %D/share/fluxbox/nls/es 2>&1 >/dev/null || true
-@unexec rm %D/share/fluxbox/nls/en_US 2>&1 >/dev/null || true
-@unexec rm %D/share/fluxbox/nls/en 2>&1 >/dev/null || true
-@unexec rm %D/share/fluxbox/nls/US_ASCII 2>&1 >/dev/null || true
-@unexec rm %D/share/fluxbox/nls/POSIX 2>&1 >/dev/null || true
-@exec ln -s lv_LV %D/share/fluxbox/nls/lv
-@exec ln -s fr_FR %D/share/fluxbox/nls/fr
-@exec ln -s es_ES %D/share/fluxbox/nls/es
-@exec ln -s C %D/share/fluxbox/nls/en_US
-@exec ln -s C %D/share/fluxbox/nls/en
-@exec ln -s C %D/share/fluxbox/nls/US_ASCII
-@exec ln -s C %D/share/fluxbox/nls/POSIX
+%%NLS:%%@unexec rm %D/share/fluxbox/nls/lv 2>&1 >/dev/null || true
+%%NLS:%%@unexec rm %D/share/fluxbox/nls/fr 2>&1 >/dev/null || true
+%%NLS:%%@unexec rm %D/share/fluxbox/nls/es 2>&1 >/dev/null || true
+%%NLS:%%@unexec rm %D/share/fluxbox/nls/en_US 2>&1 >/dev/null || true
+%%NLS:%%@unexec rm %D/share/fluxbox/nls/en 2>&1 >/dev/null || true
+%%NLS:%%@unexec rm %D/share/fluxbox/nls/US_ASCII 2>&1 >/dev/null || true
+%%NLS:%%@unexec rm %D/share/fluxbox/nls/POSIX 2>&1 >/dev/null || true
+%%NLS:%%@exec ln -s lv_LV %D/share/fluxbox/nls/lv
+%%NLS:%%@exec ln -s fr_FR %D/share/fluxbox/nls/fr
+%%NLS:%%@exec ln -s es_ES %D/share/fluxbox/nls/es
+%%NLS:%%@exec ln -s C %D/share/fluxbox/nls/en_US
+%%NLS:%%@exec ln -s C %D/share/fluxbox/nls/en
+%%NLS:%%@exec ln -s C %D/share/fluxbox/nls/US_ASCII
+%%NLS:%%@exec ln -s C %D/share/fluxbox/nls/POSIX
 @dirrm share/fluxbox/styles/Emerge/pixmaps
 @dirrm share/fluxbox/styles/Emerge
 @dirrm share/fluxbox/styles/BlueFlux/pixmaps
 @dirrm share/fluxbox/styles/BlueFlux
 @dirrm share/fluxbox/styles
-@dirrm share/fluxbox/nls/tr_TR
-@dirrm share/fluxbox/nls/sv_SE
-@dirrm share/fluxbox/nls/ru_RU
-@dirrm share/fluxbox/nls/pt_PT
-@dirrm share/fluxbox/nls/pt_BR
-@dirrm share/fluxbox/nls/nl_NL
-@dirrm share/fluxbox/nls/lv_LV
-@dirrm share/fluxbox/nls/ja_JP
-@dirrm share/fluxbox/nls/it_IT
-@dirrm share/fluxbox/nls/fr_FR
-@dirrm share/fluxbox/nls/et_EE
-@dirrm share/fluxbox/nls/es_ES
-@dirrm share/fluxbox/nls/de_DE
-@dirrm share/fluxbox/nls/da_DK
-@dirrm share/fluxbox/nls/bg_BG
-@dirrm share/fluxbox/nls/C
-@dirrm share/fluxbox/nls
+%%NLS:%%@dirrm share/fluxbox/nls/tr_TR
+%%NLS:%%@dirrm share/fluxbox/nls/sv_SE
+%%NLS:%%@dirrm share/fluxbox/nls/sl_SI
+%%NLS:%%@dirrm share/fluxbox/nls/ru_RU
+%%NLS:%%@dirrm share/fluxbox/nls/pt_PT
+%%NLS:%%@dirrm share/fluxbox/nls/pt_BR
+%%NLS:%%@dirrm share/fluxbox/nls/pl_PL
+%%NLS:%%@dirrm share/fluxbox/nls/nl_NL
+%%NLS:%%@dirrm share/fluxbox/nls/lv_LV
+%%NLS:%%@dirrm share/fluxbox/nls/ja_JP
+%%NLS:%%@dirrm share/fluxbox/nls/it_IT
+%%NLS:%%@dirrm share/fluxbox/nls/fr_FR
+%%NLS:%%@dirrm share/fluxbox/nls/et_EE
+%%NLS:%%@dirrm share/fluxbox/nls/es_ES
+%%NLS:%%@dirrm share/fluxbox/nls/de_DE
+%%NLS:%%@dirrm share/fluxbox/nls/da_DK
+%%NLS:%%@dirrm share/fluxbox/nls/bg_BG
+%%NLS:%%@dirrm share/fluxbox/nls/C
+%%NLS:%%@dirrm share/fluxbox/nls
 @dirrm share/fluxbox