diff options
| author | Tobias Kortkamp <tobik@FreeBSD.org> | 2019-01-08 11:46:19 +0000 |
|---|---|---|
| committer | Tobias Kortkamp <tobik@FreeBSD.org> | 2019-01-08 11:46:19 +0000 |
| commit | 0902703d9d3b8a80896ae13231db80f6c5eec3b3 (patch) | |
| tree | 4d73acac6ed948df9e9841b57bba2e1fda4b275a | |
| parent | 0d7b872a8cc7cd37d29fe2e5f61b2a1ac2aaffc8 (diff) | |
| download | ports-0902703d9d3b8a80896ae13231db80f6c5eec3b3.tar.gz ports-0902703d9d3b8a80896ae13231db80f6c5eec3b3.zip | |
Notes
| -rw-r--r-- | emulators/open-vm-tools/Makefile | 4 | ||||
| -rw-r--r-- | net-im/skype-devel/Makefile | 2 | ||||
| -rw-r--r-- | net/concourse-fly/Makefile | 2 |
3 files changed, 2 insertions, 6 deletions
diff --git a/emulators/open-vm-tools/Makefile b/emulators/open-vm-tools/Makefile index 97a9bd43a072..eb09ab872679 100644 --- 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 diff --git a/net-im/skype-devel/Makefile b/net-im/skype-devel/Makefile index 7da7354e4227..2791362097cb 100644 --- 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 diff --git a/net/concourse-fly/Makefile b/net/concourse-fly/Makefile index 80cb975feac7..1b54e3121af7 100644 --- 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 |