Stageify, use new LIB_DEPEND syntax. use USES=gmake libtool.

2 files changed, 23 insertions, 16 deletions

diff --git a/sysutils/policykit/Makefile b/sysutils/policykit/Makefile
index ebe33c66427c..68c623315657 100644
--- a/sysutils/policykit/Makefile
+++ b/sysutils/policykit/Makefile
@@ -12,15 +12,14 @@ DISTNAME=	PolicyKit-${PORTVERSION}
 MAINTAINER=	gnome@FreeBSD.org
 COMMENT=	Framework for controlling access to system-wide components
 
-LIB_DEPENDS=	dbus-glib-1:${PORTSDIR}/devel/dbus-glib \
-    		expat:${PORTSDIR}/textproc/expat2
+LIB_DEPENDS=	libdbus-glib-1.so:${PORTSDIR}/devel/dbus-glib \
+		libexpat.so:${PORTSDIR}/textproc/expat2
 
 USERS=		polkit
 GROUPS=		polkit
 
-USES=		pathfix pkgconfig
+USES=		gmake libtool pathfix pkgconfig
 USE_GNOME=	glib20 intlhack
-USE_GMAKE=	yes
 GNU_CONFIGURE=	yes
 USE_LDCONFIG=	yes
 CONFIGURE_ARGS=	--disable-gtk-doc \
@@ -36,7 +35,6 @@ LDFLAGS+=	-L${LOCALBASE}/lib
 OPTIONS_DEFINE=	MANPAGES
 OPTIONS_DEFAULT=MANPAGES
 
-NO_STAGE=	yes
 .include <bsd.port.options.mk>
 
 .if ${PORT_OPTIONS:MMANPAGES}
@@ -44,24 +42,22 @@ BUILD_DEPENDS=	${LOCALBASE}/share/sgml/docbook/4.1:${PORTSDIR}/textproc/docbook-
 		${LOCALBASE}/share/xsl/docbook/manpages/docbook.xsl:${PORTSDIR}/textproc/docbook-xsl
 USE_GNOME+=	libxslt:build
 
-MAN1=		polkit-action.1 polkit-auth.1 polkit-config-file-validate.1 \
-		polkit-policy-file-validate.1
-MAN5=		PolicyKit.conf.5
-MAN8=		PolicyKit.8
+PLIST_SUB+=	MANPAGES=""
 .else
 CONFIGURE_ARGS+=--disable-man-pages
+PLIST_SUB+=	MANPAGES="@comment "
 .endif
 
 post-install:
-	${MKDIR} ${PREFIX}/etc/PolicyKit
+	${MKDIR} ${STAGEDIR}${PREFIX}/etc/PolicyKit
 	if [ ! -f ${PREFIX}/etc/PolicyKit/PolicyKit.conf ]; then \
-	    	${INSTALL_DATA} ${WRKSRC}/data/PolicyKit.conf \
-			${PREFIX}/etc/PolicyKit/PolicyKit.conf ; \
+		${INSTALL_DATA} ${WRKSRC}/data/PolicyKit.conf \
+			${STAGEDIR}${PREFIX}/etc/PolicyKit/PolicyKit.conf ; \
 	fi
 	${INSTALL_DATA} ${WRKSRC}/data/PolicyKit.conf \
-	    	${PREFIX}/etc/PolicyKit/PolicyKit.conf.dist
-.if !defined(PACKAGE_BUILDING)
-	@${SETENV} PKG_PREFIX=${PREFIX} ${SH} ${PKGINSTALL} ${PKGNAME} POST-INSTALL
-.endif
+		${STAGEDIR}${PREFIX}/etc/PolicyKit/PolicyKit.conf.dist
+	# 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.*
 
 .include <bsd.port.mk>
diff --git a/sysutils/policykit/pkg-plist b/sysutils/policykit/pkg-plist
index e56b0a081618..0ebef32e983b 100644
--- a/sysutils/policykit/pkg-plist
+++ b/sysutils/policykit/pkg-plist
@@ -33,14 +33,17 @@ lib/libpolkit-dbus.a
 lib/libpolkit-dbus.la
 lib/libpolkit-dbus.so
 lib/libpolkit-dbus.so.2
+lib/libpolkit-dbus.so.2.0.0
 lib/libpolkit-grant.a
 lib/libpolkit-grant.la
 lib/libpolkit-grant.so
 lib/libpolkit-grant.so.2
+lib/libpolkit-grant.so.2.0.0
 lib/libpolkit.a
 lib/libpolkit.la
 lib/libpolkit.so
 lib/libpolkit.so.2
+lib/libpolkit.so.2.0.0
 libdata/pkgconfig/polkit-dbus.pc
 libdata/pkgconfig/polkit-grant.pc
 libdata/pkgconfig/polkit.pc
@@ -52,6 +55,12 @@ libexec/polkit-resolve-exe-helper
 libexec/polkit-revoke-helper
 libexec/polkit-set-default-helper
 libexec/polkitd-old
+%%MANPAGES%%man/man1/polkit-action.1.gz
+%%MANPAGES%%man/man1/polkit-auth.1.gz
+%%MANPAGES%%man/man1/polkit-config-file-validate.1.gz
+%%MANPAGES%%man/man1/polkit-policy-file-validate.1.gz
+%%MANPAGES%%man/man5/PolicyKit.conf.5.gz
+%%MANPAGES%%man/man8/PolicyKit.8.gz
 share/PolicyKit/config.dtd
 share/PolicyKit/policy/org.freedesktop.policykit.policy
 share/dbus-1/interfaces/org.freedesktop.PolicyKit.AuthenticationAgent.xml
@@ -67,6 +76,8 @@ share/dbus-1/system-services/org.freedesktop.PolicyKit.service
 @unexec rm -rf /var/run/PolicyKit 2>/dev/null || true
 @unexec rmdir /var/lib/PolicyKit 2>/dev/null || true
 @unexec rmdir /var/lib/PolicyKit-public 2>/dev/null || true
+@exec mkdir -p /var/lib/misc/
+@exec touch /var/lib/misc/PolicyKit.reload
 @unexec rm -f /var/lib/misc/PolicyKit.reload 2>/dev/null || true
 @unexec rmdir /var/lib/misc 2>/dev/null || true
 @cwd /