From eb53ec289c9d302b0b8817486d22c5e647c81884 Mon Sep 17 00:00:00 2001
From: jschauma <jschauma>
Date: Sun, 20 Aug 2006 23:08:44 +0000
Subject: add/enable bbkeys09, bbpager04, blackbox70 have older versions
 conflict with these newer incompatible versions

---
 wm/Makefile          | 5 ++++-
 wm/bbkeys/Makefile   | 4 +++-
 wm/bbpager/Makefile  | 4 +++-
 wm/blackbox/Makefile | 4 +++-
 4 files changed, 13 insertions(+), 4 deletions(-)

(limited to 'wm')

diff --git a/wm/Makefile b/wm/Makefile
index 89518c79580..0af42582892 100644
--- a/wm/Makefile
+++ b/wm/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.84 2006/08/04 01:10:42 reed Exp $
+# $NetBSD: Makefile,v 1.85 2006/08/20 23:08:44 jschauma Exp $
 #
 
 COMMENT=	X11 window managers, configuration tools, and themes
@@ -12,9 +12,12 @@ SUBDIR+=	amaterus
 SUBDIR+=	amiwm
 SUBDIR+=	bbconf
 SUBDIR+=	bbkeys
+SUBDIR+=	bbkeys04
 SUBDIR+=	bbpager
+SUBDIR+=	bbpager09
 SUBDIR+=	bbrun
 SUBDIR+=	blackbox
+SUBDIR+=	blackbox70
 SUBDIR+=	bsetroot
 SUBDIR+=	ctwm
 SUBDIR+=	cwm
diff --git a/wm/bbkeys/Makefile b/wm/bbkeys/Makefile
index b3c3d40bdaa..be1e1d35d9a 100644
--- a/wm/bbkeys/Makefile
+++ b/wm/bbkeys/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.18 2006/07/22 04:46:19 rillig Exp $
+# $NetBSD: Makefile,v 1.19 2006/08/20 23:08:44 jschauma Exp $
 #
 
 DISTNAME=	bbkeys-0.8.6
@@ -10,6 +10,8 @@ MAINTAINER=	jschauma@NetBSD.org
 HOMEPAGE=	http://bbkeys.sourceforge.net/
 COMMENT=	General X Window keygrabber
 
+CONFLICTS+=	bbkeys09-*
+
 GNU_CONFIGURE=	YES
 USE_LANGUAGES=	c c++
 USE_TOOLS+=	perl:run
diff --git a/wm/bbpager/Makefile b/wm/bbpager/Makefile
index a650fb43b2e..d73d5c22b5b 100644
--- a/wm/bbpager/Makefile
+++ b/wm/bbpager/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.16 2006/07/22 04:46:19 rillig Exp $
+# $NetBSD: Makefile,v 1.17 2006/08/20 23:08:44 jschauma Exp $
 #
 
 DISTNAME=	bbpager-0.3.1
@@ -10,6 +10,8 @@ MAINTAINER=	pkgsrc-users@NetBSD.org
 HOMEPAGE=	http://bbtools.windsofstorm.net/available.phtml
 COMMENT=	Pager for the blackbox window manager
 
+CONFLICTS+=	bbpager04-*
+
 GNU_CONFIGURE=	YES
 USE_LANGUAGES=	c c++
 
diff --git a/wm/blackbox/Makefile b/wm/blackbox/Makefile
index 46c17841936..abb9062f0b7 100644
--- a/wm/blackbox/Makefile
+++ b/wm/blackbox/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.26 2006/02/05 23:11:12 joerg Exp $
+# $NetBSD: Makefile,v 1.27 2006/08/20 23:08:44 jschauma Exp $
 #
 
 DISTNAME=	blackbox-0.65.0
@@ -12,6 +12,8 @@ COMMENT=	Small and fast X11R6 window manager
 
 DEPENDS+=	bsetroot>=0.1nb1:../../wm/bsetroot
 
+CONFLICTS+=	blackbox70>=0.70.1
+
 USE_LANGUAGES=	c c++
 GNU_CONFIGURE=	YES
 
-- 
cgit v1.2.3