Add NO_STAGE to all ports, until we convert each one.

Use new LIB_DEPEND syntax for most ports.


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

19 files changed, 84 insertions, 68 deletions

diff --git a/sysutils/accountsservice/Makefile b/sysutils/accountsservice/Makefile
index 021fc6598..cce5eca45 100644
--- a/sysutils/accountsservice/Makefile
+++ b/sysutils/accountsservice/Makefile
@@ -11,12 +11,12 @@ MASTER_SITES=	http://www.freedesktop.org/software/${PORTNAME}/
 MAINTAINER=	kwm@FreeBSD.org
 COMMENT=	D-Bus interface for user account query and manipulation
 
-LIB_DEPENDS=	xslt:${PORTSDIR}/textproc/libxslt \
-		dbus-glib-1:${PORTSDIR}/devel/dbus-glib \
-		polkit-gobject-1:${PORTSDIR}/sysutils/polkit
+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 intlhack gnomehier introspection:build
+USE_GNOME=	glib20 gnomehier intlhack introspection:build libxslt
 USES=		gettext gmake pathfix pkgconfig
 GNU_CONFIGURE=	yes
 USE_LDCONFIG=	yes
diff --git a/sysutils/brasero/Makefile b/sysutils/brasero/Makefile
index b10837a1e..8d398a9e9 100644
--- a/sysutils/brasero/Makefile
+++ b/sysutils/brasero/Makefile
@@ -12,16 +12,17 @@ DIST_SUBDIR=	gnome2
 MAINTAINER=	gnome@FreeBSD.org
 COMMENT=	CD/DVD mastering tool for the GNOME desktop
 
-LIB_DEPENDS=	notify:${PORTSDIR}/devel/libnotify \
-		unique-1.0:${PORTSDIR}/x11-toolkits/unique \
-		totem-plparser:${PORTSDIR}/multimedia/totem-pl-parser \
-		canberra-gtk:${PORTSDIR}/audio/libcanberra
+LIB_DEPENDS=	libnotify.so:${PORTSDIR}/devel/libnotify \
+		libunique-1.0.so:${PORTSDIR}/x11-toolkits/unique \
+		libtotem-plparser.so:${PORTSDIR}/multimedia/totem-pl-parser \
+		libcanberra-gtk.so:${PORTSDIR}/audio/libcanberra
 RUN_DEPENDS=	growisofs:${PORTSDIR}/sysutils/dvd+rw-tools \
 		cdrdao:${PORTSDIR}/sysutils/cdrdao \
 		yelp:${PORTSDIR}/x11/yelp
 
 CONFLICTS=	brasero-3.[0-9]*
 
+NO_STAGE=	yes
 USE_BZIP2=	yes
 GNU_CONFIGURE=	yes
 USE_XORG=	sm
diff --git a/sysutils/brasero3/Makefile b/sysutils/brasero3/Makefile
index 56a52b107..10d7bbec3 100644
--- a/sysutils/brasero3/Makefile
+++ b/sysutils/brasero3/Makefile
@@ -12,14 +12,15 @@ MAINTAINER=	gnome@FreeBSD.org
 COMMENT=	CD/DVD mastering tool for the GNOME desktop
 
 BUILD_DEPENDS=	itstool:${PORTSDIR}/textproc/itstool
-LIB_DEPENDS=	notify:${PORTSDIR}/devel/libnotify \
-		totem-plparser:${PORTSDIR}/multimedia/totem-pl-parser \
-		canberra-gtk3:${PORTSDIR}/audio/libcanberra-gtk3
+LIB_DEPENDS=	libnotify.so:${PORTSDIR}/devel/libnotify \
+		libtotem-plparser.so:${PORTSDIR}/multimedia/totem-pl-parser \
+		libcanberra-gtk3.so:${PORTSDIR}/audio/libcanberra-gtk3
 RUN_DEPENDS=	growisofs:${PORTSDIR}/sysutils/dvd+rw-tools \
 		cdrdao:${PORTSDIR}/sysutils/cdrdao
 
 CONFLICTS=	brasero-2.[0-9]*
 
