pkgsrc-WIP-changes archive

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

kinfocenter: 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:13:34 2018 +1300
Changeset:	a39598ead2d06c27232e2e7cb08880bda111057a

Modified Files:
	kinfocenter/Makefile
	kinfocenter/distinfo
Removed Files:
	kinfocenter/patches/patch-kcontrol_menus_CMakeLists.txt

Log Message:
kinfocenter: 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=a39598ead2d06c27232e2e7cb08880bda111057a

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

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

diffs:
diff --git a/kinfocenter/Makefile b/kinfocenter/Makefile
index 03999829cb..ce0b6f6ddd 100644
--- a/kinfocenter/Makefile
+++ b/kinfocenter/Makefile
@@ -13,6 +13,12 @@ BUILD_DEPENDS+=	kdoctools>=5.19.0:../../devel/kdoctools
 
 USE_TOOLS+=	msgmerge pkg-config
 
+SUBST_CLASSES+=		xdg
+SUBST_STAGE.xdg=	post-patch
+SUBST_MESSAGE.xdg=	Install via examples dir.
+SUBST_FILES.xdg=	kcontrol/menus/CMakeLists.txt
+SUBST_SED.xdg=		-e 's:{SYSCONF_INSTALL_DIR}/xdg:{KDE_INSTALL_XDG_EX_DIR}:'
+
 CONF_FILES+=	${PREFIX}/share/examples/kde-xdg/menus/kinfocenter.menu \
 		${PKG_SYSCONFDIR}/xdg/menus/kinfocenter.menu
 
diff --git a/kinfocenter/distinfo b/kinfocenter/distinfo
index 30b2bf4d92..173c9ee7e5 100644
--- a/kinfocenter/distinfo
+++ b/kinfocenter/distinfo
@@ -6,4 +6,3 @@ SHA512 (kinfocenter-5.11.5.tar.xz) = d64cf466b4b883c9a57a0dddfe5a1d1cae068765589
 Size (kinfocenter-5.11.5.tar.xz) = 1302960 bytes
 SHA1 (patch-Modules_base_info__netbsd.cpp) = 3c4c886757d473518874a3d79f58cbb4ca365fc0
 SHA1 (patch-Modules_nics_nic.cpp) = d759de60f074d8e35d759cef3426c2f84ad9768e
-SHA1 (patch-kcontrol_menus_CMakeLists.txt) = d55591620116acf72649026f7eaab878838621e9
diff --git a/kinfocenter/patches/patch-kcontrol_menus_CMakeLists.txt b/kinfocenter/patches/patch-kcontrol_menus_CMakeLists.txt
deleted file mode 100644
index c2922450b9..0000000000
--- a/kinfocenter/patches/patch-kcontrol_menus_CMakeLists.txt
+++ /dev/null
@@ -1,15 +0,0 @@
-$NetBSD$
-
-Install via examples dir
-
---- kcontrol/menus/CMakeLists.txt.orig	2016-04-19 11:09:20.000000000 +0000
-+++ kcontrol/menus/CMakeLists.txt
-@@ -5,7 +5,7 @@
- if (WIN32)
- install( FILES kinfocenter.menu DESTINATION ${SHARE_INSTALL_DIR}/xdg/menus/)
- else ()
--install( FILES kinfocenter.menu DESTINATION ${SYSCONF_INSTALL_DIR}/xdg/menus/)
-+install( FILES kinfocenter.menu DESTINATION ${KDE_INSTALL_XDG_EX_DIR}/menus/)
- endif ()
- 
- install( FILES kinfocenter.directory  DESTINATION  ${XDG_DIRECTORY_INSTALL_DIR} )


Home | Main Index | Thread Index | Old Index