pkgsrc-WIP-changes archive

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

filelight: 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:59:45 2018 +1300
Changeset:	33e3bb77caeced36df7ad61a8b358d9b3b189d0f

Modified Files:
	filelight/Makefile
	filelight/distinfo
Removed Files:
	filelight/patches/patch-misc_CMakeLists.txt

Log Message:
filelight: 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=33e3bb77caeced36df7ad61a8b358d9b3b189d0f

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

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

diffs:
diff --git a/filelight/Makefile b/filelight/Makefile
index a5d212d621..7efc4beff7 100644
--- a/filelight/Makefile
+++ b/filelight/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=	misc/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/filelightrc \
 		${PKG_SYSCONFDIR}/xdg/filelightrc
diff --git a/filelight/distinfo b/filelight/distinfo
index 3f4c36133b..3c4e80f7c8 100644
--- a/filelight/distinfo
+++ b/filelight/distinfo
@@ -4,4 +4,3 @@ SHA1 (filelight-17.12.1.tar.xz) = 7f43aad4f8392fc1b7b63b04800f716b01a2dfb9
 RMD160 (filelight-17.12.1.tar.xz) = 884f016a523f42216f6763ebdf675d5a0f590fee
 SHA512 (filelight-17.12.1.tar.xz) = 9282dd4ed14ae8880af5ea97760ceea2011af5c6789fb166855afbdc8da002017153988549d7b49a1e38d184da2f92a6bace907858dadd9f04738456b882439e
 Size (filelight-17.12.1.tar.xz) = 654724 bytes
-SHA1 (patch-misc_CMakeLists.txt) = 81211dbdf815aac037ecd39a84f091953fdb2711
diff --git a/filelight/patches/patch-misc_CMakeLists.txt b/filelight/patches/patch-misc_CMakeLists.txt
deleted file mode 100644
index a4548e7d76..0000000000
--- a/filelight/patches/patch-misc_CMakeLists.txt
+++ /dev/null
@@ -1,15 +0,0 @@
-$NetBSD$
-
-Install via examples dir
-
---- misc/CMakeLists.txt.orig	2018-01-06 04:28:23.000000000 +0000
-+++ misc/CMakeLists.txt
-@@ -19,7 +19,7 @@
- #######################################################################
- 
- install(PROGRAMS org.kde.filelight.desktop DESTINATION ${XDG_APPS_INSTALL_DIR})
--install(FILES filelightrc DESTINATION ${CONFIG_INSTALL_DIR})
-+install(FILES filelightrc DESTINATION ${KDE_INSTALL_DATAROOTDIR}/examples/kde-xdg)
- install(FILES filelightui.rc DESTINATION ${KXMLGUI_INSTALL_DIR}//filelight)
- install(FILES org.kde.filelight.appdata.xml DESTINATION ${KDE_INSTALL_METAINFODIR})
- 


Home | Main Index | Thread Index | Old Index