qt6: make pkglint happier

To: pkgsrc-wip-changes%NetBSD.org@localhost
Subject: qt6: make pkglint happier
From: Niclas Rosenvik <nros%pkgsrc.org@localhost>
Date: Wed, 13 Jul 2022 20:05:12 +0000
Module Name:	pkgsrc-wip
Committed By:	Niclas Rosenvik <nros%pkgsrc.org@localhost>
Pushed By:	nros
Date:		Wed Jul 13 22:05:12 2022 +0200
Changeset:	36e0b6da04d75605bbbcbdfc93121a25969738ab

Modified Files:
	qt6-qt3d/Makefile
	qt6-qtbase/Makefile
	qt6-qtbase/Makefile.common
	qt6-qtbase/PLIST
	qt6-qtmultimedia/buildlink3.mk
	qt6-qtquick3d/Makefile

Log Message:
qt6: make pkglint happier

qt6: make pkglint happier.
Sort PLIST, fix intendention.
Move fixing of pkg-config
WRKSRC path from install step.

To see a diff of this commit:
https://wip.pkgsrc.org/cgi-bin/gitweb.cgi?p=pkgsrc-wip.git;a=commitdiff;h=36e0b6da04d75605bbbcbdfc93121a25969738ab

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

diffstat:
 qt6-qt3d/Makefile              | 24 ++++++++++++------------
 qt6-qtbase/Makefile            | 23 ++++++++++-------------
 qt6-qtbase/Makefile.common     |  4 ++--
 qt6-qtbase/PLIST               |  4 ++--
 qt6-qtmultimedia/buildlink3.mk |  4 ++--
 qt6-qtquick3d/Makefile         | 20 ++++++++++----------
 6 files changed, 38 insertions(+), 41 deletions(-)

diffs:
diff --git a/qt6-qt3d/Makefile b/qt6-qt3d/Makefile
index 1030bf1a05..388c0b558c 100644
--- a/qt6-qt3d/Makefile
+++ b/qt6-qt3d/Makefile
@@ -11,18 +11,18 @@ CONFIGURE_ARGS+=	-no-fbxsdk
 
 .include "../../wip/qt6-qtbase/Makefile.common"
 
-PKGCONFIG_OVERRIDE+= lib/pkgconfig/Qt63DAnimation.pc
-PKGCONFIG_OVERRIDE+= lib/pkgconfig/Qt63DCore.pc
-PKGCONFIG_OVERRIDE+= lib/pkgconfig/Qt63DExtras.pc
-PKGCONFIG_OVERRIDE+= lib/pkgconfig/Qt63DInput.pc
-PKGCONFIG_OVERRIDE+= lib/pkgconfig/Qt63DLogic.pc
-PKGCONFIG_OVERRIDE+= lib/pkgconfig/Qt63DQuick.pc
-PKGCONFIG_OVERRIDE+= lib/pkgconfig/Qt63DQuickAnimation.pc
-PKGCONFIG_OVERRIDE+= lib/pkgconfig/Qt63DQuickExtras.pc
-PKGCONFIG_OVERRIDE+= lib/pkgconfig/Qt63DQuickInput.pc
-PKGCONFIG_OVERRIDE+= lib/pkgconfig/Qt63DQuickRender.pc
-PKGCONFIG_OVERRIDE+= lib/pkgconfig/Qt63DQuickScene2D.pc
-PKGCONFIG_OVERRIDE+= lib/pkgconfig/Qt63DRender.pc
+PKGCONFIG_OVERRIDE+=	lib/pkgconfig/Qt63DAnimation.pc
+PKGCONFIG_OVERRIDE+=	lib/pkgconfig/Qt63DCore.pc
+PKGCONFIG_OVERRIDE+=	lib/pkgconfig/Qt63DExtras.pc
+PKGCONFIG_OVERRIDE+=	lib/pkgconfig/Qt63DInput.pc
+PKGCONFIG_OVERRIDE+=	lib/pkgconfig/Qt63DLogic.pc
+PKGCONFIG_OVERRIDE+=	lib/pkgconfig/Qt63DQuick.pc
+PKGCONFIG_OVERRIDE+=	lib/pkgconfig/Qt63DQuickAnimation.pc
+PKGCONFIG_OVERRIDE+=	lib/pkgconfig/Qt63DQuickExtras.pc
+PKGCONFIG_OVERRIDE+=	lib/pkgconfig/Qt63DQuickInput.pc
+PKGCONFIG_OVERRIDE+=	lib/pkgconfig/Qt63DQuickRender.pc
+PKGCONFIG_OVERRIDE+=	lib/pkgconfig/Qt63DQuickScene2D.pc
+PKGCONFIG_OVERRIDE+=	lib/pkgconfig/Qt63DRender.pc
 
 .include "../../multimedia/assimp/buildlink3.mk"
 .include "../../wip/qt6-qtbase/buildlink3.mk"
