5 files changed, 24 insertions, 46 deletions

diff --git a/x11-wm/fluxbox-devel/Makefile b/x11-wm/fluxbox-devel/Makefile
index fad55577f949..6057a74e9a9c 100644
--- a/x11-wm/fluxbox-devel/Makefile
+++ b/x11-wm/fluxbox-devel/Makefile
@@ -6,8 +6,7 @@
 #
 
 PORTNAME=	fluxbox
-PORTVERSION=	0.9.14
-PORTREVISION=	1
+PORTVERSION=	0.9.15
 CATEGORIES=	x11-wm
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	fluxbox
@@ -26,15 +25,16 @@ USE_GMAKE=	yes
 USE_GNOME=	gnometarget
 WANT_GNOME=	yes
 USE_X_PREFIX=	yes
-USE_REINPLACE=	yes
 GNU_CONFIGURE=	yes
 
-DOCS=		AUTHORS COPYING ChangeLog INSTALL NEWS README TODO
+DOCS=		AUTHORS COPYING ChangeLog NEWS README TODO
 MAN1=		fbrun.1 fbsetbg.1 fbsetroot.1 fluxbox.1 fluxstyle.1 \
 		startfluxbox.1
 
 .if defined(WITH_DEBUG)
 CONFIGURE_ARGS+=	--enable-debug
+CFLAGS+=		-g
+STRIP=
 .endif
 
 .if defined(WITH_DOCHTML)
@@ -163,8 +163,6 @@ post-patch:
 			${WRKSRC}/util/fluxbox-generate_menu.in
 	@${REINPLACE_CMD} -e 's|/usr/local|${LOCALBASE}|g ; \
 		s|/usr/X11R6|${X11BASE}|g' ${WRKSRC}/util/fbsetbg
-	@${FIND} ${WRKSRC}/data/styles -type f | ${XARGS} ${REINPLACE_CMD} -e \
-		's|bsetroot|fbsetroot|g'
 .if defined(WITHOUT_NLS)
 	@${REINPLACE_CMD} -e 's|HAVE_ICONV=yes|HAVE_ICONV=no|g' \
 		${WRKSRC}/configure
diff --git a/x11-wm/fluxbox-devel/distinfo b/x11-wm/fluxbox-devel/distinfo
index dfb9c228d8e2..6bdf34a57f5c 100644
--- a/x11-wm/fluxbox-devel/distinfo
+++ b/x11-wm/fluxbox-devel/distinfo
@@ -1,6 +1,6 @@
-MD5 (fluxbox-0.9.14.tar.gz) = fc013c3d233ce11bcb8b6d989b1a4326
-SHA256 (fluxbox-0.9.14.tar.gz) = 87a5c710765d0e364305899e46676980527edbf42aec455cd8e98caba048fe2a
-SIZE (fluxbox-0.9.14.tar.gz) = 928623
+MD5 (fluxbox-0.9.15.tar.gz) = ce06cdddadd4dd25c0f9f63df7b1898b
+SHA256 (fluxbox-0.9.15.tar.gz) = b22216657a4310b08872826ae2662b833ae74d4762c582bb5955413c3d536b8f
+SIZE (fluxbox-0.9.15.tar.gz) = 945548
 MD5 (fb-doc-mfhtml.tgz) = 56908d6e4b35409419bff2956de61707
 SHA256 (fb-doc-mfhtml.tgz) = b0aba914c95722ebd9279c40a7de9d96ae07a8b898501149ecdd4f32d5701ece
 SIZE (fb-doc-mfhtml.tgz) = 73711
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 d2f1eebd0205..6ba2a15dfa8e 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	Wed Sep 14 19:35:32 2005
-+++ util/fluxbox-generate_menu.in	Wed Sep 14 19:47:50 2005
+--- util/fluxbox-generate_menu.in.orig	Sun Mar 19 17:12:05 2006
++++ util/fluxbox-generate_menu.in	Sun Mar 19 17:25:03 2006
 @@ -48,7 +48,7 @@
  
  
@@ -27,15 +27,6 @@
      -q  KDE-prefix; idem dito
  
  
