summaryrefslogtreecommitdiff
path: root/audio
diff options
context:
space:
mode:
authorKirill Ponomarev <krion@FreeBSD.org>2003-10-11 14:36:37 +0000
committerKirill Ponomarev <krion@FreeBSD.org>2003-10-11 14:36:37 +0000
commitf8b1515d13ea8a376eaa893f361bc1d42e5453ea (patch)
tree4dff96db4fd00e711841a4b1629c3b389e692a96 /audio
parent- Add CONFLICTS, because of the same item in pkg-plist (diff)
- Add CONFLICTS, because of the same item in pkg-plist
Submitted by: Oliver Eikemeier <eikemeier@fillmore-labs.com>
Notes
Notes: svn path=/head/; revision=90850
Diffstat (limited to 'audio')
-rw-r--r--audio/timidity++/Makefile2
-rw-r--r--audio/timidity/Makefile2
2 files changed, 4 insertions, 0 deletions
diff --git a/audio/timidity++/Makefile b/audio/timidity++/Makefile
index e80c8b749392..1d5d39a78565 100644
--- a/audio/timidity++/Makefile
+++ b/audio/timidity++/Makefile
@@ -15,6 +15,8 @@ DISTNAME= TiMidity++-${PORTVERSION}
MAINTAINER?= yatt@luna2.org
COMMENT?= Software MIDI player
+CONFLICTS= timidity-0.*
+
# If you don't have X11, type "make -DWITHOUT_X11" or uncomment this.
#WITHOUT_X11= yes
diff --git a/audio/timidity/Makefile b/audio/timidity/Makefile
index a4214d0735c8..8162dc0ac625 100644
--- a/audio/timidity/Makefile
+++ b/audio/timidity/Makefile
@@ -16,6 +16,8 @@ EXTRACT_ONLY= ${DISTNAME}.tar.gz
MAINTAINER= ports@FreeBSD.org
COMMENT= MIDI to WAV renderer and player
+CONFLICTS= timidity++-2.11.*
+
NO_CDROM= "Uses copyrighted patches"
TIINS= goemon.tgz