+NO_STAGE=	yes
 LATEST_LINK=	brasero3
 USES=		desktop-file-utils gettext gmake pathfix pkgconfig \
 		shared-mime-info
@@ -58,8 +59,8 @@ CONFIGURE_ARGS+=--enable-nautilus=no
 .endif
 
 .if ${PORT_OPTIONS:MLIBBURNIA}
-LIB_DEPENDS+=	burn:${PORTSDIR}/devel/libburn \
-		isofs:${PORTSDIR}/devel/libisofs
+LIB_DEPENDS+=	libburn.so:${PORTSDIR}/devel/libburn \
+		libisofs.so:${PORTSDIR}/devel/libisofs
 CONFIGURE_ARGS+=--enable-libburnia
 PLIST_SUB+=	LIBBURNIA=""
 .else
diff --git a/sysutils/cinnamon-control-center/Makefile b/sysutils/cinnamon-control-center/Makefile
index 62e3cd8bd..dc4d2be0c 100644
--- a/sysutils/cinnamon-control-center/Makefile
+++ b/sysutils/cinnamon-control-center/Makefile
@@ -13,22 +13,22 @@ COMMENT=	A gnome-control-center replacement for Cinnamon
 BUILD_DEPENDS=	${LOCALBASE}/share/certs/ca-root-nss.crt:${PORTSDIR}/security/ca_root_nss \
 		gnome-settings-daemon>=3.4.0:${PORTSDIR}/sysutils/gnome-settings-daemon3 \
 		gnome-autogen.sh:${PORTSDIR}/devel/gnome-common
-LIB_DEPENDS=	startup-notification-1:${PORTSDIR}/x11/startup-notification \
-		upower-glib:${PORTSDIR}/sysutils/upower \
-		cheese:${PORTSDIR}/multimedia/cheese3 \
-		krb5support:${PORTSDIR}/security/krb5 \
-		caribou:${PORTSDIR}/accessibility/caribou \
-		gtop:${PORTSDIR}/devel/libgtop \
-		muffin:${PORTSDIR}/x11-wm/muffin \
-		telepathy-glib:${PORTSDIR}/net-im/telepathy-glib \
-		telepathy-logger:${PORTSDIR}/net-im/telepathy-logger \
-		folks:${PORTSDIR}/net-im/folks \
-		pulse:${PORTSDIR}/audio/pulseaudio \
-		croco:${PORTSDIR}/textproc/libcroco \
-		dbus-glib-1:${PORTSDIR}/devel/dbus-glib \
-		clutter-glx-1:${PORTSDIR}/graphics/clutter \
-		clutter-gst-1:${PORTSDIR}/multimedia/clutter-gst \
-		gjs:${PORTSDIR}/lang/gjs
+LIB_DEPENDS=	libstartup-notification-1.so:${PORTSDIR}/x11/startup-notification \
+		libupower-glib.so:${PORTSDIR}/sysutils/upower \
+		libcheese.so:${PORTSDIR}/multimedia/cheese3 \
+		libkrb5support.so:${PORTSDIR}/security/krb5 \
+		libcaribou.so:${PORTSDIR}/accessibility/caribou \
+		libgtop.so:${PORTSDIR}/devel/libgtop \
+		libmuffin.so:${PORTSDIR}/x11-wm/muffin \
+		libtelepathy-glib.so:${PORTSDIR}/net-im/telepathy-glib \
+		libtelepathy-logger.so:${PORTSDIR}/net-im/telepathy-logger \
+		libfolks.so:${PORTSDIR}/net-im/folks \
+		libpulse.so:${PORTSDIR}/audio/pulseaudio \
+		libcroco.so:${PORTSDIR}/textproc/libcroco \
+		libdbus-glib-1.so:${PORTSDIR}/devel/dbus-glib \
+		libclutter-glx-1.so:${PORTSDIR}/graphics/clutter \
+		libclutter-gst-1.so:${PORTSDIR}/multimedia/clutter-gst \
+		libgjs.so:${PORTSDIR}/lang/gjs
 RUN_DEPENDS=	${LOCALBASE}/libdata/pkgconfig/dbus-python.pc:${PORTSDIR}/devel/py-dbus \
 		${LOCALBASE}/share/certs/ca-root-nss.crt:${PORTSDIR}/security/ca_root_nss \
 		${LOCALBASE}/share/doc/py-lxml/CREDITS.txt:${PORTSDIR}/devel/py-lxml
