Sat Apr 27 21:23:20 2019 UTC ()
kwindowsystem: fix installation of kwindowsystem.categories


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

--- pkgsrc/x11/kwindowsystem/Makefile 2019/04/27 14:09:23 1.27
+++ pkgsrc/x11/kwindowsystem/Makefile 2019/04/27 21:23:20 1.28
@@ -1,29 +1,37 @@ @@ -1,29 +1,37 @@
1# $NetBSD: Makefile,v 1.27 2019/04/27 14:09:23 maya Exp $ 1# $NetBSD: Makefile,v 1.28 2019/04/27 21:23:20 markd Exp $
2 2
3DISTNAME= kwindowsystem-${KF5VER} 3DISTNAME= kwindowsystem-${KF5VER}
 4PKGREVISION= 1
4CATEGORIES= x11 5CATEGORIES= x11
5 6
6HOMEPAGE= https://community.kde.org/Frameworks 7HOMEPAGE= https://community.kde.org/Frameworks
7COMMENT= Access to the windowing system 8COMMENT= Access to the windowing system
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+= pkg-config 13USE_TOOLS+= pkg-config
13 14
14# don't leak buildlink reference in INTERFACE_INCLUDE_DIRECTORIES 15# don't leak buildlink reference in INTERFACE_INCLUDE_DIRECTORIES
15# leaked by cmake find_package(X11), better fix welcome. 16# leaked by cmake find_package(X11), better fix welcome.
16SUBST_CLASSES+= fix-paths 17SUBST_CLASSES+= fix-paths
17SUBST_STAGE.fix-paths= post-configure 18SUBST_STAGE.fix-paths= post-configure
18SUBST_MESSAGE.fix-paths= Cleaning up INTERFACE_INCLUDE_DIRECTORIES 19SUBST_MESSAGE.fix-paths= Cleaning up INTERFACE_INCLUDE_DIRECTORIES
19SUBST_FILES.fix-paths= _KDE_build/CMakeFiles/Export/lib/cmake/KF5WindowSystem/KF5WindowSystemTargets.cmake 20SUBST_FILES.fix-paths= _KDE_build/CMakeFiles/Export/lib/cmake/KF5WindowSystem/KF5WindowSystemTargets.cmake
20SUBST_SED.fix-paths= -e 's,${BUILDLINK_DIR},${X11BASE},g' 21SUBST_SED.fix-paths= -e 's,${BUILDLINK_DIR},${X11BASE},g'
21 22
22CONF_FILES+= ${PREFIX}/share/examples/kde/kwindowsystem.categories \ 23SUBST_CLASSES+= xdg
23 ${PKG_SYSCONFDIR}/kwindowsystem.categories 24SUBST_STAGE.xdg= pre-configure
 25SUBST_MESSAGE.xdg= Install via examples dir.
 26SUBST_FILES.xdg= CMakeLists.txt
 27SUBST_SED.xdg= -e 's:{KDE_INSTALL_CONFDIR}:{KDE_INSTALL_XDG_EX_DIR}:'
 28
 29MAKE_DIRS+= ${PKG_SYSCONFDIR}/xdg
 30CONF_FILES+= ${PREFIX}/share/examples/kde-xdg/kwindowsystem.categories \
 31 ${PKG_SYSCONFDIR}/xdg/kwindowsystem.categories
24 32
25.include "../../x11/qt5-qtbase/buildlink3.mk" 33.include "../../x11/qt5-qtbase/buildlink3.mk"
26.include "../../x11/qt5-qtx11extras/buildlink3.mk" 34.include "../../x11/qt5-qtx11extras/buildlink3.mk"
27BUILDLINK_DEPMETHOD.qt5-qttools= build 35BUILDLINK_DEPMETHOD.qt5-qttools= build
28.include "../../x11/qt5-qttools/buildlink3.mk" 36.include "../../x11/qt5-qttools/buildlink3.mk"
29.include "../../mk/bsd.pkg.mk" 37.include "../../mk/bsd.pkg.mk"
cvs diff -r1.3 -r1.4 pkgsrc/x11/kwindowsystem/PLIST (expand / switch to unified diff)

