pkgsrc-WIP-changes archive

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

ark: 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 14:13:43 2018 +1300
Changeset:	f672d2fce75cfecdf6e3ff10569a782202a66af3

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

Log Message:
ark: 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=f672d2fce75cfecdf6e3ff10569a782202a66af3

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

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

diffs:
diff --git a/ark/Makefile b/ark/Makefile
index d0c921e1d5..bd15ca62eb 100644
--- a/ark/Makefile
+++ b/ark/Makefile
@@ -13,6 +13,12 @@ BUILD_DEPENDS+=	kdoctools>=5.19.0:../../devel/kdoctools
 
 USE_TOOLS+=	msgmerge
 
+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/ark.categories \
 		${PKG_SYSCONFDIR}/xdg/ark.categories
diff --git a/ark/distinfo b/ark/distinfo
index 73b84ffd99..d0b7f38c12 100644
--- a/ark/distinfo
+++ b/ark/distinfo
@@ -4,4 +4,3 @@ SHA1 (ark-17.12.1.tar.xz) = 3bc6cf9fc6d2cf1cf5515f4a75ef59c22ea0649b
 RMD160 (ark-17.12.1.tar.xz) = 2e92cad4e2c4213ff516e2c2ebf078025a9d6448
 SHA512 (ark-17.12.1.tar.xz) = 445b98bc1fe6484cb5f2b6fb78a2d33e6d0d1898968fbcea43574567af3b3d8847fe674a2bdb342bf8ca96b862bb2de25b4f06e82715a3d99899d1279b8a9fca
 Size (ark-17.12.1.tar.xz) = 1970844 bytes
-SHA1 (patch-CMakeLists.txt) = d35fb1c97af3e0fb4119a0f7b2db7205d9cfd1fe
diff --git a/ark/patches/patch-CMakeLists.txt b/ark/patches/patch-CMakeLists.txt
deleted file mode 100644
index cf4fae0a88..0000000000
--- a/ark/patches/patch-CMakeLists.txt
+++ /dev/null
@@ -1,14 +0,0 @@
-$NetBSD$
-
-Install via examples dir
-
---- CMakeLists.txt.orig	2018-01-04 17:55:33.000000000 +0000
-+++ CMakeLists.txt
-@@ -101,6 +101,6 @@ endif()
- ki18n_install(po)
- kdoctools_install(po)
- 
--install( FILES ark.categories DESTINATION ${KDE_INSTALL_CONFDIR} )
-+install( FILES ark.categories DESTINATION ${KDE_INSTALL_DATAROOTDIR}/examples/kde-xdg )
- 
- feature_summary(WHAT ALL INCLUDE_QUIET_PACKAGES FATAL_ON_MISSING_REQUIRED_PACKAGES)


Home | Main Index | Thread Index | Old Index