5 files changed, 44 insertions, 22 deletions

diff --git a/x11-wm/blackbox/Makefile b/x11-wm/blackbox/Makefile
index e6001baa96c3..60fee03775a9 100644
--- a/x11-wm/blackbox/Makefile
+++ b/x11-wm/blackbox/Makefile
@@ -6,20 +6,24 @@
 #
 
 PORTNAME=	blackbox
-PORTVERSION=	0.62.1
+PORTVERSION=	0.65.0
 CATEGORIES=	x11-wm
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	blackboxwm
 
 MAINTAINER=	stijn@win.tue.nl
 
-MAN1=		blackbox.1 bsetroot.1
+RUN_DEPENDS=	bsetbg:${PORTSDIR}/x11-wm/boxtools
+
+MAN1=		blackbox.1
 
 USE_X_PREFIX=	yes
 GNU_CONFIGURE=	yes
+USE_REINPLACE=	yes
 
 pre-patch:
-	@${PERL} -ni.orig -e '/^SUBDIRS/ || print' \
-		${WRKSRC}/doc/Makefile.in
+	${REINPLACE_CMD} -e 's#nls src util#nls src#' ${WRKSRC}/Makefile.in
+	${REINPLACE_CMD} -E 's/^SUBDIRS/#SUBDIRS/' ${WRKSRC}/doc/Makefile.in
+	${REINPLACE_CMD} -e 's# bsetroot.1 bsetbg.1##' ${WRKSRC}/doc/Makefile.in
 
 .include <bsd.port.mk>
