Sat Apr 27 21:35:00 2019 UTC ()
solid: fix installation of solid.categories


(markd)
diff -r1.27 -r1.28 pkgsrc/sysutils/solid/Makefile
diff -r1.3 -r1.4 pkgsrc/sysutils/solid/PLIST
cvs diff -r1.27 -r1.28 pkgsrc/sysutils/solid/Makefile (expand / switch to unified diff)

--- pkgsrc/sysutils/solid/Makefile 2019/04/27 14:09:23 1.27
+++ pkgsrc/sysutils/solid/Makefile 2019/04/27 21:34:59 1.28
@@ -1,22 +1,30 @@ @@ -1,22 +1,30 @@
1# $NetBSD: Makefile,v 1.27 2019/04/27 14:09:23 maya Exp $ 1# $NetBSD: Makefile,v 1.28 2019/04/27 21:34:59 markd Exp $
2 2
3DISTNAME= solid-${KF5VER} 3DISTNAME= solid-${KF5VER}
 4PKGREVISION= 1
4CATEGORIES= sysutils 5CATEGORIES= sysutils
5 6
6HOMEPAGE= https://community.kde.org/Frameworks 7HOMEPAGE= https://community.kde.org/Frameworks
7COMMENT= Hardware integration and detection 8COMMENT= Hardware integration and detection
8LICENSE= gnu-lgpl-v2.1 9LICENSE= gnu-lgpl-v2.1
9 10
10.include "../../meta-pkgs/kde/kf5.mk" 11.include "../../meta-pkgs/kde/kf5.mk"
11 12
12USE_TOOLS+= flex bison 13USE_TOOLS+= flex bison
13 14
14CONF_FILES+= ${PREFIX}/share/examples/kde/solid.categories \ 15SUBST_CLASSES+= xdg
15 ${PKG_SYSCONFDIR}/solid.categories 16SUBST_STAGE.xdg= pre-configure
 17SUBST_MESSAGE.xdg= Install via examples dir.
 18SUBST_FILES.xdg= CMakeLists.txt
 19SUBST_SED.xdg= -e 's:{KDE_INSTALL_CONFDIR}:{KDE_INSTALL_XDG_EX_DIR}:'
 20
 21MAKE_DIRS+= ${PKG_SYSCONFDIR}/xdg
 22CONF_FILES+= ${PREFIX}/share/examples/kde-xdg/solid.categories \
 23 ${PKG_SYSCONFDIR}/xdg/solid.categories
16 24
17.include "../../x11/qt5-qtbase/buildlink3.mk" 25.include "../../x11/qt5-qtbase/buildlink3.mk"
18.include "../../x11/qt5-qtdeclarative/buildlink3.mk" 26.include "../../x11/qt5-qtdeclarative/buildlink3.mk"
19BUILDLINK_DEPMETHOD.qt5-qttools= build 27BUILDLINK_DEPMETHOD.qt5-qttools= build
20.include "../../x11/qt5-qttools/buildlink3.mk" 28.include "../../x11/qt5-qttools/buildlink3.mk"
21.include "../../x11/qt5-qtbase/buildlink3.mk" 29.include "../../x11/qt5-qtbase/buildlink3.mk"
22.include "../../mk/bsd.pkg.mk" 30.include "../../mk/bsd.pkg.mk"
cvs diff -r1.3 -r1.4 pkgsrc/sysutils/solid/PLIST (expand / switch to unified diff)

