pkgsrc-WIP-changes archive

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

khelpcenter: 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:04:05 2018 +1300
Changeset:	7a53258690f588eb4e80b1a73bc8ca4a0e0fd8ab

Modified Files:
	khelpcenter/Makefile
	khelpcenter/distinfo
Removed Files:
	khelpcenter/patches/patch-CMakeLists.txt

Log Message:
khelpcenter: 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=7a53258690f588eb4e80b1a73bc8ca4a0e0fd8ab

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

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

diffs:
diff --git a/khelpcenter/Makefile b/khelpcenter/Makefile
index c9ab5bc80b..1dafe1d1c8 100644
--- a/khelpcenter/Makefile
+++ b/khelpcenter/Makefile
@@ -18,6 +18,12 @@ BUILDLINK_TRANSFORM+=	rm:-fvisibility=hidden
 
 REPLACE_PERL+=	searchhandlers/khc_mansearch.pl
 
+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:{KDE_INSTALL_CONFDIR}:{KDE_INSTALL_XDG_EX_DIR}:'
+
 MAKE_DIRS+=	${PKG_SYSCONFDIR}/xdg
 CONF_FILES+=	${PREFIX}/share/examples/kde-xdg/khelpcenter.categories \
 		${PKG_SYSCONFDIR}/xdg/khelpcenter.categories
diff --git a/khelpcenter/distinfo b/khelpcenter/distinfo
index ca0e132ae6..d0e61775d5 100644
--- a/khelpcenter/distinfo
+++ b/khelpcenter/distinfo
@@ -4,4 +4,3 @@ SHA1 (khelpcenter-17.12.1.tar.xz) = 3f5200c50e215b12846c040012c02bdf0586b4ba
 RMD160 (khelpcenter-17.12.1.tar.xz) = e538556f261dee0ba28a5f7cea3366fd52790ad0
 SHA512 (khelpcenter-17.12.1.tar.xz) = 1dee188045d1761410057772af5becb3d4dc18224266faa3b76cd5041847bfe023c8b869c1c09c16e91b952d78aa8fe8a4b9511a5527635e19257e1845ebcf46
 Size (khelpcenter-17.12.1.tar.xz) = 3024796 bytes
-SHA1 (patch-CMakeLists.txt) = a498185b6bcea90f95c07679639150a83dddc0a5
diff --git a/khelpcenter/patches/patch-CMakeLists.txt b/khelpcenter/patches/patch-CMakeLists.txt
deleted file mode 100644
index 53026367a8..0000000000
--- a/khelpcenter/patches/patch-CMakeLists.txt
+++ /dev/null
@@ -1,15 +0,0 @@
-$NetBSD$
-
-Install via examples dir
-
---- CMakeLists.txt.orig	2018-01-09 00:53:12.000000000 +0000
-+++ CMakeLists.txt
-@@ -113,7 +113,7 @@ install( FILES khelpcenter.desktop  DEST
- install( FILES khelpcenter.desktop  DESTINATION  ${SHARE_INSTALL_PREFIX}/kde4/services )
- install( FILES table-of-contents.xslt glossary.xslt DESTINATION ${DATA_INSTALL_DIR}/khelpcenter )
- install( FILES khelpcenterui.rc DESTINATION ${KXMLGUI_INSTALL_DIR}/khelpcenter )
--install( FILES khelpcenter.categories DESTINATION ${KDE_INSTALL_CONFDIR} )
-+install( FILES khelpcenter.categories DESTINATION ${KDE_INSTALL_DATAROOTDIR}/examples/kde-xdg )
- install( FILES org.kde.Help.appdata.xml DESTINATION ${KDE_INSTALL_METAINFODIR} )
- 
- feature_summary(WHAT ALL INCLUDE_QUIET_PACKAGES FATAL_ON_MISSING_REQUIRED_PACKAGES)


Home | Main Index | Thread Index | Old Index