@@ -38,6 +38,7 @@ GH_ACCOUNT=	linuxmint
 GH_TAGNAME=	1.7.1
 GH_COMMIT=	a3883df
 
+NO_STAGE=	yes
 USE_XORG=	x11 xfixes sm
 USES=		gettext gmake pathfix
 USE_GNOME=	gnomeprefix intlhack gtk30 gconf2 gnomemenus3 \
diff --git a/sysutils/consolekit/Makefile b/sysutils/consolekit/Makefile
index 3aea4135c..0f17f51f5 100644
--- a/sysutils/consolekit/Makefile
+++ b/sysutils/consolekit/Makefile
@@ -14,6 +14,7 @@ COMMENT=	Framework for defining and tracking users
 LIB_DEPENDS=	libdbus-glib-1.so:${PORTSDIR}/devel/dbus-glib \
     		libpolkit-gobject-1.so:${PORTSDIR}/sysutils/polkit
 
+NO_STAGE=	yes
 WRKSRC=		${WRKDIR}/ConsoleKit-${PORTVERSION}
 USE_BZIP2=	yes
 USES=		gettext gmake pathfix pkgconfig
diff --git a/sysutils/drwright/Makefile b/sysutils/drwright/Makefile
index 5ab0817f8..3fe61384b 100644
--- a/sysutils/drwright/Makefile
+++ b/sysutils/drwright/Makefile
@@ -10,9 +10,10 @@ MASTER_SITES=	GNOME
 MAINTAINER=	gnome@FreeBSD.org
 COMMENT=	GNOME 3 RSI prevention tool
 
-LIB_DEPENDS=	canberra-gtk3:${PORTSDIR}/audio/libcanberra-gtk3 \
-		notify:${PORTSDIR}/devel/libnotify
+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/gconf-editor/Makefile b/sysutils/gconf-editor/Makefile
index 6752c3d97..c1a2b3518 100644
--- a/sysutils/gconf-editor/Makefile
+++ b/sysutils/gconf-editor/Makefile
@@ -15,6 +15,7 @@ COMMENT=	A gconf database editor for the GNOME 2 environment
 
 CONFLICTS=	gconf-editor-3.[0-9]*
 
+NO_STAGE=	yes
 USE_BZIP2=	yes
 USES=		gettext gmake pathfix pkgconfig
 INSTALLS_OMF=	yes
diff --git a/sysutils/gconf-editor3/Makefile b/sysutils/gconf-editor3/Makefile
index f1457976a..5043a2302 100644
--- a/sysutils/gconf-editor3/Makefile
+++ b/sysutils/gconf-editor3/Makefile
@@ -13,6 +13,7 @@ COMMENT=	A gconf database editor for the GNOME 3 environment
 
 CONFLICTS=	gconf-editor-2.[0-9]*
 
+NO_STAGE=	yes
 LATEST_LINK=	gconf-editor3
 USE_XZ=		yes
 USES=		gettext gmake pathfix pkgconfig
diff --git a/sysutils/gnome-control-center/Makefile b/sysutils/gnome-control-center/Makefile
index 1f0df0916..74ba26d61 100644
--- a/sysutils/gnome-control-center/Makefile
+++ b/sysutils/gnome-control-center/Makefile
@@ -12,16 +12,17 @@ DIST_SUBDIR=	gnome2
 MAINTAINER=	gnome@FreeBSD.org
 COMMENT=	Control center for GNOME 2 project
 
