From ddb30ada50e5ce8253446443f4f1f52c42e886f5 Mon Sep 17 00:00:00 2001
From: jschauma <jschauma>
Date: Wed, 20 Nov 2002 18:20:30 +0000
Subject: Rip out bsetroot and bsetbg, which are now provided in wm/bsetroot,
 so they can be shared with openbox.

Bump PKGREVISION.
---
 wm/blackbox/Makefile         |  5 ++++-
 wm/blackbox/PLIST            |  6 +-----
 wm/blackbox/distinfo         |  4 +++-
 wm/blackbox/patches/patch-aa | 13 +++++++++++++
 wm/blackbox/patches/patch-ab | 13 +++++++++++++
 5 files changed, 34 insertions(+), 7 deletions(-)
 create mode 100644 wm/blackbox/patches/patch-aa
 create mode 100644 wm/blackbox/patches/patch-ab

(limited to 'wm')

diff --git a/wm/blackbox/Makefile b/wm/blackbox/Makefile
index f0249fb3c04..6e20a9007e3 100644
--- a/wm/blackbox/Makefile
+++ b/wm/blackbox/Makefile
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.8 2002/09/19 15:54:48 jschauma Exp $
+# $NetBSD: Makefile,v 1.9 2002/11/20 18:20:30 jschauma Exp $
 #
 
 DISTNAME=	blackbox-0.65.0
+PKGREVISION=	1
 CATEGORIES=	x11 wm
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=blackboxwm/}
 
@@ -9,6 +10,8 @@ MAINTAINER=	jschauma@netbsd.org
 HOMEPAGE=	http://blackboxwm.sourceforge.net/
 COMMENT=	small and fast X11R6 window manager
 
+DEPENDS+=	bsetroot>=0.1:../../wm/bsetroot
+
 USE_BUILDLINK2=		yes
 USE_X11BASE=		yes
 GNU_CONFIGURE=		yes
diff --git a/wm/blackbox/PLIST b/wm/blackbox/PLIST
index 0bc89a7f69b..0b7ad1336c1 100644
--- a/wm/blackbox/PLIST
+++ b/wm/blackbox/PLIST
@@ -1,10 +1,6 @@
-@comment $NetBSD: PLIST,v 1.3 2002/09/19 15:54:48 jschauma Exp $
+@comment $NetBSD: PLIST,v 1.4 2002/11/20 18:20:30 jschauma Exp $
 bin/blackbox
-bin/bsetbg
-bin/bsetroot
 man/man1/blackbox.1
-man/man1/bsetbg.1
-man/man1/bsetroot.1
 share/blackbox/menu
 share/blackbox/nls/C/blackbox.cat
 share/blackbox/nls/POSIX
diff --git a/wm/blackbox/distinfo b/wm/blackbox/distinfo
index 9f485ec7b8e..d93b1324ebd 100644
--- a/wm/blackbox/distinfo
+++ b/wm/blackbox/distinfo
@@ -1,4 +1,6 @@
-$NetBSD: distinfo,v 1.4 2002/09/19 15:54:48 jschauma Exp $
+$NetBSD: distinfo,v 1.5 2002/11/20 18:20:30 jschauma Exp $
 
 SHA1 (blackbox-0.65.0.tar.gz) = 903a35526b1c29912ca500b7f8c205368e60fc38
 Size (blackbox-0.65.0.tar.gz) = 292950 bytes
+SHA1 (patch-aa) = 265249c3e27da0d7dd9b2b85da1c417684c57e0f
+SHA1 (patch-ab) = 6081da04f0dbab0f711523114e130c176a0f1f05
diff --git a/wm/blackbox/patches/patch-aa b/wm/blackbox/patches/patch-aa
new file mode 100644
index 00000000000..0ef2c42b1c8
--- /dev/null
+++ b/wm/blackbox/patches/patch-aa
@@ -0,0 +1,13 @@
+$NetBSD: patch-aa,v 1.1 2002/11/20 18:20:30 jschauma Exp $
+
+--- 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 @@
+ 
+ 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
diff --git a/wm/blackbox/patches/patch-ab b/wm/blackbox/patches/patch-ab
new file mode 100644
index 00000000000..1dfb62d7aef
--- /dev/null
+++ b/wm/blackbox/patches/patch-ab
@@ -0,0 +1,13 @@
+$NetBSD: patch-ab,v 1.1 2002/11/20 18:20:30 jschauma Exp $
+
+--- Makefile.in.orig	Wed Nov 20 12:09:13 2002
++++ Makefile.in	Wed Nov 20 12:09:22 2002
+@@ -75,7 +75,7 @@
+ 
+ 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
-- 
cgit v1.2.3