summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--audio/musicpd/Makefile6
-rw-r--r--lang/mpd/Makefile6
2 files changed, 8 insertions, 4 deletions
diff --git a/audio/musicpd/Makefile b/audio/musicpd/Makefile
index 08a865e8fa8..af3a2612710 100644
--- a/audio/musicpd/Makefile
+++ b/audio/musicpd/Makefile
@@ -1,11 +1,13 @@
-# $NetBSD: Makefile,v 1.16 2005/10/08 12:35:14 jmmv Exp $
+# $NetBSD: Makefile,v 1.17 2005/10/19 04:48:01 is Exp $
DISTNAME= mpd-0.11.5
PKGNAME= ${DISTNAME:S/mpd/musicpd/}
-PKGREVISION= 2
+PKGREVISION= 3
CATEGORIES= audio
MASTER_SITES= http://mercury.chem.pitt.edu/~shank/
+CONFLICTS= lang/mpd
+
MAINTAINER= simonb@NetBSD.org
HOMEPAGE= http://musicpd.org/
COMMENT= Remote controllable audio player
diff --git a/lang/mpd/Makefile b/lang/mpd/Makefile
index b17f963c126..53bb74d52fd 100644
--- a/lang/mpd/Makefile
+++ b/lang/mpd/Makefile
@@ -1,13 +1,15 @@
-# $NetBSD: Makefile,v 1.4 2005/10/17 20:30:27 is Exp $
+# $NetBSD: Makefile,v 1.5 2005/10/19 04:43:31 is Exp $
#
PKGNAME= mpd-1.0.1
DISTNAME= mpd.1.0.1
-PKGREVISION= 3
+PKGREVISION= 4
CATEGORIES= lang parallel
MASTER_SITES= http://www.cs.arizona.edu/mpd/download/
EXTRACT_SUFX= .tgz
+CONFLICTS= audio/musicpd
+
MAINTAINER= is@NetBSD.org
HOMEPAGE= http://www.cs.arizona.edu/mpd/
COMMENT= The MPD language compiler and run time system