diff --git a/qt6-qtbase/Makefile b/qt6-qtbase/Makefile
index 431c688e5b..52bbf3a816 100644
--- a/qt6-qtbase/Makefile
+++ b/qt6-qtbase/Makefile
@@ -103,7 +103,7 @@ CONFIGURE_ARGS+=		-no-framework
 # so give it a direct path to them if they aren't installed
 # in /usr/include
 .  if !exists(/usr/include)
-CONFIGURE_ARGS+=	-I ${OSX_SDK_PATH}/usr/include
+CONFIGURE_ARGS+=		-I ${OSX_SDK_PATH}/usr/include
 .  endif
 .  if exists(/usr/lib/libresolv.dylib)
 LDFLAGS+=			-lresolv
@@ -152,7 +152,12 @@ SUBST_MESSAGE.path=	Add to default XDG path.
 SUBST_FILES.path=	src/corelib/io/qstandardpaths_unix.cpp
 SUBST_VARS.path=	PREFIX
 
-BROKEN_FILES=		qt6/mkspecs/qmodule.pri
+# The pri file has WRKSRC in it.
+SUBST_CLASSES+=		pkgconf
+SUBST_STAGE.pkgconf=	post-build
+SUBST_MESSAGE.pkgconf=	Fixing pkg-config WRKSRC path.
+SUBST_FILES.pkgconf=	mkspecs/qmodule.pri
+SUBST_SED.pkgconf=	-e 's,PKG_CONFIG_EXECUTABLE = .*,PKG_CONFIG_EXECUTABLE = ${TOOLS_PATH.pkg-config},'
 
 .if ${OPSYS} == "Linux"
 QMAKE_EXTRA=		QMAKE_PLATFORM += linux
@@ -197,19 +202,11 @@ pre-configure:
 .include "options.mk"
 
 .if ${OPSYS} != "Darwin"
-CONFIGURE_ARGS+= -- -DQT_DISABLE_RPATH:BOOL=ON
-CONFIGURE_ARGS+= -DCMAKE_SKIP_RPATH:BOOL=ON
-LDFLAGS+=${COMPILER_RPATH_FLAG}${QTPREFIX}/lib
+CONFIGURE_ARGS+=	-- -DQT_DISABLE_RPATH:BOOL=ON
+CONFIGURE_ARGS+=	-DCMAKE_SKIP_RPATH:BOOL=ON
+LDFLAGS+=		${COMPILER_RPATH_FLAG}${QTPREFIX}/lib
 .endif
 
-post-install:
-# The pri file has WRKSRC in it.
-	${SED} -e 's,PKG_CONFIG_EXECUTABLE = .*,PKG_CONFIG_EXECUTABLE = ${TOOLS_PATH.pkg-config},' \
-		${DESTDIR}${PREFIX}/${BROKEN_FILES} \
-		> ${DESTDIR}${PREFIX}/${BROKEN_FILES}.1
-	${MV} -f ${DESTDIR}${PREFIX}/${BROKEN_FILES}.1 \
-		${DESTDIR}${PREFIX}/${BROKEN_FILES}
-
 TOOL_DEPENDS+=	xmlstarlet-[0-9]*:../../textproc/xmlstarlet
 
 PKGCONFIG_OVERRIDE+=	lib/pkgconfig/Qt6Concurrent.pc
