svn commit: r312453 - head/net/xrdp

[Steve Wills]

Author: swills
Date: Sun Feb 17 21:52:11 2013
New Revision: 312453
URL: http://svnweb.freebsd.org/changeset/ports/312453

Log:
  - Add CONFLICTS with net/xrdp-devel
  
  PR:		ports/175675
  Submitted by:	Koichiro IWAO <meta+ports at vmeta.jp> (maintainer)

Modified:
  head/net/xrdp/Makefile

Modified: head/net/xrdp/Makefile
==============================================================================
--- head/net/xrdp/Makefile	Sun Feb 17 21:46:22 2013	(r312452)
+++ head/net/xrdp/Makefile	Sun Feb 17 21:52:11 2013	(r312453)
@@ -3,7 +3,7 @@
 
 PORTNAME=	xrdp
 PORTVERSION=	0.6.0
-PORTREVISION=	2
+PORTREVISION=	3
 PORTEPOCH=	1
 CATEGORIES=	net
 MASTER_SITES=	SF/xrdp/xrdp/${PORTVERSION}
@@ -27,6 +27,7 @@ USE_RC_SUBR=	xrdp
 CONFIGURE_ARGS=	--localstatedir=/var
 LDFLAGS+=	-L${LOCALBASE}/lib
 CPPFLAGS+=	-I${LOCALBASE}/include
+CONFLICTS=	xrdp-devel-[0-9]*
 
 USE_LDCONFIG=	${PREFIX}/lib/xrdp