[pkgsrc/trunk]: pkgsrc musicpd calls its files mpd, alas!

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

details:   https://anonhg.NetBSD.org/pkgsrc/rev/dbed852c1c99
branches:  trunk
changeset: 501222:dbed852c1c99
user:      is <is%pkgsrc.org@localhost>
date:      Wed Oct 19 04:43:31 2005 +0000

description:
musicpd calls its files mpd, alas!

diffstat:

 audio/musicpd/Makefile |  6 ++++--
 lang/mpd/Makefile      |  6 ++++--
 2 files changed, 8 insertions(+), 4 deletions(-)

diffs (40 lines):

diff -r 9626554c2017 -r dbed852c1c99 audio/musicpd/Makefile
--- a/audio/musicpd/Makefile    Wed Oct 19 04:40:23 2005 +0000
+++ b/audio/musicpd/Makefile    Wed Oct 19 04:43:31 2005 +0000
@@ -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@localhost
 HOMEPAGE=              http://musicpd.org/
 COMMENT=               Remote controllable audio player
diff -r 9626554c2017 -r dbed852c1c99 lang/mpd/Makefile
--- a/lang/mpd/Makefile Wed Oct 19 04:40:23 2005 +0000
+++ b/lang/mpd/Makefile Wed Oct 19 04:43:31 2005 +0000
@@ -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@localhost
 HOMEPAGE=              http://www.cs.arizona.edu/mpd/
 COMMENT=               The MPD language compiler and run time system