Subject: Re: updates for bbkeys and blackbox
To: None <tech-pkg@netbsd.org>
From: Antoine Reilles <Antoine.Reilles@loria.fr>
List: tech-pkg
Date: 11/05/2005 17:20:45
--Apple-Mail-5-429106795
Content-Transfer-Encoding: 7bit
Content-Type: text/plain;
charset=US-ASCII;
delsp=yes;
format=flowed
Hi,
Back in 5 september i played with blackbox 0.70 and related packages
(mainly because the current blackbox do not build under darwin).
I also tested some of the backbox related applications. At least,
there is one patch that may be useful, for bbpager.
It is sad to see that updating blackbox is a task that was done many
time, for nothing (well, i use my own version, so i didn't spend that
time on that for nothing).
This issue should be fixed, either by updating bb and related (and
let people suffer if there are little troubles), doubling the
packages (i'm not voluntering), or write a note in the current
blackbox package, to say people to void loosing time trying to update
it.
antoine
A copy of my 05 september mail:
Here my patches.
The current status of bb applications for me:
Untested:
bbrun (depends on gtk (but the new version is gtk2, it may be
interesting to update))
bbconf (depends on QT)
bbsload (not under darwin)
I really don't want to try to compile QT of gtk1 under macosx
bbappconf (broken)
this one looks really broken, and there is no update. We may delete
this package, unless someone uses it
Known OK:
bbmail (works unchanged)
bbpager (here a patch)
bbkeys (here a patch)
bbdate (works unchanged)
bbweather (works unchanged)
bbdate and bbweather have a strange beharior: hey fail with "-w" if
there is n ~/.blackboxrc Otherwise, works fine
Cheers,
antoine
--Apple-Mail-5-429106795
Content-Transfer-Encoding: 7bit
Content-Type: text/plain;
x-unix-mode=0666;
name="blackbox.diff"
Content-Disposition: attachment;
filename=blackbox.diff
? buildlink3.mk
? work
Index: Makefile
===================================================================
RCS file: /cvsroot/pkgsrc/wm/blackbox/Makefile,v
retrieving revision 1.22
diff -u -r1.22 Makefile
--- Makefile 1 Jun 2005 18:03:24 -0000 1.22
+++ Makefile 5 Sep 2005 18:56:26 -0000
@@ -1,8 +1,7 @@
# $NetBSD: Makefile,v 1.22 2005/06/01 18:03:24 jlam Exp $
#
-DISTNAME= blackbox-0.65.0
-PKGREVISION= 5
+DISTNAME= blackbox-0.70.0
CATEGORIES= wm x11
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=blackboxwm/}
@@ -10,11 +9,11 @@
HOMEPAGE= http://blackboxwm.sourceforge.net/
COMMENT= Small and fast X11R6 window manager
-DEPENDS= bsetroot>=0.1nb1:../../wm/bsetroot
+DEPENDS= bsetroot>=0.2:../../wm/bsetroot
USE_LANGUAGES= c c++
GNU_CONFIGURE= YES
+USE_TOOLS+= pkg-config
-.include "../../devel/gettext-lib/buildlink3.mk"
.include "../../mk/x11.buildlink3.mk"
.include "../../mk/bsd.pkg.mk"
Index: PLIST
===================================================================
RCS file: /cvsroot/pkgsrc/wm/blackbox/PLIST,v
retrieving revision 1.4
diff -u -r1.4 PLIST
--- PLIST 20 Nov 2002 18:20:30 -0000 1.4
+++ PLIST 5 Sep 2005 18:56:26 -0000
@@ -1,78 +1,31 @@
-@comment $NetBSD: PLIST,v 1.4 2002/11/20 18:20:30 jschauma Exp $
+@comment $NetBSD$
bin/blackbox
+include/bt/Application.hh
+include/bt/Bitmap.hh
+include/bt/Color.hh
+include/bt/Display.hh
+include/bt/EWMH.hh
+include/bt/EventHandler.hh
+include/bt/Font.hh
+include/bt/Image.hh
+include/bt/Menu.hh
+include/bt/Pen.hh
+include/bt/PixmapCache.hh
+include/bt/Rect.hh
+include/bt/Resource.hh
+include/bt/Texture.hh
+include/bt/Timer.hh
+include/bt/Unicode.hh
+include/bt/Util.hh
+lib/libbt.la
+lib/pkgconfig/libbt.pc
man/man1/blackbox.1
share/blackbox/menu
-share/blackbox/nls/C/blackbox.cat
-share/blackbox/nls/POSIX
-share/blackbox/nls/US_ASCII
-share/blackbox/nls/da_DK/blackbox.cat
-share/blackbox/nls/de
-share/blackbox/nls/de_DE/blackbox.cat
-share/blackbox/nls/en
-share/blackbox/nls/en_GB
-share/blackbox/nls/en_US
-share/blackbox/nls/es
-share/blackbox/nls/es_AR/blackbox.cat
-share/blackbox/nls/es_ES/blackbox.cat
-share/blackbox/nls/es_MX
-share/blackbox/nls/fr
-share/blackbox/nls/fr_FR/blackbox.cat
-share/blackbox/nls/hu_HU/blackbox.cat
-share/blackbox/nls/it
-share/blackbox/nls/it_IT/blackbox.cat
-share/blackbox/nls/ja_JP/blackbox.cat
-share/blackbox/nls/ko_KR/blackbox.cat
-share/blackbox/nls/lv_LV/blackbox.cat
-share/blackbox/nls/nl
-share/blackbox/nls/nl_NL/blackbox.cat
-share/blackbox/nls/no_NO/blackbox.cat
-share/blackbox/nls/pl_PL/blackbox.cat
-share/blackbox/nls/pt_BR/blackbox.cat
-share/blackbox/nls/ro_RO/blackbox.cat
-share/blackbox/nls/ru_RU/blackbox.cat
-share/blackbox/nls/sk_SK/blackbox.cat
-share/blackbox/nls/sl_SI/blackbox.cat
-share/blackbox/nls/sv_SE/blackbox.cat
-share/blackbox/nls/uk_UA/blackbox.cat
-share/blackbox/nls/zh_CN/blackbox.cat
-share/blackbox/nls/zh_TW/blackbox.cat
-share/blackbox/styles/Artwiz
-share/blackbox/styles/Cthulhain
-share/blackbox/styles/Flux
-share/blackbox/styles/Minimal
-share/blackbox/styles/Nyz
-share/blackbox/styles/Operation
-share/blackbox/styles/Outcomes
-share/blackbox/styles/Rampage
-share/blackbox/styles/Rancor
-share/blackbox/styles/Results
-share/blackbox/styles/Shade
-share/blackbox/styles/Spiff
-share/blackbox/styles/TDF
-share/blackbox/styles/Twice
+share/blackbox/styles/Blue
+share/blackbox/styles/Gray
+share/blackbox/styles/Green
+share/blackbox/styles/Purple
+share/blackbox/styles/Red
@dirrm share/blackbox/styles
-@dirrm share/blackbox/nls/zh_TW
-@dirrm share/blackbox/nls/zh_CN
-@dirrm share/blackbox/nls/uk_UA
-@dirrm share/blackbox/nls/sv_SE
-@dirrm share/blackbox/nls/sl_SI
-@dirrm share/blackbox/nls/sk_SK
-@dirrm share/blackbox/nls/ru_RU
-@dirrm share/blackbox/nls/ro_RO
-@dirrm share/blackbox/nls/pt_BR
-@dirrm share/blackbox/nls/pl_PL
-@dirrm share/blackbox/nls/no_NO
-@dirrm share/blackbox/nls/nl_NL
-@dirrm share/blackbox/nls/lv_LV
-@dirrm share/blackbox/nls/ko_KR
-@dirrm share/blackbox/nls/ja_JP
-@dirrm share/blackbox/nls/it_IT
-@dirrm share/blackbox/nls/hu_HU
-@dirrm share/blackbox/nls/fr_FR
-@dirrm share/blackbox/nls/es_ES
-@dirrm share/blackbox/nls/es_AR
-@dirrm share/blackbox/nls/de_DE
-@dirrm share/blackbox/nls/da_DK
-@dirrm share/blackbox/nls/C
-@dirrm share/blackbox/nls
@dirrm share/blackbox
+@dirrm include/bt
Index: distinfo
===================================================================
RCS file: /cvsroot/pkgsrc/wm/blackbox/distinfo,v
retrieving revision 1.8
diff -u -r1.8 distinfo
--- distinfo 23 Feb 2005 18:43:53 -0000 1.8
+++ distinfo 5 Sep 2005 18:56:26 -0000
@@ -1,9 +1,7 @@
$NetBSD: distinfo,v 1.8 2005/02/23 18:43:53 wiz Exp $
-SHA1 (blackbox-0.65.0.tar.gz) = 903a35526b1c29912ca500b7f8c205368e60fc38
-RMD160 (blackbox-0.65.0.tar.gz) = d88d9c5d9375274da149c77d3c63bb9c92470f26
-Size (blackbox-0.65.0.tar.gz) = 292950 bytes
-SHA1 (patch-aa) = 265249c3e27da0d7dd9b2b85da1c417684c57e0f
-SHA1 (patch-ab) = 6081da04f0dbab0f711523114e130c176a0f1f05
-SHA1 (patch-ac) = 5f249a2e6d75e5d88605d6d8a1675d003b1cb52f
-SHA1 (patch-ad) = 0906aa36c45b1e9ebd8c10e166ac1ba8e345fd9e
+SHA1 (blackbox-0.70.0.tar.gz) = f700efa5d284f97ba4c7aa27d1a3425cb26baf7b
+RMD160 (blackbox-0.70.0.tar.gz) = 64b857aed8cbd49bb6c5168f5f1fc65c609b4e75
+Size (blackbox-0.70.0.tar.gz) = 583527 bytes
+SHA1 (patch-aa) = b3fee258878443d83be18a47ceab5aa7afcecf35
+SHA1 (patch-ab) = f3c2f4e8b310b38050d39b8ada25c225baa34b78
Index: patches/patch-aa
===================================================================
RCS file: /cvsroot/pkgsrc/wm/blackbox/patches/patch-aa,v
retrieving revision 1.1
diff -u -r1.1 patch-aa
--- patches/patch-aa 20 Nov 2002 18:20:30 -0000 1.1
+++ patches/patch-aa 5 Sep 2005 18:56:26 -0000
@@ -1,13 +1,13 @@
-$NetBSD: patch-aa,v 1.1 2002/11/20 18:20:30 jschauma Exp $
+$NetBSD$
---- doc/Makefile.in.orig Wed Nov 20 12:08:31 2002
-+++ doc/Makefile.in Wed Nov 20 12:08:43 2002
-@@ -75,7 +75,7 @@
-
+--- doc/Makefile.in.orig 2005-03-01 20:43:25.000000000 +0100
++++ doc/Makefile.in
+@@ -168,7 +168,7 @@ xft_CFLAGS = @xft_CFLAGS@
+ xft_LIBS = @xft_LIBS@
CLEANFILES = blackbox.1
MAINTAINERCLEANFILES = Makefile.in
-man_MANS = blackbox.1 bsetroot.1 bsetbg.1
+man_MANS = blackbox.1
-
DEFAULT_MENU = $(pkgdatadir)/menu
- mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
+ all: all-am
+
Index: patches/patch-ab
===================================================================
RCS file: /cvsroot/pkgsrc/wm/blackbox/patches/patch-ab,v
retrieving revision 1.1
diff -u -r1.1 patch-ab
--- patches/patch-ab 20 Nov 2002 18:20:30 -0000 1.1
+++ patches/patch-ab 5 Sep 2005 18:56:26 -0000
@@ -1,13 +1,14 @@
-$NetBSD: patch-ab,v 1.1 2002/11/20 18:20:30 jschauma Exp $
+$NetBSD$
---- Makefile.in.orig Wed Nov 20 12:09:13 2002
-+++ Makefile.in Wed Nov 20 12:09:22 2002
-@@ -75,7 +75,7 @@
+--- Makefile.in.orig 2005-03-01 20:43:27.000000000 +0100
++++ Makefile.in
+@@ -191,8 +191,7 @@ AUTOMAKE_OPTIONS = foreign
+ SUBDIRS = data \
+ doc \
+ lib \
+- src \
+- util
++ src
- AUTOMAKE_OPTIONS = foreign
-
--SUBDIRS = data doc nls src util
-+SUBDIRS = data doc nls src
- MAINTAINERCLEANFILES = aclocal.m4 config.h.in configure Makefile.in stamp-h.in
- ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
- mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
+ MAINTAINERCLEANFILES = Makefile.in \
+ aclocal.m4 \
--- /dev/null 2005-09-05 20:53:43.000000000 +0200
+++ buildlink3.mk 2005-09-05 20:57:03.000000000 +0200
@@ -0,0 +1,18 @@
+# $NetBSD$
+
+BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+
+BLACKBOX_BUILDLINK3_MK:= ${BLACKBOX_BUILDLINK3_MK}+
+
+.if !empty(BUILDLINK_DEPTH:M+)
+BUILDLINK_DEPENDS+= blackbox
+.endif
+
+BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Nblackbox}
+BUILDLINK_PACKAGES+= blackbox
+
+.if !empty(BLACKBOX_BUILDLINK3_MK:M+)
+BUILDLINK_DEPENDS.blackbox+= blackbox>=0.70.0
+BUILDLINK_PKGSRCDIR.blackbox?= ../../wm/blackbox
+.endif # BLACKBOX_BUILDLINK3_MK
+
+BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//}
--Apple-Mail-5-429106795
Content-Transfer-Encoding: 7bit
Content-Type: text/plain;
x-unix-mode=0666;
name="bsetroot.diff"
Content-Disposition: attachment;
filename=bsetroot.diff
? work
Index: Makefile
===================================================================
RCS file: /cvsroot/pkgsrc/wm/bsetroot/Makefile,v
retrieving revision 1.17
diff -u -r1.17 Makefile
--- Makefile 17 Jun 2005 03:50:39 -0000 1.17
+++ Makefile 5 Sep 2005 12:15:19 -0000
@@ -1,9 +1,8 @@
# $NetBSD: Makefile,v 1.17 2005/06/17 03:50:39 jlam Exp $
#
-DISTNAME= blackbox-0.65.0
-PKGNAME= bsetroot-0.1
-PKGREVISION= 5
+DISTNAME= blackbox-0.70.0
+PKGNAME= bsetroot-0.2
CATEGORIES= wm x11
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=blackboxwm/}
@@ -14,7 +13,7 @@
USE_LANGUAGES= c c++
GNU_CONFIGURE= YES
-BUILD_DIRS= ${WRKSRC}/nls ${WRKSRC}/util
+BUILD_DIRS= ${WRKSRC}/lib ${WRKSRC}/util
INSTALLATION_DIRS= bin man/man1
@@ -23,8 +22,6 @@
${INSTALL_PROGRAM} ${WRKSRC}/util/bsetroot ${PREFIX}/bin
${INSTALL_MAN} ${WRKSRC}/doc/bsetbg.1 ${PREFIX}/man/man1
${INSTALL_MAN} ${WRKSRC}/doc/bsetroot.1 ${PREFIX}/man/man1
- ( cd ${WRKSRC}/nls && ${MAKE} install )
-.include "../../devel/gettext-lib/buildlink3.mk"
.include "../../mk/x11.buildlink3.mk"
.include "../../mk/bsd.pkg.mk"
Index: PLIST
===================================================================
RCS file: /cvsroot/pkgsrc/wm/bsetroot/PLIST,v
retrieving revision 1.2
diff -u -r1.2 PLIST
--- PLIST 5 Jan 2003 19:58:44 -0000 1.2
+++ PLIST 5 Sep 2005 12:15:19 -0000
@@ -1,64 +1,5 @@
-@comment $NetBSD: PLIST,v 1.2 2003/01/05 19:58:44 jschauma Exp $
+@comment $NetBSD$
bin/bsetbg
bin/bsetroot
man/man1/bsetbg.1
man/man1/bsetroot.1
-share/bsetroot/nls/POSIX
-share/bsetroot/nls/US_ASCII
-share/bsetroot/nls/de
-share/bsetroot/nls/en
-share/bsetroot/nls/en_GB
-share/bsetroot/nls/en_US
-share/bsetroot/nls/es
-share/bsetroot/nls/es_MX
-share/bsetroot/nls/fr
-share/bsetroot/nls/it
-share/bsetroot/nls/nl
-share/bsetroot/nls/C/blackbox.cat
-share/bsetroot/nls/da_DK/blackbox.cat
-share/bsetroot/nls/de_DE/blackbox.cat
-share/bsetroot/nls/es_AR/blackbox.cat
-share/bsetroot/nls/es_ES/blackbox.cat
-share/bsetroot/nls/fr_FR/blackbox.cat
-share/bsetroot/nls/hu_HU/blackbox.cat
-share/bsetroot/nls/it_IT/blackbox.cat
-share/bsetroot/nls/ja_JP/blackbox.cat
-share/bsetroot/nls/ko_KR/blackbox.cat
-share/bsetroot/nls/lv_LV/blackbox.cat
-share/bsetroot/nls/nl_NL/blackbox.cat
-share/bsetroot/nls/no_NO/blackbox.cat
-share/bsetroot/nls/pl_PL/blackbox.cat
-share/bsetroot/nls/pt_BR/blackbox.cat
-share/bsetroot/nls/ro_RO/blackbox.cat
-share/bsetroot/nls/ru_RU/blackbox.cat
-share/bsetroot/nls/sk_SK/blackbox.cat
-share/bsetroot/nls/sl_SI/blackbox.cat
-share/bsetroot/nls/sv_SE/blackbox.cat
-share/bsetroot/nls/uk_UA/blackbox.cat
-share/bsetroot/nls/zh_CN/blackbox.cat
-share/bsetroot/nls/zh_TW/blackbox.cat
-@dirrm share/bsetroot/nls/zh_TW
-@dirrm share/bsetroot/nls/zh_CN
-@dirrm share/bsetroot/nls/uk_UA
-@dirrm share/bsetroot/nls/sv_SE
-@dirrm share/bsetroot/nls/sl_SI
-@dirrm share/bsetroot/nls/sk_SK
-@dirrm share/bsetroot/nls/ru_RU
-@dirrm share/bsetroot/nls/ro_RO
-@dirrm share/bsetroot/nls/pt_BR
-@dirrm share/bsetroot/nls/pl_PL
-@dirrm share/bsetroot/nls/no_NO
-@dirrm share/bsetroot/nls/nl_NL
-@dirrm share/bsetroot/nls/lv_LV
-@dirrm share/bsetroot/nls/ko_KR
-@dirrm share/bsetroot/nls/ja_JP
-@dirrm share/bsetroot/nls/it_IT
-@dirrm share/bsetroot/nls/hu_HU
-@dirrm share/bsetroot/nls/fr_FR
-@dirrm share/bsetroot/nls/es_ES
-@dirrm share/bsetroot/nls/es_AR
-@dirrm share/bsetroot/nls/de_DE
-@dirrm share/bsetroot/nls/da_DK
-@dirrm share/bsetroot/nls/C
-@dirrm share/bsetroot/nls
-@dirrm share/bsetroot
Index: distinfo
===================================================================
RCS file: /cvsroot/pkgsrc/wm/bsetroot/distinfo,v
retrieving revision 1.4
diff -u -r1.4 distinfo
--- distinfo 23 Feb 2005 18:43:53 -0000 1.4
+++ distinfo 5 Sep 2005 12:15:19 -0000
@@ -1,8 +1,6 @@
$NetBSD: distinfo,v 1.4 2005/02/23 18:43:53 wiz Exp $
-SHA1 (blackbox-0.65.0.tar.gz) = 903a35526b1c29912ca500b7f8c205368e60fc38
-RMD160 (blackbox-0.65.0.tar.gz) = d88d9c5d9375274da149c77d3c63bb9c92470f26
-Size (blackbox-0.65.0.tar.gz) = 292950 bytes
-SHA1 (patch-aa) = 134f628eef5cec1e9d7ce4b95a57c7e35a2307d9
-SHA1 (patch-ab) = 0654be7d1465d0adc331714377f17e6e6bd459da
-SHA1 (patch-ac) = 5f249a2e6d75e5d88605d6d8a1675d003b1cb52f
+SHA1 (blackbox-0.70.0.tar.gz) = f700efa5d284f97ba4c7aa27d1a3425cb26baf7b
+RMD160 (blackbox-0.70.0.tar.gz) = 64b857aed8cbd49bb6c5168f5f1fc65c609b4e75
+Size (blackbox-0.70.0.tar.gz) = 583527 bytes
+SHA1 (patch-ab) = 06abd362f8558c5e919a9bdd36498b7d4d153a01
Index: patches/patch-ab
===================================================================
RCS file: /cvsroot/pkgsrc/wm/bsetroot/patches/patch-ab,v
retrieving revision 1.1
diff -u -r1.1 patch-ab
--- patches/patch-ab 5 Jan 2003 19:58:46 -0000 1.1
+++ patches/patch-ab 5 Sep 2005 12:15:19 -0000
@@ -1,13 +1,13 @@
-$NetBSD: patch-ab,v 1.1 2003/01/05 19:58:46 jschauma Exp $
+$NetBSD$
---- configure.orig Sun Jan 5 14:22:25 2003
+--- configure.orig 2005-03-01 20:43:29.000000000 +0100
+++ configure
-@@ -705,7 +705,7 @@ else
- fi
+@@ -1830,7 +1830,7 @@ fi
--PACKAGE=blackbox
-+PACKAGE=bsetroot
+ # Define the identity of the package.
+- PACKAGE=blackbox
++ PACKAGE=bsetroot
+ VERSION=0.70.0
- VERSION=0.65.0
--Apple-Mail-5-429106795
Content-Transfer-Encoding: 7bit
Content-Type: text/plain;
x-unix-mode=0666;
name="bbkeys.diff"
Content-Disposition: attachment;
filename=bbkeys.diff
? work
? patches/patch-ac
? patches/patch-ad
Index: Makefile
===================================================================
RCS file: /cvsroot/pkgsrc/wm/bbkeys/Makefile,v
retrieving revision 1.16
diff -u -r1.16 Makefile
--- Makefile 16 Jul 2005 19:10:40 -0000 1.16
+++ Makefile 5 Sep 2005 18:59:15 -0000
@@ -1,7 +1,7 @@
# $NetBSD: Makefile,v 1.16 2005/07/16 19:10:40 jlam Exp $
#
-DISTNAME= bbkeys-0.8.6
+DISTNAME= bbkeys-0.9.0
CATEGORIES= x11 wm
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=bbkeys/}
@@ -11,7 +11,18 @@
GNU_CONFIGURE= YES
USE_LANGUAGES= c++
-USE_TOOLS+= perl:run
+USE_TOOLS+= perl:run pkg-config
+.include "../../mk/bsd.prefs.mk"
+
+CONFIGURE_ARGS+= --sysconfdir=${PKG_SYSCONFDIR}/bbkeys
+
+EGDIR=${PREFIX}/share/examples/bbkeys
+INSTALL_MAKE_FLAGS= ${MAKE_FLAGS} sysconfdir=${EGDIR}
+
+CONF_FILES =${EGDIR}/bbkeysrc ${PKG_SYSCONFDIR}/bbkeys/bbkeysrc
+CONF_FILES+=${EGDIR}/defaultStyle ${PKG_SYSCONFDIR}/bbkeys/defaultStyle
+
+.include "../../wm/blackbox/buildlink3.mk"
.include "../../mk/x11.buildlink3.mk"
.include "../../mk/bsd.pkg.mk"
Index: PLIST
===================================================================
RCS file: /cvsroot/pkgsrc/wm/bbkeys/PLIST,v
retrieving revision 1.4
diff -u -r1.4 PLIST
--- PLIST 9 Dec 2002 16:01:47 -0000 1.4
+++ PLIST 5 Sep 2005 18:59:15 -0000
@@ -1,15 +1,15 @@
-@comment $NetBSD: PLIST,v 1.4 2002/12/09 16:01:47 tron Exp $
+@comment $NetBSD$
bin/bbkeys
-bin/bbkeysconf.pl
man/man1/bbkeys.1
-man/man5/bbkeys.bb.5
man/man5/bbkeysrc.5
-share/bbtools/bbkeys.bb
-share/bbtools/bbkeys.nobb
share/doc/bbkeys/AUTHORS
share/doc/bbkeys/BUGS
share/doc/bbkeys/ChangeLog
+share/doc/bbkeys/LICENSE
share/doc/bbkeys/NEWS
share/doc/bbkeys/README
-@unexec ${RMDIR} %D/share/bbtools 2>/dev/null || ${TRUE}
+share/doc/bbkeys/TODO
+share/examples/bbkeys/bbkeysrc
+share/examples/bbkeys/defaultStyle
@dirrm share/doc/bbkeys
+@dirrm share/examples/bbkeys
Index: distinfo
===================================================================
RCS file: /cvsroot/pkgsrc/wm/bbkeys/distinfo,v
retrieving revision 1.6
diff -u -r1.6 distinfo
--- distinfo 23 Feb 2005 18:43:53 -0000 1.6
+++ distinfo 5 Sep 2005 18:59:15 -0000
@@ -1,6 +1,7 @@
$NetBSD: distinfo,v 1.6 2005/02/23 18:43:53 wiz Exp $
-SHA1 (bbkeys-0.8.6.tar.gz) = b1638ec44903fffbe8ca822b6ee854c8d48d91eb
-RMD160 (bbkeys-0.8.6.tar.gz) = c78e1386e18131105a9be7eacf249026d315c516
-Size (bbkeys-0.8.6.tar.gz) = 185230 bytes
-SHA1 (patch-aa) = 303186f314c9d0f18415cef97630e874de14048d
+SHA1 (bbkeys-0.9.0.tar.gz) = b406f47f298fe83df6be89d2437dae2cee007439
+RMD160 (bbkeys-0.9.0.tar.gz) = a42506693da977bed17d56ee0c1e5d0440464ac6
+Size (bbkeys-0.9.0.tar.gz) = 199146 bytes
+SHA1 (patch-ac) = 49764c7872a99bd2513f85b7d32cf3ea84085b2a
+SHA1 (patch-ad) = e1f75f97cb4b000c43c4cdcfa950211984d32833
--- /dev/null 2005-09-05 20:53:43.000000000 +0200
+++ patches/patch-ac 2005-09-05 19:19:36.000000000 +0200
@@ -0,0 +1,13 @@
+$NetBSD$
+
+--- data/Makefile.in.orig 2005-03-05 18:00:05.000000000 +0100
++++ data/Makefile.in
+@@ -122,7 +122,7 @@ sbindir = @sbindir@
+ sharedstatedir = @sharedstatedir@
+ sysconfdir = @sysconfdir@
+ target_alias = @target_alias@
+-configdir = $(pkgdatadir)
++configdir = $(sysconfdir)
+
+ config_DATA = bbkeysrc defaultStyle
+
--- /dev/null 2005-09-05 20:53:43.000000000 +0200
+++ patches/patch-ad 2005-09-05 19:23:30.000000000 +0200
@@ -0,0 +1,15 @@
+$NetBSD$
+
+--- src/Makefile.in.orig 2005-03-05 18:00:10.000000000 +0100
++++ src/Makefile.in
+@@ -122,8 +122,8 @@ sbindir = @sbindir@
+ sharedstatedir = @sharedstatedir@
+ sysconfdir = @sysconfdir@
+ target_alias = @target_alias@
+-DEFAULT_RC = $(pkgdatadir)/bbkeysrc
+-DEFAULT_STYLE = $(pkgdatadir)/defaultStyle
++DEFAULT_RC = $(sysconfdir)/bbkeysrc
++DEFAULT_STYLE = $(sysconfdir)/defaultStyle
+
+ AM_CPPFLAGS = @CPPFLAGS@ \
+ -DDEFAULTRC=\"$(DEFAULT_RC)\" \
--Apple-Mail-5-429106795
Content-Transfer-Encoding: 7bit
Content-Type: text/plain;
x-unix-mode=0666;
name="bbpager.diff"
Content-Disposition: attachment;
filename=bbpager.diff
? PLIST-new
Index: Makefile
===================================================================
RCS file: /cvsroot/pkgsrc/wm/bbpager/Makefile,v
retrieving revision 1.13
diff -u -r1.13 Makefile
--- Makefile 1 Jun 2005 18:03:24 -0000 1.13
+++ Makefile 5 Sep 2005 18:58:35 -0000
@@ -1,10 +1,10 @@
# $NetBSD: Makefile,v 1.13 2005/06/01 18:03:24 jlam Exp $
#
-DISTNAME= bbpager-0.3.1
-PKGREVISION= 1
+DISTNAME= bbpager-0.4.1beta1
+PKGNAME= ${DISTNAME:C/beta.//}
CATEGORIES= wm x11
-MASTER_SITES= http://bbtools.windsofstorm.net/sources/
+MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=bbtools/}
MAINTAINER= tech-pkg@NetBSD.org
HOMEPAGE= http://bbtools.windsofstorm.net/available.phtml
@@ -17,6 +17,6 @@
post-install:
${INSTALL_MAN} ${WRKSRC}/bbpager.1 ${PREFIX}/man/man1
- ${INSTALL_MAN} ${WRKSRC}/bbpager.bb.5 ${PREFIX}/man/man5
+.include "../../wm/blackbox/buildlink3.mk"
.include "../../mk/bsd.pkg.mk"
Index: PLIST
===================================================================
RCS file: /cvsroot/pkgsrc/wm/bbpager/PLIST,v
retrieving revision 1.3
diff -u -r1.3 PLIST
--- PLIST 14 Dec 2002 00:21:36 -0000 1.3
+++ PLIST 5 Sep 2005 18:58:35 -0000
@@ -1,8 +1,6 @@
@comment $NetBSD: PLIST,v 1.3 2002/12/14 00:21:36 jschauma Exp $
bin/bbpager
man/man1/bbpager.1
-man/man5/bbpager.bb.5
share/bbtools/README.bbpager
-share/bbtools/bbpager.bb
-share/bbtools/bbpager.nobb
+share/bbtools/bbpager.rc
@unexec ${RMDIR} %D/share/bbtools 2>/dev/null || ${TRUE}
Index: distinfo
===================================================================
RCS file: /cvsroot/pkgsrc/wm/bbpager/distinfo,v
retrieving revision 1.3
diff -u -r1.3 distinfo
--- distinfo 23 Feb 2005 18:43:53 -0000 1.3
+++ distinfo 5 Sep 2005 18:58:35 -0000
@@ -1,7 +1,6 @@
$NetBSD: distinfo,v 1.3 2005/02/23 18:43:53 wiz Exp $
-SHA1 (bbpager-0.3.1.tar.gz) = a0a6708e7badb62d5e8cbbac276ccdc4eb109ea4
-RMD160 (bbpager-0.3.1.tar.gz) = 6be45a7150d83de4e078b4feea0ad81b8aa491dd
-Size (bbpager-0.3.1.tar.gz) = 81686 bytes
+SHA1 (bbpager-0.4.1beta1.tar.gz) = 272b826c3fce722c7334b5b6f32a37c0d82529e2
+RMD160 (bbpager-0.4.1beta1.tar.gz) = 3ee093f21ed45028caff3ffa06c759babd44e0c9
+Size (bbpager-0.4.1beta1.tar.gz) = 163099 bytes
SHA1 (patch-aa) = b82d730bb85d59df9cfc916865935b6f13988bc4
-SHA1 (patch-ab) = 0086f41b642bc8770d19995302701748823386c3
--Apple-Mail-5-429106795
Content-Transfer-Encoding: 7bit
Content-Type: text/plain;
charset=US-ASCII;
format=flowed
--Apple-Mail-5-429106795--