pkgsrc-Changes archive

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

CVS commit: pkgsrc



Module Name:    pkgsrc
Committed By:   maya
Date:           Sat Apr 27 14:09:24 UTC 2019

Modified Files:
        pkgsrc/devel/kcoreaddons: Makefile PLIST
        pkgsrc/meta-pkgs/kde: Makefile.common
        pkgsrc/sysutils/solid: Makefile PLIST
        pkgsrc/x11/kwindowsystem: Makefile PLIST

Log Message:
kde framework: install some things to share/examples, and use CONF_FILES.


To generate a diff of this commit:
cvs rdiff -u -r1.30 -r1.31 pkgsrc/devel/kcoreaddons/Makefile
cvs rdiff -u -r1.4 -r1.5 pkgsrc/devel/kcoreaddons/PLIST
cvs rdiff -u -r1.1 -r1.2 pkgsrc/meta-pkgs/kde/Makefile.common
cvs rdiff -u -r1.26 -r1.27 pkgsrc/sysutils/solid/Makefile
cvs rdiff -u -r1.2 -r1.3 pkgsrc/sysutils/solid/PLIST
cvs rdiff -u -r1.26 -r1.27 pkgsrc/x11/kwindowsystem/Makefile
cvs rdiff -u -r1.2 -r1.3 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/devel/kcoreaddons/Makefile
diff -u pkgsrc/devel/kcoreaddons/Makefile:1.30 pkgsrc/devel/kcoreaddons/Makefile:1.31
--- pkgsrc/devel/kcoreaddons/Makefile:1.30      Thu Apr 25 20:50:23 2019
+++ pkgsrc/devel/kcoreaddons/Makefile   Sat Apr 27 14:09:23 2019
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.30 2019/04/25 20:50:23 markd Exp $
+# $NetBSD: Makefile,v 1.31 2019/04/27 14:09:23 maya Exp $
 
 DISTNAME=      kcoreaddons-${KF5VER}
 CATEGORIES=    devel
@@ -7,6 +7,9 @@ HOMEPAGE=       https://community.kde.org/Fram
 COMMENT=       Addons to QtCore
 LICENSE=       gnu-lgpl-v2 AND gnu-lgpl-v2.1 AND modified-bsd
 
+CONF_FILES+=   ${PREFIX}/share/examples/kde/kcoreaddons.categories \
+               ${PKG_SYSCONFDIR}/kcoreaddons.categories
+
 .include "../../meta-pkgs/kde/kf5.mk"
 
 .if ${OPSYS} != "SunOS"

Index: pkgsrc/devel/kcoreaddons/PLIST
diff -u pkgsrc/devel/kcoreaddons/PLIST:1.4 pkgsrc/devel/kcoreaddons/PLIST:1.5
--- pkgsrc/devel/kcoreaddons/PLIST:1.4  Thu Apr 25 20:50:23 2019
+++ pkgsrc/devel/kcoreaddons/PLIST      Sat Apr 27 14:09:23 2019
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.4 2019/04/25 20:50:23 markd Exp $
+@comment $NetBSD: PLIST,v 1.5 2019/04/27 14:09:23 maya Exp $
 bin/desktoptojson
 include/KF5/KCoreAddons/KAboutData
 include/KF5/KCoreAddons/KAutoSaveFile
@@ -71,6 +71,7 @@ lib/libKF5CoreAddons.so
 lib/libKF5CoreAddons.so.5
 lib/libKF5CoreAddons.so.${PKGVERSION}
 qt5/mkspecs/modules/qt_KCoreAddons.pri
+share/examples/kde/kcoreaddons.categories
 share/kf5/licenses/ARTISTIC
 share/kf5/licenses/BSD
 share/kf5/licenses/GPL_V2

Index: pkgsrc/meta-pkgs/kde/Makefile.common
diff -u pkgsrc/meta-pkgs/kde/Makefile.common:1.1 pkgsrc/meta-pkgs/kde/Makefile.common:1.2
--- pkgsrc/meta-pkgs/kde/Makefile.common:1.1    Wed Apr 11 11:34:57 2018
+++ pkgsrc/meta-pkgs/kde/Makefile.common        Sat Apr 27 14:09:23 2019
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.common,v 1.1 2018/04/11 11:34:57 markd Exp $
+# $NetBSD: Makefile.common,v 1.2 2019/04/27 14:09:23 maya Exp $
 #
 # used by meta-pkgs/kde/applications.mk
 # used by meta-pkgs/kde/kf5.mk
