[pkgsrc/trunk]: pkgsrc/x11/kwindowsystem x11/kwindowsystem: use qt5-qtmacextr...

[dbj <dbj%pkgsrc.org@localhost>]

details:   https://anonhg.NetBSD.org/pkgsrc/rev/2c06c76e7b99
branches:  trunk
changeset: 446327:2c06c76e7b99
user:      dbj <dbj%pkgsrc.org@localhost>
date:      Sat Feb 06 15:25:17 2021 +0000

description:
x11/kwindowsystem: use qt5-qtmacextras on Darwin

diffstat:

 x11/kwindowsystem/Makefile      |  13 +++++++++++--
 x11/kwindowsystem/PLIST         |  27 ++++++++++++++-------------
 x11/kwindowsystem/buildlink3.mk |  11 +++++++++--
 3 files changed, 34 insertions(+), 17 deletions(-)

diffs (112 lines):

diff -r a482c17258bb -r 2c06c76e7b99 x11/kwindowsystem/Makefile
--- a/x11/kwindowsystem/Makefile        Sat Feb 06 15:22:58 2021 +0000
+++ b/x11/kwindowsystem/Makefile        Sat Feb 06 15:25:17 2021 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.43 2021/01/01 09:52:44 ryoon Exp $
+# $NetBSD: Makefile,v 1.44 2021/02/06 15:25:17 dbj Exp $
 
 DISTNAME=      kwindowsystem-${KF5VER}
 PKGREVISION=   4
@@ -12,8 +12,17 @@
 
 USE_TOOLS+=    pkg-config
 
+.include "../../mk/bsd.prefs.mk"
+
 .include "../../x11/qt5-qtbase/buildlink3.mk"
-.include "../../x11/qt5-qtx11extras/buildlink3.mk"
+PLIST_VARS+=   mac x11
+.if ${OPSYS} == "Darwin"
+PLIST.mac=     yes
+.  include "../../x11/qt5-qtmacextras/buildlink3.mk"
+.else
+PLIST.x11=     yes
+.  include "../../x11/qt5-qtx11extras/buildlink3.mk"
+.endif
 BUILDLINK_DEPMETHOD.qt5-qttools= build
 .include "../../x11/qt5-qttools/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff -r a482c17258bb -r 2c06c76e7b99 x11/kwindowsystem/PLIST
--- a/x11/kwindowsystem/PLIST   Sat Feb 06 15:22:58 2021 +0000
+++ b/x11/kwindowsystem/PLIST   Sat Feb 06 15:25:17 2021 +0000
@@ -1,7 +1,7 @@
-@comment $NetBSD: PLIST,v 1.6 2020/06/07 12:50:55 markd Exp $
+@comment $NetBSD: PLIST,v 1.7 2021/02/06 15:25:17 dbj Exp $
 include/KF5/KWindowSystem/KKeyServer
-include/KF5/KWindowSystem/KSelectionOwner
-include/KF5/KWindowSystem/KSelectionWatcher
+${PLIST.x11}include/KF5/KWindowSystem/KSelectionOwner
+${PLIST.x11}include/KF5/KWindowSystem/KSelectionWatcher
 include/KF5/KWindowSystem/KStartupInfo
 include/KF5/KWindowSystem/KUserTimestamp
 include/KF5/KWindowSystem/KWindowEffects
@@ -9,15 +9,16 @@
 include/KF5/KWindowSystem/KWindowShadow
 include/KF5/KWindowSystem/KWindowShadowTile
 include/KF5/KWindowSystem/KWindowSystem
-include/KF5/KWindowSystem/KXMessages
-include/KF5/KWindowSystem/NETWM
+${PLIST.x11}include/KF5/KWindowSystem/KXMessages
+${PLIST.x11}include/KF5/KWindowSystem/NETWM
 include/KF5/KWindowSystem/config-kwindowsystem.h
