Stageify, and misc small cleanups.

Move net/libgweather3 -> net/libgweather.


git-svn-id: svn://creme-brulee.marcuscom.com/ports/trunk@18965 df743ca5-7f9a-e211-a948-0013205c9059

7 files changed, 24 insertions, 27 deletions

diff --git a/sysutils/accountsservice/Makefile b/sysutils/accountsservice/Makefile
index cce5eca45..794639e06 100644
--- a/sysutils/accountsservice/Makefile
+++ b/sysutils/accountsservice/Makefile
@@ -1,6 +1,6 @@
 # Created by: Koop Mast <kwm@FreeBSD.org>
 # $FreeBSD$
-#    $MCom: ports/trunk/sysutils/accountsservice/Makefile 18610 2013-06-30 16:33:05Z marcus $
+#    $MCom$
 
 PORTNAME=	accountsservice
 PORTVERSION=	0.6.24
@@ -14,13 +14,12 @@ COMMENT=	D-Bus interface for user account query and manipulation
 LIB_DEPENDS=	libdbus-glib-1.so:${PORTSDIR}/devel/dbus-glib \
 		libpolkit-gobject-1.so:${PORTSDIR}/sysutils/polkit
 
-NO_STAGE=	yes
 USE_XZ=		yes
 USE_GNOME=	glib20 gnomehier intlhack introspection:build libxslt
 USES=		gettext gmake pathfix pkgconfig
 GNU_CONFIGURE=	yes
 USE_LDCONFIG=	yes
-CONFIGURE_ARGS=	--disable-systemd --localstatedir=/var/
+CONFIGURE_ARGS=	--disable-systemd --localstatedir=/var/ --disable-vala
 CPPFLAGS+=	-I${LOCALBASE}/include
 LDFLAGS+=	-L${LOCALBASE}/lib
 
@@ -31,6 +30,7 @@ post-patch:
 		${WRKSRC}/src/user.c ${WRKSRC}/src/Makefile.in
 
 post-install:
