pkgsrc-WIP-changes archive

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

ksysguard: 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:24:12 2018 +1300
Changeset:	2c5aba4d6c62979b731ce711a1b617175dbf7a39

Modified Files:
	ksysguard/Makefile
	ksysguard/distinfo
Removed Files:
	ksysguard/patches/patch-example_CMakeLists.txt
	ksysguard/patches/patch-gui_CMakeLists.txt

Log Message:
ksysguard: 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=2c5aba4d6c62979b731ce711a1b617175dbf7a39

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

diffstat:
 ksysguard/Makefile                             |  8 +++++++-
 ksysguard/distinfo                             |  2 --
 ksysguard/patches/patch-example_CMakeLists.txt | 10 ----------
 ksysguard/patches/patch-gui_CMakeLists.txt     | 13 -------------
 4 files changed, 7 insertions(+), 26 deletions(-)

diffs:
diff --git a/ksysguard/Makefile b/ksysguard/Makefile
index 7951a8e7cb..99760fed1a 100644
--- a/ksysguard/Makefile
+++ b/ksysguard/Makefile
@@ -23,7 +23,13 @@ SUBST_SED.eat-std=	-e 's, -std=iso9899:1990 , ,g'
 
 CFLAGS.NetBSD+=	-D_NETBSD_SOURCE
 
-BUILDLINK_TRANSFORM+=	rm:-fvisibility=hidden
+SUBST_CLASSES+=		xdg
+SUBST_STAGE.xdg=	post-patch
+SUBST_MESSAGE.xdg=	Install via examples dir.
+SUBST_FILES.xdg=	example/CMakeLists.txt
+SUBST_FILES.xdg+=	gui/CMakeLists.txt
+SUBST_SED.xdg=		-e 's:{KDE_INSTALL_FULL_SYSCONFDIR}:{KDE_INSTALL_DATAROOTDIR}/examples/ksysguard:'
+SUBST_SED.xdg+=		-e 's:{CONFIG_INSTALL_DIR}:{KDE_INSTALL_XDG_EX_DIR}:'
 
 MAKE_DIRS+=	${PKG_SYSCONFDIR}/xdg
 CONF_FILES+=	${PREFIX}/share/examples/ksysguard/ksysguarddrc \
diff --git a/ksysguard/distinfo b/ksysguard/distinfo
index ace6fd880c..e0cb3bc0a8 100644
--- a/ksysguard/distinfo
+++ b/ksysguard/distinfo
@@ -4,8 +4,6 @@ SHA1 (ksysguard-5.11.5.tar.xz) = 5659f0043c9057d0491b1cbce0b799b985547bf7
 RMD160 (ksysguard-5.11.5.tar.xz) = b1b3c1a3b28f7b5f19fc8a82f72ccec7a5dd3bea
 SHA512 (ksysguard-5.11.5.tar.xz) = 62af21b0d911abac5b66ccddeb0180c08199c0cfd8807d461fcfe444105ce7912efb5b8286e7f4955e97cb537edc32f046d646e82ecfc2d61ec39b2a53ed4d93
 Size (ksysguard-5.11.5.tar.xz) = 502228 bytes
-SHA1 (patch-example_CMakeLists.txt) = 1f208084ee87001b9c0f620bf2dffb8be5155869
-SHA1 (patch-gui_CMakeLists.txt) = 60e5609cff7d5b38fc4bf878104f8ed65ab53ecd
 SHA1 (patch-ksysguardd_FreeBSD_ProcessList.c) = 8ce52ef671aff102e9db0d6d4be2dae0da8ef989
 SHA1 (patch-ksysguardd_FreeBSD_cpuinfo.c) = bf646d263846faaf42ba80c0c85c3b607747f80d
 SHA1 (patch-ksysguardd_FreeBSD_uptime.c) = 8ea36c213e590f2c91c0723d03ddcf97d4f084ca
diff --git a/ksysguard/patches/patch-example_CMakeLists.txt b/ksysguard/patches/patch-example_CMakeLists.txt
deleted file mode 100644
index 7a9008c34a..0000000000
--- a/ksysguard/patches/patch-example_CMakeLists.txt
+++ /dev/null
@@ -1,10 +0,0 @@
-$NetBSD$
-
-Install via examples dir
-
---- example/CMakeLists.txt.orig	2016-04-19 11:11:51.000000000 +0000
-+++ example/CMakeLists.txt
-@@ -1,2 +1,2 @@
--install( FILES ksysguarddrc  DESTINATION  ${KDE_INSTALL_FULL_SYSCONFDIR} )
-+install( FILES ksysguarddrc  DESTINATION  ${KDE_INSTALL_DATAROOTDIR}/examples/ksysguard )
- install( FILES ksysguard.notifyrc DESTINATION  ${KNOTIFYRC_INSTALL_DIR} )
diff --git a/ksysguard/patches/patch-gui_CMakeLists.txt b/ksysguard/patches/patch-gui_CMakeLists.txt
deleted file mode 100644
index dabc05a4d1..0000000000
--- a/ksysguard/patches/patch-gui_CMakeLists.txt
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD$
-
-Install via examples dir
-
---- gui/CMakeLists.txt.orig	2016-04-19 11:11:51.000000000 +0000
-+++ gui/CMakeLists.txt
-@@ -70,5 +70,5 @@ install(TARGETS ksysguard         ${INST
- install( PROGRAMS org.kde.ksysguard.desktop  DESTINATION  ${XDG_APPS_INSTALL_DIR} )
- install( FILES ProcessTable.sgrd SystemLoad2.sgrd DESTINATION  ${DATA_INSTALL_DIR}/ksysguard )
- install( FILES ksysguardui.rc  DESTINATION  ${KXMLGUI_INSTALL_DIR}/ksysguard )
--install( FILES ksysguard.knsrc DESTINATION ${CONFIG_INSTALL_DIR})
-+install( FILES ksysguard.knsrc DESTINATION ${KDE_INSTALL_DATAROOTDIR}/examples/kde-xdg)
- 


Home | Main Index | Thread Index | Old Index