summaryrefslogtreecommitdiff
path: root/audio
diff options
context:
space:
mode:
authorhubertf <hubertf@pkgsrc.org>1999-02-20 22:48:24 +0000
committerhubertf <hubertf@pkgsrc.org>1999-02-20 22:48:24 +0000
commit2a95ad9c6be52511880e6ee241b087af70706624 (patch)
treef0ac98b899382f539e1e39385f1316edd18626bd /audio
parent2821cb11104fb7319e84b4cd1808cf56f3604a54 (diff)
downloadpkgsrc-2a95ad9c6be52511880e6ee241b087af70706624.tar.gz
Fix CONFLICTS (remove redundancy, mostly)
Diffstat (limited to 'audio')
-rw-r--r--audio/mikmod/Makefile4
-rw-r--r--audio/xmcd/Makefile4
2 files changed, 2 insertions, 6 deletions
diff --git a/audio/mikmod/Makefile b/audio/mikmod/Makefile
index 6abbe7e764a..1f744b7c339 100644
--- a/audio/mikmod/Makefile
+++ b/audio/mikmod/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.13 1998/11/12 23:03:39 frueauf Exp $
+# $NetBSD: Makefile,v 1.14 1999/02/20 22:48:24 hubertf Exp $
#
DISTNAME= mikmod-3.0.3
@@ -12,8 +12,6 @@ HOMEPAGE= http://www.freenet.tlh.fl.us/~amstpi/mikmod.html
DEPENDS+= ncurses-1.9.9g:../../devel/ncurses
-CONFLICTS= mikmod-2.14
-
USE_GMAKE= yes
.include "../../mk/bsd.prefs.mk"
diff --git a/audio/xmcd/Makefile b/audio/xmcd/Makefile
index 3e40777e823..acef9c3151b 100644
--- a/audio/xmcd/Makefile
+++ b/audio/xmcd/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.13 1998/11/05 06:35:24 mycroft Exp $
+# $NetBSD: Makefile,v 1.14 1999/02/20 22:48:24 hubertf Exp $
#
DISTNAME= xmcd-2.4
@@ -10,8 +10,6 @@ HOMEPAGE= http://sunsite.unc.edu/~cddb/xmcd/index.html
DEPENDS+= ncurses-1.9.9g:../../devel/ncurses
-CONFLICTS= xmcd-2.3
-
USE_MOTIF= yes
USE_IMAKE= yes
IS_INTERACTIVE= yes # asks a lot of questions