Remove the CONFLICTS between libproxy and libmonetra.

PR: 143039 Submitted by: Mark Schleifer <freebsd@schleifer.org>
svn path=/head/; revision=248431
2010-01-23 19:45:54 +00:00 · 2010-01-23 19:45:54 +00:00 · b074b838b0 · 2021-03-31 03:12:20 +00:00
commit b074b838b0
parent c8adc7cd22
2 changed files with 0 additions and 3 deletions
--- 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>
--- 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>