4 files changed, 152 insertions, 19 deletions

diff --git a/x11-wm/fluxbox-devel/Makefile b/x11-wm/fluxbox-devel/Makefile
index 02fb0b38a200..77ac203bfe19 100644
--- a/x11-wm/fluxbox-devel/Makefile
+++ b/x11-wm/fluxbox-devel/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	fluxbox
-PORTVERSION=	0.9.4
+PORTVERSION=	0.9.5
 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 2e0608261afb..d0859c60d5c6 100644
--- a/x11-wm/fluxbox-devel/distinfo
+++ b/x11-wm/fluxbox-devel/distinfo
@@ -1 +1 @@
-MD5 (fluxbox-0.9.4.tar.gz) = f13a28d594cb5cce899ea6628175bce1
+MD5 (fluxbox-0.9.5.tar.gz) = 5da272e1a6f53b9a406ccecd348c8871
diff --git a/x11-wm/fluxbox-devel/files/patch-src::RegExp.hh b/x11-wm/fluxbox-devel/files/patch-src::RegExp.hh
deleted file mode 100644
index ba53e9f742a3..000000000000
--- a/x11-wm/fluxbox-devel/files/patch-src::RegExp.hh
+++ /dev/null
@@ -1,12 +0,0 @@
---- src/RegExp.hh.orig	Thu Jul 10 23:39:07 2003
-+++ src/RegExp.hh	Thu Jul 10 23:39:17 2003
-@@ -39,8 +39,8 @@
-  */
- 
- #ifdef USE_REGEXP
--#include <regex.h>
- #include <sys/types.h>
-+#include <regex.h>
- #endif // USE_REGEXP
- 
- class WinClient;
diff --git a/x11-wm/fluxbox-devel/files/patch-util::fluxbox-generate_menu b/x11-wm/fluxbox-devel/files/patch-util::fluxbox-generate_menu
index 9839403a3450..e217c04102f4 100644
--- a/x11-wm/fluxbox-devel/files/patch-util::fluxbox-generate_menu
+++ b/x11-wm/fluxbox-devel/files/patch-util::fluxbox-generate_menu
@@ -1,11 +1,156 @@
---- util/fluxbox-generate_menu.orig	Thu Jul 10 23:22:00 2003
-+++ util/fluxbox-generate_menu	Thu Jul 10 23:22:19 2003
-@@ -876,7 +876,7 @@
+--- util/fluxbox-generate_menu.orig	Sun Aug 17 13:30:35 2003
++++ util/fluxbox-generate_menu	Fri Aug 29 10:54:16 2003
+@@ -22,7 +22,7 @@
+ # FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
+ # DEALINGS IN THE SOFTWARE.
+ #
+-# $Id: fluxbox-generate_menu,v 1.50 2003/08/17 13:30:35 fluxgen Exp $
++# $Id: fluxbox-generate_menu-devel,v 1.50 2003/08/17 13:30:35 fluxgen Exp $
+ 
+ #
+ # Portability notes:
+@@ -45,12 +45,12 @@
+ 
+ 
+ WHOAMI=`whoami`
+-[ "$WHOAMI" = root ] && PATH=/bin:/usr/bin/:/usr/local/bin:/usr/X11R6/bin
++[ "$WHOAMI" = root ] && PATH=/bin:/usr/bin/:/usr/local/bin:%%X11PREFIX%%/bin
+ 
+ # Functions
+ display_usage() {
+     cat << EOF
+-Usage: fluxbox-generate_menu [-kgrBh] [-t terminal] [-w url] [-b browser]
++Usage: fluxbox-generate_menu-devel [-kgrBh] [-t terminal] [-w url] [-b browser]
+          [-m menu-title] [-o /path] [-u /path] [-p /path] [-n /path] [-q /path]
+ EOF
+ }
+@@ -85,7 +85,7 @@
+ 
+ Files:
+     ~/.fluxbux/usermenu     your own submenu which will be included in the menu
+-    ~/.fluxbox/menuconfig   rc file for fluxbox-generate_menu
++    ~/.fluxbox/menuconfig   rc file for fluxbox-generate_menu-devel
+ 
+ EOF
+ }
+@@ -93,7 +93,7 @@
+ display_authors() {
+     cat << EOF
+ 
+-fluxbox-generate_menu was brought to you by:
++fluxbox-generate_menu-devel was brought to you by:
+ 
+     Henrik Kinnunen:    Project leader.
+     Han Boetes:         Packaging, debugging and scripts.
+@@ -554,7 +554,7 @@
+         if [ ! "$WHOAMI" = root ]; then # this is only for users.
+             if touch ${HOME}/.fluxbox/menuconfig; then
+                 cat << EOF > ${HOME}/.fluxbox/menuconfig
+-# This file is read by fluxbox-generate_menu.  If you don't like a
++# This file is read by fluxbox-generate_menu-devel.  If you don't like a
+ # default you can change it here.  Don't forget to remove the # in front
+ # of the line.
+ 
+@@ -567,7 +567,7 @@
+ # Name of the outputfile
+ # MENUFILENAME=${HOME}/.fluxbox/menu
+ 
+-# MENUTITLE=\`fluxbox -version|cut -d " " -f-2\`
++# MENUTITLE=\`fluxbox-devel -version|cut -d " " -f-2\`
+ 
+ # standard url for console-browsers
+ # HOMEPAGE=fluxbox.org
+@@ -588,7 +588,7 @@
+ 
+ 
+ # 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/:%%X11PREFIX%%/share/fluxbox/backgrounds/:/usr/share/wallpapers"
+ 
+ 
+ # --- Boolean variables.
+@@ -632,11 +632,11 @@
+        r) REMOVE=no ;;
+        h) display_help ; exit 0 ;;
+        a) display_authors ; exit 0 ;;
+-       -) echo "fluxbox-generate_menu doesn't recognize -- gnu-longopts."
+-          echo 'Use fluxbox-generate_menu -h for a long help message.'
++       -) echo "fluxbox-generate_menu-devel doesn't recognize -- gnu-longopts."
++          echo 'Use fluxbox-generate_menu-devel -h for a long help message.'
+           display_usage
+           exit 1 ;;
+-       *) echo 'Use fluxbox-generate_menu -h for a long help message.'
++       *) echo 'Use fluxbox-generate_menu-devel -h for a long help message.'
+           display_usage
+           exit 1 ;;
+    esac
+@@ -726,7 +726,7 @@
+ 
+ # Start of menu
+ cat << EOF > ${MENUFILENAME}
+-# Generated by fluxbox-generate_menu
++# Generated by fluxbox-generate_menu-devel
+ #
+ # If you read this it means you want to edit this file manually, so here
+ # are some useful tips:
+@@ -754,12 +754,12 @@
+     links|w3m|lynx)  append "[exec] (${DEFAULT_BROWSER}) {${DEFAULT_TERM} -e ${DEFAULT_BROWSER} ${HOMEPAGE}}" ;;
+     firebird|mozilla|phoenix|galeon|dillo|netscape) append "[exec] (${DEFAULT_BROWSER}) {${DEFAULT_BROWSER}}" ;;
+     konqueror) append "[exec] (konqueror) {kfmclient openProfile webbrowsing}" ;;
+-    opera) append "[exec] (opera) {env QT_XFT=true opera}" ;;
++    opera) append "[exec] (opera) {opera}" ;;
+     MozillaFirebird) append "[exec] (firebird) {MozillaFirebird}" ;;
+     *) append "[exec] (`basename $DEFAULT_BROWSER`) {$DEFAULT_BROWSER}" ;;
+ esac
+ 
+-find_it fbrun           append "[exec]   (Run) {fbrun}"
++find_it fbrun-devel           append "[exec]   (Run) {fbrun-devel}"
+ 
+ 
+ append_submenu "${TERMINALMENU}"
+@@ -770,7 +770,7 @@
+ append_submenu "${NETMENU}"
+     append_submenu "${BROWSERMENU}"
+         normal_find mozilla-firebird netscape galeon mozilla dillo
+-        find_it opera       append "[exec]   (opera) {env QT_XFT=true 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}}"
+@@ -779,7 +779,7 @@
+ 
+     append_submenu IM
+         normal_find gaim kopete gnomemeeting
+-        find_it licq        append "[exec]   (licq) {env QT_XFT=true licq}"
++        find_it licq        append "[exec]   (licq) {licq}"
+     append_menu_end
+ 
+     append_submenu Mail
+@@ -896,7 +896,7 @@
      append "[config] (${CONFIGUREMENU})"
  
      append_menu "[submenu] (${SYSTEMSTYLES}) {${STYLEMENUTITLE}}"
