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

5 files changed, 19 insertions, 103 deletions

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