-include/KF5/KWindowSystem/fixx11h.h
+${PLIST.x11}include/KF5/KWindowSystem/fixx11h.h
 include/KF5/KWindowSystem/kkeyserver.h
-include/KF5/KWindowSystem/kkeyserver_x11.h
-include/KF5/KWindowSystem/kmanagerselection.h
-include/KF5/KWindowSystem/kselectionowner.h
-include/KF5/KWindowSystem/kselectionwatcher.h
+${PLIST.mac}include/KF5/KWindowSystem/kkeyserver_mac.h
+${PLIST.x11}include/KF5/KWindowSystem/kkeyserver_x11.h
+${PLIST.x11}include/KF5/KWindowSystem/kmanagerselection.h
+${PLIST.x11}include/KF5/KWindowSystem/kselectionowner.h
+${PLIST.x11}include/KF5/KWindowSystem/kselectionwatcher.h
 include/KF5/KWindowSystem/kstartupinfo.h
 include/KF5/KWindowSystem/kusertimestamp.h
 include/KF5/KWindowSystem/kwindoweffects.h
@@ -25,8 +26,8 @@
 include/KF5/KWindowSystem/kwindowshadow.h
 include/KF5/KWindowSystem/kwindowsystem.h
 include/KF5/KWindowSystem/kwindowsystem_export.h
-include/KF5/KWindowSystem/kxmessages.h
-include/KF5/KWindowSystem/netwm.h
+${PLIST.x11}include/KF5/KWindowSystem/kxmessages.h
+${PLIST.x11}include/KF5/KWindowSystem/netwm.h
 include/KF5/KWindowSystem/netwm_def.h
 include/KF5/KWindowSystem/private/kwindoweffects_p.h
 include/KF5/KWindowSystem/private/kwindowinfo_p.h
@@ -43,7 +44,7 @@
 lib/libKF5WindowSystem.so.${PKGVERSION}
 qt5/mkspecs/modules/qt_KWindowSystem.pri
 qt5/plugins/kf5/org.kde.kwindowsystem.platforms/KF5WindowSystemWaylandPlugin.so
-qt5/plugins/kf5/org.kde.kwindowsystem.platforms/KF5WindowSystemX11Plugin.so
+${PLIST.x11}qt5/plugins/kf5/org.kde.kwindowsystem.platforms/KF5WindowSystemX11Plugin.so
 share/locale/af/LC_MESSAGES/kwindowsystem5_qt.qm
 share/locale/ar/LC_MESSAGES/kwindowsystem5_qt.qm
 share/locale/as/LC_MESSAGES/kwindowsystem5_qt.qm
diff -r a482c17258bb -r 2c06c76e7b99 x11/kwindowsystem/buildlink3.mk
--- a/x11/kwindowsystem/buildlink3.mk   Sat Feb 06 15:22:58 2021 +0000
+++ b/x11/kwindowsystem/buildlink3.mk   Sat Feb 06 15:25:17 2021 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.20 2020/11/05 09:07:16 ryoon Exp $
+# $NetBSD: buildlink3.mk,v 1.21 2021/02/06 15:25:17 dbj Exp $
 
 BUILDLINK_TREE+=       kwindowsystem
 
@@ -9,8 +9,15 @@
 BUILDLINK_ABI_DEPENDS.kwindowsystem?=  kwindowsystem>=5.70.0nb3
 BUILDLINK_PKGSRCDIR.kwindowsystem?=    ../../x11/kwindowsystem
 
+
+.include "../../mk/bsd.fast.prefs.mk"
+
 .include "../../x11/qt5-qtbase/buildlink3.mk"
-.include "../../x11/qt5-qtx11extras/buildlink3.mk"
+.if ${OPSYS} == "Darwin"
+.  include "../../x11/qt5-qtmacextras/buildlink3.mk"
+.else
+.  include "../../x11/qt5-qtx11extras/buildlink3.mk"
+.endif
 .endif # KWINDOWSYSTEM_BUILDLINK3_MK
 
 BUILDLINK_TREE+=       -kwindowsystem