pkgsrc-Changes-HG archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

[pkgsrc/trunk]: pkgsrc/sysutils/solid solid: fix installation of solid.catego...



details:   https://anonhg.NetBSD.org/pkgsrc/rev/12e10bbad11a
branches:  trunk
changeset: 332967:12e10bbad11a
user:      markd <markd%pkgsrc.org@localhost>
date:      Sat Apr 27 21:34:59 2019 +0000

description:
solid: fix installation of solid.categories

diffstat:

 sysutils/solid/Makefile |  14 +++++++++++---
 sysutils/solid/PLIST    |   4 ++--
 2 files changed, 13 insertions(+), 5 deletions(-)

diffs (48 lines):

diff -r 9e97294e6d96 -r 12e10bbad11a sysutils/solid/Makefile
--- a/sysutils/solid/Makefile   Sat Apr 27 21:25:56 2019 +0000
+++ b/sysutils/solid/Makefile   Sat Apr 27 21:34:59 2019 +0000
@@ -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 @@
 
 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"
diff -r 9e97294e6d96 -r 12e10bbad11a sysutils/solid/PLIST
--- a/sysutils/solid/PLIST      Sat Apr 27 21:25:56 2019 +0000
+++ b/sysutils/solid/PLIST      Sat Apr 27 21:34:59 2019 +0000
@@ -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 @@
 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



Home | Main Index | Thread Index | Old Index