ports/78967: Maintainer Update: x11-wm/blackbox, boxtools, bbkeys, bbpager
Andrew J. Caines
A.J.Caines at halplant.com
Thu Mar 17 22:30:04 UTC 2005
>Number: 78967
>Category: ports
>Synopsis: Maintainer Update: x11-wm/blackbox, boxtools, bbkeys, bbpager
>Confidential: no
>Severity: serious
>Priority: high
>Responsible: freebsd-ports-bugs
>State: open
>Quarter:
>Keywords:
>Date-Required:
>Class: maintainer-update
>Submitter-Id: current-users
>Arrival-Date: Thu Mar 17 22:30:02 GMT 2005
>Closed-Date:
>Last-Modified:
>Originator: Andrew J. Caines
>Release: FreeBSD 5.4-PRERELEASE i386
>Organization:
H.A.L. Plant
>Environment:
System: FreeBSD 5.4-PRERELEASE #0: Sat Mar 5 09:58:09 EST 2005
root at hal10000.halplant.com:/home/obj/home/src/sys/HAL10000
>Description:
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 at 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 at bsdberlin.org> and Randy Pratt <rpratt1950 at 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]
>How-To-Repeat:
Apply the patches[1].
>Fix:
--- blackbox-0.70.0.patch begins here ---
diff -ruN blackbox/Makefile blackbox-0.70.0/Makefile
--- blackbox/Makefile Fri Mar 11 14:25:25 2005
+++ blackbox-0.70.0/Makefile Thu Mar 17 16:21:03 2005
@@ -2,33 +2,44 @@
# Date created: June 15, 1998
# Whom: Brian Handy <handy at physics.montana.edu>
#
-# $FreeBSD: ports/x11-wm/blackbox/Makefile,v 1.43 2005/03/11 19:25:25 flz Exp $
+# $FreeBSD: ports/x11-wm/blackbox/Makefile,v 1.42 2004/08/10 11:04:40 vs Exp $
#
PORTNAME= blackbox
PORTVERSION= 0.70.0
+PORTEPOCH= 1
CATEGORIES= x11-wm
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
MASTER_SITE_SUBDIR= blackboxwm
-MAINTAINER= dako at bsdberlin.org
+MAINTAINER= A.J.Caines at halplant.com
COMMENT= A small and fast window manager for X11R6
+LIB_DEPENDS= Xft.2:${PORTSDIR}/x11-fonts/libXft
RUN_DEPENDS= bsetbg:${PORTSDIR}/x11-wm/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 -ruN blackbox/files/patch-lib::PixmapCache.cc blackbox-0.70.0/files/patch-lib::PixmapCache.cc
--- blackbox/files/patch-lib::PixmapCache.cc Wed Dec 31 19:00:00 1969
+++ blackbox-0.70.0/files/patch-lib::PixmapCache.cc Fri Mar 11 09:55:16 2005
@@ -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 -ruN blackbox/pkg-message blackbox-0.70.0/pkg-message
--- blackbox/pkg-message Wed Dec 31 19:00:00 1969
+++ blackbox-0.70.0/pkg-message Thu Mar 17 03:09:05 2005
@@ -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 -ruN blackbox/pkg-plist blackbox-0.70.0/pkg-plist
--- blackbox/pkg-plist Fri Mar 11 14:25:25 2005
+++ blackbox-0.70.0/pkg-plist Thu Mar 17 03:25:33 2005
@@ -1,5 +1,7 @@
bin/blackbox
bin/bstyleconvert
+lib/libbt.a
+libdata/pkgconfig/libbt.pc
include/bt/Application.hh
include/bt/Bitmap.hh
include/bt/Color.hh
@@ -17,14 +19,12 @@
include/bt/Timer.hh
include/bt/Unicode.hh
include/bt/Util.hh
-lib/libbt.a
-libdata/pkgconfig/libbt.pc
-%%DATADIR%%/menu
+%%DATADIR%%/styles
%%DATADIR%%/styles/Blue
%%DATADIR%%/styles/Gray
%%DATADIR%%/styles/Green
%%DATADIR%%/styles/Purple
%%DATADIR%%/styles/Red
+%%DATADIR%%/menu
@dirrm include/bt
- at dirrm %%DATADIR%%/styles
@dirrm %%DATADIR%%
--- blackbox-0.70.0.patch ends here ---
--- boxtools-0.70.0.patch begins here ---
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 at FreeBSD.org
+MAINTAINER= A.J.Caines at 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
- at dirrm share/boxtools/nls/C
- at dirrm share/boxtools/nls/da_DK
- at dirrm share/boxtools/nls/de_DE
- at dirrm share/boxtools/nls/es_AR
- at dirrm share/boxtools/nls/es_ES
- at dirrm share/boxtools/nls/fr_FR
- at dirrm share/boxtools/nls/hu_HU
- at dirrm share/boxtools/nls/it_IT
- at dirrm share/boxtools/nls/ja_JP
- at dirrm share/boxtools/nls/ko_KR
- at dirrm share/boxtools/nls/lv_LV
- at dirrm share/boxtools/nls/nl_NL
- at dirrm share/boxtools/nls/no_NO
- at dirrm share/boxtools/nls/pl_PL
- at dirrm share/boxtools/nls/pt_BR
- at dirrm share/boxtools/nls/ro_RO
- at dirrm share/boxtools/nls/ru_RU
- at dirrm share/boxtools/nls/sk_SK
- at dirrm share/boxtools/nls/sl_SI
- at dirrm share/boxtools/nls/sv_SE
- at dirrm share/boxtools/nls/uk_UA
- at dirrm share/boxtools/nls/zh_CN
- at dirrm share/boxtools/nls/zh_TW
- at exec ln -s C %D/share/boxtools/nls/POSIX
- at unexec rm %D/share/boxtools/nls/POSIX
- at exec ln -s C %D/share/boxtools/nls/US_ASCII
- at unexec rm %D/share/boxtools/nls/US_ASCII
- at exec ln -s de_DE %D/share/boxtools/nls/de
- at unexec rm %D/share/boxtools/nls/de
- at exec ln -s C %D/share/boxtools/nls/en
- at unexec rm %D/share/boxtools/nls/en
- at exec ln -s C %D/share/boxtools/nls/en_GB
- at unexec rm %D/share/boxtools/nls/en_GB
- at exec ln -s C %D/share/boxtools/nls/en_US
- at unexec rm %D/share/boxtools/nls/en_US
- at exec ln -s es_ES %D/share/boxtools/nls/es
- at unexec rm %D/share/boxtools/nls/es
- at exec ln -s es_ES %D/share/boxtools/nls/es_MX
- at unexec rm %D/share/boxtools/nls/es_MX
- at exec ln -s fr_FR %D/share/boxtools/nls/fr
- at unexec rm %D/share/boxtools/nls/fr
- at exec ln -s it_IT %D/share/boxtools/nls/it
- at unexec rm %D/share/boxtools/nls/it
- at exec ln -s nl_NL %D/share/boxtools/nls/nl
- at unexec rm %D/share/boxtools/nls/nl
- at dirrm share/boxtools/nls
- at dirrm share/boxtools
--- boxtools-0.70.0.patch ends here ---
--- bbkeys-0.9.0.patch begins here ---
diff -ruN bbkeys/Makefile bbkeys-0.9.0/Makefile
--- bbkeys/Makefile Thu Mar 17 13:32:22 2005
+++ bbkeys-0.9.0/Makefile Thu Mar 17 16:43:34 2005
@@ -2,11 +2,12 @@
# Date created: 17 June 2000
# Whom: Patrick Seal <patseal at hyperhost.net>
#
-# $FreeBSD: ports/x11-wm/bbkeys/Makefile,v 1.14 2005/03/17 18:32:22 novel Exp $
+# $FreeBSD: ports/x11-wm/bbkeys/Makefile,v 1.12 2004/08/10 18:51:20 krion Exp $
#
PORTNAME= bbkeys
PORTVERSION= 0.9.0
+PORTEPOCH= 1
CATEGORIES= x11-wm
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
MASTER_SITE_SUBDIR= ${PORTNAME}
@@ -19,15 +20,15 @@
USE_X_PREFIX= yes
USE_PERL5= yes
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 share/bbkeys/bbkeysrc share/${PORTNAME}/defaultStyle
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)
@@ -36,7 +37,8 @@
${INSTALL_DATA} ${WRKSRC}/${file} ${DOCSDIR}
.endfor
.endif
- @${ECHO_CMD} "@unexec ${RMDIR} %D/share/bbtools 2>/dev/null || true" \
+ @${ECHO_CMD} "@unexec ${RMDIR} %D/share/bbkeys 2>/dev/null || true" \
>> ${TMPPLIST}
+ @${CAT} ${PKGMESSAGE}
.include <bsd.port.mk>
diff -ruN bbkeys/pkg-message bbkeys-0.9.0/pkg-message
--- bbkeys/pkg-message Wed Dec 31 19:00:00 1969
+++ bbkeys-0.9.0/pkg-message Thu Mar 17 03:52:02 2005
@@ -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. *
+********************************************************************************
--- bbkeys-0.9.0.patch ends here ---
--- bbpager-0.4.0.patch begins here ---
diff -ruN bbpager/Makefile bbpager-0.4.0/Makefile
--- bbpager/Makefile Tue Aug 10 14:53:11 2004
+++ bbpager-0.4.0/Makefile Thu Mar 17 15:44:13 2005
@@ -6,22 +6,36 @@
#
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 at FreeBSD.org
+MAINTAINER= A.J.Caines at 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
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 -ruN bbpager/distinfo bbpager-0.4.0/distinfo
--- bbpager/distinfo Thu Mar 18 13:01:11 2004
+++ bbpager-0.4.0/distinfo Thu Mar 17 04:42:58 2005
@@ -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 -ruN bbpager/pkg-message bbpager-0.4.0/pkg-message
--- bbpager/pkg-message Wed Dec 31 19:00:00 1969
+++ bbpager-0.4.0/pkg-message Thu Mar 17 05:33:56 2005
@@ -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. *
+********************************************************************************
--- bbpager-0.4.0.patch ends here ---
>Release-Note:
>Audit-Trail:
>Unformatted:
More information about the freebsd-ports-bugs
mailing list