4 files changed, 44 insertions, 34 deletions

diff --git a/x11-wm/openbox/Makefile b/x11-wm/openbox/Makefile
index 7c4ced7693ca..e38b651ac034 100644
--- a/x11-wm/openbox/Makefile
+++ b/x11-wm/openbox/Makefile
@@ -6,29 +6,15 @@
 #
 
 PORTNAME=	blackbox
-PORTVERSION= 	0.51.3.1
+PORTVERSION= 	0.60.3
 CATEGORIES=	x11-wm
-MASTER_SITES=	ftp://portal.alug.org/pub/blackbox/0.5x.x/ \
-	 	ftp://ftp.dti.ad.jp/pub/X/blackbox/0.5x.x/
+MASTER_SITES=	ftp://portal.alug.org/pub/blackbox/0.6x.x/
 
 MAINTAINER=	patseal@hyperhost.net
 
 USE_X_PREFIX=	yes
 GNU_CONFIGURE=	yes
 USE_BZIP2=	yes
-
-.if !defined(WITH_KDE)
-pre-configure:
-	@ ${ECHO_MSG}
-	@ ${ECHO_MSG} If you would like build Blackbox with KDE support
-	@ ${ECHO_MSG} you must set the variable WITH_KDE
-	@ ${ECHO_MSG}
-.else
-pre-configure:
-	@ ${ECHO_MSG}
-	@ ${ECHO_MSG} Building Blackbox with KDE support
-	@ ${ECHO_MSG}
-CONFIGURE_ARGS= --enable-kde
-.endif
+CONFIGURE_ARGS= --disable-styled-frames
 
 .include <bsd.port.mk>
diff --git a/x11-wm/openbox/distinfo b/x11-wm/openbox/distinfo
index 7589f3f67b2d..b4bbbb2cce3e 100644
--- a/x11-wm/openbox/distinfo
+++ b/x11-wm/openbox/distinfo
@@ -1 +1 @@
-MD5 (blackbox-0.51.3.1.tar.bz2) = 9cef2add80465e0b62a2d804c2c4ce2a
+MD5 (blackbox-0.60.3.tar.bz2) = 7d6e75947810267aeb2ddc031ae7ca89
diff --git a/x11-wm/openbox/pkg-descr b/x11-wm/openbox/pkg-descr
index ebde7e80156f..6235c20fc767 100644
--- a/x11-wm/openbox/pkg-descr
+++ b/x11-wm/openbox/pkg-descr
@@ -3,4 +3,7 @@ out of the curiosity of the authors.  It's small, fast, has built-in
 rendering code, does image dithering at 8, 15 and 16 bits per pixel
 and colour icon support.  Blackbox is [mostly] ICCCM compliant.
 
-WWW: http://blackbox.alug.org/
+WWW: http://portal.alug.org/blackbox/
+
+- Patrick
+patseal@hyperhost.net
diff --git a/x11-wm/openbox/pkg-plist b/x11-wm/openbox/pkg-plist
index b419b6e9e7ad..23af22f50fe6 100644
--- a/x11-wm/openbox/pkg-plist
+++ b/x11-wm/openbox/pkg-plist
@@ -1,20 +1,41 @@
 bin/blackbox
 bin/bsetroot
 share/Blackbox/menu
-share/Blackbox/styles/blackmagic
-share/Blackbox/styles/coldsteel
-share/Blackbox/styles/colorpurple
-share/Blackbox/styles/darkgreen
-share/Blackbox/styles/default
-share/Blackbox/styles/gnoid
-share/Blackbox/styles/green
-share/Blackbox/styles/onoid
-share/Blackbox/styles/pnoid
-share/Blackbox/styles/previous
-share/Blackbox/styles/results
-share/Blackbox/styles/slatebox
-share/Blackbox/styles/steelblue
-share/Blackbox/styles/steelbox
-share/Blackbox/styles/stylesmenu
+share/Blackbox/nls/C/blackbox.cat
+share/Blackbox/nls/es_ES/blackbox.cat
+share/Blackbox/nls/pt_BR/blackbox.cat
+share/Blackbox/nls/ru_RU/blackbox.cat
+share/Blackbox/nls/sv_SE/blackbox.cat
+share/Blackbox/nls/tr_TR/blackbox.cat
+share/Blackbox/styles/Artwiz
+share/Blackbox/styles/Flux
+share/Blackbox/styles/Minimal
+share/Blackbox/styles/Nyz
+share/Blackbox/styles/Operation
+share/Blackbox/styles/Outcomes
+share/Blackbox/styles/Rampage
+share/Blackbox/styles/Rancor
+share/Blackbox/styles/Results
+share/Blackbox/styles/Shade
+share/Blackbox/styles/Spiff
+share/Blackbox/styles/TDF
+share/Blackbox/styles/Twice
+@dirrm share/Blackbox/nls/C
+@dirrm share/Blackbox/nls/es_ES
+@dirrm share/Blackbox/nls/pt_BR
+@dirrm share/Blackbox/nls/ru_RU
+@dirrm share/Blackbox/nls/sv_SE
+@dirrm share/Blackbox/nls/tr_TR
+@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
+@unexec rm %D/share/Blackbox/nls/US_ASCII
+@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_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
+@dirrm share/Blackbox/nls
 @dirrm share/Blackbox/styles
 @dirrm share/Blackbox