--- pkgsrc/x11/kwindowsystem/PLIST 2019/04/27 14:09:23 1.3
+++ pkgsrc/x11/kwindowsystem/PLIST 2019/04/27 21:23:20 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:23:20 markd Exp $
2include/KF5/KWindowSystem/KKeyServer 2include/KF5/KWindowSystem/KKeyServer
3include/KF5/KWindowSystem/KSelectionOwner 3include/KF5/KWindowSystem/KSelectionOwner
4include/KF5/KWindowSystem/KSelectionWatcher 4include/KF5/KWindowSystem/KSelectionWatcher
5include/KF5/KWindowSystem/KStartupInfo 5include/KF5/KWindowSystem/KStartupInfo
6include/KF5/KWindowSystem/KUserTimestamp 6include/KF5/KWindowSystem/KUserTimestamp
7include/KF5/KWindowSystem/KWindowEffects 7include/KF5/KWindowSystem/KWindowEffects
8include/KF5/KWindowSystem/KWindowInfo 8include/KF5/KWindowSystem/KWindowInfo
9include/KF5/KWindowSystem/KWindowSystem 9include/KF5/KWindowSystem/KWindowSystem
10include/KF5/KWindowSystem/KXMessages 10include/KF5/KWindowSystem/KXMessages
11include/KF5/KWindowSystem/NETWM 11include/KF5/KWindowSystem/NETWM
12include/KF5/KWindowSystem/config-kwindowsystem.h 12include/KF5/KWindowSystem/config-kwindowsystem.h
13include/KF5/KWindowSystem/fixx11h.h 13include/KF5/KWindowSystem/fixx11h.h
14include/KF5/KWindowSystem/kkeyserver.h 14include/KF5/KWindowSystem/kkeyserver.h
@@ -30,27 +30,27 @@ include/KF5/KWindowSystem/private/kwindo @@ -30,27 +30,27 @@ include/KF5/KWindowSystem/private/kwindo
30include/KF5/KWindowSystem/private/kwindowsystem_p.h 30include/KF5/KWindowSystem/private/kwindowsystem_p.h
31include/KF5/KWindowSystem/private/kwindowsystemplugininterface_p.h 31include/KF5/KWindowSystem/private/kwindowsystemplugininterface_p.h
32include/KF5/kwindowsystem_version.h 32include/KF5/kwindowsystem_version.h
33lib/cmake/KF5WindowSystem/KF5WindowSystemConfig.cmake 33lib/cmake/KF5WindowSystem/KF5WindowSystemConfig.cmake
34lib/cmake/KF5WindowSystem/KF5WindowSystemConfigVersion.cmake 34lib/cmake/KF5WindowSystem/KF5WindowSystemConfigVersion.cmake
35lib/cmake/KF5WindowSystem/KF5WindowSystemTargets-noconfig.cmake 35lib/cmake/KF5WindowSystem/KF5WindowSystemTargets-noconfig.cmake
36lib/cmake/KF5WindowSystem/KF5WindowSystemTargets.cmake 36lib/cmake/KF5WindowSystem/KF5WindowSystemTargets.cmake
37lib/libKF5WindowSystem.so 37lib/libKF5WindowSystem.so
38lib/libKF5WindowSystem.so.5 38lib/libKF5WindowSystem.so.5
39lib/libKF5WindowSystem.so.${PKGVERSION} 39lib/libKF5WindowSystem.so.${PKGVERSION}
40qt5/mkspecs/modules/qt_KWindowSystem.pri 40qt5/mkspecs/modules/qt_KWindowSystem.pri
41qt5/plugins/kf5/org.kde.kwindowsystem.platforms/KF5WindowSystemWaylandPlugin.so 41qt5/plugins/kf5/org.kde.kwindowsystem.platforms/KF5WindowSystemWaylandPlugin.so
42qt5/plugins/kf5/org.kde.kwindowsystem.platforms/KF5WindowSystemX11Plugin.so 42qt5/plugins/kf5/org.kde.kwindowsystem.platforms/KF5WindowSystemX11Plugin.so
43share/examples/kde/kwindowsystem.categories 43share/examples/kde-xdg/kwindowsystem.categories
44share/locale/af/LC_MESSAGES/kwindowsystem5_qt.qm 44share/locale/af/LC_MESSAGES/kwindowsystem5_qt.qm
45share/locale/ar/LC_MESSAGES/kwindowsystem5_qt.qm 45share/locale/ar/LC_MESSAGES/kwindowsystem5_qt.qm
46share/locale/as/LC_MESSAGES/kwindowsystem5_qt.qm 46share/locale/as/LC_MESSAGES/kwindowsystem5_qt.qm
47share/locale/be/LC_MESSAGES/kwindowsystem5_qt.qm 47share/locale/be/LC_MESSAGES/kwindowsystem5_qt.qm
48share/locale/be@latin/LC_MESSAGES/kwindowsystem5_qt.qm 48share/locale/be@latin/LC_MESSAGES/kwindowsystem5_qt.qm
49share/locale/bg/LC_MESSAGES/kwindowsystem5_qt.qm 49share/locale/bg/LC_MESSAGES/kwindowsystem5_qt.qm
50share/locale/bn/LC_MESSAGES/kwindowsystem5_qt.qm 50share/locale/bn/LC_MESSAGES/kwindowsystem5_qt.qm
51share/locale/bn_IN/LC_MESSAGES/kwindowsystem5_qt.qm 51share/locale/bn_IN/LC_MESSAGES/kwindowsystem5_qt.qm
52share/locale/br/LC_MESSAGES/kwindowsystem5_qt.qm 52share/locale/br/LC_MESSAGES/kwindowsystem5_qt.qm
53share/locale/bs/LC_MESSAGES/kwindowsystem5_qt.qm 53share/locale/bs/LC_MESSAGES/kwindowsystem5_qt.qm
54share/locale/ca/LC_MESSAGES/kwindowsystem5_qt.qm 54share/locale/ca/LC_MESSAGES/kwindowsystem5_qt.qm
55share/locale/ca@valencia/LC_MESSAGES/kwindowsystem5_qt.qm 55share/locale/ca@valencia/LC_MESSAGES/kwindowsystem5_qt.qm
56share/locale/crh/LC_MESSAGES/kwindowsystem5_qt.qm 56share/locale/crh/LC_MESSAGES/kwindowsystem5_qt.qm