layer-shell-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:56:36 2024 +1200
Changeset:	8053c3165c43b134f81c3019a12e3b2ca0d71823

Modified Files:
	layer-shell-qt6/Makefile
	layer-shell-qt6/PLIST
	layer-shell-qt6/buildlink3.mk

Log Message:
layer-shell-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=8053c3165c43b134f81c3019a12e3b2ca0d71823

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

diffstat:
 layer-shell-qt6/Makefile      | 17 +++--------------
 layer-shell-qt6/PLIST         | 10 +++++-----
 layer-shell-qt6/buildlink3.mk | 14 +++++++-------
 3 files changed, 15 insertions(+), 26 deletions(-)

diffs:
diff --git a/layer-shell-qt6/Makefile b/layer-shell-qt6/Makefile
index 6db690147d..99df649618 100644
--- a/layer-shell-qt6/Makefile
+++ b/layer-shell-qt6/Makefile
@@ -1,32 +1,21 @@
 # $NetBSD$
 
-DISTNAME=	layer-shell-qt-6.0.5
+DISTNAME=	layer-shell-qt-${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/layer-shell-qt
 COMMENT=	Qt component to allow applications to use the Wayland wl-layer-shell protocol
 LICENSE=	gnu-lgpl-v3 AND cc0-1.0-universal AND mit AND modified-bsd
 
-TOOL_DEPENDS+=	extra-cmake-modules-[0-9]*:../../devel/extra-cmake-modules
+.include "../../meta-pkgs/kde/plasma6.mk"
+
 TOOL_DEPENDS+=	qt6-qttools-[0-9]*:../../devel/qt6-qttools
 
-USE_LANGUAGES=	c c++
 USE_TOOLS+=	pkg-config
 
-.include "../../mk/bsd.fast.prefs.mk"
-.if ${OPSYS} == "NetBSD"
-# Work-around bad use-warning check in GNU ld 2.26
-# Stolen from /usr/pkgsrc/meta-pkgs/kde/Makefile.common
-BUILDLINK_TRANSFORM+=	rm:-Wl,--fatal-warnings
-.endif
-
 .include "../../devel/wayland-protocols/buildlink3.mk"
 .include "../../x11/qt6-qtbase/buildlink3.mk"
 .include "../../devel/qt6-qtwayland/buildlink3.mk"
 .include "../../lang/qt6-qtdeclarative/buildlink3.mk"
 .include "../../x11/libxkbcommon/buildlink3.mk"
-.include "../../devel/cmake/build.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/layer-shell-qt6/PLIST b/layer-shell-qt6/PLIST
index c2f8180f3f..f780b0cdbc 100644
--- a/layer-shell-qt6/PLIST
+++ b/layer-shell-qt6/PLIST
@@ -11,8 +11,8 @@ lib/cmake/LayerShellQt/LayerShellQtTargets.cmake
 lib/libLayerShellQtInterface.so
 lib/libLayerShellQtInterface.so.6
 lib/libLayerShellQtInterface.so.${PKGVERSION}
-lib/plugins/wayland-shell-integration/liblayer-shell.so
-lib/qml/org/kde/layershell/LayerShellQtQml.qmltypes
-lib/qml/org/kde/layershell/kde-qmlmodule.version
-lib/qml/org/kde/layershell/libLayerShellQtQml.so
-lib/qml/org/kde/layershell/qmldir
+qt6/plugins/wayland-shell-integration/liblayer-shell.so
+qt6/qml/org/kde/layershell/LayerShellQtQml.qmltypes
+qt6/qml/org/kde/layershell/kde-qmlmodule.version
+qt6/qml/org/kde/layershell/libLayerShellQtQml.so
+qt6/qml/org/kde/layershell/qmldir
diff --git a/layer-shell-qt6/buildlink3.mk b/layer-shell-qt6/buildlink3.mk
index 16c7afe1f4..871d6a200a 100644
--- a/layer-shell-qt6/buildlink3.mk
+++ b/layer-shell-qt6/buildlink3.mk
@@ -1,18 +1,18 @@
 # $NetBSD$
 
-BUILDLINK_TREE+=	layer-shell-qt
+BUILDLINK_TREE+=	plasma6-layer-shell-qt
 
-.if !defined(LAYER_SHELL_QT_BUILDLINK3_MK)
-LAYER_SHELL_QT_BUILDLINK3_MK:=
+.if !defined(PLASMA6_LAYER_SHELL_QT_BUILDLINK3_MK)
+PLASMA6_LAYER_SHELL_QT_BUILDLINK3_MK:=
 
-BUILDLINK_API_DEPENDS.layer-shell-qt+=	layer-shell-qt>=6.0.5
-BUILDLINK_PKGSRCDIR.layer-shell-qt?=	../../wip/layer-shell-qt6
+BUILDLINK_API_DEPENDS.plasma6-layer-shell-qt+=	plasma6-layer-shell-qt>=6.0.5
+BUILDLINK_PKGSRCDIR.plasma6-layer-shell-qt?=	../../wip/layer-shell-qt6
 
 .include "../../devel/wayland-protocols/buildlink3.mk"
 .include "../../x11/qt6-qtbase/buildlink3.mk"
 .include "../../devel/qt6-qtwayland/buildlink3.mk"
 .include "../../lang/qt6-qtdeclarative/buildlink3.mk"
 .include "../../x11/libxkbcommon/buildlink3.mk"
-.endif	# LAYER_SHELL_QT_BUILDLINK3_MK
+.endif	# PLASMA6_LAYER_SHELL_QT_BUILDLINK3_MK
 
-BUILDLINK_TREE+=	-layer-shell-qt
+BUILDLINK_TREE+=	-plasma6-layer-shell-qt