[pkgsrc/trunk]: pkgsrc/www/khtml khtml: SUBST rather than patch

[markd <markd%pkgsrc.org@localhost>]

details:   https://anonhg.NetBSD.org/pkgsrc/rev/4d01f5a8a237
branches:  trunk
changeset: 374852:4d01f5a8a237
user:      markd <markd%pkgsrc.org@localhost>
date:      Tue Jan 30 09:24:25 2018 +0000

description:
khtml: SUBST rather than patch

diffstat:

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

diffs (53 lines):

diff -r 609a412c2b06 -r 4d01f5a8a237 www/khtml/Makefile
--- a/www/khtml/Makefile        Tue Jan 30 09:21:44 2018 +0000
+++ b/www/khtml/Makefile        Tue Jan 30 09:24:25 2018 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.16 2018/01/28 20:10:38 wiz Exp $
+# $NetBSD: Makefile,v 1.17 2018/01/30 09:24:25 markd Exp $
 
 DISTNAME=      khtml-${KF5VER}
 PKGREVISION=   2
@@ -22,6 +22,12 @@
 SUBST_FILES.fix-moc+=  _KDE_build/src/kmultipart/CMakeFiles/kmultipart_autogen.dir/AutogenInfo.cmake 
 SUBST_SED.fix-moc=     -e 's,;${PREFIX}/include;,;,g'
 
+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_CONFDIR}:{KDE_INSTALL_DATAROOTDIR}/examples/kde-xdg:'
+
 MAKE_DIRS+=    ${PKG_SYSCONFDIR}/xdg
 CONF_FILES+=   ${PREFIX}/share/examples/kde-xdg/khtmlrc \
                ${PKG_SYSCONFDIR}/xdg/khtmlrc
diff -r 609a412c2b06 -r 4d01f5a8a237 www/khtml/distinfo
--- a/www/khtml/distinfo        Tue Jan 30 09:21:44 2018 +0000
+++ b/www/khtml/distinfo        Tue Jan 30 09:24:25 2018 +0000
@@ -1,7 +1,6 @@
-$NetBSD: distinfo,v 1.2 2018/01/17 20:13:38 markd Exp $
+$NetBSD: distinfo,v 1.3 2018/01/30 09:24:25 markd Exp $
 
 SHA1 (khtml-5.41.0.tar.xz) = 93f83089f3c3896e2fc5aba79191b1e048ba2816
 RMD160 (khtml-5.41.0.tar.xz) = 0412c00d04ebd859abe5cb84c9dd4ab6d5e9f5f1
 SHA512 (khtml-5.41.0.tar.xz) = 64210f2b9b17a8abea88c71e78abf2456578292e62350e93f62b8c690344399779fa1e2421d97dd9a6d5306270b071e1d6d7faebf6273ca8118a09b059469d96
 Size (khtml-5.41.0.tar.xz) = 2081692 bytes
-SHA1 (patch-src_CMakeLists.txt) = 8579c2c7d3f22d4df8e38db48e4e379eba370a0d
diff -r 609a412c2b06 -r 4d01f5a8a237 www/khtml/patches/patch-src_CMakeLists.txt
--- a/www/khtml/patches/patch-src_CMakeLists.txt        Tue Jan 30 09:21:44 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/08/21 22:33:12 markd Exp $
-
-Install via examples dir
-
---- src/CMakeLists.txt.orig    2016-04-03 20:53:09.000000000 +0000
-+++ src/CMakeLists.txt
-@@ -795,7 +795,7 @@ install(FILES khtml_browser.rc  DESTINAT
- 
- install(FILES error.html DESTINATION ${KDE_INSTALL_DATADIR_KF5}/khtml )
- 
--install(FILES khtmlrc DESTINATION ${KDE_INSTALL_CONFDIR} )
-+install(FILES khtmlrc DESTINATION ${KDE_INSTALL_DATAROOTDIR}/examples/kde-xdg )
- 
- include(ECMGeneratePriFile)
- ecm_generate_pri_file(BASE_NAME KHtml LIB_NAME KF5KHtml DEPS "gui KIOCore KJS KI18n KParts" FILENAME_VAR PRI_FILENAME INCLUDE_INSTALL_DIR ${KDE_INSTALL_INCLUDEDIR_KF5}/KHtml)