3 files changed, 33 insertions, 30 deletions

diff --git a/sysutils/polkit/Makefile b/sysutils/polkit/Makefile
index 372eef6cea6e..0065ec4a69a0 100644
--- a/sysutils/polkit/Makefile
+++ b/sysutils/polkit/Makefile
@@ -1,27 +1,22 @@
 # Created by: Koop Mast<kwm@FreeBSD.org>
 # $FreeBSD$
-#   $MCom: ports/sysutils/polkit/Makefile,v 1.23 2012/12/18 13:01:54 kwm Exp $
+#   $MCom: ports/trunk/sysutils/polkit/Makefile 19013 2014-03-08 07:50:57Z kwm $
 
 PORTNAME=	polkit
 PORTVERSION=	0.105
 PORTREVISION=	2
 CATEGORIES=	sysutils gnome
-MASTER_SITES=	http://www.freedesktop.org/software/polkit/releases/ \
-		http://miwibox.org/distfiles/
+MASTER_SITES=	http://www.freedesktop.org/software/polkit/releases/
 
 MAINTAINER=	gnome@FreeBSD.org
 COMMENT=	Framework for controlling access to system-wide components
 
-BUILD_DEPENDS=	${LOCALBASE}/share/gir-1.0/GLib-2.0.gir:${PORTSDIR}/devel/gobject-introspection
-LIB_DEPENDS=	expat:${PORTSDIR}/textproc/expat2
-RUN_DEPENDS=	${LOCALBASE}/share/gir-1.0/GLib-2.0.gir:${PORTSDIR}/devel/gobject-introspection \
-		dbus-launch:${PORTSDIR}/devel/dbus
+LIB_DEPENDS=	libexpat.so:${PORTSDIR}/textproc/expat2
+RUN_DEPENDS=	dbus-launch:${PORTSDIR}/devel/dbus
 
-USE_GNOME=	gnomehack glib20 intlhack gnomehier
-USE_GMAKE=	yes
-MAKE_JOBS_UNSAFE=	yes
+USE_GNOME=	glib20 intlhack gnomehier introspection
+USES=		gettext gmake libtool pathfix pkgconfig
 GNU_CONFIGURE=	yes
-USES=		pkgconfig gettext
 USE_LDCONFIG=	yes
 CONFIGURE_ARGS=	--disable-gtk-doc \
 		--with-authfw=pam \
@@ -36,18 +31,17 @@ LDFLAGS+=	-L${LOCALBASE}/lib
 
 OPTIONS_DEFINE=	MANPAGES
 
-NO_STAGE=	yes
 .include <bsd.port.options.mk>
 
 .if ${PORT_OPTIONS:MMANPAGES}
 BUILD_DEPENDS+=	${LOCALBASE}/share/sgml/docbook/4.1:${PORTSDIR}/textproc/docbook-sgml \
-    		xsltproc:${PORTSDIR}/textproc/libxslt \
 		${LOCALBASE}/share/xsl/docbook/manpages/docbook.xsl:${PORTSDIR}/textproc/docbook-xsl
 
-MAN1=		pkaction.1 pkcheck.1 pkexec.1 pkttyagent.1
-MAN8=		pklocalauthority.8 polkit.8 polkitd.8
+USE_GNOME+=	libxslt:build
+PLIST_SUB+=	MANPAGES=""
 .else
 CONFIGURE_ARGS+=--disable-man-pages
+PLIST_SUB+=	MANPAGES="@comment "
 .endif
 
 post-patch:
@@ -56,15 +50,11 @@ post-patch:
 		${WRKSRC}/src/examples/org.freedesktop.policykit.examples.pkexec.policy.in
 
 post-install:
-	${MKDIR} ${PREFIX}/etc/dbus-1/system.d/
-	if [ ! -f ${PREFIX}/etc/dbus-1/system.d/org.freedesktop.PolicyKit1.conf ]; then \
-		${INSTALL_DATA} ${WRKSRC}/data/org.freedesktop.PolicyKit1.conf \
-			${PREFIX}/etc/dbus-1/system.d/org.freedesktop.PolicyKit1.conf ; \
-	fi
+	@${MKDIR} ${STAGEDIR}${PREFIX}/etc/dbus-1/system.d/
+	@${MKDIR} ${STAGEDIR}${PREFIX}/share/polkit-1/rules.d/
 	${INSTALL_DATA} ${WRKSRC}/data/org.freedesktop.PolicyKit1.conf \