--        append "[stylesdir] (${PKGDATADIR}/fluxbox/styles)"
-+        append "[stylesdir] (${PKGDATADIR}/fluxbox-devel/styles)"
+-        append "[stylesdir] (${PREFIX}/share/fluxbox/styles)"
++        append "[stylesdir] (${PREFIX}/share/fluxbox-devel/styles)"
      append_menu_end
  
      append_menu "[submenu] (${USERSTYLES}) {${STYLEMENUTITLE}}"
+@@ -950,10 +950,10 @@
+             find_it xmessage append \
+               "[exec] (Windowname) {xprop WM_CLASS|cut -d \\\" -f 2|xmessage -file - -center}"
+         find_it import append "[exec] (screenshot) {import screenshot.png && qiv -W 50 screenshot.png}"
+-        find_it fbrun append "[exec] (Run) {fbrun}"
++        find_it fbrun-devel append "[exec] (Run) {fbrun-devel}"
+         find_it switch append "[exec] (gtk-theme-switch) {switch}"
+         find_it switch2 append "[exec] (gtk2-theme-switch) {switch2}"
+-        find_it fluxbox-generate_menu append "[exec] (regenerate menu) {fluxbox-generate_menu}"
++        find_it fluxbox-generate_menu-devel append "[exec] (regenerate menu) {fluxbox-generate_menu-devel}"
+     append_menu_end
+ 
+     append_submenu ${WINDOWMANAGERS}
+@@ -984,4 +984,4 @@
+ fi
+ 
+ echo 'Menu succesfully generated.'
+-echo 'Use fluxbox-generate_menu -h to read all about the latest features.'
++echo 'Use fluxbox-generate_menu-devel -h to read all about the latest features.'