-LIB_DEPENDS=	canberra-gtk:${PORTSDIR}/audio/libcanberra \
-		dbus-glib-1:${PORTSDIR}/devel/dbus-glib \
-		polkit-gobject-1:${PORTSDIR}/sysutils/polkit \
-		unique-1.0:${PORTSDIR}/x11-toolkits/unique
+LIB_DEPENDS=	libcanberra-gtk.so:${PORTSDIR}/audio/libcanberra \
+		libdbus-glib-1.so:${PORTSDIR}/devel/dbus-glib \
+		libpolkit-gobject-1.so:${PORTSDIR}/sysutils/polkit \
+		libunique-1.0.so:${PORTSDIR}/x11-toolkits/unique
 BUILD_DEPENDS=	${LOCALBASE}/libexec/gnome-settings-daemon:${PORTSDIR}/sysutils/gnome-settings-daemon
 RUN_DEPENDS=	gnome-eject:${PORTSDIR}/sysutils/gnome-mount \
 		${LOCALBASE}/libexec/gnome-settings-daemon:${PORTSDIR}/sysutils/gnome-settings-daemon
 
 CONFLICTS=	gnome-control-center-3.[0-9]*
 
+NO_STAGE=	yes
 USE_BZIP2=	yes
 USES=		desktop-file-utils gettext gmake pathfix pkgconfig \
 		shared-mime-info
diff --git a/sysutils/gnome-control-center3/Makefile b/sysutils/gnome-control-center3/Makefile
index fbfd8f596..5575e39d9 100644
--- a/sysutils/gnome-control-center3/Makefile
+++ b/sysutils/gnome-control-center3/Makefile
@@ -14,17 +14,17 @@ COMMENT=	Control center for GNOME 3 project
 BUILD_DEPENDS=	gnome-settings-daemon>=3.4.0:${PORTSDIR}/sysutils/gnome-settings-daemon3 \
 		gsettings-desktop-schemas>=3.2.2:${PORTSDIR}/devel/gsettings-desktop-schemas \
 		${LOCALBASE}/libdata/pkgconfig/iso-codes.pc:${PORTSDIR}/misc/iso-codes
-LIB_DEPENDS=	canberra-gtk3:${PORTSDIR}/audio/libcanberra-gtk3 \
-		xklavier:${PORTSDIR}/x11/libxklavier \
-		upower-glib:${PORTSDIR}/sysutils/upower \
-		colord:${PORTSDIR}/graphics/colord \
-		ibus:${PORTSDIR}/textproc/ibus \
-		goa-1.0:${PORTSDIR}/net/gnome-online-accounts \
-		socialweb:${PORTSDIR}/www/libsocialweb \
-		pwquality:${PORTSDIR}/security/libpwquality \
-		gtop-2.0:${PORTSDIR}/devel/libgtop \
-		dbus-glib-1:${PORTSDIR}/devel/dbus-glib \
-		polkit-gobject-1:${PORTSDIR}/sysutils/polkit
+LIB_DEPENDS=	libcanberra-gtk3.so:${PORTSDIR}/audio/libcanberra-gtk3 \
+		libxklavier.so:${PORTSDIR}/x11/libxklavier \
+		libupower-glib.so:${PORTSDIR}/sysutils/upower \
+		libcolord.so:${PORTSDIR}/graphics/colord \
+		libibus.so:${PORTSDIR}/textproc/ibus \
+		libgoa-1.0.so:${PORTSDIR}/net/gnome-online-accounts \
+		libsocialweb.so:${PORTSDIR}/www/libsocialweb \
+		libpwquality.so:${PORTSDIR}/security/libpwquality \
+		libgtop-2.0.so:${PORTSDIR}/devel/libgtop \
+		libdbus-glib-1.so:${PORTSDIR}/devel/dbus-glib \
+		libpolkit-gobject-1.so:${PORTSDIR}/sysutils/polkit
 RUN_DEPENDS=	gnome-eject:${PORTSDIR}/sysutils/gnome-mount \
 		gnome-settings-daemon>=3.4.0:${PORTSDIR}/sysutils/gnome-settings-daemon3 \
 		gsettings-desktop-schemas>=3.2.2:${PORTSDIR}/devel/gsettings-desktop-schemas \
