summaryrefslogtreecommitdiff
path: root/wm
diff options
context:
space:
mode:
authorwiz <wiz>2002-03-18 09:23:00 +0000
committerwiz <wiz>2002-03-18 09:23:00 +0000
commit17c9279f198a6cbba53298b66eca76104e9206b7 (patch)
treeee3d64349f2e8a814f9fcda45c666f484bc066a0 /wm
parent87ba62d2ba35ee7fe0d6d50ebfb553aba3fec041 (diff)
downloadpkgsrc-17c9279f198a6cbba53298b66eca76104e9206b7.tar.gz
Update to 0.8.4:
Works better with blackbox 0.62.1. Inspired by pkg/14900 by Yannick Montulet.
Diffstat (limited to 'wm')
-rw-r--r--wm/bbkeys/Makefile14
-rw-r--r--wm/bbkeys/Makefile.common11
-rw-r--r--wm/bbkeys/PLIST14
-rw-r--r--wm/bbkeys/distinfo8
-rw-r--r--wm/bbkeys/patches/patch-aa13
-rw-r--r--wm/bbkeys/patches/patch-ab17
6 files changed, 57 insertions, 20 deletions
diff --git a/wm/bbkeys/Makefile b/wm/bbkeys/Makefile
index fde9e37dd13..80c4ded2be1 100644
--- a/wm/bbkeys/Makefile
+++ b/wm/bbkeys/Makefile
@@ -1,13 +1,21 @@
-# $NetBSD: Makefile,v 1.4 2001/08/29 22:41:22 jlam Exp $
+# $NetBSD: Makefile,v 1.5 2002/03/18 09:23:00 wiz Exp $
#
-.include "Makefile.common"
+DISTNAME= bbkeys-0.8.4
+CATEGORIES= x11 wm
+MASTER_SITES= http://bbkeys.sourceforge.net/downloads/
+# I'd like to add the next line, but the file there has the same name,
+# but is just a tar, not a tar.gz. [wiz 2002-03-18]
+# ${MASTER_SITE_SOURCEFORGE:=bbkeys/}
-PKGNAME= bbkeys-0.3.5
+MAINTAINER= packages@netbsd.org
+HOMEPAGE= http://bbkeys.sourceforge.net/
COMMENT= General X Window keygrabber
GNU_CONFIGURE= YES
USE_BUILDLINK_ONLY= YES
+USE_PERL5= YES
+USE_X11BASE= YES
.include "../../mk/x11.buildlink.mk"
.include "../../mk/bsd.pkg.mk"
diff --git a/wm/bbkeys/Makefile.common b/wm/bbkeys/Makefile.common
deleted file mode 100644
index eef5d68f575..00000000000
--- a/wm/bbkeys/Makefile.common
+++ /dev/null
@@ -1,11 +0,0 @@
-# $NetBSD: Makefile.common,v 1.2 2001/06/26 20:55:38 jlam Exp $
-#
-
-DISTNAME= bbkeys-0.3.5
-CATEGORIES= x11 wm
-MASTER_SITES= http://movingparts.thelinuxcommunity.org/bbkeys/
-
-MAINTAINER= alaric@alaric-snell.com
-HOMEPAGE= http://movingparts.thelinuxcommunity.org/bbkeys.shtml
-
-USE_X11BASE= YES
diff --git a/wm/bbkeys/PLIST b/wm/bbkeys/PLIST
index 85b0b9237a7..0c8d7448be8 100644
--- a/wm/bbkeys/PLIST
+++ b/wm/bbkeys/PLIST
@@ -1,7 +1,15 @@
-@comment $NetBSD: PLIST,v 1.2 2002/03/14 15:17:15 wiz Exp $
+@comment $NetBSD: PLIST,v 1.3 2002/03/18 09:23:01 wiz Exp $
bin/bbkeys
-bin/bbkeysConfigC
-share/bbtools/README.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/NEWS
+share/doc/bbkeys/README
@unexec ${RMDIR} %D/share/bbtools 2>/dev/null || true
+@dirrm share/doc/bbkeys
diff --git a/wm/bbkeys/distinfo b/wm/bbkeys/distinfo
index 69223877ead..fb0569f8173 100644
--- a/wm/bbkeys/distinfo
+++ b/wm/bbkeys/distinfo
@@ -1,4 +1,6 @@
-$NetBSD: distinfo,v 1.2 2001/04/17 16:03:43 agc Exp $
+$NetBSD: distinfo,v 1.3 2002/03/18 09:23:02 wiz Exp $
-SHA1 (bbkeys-0.3.5.tar.gz) = 1c0e74db16b940e0fbcda088a11a9c9af905a1e8
-Size (bbkeys-0.3.5.tar.gz) = 102703 bytes
+SHA1 (bbkeys-0.8.4.tar.gz) = 08db9aadac6e7c3a793de0af4ca1522d492a6c55
+Size (bbkeys-0.8.4.tar.gz) = 183028 bytes
+SHA1 (patch-aa) = 295e195b368d45cef51064da67b520764395349b
+SHA1 (patch-ab) = 9cdcb9e6c19f178232527a9ad28d222ffe0d98ac
diff --git a/wm/bbkeys/patches/patch-aa b/wm/bbkeys/patches/patch-aa
new file mode 100644
index 00000000000..bd36ef4fbb4
--- /dev/null
+++ b/wm/bbkeys/patches/patch-aa
@@ -0,0 +1,13 @@
+$NetBSD: patch-aa,v 1.1 2002/03/18 09:23:03 wiz Exp $
+
+--- Makefile.in.orig Fri Jan 18 14:34:58 2002
++++ Makefile.in
+@@ -78,7 +78,7 @@
+
+ SUBDIRS = src data doc redhat
+
+-docdir = $(prefix)/doc/bbkeys
++docdir = $(prefix)/share/doc/bbkeys
+ doc_DATA = README AUTHORS BUGS ChangeLog NEWS
+ EXTRA_DIST = $(doc_DATA) debian redhat
+ ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
diff --git a/wm/bbkeys/patches/patch-ab b/wm/bbkeys/patches/patch-ab
new file mode 100644
index 00000000000..76fb9351e87
--- /dev/null
+++ b/wm/bbkeys/patches/patch-ab
@@ -0,0 +1,17 @@
+$NetBSD: patch-ab,v 1.1 2002/03/18 09:23:03 wiz Exp $
+
+--- src/bbkeys.cc.orig Tue Jan 15 04:21:25 2002
++++ src/bbkeys.cc
+@@ -676,10 +676,10 @@
+ char *args = new char[strlen(begin) + strlen(bbkeys_rcfile) +1];
+ sprintf(args, "%s%s", begin, bbkeys_rcfile);
+ res = execlp("rxvt", "rxvt", "-bg", "black", "-fg", "red",
+- "-e", args, NULL);
++ "-e", "bbkeysconf.pl", "-rcfile", bbkeys_rcfile, NULL);
+ if (res != 0) {
+ execlp("xterm", "xterm", "-bg", "black", "-fg",
+- "red", "-e", args, NULL);
++ "red", "-e", "bbkeysconf.pl", "-rcfile", bbkeys_rcfile, NULL);
+ }
+ delete args;
+ }