From 2a95ad9c6be52511880e6ee241b087af70706624 Mon Sep 17 00:00:00 2001
From: hubertf <hubertf@pkgsrc.org>
Date: Sat, 20 Feb 1999 22:48:24 +0000
Subject: Fix CONFLICTS (remove redundancy, mostly)

---
 emulators/wine/Makefile  | 4 +---
 emulators/xmame/Makefile | 5 +----
 emulators/xmess/Makefile | 4 +---
 3 files changed, 3 insertions(+), 10 deletions(-)

(limited to 'emulators')

diff --git a/emulators/wine/Makefile b/emulators/wine/Makefile
index ac44ff730fa..cf3db325b06 100644
--- a/emulators/wine/Makefile
+++ b/emulators/wine/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.15 1999/01/30 23:18:46 agc Exp $
+# $NetBSD: Makefile,v 1.16 1999/02/20 22:48:28 hubertf Exp $
 
 DISTNAME=		Wine-981211
 PKGNAME=		wine-981211
@@ -13,8 +13,6 @@ HOMEPAGE=		http://www.winehq.com/
 
 DEPENDS+=		xpm-3.4k:../../graphics/xpm
 
-CONFLICTS=		wine-980[26]*
-
 USE_X11BASE=		yes
 GNU_CONFIGURE=		yes
 CONFIGURE_ARGS+=	--enable-dll
diff --git a/emulators/xmame/Makefile b/emulators/xmame/Makefile
index b801dd9b424..42a7bb9997a 100644
--- a/emulators/xmame/Makefile
+++ b/emulators/xmame/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.28 1999/01/30 23:18:46 agc Exp $
+# $NetBSD: Makefile,v 1.29 1999/02/20 22:48:28 hubertf Exp $
 #
 
 DISTNAME=		xmame-0.34b8.1
@@ -12,9 +12,6 @@ HOMEPAGE=		http://xmame.retrogames.com/
 DEPENDS=		unzip-5.40:../../archivers/unzip
 DEPENDS+=		xpm-3.4k:../../graphics/xpm
 
-CONFLICTS=		xmame-0.30.1 xmame-0.33b6.1 xmame-0.34b1.1 \
-			xmame-0.34b2.1 xmame-0.34b2.2 xmame-0.34b5.2
-
 NOT_FOR_ARCHS=		alpha	#gcc lossage
 
 USE_X11BASE=		yes
diff --git a/emulators/xmess/Makefile b/emulators/xmess/Makefile
index bfb993f9b62..a555d522402 100644
--- a/emulators/xmess/Makefile
+++ b/emulators/xmess/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.9 1999/01/30 23:18:46 agc Exp $
+# $NetBSD: Makefile,v 1.10 1999/02/20 22:48:29 hubertf Exp $
 #
 
 DISTNAME=		unix02b4
@@ -13,8 +13,6 @@ HOMEPAGE=		http://internetter.com/titan/mess/
 DEPENDS=		unzip-5.40:../../archivers/unzip
 DEPENDS+=		xpm-3.4k:../../graphics/xpm
 
-CONFLICTS=		xmess-0.1
-
 NOT_FOR_ARCHS=		alpha	#gcc lossage
 
 USE_X11BASE=		yes
-- 
cgit v1.2.3