Update to 0.9.13.

	Release note:	http://fluxbox.sourceforge.net/version-0.9.php
	ChangeLog:	http://fluxbox.sourceforge.net/changelog.php

8 files changed, 98 insertions, 78 deletions

diff --git a/x11-wm/fluxbox-devel/Makefile b/x11-wm/fluxbox-devel/Makefile
index 2fb237e94c90..c1f0e1f0a744 100644
--- a/x11-wm/fluxbox-devel/Makefile
+++ b/x11-wm/fluxbox-devel/Makefile
@@ -6,8 +6,7 @@
 #
 
 PORTNAME=	fluxbox
-PORTVERSION=	0.9.12
-PORTREVISION=	1
+PORTVERSION=	0.9.13
 CATEGORIES=	x11-wm
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	fluxbox
diff --git a/x11-wm/fluxbox-devel/distinfo b/x11-wm/fluxbox-devel/distinfo
index c738c7a70bbc..14dd4ee6dec7 100644
--- a/x11-wm/fluxbox-devel/distinfo
+++ b/x11-wm/fluxbox-devel/distinfo
@@ -1,6 +1,6 @@
-MD5 (fluxbox-0.9.12.tar.gz) = e4e6821d9e7a4b3f64c0d8069dbff8b8
-SIZE (fluxbox-0.9.12.tar.gz) = 871825
-MD5 (fb-doc-mfhtml.tgz) = e081dcea99483b538be9465cf3ab14c3
-SIZE (fb-doc-mfhtml.tgz) = 70736
-MD5 (fluxbook.pdf) = bcf3cb99a7d5b9ef16181d29d99a189b
-SIZE (fluxbook.pdf) = 211324
+MD5 (fluxbox-0.9.13.tar.gz) = aa0ad2392524242fdc25eca58c028553
+SIZE (fluxbox-0.9.13.tar.gz) = 899873
+MD5 (fb-doc-mfhtml.tgz) = e735785ae2ad8dd9e0120103960230a7
+SIZE (fb-doc-mfhtml.tgz) = 73481
+MD5 (fluxbook.pdf) = 70f361eab49f16a18a9b639426335e9a
+SIZE (fluxbook.pdf) = 304035
diff --git a/x11-wm/fluxbox-devel/files/patch-doc::Makefile.in b/x11-wm/fluxbox-devel/files/patch-doc::Makefile.in
index a30abf4a4a53..825a6aab749d 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 Dec  6 18:30:25 2004
-+++ doc/Makefile.in	Mon Dec  6 18:31:00 2004
-@@ -102,10 +102,10 @@
+--- doc/Makefile.in.orig	Fri May 13 23:11:38 2005
++++ doc/Makefile.in	Fri May 13 23:12:22 2005
+@@ -107,10 +107,10 @@
  SUBDIRS = ru
  CLEANFILES = fluxbox.1 fluxstyle.1
  MAINTAINERCLEANFILES = Makefile.in
