aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--devel/libmonetra/Makefile2
-rw-r--r--net/libproxy/Makefile1
2 files changed, 0 insertions, 3 deletions
diff --git a/devel/libmonetra/Makefile b/devel/libmonetra/Makefile
index b48cf0a35c25..ceb0e520ca59 100644
--- a/devel/libmonetra/Makefile
+++ b/devel/libmonetra/Makefile
@@ -18,6 +18,4 @@ GNU_CONFIGURE= yes
USE_GMAKE= yes
USE_LDCONFIG= yes
-CONFLICTS= libproxy-[0-9]*
-
.include <bsd.port.mk>
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>