cleanup Qt6 packages

[Niclas Rosenvik <nros%NetBSD.org@localhost>]

Module Name:	pkgsrc-wip
Committed By:	Niclas Rosenvik <nros%NetBSD.org@localhost>
Pushed By:	nros
Date:		Fri Feb 5 17:02:03 2021 +0000
Changeset:	d1c7e8806bf7cea9e0de862b676d3c84ac7c12b8

Modified Files:
	qt6-qt5compat/Makefile
	qt6-qtbase/Makefile.common
	qt6-qtsvg/Makefile

Log Message:
cleanup Qt6 packages

move the CONDFIGURE_ARGS of the modules to MAkefile.common since
they are the same for all modules.
fix some typos.

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

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

diffstat:
 qt6-qt5compat/Makefile     | 5 +----
 qt6-qtbase/Makefile.common | 6 +++++-
 qt6-qtsvg/Makefile         | 3 ---
 3 files changed, 6 insertions(+), 8 deletions(-)

diffs:
diff --git a/qt6-qt5compat/Makefile b/qt6-qt5compat/Makefile
index 26dfc0b2db..32746d4c5b 100644
--- a/qt6-qt5compat/Makefile
+++ b/qt6-qt5compat/Makefile
@@ -2,12 +2,9 @@
 
 DISTNAME=	qt5compat-everywhere-src-${QTVERSION}
 PKGNAME=	qt6-qt5compat-${QTVERSION}
-COMMENT=	Qt6 module for qt5 portability
+COMMENT=	Qt6 module for Qt5 portability
 CATEGORIES=	x11
 
-CONFIGURE_ARGS+=-cmake-use-default-generator
-CONFIGURE_ARGS+=-- -DCMAKE_SKIP_RPATH:BOOL=TRUE
-
 .include "../../wip/qt6-qtbase/Makefile.common"
 
 .include "../../wip/qt6-qtbase/buildlink3.mk"
diff --git a/qt6-qtbase/Makefile.common b/qt6-qtbase/Makefile.common
index f753767ccd..52d6ed3a37 100644
--- a/qt6-qtbase/Makefile.common
+++ b/qt6-qtbase/Makefile.common
@@ -25,7 +25,7 @@ CXXFLAGS.SunOS+=	-D_Noreturn=""
 BUILDLINK_TRANSFORM+=	rm:-Wundef
 
 # SunOS ld doesn't support -rpath-link
-BUILDLINK_TRANSFORM.SunOS+=	rm:-Wl,-rpath-link,${PREFIX}/qt5/lib
+BUILDLINK_TRANSFORM.SunOS+=	rm:-Wl,-rpath-link,${PREFIX}/qt6/lib
 BUILDLINK_TRANSFORM.SunOS+=	rm:-Wl,-rpath-link,${WRKSRC}/lib
 
 MAKE_ENV+=		QTPREFIX=${QTPREFIX:Q}
@@ -38,6 +38,10 @@ PLIST.notdarwin=	yes
 SCRIPTS_ENV+=		HOME=${WRKDIR}
 
 .if "${PKGPATH}" != "wip/qt6-qtbase"
+CONFIGURE_ARGS+=	-cmake-use-default-generator
+.if ${OPSYS} != "Darwin"
+CONFIGURE_ARGS+=	-- -DCMAKE_SKIP_RPATH:BOOL=TRUE
+.endif
 do-configure:
 	cd ${WRKSRC} && ${SETENV} ${CONFIGURE_ENV} ${QTPREFIX}/bin/qt-configure-module ${WRKSRC} ${CONFIGURE_ARGS}
 .endif
diff --git a/qt6-qtsvg/Makefile b/qt6-qtsvg/Makefile
index 1a4db188d8..ba4dea55c6 100644
--- a/qt6-qtsvg/Makefile
+++ b/qt6-qtsvg/Makefile
@@ -5,9 +5,6 @@ PKGNAME=	qt6-qtsvg-${QTVERSION}
 COMMENT=	Qt6 module for SVG
 CATEGORIES=	graphics
 
-CONFIGURE_ARGS+=-cmake-use-default-generator
-CONFIGURE_ARGS+=-- -DCMAKE_SKIP_RPATH:BOOL=TRUE
-
 .include "../../wip/qt6-qtbase/Makefile.common"
 
 .include "../../wip/qt6-qtbase/buildlink3.mk"