- Add UPDATING entry about latest blackbox ports changes.

- Update boxtools to 0.70.0.
- Update bbpager to 0.4.0.
- Global cleanup in blackbox and bbkeys.

PR:		ports/78967
Submitted by:	Andrew J. Caines <A.J.Caines@halplant.com>

4 files changed, 46 insertions, 8 deletions

diff --git a/x11-wm/blackbox/Makefile b/x11-wm/blackbox/Makefile
index 161d21d1c6e7..5a4b92c74d2a 100644
--- a/x11-wm/blackbox/Makefile
+++ b/x11-wm/blackbox/Makefile
@@ -7,28 +7,39 @@
 
 PORTNAME=	blackbox
 PORTVERSION=	0.70.0
+PORTREVISION=	1
 CATEGORIES=	x11-wm
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	blackboxwm
 
-MAINTAINER=	dako@bsdberlin.org
+MAINTAINER=	A.J.Caines@halplant.com
 COMMENT=	A small and fast window manager for X11R6
 
-RUN_DEPENDS=	bsetbg:${PORTSDIR}/x11-wm/boxtools
+LIB_DEPENDS=	Xft.2:${PORTSDIR}/x11-fonts/libXft
 
+CONFLICTS=	boxtools-*
+
+PORTDOCS=	AUTHORS COMPLIANCE ChangeLog LICENSE README RELNOTES TODO
 MAN1=		blackbox.1
 
 USE_X_PREFIX=	yes
+USE_GNOME=	gnomehack pkgconfig
 GNU_CONFIGURE=	yes
 USE_REINPLACE=	yes
 USE_ICONV=	yes
-USE_GNOME=	pkgconfig gnomehack
 USE_GCC=	3.3+
 
 post-patch:
 	@${REINPLACE_CMD} -e 's#-pedantic##' ${WRKSRC}/configure
-	@${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
 
+post-install:
+.if !defined(NOPORTDOCS)
+	${MKDIR} ${DOCSDIR}
+.for doc in ${PORTDOCS}
+	${INSTALL_DATA} ${WRKSRC}/${doc} ${DOCSDIR}/
+.endfor
+.endif
+	@${CAT} ${PKGMESSAGE}
+
 .include <bsd.port.mk>
diff --git a/x11-wm/blackbox/files/patch-lib::PixmapCache.cc b/x11-wm/blackbox/files/patch-lib::PixmapCache.cc
new file mode 100644
index 000000000000..18a78b770edd
--- /dev/null
+++ b/x11-wm/blackbox/files/patch-lib::PixmapCache.cc
@@ -0,0 +1,11 @@
+--- lib/PixmapCache.cc.old	Fri Mar 11 09:46:02 2005
++++ lib/PixmapCache.cc	Fri Mar 11 09:32:16 2005
+@@ -97,7 +97,7 @@
+ 
+ 
+   static RealPixmapCache *realpixmapcache = 0;
+-  static unsigned long maxmem_usage = 2ul*1024ul*1024ul; // 2mb default
++  static unsigned long maxmem_usage = 8ul*1024ul*1024ul; // 8MB default
+   static unsigned long mem_usage = 0ul;
+ 
+ 
diff --git a/x11-wm/blackbox/pkg-message b/x11-wm/blackbox/pkg-message
new file mode 100644
index 000000000000..2531b888ab72
--- /dev/null
+++ b/x11-wm/blackbox/pkg-message
@@ -0,0 +1,14 @@
+********************************************************************************
+* This version of blackbox includes various changes in features, behaviour and *
+* configuration. See the ChangeLog for details.                                *
+*                                                                              *
+* Styles from version 0.65.0 should be converted to the new format with        *
+* bstyleconvert, eg.                                                           *
+*                                                                              *
+*   # bstyleconvert ~/.blackbox/Styles/BSD                                     *
+*   /home/user/.blackbox/Styles/BSD -> /home/user/.blackbox/Styles/BSD-new     *
+*                                                                              *
+* The new Stlye (BSD-new) can replace the old one (BSD), ie.                   *
+*                                                                              *
+*   # mv ~/.blackbox/Styles/BSD-new ~/.blackbox/Styles/BSD                     *
+********************************************************************************
diff --git a/x11-wm/blackbox/pkg-plist b/x11-wm/blackbox/pkg-plist
index 6f07e7330558..3f5b1628523e 100644
--- a/x11-wm/blackbox/pkg-plist
+++ b/x11-wm/blackbox/pkg-plist
@@ -1,5 +1,9 @@
 bin/blackbox
+bin/bsetbg
+bin/bsetroot
 bin/bstyleconvert
+lib/libbt.a
+libdata/pkgconfig/libbt.pc
 include/bt/Application.hh
 include/bt/Bitmap.hh
 include/bt/Color.hh
@@ -17,14 +21,12 @@ include/bt/Texture.hh
 include/bt/Timer.hh
 include/bt/Unicode.hh
 include/bt/Util.hh
-lib/libbt.a
-libdata/pkgconfig/libbt.pc
-%%DATADIR%%/menu
 %%DATADIR%%/styles/Blue
 %%DATADIR%%/styles/Gray
 %%DATADIR%%/styles/Green
 %%DATADIR%%/styles/Purple
 %%DATADIR%%/styles/Red
+%%DATADIR%%/menu
 @dirrm include/bt
 @dirrm %%DATADIR%%/styles
 @dirrm %%DATADIR%%