svn commit: r392524 - head/sysutils/policykit

[Baptiste Daroussin]

Author: bapt
Date: Sun Jul 19 17:39:03 2015
New Revision: 392524
URL: https://svnweb.freebsd.org/changeset/ports/392524

Log:
  Fix policykit leftovers by using @sample

Modified:
  head/sysutils/policykit/Makefile
  head/sysutils/policykit/pkg-plist

Modified: head/sysutils/policykit/Makefile
==============================================================================
--- head/sysutils/policykit/Makefile	Sun Jul 19 17:22:11 2015	(r392523)
+++ head/sysutils/policykit/Makefile	Sun Jul 19 17:39:03 2015	(r392524)
@@ -4,7 +4,7 @@
 
 PORTNAME=	policykit
 PORTVERSION=	0.9
-PORTREVISION=	8
+PORTREVISION=	9
 CATEGORIES=	sysutils gnome
 MASTER_SITES=	http://hal.freedesktop.org/releases/
 DISTNAME=	PolicyKit-${PORTVERSION}
@@ -50,12 +50,8 @@ PLIST_SUB+=	MANPAGES="@comment "
 
 post-install:
 	${MKDIR} ${STAGEDIR}${PREFIX}/etc/PolicyKit
-	if [ ! -f ${PREFIX}/etc/PolicyKit/PolicyKit.conf ]; then \
-		${INSTALL_DATA} ${WRKSRC}/data/PolicyKit.conf \
-			${STAGEDIR}${PREFIX}/etc/PolicyKit/PolicyKit.conf ; \
-	fi
 	${INSTALL_DATA} ${WRKSRC}/data/PolicyKit.conf \
-		${STAGEDIR}${PREFIX}/etc/PolicyKit/PolicyKit.conf.dist
+		${STAGEDIR}${PREFIX}/etc/PolicyKit/PolicyKit.conf.sample
 	# this file is used for reloading rules, handle it in the plist.
 	@${RM} ${STAGEDIR}/var/lib/misc/PolicyKit.reload
 	@${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/lib*.so.*

Modified: head/sysutils/policykit/pkg-plist
==============================================================================
--- head/sysutils/policykit/pkg-plist	Sun Jul 19 17:22:11 2015	(r392523)
+++ head/sysutils/policykit/pkg-plist	Sun Jul 19 17:39:03 2015	(r392524)
@@ -2,9 +2,7 @@ bin/polkit-action
 bin/polkit-auth
 bin/polkit-config-file-validate
 bin/polkit-policy-file-validate
- at unexec if cmp -s %D/etc/PolicyKit/PolicyKit.conf %D/etc/PolicyKit/PolicyKit.conf.dist; then rm -f %D/etc/PolicyKit/PolicyKit.conf ; fi
-etc/PolicyKit/PolicyKit.conf.dist
- at exec [ -f %B/PolicyKit.conf ] || cp %B/%f %B/PolicyKit.conf
+ at sample etc/PolicyKit/PolicyKit.conf.sample
 etc/dbus-1/system.d/org.freedesktop.PolicyKit.conf
 etc/pam.d/polkit
 etc/profile.d/polkit-bash-completion.sh