10 files changed, 58 insertions, 150 deletions

diff --git a/x11-wm/fluxbox-devel/Makefile b/x11-wm/fluxbox-devel/Makefile
index 0fc43c1e26a1..14972c4406bb 100644
--- a/x11-wm/fluxbox-devel/Makefile
+++ b/x11-wm/fluxbox-devel/Makefile
@@ -6,17 +6,15 @@
 #
 
 PORTNAME=	fluxbox
-PORTVERSION=	0.1.13
-PORTREVISION=	2
+PORTVERSION=	0.1.14
 CATEGORIES=	x11-wm
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	${PORTNAME}
 
-PATCH_SITES=	http://www.cse.unsw.edu.au/~simonb/
-PATCH_DIST_STRIP=	-p1
-PATCHFILES=	fluxbox.openoffice.patch fluxbox-0.1.13.aa2.patch
 .if defined(WITH_REMEMBER)
-PATCHFILES+=	fluxbox-remember-patch-0.1.13.gz
+PATCH_SITES=    http://www.bugfactory.org/~gav/fluxbox/
+PATCH_DIST_STRIP=   -p1
+PATCHFILES+=	remember-0.1.14.gz
 .endif
 
 MAINTAINER=	hendrik@scholz.net
@@ -34,7 +32,7 @@ USE_GNOMENG=	yes
 WANT_GNOME=	yes
 .if defined(WITH_REMEMBER)
 USE_GMAKE=	yes
-CONFIGURE_ENV=	AUTOMAKE="${AUTOMAKE}"
+CONFIGURE_ENV=	AUTOMAKE=automake14
 .endif
 CONFIGURE_ARGS=	--disable-newwmspec
 .if defined(WITH_KDE) || defined(PACKAGE_BUILDING)
diff --git a/x11-wm/fluxbox-devel/distinfo b/x11-wm/fluxbox-devel/distinfo
index 315f3f6dc350..73b71bc87e5e 100644
--- a/x11-wm/fluxbox-devel/distinfo
+++ b/x11-wm/fluxbox-devel/distinfo
@@ -1,4 +1,2 @@
-MD5 (fluxbox-0.1.13.tar.gz) = 1b6eec68ae437f3f7084cc19ed7e1083
-MD5 (fluxbox.openoffice.patch) = 5f1cedd6893799695fbbc3a19f5c5cff
-MD5 (fluxbox-0.1.13.aa2.patch) = a983e268749bf143cd500690878def80
-MD5 (fluxbox-remember-patch-0.1.13.gz) = 40ac61743c6535488e3526247b66af63
+MD5 (fluxbox-0.1.14.tar.gz) = f097b97127461fa3f6f4af4048c75cfc
+MD5 (remember-0.1.14.gz) = 205e45a85954645768a18fb9b449cac9
diff --git a/x11-wm/fluxbox-devel/files/patch-configure b/x11-wm/fluxbox-devel/files/patch-configure
deleted file mode 100644
index 3ff4889a952e..000000000000
--- a/x11-wm/fluxbox-devel/files/patch-configure
+++ /dev/null
@@ -1,37 +0,0 @@
---- configure.orig	Mon Nov 18 06:03:16 2002
-+++ configure	Thu Nov 21 22:33:40 2002
-@@ -5515,11 +5515,10 @@
-   if test x$enableval = "xyes"; then
-     echo "$as_me:$LINENO: result: yes" >&5
- echo "${ECHO_T}yes" >&6
--
-+  NLS="-DNLS"
- cat >>confdefs.h <<\_ACEOF
- #define NLS 1
- _ACEOF
--
-   else
-     echo "$as_me:$LINENO: result: no" >&5
- echo "${ECHO_T}no" >&6
-@@ -5527,12 +5526,10 @@
- else
-   echo "$as_me:$LINENO: result: yes" >&5
- echo "${ECHO_T}yes" >&6
--
-+  NLS="-DNLS"
- cat >>confdefs.h <<\_ACEOF
- #define NLS 1
- _ACEOF
--
--
- fi;
- 
- echo "$as_me:$LINENO: checking for setlocale in -lxpg4" >&5
-@@ -6901,6 +6898,7 @@
- s,@MULTIBYTE_TRUE@,$MULTIBYTE_TRUE,;t t
- s,@MULTIBYTE_FALSE@,$MULTIBYTE_FALSE,;t t
- s,@XINERAMA@,$XINERAMA,;t t
-+s,@NLS@,$NLS,;t t
- CEOF
- 
- _ACEOF
diff --git a/x11-wm/fluxbox-devel/files/patch-util::Makefile.in b/x11-wm/fluxbox-devel/files/patch-util::Makefile.in
index 6c345e4ced0d..a9191b2e5ca9 100644
--- a/x11-wm/fluxbox-devel/files/patch-util::Makefile.in
+++ b/x11-wm/fluxbox-devel/files/patch-util::Makefile.in
@@ -1,27 +1,22 @@
---- util/Makefile.in.orig	Mon Nov 18 06:03:43 2002
-+++ util/Makefile.in	Thu Nov 21 23:05:33 2002
-@@ -81,20 +81,20 @@
- regex_cmd = @regex_cmd@
+--- util/Makefile.in.orig	Tue Dec 10 11:33:13 2002
++++ util/Makefile.in	Tue Dec 10 11:33:30 2002
+@@ -94,8 +94,8 @@
  
  SUBDIRS = fbrun
