diff options
| author | jmmv <jmmv@pkgsrc.org> | 2004-01-08 19:58:34 +0000 |
|---|---|---|
| committer | jmmv <jmmv@pkgsrc.org> | 2004-01-08 19:58:34 +0000 |
| commit | 56eb233c19809608c600cd3d7ee0c8bb43edb4d2 (patch) | |
| tree | d3dd9a4b23c819b555a248b84bf01e8e3d8b2646 | |
| parent | dde75f6bf4cc2631a918f44e465a9f3508bafa35 (diff) | |
| download | pkgsrc-56eb233c19809608c600cd3d7ee0c8bb43edb4d2.tar.gz | |
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).
| -rw-r--r-- | audio/icecast/Makefile | 4 | ||||
| -rw-r--r-- | audio/icecast2/Makefile | 5 |
2 files changed, 2 insertions, 7 deletions
diff --git a/audio/icecast/Makefile b/audio/icecast/Makefile index f08e6416ebd..4cfcb593845 100644 --- a/audio/icecast/Makefile +++ b/audio/icecast/Makefile @@ -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 @@ USE_BUILDLINK2= # defined GNU_CONFIGURE= # defined USE_PKGINSTALL= yes -CONFLICTS+= icecast2-[0-9]* - RCD_SCRIPTS= icecast PKG_SYSCONFSUBDIR= icecast diff --git a/audio/icecast2/Makefile b/audio/icecast2/Makefile index ce7e656ba1e..9fd62c69a8b 100644 --- a/audio/icecast2/Makefile +++ b/audio/icecast2/Makefile @@ -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 @@ MAINTAINER= pancake@phreaker.net 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 |