Index: head/lang/mpd/Makefile
===================================================================
--- head/lang/mpd/Makefile	(revision 184719)
+++ head/lang/mpd/Makefile	(revision 184720)
@@ -1,63 +1,64 @@
 # New ports collection makefile for:	mpd
 # Date Created:	2007-02-05
 # Whom:		Kai Wang <kaiw27@gmail.com>
 #
 # $FreeBSD$
 #
 
 PORTNAME=	mpd
 PORTVERSION=	1.0.1
 CATEGORIES=	lang
 MASTER_SITES=	http://www.cs.arizona.edu/mpd/download/ \
 		http://crypto.riken.go.jp/pub/NetBSD/packages/distfiles/mpd-language/
 DISTNAME=	${PORTNAME}.${PORTVERSION}
 EXTRACT_SUFX=	.tgz
 
 MAINTAINER=	kaiw27@gmail.com
 COMMENT=	A concurrent programming language
 
 ONLY_FOR_ARCHS=	alpha i386
 ONLY_FOR_ARCHS_REASON=	uses assembly code for the target machine
 
 # net/mpd
+CONFLICTS=	mpd-[^1]*
 NO_LATEST_LINK=	yes
 
 USE_GMAKE=	yes
 
 OPTIONS=	X11 "Enable X11 support" on
 
 MAN1=		mpd.1 mpdl.1 mpdm.1 mpdprof.1
 MAN3=		mpdanimator.3 mpdgetopt.3 mpdwin.3
 MAN5=		mpdmap.5 mpdtrace.5
 
 .include <bsd.port.pre.mk>
 
 .if defined(WITHOUT_X11)
 PLIST_SUB+=	X11="@comment "
 .else
 PLIST_SUB+=	X11=""
 USE_XLIB=	yes
 .endif
 
 post-patch:
 	@${REINPLACE_CMD} -Ee \
 		"s%^(CCPATH =) .*%\1 `${WHICH} ${CC}`%; \
 		 s%^(MPDSRC =) .*%\1 ${WRKSRC}%; \
 		 s%^((MPD(CMD|LIB)|MAN[135]) =) /usr/local%\1 ${PREFIX}%" \
 		 ${WRKSRC}/Configuration
 .if defined(WITHOUT_X11)
 	@${REINPLACE_CMD} -Ee 's%^(XINCL =) .*%\1%' ${WRKSRC}/Configuration
 .endif
 
 pre-install:
 	@${MKDIR} ${PREFIX}/lib/mpd
 
 post-install:
 .if !defined(NOPORTDOCS)
 	@${MKDIR} ${DOCSDIR}
 	@${INSTALL_DATA} ${WRKSRC}/doc/* ${DOCSDIR}
 	@${MKDIR} ${EXAMPLESDIR}
 	@${CP} -pR ${WRKSRC}/vsuite/examples/* ${EXAMPLESDIR}
 .endif
 
 .include <bsd.port.post.mk>

Property changes on: head/lang/mpd/Makefile
___________________________________________________________________
Modified: cvs2svn:cvs-rev
## -1 +1 ##
-1.2
\ No newline at end of property
+1.3
\ No newline at end of property
Index: head/net/mpd/Makefile
===================================================================
--- head/net/mpd/Makefile	(revision 184719)
+++ head/net/mpd/Makefile	(revision 184720)
@@ -1,33 +1,36 @@
 # New ports collection makefile for:	mpd
 # Date created:				25 Feb 1999
 # Whom:					Archie Cobbs
 #
 # $FreeBSD$
 #
 
 PORTNAME=	mpd
 PORTVERSION=	3.18
 PORTREVISION=	5
 CATEGORIES=	net
 MASTER_SITES=	${MASTER_SITE_LOCAL}
 MASTER_SITE_SUBDIR=	archie
 DIST_SUBDIR=	mpd
 
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Multi-link PPP daemon based on netgraph(4)
 
+# lang/mpd
+CONFLICTS=	mpd-[^3]*
+
 MTREE_FILE=	${FILESDIR}/mpd.mtree
 MAN8=		mpd.8
 MANCOMPRESSED=	maybe
 
 USE_OPENSSL=	yes
 MAKE_ENV=	COPTS="${COPTS} -I${OPENSSLINC}" LDADD="${LDADD} -L${OPENSSLLIB}"
 
 USE_RC_SUBR=	mpd
 
 pre-build:
 	@${ECHO}
 	@${ECHO} "Use WITH_OPENSSL_PORT=yes if you use OPENSSL from ports"
 	@${ECHO}
 
 .include <bsd.port.mk>

Property changes on: head/net/mpd/Makefile
___________________________________________________________________
Modified: cvs2svn:cvs-rev
## -1 +1 ##
-1.49
\ No newline at end of property
+1.50
\ No newline at end of property