-@@ -153,7 +153,7 @@
- else
-     # can rely on return value
-     find_it() {
--        which $1 > /dev/null 2>&1 && shift && $*
-+        which $1 > /dev/null 2>&1 && shift && "$@"
-     }
- 
-     find_it_options() {
 @@ -285,7 +285,9 @@
      # echo -n "for $temp_icon"
      eval doSearchLoop $USER_ICONPATHS \
@@ -47,14 +38,9 @@
        ${OTHER_ICONPATHS} \
  
  
-@@ -1166,19 +1168,19 @@
- # FBRUNOPTIONS='-font 10x20 -fg grey -bg black -title run'
- 
- # --- PREFIX'es
--# These are prefixes; So if fluxbox is installed in /usr/bin/fluxbox
--# your prefix is: /usr
-+# These are prefixes; So if fluxbox is installed in @PREFIX@/bin/fluxbox
-+# your prefix is: @PREFIX@
+@@ -1209,16 +1211,16 @@
+ # These are prefixes; So if fluxbox is installed in @PREFIX@/bin/fluxbox
+ # your prefix is: @PREFIX@
  
 -# fluxbox-generate already looks in /usr/X11R6, /usr, /usr/local and /opt so
 +# fluxbox-generate already looks in %%LOCALBASE%%, %%X11BASE%% and /opt so
@@ -73,7 +59,7 @@
  
  
  # --- Boolean variables.
-@@ -1246,16 +1248,22 @@
+@@ -1286,16 +1288,22 @@
          -g) GNOMEMENU=yes; shift;;
          -in) NO_ICON=yes; shift;;
          -is) OTHER_ICONPATHS="
@@ -100,7 +86,7 @@
              "
              # /usr/share/apps \
              shift;;
-@@ -1330,7 +1338,7 @@
+@@ -1370,7 +1378,7 @@
  
  
  # gnome prefix
@@ -109,7 +95,7 @@
      if [ -n "${GNOME_PREFIX}" -a -d "$GNOME_PREFIX/share/gnome" ]; then
          break;
      fi
-@@ -1338,7 +1346,7 @@
+@@ -1378,7 +1386,7 @@
  # Will remain $PREFIX if all else fails
  
  # kde prefix
@@ -118,7 +104,7 @@
      if [ -n "${KDE_PREFIX}" -a -d "$KDE_PREFIX/share/applnk" ]; then
          break;
      fi
-@@ -1426,7 +1434,7 @@
+@@ -1466,7 +1474,7 @@
  else
      [ -n "$MY_BROWSER" ] && echo "Warning: you chose an invalid browser." >&2
      #The precise order is up for debate.
@@ -127,7 +113,7 @@
          if find_it $browser; then
              DEFAULT_BROWSER=$browser
              break
-@@ -1466,7 +1474,8 @@
+@@ -1506,7 +1514,8 @@
      links|w3m|lynx)  append "[exec] (${DEFAULT_BROWSERNAME}) {${DEFAULT_TERM} -e ${DEFAULT_BROWSER} ${HOMEPAGE}}" ;;
      firefox|firebird|mozilla|phoenix|galeon|dillo|netscape) append "[exec] (${DEFAULT_BROWSERNAME}) {${DEFAULT_BROWSER}}" ;;
      konqueror) append "[exec] (konqueror) {kfmclient openProfile webbrowsing}" ;;
@@ -137,7 +123,7 @@
      MozillaFirebird) append "[exec] (firebird) {MozillaFirebird}" ;;
      MozillaFirefox) append "[exec] (firefox) {MozillaFirefox}" ;;
      *) append "[exec] ($DEFAULT_BROWSERNAME) {$DEFAULT_BROWSER}" ;;
-@@ -1485,7 +1494,8 @@
+@@ -1525,7 +1534,8 @@
      append_submenu "${BROWSERMENU}"
          normal_find firefox mozilla-firefox MozillaFirefox galeon mozilla dillo netscape vncviewer
          find_it links       append "[exec]   (links-graphic) {links -driver x ${HOMEPAGE}}"