+ INCLUDES = -I../src/FbTk/
 -bin_SCRIPTS = bsetbg fluxbox-generate_menu
 -bin_PROGRAMS = bsetroot
 +bin_SCRIPTS = fluxbox-generate_menu
-+bin_PROGRAMS = 
++bin_PROGRAMS =
  bsetroot_SOURCES = bsetroot.cc bsetroot.hh
  bsetroot_LDADD = ../src/BaseDisplay.o ../src/Timer.o ../src/Image.o ../src/i18n.o ../src/FbAtoms.o \
- 	../src/Color.o ../src/Texture.o ../src/StringUtil.o
- 
- 
- MAINTAINERCLEANFILES = Makefile.in
--EXTRA_DIST = bsetbg fluxbox-generate_menu
-+EXTRA_DIST = fluxbox-generate_menu
- subdir = util
+ 	../src/StringUtil.o ../src/FbTk/libFbTk.a
+@@ -107,7 +107,7 @@
  mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
  CONFIG_HEADER = $(top_builddir)/config.h
  CONFIG_CLEAN_FILES =
 -bin_PROGRAMS = bsetroot$(EXEEXT)
-+bin_PROGRAMS = 
++bin_PROGRAMS =
  PROGRAMS = $(bin_PROGRAMS)
  
  am_bsetroot_OBJECTS = bsetroot.$(OBJEXT)
diff --git a/x11-wm/fluxbox-devel/pkg-plist b/x11-wm/fluxbox-devel/pkg-plist
index d8df8902b82d..9db07952e95d 100644
--- a/x11-wm/fluxbox-devel/pkg-plist
+++ b/x11-wm/fluxbox-devel/pkg-plist
@@ -4,20 +4,20 @@ bin/fluxbox-generate_menu
 share/fluxbox/init
 share/fluxbox/keys
 share/fluxbox/menu
-share/fluxbox/nls/C/blackbox.cat
-share/fluxbox/nls/bg_BG/blackbox.cat
-share/fluxbox/nls/da_DK/blackbox.cat
-share/fluxbox/nls/es_ES/blackbox.cat
-share/fluxbox/nls/et_EE/blackbox.cat
-share/fluxbox/nls/fr_FR/blackbox.cat
-share/fluxbox/nls/it_IT/blackbox.cat
-share/fluxbox/nls/ja_JP/blackbox.cat
-share/fluxbox/nls/lv_LV/blackbox.cat
-share/fluxbox/nls/pt_BR/blackbox.cat
-share/fluxbox/nls/pt_PT/blackbox.cat
-share/fluxbox/nls/ru_RU/blackbox.cat
-share/fluxbox/nls/sv_SE/blackbox.cat
-share/fluxbox/nls/tr_TR/blackbox.cat
+share/fluxbox/nls/C/fluxbox.cat
+share/fluxbox/nls/bg_BG/fluxbox.cat
+share/fluxbox/nls/da_DK/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/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
 share/fluxbox/styles/Artwiz
 share/fluxbox/styles/Blue
 share/fluxbox/styles/BlueNight
