summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorabs <abs@pkgsrc.org>2005-02-02 13:22:14 +0000
committerabs <abs@pkgsrc.org>2005-02-02 13:22:14 +0000
commit7b44988303aebda2d5f7efc377d847617337d8d6 (patch)
tree148dc03c70af69c9d877f58e82c1db613a1fcdab
parent6dee9b9a382c63b0d768e3e0d97339fd9d079596 (diff)
downloadpkgsrc-7b44988303aebda2d5f7efc377d847617337d8d6.tar.gz
revert last (Addition of mserv-devel CONFLICTS) - my installed packages
must have been in a strange state. (Picked up by Kim - thanks)
-rw-r--r--audio/mserv/Makefile3
1 files changed, 1 insertions, 2 deletions
diff --git a/audio/mserv/Makefile b/audio/mserv/Makefile
index c41c1c36fb0..7f05d058bc1 100644
--- a/audio/mserv/Makefile
+++ b/audio/mserv/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.29 2005/02/02 10:23:44 abs Exp $
+# $NetBSD: Makefile,v 1.30 2005/02/02 13:22:14 abs Exp $
#
DISTNAME= mserv-0.35
@@ -12,7 +12,6 @@ COMMENT= Local centralised music server environment
PKG_INSTALLATION_TYPES= overwrite pkgviews
-CONFLICTS+= mserv-devel-[0-9]*
GNU_CONFIGURE= yes
CONFIGURE_ARGS+= --datadir=${PREFIX}/share/mserv
CONFIGURE_ENV+= MY_LIBS="-lvorbisfile -lvorbis"