-	@${SETENV} PKG_PREFIX=${PREFIX} ${SH} ${PKGINSTALL} ${PKGNAME} POST-INSTALL
+	@${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/lib*.so*
 
 .include <bsd.port.mk>
+
diff --git a/sysutils/drwright/Makefile b/sysutils/drwright/Makefile
index 3fe61384b..eb2208388 100644
--- a/sysutils/drwright/Makefile
+++ b/sysutils/drwright/Makefile
@@ -1,9 +1,9 @@
 # Created by: Koop Mast <kwm@FreeBSD.org>
 # $FreeBSD$
-#  $MCom: ports/trunk/sysutils/drwright/Makefile 18393 2013-04-26 21:23:07Z kwm $
+#  $MCom$
 
 PORTNAME=	drwright
-PORTVERSION=	3.2.5
+PORTVERSION=	3.5.0
 CATEGORIES=	sysutils gnome
 MASTER_SITES=	GNOME
 
@@ -13,7 +13,6 @@ COMMENT=	GNOME 3 RSI prevention tool
 LIB_DEPENDS=	libcanberra-gtk3.so:${PORTSDIR}/audio/libcanberra-gtk3 \
 		libnotify.so:${PORTSDIR}/devel/libnotify
 
-NO_STAGE=	yes
 USE_XZ=		yes
 USE_GNOME=	intlhack gtk30 gnomecontrolcenter3
 USE_XORG=	x11 xscrnsaver
diff --git a/sysutils/drwright/distinfo b/sysutils/drwright/distinfo
index 328a2b90e..4334cf6fb 100644
--- a/sysutils/drwright/distinfo
+++ b/sysutils/drwright/distinfo
@@ -1,2 +1,2 @@
-SHA256 (drwright-3.2.5.tar.xz) = fc0c8bfc87ee35eb9b5768dd32736747cf4a7aeda4ea86e813b46261a30616f8
-SIZE (drwright-3.2.5.tar.xz) = 1451424
+SHA256 (drwright-3.5.0.tar.xz) = a8b64b27fdf0aa8c6703141a0e83e2619e34b8d1303afdeef304761814bcfbb8
+SIZE (drwright-3.5.0.tar.xz) = 1441336
diff --git a/sysutils/polkit/Makefile b/sysutils/polkit/Makefile
index f59c3c1b3..52317997c 100644
--- a/sysutils/polkit/Makefile
+++ b/sysutils/polkit/Makefile
@@ -1,6 +1,6 @@
 # Created by: Koop Mast<kwm@FreeBSD.org>
 # $FreeBSD$
-#   $MCom: ports/trunk/sysutils/polkit/Makefile 18610 2013-06-30 16:33:05Z marcus $
+#   $MCom$
 
 PORTNAME=	polkit
 PORTVERSION=	0.105
@@ -14,7 +14,6 @@ COMMENT=	Framework for controlling access to system-wide components
 LIB_DEPENDS=	libexpat.so:${PORTSDIR}/textproc/expat2
 RUN_DEPENDS=	dbus-launch:${PORTSDIR}/devel/dbus
 
-NO_STAGE=	yes
 USE_GNOME=	glib20 intlhack gnomehier introspection
 USES=		gettext gmake pathfix pkgconfig
 GNU_CONFIGURE=	yes
@@ -51,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-plist b/sysutils/polkit/pkg-plist
index 1c9aa117a..65f8b0486 100644
--- a/sysutils/polkit/pkg-plist
+++ b/sysutils/polkit/pkg-plist
@@ -96,7 +96,6 @@ share/polkit-1/actions/org.freedesktop.policykit.policy
 @dirrmtry var/lib/polkit-1/localauthority/20-org.d
 @dirrmtry var/lib/polkit-1/localauthority/10-vendor.d
 @dirrmtry var/lib/polkit-1/localauthority
-@dirrmtry var/lib/polkit-1/localauthority
 @dirrmtry var/lib/polkit-1
 @dirrmtry var/lib
 @cwd
diff --git a/sysutils/upower/Makefile b/sysutils/upower/Makefile
index 74f6a331f..5c55ebaeb 100644
--- a/sysutils/upower/Makefile
+++ b/sysutils/upower/Makefile
@@ -1,6 +1,6 @@
 # Created by: Joe Marcus Clarke <marcus@FreeBSD.org>
 # $FreeBSD$
-#   $MCom: ports/trunk/sysutils/upower/Makefile 18681 2013-09-15 22:52:32Z marcus $
+#   $MCom$
 
 PORTNAME=	upower
 PORTVERSION=	0.9.21
@@ -16,11 +16,10 @@ LICENSE_FILE=	${WRKSRC}/COPYING
 LIB_DEPENDS=	libpolkit-gobject-1.so:${PORTSDIR}/sysutils/polkit \
 		libdbus-glib-1.so:${PORTSDIR}/devel/dbus-glib
 
-NO_STAGE=	yes
 USES=		gettext gmake pathfix pkgconfig
 USE_XZ=		yes
 USE_GNOME=	intlhack ltverhack glib20 introspection:build
-USE_AUTOTOOLS=	libtool
+GNU_CONFIGURE=	yes
 USE_LDCONFIG=	yes
 USE_PYTHON=	yes
 CONFIGURE_ARGS=	--disable-gtk-doc \
@@ -31,14 +30,16 @@ CONFIGURE_ENV=	GTKDOC="false"
 
 .if defined(NO_INSTALL_MANPAGES)
 CONFIGURE_ARGS+=--disable-man-pages
+PLIST_SUB+=	MAN="@comment "
 .else
 BUILD_DEPENDS+=	${LOCALBASE}/share/sgml/docbook/4.1/dtd/catalog:${PORTSDIR}/textproc/docbook-410 \
     		${LOCALBASE}/share/xml/docbook/4.1.2/docbookx.dtd:${PORTSDIR}/textproc/docbook-sk \
 		${LOCALBASE}/share/xsl/docbook/manpages/docbook.xsl:${PORTSDIR}/textproc/docbook-xsl
 USE_GNOME+=	libxslt:build
-MAN1=		upower.1
-MAN7=		UPower.7
-MAN8=		upowerd.8
+PLIST_SUB+=	MAN=""
 .endif
 
+post-install:
+	@${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/lib*.so*
+
 .include <bsd.port.mk>
diff --git a/sysutils/upower/pkg-plist b/sysutils/upower/pkg-plist
index df8f0ffdd..31d9b6923 100644
--- a/sysutils/upower/pkg-plist
+++ b/sysutils/upower/pkg-plist
@@ -18,6 +18,9 @@ lib/libupower-glib.so
 lib/libupower-glib.so.1
 libdata/pkgconfig/upower-glib.pc
 libexec/upowerd
+%%MAN%%man/man1/upower.1.gz
+%%MAN%%man/man7/UPower.7.gz
+%%MAN%%man/man8/upowerd.8.gz
 share/dbus-1/interfaces/org.freedesktop.UPower.Device.xml
 share/dbus-1/interfaces/org.freedesktop.UPower.KbdBacklight.xml
 share/dbus-1/interfaces/org.freedesktop.UPower.QoS.xml