libkscreen-qt6: tidy up

[Mark Davies <mark%ecs.vuw.ac.nz@localhost>]

Module Name:	pkgsrc-wip
Committed By:	Mark Davies <mark%ecs.vuw.ac.nz@localhost>
Pushed By:	markd
Date:		Sun Jun 9 12:58:34 2024 +1200
Changeset:	84d00c00827c607b6beaad2a91c98f6d13c56d08

Modified Files:
	libkscreen-qt6/Makefile
	libkscreen-qt6/PLIST
	libkscreen-qt6/buildlink3.mk

Log Message:
libkscreen-qt6: tidy up

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

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

diffstat:
 libkscreen-qt6/Makefile      | 10 +++-------
 libkscreen-qt6/PLIST         | 10 +++++-----
 libkscreen-qt6/buildlink3.mk | 14 +++++++-------
 3 files changed, 15 insertions(+), 19 deletions(-)

diffs:
diff --git a/libkscreen-qt6/Makefile b/libkscreen-qt6/Makefile
index 5505466042..2f6e47c1fc 100644
--- a/libkscreen-qt6/Makefile
+++ b/libkscreen-qt6/Makefile
@@ -1,24 +1,20 @@
 # $NetBSD$
 
-DISTNAME=	libkscreen-6.0.5
+DISTNAME=	libkscreen-${PLASMAVER}
 CATEGORIES=	x11
-MASTER_SITES=	${MASTER_SITE_KDE:=plasma/6.0.5/}
-EXTRACT_SUFX=	.tar.xz
 
-MAINTAINER=	pkgsrc-users%NetBSD.org@localhost
 HOMEPAGE=	https://invent.kde.org/plasma/libkscreen
 COMMENT=	KDE screen management software
 LICENSE=	gnu-gpl-v2
 
+.include "../../meta-pkgs/kde/plasma6.mk"
+
 USE_PKGLOCALEDIR=	yes
-USE_LANGUAGES=		c c++
 
-TOOL_DEPENDS+=	extra-cmake-modules>=6.2.0:../../devel/extra-cmake-modules
 TOOL_DEPENDS+=	qt6-qttools-[0-9]*:../../devel/qt6-qttools
 
 .include "../../devel/kf6-kconfig/buildlink3.mk"
 .include "../../wip/kwayland-qt6/buildlink3.mk"
 .include "../../devel/plasma-wayland-protocols/buildlink3.mk"
 .include "../../x11/qt6-qtbase/buildlink3.mk"
-.include "../../devel/cmake/build.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/libkscreen-qt6/PLIST b/libkscreen-qt6/PLIST
index 72cca1dc06..c38cd01c39 100644
--- a/libkscreen-qt6/PLIST
+++ b/libkscreen-qt6/PLIST
@@ -38,13 +38,13 @@ lib/libKF6Screen.so.8
 lib/libKF6ScreenDpms.so
 lib/libKF6ScreenDpms.so.${PKGVERSION}
 lib/libKF6ScreenDpms.so.8
-lib/libexec/kf6/kscreen_backend_launcher
 lib/pkgconfig/KF6Screen.pc
-lib/plugins/kf6/kscreen/KSC_Fake.so
-lib/plugins/kf6/kscreen/KSC_KWayland.so
-lib/plugins/kf6/kscreen/KSC_QScreen.so
-lib/plugins/kf6/kscreen/KSC_XRandR.so
 lib/systemd/user/plasma-kscreen.service
+libexec/kf6/kscreen_backend_launcher
+qt6/plugins/kf6/kscreen/KSC_Fake.so
+qt6/plugins/kf6/kscreen/KSC_KWayland.so
+qt6/plugins/kf6/kscreen/KSC_QScreen.so
+qt6/plugins/kf6/kscreen/KSC_XRandR.so
 share/dbus-1/services/org.kde.kscreen.service
 share/locale/ar/LC_MESSAGES/libkscreen6_qt.qm
 share/locale/ast/LC_MESSAGES/libkscreen6_qt.qm
diff --git a/libkscreen-qt6/buildlink3.mk b/libkscreen-qt6/buildlink3.mk
index 861bfc58c2..dc381d97d9 100644
--- a/libkscreen-qt6/buildlink3.mk
+++ b/libkscreen-qt6/buildlink3.mk
@@ -1,17 +1,17 @@
 # $NetBSD$
 
-BUILDLINK_TREE+=	libkscreen
+BUILDLINK_TREE+=	plasma6-libkscreen
 
-.if !defined(LIBKSCREEN_BUILDLINK3_MK)
-LIBKSCREEN_BUILDLINK3_MK:=
+.if !defined(PLASMA6_LIBKSCREEN_BUILDLINK3_MK)
+PLASMA6_LIBKSCREEN_BUILDLINK3_MK:=
 
-BUILDLINK_API_DEPENDS.libkscreen+=	libkscreen>=6.0.5
-BUILDLINK_PKGSRCDIR.libkscreen?=	../../wip/libkscreen-qt6
+BUILDLINK_API_DEPENDS.plasma6-libkscreen+=	plasma6-libkscreen>=6.0.5
+BUILDLINK_PKGSRCDIR.plasma6-libkscreen?=	../../wip/libkscreen-qt6
 
 .include "../../devel/kf6-kconfig/buildlink3.mk"
 .include "../../wip/kwayland-qt6/buildlink3.mk"
 .include "../../devel/plasma-wayland-protocols/buildlink3.mk"
 .include "../../x11/qt6-qtbase/buildlink3.mk"
-.endif	# LIBKSCREEN_BUILDLINK3_MK
+.endif	# PLASMA6_LIBKSCREEN_BUILDLINK3_MK
 
-BUILDLINK_TREE+=	-libkscreen
+BUILDLINK_TREE+=	-plasma6-libkscreen