- 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>

14 files changed, 113 insertions, 128 deletions

diff --git a/x11-wm/bbkeys/Makefile b/x11-wm/bbkeys/Makefile
index e599361cb56a..e5c5993263b1 100644
--- a/x11-wm/bbkeys/Makefile
+++ b/x11-wm/bbkeys/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	bbkeys
 PORTVERSION=	0.9.0
+PORTREVISION=	1
 CATEGORIES=	x11-wm
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	${PORTNAME}
@@ -18,25 +19,27 @@ BUILD_DEPENDS=	blackbox:${PORTSDIR}/x11-wm/blackbox
 
 USE_X_PREFIX=	yes
 USE_PERL5=	yes
+USE_GCC=	3.3+
 GNU_CONFIGURE=	yes
-USE_GNOME=	gnomehack pkgconfig
+USE_REINPLACE=	yes
 
 MAN1=		bbkeys.1
 MAN5=		bbkeysrc.5
-PORTDOCS=	AUTHORS BUGS ChangeLog NEWS README
-PLIST_FILES=	bin/bbkeys share/bbkeys/bbkeysrc share/bbkeys/defaultStyle
+PORTDOCS=	AUTHORS BUGS ChangeLog LICENSE NEWS README TODO
+
+PLIST_FILES=	bin/bbkeys %%DATADIR%%/bbkeysrc %%DATADIR%%/defaultStyle
+PLIST_DIRS=	%%DATADIR%%
 
 post-patch:
-	@${PERL} -pi -e 's|: install-docDATA|:|g' ${WRKSRC}/Makefile.in
+	@${REINPLACE_CMD} -e 's#: install-docDATA#:#g' ${WRKSRC}/Makefile.in
 
 post-install:
 .if !defined(NOPORTDOCS)
 	@${MKDIR} ${DOCSDIR}
 .for file in ${PORTDOCS}
-	${INSTALL_DATA} ${WRKSRC}/${file} ${DOCSDIR}
+	${INSTALL_DATA} ${WRKSRC}/${file} ${DOCSDIR}/
 .endfor
 .endif
-	@${ECHO_CMD} "@unexec ${RMDIR} %D/share/bbtools 2>/dev/null || true" \
-		>> ${TMPPLIST}
+	@${CAT} ${PKGMESSAGE}
 
 .include <bsd.port.mk>
diff --git a/x11-wm/bbkeys/pkg-message b/x11-wm/bbkeys/pkg-message
new file mode 100644
index 000000000000..9ef1bcb04775
--- /dev/null
+++ b/x11-wm/bbkeys/pkg-message
@@ -0,0 +1,7 @@
+********************************************************************************
+* This version of bbkeys includes various changes in features, behaviour and   *
+* configuration. See the README for details of the changes.                    *
+*                                                                              *
+* You can create a new bbkeys configuration by copying some or all of bbkeysrc *
+* to your ~/.bbkeysrc file. The new sytax resembles the blackbox menu config.  *
+********************************************************************************
diff --git a/x11-wm/bbpager/Makefile b/x11-wm/bbpager/Makefile
index 59e566521f07..8a284e5f2b24 100644
--- a/x11-wm/bbpager/Makefile
+++ b/x11-wm/bbpager/Makefile
@@ -6,22 +6,37 @@
 #
 
 PORTNAME=	bbpager
-PORTVERSION=	0.3.1
+PORTVERSION=	0.4.0
 CATEGORIES=	x11-wm
-MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR=	bbtools
+MASTER_SITES=	http://halplant.com:88/software/src/
+DISTFILES=	${PORTNAME}-${PORTVERSION}-cvs.tar.gz
 
-MAINTAINER=	ports@FreeBSD.org
+MAINTAINER=	A.J.Caines@halplant.com
 COMMENT=	A pager for the Blackbox window manager
 
+BUILD_DEPENDS=	blackbox:${PORTSDIR}/x11-wm/blackbox
+
 USE_X_PREFIX=	yes
