From 6c1a320995fd665c91c917d6d64e9e0e3305809e Mon Sep 17 00:00:00 2001
From: mycroft <mycroft@pkgsrc.org>
Date: Sat, 5 Sep 1998 12:37:58 +0000
Subject: Add conflict.

---
 emulators/xmame/Makefile | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'emulators')

diff --git a/emulators/xmame/Makefile b/emulators/xmame/Makefile
index d57a4c1b4d7..d314c401599 100644
--- a/emulators/xmame/Makefile
+++ b/emulators/xmame/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.16 1998/09/05 12:27:39 mycroft Exp $
+# $NetBSD: Makefile,v 1.17 1998/09/05 12:37:58 mycroft Exp $
 #
 
 DISTNAME=		xmame-0.34b2.1
@@ -12,7 +12,7 @@ HOMEPAGE=		http://drake.dit.upm.es/~mame/
 RUN_DEPENDS=		unzip:../../archivers/unzip
 DEPENDS+=		xpm-3.4k:../../graphics/xpm
 
-CONFLICTS=		xmame-0.30.1 xmame-0.33b6.1
+CONFLICTS=		xmame-0.30.1 xmame-0.33b6.1 xmame-0.34b1.1
 
 USE_X11=		yes
 USE_GMAKE=		yes
-- 
cgit v1.2.3