From owner-svn-ports-all@freebsd.org Sat Mar 16 18:54:19 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 626871538C9C; Sat, 16 Mar 2019 18:54:19 +0000 (UTC) (envelope-from tcberner@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 01CAE6FCEE; Sat, 16 Mar 2019 18:54:19 +0000 (UTC) (envelope-from tcberner@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 9CB132623C; Sat, 16 Mar 2019 18:54:18 +0000 (UTC) (envelope-from tcberner@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id x2GIsIOA075469; Sat, 16 Mar 2019 18:54:18 GMT (envelope-from tcberner@FreeBSD.org) Received: (from tcberner@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id x2GIsIoH075468; Sat, 16 Mar 2019 18:54:18 GMT (envelope-from tcberner@FreeBSD.org) Message-Id: <201903161854.x2GIsIoH075468@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: tcberner set sender to tcberner@FreeBSD.org using -f From: "Tobias C. Berner" Date: Sat, 16 Mar 2019 18:54:18 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r495943 - head/security/qtkeychain X-SVN-Group: ports-head X-SVN-Commit-Author: tcberner X-SVN-Commit-Paths: head/security/qtkeychain X-SVN-Commit-Revision: 495943 X-SVN-Commit-Repository: ports MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-Rspamd-Queue-Id: 01CAE6FCEE X-Spamd-Bar: -- Authentication-Results: mx1.freebsd.org X-Spamd-Result: default: False [-2.96 / 15.00]; local_wl_from(0.00)[FreeBSD.org]; NEURAL_HAM_MEDIUM(-1.00)[-0.998,0]; NEURAL_HAM_SHORT(-0.96)[-0.961,0]; NEURAL_HAM_LONG(-1.00)[-1.000,0]; ASN(0.00)[asn:11403, ipnet:2610:1c1:1::/48, country:US] 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: Sat, 16 Mar 2019 18:54:19 -0000 Author: tcberner Date: Sat Mar 16 18:54:18 2019 New Revision: 495943 URL: https://svnweb.freebsd.org/changeset/ports/495943 Log: security/qtkeychain: add CONFLICTS_INSTALL - follow up on the flavor removal: mark conflicting with flavored pkgs Approved by: portmgr (implicit) Modified: head/security/qtkeychain/Makefile Modified: head/security/qtkeychain/Makefile ============================================================================== --- head/security/qtkeychain/Makefile Sat Mar 16 18:53:09 2019 (r495942) +++ head/security/qtkeychain/Makefile Sat Mar 16 18:54:18 2019 (r495943) @@ -19,6 +19,8 @@ GH_ACCOUNT= frankosterfeld USE_LDCONFIG= yes PLIST_SUB= VERSION=${PORTVERSION} +CONFLICTS_INSTALL= qtkeychain-qt[45] + OPTIONS_DEFINE= LIBSECRET OPTIONS_DEFAULT= LIBSECRET