[pkgsrc/trunk]: pkgsrc/x11/kdelibs4support kdelibs4support: SUBST rather than...

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

details:   https://anonhg.NetBSD.org/pkgsrc/rev/2a4077bfd76c
branches:  trunk
changeset: 374850:2a4077bfd76c
user:      markd <markd%pkgsrc.org@localhost>
date:      Tue Jan 30 09:10:59 2018 +0000

description:
kdelibs4support: SUBST rather than patches

diffstat:

 x11/kdelibs4support/Makefile                                   |   9 +++-
 x11/kdelibs4support/distinfo                                   |   4 +-
 x11/kdelibs4support/patches/patch-src_CMakeLists.txt           |  23 ----------
 x11/kdelibs4support/patches/patch-src_kssl_kssl_CMakeLists.txt |  11 ----
 4 files changed, 9 insertions(+), 38 deletions(-)

diffs (78 lines):

diff -r 2c3a62a503d7 -r 2a4077bfd76c x11/kdelibs4support/Makefile
--- a/x11/kdelibs4support/Makefile      Tue Jan 30 09:09:06 2018 +0000
+++ b/x11/kdelibs4support/Makefile      Tue Jan 30 09:10:59 2018 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.18 2018/01/28 20:10:39 wiz Exp $
+# $NetBSD: Makefile,v 1.19 2018/01/30 09:10:59 markd Exp $
 
 DISTNAME=      kdelibs4support-${KF5VER}
 PKGREVISION=   2
@@ -20,6 +20,13 @@
 
 REPLACE_PERL+= src/kio/fileshareset
 
+SUBST_CLASSES+=                xdg
+SUBST_STAGE.xdg=       post-patch
+SUBST_MESSAGE.xdg=     Install via examples dir.
+SUBST_FILES.xdg=       src/CMakeLists.txt
+SUBST_FILES.xdg+=      src/kssl/kssl/CMakeLists.txt
+SUBST_SED.xdg=         -e 's:{KDE_INSTALL_CONFDIR}:{KDE_INSTALL_DATAROOTDIR}/examples/kdelibs4support:'
+
 MAKE_DIRS+=    ${PKG_SYSCONFDIR}/xdg/colors
 CONF_FILES+=   ${PREFIX}/share/examples/kdelibs4support/kdebug.areas \
                ${PKG_SYSCONFDIR}/xdg/kdebug.areas
diff -r 2c3a62a503d7 -r 2a4077bfd76c x11/kdelibs4support/distinfo
--- a/x11/kdelibs4support/distinfo      Tue Jan 30 09:09:06 2018 +0000
+++ b/x11/kdelibs4support/distinfo      Tue Jan 30 09:10:59 2018 +0000
@@ -1,8 +1,6 @@
-$NetBSD: distinfo,v 1.2 2018/01/17 20:16:57 markd Exp $
+$NetBSD: distinfo,v 1.3 2018/01/30 09:10:59 markd Exp $
 
 SHA1 (kdelibs4support-5.41.0.tar.xz) = 546dcb851de36e08d3a821f83e16e132f0ae2223
 RMD160 (kdelibs4support-5.41.0.tar.xz) = 6b24a3bdc7ad15b8396b88dc27ed4a702b3a64ba
 SHA512 (kdelibs4support-5.41.0.tar.xz) = ecda32a36099bc6b7fcdb56a7608cabb20fd30ea591a47c789b499924c7beda37f9479b8321d5e0a09094cd1274060e9546f4fb089cad70b80991e7f9a6fdc61
 Size (kdelibs4support-5.41.0.tar.xz) = 3341980 bytes
-SHA1 (patch-src_CMakeLists.txt) = f3261304b12cf81d4ab7c838bde96757cd6b15d1
-SHA1 (patch-src_kssl_kssl_CMakeLists.txt) = 06036c0e26012df88a420145fbf0213e573e1c81
diff -r 2c3a62a503d7 -r 2a4077bfd76c x11/kdelibs4support/patches/patch-src_CMakeLists.txt
--- a/x11/kdelibs4support/patches/patch-src_CMakeLists.txt      Tue Jan 30 09:09:06 2018 +0000
+++ /dev/null   Thu Jan 01 00:00:00 1970 +0000
@@ -1,23 +0,0 @@
-$NetBSD: patch-src_CMakeLists.txt,v 1.2 2018/01/17 20:16:58 markd Exp $
-
-Install via examples dir
-
---- src/CMakeLists.txt.orig    2017-12-02 20:03:43.000000000 +0000
-+++ src/CMakeLists.txt
-@@ -523,14 +523,14 @@ set_property(DIRECTORY APPEND PROPERTY A
- install(FILES ${CMAKE_CURRENT_BINARY_DIR}/kssl/ksslconfig.h 
-   DESTINATION ${KDE_INSTALL_INCLUDEDIR_KF5}/KDELibs4Support COMPONENT Devel)
- 
--install( FILES kdebug.areas kdebugrc DESTINATION ${KDE_INSTALL_CONFDIR} )
-+install( FILES kdebug.areas kdebugrc DESTINATION ${KDE_INSTALL_DATAROOTDIR}/examples/kdelibs4support )
- 
- configure_file(kdecore/all_languages.desktop ${CMAKE_CURRENT_BINARY_DIR}/all_languages @ONLY)
- install( FILES ${CMAKE_CURRENT_BINARY_DIR}/all_languages DESTINATION ${KDE_INSTALL_LOCALEDIR} RENAME kf5_all_languages )
- 
- 
- install( FILES kdeui/40.colors kdeui/Oxygen.colors kdeui/Web.colors kdeui/Royal.colors kdeui/Rainbow.colors
--         DESTINATION ${KDE_INSTALL_CONFDIR}/colors)
-+         DESTINATION ${KDE_INSTALL_DATAROOTDIR}/examples/kdelibs4support/colors)
- 
- if (NOT X11_FOUND)
-     # install our copy of the rgb.txt named colors list on systems without X11
diff -r 2c3a62a503d7 -r 2a4077bfd76c x11/kdelibs4support/patches/patch-src_kssl_kssl_CMakeLists.txt
--- a/x11/kdelibs4support/patches/patch-src_kssl_kssl_CMakeLists.txt    Tue Jan 30 09:09:06 2018 +0000
+++ /dev/null   Thu Jan 01 00:00:00 1970 +0000
@@ -1,11 +0,0 @@
-$NetBSD: patch-src_kssl_kssl_CMakeLists.txt,v 1.1 2016/08/21 22:20:43 markd Exp $
-
-Install via examples dir
-
---- src/kssl/kssl/CMakeLists.txt.orig  2016-04-03 20:49:26.000000000 +0000
-+++ src/kssl/kssl/CMakeLists.txt
-@@ -1,3 +1,3 @@
- add_subdirectory( caroot )
- 
--install( FILES ksslcalist  DESTINATION  ${KDE_INSTALL_CONFDIR} )
-+install( FILES ksslcalist  DESTINATION  ${KDE_INSTALL_DATAROOTDIR}/examples/kdelibs4support )