pkgsrc-WIP-changes archive

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

polkit-kde-agent: 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:38:58 2018 +1300
Changeset:	247e69877bfa53a33e0c1d017b82125fc4d359ba

Modified Files:
	polkit-kde-agent/Makefile
	polkit-kde-agent/PLIST
	polkit-kde-agent/distinfo
Removed Files:
	polkit-kde-agent/patches/patch-CMakeLists.txt

Log Message:
polkit-kde-agent: 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=247e69877bfa53a33e0c1d017b82125fc4d359ba

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

diffstat:
 polkit-kde-agent/Makefile                     |  8 +++++++-
 polkit-kde-agent/PLIST                        |  2 +-
 polkit-kde-agent/distinfo                     |  1 -
 polkit-kde-agent/patches/patch-CMakeLists.txt | 15 ---------------
 4 files changed, 8 insertions(+), 18 deletions(-)

diffs:
diff --git a/polkit-kde-agent/Makefile b/polkit-kde-agent/Makefile
index c42e5e7c6e..022b4c1196 100644
--- a/polkit-kde-agent/Makefile
+++ b/polkit-kde-agent/Makefile
@@ -14,8 +14,14 @@ 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=	CMakeLists.txt
+SUBST_SED.xdg=		-e 's:{AUTOSTART_INSTALL_DIR}:{KDE_INSTALL_AUTOSTARTEXDIR}:'
+
 MAKE_DIRS+=	${PKG_SYSCONFDIR}/xdg/autostart
-CONF_FILES+=	${PREFIX}/share/examples/kde-polkit/polkit-kde-authentication-agent-1.desktop \
+CONF_FILES+=	${PREFIX}/share/examples/kde-xdg/autostart/polkit-kde-authentication-agent-1.desktop \
 		${PKG_SYSCONFDIR}/xdg/autostart/polkit-kde-authentication-agent-1.desktop
 
 .include "../../devel/kcrash/buildlink3.mk"
diff --git a/polkit-kde-agent/PLIST b/polkit-kde-agent/PLIST
index 5d59430cca..9c4cb71b59 100644
--- a/polkit-kde-agent/PLIST
+++ b/polkit-kde-agent/PLIST
@@ -1,6 +1,6 @@
 @comment $NetBSD$
 libexec/polkit-kde-authentication-agent-1
-share/examples/kde-polkit/polkit-kde-authentication-agent-1.desktop
+share/examples/kde-xdg/autostart/polkit-kde-authentication-agent-1.desktop
 share/knotifications5/policykit1-kde.notifyrc
 share/locale/ar/LC_MESSAGES/polkit-kde-authentication-agent-1.mo
 share/locale/ast/LC_MESSAGES/polkit-kde-authentication-agent-1.mo
diff --git a/polkit-kde-agent/distinfo b/polkit-kde-agent/distinfo
index 83cd6837c2..e68239fbed 100644
--- a/polkit-kde-agent/distinfo
+++ b/polkit-kde-agent/distinfo
@@ -4,4 +4,3 @@ SHA1 (polkit-kde-agent-1-5.11.5.tar.xz) = 4d4b0a26919f2062863dffc52e21c810eab5e6
 RMD160 (polkit-kde-agent-1-5.11.5.tar.xz) = ce05f73d28ba27f175a090dd14e420c86db50ef7
 SHA512 (polkit-kde-agent-1-5.11.5.tar.xz) = 63a6696fa5961c4757b9ee13db8d9de67d0ff8c15f72448c05f2728fc57f19717adfe09aba38d7990bbaf3bd67a3674300397fd2f988f0d27b5e13b22902966f
 Size (polkit-kde-agent-1-5.11.5.tar.xz) = 44320 bytes
-SHA1 (patch-CMakeLists.txt) = c886c3126030d201cb9bdd5ab19c6c2b31f8da8f
diff --git a/polkit-kde-agent/patches/patch-CMakeLists.txt b/polkit-kde-agent/patches/patch-CMakeLists.txt
deleted file mode 100644
index d5764c70e8..0000000000
--- a/polkit-kde-agent/patches/patch-CMakeLists.txt
+++ /dev/null
@@ -1,15 +0,0 @@
-$NetBSD$
-
-Install via examples dir
-
---- CMakeLists.txt.orig	2016-05-08 04:19:51.000000000 +0000
-+++ CMakeLists.txt
-@@ -79,7 +79,7 @@ configure_file(polkit-kde-authentication
- 
- install(TARGETS polkit-kde-authentication-agent-1 DESTINATION ${LIBEXEC_INSTALL_DIR})
- 
--install(FILES ${CMAKE_BINARY_DIR}/polkit-kde-authentication-agent-1.desktop DESTINATION ${AUTOSTART_INSTALL_DIR})
-+install(FILES ${CMAKE_BINARY_DIR}/polkit-kde-authentication-agent-1.desktop DESTINATION ${KDE_INSTALL_DATAROOTDIR}/examples/kde-polkit)
- 
- install(FILES policykit1-kde.notifyrc DESTINATION ${KNOTIFYRC_INSTALL_DIR})
- 


Home | Main Index | Thread Index | Old Index