--- pkgsrc/sysutils/solid/PLIST 2019/04/27 14:09:23 1.3
+++ pkgsrc/sysutils/solid/PLIST 2019/04/27 21:34:59 1.4
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1@comment $NetBSD: PLIST,v 1.3 2019/04/27 14:09:23 maya Exp $ 1@comment $NetBSD: PLIST,v 1.4 2019/04/27 21:34:59 markd Exp $
2bin/solid-hardware5 2bin/solid-hardware5
3include/KF5/Solid/Solid/Battery 3include/KF5/Solid/Solid/Battery
4include/KF5/Solid/Solid/Block 4include/KF5/Solid/Solid/Block
5include/KF5/Solid/Solid/Camera 5include/KF5/Solid/Solid/Camera
6include/KF5/Solid/Solid/Device 6include/KF5/Solid/Solid/Device
7include/KF5/Solid/Solid/DeviceInterface 7include/KF5/Solid/Solid/DeviceInterface
8include/KF5/Solid/Solid/DeviceNotifier 8include/KF5/Solid/Solid/DeviceNotifier
9include/KF5/Solid/Solid/GenericInterface 9include/KF5/Solid/Solid/GenericInterface
10include/KF5/Solid/Solid/NetworkShare 10include/KF5/Solid/Solid/NetworkShare
11include/KF5/Solid/Solid/OpticalDisc 11include/KF5/Solid/Solid/OpticalDisc
12include/KF5/Solid/Solid/OpticalDrive 12include/KF5/Solid/Solid/OpticalDrive
13include/KF5/Solid/Solid/PortableMediaPlayer 13include/KF5/Solid/Solid/PortableMediaPlayer
14include/KF5/Solid/Solid/Predicate 14include/KF5/Solid/Solid/Predicate
@@ -36,27 +36,27 @@ include/KF5/Solid/solid/storageaccess.h @@ -36,27 +36,27 @@ include/KF5/Solid/solid/storageaccess.h
36include/KF5/Solid/solid/storagedrive.h 36include/KF5/Solid/solid/storagedrive.h
37include/KF5/Solid/solid/storagevolume.h 37include/KF5/Solid/solid/storagevolume.h
38include/KF5/solid_version.h 38include/KF5/solid_version.h
39lib/cmake/KF5Solid/KF5SolidConfig.cmake 39lib/cmake/KF5Solid/KF5SolidConfig.cmake
40lib/cmake/KF5Solid/KF5SolidConfigVersion.cmake 40lib/cmake/KF5Solid/KF5SolidConfigVersion.cmake
41lib/cmake/KF5Solid/KF5SolidTargets-noconfig.cmake 41lib/cmake/KF5Solid/KF5SolidTargets-noconfig.cmake
42lib/cmake/KF5Solid/KF5SolidTargets.cmake 42lib/cmake/KF5Solid/KF5SolidTargets.cmake
43lib/libKF5Solid.so 43lib/libKF5Solid.so
44lib/libKF5Solid.so.5 44lib/libKF5Solid.so.5
45lib/libKF5Solid.so.${PKGVERSION} 45lib/libKF5Solid.so.${PKGVERSION}
46qt5/mkspecs/modules/qt_Solid.pri 46qt5/mkspecs/modules/qt_Solid.pri
47qt5/qml/org/kde/solid/libsolidextensionplugin.so 47qt5/qml/org/kde/solid/libsolidextensionplugin.so
48qt5/qml/org/kde/solid/qmldir 48qt5/qml/org/kde/solid/qmldir
49share/examples/kde/solid.categories 49share/examples/kde-xdg/solid.categories
50share/locale/ar/LC_MESSAGES/solid5_qt.qm 50share/locale/ar/LC_MESSAGES/solid5_qt.qm
51share/locale/bg/LC_MESSAGES/solid5_qt.qm 51share/locale/bg/LC_MESSAGES/solid5_qt.qm
52share/locale/bs/LC_MESSAGES/solid5_qt.qm 52share/locale/bs/LC_MESSAGES/solid5_qt.qm
53share/locale/ca/LC_MESSAGES/solid5_qt.qm 53share/locale/ca/LC_MESSAGES/solid5_qt.qm
54share/locale/ca@valencia/LC_MESSAGES/solid5_qt.qm 54share/locale/ca@valencia/LC_MESSAGES/solid5_qt.qm
55share/locale/cs/LC_MESSAGES/solid5_qt.qm 55share/locale/cs/LC_MESSAGES/solid5_qt.qm
56share/locale/da/LC_MESSAGES/solid5_qt.qm 56share/locale/da/LC_MESSAGES/solid5_qt.qm
57share/locale/de/LC_MESSAGES/solid5_qt.qm 57share/locale/de/LC_MESSAGES/solid5_qt.qm
58share/locale/el/LC_MESSAGES/solid5_qt.qm 58share/locale/el/LC_MESSAGES/solid5_qt.qm
59share/locale/en_GB/LC_MESSAGES/solid5_qt.qm 59share/locale/en_GB/LC_MESSAGES/solid5_qt.qm
60share/locale/eo/LC_MESSAGES/solid5_qt.qm 60share/locale/eo/LC_MESSAGES/solid5_qt.qm
61share/locale/es/LC_MESSAGES/solid5_qt.qm 61share/locale/es/LC_MESSAGES/solid5_qt.qm
62share/locale/et/LC_MESSAGES/solid5_qt.qm 62share/locale/et/LC_MESSAGES/solid5_qt.qm