Module Name:	pkgsrc
Committed By:	wiz
Date:		Fri Nov 18 18:34:11 UTC 2005

Modified Files:
	pkgsrc/audio/musicpd: Makefile

Log Message:
CONFLICTS=lang/mpd looks like it might work, but it does not.
Replace it with CONFLICTS=mpd-[0-9]*


To generate a diff of this commit:
cvs rdiff -r1.17 -r1.18 pkgsrc/audio/musicpd/Makefile

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.