From owner-svn-ports-all@freebsd.org Tue Jan 8 11:46:20 2019 Return-Path: Delivered-To: svn-ports-all@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id A4453149CF9B; Tue, 8 Jan 2019 11:46:20 +0000 (UTC) (envelope-from tobik@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) server-signature RSA-PSS (4096 bits) client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 44B83868AA; Tue, 8 Jan 2019 11:46:20 +0000 (UTC) (envelope-from tobik@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 2E37A27344; Tue, 8 Jan 2019 11:46:20 +0000 (UTC) (envelope-from tobik@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id x08BkKWr028652; Tue, 8 Jan 2019 11:46:20 GMT (envelope-from tobik@FreeBSD.org) Received: (from tobik@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id x08BkJcr028649; Tue, 8 Jan 2019 11:46:19 GMT (envelope-from tobik@FreeBSD.org) Message-Id: <201901081146.x08BkJcr028649@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: tobik set sender to tobik@FreeBSD.org using -f From: Tobias Kortkamp Date: Tue, 8 Jan 2019 11:46:19 +0000 (UTC) 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 X-SVN-Group: ports-head X-SVN-Commit-Author: tobik X-SVN-Commit-Paths: in head: emulators/open-vm-tools net-im/skype-devel net/concourse-fly X-SVN-Commit-Revision: 489672 X-SVN-Commit-Repository: ports MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-Rspamd-Queue-Id: 44B83868AA X-Spamd-Bar: -- Authentication-Results: mx1.freebsd.org X-Spamd-Result: default: False [-2.95 / 15.00]; local_wl_from(0.00)[FreeBSD.org]; NEURAL_HAM_MEDIUM(-1.00)[-0.997,0]; NEURAL_HAM_LONG(-1.00)[-0.998,0]; NEURAL_HAM_SHORT(-0.95)[-0.953,0] X-BeenThere: svn-ports-all@freebsd.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: SVN commit messages for the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 08 Jan 2019 11:46:21 -0000 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 .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