summaryrefslogtreecommitdiff
path: root/emulators
diff options
context:
space:
mode:
authormycroft <mycroft>1998-09-05 12:37:58 +0000
committermycroft <mycroft>1998-09-05 12:37:58 +0000
commit0f25c97ecdcffad469214b8dca109d252efb6d0e (patch)
tree46faa89f6d8a6bc1978bd044bfaac4c9b14c68df /emulators
parent6a7abb4c52659561f18fde19b058713f8f569062 (diff)
downloadpkgsrc-0f25c97ecdcffad469214b8dca109d252efb6d0e.tar.gz
Add conflict.
Diffstat (limited to 'emulators')
-rw-r--r--emulators/xmame/Makefile4
1 files changed, 2 insertions, 2 deletions
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