qt6-qtwayland and poppler-qt6: depend on qt6-* from pkgsrc-current

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

Module Name:	pkgsrc-wip
Committed By:	Niclas Rosenvik <nros%pkgsrc.org@localhost>
Pushed By:	nros
Date:		Fri Dec 2 00:25:15 2022 +0100
Changeset:	a7ae58076ce50df6cfcd75d3e4ec9e9c7435ea32

Modified Files:
	poppler-qt6/Makefile
	poppler-qt6/buildlink3.mk
	qt6-qtwayland/Makefile
	qt6-qtwayland/buildlink3.mk

Log Message:
qt6-qtwayland and poppler-qt6: depend on qt6-* from pkgsrc-current

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

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

diffstat:
 poppler-qt6/Makefile        | 2 +-
 poppler-qt6/buildlink3.mk   | 2 +-
 qt6-qtwayland/Makefile      | 6 +++---
 qt6-qtwayland/buildlink3.mk | 4 ++--
 4 files changed, 7 insertions(+), 7 deletions(-)

diffs:
diff --git a/poppler-qt6/Makefile b/poppler-qt6/Makefile
index 5468d5a7ca..9e6ceeb89d 100644
--- a/poppler-qt6/Makefile
+++ b/poppler-qt6/Makefile
@@ -27,6 +27,6 @@ BUILD_DIRS=		qt6/src
 post-install:
 	${INSTALL_DATA} ${WRKSRC}/poppler-qt6.pc ${DESTDIR}${PREFIX}/lib/pkgconfig
 
-.include "../../wip/qt6-qtbase/buildlink3.mk"
+.include "../../x11/qt6-qtbase/buildlink3.mk"
 .include "../../mk/pthread.buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/poppler-qt6/buildlink3.mk b/poppler-qt6/buildlink3.mk
index 32c4110ca8..7a9c1e1ade 100644
--- a/poppler-qt6/buildlink3.mk
+++ b/poppler-qt6/buildlink3.mk
@@ -9,7 +9,7 @@ BUILDLINK_API_DEPENDS.poppler-qt6+=	poppler-qt6>=22.01.0
 BUILDLINK_PKGSRCDIR.poppler-qt6?=	../../wip/poppler-qt6
 
 .include "../../print/poppler/buildlink3.mk"
-.include "../../wip/qt6-qtbase/buildlink3.mk"
+.include "../../x11/qt6-qtbase/buildlink3.mk"
 .endif	# POPPLER_QT6_BUILDLINK3_MK
 
 BUILDLINK_TREE+=	-poppler-qt6
diff --git a/qt6-qtwayland/Makefile b/qt6-qtwayland/Makefile
index d5fc821776..8633956673 100644
--- a/qt6-qtwayland/Makefile
+++ b/qt6-qtwayland/Makefile
@@ -6,12 +6,12 @@ COMMENT=	Qt6 wayland
 CATEGORIES=	x11
 LICENSE=	gnu-lgpl-v3 OR gnu-gpl-v2 OR gnu-gpl-v3
 
-.include "../../wip/qt6-qtbase/Makefile.common"
+.include "../../x11/qt6-qtbase/Makefile.common"
 
 PKGCONFIG_OVERRIDE+=	lib/pkgconfig/Qt6WaylandClient.pc
 PKGCONFIG_OVERRIDE+=	lib/pkgconfig/Qt6WaylandCompositor.pc
 
 .include "../../devel/wayland/buildlink3.mk"
-.include "../../wip/qt6-qtbase/buildlink3.mk"
-.include "../../wip/qt6-qtdeclarative/buildlink3.mk"
+.include "../../lang/qt6-qtdeclarative/buildlink3.mk"
+.include "../../x11/qt6-qtbase/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/qt6-qtwayland/buildlink3.mk b/qt6-qtwayland/buildlink3.mk
index 2a18cfe7f0..0f21cfb164 100644
--- a/qt6-qtwayland/buildlink3.mk
+++ b/qt6-qtwayland/buildlink3.mk
@@ -16,8 +16,8 @@ BUILDLINK_LIBDIRS.qt6-qtwayland+=	qt6/plugins/wayland-shell-integration
 
 
 .include "../../devel/wayland/buildlink3.mk"
-.include "../../wip/qt6-qtbase/buildlink3.mk"
-.include "../../wip/qt6-qtdeclarative/buildlink3.mk"
+.include "../../lang/qt6-qtdeclarative/buildlink3.mk"
+.include "../../x11/qt6-qtbase/buildlink3.mk"
 .endif	# QT6_QTWAYLAND_BUILDLINK3_MK
 
 BUILDLINK_TREE+=	-qt6-qtwayland