kwayland-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:00 2024 +1200
Changeset:	0c2d36794debbc0e52ca8088f114b74b7aa48979

Modified Files:
	kwayland-qt6/Makefile
	kwayland-qt6/buildlink3.mk

Log Message:
kwayland-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=0c2d36794debbc0e52ca8088f114b74b7aa48979

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

diffstat:
 kwayland-qt6/Makefile      | 16 +++-------------
 kwayland-qt6/buildlink3.mk | 14 +++++++-------
 2 files changed, 10 insertions(+), 20 deletions(-)

diffs:
diff --git a/kwayland-qt6/Makefile b/kwayland-qt6/Makefile
index 287215f514..7459c58d31 100644
--- a/kwayland-qt6/Makefile
+++ b/kwayland-qt6/Makefile
@@ -1,18 +1,16 @@
 # $NetBSD$
 
-DISTNAME=	kwayland-6.0.5
+DISTNAME=	kwayland-${PLASMAVER}
 CATEGORIES=	devel
-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/kwayland
 COMMENT=	Qt-style Client and Server library wrapper for the Wayland libraries
 LICENSE=	gnu-lgpl-v2.1
 
+.include "../../meta-pkgs/kde/plasma6.mk"
+
 TOOL_DEPENDS+=	plasma-wayland-protocols>=1.7:../../devel/plasma-wayland-protocols
 
-USE_LANGUAGES=	c c++
 USE_TOOLS+=	pkg-config
 # Don't do autotests.  Some builds are linux specific.
 CMAKE_ARGS+=	-DBUILD_TESTING=no
@@ -23,15 +21,7 @@ CMAKE_ARGS+=	-DKF_IGNORE_PLATFORM_CHECK=true
 PKG_SKIP_REASON+=       "Platform does not support Wayland"
 .endif
 
-.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 "../../devel/cmake/build.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/kwayland-qt6/buildlink3.mk b/kwayland-qt6/buildlink3.mk
index 298ef87e42..ae09d5b8b5 100644
--- a/kwayland-qt6/buildlink3.mk
+++ b/kwayland-qt6/buildlink3.mk
@@ -1,16 +1,16 @@
 # $NetBSD$
 
-BUILDLINK_TREE+=	kwayland
+BUILDLINK_TREE+=	plasma6-kwayland
 
-.if !defined(KWAYLAND_BUILDLINK3_MK)
-KWAYLAND_BUILDLINK3_MK:=
+.if !defined(PLASMA6_KWAYLAND_BUILDLINK3_MK)
+PLASMA6_KWAYLAND_BUILDLINK3_MK:=
 
-BUILDLINK_API_DEPENDS.kwayland+=	kwayland>=6.0.5
-BUILDLINK_PKGSRCDIR.kwayland?=	../../wip/kwayland-qt6
+BUILDLINK_API_DEPENDS.plasma6-kwayland+=	plasma6-kwayland>=6.0.5
+BUILDLINK_PKGSRCDIR.plasma6-kwayland?=		../../wip/kwayland-qt6
 
 .include "../../devel/wayland-protocols/buildlink3.mk"
 .include "../../x11/qt6-qtbase/buildlink3.mk"
 .include "../../devel/qt6-qtwayland/buildlink3.mk"
-.endif	# KWAYLAND_BUILDLINK3_MK
+.endif	# PLASMA6_KWAYLAND_BUILDLINK3_MK
 
-BUILDLINK_TREE+=	-kwayland
+BUILDLINK_TREE+=	-plasma6-kwayland