diff --git a/qt6-qtbase/Makefile.common b/qt6-qtbase/Makefile.common
index 8dea9ab0e1..67aed710d7 100644
--- a/qt6-qtbase/Makefile.common
+++ b/qt6-qtbase/Makefile.common
@@ -67,9 +67,9 @@ SCRIPTS_ENV+=		HOME=${WRKDIR}
 
 .if "${PKGPATH}" != "wip/qt6-qtbase"
 CONFIGURE_ARGS+=	-cmake-use-default-generator
-.if ${OPSYS} != "Darwin"
+.  if ${OPSYS} != "Darwin"
 CONFIGURE_ARGS+=	-- -DCMAKE_SKIP_RPATH:BOOL=TRUE
-.endif
+.  endif
 QTCONFDIR?=		.
 do-configure:
 	cd ${WRKSRC} && ${SETENV} ${CONFIGURE_ENV} ${QTPREFIX}/bin/qt-configure-module ${QTCONFDIR} ${CONFIGURE_ARGS}
diff --git a/qt6-qtbase/PLIST b/qt6-qtbase/PLIST
index 6d2985d6ce..d1b7716501 100644
--- a/qt6-qtbase/PLIST
+++ b/qt6-qtbase/PLIST
@@ -72,12 +72,12 @@ qt6/doc/global/externalsites/qtcreator.qdoc
 qt6/doc/global/externalsites/qtdesignstudio.qdoc
 qt6/doc/global/externalsites/rfc.qdoc
 qt6/doc/global/fileextensions.qdocconf
-qt6/doc/global/htmltabs.qdocconf
 qt6/doc/global/html-config.qdocconf
 qt6/doc/global/html-footer-online.qdocconf
 qt6/doc/global/html-footer.qdocconf
 qt6/doc/global/html-header-offline.qdocconf
 qt6/doc/global/html-header-online.qdocconf
+qt6/doc/global/htmltabs.qdocconf
 qt6/doc/global/includes-online/search.qdoc
 qt6/doc/global/includes/cli-build-cmake.qdocinc
 qt6/doc/global/includes/examples-run.qdocinc
@@ -2712,8 +2712,8 @@ qt6/lib/cmake/Qt6/QtFileConfigure.txt.in
 qt6/lib/cmake/Qt6/QtFindPackageHelpers.cmake
 qt6/lib/cmake/Qt6/QtFindWrapConfigExtra.cmake.in
 qt6/lib/cmake/Qt6/QtFindWrapHelper.cmake
-qt6/lib/cmake/Qt6/QtFinishPrlFile.cmake
 qt6/lib/cmake/Qt6/QtFinishPkgConfigFile.cmake
+qt6/lib/cmake/Qt6/QtFinishPrlFile.cmake
 qt6/lib/cmake/Qt6/QtFlagHandlingHelpers.cmake
 qt6/lib/cmake/Qt6/QtFrameworkHelpers.cmake
 qt6/lib/cmake/Qt6/QtGenerateExtPri.cmake
diff --git a/qt6-qtmultimedia/buildlink3.mk b/qt6-qtmultimedia/buildlink3.mk
index 8dd0517d75..ad9b5c23dd 100644
--- a/qt6-qtmultimedia/buildlink3.mk
+++ b/qt6-qtmultimedia/buildlink3.mk
@@ -11,10 +11,10 @@ BUILDLINK_PKGSRCDIR.qt6-qtmultimedia?=		../../wip/qt6-qtmultimedia
 pkgbase := qt6-qtmultimedia
 .include "../../mk/pkg-build-options.mk"
 