@@ -35,6 +35,7 @@ RUN_DEPENDS=	gnome-eject:${PORTSDIR}/sysutils/gnome-mount \
 
 CONFLICTS=	gnome-control-center-2.[0-9]* gnome-media-2.[0-9]*
 
+NO_STAGE=	yes
 LATEST_LINK=	gnome-control-center3
 USE_XZ=		yes
 USES=		desktop-file-utils gettext gmake pathfix pkgconfig \
@@ -64,7 +65,7 @@ OPTIONS_DEFAULT_amd64=	CHEESE
 .include <bsd.port.options.mk>
 
 .if ${PORT_OPTIONS:MCUPS}
-LIB_DEPENDS+=	cups:${PORTSDIR}/print/cups-client
+LIB_DEPENDS+=	libcups.so:${PORTSDIR}/print/cups-client
 PLIST_SUB+=	CUPS=""
 .else
 PLIST_SUB+=	CUPS="@comment "
@@ -74,7 +75,7 @@ CONFIGURE_ARGS+=--disable-cups
 .if ${PORT_OPTIONS:MCHEESE}
 CONFIGURE_ARGS+=--with-cheese
 BUILD_DEPENDS+=	cheese>=3.0.1:${PORTSDIR}/multimedia/cheese3
-LIB_DEPENDS+=	cheese:${PORTSDIR}/multimedia/cheese3
+LIB_DEPENDS+=	libcheese.so:${PORTSDIR}/multimedia/cheese3
 .else
 CONFIGURE_ARGS+=--without-cheese
 .endif
diff --git a/sysutils/gnome-power-manager3/Makefile b/sysutils/gnome-power-manager3/Makefile
index fa7b1382f..e2981dfc1 100644
--- a/sysutils/gnome-power-manager3/Makefile
+++ b/sysutils/gnome-power-manager3/Makefile
@@ -11,10 +11,11 @@ DIST_SUBDIR=	gnome3
 MAINTAINER=	gnome@FreeBSD.org
 COMMENT=	Power management system for the GNOME Desktop
 
-LIB_DEPENDS=	upower-glib:${PORTSDIR}/sysutils/upower \
+LIB_DEPENDS=	libupower-glib.so:${PORTSDIR}/sysutils/upower \
 
 CONFLICTS=	gnome-power-manager-2.[0-9]*
 
+NO_STAGE=	yes
 LATEST_LINK=	gnome-power-manager3
 USES=		gettext gmake pathfix pkgconfig
 USE_XZ=		yes
diff --git a/sysutils/gnome-settings-daemon3/Makefile b/sysutils/gnome-settings-daemon3/Makefile
index 7c7dde055..5b3c34098 100644
--- a/sysutils/gnome-settings-daemon3/Makefile
+++ b/sysutils/gnome-settings-daemon3/Makefile
@@ -13,20 +13,21 @@ COMMENT=	GNOME 3 settings daemon
 
 BUILD_DEPENDS=	gnome-session>=2.91.0:${PORTSDIR}/x11/gnome-session3 \
 		${LOCALBASE}/libdata/pkgconfig/gsettings-desktop-schemas.pc:${PORTSDIR}/devel/gsettings-desktop-schemas
