aboutsummaryrefslogtreecommitdiff
path: root/net/libproxy
diff options
context:
space:
mode:
authorJoe Marcus Clarke <marcus@FreeBSD.org>2010-01-23 19:45:54 +0000
committerJoe Marcus Clarke <marcus@FreeBSD.org>2010-01-23 19:45:54 +0000
commitb074b838b041cd30c5489b0ed6655860424c10ae (patch)
treeecb0f9dcdb2abc3facb2d4a44443f7d609b22055 /net/libproxy
parentc8adc7cd224c0a739f8098dbf43360cbf382b961 (diff)
downloadports-b074b838b041cd30c5489b0ed6655860424c10ae.tar.gz
ports-b074b838b041cd30c5489b0ed6655860424c10ae.zip
Remove the CONFLICTS between libproxy and libmonetra.
PR: 143039 Submitted by: Mark Schleifer <freebsd@schleifer.org>
Notes
Notes: svn path=/head/; revision=248431
Diffstat (limited to 'net/libproxy')
-rw-r--r--net/libproxy/Makefile1
1 files changed, 0 insertions, 1 deletions
diff --git a/net/libproxy/Makefile b/net/libproxy/Makefile
index df852c2696a7..597d41012444 100644
--- a/net/libproxy/Makefile
+++ b/net/libproxy/Makefile
@@ -28,7 +28,6 @@ PLIST_SUB+= VERSION=${PORTVERSION}
.if !defined(LIBPROXY_SLAVE)
USE_LDCONFIG= yes
USE_PYTHON= yes
-CONFLICTS= libmonetra-[0-9]*
.endif
.include <bsd.port.mk>