Do not set CONFLICTS{,_INSTALL} twice

2019-01-08 11:46:19 +00:00
parent 0d7b872a8c
commit 0902703d9d
3 changed files with 2 additions and 6 deletions
--- a/emulators/open-vm-tools/Makefile
+++ b/emulators/open-vm-tools/Makefile
@@ -64,9 +64,9 @@ INSTALL_TARGET=		install-strip
 .include <bsd.port.options.mk>

 .if ${PORT_OPTIONS:MX11}
-CONFLICTS=		open-vm-tools-nox11-[0-9]*
+CONFLICTS+=		open-vm-tools-nox11-[0-9]*
 .else
-CONFLICTS=		open-vm-tools-[0-9]*
+CONFLICTS+=		open-vm-tools-[0-9]*
 .endif

 CONFIGURE_ENV+=		SYSDIR=${SRC_BASE}/sys
--- a/net-im/skype-devel/Makefile
+++ b/net-im/skype-devel/Makefile
@@ -12,8 +12,6 @@ DISTNAME=	skype_static-${DISTVERSION}
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	P2P VoIP software, development version

-CONFLICTS=	skype-[0-9]*
-
 OPTIONS_DEFINE=	DOCS VIDEO
 OPTIONS_DEFAULT=VIDEO
 VIDEO_DESC=	[broken] Video support
--- a/net/concourse-fly/Makefile
+++ b/net/concourse-fly/Makefile
@@ -11,8 +11,6 @@ COMMENT=	CLI for Concourse

 LICENSE=	APACHE20

-CONFLICTS_INSTALL=	fly
-
 GO_CMD=		${LOCALBASE}/bin/go
 GO_PKGNAME=	github.com/concourse/fly