diff --git a/x11-wm/fluxbox-devel/files/patch-src::FbTk::Timer.hh b/x11-wm/fluxbox-devel/files/patch-src::FbTk::Timer.hh
deleted file mode 100644
index 26528f3b1758..000000000000
--- a/x11-wm/fluxbox-devel/files/patch-src::FbTk::Timer.hh
+++ /dev/null
@@ -1,13 +0,0 @@
---- src/FbTk/Timer.hh.orig	Mon Jan 24 13:36:40 2005
-+++ src/FbTk/Timer.hh	Mon Jan 24 14:00:05 2005
-@@ -42,9 +42,9 @@
- #include <inttypes.h>
- #endif // HAVE_INTTYPES_H
- 
-+#include <sys/types.h>
- #include <sys/select.h>
- #include <sys/time.h>
--#include <sys/types.h>
- #include <unistd.h>
- 
- namespace FbTk {
diff --git a/x11-wm/fluxbox-devel/files/patch-util::Makefile.in b/x11-wm/fluxbox-devel/files/patch-util::Makefile.in
index 6710fdee19e8..764c45d4e45c 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 Dec  6 18:31:56 2004
-+++ util/Makefile.in	Mon Dec  6 18:32:21 2004
-@@ -101,7 +101,7 @@
+--- util/Makefile.in.orig	Fri May 13 23:13:27 2005
++++ util/Makefile.in	Fri May 13 23:14:06 2005
+@@ -106,7 +106,7 @@
  SUBDIRS = fbrun
  INCLUDES = -I$(top_srcdir)/src -I$(top_srcdir)/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/FbAtoms.o \
  			../src/FbTk/libFbTk.a
-@@ -115,7 +115,7 @@
+@@ -120,7 +120,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 b22759c2398f..01a188c3981b 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,35 +1,44 @@
---- util/fluxbox-generate_menu.in.orig	Mon Jan 17 19:06:02 2005
-+++ util/fluxbox-generate_menu.in	Mon Jan 17 19:19:37 2005
-@@ -45,7 +45,7 @@
+--- util/fluxbox-generate_menu.in.orig	Fri May 13 23:17:44 2005
++++ util/fluxbox-generate_menu.in	Fri May 13 23:53:48 2005
+@@ -47,7 +47,7 @@
  
  
  WHOAMI=`whoami`
--[ "$WHOAMI" = root ] && PATH=/bin:/usr/bin/:/usr/local/bin:/usr/X11R6/bin
-+[ "$WHOAMI" = root ] && PATH=/bin:/usr/bin/:%%LOCALBASE%%/bin:%%X11BASE%%/bin
+-[ "$WHOAMI" = root ] && PATH=/bin:/usr/bin:/usr/local/bin:/usr/X11R6/bin
++[ "$WHOAMI" = root ] && PATH=/bin:/usr/bin:%%LOCALBASE%%/bin:%%X11BASE%%/bin
  
  # Check for Imlib2-support
- if ( fluxbox -info 2> /dev/null | grep -- -IMLIB ); then
-@@ -85,8 +85,8 @@
- 
+ if fluxbox -info 2> /dev/null | grep -q "^IMLIB"; then
+@@ -97,7 +97,7 @@
    Only for packagers:
  
--    -p  prefix; default is /usr/local
+     -p  prefix; default is @PREFIX@
 -    -n  Gnome-prefix; /opt, /usr, /usr/X11R6 and /usr/local autodetected
-+    -p  prefix; default is @PREFIX@
 +    -n  Gnome-prefix; %%X11BASE%%, %%LOCALBASE%% and /opt autodetected
      -q  KDE-prefix; idem dito
  
  
-@@ -116,7 +116,7 @@
- case `uname` in
-     Linux|*BSD)
-         find_it() {
--            which $1 > /dev/null 2>&1 && shift && $*
-+            which $1 > /dev/null 2>&1 && shift && "$@"
-         }
- 
-         find_it_options() {
-@@ -825,19 +825,19 @@
+@@ -152,7 +152,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() {
+@@ -284,7 +284,9 @@
+     # echo -n "for $temp_icon"
+     eval doSearchLoop $USER_ICONPATHS \
+       "$FB_ICONDIR" \
+-      "/usr/share/${execname%% *}" \
++      "%%LOCALBASE%%/share/${execname%% *}" \
++      "%%X11BASE%%/share/${execname%% *}" \
++      "%%X11BASE%%/share/gnome/${execname%% *}" \
+       ${OTHER_ICONPATHS} \
+ 
+ 
+@@ -1164,19 +1166,19 @@
  # FBRUNOPTIONS='-font 10x20 -fg grey -bg black -title run'
  
  # --- PREFIX'es
@@ -42,21 +51,47 @@
 +# fluxbox-generate already looks in %%LOCALBASE%%, %%X11BASE%% and /opt so
  # there should be no need to specify them.
  #
--# PREFIX=/usr
+ # PREFIX=@PREFIX@
 -# GNOME_PREFIX=/opt/gnome
 -# KDE_PREFIX=/opt/kde
-+# PREFIX=@PREFIX@
 +# GNOME_PREFIX=%%X11BASE%%
 +# KDE_PREFIX=%%LOCALBASE%%
  
  
  # Sepparate the list of background-dirs with semicolumns ':'
--# BACKGROUND_DIRS="${HOME}/.fluxbox/backgrounds/:/usr/local/share/fluxbox/backgrounds/:/usr/share/wallpapers"
+-# BACKGROUND_DIRS="${HOME}/.fluxbox/backgrounds/:@PREFIX@/share/fluxbox/backgrounds/:/usr/share/wallpapers"
 +# BACKGROUND_DIRS="${HOME}/.fluxbox/backgrounds/:@PREFIX@/share/fluxbox/backgrounds/:%%X11BASE%%/share/wallpapers"
  
  
  # --- Boolean variables.
-@@ -962,7 +962,7 @@
+@@ -1244,16 +1246,22 @@
+         -g) GNOMEMENU=yes; shift;;
+         -in) NO_ICON=yes; shift;;
+         -is) OTHER_ICONPATHS="
++                %%LOCALBASE%%/share/icons
++                %%LOCALBASE%%/share/pixmaps
++                %%X11BASE%%/share/icons
++                %%X11BASE%%/share/pixmaps
++                %%X11BASE%%/share/gnome/icons
++                %%X11BASE%%/share/gnome/pixmaps
+                 /usr{,/local}/share{,/xclass}/{icons,pixmaps}
+                 /usr{,/local}/share/icons/mini
+                 /usr{,/local}/{,X11R6/}share/icons/{default.kde,hicolor}/16x16/*
+             "
+             shift;;
+         -ds) OTHER_DESKTOP_PATHS="
+-                /usr/share/mimelnk 
+-                /usr/share/applications
+-                /usr/share/xsessions 
+-                /usr/share/services 
++                %%LOCALBASE%%/share/applications
++                %%X11BASE%%/share/applications
++                %%X11BASE%%/share/gnome/applications
++                %%X11BASE%%/share/gnome/xsessions
+             "
+             # /usr/share/apps \
+             shift;;
+@@ -1328,7 +1336,7 @@
  
  
  # gnome prefix
@@ -65,7 +100,7 @@
      if [ -n "${GNOME_PREFIX}" -a -d "$GNOME_PREFIX/share/gnome" ]; then
          break;
      fi
-@@ -970,7 +970,7 @@
+@@ -1336,7 +1344,7 @@
  # Will remain $PREFIX if all else fails
  
  # kde prefix
@@ -74,7 +109,7 @@
      if [ -n "${KDE_PREFIX}" -a -d "$KDE_PREFIX/share/applnk" ]; then
          break;
      fi
-@@ -1015,7 +1015,7 @@
+@@ -1424,7 +1432,7 @@
  else
      [ -n "$MY_BROWSER" ] && echo "Warning: you chose an invalid browser." >&2
      #The precise order is up for debate.
@@ -83,7 +118,7 @@
          if find_it $browser; then
              DEFAULT_BROWSER=$browser
              break
-@@ -1055,7 +1055,8 @@
+@@ -1464,7 +1472,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}" ;;
@@ -93,9 +128,9 @@
      MozillaFirebird) append "[exec] (firebird) {MozillaFirebird}" ;;
      MozillaFirefox) append "[exec] (firefox) {MozillaFirefox}" ;;
      *) append "[exec] ($DEFAULT_BROWSERNAME) {$DEFAULT_BROWSER}" ;;
-@@ -1073,7 +1074,8 @@
+@@ -1482,7 +1491,8 @@
      append_submenu "${BROWSERMENU}"
-         normal_find firefox mozilla-firefox MozillaFirefox galeon mozilla dillo netscape
+         normal_find firefox mozilla-firefox MozillaFirefox galeon mozilla dillo netscape vncviewer
          find_it links       append "[exec]   (links-graphic) {links -driver x ${HOMEPAGE}}"
 -        find_it opera       append "[exec]   (opera) {env QT_XFT=true opera}"
 +        find_it linux-opera append "[exec]   (linux-opera) {linux-opera}"
@@ -103,11 +138,12 @@
          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}}"
-@@ -1241,7 +1243,6 @@
+@@ -1562,7 +1572,7 @@
+ 
  
-     append_menu "[submenu] (${SYSTEMSTYLES}) {${STYLEMENUTITLE}}"
-         append "[stylesdir] (${PREFIX}/share/fluxbox/styles)"
--        append "[stylesdir] (/usr/share/commonbox/styles/)"
-     append_menu_end
+        append_submenu "${VIDEOMENU}"
+-           normal_find xine aviplay gtv gmplayer xmovie xcdroast xgdb realplay xawtv fxtv ogle goggles
++           normal_find xine aviplay gtv gmplayer vlc xmovie xcdroast xgdb realplay xawtv fxtv ogle goggles
+            find_it dvdrip append "[exec] (dvdrip) {nohup dvdrip}"
+        append_menu_end
  
-     append_menu "[submenu] (${USERSTYLES}) {${STYLEMENUTITLE}}"
diff --git a/x11-wm/fluxbox-devel/files/patch-util::startfluxbox.in b/x11-wm/fluxbox-devel/files/patch-util::startfluxbox.in
index e01409345937..8f47a6c53473 100644
--- a/x11-wm/fluxbox-devel/files/patch-util::startfluxbox.in
+++ b/x11-wm/fluxbox-devel/files/patch-util::startfluxbox.in
@@ -1,20 +1,11 @@
---- util/startfluxbox.in	Sat Dec  6 18:29:21 2003
-+++ util/startfluxbox.in	Sun Mar 14 11:52:50 2004
-@@ -6,7 +6,7 @@
-     exec sh ~/.fluxbox/startup
+--- 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 ~/.fluxbox/startup ]; then
-         cat << EOF > ~/.fluxbox/startup
-@@ -24,7 +24,7 @@
- @pkgbindir@/bsetroot -solid black
- 
- # This shows the fluxbox-splash-screen
--# fbsetbg -C /usr/share/fluxbox/splash.jpg
-+# fbsetbg -C @pkgdatadir@/splash.jpg
- 
- # Other examples. Check man xset for details.
- #
+     if [ ! -r "$startup" ]; then
+         ( cat << EOF
diff --git a/x11-wm/fluxbox-devel/pkg-plist b/x11-wm/fluxbox-devel/pkg-plist
index 3e16b9a39004..da60e84ce977 100644
--- a/x11-wm/fluxbox-devel/pkg-plist
+++ b/x11-wm/fluxbox-devel/pkg-plist
@@ -22,6 +22,7 @@ bin/startfluxbox
 %%DOCHTML:%%%%DOCSDIR%%/html/c289.html
 %%DOCHTML:%%%%DOCSDIR%%/html/c722.html
 %%DOCHTML:%%%%DOCSDIR%%/html/c724.html
+%%DOCHTML:%%%%DOCSDIR%%/html/c728.html
 %%DOCHTML:%%%%DOCSDIR%%/html/c740.html
 %%DOCHTML:%%%%DOCSDIR%%/html/c98.html
 %%DOCHTML:%%%%DOCSDIR%%/html/chap-bg.html
@@ -46,11 +47,14 @@ bin/startfluxbox
 %%DOCHTML:%%%%DOCSDIR%%/html/x233.html
 %%DOCHTML:%%%%DOCSDIR%%/html/x315.html
 %%DOCHTML:%%%%DOCSDIR%%/html/x317.html
+%%DOCHTML:%%%%DOCSDIR%%/html/x321.html
 %%DOCHTML:%%%%DOCSDIR%%/html/x346.html
 %%DOCHTML:%%%%DOCSDIR%%/html/x348.html
+%%DOCHTML:%%%%DOCSDIR%%/html/x352.html
 %%DOCHTML:%%%%DOCSDIR%%/html/x47.html
 %%DOCHTML:%%%%DOCSDIR%%/html/x739.html
 %%DOCHTML:%%%%DOCSDIR%%/html/x741.html
+%%DOCHTML:%%%%DOCSDIR%%/html/x745.html
 %%DOCHTML:%%%%DOCSDIR%%/html/x757.html
 %%DOCHTML:%%%%DOCSDIR%%/html/x795.html
 %%DOCHTML:%%%%DOCSDIR%%/html/x812.html
@@ -58,12 +62,14 @@ bin/startfluxbox
 %%DOCHTML:%%%%DOCSDIR%%/html/x814.html
 %%DOCHTML:%%%%DOCSDIR%%/html/x817.html
 %%DOCHTML:%%%%DOCSDIR%%/html/x820.html
+%%DOCHTML:%%%%DOCSDIR%%/html/x824.html
 %%DOCPDF:%%%%DOCSDIR%%/pdf/fluxbook.pdf
 %%DATADIR%%/init
 %%DATADIR%%/keys
 %%DATADIR%%/menu
 %%NLS:%%%%DATADIR%%/nls/C/fluxbox.cat
 %%NLS:%%%%DATADIR%%/nls/bg_BG/fluxbox.cat
+%%NLS:%%%%DATADIR%%/nls/cs_CZ/fluxbox.cat
 %%NLS:%%%%DATADIR%%/nls/da_DK/fluxbox.cat
 %%NLS:%%%%DATADIR%%/nls/de_DE/fluxbox.cat
 %%NLS:%%%%DATADIR%%/nls/es_ES/fluxbox.cat
@@ -166,6 +172,7 @@ bin/startfluxbox
 %%NLS:%%@dirrm %%DATADIR%%/nls/es_ES
 %%NLS:%%@dirrm %%DATADIR%%/nls/de_DE
 %%NLS:%%@dirrm %%DATADIR%%/nls/da_DK
+%%NLS:%%@dirrm %%DATADIR%%/nls/cs_CZ
 %%NLS:%%@dirrm %%DATADIR%%/nls/bg_BG
 %%NLS:%%@dirrm %%DATADIR%%/nls/C
 %%NLS:%%@dirrm %%DATADIR%%/nls