diff options
| author | markd <markd@pkgsrc.org> | 2018-01-30 09:24:25 +0000 |
|---|---|---|
| committer | markd <markd@pkgsrc.org> | 2018-01-30 09:24:25 +0000 |
| commit | 530904ec4595a7296a5d6e6822959e2ca783d00a (patch) | |
| tree | 39d5b1a0cbf50957fe8a93480137be88672b8e09 /www/khtml | |
| parent | 2b61e561ee16f968192e5a9cf3944a309062d6a3 (diff) | |
| download | pkgsrc-530904ec4595a7296a5d6e6822959e2ca783d00a.tar.gz | |
khtml: SUBST rather than patch
Diffstat (limited to 'www/khtml')
| -rw-r--r-- | www/khtml/Makefile | 8 | ||||
| -rw-r--r-- | www/khtml/distinfo | 3 | ||||
| -rw-r--r-- | www/khtml/patches/patch-src_CMakeLists.txt | 15 |
3 files changed, 8 insertions, 18 deletions
diff --git a/www/khtml/Makefile b/www/khtml/Makefile index f1484886c13..1f7e8690b10 100644 --- a/www/khtml/Makefile +++ b/www/khtml/Makefile @@ -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/CMakeFiles/khtmlimagepart_autogen.dir/Autog 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 --git a/www/khtml/distinfo b/www/khtml/distinfo index cb5aab2e248..a42b6318e21 100644 --- a/www/khtml/distinfo +++ b/www/khtml/distinfo @@ -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 --git a/www/khtml/patches/patch-src_CMakeLists.txt b/www/khtml/patches/patch-src_CMakeLists.txt deleted file mode 100644 index 8b20deeec37..00000000000 --- a/www/khtml/patches/patch-src_CMakeLists.txt +++ /dev/null @@ -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) |