+USE_GNOME=	gnomehack pkgconfig
+USE_GCC=	3.3+
 GNU_CONFIGURE=	yes
 
-PLIST_FILES=	bin/bbpager share/bbtools/bbpager.bb \
-		share/bbtools/bbpager.nobb share/bbtools/README.bbpager
+PORTDOCS=	README.bbpager
+PLIST_FILES=	bin/bbpager %%DATADIR%%/bbpager.rc
+PLIST_DIRS=	%%DATADIR%% %%DOCSDIR%%
+
+do-install:
+	${INSTALL_PROGRAM} ${WRKSRC}/src/bbpager ${PREFIX}/bin
+	@${MKDIR} ${DATADIR}
+	${INSTALL_DATA} ${WRKSRC}/data/bbpager.rc ${DATADIR}/
 
 post-install:
-	@${ECHO_CMD} "@unexec rmdir %D/share/bbtools 2>/dev/null || true" \
-		>> ${TMPPLIST}
+.if !defined(NOPORTDOCS)
+	@${MKDIR} ${DOCSDIR}
+.for file in ${PORTDOCS}
+	${INSTALL_DATA} ${WRKSRC}/data/${file} ${DOCSDIR}/
+.endfor
+.endif
+	@${CAT} ${PKGMESSAGE}
 
 .include <bsd.port.mk>
diff --git a/x11-wm/bbpager/distinfo b/x11-wm/bbpager/distinfo
index 71eb3727d0b9..65ad0e568c55 100644
--- a/x11-wm/bbpager/distinfo
+++ b/x11-wm/bbpager/distinfo
@@ -1,2 +1,2 @@
-MD5 (bbpager-0.3.1.tar.gz) = 27e575bd87be25e2fe8a116412d933cc
-SIZE (bbpager-0.3.1.tar.gz) = 81686
+MD5 (bbpager-0.4.0-cvs.tar.gz) = 11bb97c304d4708b04b0c1845efda618
+SIZE (bbpager-0.4.0-cvs.tar.gz) = 206841
diff --git a/x11-wm/bbpager/pkg-message b/x11-wm/bbpager/pkg-message
new file mode 100644
index 000000000000..ee74a7fe1635
--- /dev/null
+++ b/x11-wm/bbpager/pkg-message
@@ -0,0 +1,6 @@
+********************************************************************************
+* This version of bbpager includes various changes in features, behaviour and  *
+* configuration. See README.bbpager for details.                               *
+*                                                                              *
+* Copy bbpager.rc to ~/.bbtools/bbpager.rc and modify it to your taste.        *
+********************************************************************************
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%%
diff --git a/x11-wm/boxtools/Makefile b/x11-wm/boxtools/Makefile
index 09ee507037ab..3cca4ee3d292 100644
--- a/x11-wm/boxtools/Makefile
+++ b/x11-wm/boxtools/Makefile
@@ -6,30 +6,43 @@
 #
 
 PORTNAME=	boxtools
-PORTVERSION=	0.65.0
+PORTVERSION=	0.70.0
 CATEGORIES=	x11-wm
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	blackboxwm
 DISTNAME=	blackbox-${PORTVERSION}
 
-MAINTAINER=	ports@FreeBSD.org
+MAINTAINER=	A.J.Caines@halplant.com
 COMMENT=	Style tools for the blackbox family of window managers
 
+CONFLICTS=	blackbox-0.[7-9]*
+
 MAN1=		bsetbg.1 bsetroot.1
+PORTDOCS=	README.bbtools README.bsetbg
+PLIST_FILES=	bin/bsetbg bin/bsetroot
 
 USE_X_PREFIX=	yes
 GNU_CONFIGURE=	yes
 USE_REINPLACE=	yes
+USE_ICONV=	yes
+USE_GCC=	3.3+
 
 pre-patch:
