CVS commit: pkgsrc/x11/kwindowsystem

["Mark Davies" <markd%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   markd
Date:           Sat Apr 27 21:23:20 UTC 2019

Modified Files:
        pkgsrc/x11/kwindowsystem: Makefile PLIST

Log Message:
kwindowsystem: fix installation of kwindowsystem.categories


To generate a diff of this commit:
cvs rdiff -u -r1.27 -r1.28 pkgsrc/x11/kwindowsystem/Makefile
cvs rdiff -u -r1.3 -r1.4 pkgsrc/x11/kwindowsystem/PLIST

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.27 pkgsrc/x11/kwindowsystem/Makefile:1.28
--- pkgsrc/x11/kwindowsystem/Makefile:1.27      Sat Apr 27 14:09:23 2019
+++ pkgsrc/x11/kwindowsystem/Makefile   Sat Apr 27 21:23:20 2019
@@ -1,6 +1,7 @@
-# $NetBSD: Makefile,v 1.27 2019/04/27 14:09:23 maya Exp $
+# $NetBSD: Makefile,v 1.28 2019/04/27 21:23:20 markd Exp $
 
 DISTNAME=      kwindowsystem-${KF5VER}
+PKGREVISION=   1
 CATEGORIES=    x11
 
 HOMEPAGE=      https://community.kde.org/Frameworks
@@ -19,8 +20,15 @@ SUBST_MESSAGE.fix-paths=     Cleaning up INT
 SUBST_FILES.fix-paths=         _KDE_build/CMakeFiles/Export/lib/cmake/KF5WindowSystem/KF5WindowSystemTargets.cmake
 SUBST_SED.fix-paths=           -e 's,${BUILDLINK_DIR},${X11BASE},g'
 
-CONF_FILES+=   ${PREFIX}/share/examples/kde/kwindowsystem.categories \
-               ${PKG_SYSCONFDIR}/kwindowsystem.categories
+SUBST_CLASSES+=                xdg
+SUBST_STAGE.xdg=       pre-configure
+SUBST_MESSAGE.xdg=     Install via examples dir.
+SUBST_FILES.xdg=       CMakeLists.txt
+SUBST_SED.xdg=         -e 's:{KDE_INSTALL_CONFDIR}:{KDE_INSTALL_XDG_EX_DIR}:'
+
+MAKE_DIRS+=    ${PKG_SYSCONFDIR}/xdg
+CONF_FILES+=   ${PREFIX}/share/examples/kde-xdg/kwindowsystem.categories \
+               ${PKG_SYSCONFDIR}/xdg/kwindowsystem.categories
 
 .include "../../x11/qt5-qtbase/buildlink3.mk"
 .include "../../x11/qt5-qtx11extras/buildlink3.mk"

Index: pkgsrc/x11/kwindowsystem/PLIST
diff -u pkgsrc/x11/kwindowsystem/PLIST:1.3 pkgsrc/x11/kwindowsystem/PLIST:1.4
--- pkgsrc/x11/kwindowsystem/PLIST:1.3  Sat Apr 27 14:09:23 2019
+++ pkgsrc/x11/kwindowsystem/PLIST      Sat Apr 27 21:23:20 2019
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.3 2019/04/27 14:09:23 maya Exp $
+@comment $NetBSD: PLIST,v 1.4 2019/04/27 21:23:20 markd Exp $
 include/KF5/KWindowSystem/KKeyServer
 include/KF5/KWindowSystem/KSelectionOwner
 include/KF5/KWindowSystem/KSelectionWatcher
@@ -40,7 +40,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
-share/examples/kde/kwindowsystem.categories
+share/examples/kde-xdg/kwindowsystem.categories
 share/locale/af/LC_MESSAGES/kwindowsystem5_qt.qm
 share/locale/ar/LC_MESSAGES/kwindowsystem5_qt.qm
 share/locale/as/LC_MESSAGES/kwindowsystem5_qt.qm