svn commit: r493464 - head/Mk/Uses

[Tobias Kortkamp]

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).