Date: Tue, 8 Jan 2019 11:46:19 +0000 (UTC) From: Tobias Kortkamp <tobik@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r489672 - in head: emulators/open-vm-tools net-im/skype-devel net/concourse-fly Message-ID: <201901081146.x08BkJcr028649@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: tobik Date: Tue Jan 8 11:46:19 2019 New Revision: 489672 URL: https://svnweb.freebsd.org/changeset/ports/489672 Log: Do not set CONFLICTS{,_INSTALL} twice Modified: head/emulators/open-vm-tools/Makefile head/net-im/skype-devel/Makefile head/net/concourse-fly/Makefile Modified: head/emulators/open-vm-tools/Makefile ============================================================================== --- head/emulators/open-vm-tools/Makefile Tue Jan 8 11:23:34 2019 (r489671) +++ head/emulators/open-vm-tools/Makefile Tue Jan 8 11:46:19 2019 (r489672) @@ -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 Modified: head/net-im/skype-devel/Makefile ============================================================================== --- head/net-im/skype-devel/Makefile Tue Jan 8 11:23:34 2019 (r489671) +++ head/net-im/skype-devel/Makefile Tue Jan 8 11:46:19 2019 (r489672) @@ -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 Modified: head/net/concourse-fly/Makefile ============================================================================== --- head/net/concourse-fly/Makefile Tue Jan 8 11:23:34 2019 (r489671) +++ head/net/concourse-fly/Makefile Tue Jan 8 11:46:19 2019 (r489672) @@ -11,8 +11,6 @@ COMMENT= CLI for Concourse LICENSE= APACHE20 -CONFLICTS_INSTALL= fly - GO_CMD= ${LOCALBASE}/bin/go GO_PKGNAME= github.com/concourse/fly
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201901081146.x08BkJcr028649>