diff --git a/x11-wm/fluxbox/Makefile b/x11-wm/fluxbox/Makefile
index 0fc43c1e26a1..14972c4406bb 100644
--- a/x11-wm/fluxbox/Makefile
+++ b/x11-wm/fluxbox/Makefile
@@ -6,17 +6,15 @@
 #
 
 PORTNAME=	fluxbox
-PORTVERSION=	0.1.13
-PORTREVISION=	2
+PORTVERSION=	0.1.14
 CATEGORIES=	x11-wm
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	${PORTNAME}
 
-PATCH_SITES=	http://www.cse.unsw.edu.au/~simonb/
-PATCH_DIST_STRIP=	-p1
-PATCHFILES=	fluxbox.openoffice.patch fluxbox-0.1.13.aa2.patch
 .if defined(WITH_REMEMBER)
-PATCHFILES+=	fluxbox-remember-patch-0.1.13.gz
+PATCH_SITES=    http://www.bugfactory.org/~gav/fluxbox/
+PATCH_DIST_STRIP=   -p1
+PATCHFILES+=	remember-0.1.14.gz
 .endif
 
 MAINTAINER=	hendrik@scholz.net
@@ -34,7 +32,7 @@ USE_GNOMENG=	yes
 WANT_GNOME=	yes
 .if defined(WITH_REMEMBER)
 USE_GMAKE=	yes
-CONFIGURE_ENV=	AUTOMAKE="${AUTOMAKE}"
+CONFIGURE_ENV=	AUTOMAKE=automake14
 .endif
 CONFIGURE_ARGS=	--disable-newwmspec
 .if defined(WITH_KDE) || defined(PACKAGE_BUILDING)
diff --git a/x11-wm/fluxbox/distinfo b/x11-wm/fluxbox/distinfo
index 315f3f6dc350..73b71bc87e5e 100644
--- a/x11-wm/fluxbox/distinfo
+++ b/x11-wm/fluxbox/distinfo
@@ -1,4 +1,2 @@
-MD5 (fluxbox-0.1.13.tar.gz) = 1b6eec68ae437f3f7084cc19ed7e1083
-MD5 (fluxbox.openoffice.patch) = 5f1cedd6893799695fbbc3a19f5c5cff
-MD5 (fluxbox-0.1.13.aa2.patch) = a983e268749bf143cd500690878def80
-MD5 (fluxbox-remember-patch-0.1.13.gz) = 40ac61743c6535488e3526247b66af63
+MD5 (fluxbox-0.1.14.tar.gz) = f097b97127461fa3f6f4af4048c75cfc
+MD5 (remember-0.1.14.gz) = 205e45a85954645768a18fb9b449cac9
diff --git a/x11-wm/fluxbox/files/patch-configure b/x11-wm/fluxbox/files/patch-configure
deleted file mode 100644
index 3ff4889a952e..000000000000
--- a/x11-wm/fluxbox/files/patch-configure
+++ /dev/null
@@ -1,37 +0,0 @@
---- configure.orig	Mon Nov 18 06:03:16 2002
-+++ configure	Thu Nov 21 22:33:40 2002
-@@ -5515,11 +5515,10 @@
-   if test x$enableval = "xyes"; then
-     echo "$as_me:$LINENO: result: yes" >&5
- echo "${ECHO_T}yes" >&6
--
-+  NLS="-DNLS"
- cat >>confdefs.h <<\_ACEOF
- #define NLS 1
- _ACEOF
--
-   else
-     echo "$as_me:$LINENO: result: no" >&5
- echo "${ECHO_T}no" >&6
-@@ -5527,12 +5526,10 @@
- else
-   echo "$as_me:$LINENO: result: yes" >&5
- echo "${ECHO_T}yes" >&6
--
-+  NLS="-DNLS"
- cat >>confdefs.h <<\_ACEOF
- #define NLS 1
- _ACEOF
--
--
- fi;
- 
- echo "$as_me:$LINENO: checking for setlocale in -lxpg4" >&5
-@@ -6901,6 +6898,7 @@
- s,@MULTIBYTE_TRUE@,$MULTIBYTE_TRUE,;t t
- s,@MULTIBYTE_FALSE@,$MULTIBYTE_FALSE,;t t
- s,@XINERAMA@,$XINERAMA,;t t
-+s,@NLS@,$NLS,;t t
- CEOF
- 
- _ACEOF
diff --git a/x11-wm/fluxbox/files/patch-util::Makefile.in b/x11-wm/fluxbox/files/patch-util::Makefile.in
index 6c345e4ced0d..a9191b2e5ca9 100644
--- a/x11-wm/fluxbox/files/patch-util::Makefile.in
+++ b/x11-wm/fluxbox/files/patch-util::Makefile.in
@@ -1,27 +1,22 @@
---- util/Makefile.in.orig	Mon Nov 18 06:03:43 2002
-+++ util/Makefile.in	Thu Nov 21 23:05:33 2002
-@@ -81,20 +81,20 @@
- regex_cmd = @regex_cmd@
+--- util/Makefile.in.orig	Tue Dec 10 11:33:13 2002
++++ util/Makefile.in	Tue Dec 10 11:33:30 2002
+@@ -94,8 +94,8 @@
  
  SUBDIRS = fbrun
