5 files changed, 7 insertions, 47 deletions

diff --git a/x11-wm/fluxbox/Makefile b/x11-wm/fluxbox/Makefile
index 0e0f93e4da87..1d63a3af66c2 100644
--- a/x11-wm/fluxbox/Makefile
+++ b/x11-wm/fluxbox/Makefile
@@ -6,8 +6,7 @@
 #
 
 PORTNAME=	fluxbox
-PORTVERSION=	0.1.6
-PORTREVISION=	1
+PORTVERSION=	0.1.7
 CATEGORIES=	x11-wm
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	${PORTNAME}
diff --git a/x11-wm/fluxbox/distinfo b/x11-wm/fluxbox/distinfo
index 345393154178..88989c8130d3 100644
--- a/x11-wm/fluxbox/distinfo
+++ b/x11-wm/fluxbox/distinfo
@@ -1 +1 @@
-MD5 (fluxbox-0.1.6.tar.gz) = 1969a8d6c1c33c6c2795f7593fb01ab3
+MD5 (fluxbox-0.1.7.tar.gz) = bb2c250128bbd1f33cbb5a1ca9e59615
diff --git a/x11-wm/fluxbox/files/patch-src::StringUtil.cc b/x11-wm/fluxbox/files/patch-src::StringUtil.cc
deleted file mode 100644
index f95273ad9cc9..000000000000
--- a/x11-wm/fluxbox/files/patch-src::StringUtil.cc
+++ /dev/null
@@ -1,11 +0,0 @@
---- src/StringUtil.cc.orig	Wed Jan  9 15:11:20 2002
-+++ src/StringUtil.cc	Wed Jan 30 06:54:54 2002
-@@ -67,7 +67,7 @@ char *StringUtil::expandFilename(const c
-   
- 	auto_ptr<char> retval( new char[strlen(filename)+strlen(getenv("HOME"))+2]);
-   if (filename[0]=='~') {
--    strcat(retval.get(), getenv("HOME"));
-+    strcpy(retval.get(), getenv("HOME"));
-     strcat(retval.get(), &filename[1]);
-   } else
-     return StringUtil::strdup(filename);	//return unmodified value
diff --git a/x11-wm/fluxbox/files/patch-src::Window.cc b/x11-wm/fluxbox/files/patch-src::Window.cc
deleted file mode 100644
index 10ca1f863d8f..000000000000
--- a/x11-wm/fluxbox/files/patch-src::Window.cc
+++ /dev/null
@@ -1,33 +0,0 @@
---- src/Window.cc.orig	Fri Jan 11 13:21:59 2002
-+++ src/Window.cc	Wed Jan 30 06:54:54 2002
-@@ -22,7 +22,7 @@
- // FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
- // DEALINGS IN THE SOFTWARE.
- 
--// $Id: Window.cc,v 1.18 2002/01/11 10:04:32 fluxgen Exp $
-+// $Id: Window.cc,v 1.19.2.1 2002/01/12 16:36:18 fluxgen Exp $
- 
- // stupid macros needed to access some functions in version 2 of the GNU C
- // library
-@@ -441,7 +441,9 @@ FluxboxWindow::FluxboxWindow(Window w, B
- 
- FluxboxWindow::~FluxboxWindow(void) {
- 	Fluxbox *fluxbox = Fluxbox::instance();
--	
-+	//TODO: Move this to Workspace::removeWindow
-+	if (client.transient_for)	
-+		fluxbox->setFocusedWindow(client.transient_for);	
- 	
- 	if (moving || resizing) {
- 		screen->hideGeometry();
-@@ -556,9 +558,7 @@ FluxboxWindow::~FluxboxWindow(void) {
- 		fluxbox->removeWindowSearch(client.window);
- 		screen->removeNetizen(client.window);
- 	}
--	//TODO: Move this to Workspace::removeWindow
--	if (client.transient_for)	
--		fluxbox->setFocusedWindow(client.transient_for);	
-+	
- 	#ifdef DEBUG	
- 	fprintf(stderr, "%s(%d): ~FluxboxWindow(this=%p) done\n", __FILE__, __LINE__, this);
- 	#endif
diff --git a/x11-wm/fluxbox/pkg-plist b/x11-wm/fluxbox/pkg-plist
index a51f42301a69..6efa8ca0b60c 100644
--- a/x11-wm/fluxbox/pkg-plist
+++ b/x11-wm/fluxbox/pkg-plist
@@ -10,7 +10,9 @@ 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/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
@@ -38,6 +40,7 @@ share/fluxbox/styles/qnx-photon
 share/fluxbox/titlebar
 @unexec rm %D/share/fluxbox/nls/fr
 @unexec rm %D/share/fluxbox/nls/es
+@unexec rm %D/share/fluxbox/nls/bg_BG
 @unexec rm %D/share/fluxbox/nls/en_US   
 @unexec rm %D/share/fluxbox/nls/en   
 @unexec rm %D/share/fluxbox/nls/US_ASCII   
@@ -51,9 +54,11 @@ share/fluxbox/titlebar
 @dirrm share/fluxbox/styles
 @dirrm share/fluxbox/nls/tr_TR
 @dirrm share/fluxbox/nls/sv_SE
+@dirrm share/fluxbox/nls/pt_PT
 @dirrm share/fluxbox/nls/ru_RU
 @dirrm share/fluxbox/nls/pt_BR
 @dirrm share/fluxbox/nls/it_IT
+@dirrm share/fluxbox/nls/ja_JP
 @dirrm share/fluxbox/nls/fr_FR
 @dirrm share/fluxbox/nls/et_EE
 @dirrm share/fluxbox/nls/es_ES