summaryrefslogtreecommitdiff
path: root/emulators
diff options
context:
space:
mode:
authormycroft <mycroft@pkgsrc.org>1998-11-04 14:06:03 +0000
committermycroft <mycroft@pkgsrc.org>1998-11-04 14:06:03 +0000
commit32b429852161994216d056e4b0230417da0e3e3b (patch)
tree3dce0ed84daadad1d6e181db6aeca5c6865339ee /emulators
parent3087bb9f66eff43e0da763fa2deb9dd6b2c5025a (diff)
downloadpkgsrc-32b429852161994216d056e4b0230417da0e3e3b.tar.gz
Missed a 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 fc09daeddd2..ea705df6738 100644
--- a/emulators/xmame/Makefile
+++ b/emulators/xmame/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.22 1998/11/04 14:05:32 mycroft Exp $
+# $NetBSD: Makefile,v 1.23 1998/11/04 14:06:03 mycroft Exp $
#
DISTNAME= xmame-0.34b5.2
@@ -15,7 +15,7 @@ RUN_DEPENDS= unzip:../../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.1 xmame-0.34b2.2
USE_X11= yes
USE_GMAKE= yes