[pkgsrc/trunk]: pkgsrc/devel/kio kio: SUBST rather than patches

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

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

description:
kio: SUBST rather than patches

diffstat:

 devel/kio/Makefile                                             |  11 +++++--
 devel/kio/distinfo                                             |   4 +--
 devel/kio/patches/patch-src_core_CMakeLists.txt                |  15 ----------
 devel/kio/patches/patch-src_urifilters_shorturi_CMakeLists.txt |  13 --------
 4 files changed, 9 insertions(+), 34 deletions(-)

diffs (82 lines):

diff -r fdf5e37d8fed -r f2ea8303832f devel/kio/Makefile
--- a/devel/kio/Makefile        Tue Jan 30 08:44:31 2018 +0000
+++ b/devel/kio/Makefile        Tue Jan 30 08:47:11 2018 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.18 2018/01/28 20:10:35 wiz Exp $
+# $NetBSD: Makefile,v 1.19 2018/01/30 08:47:11 markd Exp $
 
 DISTNAME=      kio-${KF5VER}
 PKGREVISION=   2
@@ -12,6 +12,13 @@
 
 USE_TOOLS+=    msgmerge
 
+SUBST_CLASSES+=                xdg
+SUBST_STAGE.xdg=       post-patch
+SUBST_MESSAGE.xdg=     Install via examples dir.
+SUBST_FILES.xdg=       src/core/CMakeLists.txt
+SUBST_FILES.xdg+=      src/urifilters/shorturi/CMakeLists.txt
+SUBST_SED.xdg=         -e 's:{KDE_INSTALL_CONFDIR}:{KDE_INSTALL_DATAROOTDIR}/examples/kio:'
+
 MAKE_DIRS+=    ${PKG_SYSCONFDIR}/xdg
 CONF_FILES+=   ${PREFIX}/share/examples/kio/accept-languages.codes \
                ${PKG_SYSCONFDIR}/xdg/accept-languages.codes
@@ -29,8 +36,6 @@
 SUBST_FILES.fix-moc+=  _KDE_build/src/kcms/kio/CMakeFiles/kcm_kio_autogen.dir/AutogenInfo.cmake
 SUBST_SED.fix-moc=     -e 's,;${PREFIX}/include;,;,g'
 
-#.include "../../lang/python/tool.mk"
-#.include "../../wip/gpgmepp/buildlink3.mk"
 .include "../../devel/zlib/buildlink3.mk"
 .include "../../mk/krb5.buildlink3.mk"
 .include "../../archivers/karchive/buildlink3.mk"
diff -r fdf5e37d8fed -r f2ea8303832f devel/kio/distinfo
--- a/devel/kio/distinfo        Tue Jan 30 08:44:31 2018 +0000
+++ b/devel/kio/distinfo        Tue Jan 30 08:47:11 2018 +0000
@@ -1,9 +1,7 @@
-$NetBSD: distinfo,v 1.3 2018/01/17 20:00:21 markd Exp $
+$NetBSD: distinfo,v 1.4 2018/01/30 08:47:11 markd Exp $
 
 SHA1 (kio-5.41.0.tar.xz) = 6beac80ca4313916e9371ff16c7ebded01b92da4
 RMD160 (kio-5.41.0.tar.xz) = db4f80c31eef9bbc7e32ebe5244e0f6ab2354573
 SHA512 (kio-5.41.0.tar.xz) = 8f7072bf6268bf07c0c1266cdbee58aacdf43721d193aaa7574c683a4339de3d9701977c8bdd604f301d11393b8d2031e0b90e9ccc42a2c5e62050f41bc04216
 Size (kio-5.41.0.tar.xz) = 3108068 bytes
-SHA1 (patch-src_core_CMakeLists.txt) = f909a89e4da035c81f0bff9673affce8293e5afc
 SHA1 (patch-src_core_config-kmountpoint.h.cmake) = 7da0ea584a8c10b7b5476dd91f56a284869f056c
-SHA1 (patch-src_urifilters_shorturi_CMakeLists.txt) = 0491c093eff0c4385612812b086abd436df023aa
diff -r fdf5e37d8fed -r f2ea8303832f devel/kio/patches/patch-src_core_CMakeLists.txt
--- a/devel/kio/patches/patch-src_core_CMakeLists.txt   Tue Jan 30 08:44:31 2018 +0000
+++ /dev/null   Thu Jan 01 00:00:00 1970 +0000
@@ -1,15 +0,0 @@
-$NetBSD: patch-src_core_CMakeLists.txt,v 1.2 2018/01/17 20:00:21 markd Exp $
-
-Install via examples dir
-
---- src/core/CMakeLists.txt.orig       2017-12-02 20:05:51.000000000 +0000
-+++ src/core/CMakeLists.txt
-@@ -277,7 +277,7 @@ install(FILES
-   ${CMAKE_CURRENT_BINARY_DIR}/kiocore_export.h
-   DESTINATION ${KDE_INSTALL_INCLUDEDIR_KF5}/KIOCore COMPONENT Devel)
- 
--install(FILES accept-languages.codes DESTINATION ${KDE_INSTALL_CONFDIR})
-+install(FILES accept-languages.codes DESTINATION ${KDE_INSTALL_DATAROOTDIR}/examples/kio)
- 
- # make available to ecm_add_qch in parent folder
- set(KIOCore_QCH_SOURCES ${KIOCore_HEADERS} ${KIO_namespaced_HEADERS} PARENT_SCOPE)
diff -r fdf5e37d8fed -r f2ea8303832f devel/kio/patches/patch-src_urifilters_shorturi_CMakeLists.txt
--- a/devel/kio/patches/patch-src_urifilters_shorturi_CMakeLists.txt    Tue Jan 30 08:44:31 2018 +0000
+++ /dev/null   Thu Jan 01 00:00:00 1970 +0000
@@ -1,13 +0,0 @@
-$NetBSD: patch-src_urifilters_shorturi_CMakeLists.txt,v 1.2 2018/01/17 20:00:21 markd Exp $
-
-Install via examples dir
-
---- src/urifilters/shorturi/CMakeLists.txt.orig        2017-12-02 20:05:51.000000000 +0000
-+++ src/urifilters/shorturi/CMakeLists.txt
-@@ -4,5 +4,5 @@ kcoreaddons_add_plugin(kshorturifilter I
- 
- target_link_libraries(kshorturifilter KF5::I18n KF5::KIOWidgets Qt5::DBus)
- 
--install( FILES kshorturifilterrc  DESTINATION  ${KDE_INSTALL_CONFDIR} )
-+install( FILES kshorturifilterrc  DESTINATION  ${KDE_INSTALL_DATAROOTDIR}/examples/kio )
-