+ INCLUDES = -I../src/FbTk/
 -bin_SCRIPTS = bsetbg fluxbox-generate_menu
 -bin_PROGRAMS = bsetroot
 +bin_SCRIPTS = fluxbox-generate_menu
-+bin_PROGRAMS = 
++bin_PROGRAMS =
  bsetroot_SOURCES = bsetroot.cc bsetroot.hh
  bsetroot_LDADD = ../src/BaseDisplay.o ../src/Timer.o ../src/Image.o ../src/i18n.o ../src/FbAtoms.o \
- 	../src/Color.o ../src/Texture.o ../src/StringUtil.o
- 
- 
- MAINTAINERCLEANFILES = Makefile.in
--EXTRA_DIST = bsetbg fluxbox-generate_menu
-+EXTRA_DIST = fluxbox-generate_menu
- subdir = util
+ 	../src/StringUtil.o ../src/FbTk/libFbTk.a
+@@ -107,7 +107,7 @@
  mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
  CONFIG_HEADER = $(top_builddir)/config.h
  CONFIG_CLEAN_FILES =
 -bin_PROGRAMS = bsetroot$(EXEEXT)
-+bin_PROGRAMS = 
++bin_PROGRAMS =
  PROGRAMS = $(bin_PROGRAMS)
  
  am_bsetroot_OBJECTS = bsetroot.$(OBJEXT)
diff --git a/x11-wm/fluxbox/pkg-plist b/x11-wm/fluxbox/pkg-plist
index d8df8902b82d..9db07952e95d 100644
--- a/x11-wm/fluxbox/pkg-plist
+++ b/x11-wm/fluxbox/pkg-plist
@@ -4,20 +4,20 @@ bin/fluxbox-generate_menu
 share/fluxbox/init
 share/fluxbox/keys
 share/fluxbox/menu
-share/fluxbox/nls/C/blackbox.cat
-share/fluxbox/nls/bg_BG/blackbox.cat
-share/fluxbox/nls/da_DK/blackbox.cat
-share/fluxbox/nls/es_ES/blackbox.cat
-share/fluxbox/nls/et_EE/blackbox.cat
-share/fluxbox/nls/fr_FR/blackbox.cat
-share/fluxbox/nls/it_IT/blackbox.cat
-share/fluxbox/nls/ja_JP/blackbox.cat
-share/fluxbox/nls/lv_LV/blackbox.cat
-share/fluxbox/nls/pt_BR/blackbox.cat
-share/fluxbox/nls/pt_PT/blackbox.cat
-share/fluxbox/nls/ru_RU/blackbox.cat
-share/fluxbox/nls/sv_SE/blackbox.cat
-share/fluxbox/nls/tr_TR/blackbox.cat
+share/fluxbox/nls/C/fluxbox.cat
+share/fluxbox/nls/bg_BG/fluxbox.cat
+share/fluxbox/nls/da_DK/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/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
 share/fluxbox/styles/Artwiz
 share/fluxbox/styles/Blue
 share/fluxbox/styles/BlueNight