From 7b44988303aebda2d5f7efc377d847617337d8d6 Mon Sep 17 00:00:00 2001
From: abs <abs@pkgsrc.org>
Date: Wed, 2 Feb 2005 13:22:14 +0000
Subject: revert last (Addition of mserv-devel CONFLICTS) - my installed
 packages must have been in a strange state. (Picked up by Kim - thanks)

---
 audio/mserv/Makefile | 3 +--
 1 file changed, 1 insertion(+), 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"
-- 
cgit v1.2.3