summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--audio/kdemultimedia3/Makefile4
-rw-r--r--audio/timidity/Makefile4
2 files changed, 6 insertions, 2 deletions
diff --git a/audio/kdemultimedia3/Makefile b/audio/kdemultimedia3/Makefile
index f516463672a..2d9d2d9f8e6 100644
--- a/audio/kdemultimedia3/Makefile
+++ b/audio/kdemultimedia3/Makefile
@@ -1,9 +1,11 @@
-# $NetBSD: Makefile,v 1.28 2003/09/30 12:24:19 seb Exp $
+# $NetBSD: Makefile,v 1.29 2003/10/04 05:47:31 mycroft Exp $
DISTNAME= kdemultimedia-3.1.4
CATEGORIES= audio
COMMENT= Audio tools for the KDE integrated X11 desktop
+CONFLICTS= timidity-[0-9]*
+
.include "../../meta-pkgs/kde3/Makefile.kde3"
DEPENDS+= xanim>=2.80.0:../../graphics/xanim
diff --git a/audio/timidity/Makefile b/audio/timidity/Makefile
index 588972dbeba..bd0fe412521 100644
--- a/audio/timidity/Makefile
+++ b/audio/timidity/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.42 2003/09/28 09:13:55 jlam Exp $
+# $NetBSD: Makefile,v 1.43 2003/10/04 05:47:31 mycroft Exp $
#
DISTNAME= TiMidity++-2.11.3
@@ -12,6 +12,8 @@ MAINTAINER= wiz@NetBSD.org
HOMEPAGE= http://www.goice.co.jp/member/mo/timidity/
COMMENT= MIDI to WAV renderer and player
+CONFLICTS= kdemultimedia-[0-9]*
+
GNU_CONFIGURE= yes
CONFIGURE_ARGS+=--enable-vt100 --enable-audio=sun,vorbis --disable-debug \
--enable-gtk --enable-wrd --enable-xaw --enable-ncurses \