diff options
| author | marcus <marcus@FreeBSD.org> | 2010-01-24 03:45:54 +0800 |
|---|---|---|
| committer | marcus <marcus@FreeBSD.org> | 2010-01-24 03:45:54 +0800 |
| commit | eb55e2b6c01b4e3a1a4c2ab7f99a72d93f1926b8 (patch) | |
| tree | 41fb2f7810a30f9cfbe661551aa1315b3c56e341 | |
| parent | 0be774476ba4f228bd7eeba156d390d84bfd1e00 (diff) | |
| download | freebsd-ports-gnome-eb55e2b6c01b4e3a1a4c2ab7f99a72d93f1926b8.tar.gz freebsd-ports-gnome-eb55e2b6c01b4e3a1a4c2ab7f99a72d93f1926b8.tar.zst freebsd-ports-gnome-eb55e2b6c01b4e3a1a4c2ab7f99a72d93f1926b8.zip | |
Remove the CONFLICTS between libproxy and libmonetra.
PR: 143039
Submitted by: Mark Schleifer <freebsd@schleifer.org>
| -rw-r--r-- | devel/libmonetra/Makefile | 2 | ||||
| -rw-r--r-- | net/libproxy/Makefile | 1 |
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> |