From owner-svn-ports-head@freebsd.org Sun May 31 09:00:48 2020 Return-Path: Delivered-To: svn-ports-head@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id 1971D32F556; Sun, 31 May 2020 09:00:48 +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) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 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 49ZXMg6yznz3SBb; Sun, 31 May 2020 09:00:47 +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 D12C11717E; Sun, 31 May 2020 09:00:47 +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 04V90lUk000199; Sun, 31 May 2020 09:00:47 GMT (envelope-from tcberner@FreeBSD.org) Received: (from tcberner@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id 04V90lHS000197; Sun, 31 May 2020 09:00:47 GMT (envelope-from tcberner@FreeBSD.org) Message-Id: <202005310900.04V90lHS000197@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: tcberner set sender to tcberner@FreeBSD.org using -f From: "Tobias C. Berner" Date: Sun, 31 May 2020 09:00:47 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r537134 - in head: . Mk/Uses X-SVN-Group: ports-head X-SVN-Commit-Author: tcberner X-SVN-Commit-Paths: in head: . Mk/Uses X-SVN-Commit-Revision: 537134 X-SVN-Commit-Repository: ports MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-head@freebsd.org X-Mailman-Version: 2.1.33 Precedence: list List-Id: SVN commit messages for the ports tree for head List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 31 May 2020 09:00:48 -0000 Author: tcberner Date: Sun May 31 09:00:47 2020 New Revision: 537134 URL: https://svnweb.freebsd.org/changeset/ports/537134 Log: Add support for test-only dependencies in pyqt.mk Allow ports to only depend on a component of PyQt for testing. USES=pyqt:5 USE_PYQT=webengine_test will add a TEST_DEPENDS on www/py-qt5-webengine Approved by: portmgr (mat) Differential Revision: https://reviews.freebsd.org/D23241 Modified: head/CHANGES head/Mk/Uses/pyqt.mk Modified: head/CHANGES ============================================================================== --- head/CHANGES Sun May 31 08:58:31 2020 (r537133) +++ head/CHANGES Sun May 31 09:00:47 2020 (r537134) @@ -10,6 +10,14 @@ in the release notes and/or placed into UPDATING. All ports committers are allowed to commit to this file. +20200531: +AUTHOR: kde@FreeBSD.org + + pyqt.mk gained support for test-only dependencies. If a component, say + py-qt5-gui is only required for testing, you can add + + USE_PYQT= gui_test + 20200514: AUTHOR: mat@FreeBSD.org Modified: head/Mk/Uses/pyqt.mk ============================================================================== --- head/Mk/Uses/pyqt.mk Sun May 31 08:58:31 2020 (r537133) +++ head/Mk/Uses/pyqt.mk Sun May 31 09:00:47 2020 (r537134) @@ -15,6 +15,7 @@ # USE_PYQT - List of PyQt components to depend on # * foo_build only build depend # * foo_run only run depend +# * foo_test only test depend # * foo both (default) # PYQT_SIPDIR - where sip files will be installed to # PYQT_APIDIR - where api files will be installed to @@ -280,15 +281,17 @@ do-configure: .endif # !target(do-configure) .endif # defined(PYQT_DIST) -# Set build and run depends -- we need to prefix them internally with "py-" +# Set build, run and test depends -- we need to prefix them internally with "py-" # else we conflict with the ones defined in bsd.qt.mk with the same name _USE_PYQT_ALL+= ${_USE_PYQT${_PYQT_VERSION}_ONLY} .for comp in ${_USE_PYQT_ALL:O:u} -_USE_PYQT_ALL_SUFFIXED+= py-${comp} py-${comp}_build py-${comp}_run +_USE_PYQT_ALL_SUFFIXED+= py-${comp} py-${comp}_build py-${comp}_run py-${comp}_test py-${comp}_BUILD_DEPENDS?= ${py-${comp}_PATH}:${py-${comp}_PORT}@${PY_FLAVOR} py-${comp}_RUN_DEPENDS?= ${py-${comp}_PATH}:${py-${comp}_PORT}@${PY_FLAVOR} +py-${comp}_TEST_DEPENDS?= ${py-${comp}_PATH}:${py-${comp}_PORT}@${PY_FLAVOR} py-${comp}_build_BUILD_DEPENDS?= ${py-${comp}_BUILD_DEPENDS} py-${comp}_run_RUN_DEPENDS?= ${py-${comp}_RUN_DEPENDS} +py-${comp}_test_TEST_DEPENDS?= ${py-${comp}_TEST_DEPENDS} .endfor _USE_PYQT= ${USE_PYQT:O:u} @@ -296,6 +299,7 @@ _USE_PYQT= ${USE_PYQT:O:u} . if ${_USE_PYQT_ALL_SUFFIXED:Mpy-${comp}} BUILD_DEPENDS+= ${py-${comp}_BUILD_DEPENDS} RUN_DEPENDS+= ${py-${comp}_RUN_DEPENDS} +TEST_DEPENDS+= ${py-${comp}_TEST_DEPENDS} . else IGNORE?= cannot be installed: unknown USE_PYQT component ${comp} #' . endif