svn commit: r564908 - head/Mk/Uses

[Adriaan de Groot]

Author: adridg
Date: Wed Feb 10 23:19:17 2021
New Revision: 564908
URL: https://svnweb.freebsd.org/changeset/ports/564908

Log:
  Improve the upgrade path for Qt with portupgrade.
  
  Newer Qt releases depend on the build tools and qmake from that release,
  but the existing way of specifying that (e.g. USE_QT=buildtools_build)
  could pick up the *old* Qt version's tools and qmake. Never a problem
  in poudriere, which builds cleanly, but it keeps tripping up other
  tools. Replace the existing definitions for the dependencies with
  versioned dependencies, so that the right version of tools is built
  and used for the rest of the Qt stack.
  
  PR:		245862
  Reported by:	Piotr Smyrak
  Reviewed by:	tcberner

Modified:
  head/Mk/Uses/qt.mk

Modified: head/Mk/Uses/qt.mk
==============================================================================
--- head/Mk/Uses/qt.mk	Wed Feb 10 22:08:53 2021	(r564907)
+++ head/Mk/Uses/qt.mk	Wed Feb 10 23:19:17 2021	(r564908)
@@ -151,8 +151,9 @@ qt-3d_LIB=		libQt${_QT_LIBVER}3DCore.so
 qt-assistant_PORT=	devel/${_QT_RELNAME}-assistant
 qt-assistant_PATH=	${LOCALBASE}/${QT_BINDIR_REL}/assistant
 
+# Always build with *this* version's buildtools
 qt-buildtools_PORT=	devel/${_QT_RELNAME}-buildtools
-qt-buildtools_PATH=	${LOCALBASE}/${QT_BINDIR_REL}/moc
+qt-buildtools_PATH=	${_QT_RELNAME}-buildtools>=${_QT_VERSION}
 
 qt-charts_PORT=		x11-toolkits/${_QT_RELNAME}-charts
 qt-charts_LIB=		libQt${_QT_LIBVER}Charts.so
@@ -256,8 +257,9 @@ qt-qdoc-data_PATH=	${LOCALBASE}/${QT_DOCDIR_REL}/globa
 qt-qev_PORT=		x11/${_QT_RELNAME}-qev
 qt-qev_PATH=		${LOCALBASE}/${QT_BINDIR_REL}/qev
 
+# Always build with *this* version's qmake
 qt-qmake_PORT=		devel/${_QT_RELNAME}-qmake
-qt-qmake_PATH=		${LOCALBASE}/${QT_BINDIR_REL}/qmake
+qt-qmake_PATH=		${_QT_RELNAME}-qmake>=${_QT_VERSION}
 
 qt-quick3d_PORT=	x11-toolkits/${_QT_RELNAME}-quick3d
 qt-quick3d_LIB=		libQt${_QT_LIBVER}Quick3D.so