-	${REINPLACE_CMD} -e 's#PACKAGE=blackbox#PACKAGE=boxtools#' \
+	@${REINPLACE_CMD} -e 's#PACKAGE=blackbox#PACKAGE=boxtools#' \
 		-e 's#-pedantic##' ${WRKSRC}/configure
 
 do-install:
 	${INSTALL_SCRIPT} ${WRKSRC}/util/bsetbg ${PREFIX}/bin
 	${INSTALL_PROGRAM} ${WRKSRC}/util/bsetroot ${PREFIX}/bin
-	cd ${WRKSRC}/nls && ${MAKE} install
 	${INSTALL_MAN} ${WRKSRC}/doc/bsetbg.1 ${PREFIX}/man/man1
 	${INSTALL_MAN} ${WRKSRC}/doc/bsetroot.1 ${PREFIX}/man/man1
 
+post-install:
+.if !defined(NOPORTDOCS)
+	@${MKDIR} ${DOCSDIR}
+.for file in ${PORTDOCS}
+	${INSTALL_DATA} ${WRKSRC}/${file} ${DOCSDIR}
+.endfor
+.endif
+
 .include <bsd.port.mk>
diff --git a/x11-wm/boxtools/distinfo b/x11-wm/boxtools/distinfo
index a1dfde27307b..73cf326fb44d 100644
--- a/x11-wm/boxtools/distinfo
+++ b/x11-wm/boxtools/distinfo
@@ -1,2 +1,2 @@
-MD5 (blackbox-0.65.0.tar.gz) = 08560fa287c68d65fbe894696d04deaf
-SIZE (blackbox-0.65.0.tar.gz) = 292950
+MD5 (blackbox-0.70.0.tar.gz) = 033a92af3eecaa10bcb689e55a1ceadc
+SIZE (blackbox-0.70.0.tar.gz) = 583527
diff --git a/x11-wm/boxtools/files/patch-src::Timer.hh b/x11-wm/boxtools/files/patch-src::Timer.hh
deleted file mode 100644
index 89b27ecf0e21..000000000000
--- a/x11-wm/boxtools/files/patch-src::Timer.hh
+++ /dev/null
@@ -1,15 +0,0 @@
---- src/Timer.hh~	Sun Aug  1 17:13:29 2004
-+++ src/Timer.hh	Sun Aug  1 17:14:13 2004
-@@ -98,9 +98,10 @@
-   ~_timer_queue(void) {}
- 
-   void release(const _Tp& value) {
--    c.erase(std::remove(c.begin(), c.end(), value), c.end());
-+    _Base::c.erase(std::remove(_Base::c.begin(), _Base::c.end(), value),
-+			_Base::c.end());
-     // after removing the item we need to make the heap again
--    std::make_heap(c.begin(), c.end(), comp);
-+    std::make_heap(_Base::c.begin(), _Base::c.end(), _Base::comp);
-   }
-   bool empty(void) const { return _Base::empty(); }
-   size_t size(void) const { return _Base::size(); }
diff --git a/x11-wm/boxtools/files/patch-src::Window.cc b/x11-wm/boxtools/files/patch-src::Window.cc
deleted file mode 100644
index ec6c3afd4e04..000000000000
--- a/x11-wm/boxtools/files/patch-src::Window.cc
+++ /dev/null
@@ -1,10 +0,0 @@
---- src/Window.cc.orig Wed Aug 13 12:40:02 2003 
-+++ src/Window.cc      Wed Aug 13 12:41:03 2003
-@@ -44,6 +44,8 @@
- #endif // HAVE_STDLIB_H
- }
-+#include <cassert>
-+
- #include "i18n.hh"
- #include "blackbox.hh"
- #include "GCCache.hh"
diff --git a/x11-wm/boxtools/pkg-plist b/x11-wm/boxtools/pkg-plist
deleted file mode 100644
index 6332cef61784..000000000000
--- a/x11-wm/boxtools/pkg-plist
+++ /dev/null
@@ -1,72 +0,0 @@
-bin/bsetbg
-bin/bsetroot
-share/boxtools/nls/C/blackbox.cat
-share/boxtools/nls/da_DK/blackbox.cat
-share/boxtools/nls/de_DE/blackbox.cat
-share/boxtools/nls/es_AR/blackbox.cat
-share/boxtools/nls/es_ES/blackbox.cat
-share/boxtools/nls/fr_FR/blackbox.cat
-share/boxtools/nls/hu_HU/blackbox.cat
-share/boxtools/nls/it_IT/blackbox.cat
-share/boxtools/nls/ja_JP/blackbox.cat
-share/boxtools/nls/ko_KR/blackbox.cat
-share/boxtools/nls/lv_LV/blackbox.cat
-share/boxtools/nls/nl_NL/blackbox.cat
-share/boxtools/nls/no_NO/blackbox.cat
-share/boxtools/nls/pl_PL/blackbox.cat
-share/boxtools/nls/pt_BR/blackbox.cat
-share/boxtools/nls/ro_RO/blackbox.cat
-share/boxtools/nls/ru_RU/blackbox.cat
-share/boxtools/nls/sk_SK/blackbox.cat
-share/boxtools/nls/sl_SI/blackbox.cat
-share/boxtools/nls/sv_SE/blackbox.cat
-share/boxtools/nls/uk_UA/blackbox.cat
-share/boxtools/nls/zh_CN/blackbox.cat
-share/boxtools/nls/zh_TW/blackbox.cat
-@dirrm share/boxtools/nls/C
-@dirrm share/boxtools/nls/da_DK
-@dirrm share/boxtools/nls/de_DE
-@dirrm share/boxtools/nls/es_AR
-@dirrm share/boxtools/nls/es_ES
-@dirrm share/boxtools/nls/fr_FR
-@dirrm share/boxtools/nls/hu_HU
-@dirrm share/boxtools/nls/it_IT
-@dirrm share/boxtools/nls/ja_JP
-@dirrm share/boxtools/nls/ko_KR
-@dirrm share/boxtools/nls/lv_LV
-@dirrm share/boxtools/nls/nl_NL
-@dirrm share/boxtools/nls/no_NO
-@dirrm share/boxtools/nls/pl_PL
-@dirrm share/boxtools/nls/pt_BR
-@dirrm share/boxtools/nls/ro_RO
-@dirrm share/boxtools/nls/ru_RU
-@dirrm share/boxtools/nls/sk_SK
-@dirrm share/boxtools/nls/sl_SI
-@dirrm share/boxtools/nls/sv_SE
-@dirrm share/boxtools/nls/uk_UA
-@dirrm share/boxtools/nls/zh_CN
-@dirrm share/boxtools/nls/zh_TW
-@exec ln -s C %D/share/boxtools/nls/POSIX
-@unexec rm %D/share/boxtools/nls/POSIX
-@exec ln -s C %D/share/boxtools/nls/US_ASCII
-@unexec rm %D/share/boxtools/nls/US_ASCII
-@exec ln -s de_DE %D/share/boxtools/nls/de
-@unexec rm %D/share/boxtools/nls/de
-@exec ln -s C %D/share/boxtools/nls/en
-@unexec rm %D/share/boxtools/nls/en
-@exec ln -s C %D/share/boxtools/nls/en_GB
-@unexec rm %D/share/boxtools/nls/en_GB
-@exec ln -s C %D/share/boxtools/nls/en_US
-@unexec rm %D/share/boxtools/nls/en_US
-@exec ln -s es_ES %D/share/boxtools/nls/es
-@unexec rm %D/share/boxtools/nls/es
-@exec ln -s es_ES %D/share/boxtools/nls/es_MX
-@unexec rm %D/share/boxtools/nls/es_MX
-@exec ln -s fr_FR %D/share/boxtools/nls/fr
-@unexec rm %D/share/boxtools/nls/fr
-@exec ln -s it_IT %D/share/boxtools/nls/it
-@unexec rm %D/share/boxtools/nls/it
-@exec ln -s nl_NL %D/share/boxtools/nls/nl
-@unexec rm %D/share/boxtools/nls/nl
-@dirrm share/boxtools/nls
-@dirrm share/boxtools