pkgsrc-Changes-HG archive

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

[pkgsrc/trunk]: pkgsrc/textproc/sonnet sonnet: SUBST rather than patch



details:   https://anonhg.NetBSD.org/pkgsrc/rev/a5da2385bc45
branches:  trunk
changeset: 374842:a5da2385bc45
user:      markd <markd%pkgsrc.org@localhost>
date:      Tue Jan 30 08:04:59 2018 +0000

description:
sonnet: SUBST rather than patch

diffstat:

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

diffs (52 lines):

diff -r a430c3ce7717 -r a5da2385bc45 textproc/sonnet/Makefile
--- a/textproc/sonnet/Makefile  Tue Jan 30 07:58:50 2018 +0000
+++ b/textproc/sonnet/Makefile  Tue Jan 30 08:04:59 2018 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.17 2018/01/28 20:11:05 wiz Exp $
+# $NetBSD: Makefile,v 1.18 2018/01/30 08:04:59 markd Exp $
 
 DISTNAME=      sonnet-${KF5VER}
 PKGREVISION=   3
@@ -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/sonnet.categories \
                ${PKG_SYSCONFDIR}/xdg/sonnet.categories
diff -r a430c3ce7717 -r a5da2385bc45 textproc/sonnet/distinfo
--- a/textproc/sonnet/distinfo  Tue Jan 30 07:58:50 2018 +0000
+++ b/textproc/sonnet/distinfo  Tue Jan 30 08:04:59 2018 +0000
@@ -1,7 +1,6 @@
-$NetBSD: distinfo,v 1.4 2018/01/27 03:56:52 markd Exp $
+$NetBSD: distinfo,v 1.5 2018/01/30 08:04:59 markd Exp $
 
 SHA1 (sonnet-5.41.0.tar.xz) = c945c1ea6486bfdb2e710c296b6a02f8dd038baa
 RMD160 (sonnet-5.41.0.tar.xz) = 6239134fb81af981d66d3dfd01836ef5e11006d5
 SHA512 (sonnet-5.41.0.tar.xz) = 608b0c476f6a1bb9e598c9c3dbb58882ec80f2e3d436cf4e4657cccc2ca5abd24bf7af5f7982ff79d80eb602c92a26be498a9bd02fcb8b6ac44298b42af6648b
 Size (sonnet-5.41.0.tar.xz) = 284748 bytes
-SHA1 (patch-CMakeLists.txt) = d64b508552169d4f9736a24c69b02cf401669068
diff -r a430c3ce7717 -r a5da2385bc45 textproc/sonnet/patches/patch-CMakeLists.txt
--- a/textproc/sonnet/patches/patch-CMakeLists.txt      Tue Jan 30 07:58:50 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/27 03:56:52 markd Exp $
-
-Install via examples dir
-
---- CMakeLists.txt.orig        2018-01-27 03:47:45.549155864 +0000
-+++ CMakeLists.txt
-@@ -85,6 +85,6 @@ install(FILES ${CMAKE_CURRENT_BINARY_DIR
-         DESTINATION ${KDE_INSTALL_INCLUDEDIR_KF5} COMPONENT Devel )
- 
- # contains list of debug categories, for kdebugsettings
--install(FILES sonnet.categories DESTINATION ${KDE_INSTALL_CONFDIR})
-+install(FILES sonnet.categories DESTINATION ${KDE_INSTALL_DATAROOTDIR}/examples/kde-xdg)
- 
- feature_summary(WHAT ALL FATAL_ON_MISSING_REQUIRED_PACKAGES)



Home | Main Index | Thread Index | Old Index