[pkgsrc/trunk]: pkgsrc/audio Share PKGNAME so that we get implicit conflicts ...

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

details:   https://anonhg.NetBSD.org/pkgsrc/rev/f7a79328ac60
branches:  trunk
changeset: 465943:f7a79328ac60
user:      jmmv <jmmv%pkgsrc.org@localhost>
date:      Thu Jan 08 19:58:34 2004 +0000

description:
Share PKGNAME so that we get implicit conflicts through the version number.
There is no need for different PKGNAMEs, which will only make things more
complex in the future (to track dependancies and the like).

diffstat:

 audio/icecast/Makefile  |  4 +---
 audio/icecast2/Makefile |  5 +----
 2 files changed, 2 insertions(+), 7 deletions(-)

diffs (40 lines):

diff -r 18c167330966 -r f7a79328ac60 audio/icecast/Makefile
--- a/audio/icecast/Makefile    Thu Jan 08 19:48:05 2004 +0000
+++ b/audio/icecast/Makefile    Thu Jan 08 19:58:34 2004 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.16 2004/01/08 19:42:31 xtraeme Exp $
+# $NetBSD: Makefile,v 1.17 2004/01/08 19:58:34 jmmv Exp $
 #
 
 DISTNAME=      icecast-1.3.12
@@ -14,8 +14,6 @@
 GNU_CONFIGURE=         # defined
 USE_PKGINSTALL=                yes
 
-CONFLICTS+=            icecast2-[0-9]*
-
 RCD_SCRIPTS=           icecast
 PKG_SYSCONFSUBDIR=     icecast
 
diff -r 18c167330966 -r f7a79328ac60 audio/icecast2/Makefile
--- a/audio/icecast2/Makefile   Thu Jan 08 19:48:05 2004 +0000
+++ b/audio/icecast2/Makefile   Thu Jan 08 19:58:34 2004 +0000
@@ -1,8 +1,7 @@
-# $NetBSD: Makefile,v 1.1.1.1 2004/01/08 19:39:42 xtraeme Exp $
+# $NetBSD: Makefile,v 1.2 2004/01/08 19:58:34 jmmv Exp $
 #
 
 DISTNAME=              icecast-2.0.0
-PKGNAME=               ${DISTNAME:S/-/2-/}
 CATEGORIES=            audio
 MASTER_SITES=          http://www.icecast.org/files/
 
@@ -10,8 +9,6 @@
 HOMEPAGE=              http://www.icecast.org/
 COMMENT=               Live streaming audio server
 
-CONFLICTS+=            icecast-[0-9]*:../../audio/icecast
-
 USE_BUILDLINK2=                yes
 USE_PKGLOCALEDIR=      yes
 USE_LIBTOOL=           yes