CVS commit: pkgsrc/x11/kwindowsystem

["Darrin B. Jewell" <dbj%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   dbj
Date:           Sat Feb  6 15:25:17 UTC 2021

Modified Files:
        pkgsrc/x11/kwindowsystem: Makefile PLIST buildlink3.mk

Log Message:
x11/kwindowsystem: use qt5-qtmacextras on Darwin


To generate a diff of this commit:
cvs rdiff -u -r1.43 -r1.44 pkgsrc/x11/kwindowsystem/Makefile
cvs rdiff -u -r1.6 -r1.7 pkgsrc/x11/kwindowsystem/PLIST
cvs rdiff -u -r1.20 -r1.21 pkgsrc/x11/kwindowsystem/buildlink3.mk

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

Modified files:

Index: pkgsrc/x11/kwindowsystem/Makefile
diff -u pkgsrc/x11/kwindowsystem/Makefile:1.43 pkgsrc/x11/kwindowsystem/Makefile:1.44
--- pkgsrc/x11/kwindowsystem/Makefile:1.43      Fri Jan  1 09:52:44 2021
+++ pkgsrc/x11/kwindowsystem/Makefile   Sat Feb  6 15:25:17 2021
@@ -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 @@ LICENSE=     gnu-lgpl-v2.1
 
 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"

Index: pkgsrc/x11/kwindowsystem/PLIST
diff -u pkgsrc/x11/kwindowsystem/PLIST:1.6 pkgsrc/x11/kwindowsystem/PLIST:1.7
--- pkgsrc/x11/kwindowsystem/PLIST:1.6  Sun Jun  7 12:50:55 2020
+++ pkgsrc/x11/kwindowsystem/PLIST      Sat Feb  6 15:25:17 2021
@@ -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/KWindowInfo
 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/kwindowinfo.h
 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.5
 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

Index: pkgsrc/x11/kwindowsystem/buildlink3.mk
diff -u pkgsrc/x11/kwindowsystem/buildlink3.mk:1.20 pkgsrc/x11/kwindowsystem/buildlink3.mk:1.21
--- pkgsrc/x11/kwindowsystem/buildlink3.mk:1.20 Thu Nov  5 09:07:16 2020
+++ pkgsrc/x11/kwindowsystem/buildlink3.mk      Sat Feb  6 15:25:17 2021
@@ -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_API_DEPENDS.kwindowsystem+=  kw
 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