-LIB_DEPENDS=	canberra-gtk3:${PORTSDIR}/audio/libcanberra-gtk3 \
-		polkit-gobject-1:${PORTSDIR}/sysutils/polkit \
-		ibus-1.0:${PORTSDIR}/textproc/ibus \
-		dbus-1:${PORTSDIR}/devel/dbus \
-		colord:${PORTSDIR}/graphics/colord \
-		lcms2:${PORTSDIR}/graphics/lcms2 \
-		pulse:${PORTSDIR}/audio/pulseaudio \
-		gdbm:${PORTSDIR}/databases/gdbm \
-		notify:${PORTSDIR}/devel/libnotify
+LIB_DEPENDS=	libcanberra-gtk3.so:${PORTSDIR}/audio/libcanberra-gtk3 \
+		libpolkit-gobject-1.so:${PORTSDIR}/sysutils/polkit \
+		libibus-1.0.so:${PORTSDIR}/textproc/ibus \
+		libdbus-1.so:${PORTSDIR}/devel/dbus \
+		libcolord.so:${PORTSDIR}/graphics/colord \
+		liblcms2.so:${PORTSDIR}/graphics/lcms2 \
+		libpulse.so:${PORTSDIR}/audio/pulseaudio \
+		libgdbm.so:${PORTSDIR}/databases/gdbm \
+		libnotify.so:${PORTSDIR}/devel/libnotify
 RUN_DEPENDS=	gnome-session>=2.91.0:${PORTSDIR}/x11/gnome-session3 \
 		${LOCALBASE}/libdata/pkgconfig/gsettings-desktop-schemas.pc:${PORTSDIR}/devel/gsettings-desktop-schemas
 
 CONFLICTS=	gnome-settings-daemon-2.[0-9]*
 
+NO_STAGE=	yes
 LATEST_LINK=	gnome-settings-daemon3
 USE_XORG=	xxf86misc
 USE_XZ=		yes
@@ -63,7 +64,7 @@ MAN1=		gnome-settings-daemon.1
 .include <bsd.port.options.mk>
 
 .if ${PORT_OPTIONS:MCUPS}
-LIB_DEPENDS+=	cups:${PORTSDIR}/print/cups-client
+LIB_DEPENDS+=	libcups.so:${PORTSDIR}/print/cups-client
 PLIST_SUB+=	CUPS=""
 .else
 PLIST_SUB+=	CUPS="@comment "
@@ -71,7 +72,7 @@ CONFIGURE_ARGS+=--disable-cups
 .endif
 
 .if ${PORT_OPTIONS:MSMARTCARD}
-LIB_DEPENDS+=	nss3:${PORTSDIR}/security/nss
+LIB_DEPENDS+=	libnss3.so:${PORTSDIR}/security/nss
 CONFIGURE_ARGS+=--enable-smartcard-support
 PLIST_SUB+=	SMARTCARD=""
 .else
diff --git a/sysutils/gnome-system-monitor/Makefile b/sysutils/gnome-system-monitor/Makefile
index 64b456ca3..b940fba12 100644
--- a/sysutils/gnome-system-monitor/Makefile
+++ b/sysutils/gnome-system-monitor/Makefile
@@ -19,6 +19,7 @@ RUN_DEPENDS=	${LOCALBASE}/libdata/pkgconfig/gnome-icon-theme.pc:${PORTSDIR}/misc
 
 CONFLICTS=	gnome-system-monitor-3.[0-9]*
 
+NO_STAGE=	yes
 USE_BZIP2=	yes
 USES=		gettext gmake pathfix pkgconfig
 INSTALLS_OMF=	yes
diff --git a/sysutils/gnome-system-monitor3/Makefile b/sysutils/gnome-system-monitor3/Makefile
index 320f2c5e0..e4c2d70ab 100644
--- a/sysutils/gnome-system-monitor3/Makefile
+++ b/sysutils/gnome-system-monitor3/Makefile
@@ -13,11 +13,12 @@ COMMENT=	GNOME 3 system monitor program
 
 BUILD_DEPENDS=	${LOCALBASE}/libdata/pkgconfig/gnome-icon-theme.pc:${PORTSDIR}/misc/gnome-icon-theme \
 		itstool:${PORTSDIR}/textproc/itstool
-LIB_DEPENDS=	gtop-2.0:${PORTSDIR}/devel/libgtop
+LIB_DEPENDS=	libgtop-2.0.so:${PORTSDIR}/devel/libgtop
 RUN_DEPENDS=	${LOCALBASE}/libdata/pkgconfig/gnome-icon-theme.pc:${PORTSDIR}/misc/gnome-icon-theme
 
 CONFLICTS=	gnome-system-monitor-2.[0-9]*
 