@@ -16,6 +16,7 @@ CONFIGURE_DIRS=       _KDE_build
 CMAKE_ARGS+=   -DKDE_INSTALL_USE_QT_SYS_PATHS=ON
 CMAKE_ARGS+=   -DKDE_INSTALL_LIBEXECDIR=libexec
 CMAKE_ARGS+=   -DKDE_INSTALL_SYSCONFDIR=${PKG_SYSCONFDIR:Q}
+CMAKE_ARGS+=   -DKDE_INSTALL_CONFDIR=${PREFIX}/share/examples/kde
 
 CMAKE_ARGS+=   -DKDE_INSTALL_XDG_EX_DIR=${PREFIX}/share/examples/kde-xdg
 CMAKE_ARGS+=   -DKDE_INSTALL_AUTOSTARTEXDIR=${PREFIX}/share/examples/kde-xdg/autostart

Index: pkgsrc/sysutils/solid/Makefile
diff -u pkgsrc/sysutils/solid/Makefile:1.26 pkgsrc/sysutils/solid/Makefile:1.27
--- pkgsrc/sysutils/solid/Makefile:1.26 Thu Apr 25 21:05:22 2019
+++ pkgsrc/sysutils/solid/Makefile      Sat Apr 27 14:09:23 2019
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.26 2019/04/25 21:05:22 markd Exp $
+# $NetBSD: Makefile,v 1.27 2019/04/27 14:09:23 maya Exp $
 
 DISTNAME=      solid-${KF5VER}
 CATEGORIES=    sysutils
@@ -11,6 +11,9 @@ LICENSE=      gnu-lgpl-v2.1
 
 USE_TOOLS+=    flex bison
 
+CONF_FILES+=   ${PREFIX}/share/examples/kde/solid.categories \
+               ${PKG_SYSCONFDIR}/solid.categories
+
 .include "../../x11/qt5-qtbase/buildlink3.mk"
 .include "../../x11/qt5-qtdeclarative/buildlink3.mk"
 BUILDLINK_DEPMETHOD.qt5-qttools= build

Index: pkgsrc/sysutils/solid/PLIST
diff -u pkgsrc/sysutils/solid/PLIST:1.2 pkgsrc/sysutils/solid/PLIST:1.3
--- pkgsrc/sysutils/solid/PLIST:1.2     Thu Apr 25 21:05:22 2019
+++ pkgsrc/sysutils/solid/PLIST Sat Apr 27 14:09:23 2019
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.2 2019/04/25 21:05:22 markd Exp $
+@comment $NetBSD: PLIST,v 1.3 2019/04/27 14:09:23 maya Exp $
 bin/solid-hardware5
 include/KF5/Solid/Solid/Battery
 include/KF5/Solid/Solid/Block
@@ -46,6 +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/locale/ar/LC_MESSAGES/solid5_qt.qm
 share/locale/bg/LC_MESSAGES/solid5_qt.qm
 share/locale/bs/LC_MESSAGES/solid5_qt.qm

Index: pkgsrc/x11/kwindowsystem/Makefile
diff -u pkgsrc/x11/kwindowsystem/Makefile:1.26 pkgsrc/x11/kwindowsystem/Makefile:1.27
--- pkgsrc/x11/kwindowsystem/Makefile:1.26      Thu Apr 25 21:17:15 2019
+++ pkgsrc/x11/kwindowsystem/Makefile   Sat Apr 27 14:09:23 2019
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.26 2019/04/25 21:17:15 markd Exp $
+# $NetBSD: Makefile,v 1.27 2019/04/27 14:09:23 maya Exp $
 
 DISTNAME=      kwindowsystem-${KF5VER}
 CATEGORIES=    x11
@@ -19,6 +19,9 @@ 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
+
 .include "../../x11/qt5-qtbase/buildlink3.mk"
 .include "../../x11/qt5-qtx11extras/buildlink3.mk"
 BUILDLINK_DEPMETHOD.qt5-qttools= build

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



Home | Main Index | Thread Index | Old Index