-		${PREFIX}/etc/dbus-1/system.d/org.freedesktop.PolicyKit1.conf.dist
-.if !defined(PACKAGE_BUILDING)
-	@${SETENV} PKG_PREFIX=${PREFIX} ${SH} ${PKGINSTALL} ${PKGNAME} POST-INSTALL
-.endif
+		${STAGEDIR}${PREFIX}/etc/dbus-1/system.d/org.freedesktop.PolicyKit1.conf.dist
+	@${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/lib*.so*
+	@${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/polkit-1/extensions/lib*.so
 
 .include <bsd.port.mk>
diff --git a/sysutils/polkit/pkg-install b/sysutils/polkit/pkg-install
index dc204b56b265..c1c6c609dbc2 100644
--- a/sysutils/polkit/pkg-install
+++ b/sysutils/polkit/pkg-install
@@ -2,14 +2,15 @@
 
 case $2 in
 POST-INSTALL)
-	mkdir -p /var/lib/polkit-1/localauthority
-	mkdir -p ${PKG_PREFIX}/etc/polkit-1/localauthority
+	/bin/mkdir -p /var/lib/polkit-1/localauthority
+	/bin/mkdir -p ${PKG_PREFIX}/etc/polkit-1/localauthority
+	/bin/mkdir -p ${PKG_PREFIX}/share/polkit-1/rules.d
 	for i in 10-vendor.d 20-org.d 30-site.d 50-local.d 90-mandatory.d; do
-	    mkdir -p /var/lib/polkit-1/localauthority/${i}
-	    mkdir -p ${PKG_PREFIX}/etc/polkit-1/localauthority/${i}
+	    /bin/mkdir -p /var/lib/polkit-1/localauthority/${i}
+	    /bin/mkdir -p ${PKG_PREFIX}/etc/polkit-1/localauthority/${i}
 	done
-	chmod 0700 /var/lib/polkit-1
-	chmod 0700 ${PKG_PREFIX}/etc/polkit-1
+	/bin/chmod 0700 /var/lib/polkit-1
+	/bin/chmod 0700 ${PKG_PREFIX}/etc/polkit-1
 	exit 0
 	;;
 esac
diff --git a/sysutils/polkit/pkg-plist b/sysutils/polkit/pkg-plist
index 8d1e94210023..504cfd545a6f 100644
--- a/sysutils/polkit/pkg-plist
+++ b/sysutils/polkit/pkg-plist
@@ -49,14 +49,17 @@ lib/libpolkit-agent-1.a
 lib/libpolkit-agent-1.la
 lib/libpolkit-agent-1.so
 lib/libpolkit-agent-1.so.0
+lib/libpolkit-agent-1.so.0.0.0
 lib/libpolkit-backend-1.a
 lib/libpolkit-backend-1.la
 lib/libpolkit-backend-1.so
 lib/libpolkit-backend-1.so.0
+lib/libpolkit-backend-1.so.0.0.0
 lib/libpolkit-gobject-1.a
 lib/libpolkit-gobject-1.la
 lib/libpolkit-gobject-1.so
 lib/libpolkit-gobject-1.so.0
+lib/libpolkit-gobject-1.so.0.0.0
 lib/polkit-1/extensions/libnullbackend.a
 lib/polkit-1/extensions/libnullbackend.la
 lib/polkit-1/extensions/libnullbackend.so
@@ -65,12 +68,20 @@ libdata/pkgconfig/polkit-backend-1.pc
 libdata/pkgconfig/polkit-gobject-1.pc
 libexec/polkit-agent-helper-1
 libexec/polkitd
+%%MANPAGES%%man/man1/pkaction.1.gz
+%%MANPAGES%%man/man1/pkcheck.1.gz
+%%MANPAGES%%man/man1/pkexec.1.gz
+%%MANPAGES%%man/man1/pkttyagent.1.gz
+%%MANPAGES%%man/man8/pklocalauthority.8.gz
+%%MANPAGES%%man/man8/polkit.8.gz
+%%MANPAGES%%man/man8/polkitd.8.gz
 share/dbus-1/system-services/org.freedesktop.PolicyKit1.service
 share/gir-1.0/Polkit-1.0.gir
 share/gir-1.0/PolkitAgent-1.0.gir
 share/locale/da/LC_MESSAGES/polkit-1.mo
 share/polkit-1/actions/org.freedesktop.policykit.examples.pkexec.policy
 share/polkit-1/actions/org.freedesktop.policykit.policy
+@dirrmtry share/polkit-1/rules.d
 @dirrmtry share/polkit-1/actions
 @dirrmtry share/polkit-1
 @dirrm lib/polkit-1/extensions
@@ -97,3 +108,4 @@ share/polkit-1/actions/org.freedesktop.policykit.policy
 @dirrmtry var/lib/polkit-1/localauthority
 @dirrmtry var/lib/polkit-1
 @dirrmtry var/lib
+@cwd