pkgsrc-Changes-HG archive

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

[pkgsrc/trunk]: pkgsrc/devel/kservice kservice: SUBST rather than patch



details:   https://anonhg.NetBSD.org/pkgsrc/rev/ca78c139a628
branches:  trunk
changeset: 374848:ca78c139a628
user:      markd <markd%pkgsrc.org@localhost>
date:      Tue Jan 30 08:58:47 2018 +0000

description:
kservice: SUBST rather than patch

diffstat:

 devel/kservice/Makefile                         |   8 +++++++-
 devel/kservice/distinfo                         |   3 +--
 devel/kservice/patches/patch-src_CMakeLists.txt |  15 ---------------
 3 files changed, 8 insertions(+), 18 deletions(-)

diffs (53 lines):

diff -r f2ea8303832f -r ca78c139a628 devel/kservice/Makefile
--- a/devel/kservice/Makefile   Tue Jan 30 08:47:11 2018 +0000
+++ b/devel/kservice/Makefile   Tue Jan 30 08:58:47 2018 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.10 2018/01/24 19:06:08 markd Exp $
+# $NetBSD: Makefile,v 1.11 2018/01/30 08:58:47 markd Exp $
 
 DISTNAME=      kservice-${KF5VER}
 PKGREVISION=   1
@@ -14,6 +14,12 @@
 
 USE_TOOLS+=    bison flex msgmerge
 
+SUBST_CLASSES+=                xdg
+SUBST_STAGE.xdg=       post-patch
+SUBST_MESSAGE.xdg=     Install via examples dir.
+SUBST_FILES.xdg=       src/CMakeLists.txt
+SUBST_SED.xdg=         -e 's:{KDE_INSTALL_SYSCONFDIR}/xdg/menus:{KDE_INSTALL_DATAROOTDIR}/examples/kservice:'
+
 MAKE_DIRS+=    ${PKG_SYSCONFDIR}/xdg/menus
 CONF_FILES+=   ${PREFIX}/share/examples/kservice/applications.menu \
                ${PKG_SYSCONFDIR}/xdg/menus/applications.menu
diff -r f2ea8303832f -r ca78c139a628 devel/kservice/distinfo
--- a/devel/kservice/distinfo   Tue Jan 30 08:47:11 2018 +0000
+++ b/devel/kservice/distinfo   Tue Jan 30 08:58:47 2018 +0000
@@ -1,7 +1,6 @@
-$NetBSD: distinfo,v 1.5 2018/01/17 20:00:22 markd Exp $
+$NetBSD: distinfo,v 1.6 2018/01/30 08:58:47 markd Exp $
 
 SHA1 (kservice-5.41.0.tar.xz) = 82d7519323de1a924c05c44738a26a3fffcc91c1
 RMD160 (kservice-5.41.0.tar.xz) = 65d1ce9d007ed213d5a3fc1e8df306ca3297d301
 SHA512 (kservice-5.41.0.tar.xz) = 4dee46935a3fd136b84edcdd4590531370e5d9c1b6fee31992811ba5f6c601a2da4d8d3bded9ca080c6263e00be80288ec22e814003f436a2439f8238598bb60
 Size (kservice-5.41.0.tar.xz) = 250040 bytes
-SHA1 (patch-src_CMakeLists.txt) = 5aba4175867e285af4f24de9aea19c859f7bdf55
diff -r f2ea8303832f -r ca78c139a628 devel/kservice/patches/patch-src_CMakeLists.txt
--- a/devel/kservice/patches/patch-src_CMakeLists.txt   Tue Jan 30 08:47:11 2018 +0000
+++ /dev/null   Thu Jan 01 00:00:00 1970 +0000
@@ -1,15 +0,0 @@
-$NetBSD: patch-src_CMakeLists.txt,v 1.1 2016/05/26 08:29:06 markd Exp $
-
-Do installs into PKG_SYSCONFDIR indirectly via examples dir
-
---- src/CMakeLists.txt.orig    2016-01-02 16:49:15.000000000 +0000
-+++ src/CMakeLists.txt
-@@ -137,7 +137,7 @@ install(FILES
- if (WIN32)
- install( FILES applications.menu  DESTINATION  ${KDE_INSTALL_DATAROOTDIR}/xdg/menus  RENAME ${APPLICATIONS_MENU_NAME} )
- else ()
--install( FILES applications.menu  DESTINATION  ${KDE_INSTALL_SYSCONFDIR}/xdg/menus  RENAME ${APPLICATIONS_MENU_NAME} )
-+install( FILES applications.menu  DESTINATION  ${KDE_INSTALL_DATAROOTDIR}/examples/kservice  RENAME ${APPLICATIONS_MENU_NAME} )
- endif ()
- 
- install(TARGETS KF5Service EXPORT KF5ServiceTargets ${KF5_INSTALL_TARGETS_DEFAULT_ARGS})



Home | Main Index | Thread Index | Old Index