diff --git a/x11-wm/blackbox/distinfo b/x11-wm/blackbox/distinfo
index 24471404a58a..c6775c2f131d 100644
--- a/x11-wm/blackbox/distinfo
+++ b/x11-wm/blackbox/distinfo
@@ -1 +1 @@
-MD5 (blackbox-0.62.1.tar.gz) = a188b0bb144eb239bac98e781f1611d9
+MD5 (blackbox-0.65.0.tar.gz) = 08560fa287c68d65fbe894696d04deaf
diff --git a/x11-wm/blackbox/files/patch-src::Screen.cc b/x11-wm/blackbox/files/patch-src::Screen.cc
new file mode 100644
index 000000000000..d92e9d3ab10f
--- /dev/null
+++ b/x11-wm/blackbox/files/patch-src::Screen.cc
@@ -0,0 +1,11 @@
+--- src/Screen.cc.orig	Wed Sep  4 19:15:58 2002
++++ src/Screen.cc	Thu Sep 19 09:12:24 2002
+@@ -1120,7 +1120,7 @@
+       focused->getScreen()->getScreenNumber() == getScreenNumber() &&
+       current_workspace->getCount() > 1) {
+     do {
+-      next = current_workspace->getNextWindowInList(next);
++      next = current_workspace->getPrevWindowInList(next);
+     } while(next != focused && ! next->setInputFocus());
+ 
+     if (next != focused)
diff --git a/x11-wm/blackbox/files/patch-util::bsetbg b/x11-wm/blackbox/files/patch-util::bsetbg
deleted file mode 100644
index a7183a26b232..000000000000
--- a/x11-wm/blackbox/files/patch-util::bsetbg
+++ /dev/null
@@ -1,11 +0,0 @@
---- util/bsetbg.orig	Mon Jan 28 16:53:53 2002
-+++ util/bsetbg	Mon Jan 28 16:54:10 2002
-@@ -602,7 +602,7 @@
- VERSION=1.12
- MORE="(C) 2000 by lordzork industries (http://lordzork.com/)"
- PATH=$PATH:/usr/bin:/usr/local/bin:/usr/X11R6/bin:/usr/X11/bin
--TMPFILE=`tempfile --prefix=bsetbg`
-+TMPFILE=`mktemp -t bsetbg`
- ARGUMENT=$1
- 
- 
diff --git a/x11-wm/blackbox/pkg-plist b/x11-wm/blackbox/pkg-plist
index 44d310271383..ff7978c8cf67 100644
--- a/x11-wm/blackbox/pkg-plist
+++ b/x11-wm/blackbox/pkg-plist
@@ -1,22 +1,28 @@
 bin/blackbox
-bin/bsetroot
-bin/bsetbg
 share/blackbox/menu
 share/blackbox/nls/C/blackbox.cat
 share/blackbox/nls/da_DK/blackbox.cat
 share/blackbox/nls/de_DE/blackbox.cat
+share/blackbox/nls/es_AR/blackbox.cat
 share/blackbox/nls/es_ES/blackbox.cat
-share/blackbox/nls/et_EE/blackbox.cat
 share/blackbox/nls/fr_FR/blackbox.cat
+share/blackbox/nls/hu_HU/blackbox.cat
 share/blackbox/nls/it_IT/blackbox.cat
 share/blackbox/nls/ja_JP/blackbox.cat
+share/blackbox/nls/ko_KR/blackbox.cat
+share/blackbox/nls/lv_LV/blackbox.cat
 share/blackbox/nls/nl_NL/blackbox.cat
+share/blackbox/nls/no_NO/blackbox.cat
+share/blackbox/nls/pl_PL/blackbox.cat
 share/blackbox/nls/pt_BR/blackbox.cat
+share/blackbox/nls/ro_RO/blackbox.cat
 share/blackbox/nls/ru_RU/blackbox.cat
+share/blackbox/nls/sk_SK/blackbox.cat
 share/blackbox/nls/sl_SI/blackbox.cat
 share/blackbox/nls/sv_SE/blackbox.cat
-share/blackbox/nls/tr_TR/blackbox.cat
+share/blackbox/nls/uk_UA/blackbox.cat
 share/blackbox/nls/zh_CN/blackbox.cat
+share/blackbox/nls/zh_TW/blackbox.cat
 share/blackbox/styles/Artwiz
 share/blackbox/styles/Cthulhain
 share/blackbox/styles/Flux
@@ -34,18 +40,26 @@ share/blackbox/styles/Twice
 @dirrm share/blackbox/nls/C
 @dirrm share/blackbox/nls/da_DK
 @dirrm share/blackbox/nls/de_DE
+@dirrm share/blackbox/nls/es_AR
 @dirrm share/blackbox/nls/es_ES
-@dirrm share/blackbox/nls/et_EE
 @dirrm share/blackbox/nls/fr_FR
+@dirrm share/blackbox/nls/hu_HU
 @dirrm share/blackbox/nls/it_IT
 @dirrm share/blackbox/nls/ja_JP
+@dirrm share/blackbox/nls/ko_KR
+@dirrm share/blackbox/nls/lv_LV
 @dirrm share/blackbox/nls/nl_NL
+@dirrm share/blackbox/nls/no_NO
+@dirrm share/blackbox/nls/pl_PL
 @dirrm share/blackbox/nls/pt_BR
+@dirrm share/blackbox/nls/ro_RO
 @dirrm share/blackbox/nls/ru_RU
+@dirrm share/blackbox/nls/sk_SK
 @dirrm share/blackbox/nls/sl_SI
 @dirrm share/blackbox/nls/sv_SE
-@dirrm share/blackbox/nls/tr_TR
+@dirrm share/blackbox/nls/uk_UA
 @dirrm share/blackbox/nls/zh_CN
+@dirrm share/blackbox/nls/zh_TW
 @exec ln -s C %D/share/blackbox/nls/POSIX
 @unexec rm %D/share/blackbox/nls/POSIX
 @exec ln -s C %D/share/blackbox/nls/US_ASCII
@@ -54,10 +68,14 @@ share/blackbox/styles/Twice
 @unexec rm %D/share/blackbox/nls/de
 @exec ln -s C %D/share/blackbox/nls/en
 @unexec rm %D/share/blackbox/nls/en
+@exec ln -s C %D/share/blackbox/nls/en_GB
+@unexec rm %D/share/blackbox/nls/en_GB
 @exec ln -s C %D/share/blackbox/nls/en_US
 @unexec rm %D/share/blackbox/nls/en_US
 @exec ln -s es_ES %D/share/blackbox/nls/es
 @unexec rm %D/share/blackbox/nls/es
+@exec ln -s es_ES %D/share/blackbox/nls/es_MX
+@unexec rm %D/share/blackbox/nls/es_MX
 @exec ln -s fr_FR %D/share/blackbox/nls/fr
 @unexec rm %D/share/blackbox/nls/fr
 @exec ln -s it_IT %D/share/blackbox/nls/it