CVS commit: pkgsrc/devel/kio

["Mark Davies" <markd%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   markd
Date:           Tue Jan 30 08:47:11 UTC 2018

Modified Files:
        pkgsrc/devel/kio: Makefile distinfo
Removed Files:
        pkgsrc/devel/kio/patches: patch-src_core_CMakeLists.txt
            patch-src_urifilters_shorturi_CMakeLists.txt

Log Message:
kio: SUBST rather than patches


To generate a diff of this commit:
cvs rdiff -u -r1.18 -r1.19 pkgsrc/devel/kio/Makefile
cvs rdiff -u -r1.3 -r1.4 pkgsrc/devel/kio/distinfo
cvs rdiff -u -r1.2 -r0 pkgsrc/devel/kio/patches/patch-src_core_CMakeLists.txt \
    pkgsrc/devel/kio/patches/patch-src_urifilters_shorturi_CMakeLists.txt

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: pkgsrc/devel/kio/Makefile
diff -u pkgsrc/devel/kio/Makefile:1.18 pkgsrc/devel/kio/Makefile:1.19
--- pkgsrc/devel/kio/Makefile:1.18      Sun Jan 28 20:10:35 2018
+++ pkgsrc/devel/kio/Makefile   Tue Jan 30 08:47:11 2018
@@ -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 @@ LICENSE=     gnu-lgpl-v2.1
 
 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/autotes
 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"

Index: pkgsrc/devel/kio/distinfo
diff -u pkgsrc/devel/kio/distinfo:1.3 pkgsrc/devel/kio/distinfo:1.4
--- pkgsrc/devel/kio/distinfo:1.3       Wed Jan 17 20:00:21 2018
+++ pkgsrc/devel/kio/distinfo   Tue Jan 30 08:47:11 2018
@@ -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