From 257b0a60c667fd0174af1c3988b7fafd1cf3a356 Mon Sep 17 00:00:00 2001
From: Niclas Rosenvik <nros@NetBSD.org>
Date: Mon, 4 Jan 2021 09:51:18 +0000
Subject: [PATCH] More fixes fot qt6-qtbase

fixes for qt6-qtbase: removed the pc links since no pc files where
istalled and fix a broken file.
---
 qt6-qtbase/Makefile | 12 +-----------
 qt6-qtbase/PLIST    | 12 ------------
 2 files changed, 1 insertion(+), 23 deletions(-)

diff --git a/qt6-qtbase/Makefile b/qt6-qtbase/Makefile
index ac40c28d3f..0fc81a19a4 100644
--- a/qt6-qtbase/Makefile
+++ b/qt6-qtbase/Makefile
@@ -145,13 +145,7 @@ SUBST_MESSAGE.path=	Add to default XDG path.
 SUBST_FILES.path=	src/corelib/io/qstandardpaths_unix.cpp
 SUBST_VARS.path=	PREFIX
 
-BROKEN_FILES=		qt5/mkspecs/qmodule.pri
-
-PC_FILES=		Qt5Concurrent.pc Qt5Core.pc \
-			Qt5Gui.pc Qt5Network.pc Qt5OpenGL.pc \
-			Qt5OpenGLExtensions.pc \
-			Qt5PrintSupport.pc Qt5Sql.pc Qt5Test.pc \
-			Qt5Widgets.pc Qt5Xml.pc
+BROKEN_FILES=		qt6/mkspecs/qmodule.pri
 
 .if ${OPSYS} == "Linux"
 QMAKE_EXTRA=		QMAKE_PLATFORM += linux
@@ -202,10 +196,6 @@ LDFLAGS+=${COMPILER_RPATH_FLAG}${QTPREFIX}/lib
 .endif
 
 post-install:
-.for i in ${PC_FILES}
-	cd ${DESTDIR}${PREFIX}/lib/pkgconfig && \
-	${LN} -f -s ${QTPREFIX}/lib/pkgconfig/${i} ${i}
-.endfor
 # The pri file has WRKSRC in it.
 	${SED} -e 's,PKG_CONFIG_EXECUTABLE = .*,PKG_CONFIG_EXECUTABLE = ${TOOLS_PATH.pkg-config},' \
 		${DESTDIR}${PREFIX}/${BROKEN_FILES} \
diff --git a/qt6-qtbase/PLIST b/qt6-qtbase/PLIST
index 879c71a365..5efb30ec7a 100644
--- a/qt6-qtbase/PLIST
+++ b/qt6-qtbase/PLIST
@@ -1,16 +1,4 @@
 @comment $NetBSD$
-lib/pkgconfig/Qt5Concurrent.pc
-lib/pkgconfig/Qt5Core.pc
-${PLIST.dbus}lib/pkgconfig/Qt5DBus.pc
-lib/pkgconfig/Qt5Gui.pc
-lib/pkgconfig/Qt5Network.pc
-lib/pkgconfig/Qt5OpenGL.pc
-lib/pkgconfig/Qt5OpenGLExtensions.pc
-lib/pkgconfig/Qt5PrintSupport.pc
-lib/pkgconfig/Qt5Sql.pc
-lib/pkgconfig/Qt5Test.pc
-lib/pkgconfig/Qt5Widgets.pc
-lib/pkgconfig/Qt5Xml.pc
 qt6/bin/androiddeployqt
 qt6/bin/androidtestrunner
 qt6/bin/cmake_automoc_parser