Bug 78967 - Maintainer Update: x11-wm/blackbox, boxtools, bbkeys, bbpager
Summary: Maintainer Update: x11-wm/blackbox, boxtools, bbkeys, bbpager
Status: Closed FIXED
Alias: None
Product: Ports & Packages
Classification: Unclassified
Component: Individual Port(s) (show other bugs)
Version: Latest
Hardware: Any Any
: Normal Affects Only Me
Assignee: Florent Thoumie
URL:
Keywords:
Depends on:
Blocks:
 
Reported: 2005-03-17 22:30 UTC by Andrew J. Caines
Modified: 2005-03-18 21:22 UTC (History)
1 user (show)

See Also:


Attachments
blackbox-0.70.0.patch (4.10 KB, patch)
2005-03-17 22:30 UTC, Andrew J. Caines
no flags Details | Diff
bbkeys-0.9.0.patch (2.18 KB, patch)
2005-03-17 22:30 UTC, Andrew J. Caines
no flags Details | Diff
file.diff (2.37 KB, patch)
2005-03-17 22:30 UTC, Andrew J. Caines
no flags Details | Diff

Note You need to log in before you can comment on or make changes to this bug.
Description Andrew J. Caines 2005-03-17 22:30:02 UTC

The Blackbox window manager and associated ports have all been updated. The new versions do not work with the old ones and a couple of broken updates have gone into the tree.

These patches update all the bb ports to the latest versions and have been tested and appear to be working on 5.4 and 4.x.* Patches include instructions to users on updating their config files and other changes.

Please add the following entry to ports/UPDATING:

----8<----
  AFFECTS: users of x11-wm/blackbox,boxtools,bbkeys,bbpager
  AUTHOR: A.J.Caines@halplant.com

  The new bb ports include several changes to use and configuration.
  Please read the package messages in the respective ports for details.
----8<----


Thanks to Danny Koenig <dako@bsdberlin.org>  and Randy Pratt <rpratt1950@earthlink.net> for collaboration, testing and suggestions. Thanks also to flz, krion, Pav and other in #bsdports on EFnet for the valuable advice.

*[There is a known issue affecting mplayer in full screen mode]

Fix: diff -ruN boxtools/Makefile boxtools-0.70.0/Makefile
--- boxtools/Makefile	Tue Aug 10 07:04:41 2004
+++ boxtools-0.70.0/Makefile	Thu Mar 17 14:50:43 2005
@@ -6,30 +6,41 @@
 #
 
 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
 
 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 -ruN boxtools/distinfo boxtools-0.70.0/distinfo
--- boxtools/distinfo	Thu Mar 18 13:01:11 2004
+++ boxtools-0.70.0/distinfo	Wed Mar  9 16:33:49 2005
@@ -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 -ruN boxtools/files/patch-src::Timer.hh boxtools-0.70.0/files/patch-src::Timer.hh
--- boxtools/files/patch-src::Timer.hh	Sun Aug  1 05:17:58 2004
+++ boxtools-0.70.0/files/patch-src::Timer.hh	Wed Dec 31 19:00:00 1969
@@ -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 -ruN boxtools/files/patch-src::Window.cc boxtools-0.70.0/files/patch-src::Window.cc
--- boxtools/files/patch-src::Window.cc	Thu Aug 28 07:36:56 2003
+++ boxtools-0.70.0/files/patch-src::Window.cc	Wed Dec 31 19:00:00 1969
@@ -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 -ruN boxtools/pkg-plist boxtools-0.70.0/pkg-plist
--- boxtools/pkg-plist	Thu Sep 19 09:50:58 2002
+++ boxtools-0.70.0/pkg-plist	Wed Dec 31 19:00:00 1969
@@ -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
--- boxtools-0.70.0.patch ends here ---
How-To-Repeat: 

Apply the patches[1].
Comment 1 Andrew J. Caines 2005-03-17 22:55:53 UTC
Please replace the erroneous PORTEPOCH=1 lines with PORTREVISION=1 before
applying.

Thanks.


-Andrew-
-- 
 _______________________________________________________________________
| -Andrew J. Caines-   Unix Systems Engineer   A.J.Caines@halplant.com  |
| "They that can give up essential liberty to obtain a little temporary |
|  safety deserve neither liberty nor safety" - Benjamin Franklin, 1759 |
Comment 2 Florent Thoumie freebsd_committer 2005-03-18 08:26:38 UTC
Responsible Changed
From-To: freebsd-ports-bugs->flz

Grab, not sure that should be classified as serious though.
Comment 3 Florent Thoumie freebsd_committer 2005-03-18 21:22:16 UTC
State Changed
From-To: open->closed

Committed, thanks!