pkgsrc-WIP-changes archive

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

powerdevil: 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:24:15 2018 +1300
Changeset:	f07c75d39a45076c5f6df3aba4b34b574a541733

Modified Files:
	powerdevil/Makefile
	powerdevil/distinfo
Removed Files:
	powerdevil/patches/patch-daemon_CMakeLists.txt

Log Message:
powerdevil: 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=f07c75d39a45076c5f6df3aba4b34b574a541733

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

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

diffs:
diff --git a/powerdevil/Makefile b/powerdevil/Makefile
index 468503666b..48b4567621 100644
--- a/powerdevil/Makefile
+++ b/powerdevil/Makefile
@@ -15,6 +15,12 @@ USE_TOOLS+=	msgmerge
 
 CMAKE_ARGS+=	-DKAUTH_DBUS_DIR=${PREFIX}/share/examples/powerdevil
 
+SUBST_CLASSES+=		xdg
+SUBST_STAGE.xdg=	post-patch
+SUBST_MESSAGE.xdg=	Install via examples dir.
+SUBST_FILES.xdg=	daemon/CMakeLists.txt
+SUBST_SED.xdg=		-e 's:{KDE_INSTALL_AUTOSTARTDIR}:{KDE_INSTALL_AUTOSTARTEXDIR}:'
+
 MAKE_DIRS+=	${PKG_SYSCONFDIR}/xdg/autostart
 CONF_FILES+=	${PREFIX}/share/examples/kde-xdg/autostart/powerdevil.desktop \
 		${PKG_SYSCONFDIR}/xdg/autostart/powerdevil.desktop
diff --git a/powerdevil/distinfo b/powerdevil/distinfo
index 2504ba2ed2..9c03836da5 100644
--- a/powerdevil/distinfo
+++ b/powerdevil/distinfo
@@ -4,4 +4,3 @@ SHA1 (powerdevil-5.11.5.tar.xz) = cdaddc1bd04fce0d17057cdb72a3fcbecd5fff6d
 RMD160 (powerdevil-5.11.5.tar.xz) = 7418dd4380eac584b540677062bf34dadd69acd3
 SHA512 (powerdevil-5.11.5.tar.xz) = 8d3658b5cfe53fbe43880f6ca2346edcfb715975798b20d2059267b4daa47511fe9fb17a5b9882c21b75f80a57763a434373607a79594684fb044aae39cd0fb3
 Size (powerdevil-5.11.5.tar.xz) = 392664 bytes
-SHA1 (patch-daemon_CMakeLists.txt) = 48fd83bb322e71b87efc9ca74acba595dc6896e5
diff --git a/powerdevil/patches/patch-daemon_CMakeLists.txt b/powerdevil/patches/patch-daemon_CMakeLists.txt
deleted file mode 100644
index eb1dd31a93..0000000000
--- a/powerdevil/patches/patch-daemon_CMakeLists.txt
+++ /dev/null
@@ -1,15 +0,0 @@
-$NetBSD$
-
-Install via examples dir
-
---- daemon/CMakeLists.txt.orig	2018-01-02 13:20:52.475848717 +0000
-+++ daemon/CMakeLists.txt
-@@ -134,7 +134,7 @@ target_link_libraries(powerdevil ${UDEV_
- 
- install(TARGETS powerdevil DESTINATION ${CMAKE_INSTALL_FULL_LIBEXECDIR})
- install(FILES ${CMAKE_CURRENT_BINARY_DIR}/powerdevil.desktop
--        DESTINATION ${KDE_INSTALL_AUTOSTARTDIR})
-+        DESTINATION ${KDE_INSTALL_AUTOSTARTEXDIR})
- install(TARGETS powerdevilcore ${INSTALL_TARGETS_DEFAULT_ARGS})
- 
- # target no.3 - powerdevil ui library


Home | Main Index | Thread Index | Old Index