CVS commit: pkgsrc/sysutils/solid

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

Module Name:    pkgsrc
Committed By:   markd
Date:           Sat Apr 27 21:35:00 UTC 2019

Modified Files:
        pkgsrc/sysutils/solid: Makefile PLIST

Log Message:
solid: fix installation of solid.categories


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

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

Modified files:

Index: pkgsrc/sysutils/solid/Makefile
diff -u pkgsrc/sysutils/solid/Makefile:1.27 pkgsrc/sysutils/solid/Makefile:1.28
--- pkgsrc/sysutils/solid/Makefile:1.27 Sat Apr 27 14:09:23 2019
+++ pkgsrc/sysutils/solid/Makefile      Sat Apr 27 21:34:59 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:34:59 markd Exp $
 
 DISTNAME=      solid-${KF5VER}
+PKGREVISION=   1
 CATEGORIES=    sysutils
 
 HOMEPAGE=      https://community.kde.org/Frameworks
@@ -11,8 +12,15 @@ LICENSE=     gnu-lgpl-v2.1
 
 USE_TOOLS+=    flex bison
 
-CONF_FILES+=   ${PREFIX}/share/examples/kde/solid.categories \
-               ${PKG_SYSCONFDIR}/solid.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/solid.categories \
+               ${PKG_SYSCONFDIR}/xdg/solid.categories
 
 .include "../../x11/qt5-qtbase/buildlink3.mk"
 .include "../../x11/qt5-qtdeclarative/buildlink3.mk"

Index: pkgsrc/sysutils/solid/PLIST
diff -u pkgsrc/sysutils/solid/PLIST:1.3 pkgsrc/sysutils/solid/PLIST:1.4
--- pkgsrc/sysutils/solid/PLIST:1.3     Sat Apr 27 14:09:23 2019
+++ pkgsrc/sysutils/solid/PLIST Sat Apr 27 21:34:59 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:34:59 markd Exp $
 bin/solid-hardware5
 include/KF5/Solid/Solid/Battery
 include/KF5/Solid/Solid/Block
@@ -46,7 +46,7 @@ lib/libKF5Solid.so.${PKGVERSION}
 qt5/mkspecs/modules/qt_Solid.pri
 qt5/qml/org/kde/solid/libsolidextensionplugin.so
 qt5/qml/org/kde/solid/qmldir
-share/examples/kde/solid.categories
+share/examples/kde-xdg/solid.categories
 share/locale/ar/LC_MESSAGES/solid5_qt.qm
 share/locale/bg/LC_MESSAGES/solid5_qt.qm
 share/locale/bs/LC_MESSAGES/solid5_qt.qm