pkgsrc-Changes-HG archive

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

[pkgsrc/trunk]: pkgsrc/archivers/karchive karchive: SUBST rather than patch



details:   https://anonhg.NetBSD.org/pkgsrc/rev/21e4477ac408
branches:  trunk
changeset: 374838:21e4477ac408
user:      markd <markd%pkgsrc.org@localhost>
date:      Tue Jan 30 07:29:55 2018 +0000

description:
karchive: SUBST rather than patch

diffstat:

 archivers/karchive/Makefile                     |   8 +++++++-
 archivers/karchive/distinfo                     |   3 +--
 archivers/karchive/patches/patch-CMakeLists.txt |  14 --------------
 3 files changed, 8 insertions(+), 17 deletions(-)

diffs (52 lines):

diff -r 9c3edebfcf90 -r 21e4477ac408 archivers/karchive/Makefile
--- a/archivers/karchive/Makefile       Tue Jan 30 07:23:16 2018 +0000
+++ b/archivers/karchive/Makefile       Tue Jan 30 07:29:55 2018 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.10 2018/01/24 19:06:06 markd Exp $
+# $NetBSD: Makefile,v 1.11 2018/01/30 07:29:55 markd Exp $
 
 DISTNAME=      karchive-${KF5VER}
 PKGREVISION=   2
@@ -10,6 +10,12 @@
 
 .include "../../meta-pkgs/kf5/Makefile.common"
 
+SUBST_CLASSES+=                xdg
+SUBST_STAGE.xdg=       post-patch
+SUBST_MESSAGE.xdg=     Install via examples dir.
+SUBST_FILES.xdg=       CMakeLists.txt
+SUBST_SED.xdg=         -e 's:{KDE_INSTALL_CONFDIR}:{KDE_INSTALL_DATAROOTDIR}/examples/kde-xdg:'
+
 MAKE_DIRS+=    ${PKG_SYSCONFDIR}/xdg
 CONF_FILES+=   ${PREFIX}/share/examples/kde-xdg/karchive.categories \
                ${PKG_SYSCONFDIR}/xdg/karchive.categories
diff -r 9c3edebfcf90 -r 21e4477ac408 archivers/karchive/distinfo
--- a/archivers/karchive/distinfo       Tue Jan 30 07:23:16 2018 +0000
+++ b/archivers/karchive/distinfo       Tue Jan 30 07:29:55 2018 +0000
@@ -1,7 +1,6 @@
-$NetBSD: distinfo,v 1.4 2018/01/21 21:34:03 markd Exp $
+$NetBSD: distinfo,v 1.5 2018/01/30 07:29:55 markd Exp $
 
 SHA1 (karchive-5.41.0.tar.xz) = d945571a3e23e41073c93ed1e00af68a8277a9a5
 RMD160 (karchive-5.41.0.tar.xz) = 6f19b98126de9cec0768477a49b0904b279fffc7
 SHA512 (karchive-5.41.0.tar.xz) = fd28292b0076ef516ee695c057b026c3601386f1f4733f4ddc6ad21e416c27e891ffb2339f31100105834a84dc9adf4cef518d110e84f9f2d56ac92abe440f05
 Size (karchive-5.41.0.tar.xz) = 113596 bytes
-SHA1 (patch-CMakeLists.txt) = 0dc0dbc325fa6e6256dffed6817eea08de4db288
diff -r 9c3edebfcf90 -r 21e4477ac408 archivers/karchive/patches/patch-CMakeLists.txt
--- a/archivers/karchive/patches/patch-CMakeLists.txt   Tue Jan 30 07:23:16 2018 +0000
+++ /dev/null   Thu Jan 01 00:00:00 1970 +0000
@@ -1,14 +0,0 @@
-$NetBSD: patch-CMakeLists.txt,v 1.1 2018/01/21 21:34:03 markd Exp $
-
-Install via examples dir
-
---- CMakeLists.txt.orig        2018-01-21 21:13:20.336090799 +0000
-+++ CMakeLists.txt
-@@ -102,6 +102,6 @@ install(EXPORT KF5ArchiveTargets
-         FILE KF5ArchiveTargets.cmake
-         NAMESPACE KF5::)
- 
--install(FILES karchive.categories DESTINATION ${KDE_INSTALL_CONFDIR})
-+install(FILES karchive.categories DESTINATION ${KDE_INSTALL_DATAROOTDIR}/examples/kde-xdg)
- 
- feature_summary(WHAT ALL   FATAL_ON_MISSING_REQUIRED_PACKAGES)



Home | Main Index | Thread Index | Old Index