diff --git a/x11-wm/fluxbox-devel/files/patch-util::startfluxbox.in b/x11-wm/fluxbox-devel/files/patch-util::startfluxbox.in
deleted file mode 100644
index 8f47a6c53473..000000000000
--- a/x11-wm/fluxbox-devel/files/patch-util::startfluxbox.in
+++ /dev/null
@@ -1,11 +0,0 @@
---- util/startfluxbox.in.orig	Fri May 13 23:14:41 2005
-+++ util/startfluxbox.in	Fri May 13 23:17:11 2005
-@@ -29,7 +29,7 @@
-     exec sh "$startup"
- else
-     if [ ! -d ~/.fluxbox ]; then
--	mkdir -p ~/.fluxbox/{backgrounds,styles,pixmaps}
-+	mkdir -p ~/.fluxbox/backgrounds ~/.fluxbox/styles ~/.fluxbox/pixmaps
-     fi
-     if [ ! -r "$startup" ]; then
-         ( cat << EOF
diff --git a/x11-wm/fluxbox-devel/pkg-plist b/x11-wm/fluxbox-devel/pkg-plist
index 685c39c6c547..ca96b8a8cbe4 100644
--- a/x11-wm/fluxbox-devel/pkg-plist
+++ b/x11-wm/fluxbox-devel/pkg-plist
@@ -7,7 +7,6 @@ bin/startfluxbox
 %%PORTDOCS%%%%DOCSDIR%%/AUTHORS
 %%PORTDOCS%%%%DOCSDIR%%/COPYING
 %%PORTDOCS%%%%DOCSDIR%%/ChangeLog
-%%PORTDOCS%%%%DOCSDIR%%/INSTALL
 %%PORTDOCS%%%%DOCSDIR%%/NEWS
 %%PORTDOCS%%%%DOCSDIR%%/README
 %%PORTDOCS%%%%DOCSDIR%%/TODO
@@ -82,7 +81,9 @@ bin/startfluxbox
 %%NLS:%%%%DATADIR%%/nls/ja_JP/fluxbox.cat
 %%NLS:%%%%DATADIR%%/nls/ko_KR/fluxbox.cat
 %%NLS:%%%%DATADIR%%/nls/lv_LV/fluxbox.cat
+%%NLS:%%%%DATADIR%%/nls/nb_NO/fluxbox.cat
 %%NLS:%%%%DATADIR%%/nls/nl_NL/fluxbox.cat
+%%NLS:%%%%DATADIR%%/nls/no_NO/fluxbox.cat
 %%NLS:%%%%DATADIR%%/nls/pl_PL/fluxbox.cat
 %%NLS:%%%%DATADIR%%/nls/pt_BR/fluxbox.cat
 %%NLS:%%%%DATADIR%%/nls/pt_PT/fluxbox.cat
@@ -92,6 +93,7 @@ bin/startfluxbox
 %%NLS:%%%%DATADIR%%/nls/tr_TR/fluxbox.cat
 %%NLS:%%%%DATADIR%%/nls/uk_UA/fluxbox.cat
 %%NLS:%%%%DATADIR%%/nls/vi_VN/fluxbox.cat
+%%NLS:%%%%DATADIR%%/nls/zh_CN/fluxbox.cat
 %%DATADIR%%/styles/Artwiz
 %%DATADIR%%/styles/BlueFlux/pixmaps/button_close_active.xpm
 %%DATADIR%%/styles/BlueFlux/pixmaps/button_close_pressed.xpm
@@ -158,6 +160,7 @@ bin/startfluxbox
 @dirrm %%DATADIR%%/styles/BlueFlux/pixmaps
 @dirrm %%DATADIR%%/styles/BlueFlux
 @dirrm %%DATADIR%%/styles
+%%NLS:%%@dirrm %%DATADIR%%/nls/zh_CN
 %%NLS:%%@dirrm %%DATADIR%%/nls/vi_VN
 %%NLS:%%@dirrm %%DATADIR%%/nls/uk_UA
 %%NLS:%%@dirrm %%DATADIR%%/nls/tr_TR
@@ -167,7 +170,9 @@ bin/startfluxbox
 %%NLS:%%@dirrm %%DATADIR%%/nls/pt_PT
 %%NLS:%%@dirrm %%DATADIR%%/nls/pt_BR
 %%NLS:%%@dirrm %%DATADIR%%/nls/pl_PL
+%%NLS:%%@dirrm %%DATADIR%%/nls/no_NO
 %%NLS:%%@dirrm %%DATADIR%%/nls/nl_NL
+%%NLS:%%@dirrm %%DATADIR%%/nls/nb_NO
 %%NLS:%%@dirrm %%DATADIR%%/nls/lv_LV
 %%NLS:%%@dirrm %%DATADIR%%/nls/ko_KR
 %%NLS:%%@dirrm %%DATADIR%%/nls/ja_JP