[pkgsrc/trunk]: pkgsrc/audio These both install "timidity" executables.

[mycroft <mycroft%pkgsrc.org@localhost>]

details:   https://anonhg.NetBSD.org/pkgsrc/rev/4cc79729e5aa
branches:  trunk
changeset: 462490:4cc79729e5aa
user:      mycroft <mycroft%pkgsrc.org@localhost>
date:      Sat Oct 04 05:47:31 2003 +0000

description:
These both install "timidity" executables.

diffstat:

 audio/kdemultimedia3/Makefile |  4 +++-
 audio/timidity/Makefile       |  4 +++-
 2 files changed, 6 insertions(+), 2 deletions(-)

diffs (34 lines):

diff -r 1950f9e87bb8 -r 4cc79729e5aa audio/kdemultimedia3/Makefile
--- a/audio/kdemultimedia3/Makefile     Sat Oct 04 02:12:16 2003 +0000
+++ b/audio/kdemultimedia3/Makefile     Sat Oct 04 05:47:31 2003 +0000
@@ -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 -r 1950f9e87bb8 -r 4cc79729e5aa audio/timidity/Makefile
--- a/audio/timidity/Makefile   Sat Oct 04 02:12:16 2003 +0000
+++ b/audio/timidity/Makefile   Sat Oct 04 05:47:31 2003 +0000
@@ -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 @@
 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 \