pkgsrc-WIP-changes archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

kde-gtk-config: SUBST rather than patch



Module Name:	pkgsrc-wip
Committed By:	Mark Davies <mark%ecs.vuw.ac.nz@localhost>
Pushed By:	markd
Date:		Sat Feb 3 15:17:15 2018 +1300
Changeset:	e40fdb242937e39e93a0d49e207933d8ce259af2

Modified Files:
	kde-gtk-config/Makefile
	kde-gtk-config/distinfo
Removed Files:
	kde-gtk-config/patches/patch-CMakeLists.txt

Log Message:
kde-gtk-config: SUBST rather than patch

To see a diff of this commit:
https://wip.pkgsrc.org/cgi-bin/gitweb.cgi?p=pkgsrc-wip.git;a=commitdiff;h=e40fdb242937e39e93a0d49e207933d8ce259af2

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

diffstat:
 kde-gtk-config/Makefile                     |  6 ++++++
 kde-gtk-config/distinfo                     |  1 -
 kde-gtk-config/patches/patch-CMakeLists.txt | 15 ---------------
 3 files changed, 6 insertions(+), 16 deletions(-)

diffs:
diff --git a/kde-gtk-config/Makefile b/kde-gtk-config/Makefile
index d908929e74..f1f9954331 100644
--- a/kde-gtk-config/Makefile
+++ b/kde-gtk-config/Makefile
@@ -15,6 +15,12 @@ DEPENDS+=	kde-cli-tools-[0-9]*:../../wip/kde-cli-tools
 
 USE_TOOLS+=	msgmerge pkg-config
 
+SUBST_CLASSES+=		xdg
+SUBST_STAGE.xdg=	post-patch
+SUBST_MESSAGE.xdg=	Install via examples dir.
+SUBST_FILES.xdg=	CMakeLists.txt
+SUBST_SED.xdg=		-e 's:{CONFIG_INSTALL_DIR}:{KDE_INSTALL_XDG_EX_DIR}:'
+
 MAKE_DIRS+=	${PKG_SYSCONFDIR}/xdg
 CONF_FILES+=	${PREFIX}/share/examples/kde-xdg/cgcgtk3.knsrc \
 		${PKG_SYSCONFDIR}/xdg/cgcgtk3.knsrc
diff --git a/kde-gtk-config/distinfo b/kde-gtk-config/distinfo
index 1d2a19d229..3dc6036471 100644
--- a/kde-gtk-config/distinfo
+++ b/kde-gtk-config/distinfo
@@ -4,5 +4,4 @@ SHA1 (kde-gtk-config-5.11.5.tar.xz) = f14d50e6d071424c30303ba719c9c9b82c39cf66
 RMD160 (kde-gtk-config-5.11.5.tar.xz) = a44a40863b73eff702d50590d4bc2b035d97ccf3
 SHA512 (kde-gtk-config-5.11.5.tar.xz) = bcaf0e8c6495fa2418caa92e4fa30f6369b7ed6d45ed288a6f4d071661cefad9240e990c57727aa709e398c1947a4caa6bcf77f3ef53c24127a5696186c989df
 Size (kde-gtk-config-5.11.5.tar.xz) = 159700 bytes
-SHA1 (patch-CMakeLists.txt) = 4d198f86ad4d23b524dd4ef6bdd38118f29f8aee
 SHA1 (patch-cmake_modules_FindGTK2.cmake) = 00edb6b5608e290511edb0de22cf410207b0ec94
diff --git a/kde-gtk-config/patches/patch-CMakeLists.txt b/kde-gtk-config/patches/patch-CMakeLists.txt
deleted file mode 100644
index 79efcf86a3..0000000000
--- a/kde-gtk-config/patches/patch-CMakeLists.txt
+++ /dev/null
@@ -1,15 +0,0 @@
-$NetBSD$
-
-Install via examples dir
-
---- CMakeLists.txt.orig	2018-01-02 11:26:12.806717176 +0000
-+++ CMakeLists.txt
-@@ -56,7 +56,7 @@ target_link_libraries(kcm_kdegtkconfig $
- kcoreaddons_desktop_to_json(kcm_kdegtkconfig kde-gtk-config.desktop)
- 
- install(TARGETS kcm_kdegtkconfig DESTINATION ${PLUGIN_INSTALL_DIR})
--install(FILES cgctheme.knsrc cgcgtk3.knsrc DESTINATION ${CONFIG_INSTALL_DIR})
-+install(FILES cgctheme.knsrc cgcgtk3.knsrc DESTINATION ${KDE_INSTALL_XDG_EX_DIR})
- install(FILES kde-gtk-config.desktop DESTINATION ${SERVICES_INSTALL_DIR})
- 
- add_subdirectory(gtkproxies)


Home | Main Index | Thread Index | Old Index