From owner-svn-ports-all@freebsd.org Wed Feb 20 21:24:34 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 5164114DCF36; Wed, 20 Feb 2019 21:24:34 +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 E29126F653; Wed, 20 Feb 2019 21:24:33 +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 D37ABB409; Wed, 20 Feb 2019 21:24:33 +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 x1KLOXvq009880; Wed, 20 Feb 2019 21:24:33 GMT (envelope-from tobik@FreeBSD.org) Received: (from tobik@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id x1KLOXtf009879; Wed, 20 Feb 2019 21:24:33 GMT (envelope-from tobik@FreeBSD.org) Message-Id: <201902202124.x1KLOXtf009879@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: tobik set sender to tobik@FreeBSD.org using -f From: Tobias Kortkamp Date: Wed, 20 Feb 2019 21:24:33 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r493464 - head/Mk/Uses X-SVN-Group: ports-head X-SVN-Commit-Author: tobik X-SVN-Commit-Paths: head/Mk/Uses X-SVN-Commit-Revision: 493464 X-SVN-Commit-Repository: ports MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-Rspamd-Queue-Id: E29126F653 X-Spamd-Bar: -- Authentication-Results: mx1.freebsd.org X-Spamd-Result: default: False [-2.97 / 15.00]; local_wl_from(0.00)[FreeBSD.org]; NEURAL_HAM_MEDIUM(-1.00)[-0.999,0]; NEURAL_HAM_SHORT(-0.97)[-0.973,0]; ASN(0.00)[asn:11403, ipnet:2610:1c1:1::/48, country:US]; NEURAL_HAM_LONG(-1.00)[-0.999,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: Wed, 20 Feb 2019 21:24:34 -0000 Author: tobik Date: Wed Feb 20 21:24:33 2019 New Revision: 493464 URL: https://svnweb.freebsd.org/changeset/ports/493464 Log: Mk/Uses/qt.mk: Complain about components with an unknown suffix Normally, USE_QT complains about unknown components with ===> $PKGNAME cannot be installed: unknown USE_QT component 'foobar'. However this fails if the component has a suffix starting with `_`. For example USE_QT= buildtools_build,core or even a simple USE_QT= buildtools_buld is silently accepted, but they do not do anything. Only components with _build and _run suffixes should be accepted. Amend the regular expression we use for this to be stricter. It is currently over eager. Since we only have two cases to cover here we can spell them out explictly instead. PR: 235898 Approved by: kde (tcberner) Differential Revision: https://reviews.freebsd.org/D19267 Modified: head/Mk/Uses/qt.mk Modified: head/Mk/Uses/qt.mk ============================================================================== --- head/Mk/Uses/qt.mk Wed Feb 20 21:15:37 2019 (r493463) +++ head/Mk/Uses/qt.mk Wed Feb 20 21:24:33 2019 (r493464) @@ -466,7 +466,7 @@ xmlpatterns-tool_PATH= ${LOCALBASE}/${QT_BINDIR_REL}/x _USE_QT_ALL+= ${_USE_QT${_QT_VER}_ONLY} _USE_QT= ${USE_QT} # Iterate through components deprived of suffix. -. for component in ${_USE_QT:O:u:C/_.+//} +. for component in ${_USE_QT:O:u:C/_(build|run)$//} # Check that the component is valid. . if ${_USE_QT_ALL:M${component}} != "" # Skip meta-components (currently none).