+NO_STAGE=	yes
 LATEST_LINK=	gnome-system-monitor3
 USE_XZ=		yes
 USES=		gettext gmake pathfix
diff --git a/sysutils/polkit-gnome/Makefile b/sysutils/polkit-gnome/Makefile
index af5498be7..4dd4c75c1 100644
--- a/sysutils/polkit-gnome/Makefile
+++ b/sysutils/polkit-gnome/Makefile
@@ -10,8 +10,9 @@ MASTER_SITES=	GNOME
 MAINTAINER=	gnome@FreeBSD.org
 COMMENT=	GNOME frontend to the PolicyKit framework
 
-LIB_DEPENDS=	polkit-gobject-1:${PORTSDIR}/sysutils/polkit
+LIB_DEPENDS=	libpolkit-gobject-1.so:${PORTSDIR}/sysutils/polkit
 
+NO_STAGE=	yes
 USE_XZ=		yes
 USES=		gettext gmake pathfix
 USE_GNOME=	gnomeprefix gtk20 intlhack introspection:build
diff --git a/sysutils/polkit/Makefile b/sysutils/polkit/Makefile
index e65991a44..a5794f56e 100644
--- a/sysutils/polkit/Makefile
+++ b/sysutils/polkit/Makefile
@@ -11,9 +11,10 @@ MASTER_SITES=	http://www.freedesktop.org/software/polkit/releases/
 MAINTAINER=	gnome@FreeBSD.org
 COMMENT=	Framework for controlling access to system-wide components
 
-LIB_DEPENDS=	expat:${PORTSDIR}/textproc/expat2
+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
diff --git a/sysutils/system-tools-backends/Makefile b/sysutils/system-tools-backends/Makefile
index 07298263f..759b6e5f7 100644
--- a/sysutils/system-tools-backends/Makefile
+++ b/sysutils/system-tools-backends/Makefile
@@ -16,6 +16,7 @@ LIB_DEPENDS=	libdbus-glib-1.so:${PORTSDIR}/devel/dbus-glib \
 		libpolkit-gobject-1.so:${PORTSDIR}/sysutils/polkit
 RUN_DEPENDS=	p5-Net-DBus>=0:${PORTSDIR}/devel/p5-Net-DBus
 
+NO_STAGE=	yes
 USE_BZIP2=	yes
 USES=		gmake pathfix perl5
 USE_GNOME=	intlhack glib20
diff --git a/sysutils/upower/Makefile b/sysutils/upower/Makefile
index bf8b0db36..79149eafa 100644
--- a/sysutils/upower/Makefile
+++ b/sysutils/upower/Makefile
@@ -3,8 +3,7 @@
 #   $MCom: ports/trunk/sysutils/upower/Makefile 18681 2013-09-15 22:52:32Z marcus $
 
 PORTNAME=	upower
-PORTVERSION=	0.9.18
-PORTREVISION=	1
+PORTVERSION=	0.9.21
 CATEGORIES=	sysutils
 MASTER_SITES=	http://upower.freedesktop.org/releases/
 
@@ -17,9 +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
+USE_GNOME=	intlhack ltverhack glib20 introspection:build
 USE_AUTOTOOLS=	libtool
 USE_LDCONFIG=	yes
 USE_PYTHON=	yes
diff --git a/sysutils/upower/distinfo b/sysutils/upower/distinfo
index d1b36cd71..ceafe3267 100644
--- a/sysutils/upower/distinfo
+++ b/sysutils/upower/distinfo
@@ -1,2 +1,2 @@
-SHA256 (upower-0.9.18.tar.xz) = a1a1505d2f95e9398a9bed90917c78a6ee0c3d7956aef1ce011717d20467068f
-SIZE (upower-0.9.18.tar.xz) = 403844
+SHA256 (upower-0.9.21.tar.xz) = 13c28e0a700291a322e0674894fedfd695889845ab82df2aafd699aa9bdbb2e2
+SIZE (upower-0.9.21.tar.xz) = 421204