[pkgsrc/trunk]: pkgsrc/multimedia/kdemultimedia3 this pkg does not conflict w...

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

details:   https://anonhg.NetBSD.org/pkgsrc/rev/a598b3a86af2
branches:  trunk
changeset: 477418:a598b3a86af2
user:      drochner <drochner%pkgsrc.org@localhost>
date:      Fri Jul 02 15:10:56 2004 +0000

description:
this pkg does not conflict with timidity

diffstat:

 multimedia/kdemultimedia3/Makefile |  4 +---
 1 files changed, 1 insertions(+), 3 deletions(-)

diffs (16 lines):

diff -r 854ec4ab4cce -r a598b3a86af2 multimedia/kdemultimedia3/Makefile
--- a/multimedia/kdemultimedia3/Makefile        Fri Jul 02 14:44:52 2004 +0000
+++ b/multimedia/kdemultimedia3/Makefile        Fri Jul 02 15:10:56 2004 +0000
@@ -1,11 +1,9 @@
-# $NetBSD: Makefile,v 1.13 2004/04/20 13:13:42 markd Exp $
+# $NetBSD: Makefile,v 1.14 2004/07/02 15:10:56 drochner Exp $
 
 DISTNAME=      kdemultimedia-${_KDE_VERSION}
 CATEGORIES=    multimedia
 COMMENT=       Multimedia tools for the KDE integrated X11 desktop
 
-CONFLICTS=     timidity-[0-9]*
-
 .include "../../meta-pkgs/kde3/Makefile.kde3"
 
 DEPENDS+=      xine-arts>=1rc0a:../../audio/xine-arts