-.if !empty(PKG_BUILD_OPTIONS.qt6-qtmultimedia:Mgstreamer)
+.if ${PKG_BUILD_OPTIONS.qt6-qtmultimedia:Mgstreamer}
 .include "../../multimedia/gst-plugins1-base/buildlink3.mk"
 .endif
-.if !empty(PKG_BUILD_OPTIONS.qt6-qtmultimedia:Mpulseaudio)
+.if ${PKG_BUILD_OPTIONS.qt6-qtmultimedia:Mpulseaudio}
 .include "../../audio/pulseaudio/buildlink3.mk"
 .endif
 .include "../../wip/qt6-qtbase/buildlink3.mk"
diff --git a/qt6-qtquick3d/Makefile b/qt6-qtquick3d/Makefile
index b0d6e9e4fc..417893450d 100644
--- a/qt6-qtquick3d/Makefile
+++ b/qt6-qtquick3d/Makefile
@@ -8,16 +8,16 @@ LICENSE=	gnu-gpl-v3
 
 .include "../../wip/qt6-qtbase/Makefile.common"
 
-PKGCONFIG_OVERRIDE+= lib/pkgconfig/Qt6Quick3D.pc
-PKGCONFIG_OVERRIDE+= lib/pkgconfig/Qt6Quick3DAssetImport.pc
-PKGCONFIG_OVERRIDE+= lib/pkgconfig/Qt6Quick3DAssetUtils.pc
-PKGCONFIG_OVERRIDE+= lib/pkgconfig/Qt6Quick3DEffects.pc
-PKGCONFIG_OVERRIDE+= lib/pkgconfig/Qt6Quick3DHelpers.pc
-PKGCONFIG_OVERRIDE+= lib/pkgconfig/Qt6Quick3DIblBaker.pc
-PKGCONFIG_OVERRIDE+= lib/pkgconfig/Qt6Quick3DParticleEffects.pc
-PKGCONFIG_OVERRIDE+= lib/pkgconfig/Qt6Quick3DParticles.pc
-PKGCONFIG_OVERRIDE+= lib/pkgconfig/Qt6Quick3DRuntimeRender.pc
-PKGCONFIG_OVERRIDE+= lib/pkgconfig/Qt6Quick3DUtils.pc
+PKGCONFIG_OVERRIDE+=	lib/pkgconfig/Qt6Quick3D.pc
+PKGCONFIG_OVERRIDE+=	lib/pkgconfig/Qt6Quick3DAssetImport.pc
+PKGCONFIG_OVERRIDE+=	lib/pkgconfig/Qt6Quick3DAssetUtils.pc
+PKGCONFIG_OVERRIDE+=	lib/pkgconfig/Qt6Quick3DEffects.pc
+PKGCONFIG_OVERRIDE+=	lib/pkgconfig/Qt6Quick3DHelpers.pc
+PKGCONFIG_OVERRIDE+=	lib/pkgconfig/Qt6Quick3DIblBaker.pc
+PKGCONFIG_OVERRIDE+=	lib/pkgconfig/Qt6Quick3DParticleEffects.pc
+PKGCONFIG_OVERRIDE+=	lib/pkgconfig/Qt6Quick3DParticles.pc
+PKGCONFIG_OVERRIDE+=	lib/pkgconfig/Qt6Quick3DRuntimeRender.pc
+PKGCONFIG_OVERRIDE+=	lib/pkgconfig/Qt6Quick3DUtils.pc
 
 .include "../../multimedia/assimp/buildlink3.mk"
 .include "../../wip/qt6-qtbase/buildlink3.mk"
Prev by Date: qt6-qtbase: fix crash of qt6 apps that uses threads
Next by Date: buddy: buildlink added
Previous by Thread: qt6-qtbase: fix crash of qt6 apps that uses threads
Next by Thread: buddy: buildlink added
Indexes:
Home | Main Index | Thread Index | Old Index