Massive port framework maintaince/update (long over due too)

Deal with recent USES changes, pet portlint here and there.
Sync with ports, more to come.


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

21 files changed, 108 insertions, 187 deletions

diff --git a/sysutils/accountsservice/Makefile b/sysutils/accountsservice/Makefile
index 2f67cc49f..ee390c04d 100644
--- a/sysutils/accountsservice/Makefile
+++ b/sysutils/accountsservice/Makefile
@@ -1,6 +1,6 @@
 # Created by: Koop Mast <kwm@FreeBSD.org>
 # $FreeBSD$
-#    $MCom$
+#    $MCom: ports/trunk/sysutils/accountsservice/Makefile 17268 2013-04-01 05:13:11Z marcus $
 
 PORTNAME=	accountsservice
 PORTVERSION=	0.6.24
@@ -17,8 +17,8 @@ LIB_DEPENDS=	xslt:${PORTSDIR}/textproc/libxslt \
 		polkit-gobject-1:${PORTSDIR}/sysutils/polkit
 
 USE_XZ=		yes
-USE_GNOME=	gnomehack glib20 intlhack gnomehier
-USE_GETTEXT=	yes
+USE_GNOME=	glib20 intlhack gnomehier
+USES=		gettext pathfix pkgconfig
 USE_GMAKE=	yes
 GNU_CONFIGURE=	yes
 USE_LDCONFIG=	yes
diff --git a/sysutils/brasero/Makefile b/sysutils/brasero/Makefile
index f6fb772aa..c563df531 100644
--- a/sysutils/brasero/Makefile
+++ b/sysutils/brasero/Makefile
@@ -1,9 +1,6 @@
-# New ports collection makefile for:	bonfire
-# Date created:		2006-05-12
-# Whom:			Michael Johnson <ahze@FreeBSD.org>
-#
+# Created by: Michael Johnson <ahze@FreeBSD.org>
 # $FreeBSD$
-#    $MCom$
+#    $MCom: ports/trunk/sysutils/brasero/Makefile 17268 2013-04-01 05:13:11Z marcus $
 
 PORTNAME=	brasero
 PORTVERSION=	2.32.1
@@ -15,22 +12,22 @@ DIST_SUBDIR=	gnome2
 MAINTAINER=	gnome@FreeBSD.org
 COMMENT=	CD/DVD mastering tool for the GNOME desktop
 
-LIB_DEPENDS=	notify.4:${PORTSDIR}/devel/libnotify \
-		unique-1.0.2:${PORTSDIR}/x11-toolkits/unique \
-		totem-plparser.17:${PORTSDIR}/multimedia/totem-pl-parser \
-		canberra-gtk.0:${PORTSDIR}/audio/libcanberra
+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
 RUN_DEPENDS=	growisofs:${PORTSDIR}/sysutils/dvd+rw-tools \
 		cdrdao:${PORTSDIR}/sysutils/cdrdao \
 		yelp:${PORTSDIR}/x11/yelp
 
 CONFLICTS=	brasero-3.[0-9]*
 
-USE_GETTEXT=	yes
+USES=		gettext pathfix pkgconfig shared-mime-info desktop-file-utils
 USE_BZIP2=	yes
 GNU_CONFIGURE=	yes
 USE_GMAKE=	yes
 USE_XORG=	sm
-USE_GNOME=	intlhack gnomeprefix gnomehack gnomedocutils
+USE_GNOME=	intlhack gnomeprefix gnomedocutils
 USE_LDCONFIG=	yes
 USE_GSTREAMER=	gconf core
 INSTALLS_OMF=	yes
@@ -48,7 +45,7 @@ OPTIONS=	NAUTILUS "Enable Nautilus extension" on \
 
 PLIST_SUB=	FULL_VERSION=${PORTVERSION}
 
-.include <bsd.port.pre.mk>
+.include <bsd.port.options.mk>
 
 .if !defined(WITHOUT_NAUTILUS)
 USE_GNOME+=	nautilus2
@@ -60,8 +57,8 @@ CONFIGURE_ARGS+=--enable-nautilus=no
 .endif
 
 .if defined(WITH_LIBBURNIA)
-LIB_DEPENDS+=	burn.4:${PORTSDIR}/devel/libburn \
-    		isofs.6:${PORTSDIR}/devel/libisofs
+LIB_DEPENDS+=	burn:${PORTSDIR}/devel/libburn \
+    		isofs:${PORTSDIR}/devel/libisofs
 CONFIGURE_ARGS+=--enable-libburnia
 PLIST_SUB+=	LIBBURNIA=""
 .else
@@ -75,4 +72,4 @@ post-patch:
 		${WRKSRC}/configure
 	@${REINPLACE_CMD} -e 's|/proc/self/fd/0|/dev/fd/0|g' ${WRKSRC}/po/*.po
 
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
diff --git a/sysutils/brasero/pkg-plist b/sysutils/brasero/pkg-plist
index 3b2f6327a..8d170961d 100644
--- a/sysutils/brasero/pkg-plist
+++ b/sysutils/brasero/pkg-plist
@@ -512,10 +512,6 @@ share/omf/brasero/brasero-zh_TW.omf
 @dirrm include/brasero
 @dirrmtry share/GConf/gsettings
 @dirrmtry share/GConf
-@exec %%LOCALBASE%%/bin/update-mime-database %D/share/mime
-@unexec %%LOCALBASE%%/bin/update-mime-database %D/share/mime
-@exec %%LOCALBASE%%/bin/update-desktop-database > /dev/null || /usr/bin/true
-@unexec %%LOCALBASE%%/bin/update-desktop-database > /dev/null || /usr/bin/true
 @dirrmtry share/locale/zh_HK/LC_MESSAGES
 @dirrmtry share/locale/zh_HK
 @dirrmtry share/locale/te/LC_MESSAGES
diff --git a/sysutils/brasero3/Makefile b/sysutils/brasero3/Makefile
index 23ffde5eb..cbafc3aa5 100644
--- a/sysutils/brasero3/Makefile
+++ b/sysutils/brasero3/Makefile
@@ -1,9 +1,6 @@
-# New ports collection makefile for:	bonfire
-# Date created:		2006-05-12
-# Whom:			Michael Johnson <ahze@FreeBSD.org>
-#
+# Created by: Michael Johnson <ahze@FreeBSD.org>
 # $FreeBSD$
-#    $MCom$
+#    $MCom: ports/trunk/sysutils/brasero3/Makefile 17268 2013-04-01 05:13:11Z marcus $
 
 PORTNAME=	brasero
 PORTVERSION=	3.4.1
@@ -14,30 +11,29 @@ DIST_SUBDIR=	gnome3
 MAINTAINER=	gnome@FreeBSD.org
 COMMENT=	CD/DVD mastering tool for the GNOME desktop
 
-LIB_DEPENDS=	notify.4:${PORTSDIR}/devel/libnotify \
-		totem-plparser.17:${PORTSDIR}/multimedia/totem-pl-parser \
-		canberra-gtk3.0:${PORTSDIR}/audio/libcanberra-gtk3
+LIB_DEPENDS=	notify:${PORTSDIR}/devel/libnotify \
+		totem-plparser:${PORTSDIR}/multimedia/totem-pl-parser \
+		canberra-gtk3:${PORTSDIR}/audio/libcanberra-gtk3
 RUN_DEPENDS=	growisofs:${PORTSDIR}/sysutils/dvd+rw-tools \
 		cdrdao:${PORTSDIR}/sysutils/cdrdao
 
 CONFLICTS=	brasero-2.[0-9]*
 
 LATEST_LINK=	brasero3
-USE_GETTEXT=	yes
+USES=		gettext pathfix pkgconfig desktop-file-utils shared-mime-info
 USE_XZ=		yes
 GNU_CONFIGURE=	yes
 USE_GMAKE=	yes
 USE_XORG=	sm ice
-USE_GNOME=	intlhack gnomeprefix gnomehack gnomedocutils gtk30 gconf2 \
-		libxml2 desktopfileutils
+USE_GNOME=	intlhack gnomeprefix gnomedocutils gtk30 gconf2 libxml2
 USE_LDCONFIG=	yes
 USE_GSTREAMER=	gconf core
 INSTALLS_OMF=	yes
 INSTALLS_ICONS=	yes
 CONFIGURE_ARGS=	--disable-inotify --enable-search=no --enable-playlist=no \
 		--enable-introspection=yes
-CPPFLAGS=	-I${LOCALBASE}/include -DHAVE_CAM_LIB_H=1
-LDFLAGS=	-L${LOCALBASE}/lib
+CPPFLAGS+=	-I${LOCALBASE}/include -DHAVE_CAM_LIB_H=1
+LDFLAGS+=	-L${LOCALBASE}/lib
 
 MAN1=		brasero.1
 GLIB_SCHEMAS=	org.gnome.brasero.gschema.xml
@@ -61,8 +57,8 @@ CONFIGURE_ARGS+=--enable-nautilus=no
 .endif
 
 .if ${PORT_OPTIONS:MLIBBURNIA}
-LIB_DEPENDS+=	burn.4:${PORTSDIR}/devel/libburn \
-    		isofs.6:${PORTSDIR}/devel/libisofs
+LIB_DEPENDS+=	burn:${PORTSDIR}/devel/libburn \
+    		isofs:${PORTSDIR}/devel/libisofs
 CONFIGURE_ARGS+=--enable-libburnia
 PLIST_SUB+=	LIBBURNIA=""
 .else
diff --git a/sysutils/brasero3/pkg-plist b/sysutils/brasero3/pkg-plist
index 4f9357e65..eacc5ac01 100644
--- a/sysutils/brasero3/pkg-plist
+++ b/sysutils/brasero3/pkg-plist
@@ -876,7 +876,3 @@ share/mime/packages/brasero.xml
 @dirrm lib/brasero3/plugins
 @dirrm lib/brasero3
 @dirrm include/brasero3
-@exec %%LOCALBASE%%/bin/update-mime-database %D/share/mime
-@unexec %%LOCALBASE%%/bin/update-mime-database %D/share/mime
-@exec %%LOCALBASE%%/bin/update-desktop-database > /dev/null || /usr/bin/true
-@unexec %%LOCALBASE%%/bin/update-desktop-database > /dev/null || /usr/bin/true
diff --git a/sysutils/cinnamon-control-center/Makefile b/sysutils/cinnamon-control-center/Makefile
index 0a6167a95..ff8f72c80 100644
--- a/sysutils/cinnamon-control-center/Makefile
+++ b/sysutils/cinnamon-control-center/Makefile
@@ -39,9 +39,8 @@ GH_TAGNAME=	1.7.1
 GH_COMMIT=	a3883df
 
 USE_XORG=	x11 xfixes sm
-USE_GETTEXT=	yes
+USES=		gettext pathfix
 USE_GMAKE=	yes
-USES=		pathfix
 USE_GNOME=	gnomeprefix intlhack gtk30 gconf2 gnomemenus3 \
 		gnomedesktop3 evolutiondataserver3
 USE_LDCONFIG=	yes
diff --git a/sysutils/consolekit/Makefile b/sysutils/consolekit/Makefile
index ce4435e29..fa4d99efa 100644
--- a/sysutils/consolekit/Makefile
+++ b/sysutils/consolekit/Makefile
@@ -1,9 +1,5 @@
-# New ports collection makefile for:	ConsoleKit
-# Date Created:				26 Aug 2006
-# Whom:					Florent Thoumie <flz@FreeBSD.org>
-#
 # $FreeBSD$
-#    $MCom$
+#    $MCom: ports/trunk/sysutils/consolekit/Makefile 17268 2013-04-01 05:13:11Z marcus $
 
 PORTNAME=	consolekit
 PORTVERSION=	0.4.5
@@ -14,14 +10,13 @@ DISTFILES=	ConsoleKit-${PORTVERSION}${EXTRACT_SUFX}
 MAINTAINER=	gnome@FreeBSD.org
 COMMENT=	Framework for defining and tracking users
 
-LIB_DEPENDS=	dbus-glib-1.2:${PORTSDIR}/devel/dbus-glib \
-    		polkit-gobject-1.0:${PORTSDIR}/sysutils/polkit
+LIB_DEPENDS=	dbus-glib-1:${PORTSDIR}/devel/dbus-glib \
+    		polkit-gobject-1:${PORTSDIR}/sysutils/polkit
 
 WRKSRC=		${WRKDIR}/ConsoleKit-${PORTVERSION}
 USE_BZIP2=	yes
-USE_GETTEXT=	yes
+USES=		gettext pathfix pkgconfig
 USE_XORG=	x11
-USE_GNOME=	gnomehack
 USE_GMAKE=	yes
 GNU_CONFIGURE=	yes
 USE_LDCONFIG=	yes
diff --git a/sysutils/drwright/Makefile b/sysutils/drwright/Makefile
index 0d551cc0f..6be52ffc1 100644
--- a/sysutils/drwright/Makefile
+++ b/sysutils/drwright/Makefile
@@ -1,9 +1,6 @@
-# New ports collection makefile for:   drwright
-# Date Created:			26 Apr 2011
-# Whom:				Koop Mast <kwm@FreeBSD.org>
-#
+# Created by: Koop Mast <kwm@FreeBSD.org>
 # $FreeBSD$
-#
+#  $MCom$
 
 PORTNAME=	drwright
 PORTVERSION=	3.2.5
@@ -13,14 +10,14 @@ MASTER_SITES=	GNOME
 MAINTAINER=	gnome@FreeBSD.org
 COMMENT=	GNOME 3 RSI prevention tool
 
-LIB_DEPENDS=	canberra-gtk3.0:${PORTSDIR}/audio/libcanberra-gtk3 \
-		notify.4:${PORTSDIR}/devel/libnotify
+LIB_DEPENDS=	canberra-gtk3:${PORTSDIR}/audio/libcanberra-gtk3 \
+		notify:${PORTSDIR}/devel/libnotify
 
 USE_XZ=		yes
-USE_GNOME=	gnomehack intlhack gtk30 gnomecontrolcenter3
+USE_GNOME=	intlhack gtk30 gnomecontrolcenter3
 USE_XORG=	x11 xscrnsaver
 USE_GMAKE=	yes
-USE_GETTEXT=	yes
+USES=		gettext pathfix pkgconfig
 GNU_CONFIGURE=	yes
 INSTALLS_ICONS=	yes
 
diff --git a/sysutils/gconf-editor/Makefile b/sysutils/gconf-editor/Makefile
index cec2486bc..c436394ba 100644
--- a/sysutils/gconf-editor/Makefile
+++ b/sysutils/gconf-editor/Makefile
@@ -1,10 +1,6 @@
-# New ports collection makefile for:	gconf-editor
-# Date created:				12 May 2002
-# Whom:					Joe Marcus Clarke <marcus@FreeBSD.org>
-#
+# Created by: Joe Marcus Clarke <marcus@FreeBSD.org>
 # $FreeBSD$
-#   $MCom$
-#
+#   $MCom: ports/trunk/sysutils/gconf-editor/Makefile 17268 2013-04-01 05:13:11Z marcus $
 
 PORTNAME=	gconf-editor
 PORTVERSION=	2.32.0
@@ -20,11 +16,11 @@ COMMENT=	A gconf database editor for the GNOME 2 environment
 CONFLICTS=	gconf-editor-3.[0-9]*
 
 USE_BZIP2=	yes
-USE_GETTEXT=	yes
+USES=		gettext pathfix pkgconfig
 INSTALLS_OMF=	yes
 INSTALLS_ICONS=	yes
 USE_GMAKE=	yes
-USE_GNOME=	gnomeprefix intlhack gnomehack libgnomeui gnomedocutils
+USE_GNOME=	gnomeprefix intlhack libgnomeui gnomedocutils
 GNU_CONFIGURE=	yes
 CPPFLAGS+=	-I${LOCALBASE}/include
 LDFLAGS+=	-L${LOCALBASE}/lib
diff --git a/sysutils/gconf-editor3/Makefile b/sysutils/gconf-editor3/Makefile
index 624564b39..ec5144d8d 100644
--- a/sysutils/gconf-editor3/Makefile
+++ b/sysutils/gconf-editor3/Makefile
@@ -1,10 +1,6 @@
-# New ports collection makefile for:	gconf-editor
-# Date created:				12 May 2002
-# Whom:					Joe Marcus Clarke <marcus@FreeBSD.org>
-#
+# Created by: Joe Marcus Clarke <marcus@FreeBSD.org>
 # $FreeBSD$
-#   $MCom$
-#
+#   $MCom: ports/trunk/sysutils/gconf-editor3/Makefile 17268 2013-04-01 05:13:11Z marcus $
 
 PORTNAME=	gconf-editor
 PORTVERSION=	3.0.1
@@ -19,11 +15,11 @@ CONFLICTS=	gconf-editor-2.[0-9]*
 
 LATEST_LINK=	gconf-editor3
 USE_XZ=		yes
-USE_GETTEXT=	yes
+USES=		gettext pathfix pkgconfig
 INSTALLS_OMF=	yes
 INSTALLS_ICONS=	yes
 USE_GMAKE=	yes
-USE_GNOME=	gnomeprefix intlhack gnomehack gtk30 gconf2 gnomedocutils
+USE_GNOME=	gnomeprefix intlhack gtk30 gconf2 gnomedocutils
 GNU_CONFIGURE=	yes
 CPPFLAGS=	-I${LOCALBASE}/include
 LDFLAGS=	-L${LOCALBASE}/lib
diff --git a/sysutils/gnome-control-center/Makefile b/sysutils/gnome-control-center/Makefile
index 5112ff00c..26627274c 100644
--- a/sysutils/gnome-control-center/Makefile
+++ b/sysutils/gnome-control-center/Makefile
@@ -1,10 +1,6 @@
-# New ports collection makefile for:	gnomecontrolcenter2
-# Date created:				04 May 2002
-# Whom:					Joe Marcus Clarke <marcus@FreeBSD.org>
-#
+# Created by: Joe Marcus Clarke <marcus@FreeBSD.org>
 # $FreeBSD$
-#   $MCom$
-#
+#   $MCom: ports/trunk/sysutils/gnome-control-center/Makefile 17268 2013-04-01 05:13:11Z marcus $
 
 PORTNAME=	gnome-control-center
 PORTVERSION=	2.32.1
@@ -16,10 +12,10 @@ DIST_SUBDIR=	gnome2
 MAINTAINER=	gnome@FreeBSD.org
 COMMENT=	Control center for GNOME 2 project
 
-LIB_DEPENDS=	canberra-gtk.0:${PORTSDIR}/audio/libcanberra \
-		dbus-glib-1.2:${PORTSDIR}/devel/dbus-glib \
-		polkit-gobject-1.0:${PORTSDIR}/sysutils/polkit \
-		unique-1.0.2:${PORTSDIR}/x11-toolkits/unique
+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
 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
@@ -27,12 +23,12 @@ RUN_DEPENDS=	gnome-eject:${PORTSDIR}/sysutils/gnome-mount \
 CONFLICTS=	gnome-control-center-3.[0-9]*
 
 USE_BZIP2=	yes
-USE_GETTEXT=	yes
+USES=		gettext pathfix pkgconfig desktop-file-utils shared-mime-info
 USE_GMAKE=	yes
 USE_GSTREAMER=	good
 WANT_GNOME=	yes
-USE_GNOME=	gnomeprefix gnomehack intlhack metacity gnomemenus \
-		desktopfileutils libgnomekbd gnomedesktop librsvg2 gconf2
+USE_GNOME=	gnomeprefix intlhack metacity gnomemenus \
+		libgnomekbd gnomedesktop librsvg2 gconf2
 USE_XORG=	xscrnsaver
 GNU_CONFIGURE=	yes
 INSTALLS_OMF=	yes
@@ -66,7 +62,4 @@ post-patch:
 	@${REINPLACE_CMD} -e 's|/usr/sbin|${PREFIX}/sbin|g' \
 		${WRKSRC}/capplets/display/org.gnome.randr.policy.in
 
-post-install:
-	@-update-desktop-database
-
 .include <bsd.port.post.mk>
diff --git a/sysutils/gnome-control-center/pkg-plist b/sysutils/gnome-control-center/pkg-plist
index 65d4d00b5..c23cc6cad 100644
--- a/sysutils/gnome-control-center/pkg-plist
+++ b/sysutils/gnome-control-center/pkg-plist
@@ -318,12 +318,6 @@ share/polkit-1/actions/org.gnome.randr.policy
 @dirrmtry share/applications
 @dirrm lib/window-manager-settings
 @dirrm include/gnome-window-settings-2.0
-@exec %%LOCALBASE%%/bin/update-mime-database %D/share/mime
-@unexec %%LOCALBASE%%/bin/update-mime-database %D/share/mime
-@comment not sure about this ..
-@unexec rm -f %D/share/applications/mimeinfo.cache > /dev/null || /usr/bin/true
-@exec %%LOCALBASE%%/bin/update-desktop-database > /dev/null || /usr/bin/true
-@unexec %%LOCALBASE%%/bin/update-desktop-database > /dev/null || /usr/bin/true
 @dirrmtry share/locale/zu/LC_MESSAGES
 @dirrmtry share/locale/zu
 @dirrmtry share/locale/zh_HK/LC_MESSAGES
diff --git a/sysutils/gnome-control-center3/Makefile b/sysutils/gnome-control-center3/Makefile
index 0871cbc2d..d42878b8d 100644
--- a/sysutils/gnome-control-center3/Makefile
+++ b/sysutils/gnome-control-center3/Makefile
@@ -1,10 +1,6 @@
-# New ports collection makefile for:	gnomecontrolcenter2
-# Date created:				04 May 2002
-# Whom:					Joe Marcus Clarke <marcus@FreeBSD.org>
-#
+# Created by: Joe Marcus Clarke <marcus@FreeBSD.org>
 # $FreeBSD$
-#   $MCom$
-#
+#   $MCom: ports/trunk/sysutils/gnome-control-center3/Makefile 17268 2013-04-01 05:13:11Z marcus $
 
 PORTNAME=	gnome-control-center
 PORTVERSION=	3.4.2
@@ -18,15 +14,15 @@ 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.0:${PORTSDIR}/audio/libcanberra-gtk3 \
-		xklavier.12:${PORTSDIR}/x11/libxklavier \
-		upower-glib.1:${PORTSDIR}/sysutils/upower \
-		colord.1:${PORTSDIR}/graphics/colord \
-		goa-1.0.0:${PORTSDIR}/net/gnome-online-accounts \
-		socialweb.0:${PORTSDIR}/www/libsocialweb \
-		gtop-2.0.7:${PORTSDIR}/devel/libgtop \
-		dbus-glib-1.2:${PORTSDIR}/devel/dbus-glib \
-		polkit-gobject-1.0:${PORTSDIR}/sysutils/polkit
+LIB_DEPENDS=	canberra-gtk3:${PORTSDIR}/audio/libcanberra-gtk3 \
+		xklavier:${PORTSDIR}/x11/libxklavier \
+		upower-glib:${PORTSDIR}/sysutils/upower \
+		colord:${PORTSDIR}/graphics/colord \
+		goa-1.0:${PORTSDIR}/net/gnome-online-accounts \
+		socialweb:${PORTSDIR}/www/libsocialweb \
+		gtop-2.0:${PORTSDIR}/devel/libgtop \
+		dbus-glib-1:${PORTSDIR}/devel/dbus-glib \
+		polkit-gobject-1:${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 \
@@ -39,11 +35,11 @@ CONFLICTS=	gnome-control-center-2.[0-9]* gnome-media-2.[0-9]*
 
 LATEST_LINK=	gnome-control-center3
 USE_XZ=		yes
-USE_GETTEXT=	yes
+USES=		gettext pathfix pkgconfig desktop-file-utils shared-mime-info
 USE_GMAKE=	yes
 WANT_GNOME=	yes
-USE_GNOME=	gnomeprefix gnomehack gnomehier intlhack libxml2 gnomemenus3 \
-		libgnomekbd3 desktopfileutils gnomedesktop3 gconf2
+USE_GNOME=	gnomeprefix gnomehier intlhack libxml2 gnomemenus3 \
+		libgnomekbd3 gnomedesktop3 gconf2
 USE_XORG=	xscrnsaver x11 xxf86misc kbproto xi
 GNU_CONFIGURE=	yes
 INSTALLS_ICONS=	yes
@@ -82,7 +78,4 @@ post-patch:
 	@${REINPLACE_CMD} -e 's|datetime wacom|datetime|g' \
 		${WRKSRC}/panels/Makefile.in
 
-post-install:
-	@-update-desktop-database
-
 .include <bsd.port.post.mk>
diff --git a/sysutils/gnome-power-manager3/Makefile b/sysutils/gnome-power-manager3/Makefile
index 4e9fcf84b..17d79a401 100644
--- a/sysutils/gnome-power-manager3/Makefile
+++ b/sysutils/gnome-power-manager3/Makefile
@@ -1,10 +1,6 @@
-# New ports collection makefile for:	gnome-power-manager
-# Date created:				03 May 2006
-# Whom:					Joe Marcus Clarke <marcus@FreeBSD.org>
-#
+# Created by: Joe Marcus Clarke <marcus@FreeBSD.org>
 # $FreeBSD$
-#   $MCom$
-#
+#   $MCom: ports/trunk/sysutils/gnome-power-manager3/Makefile 17268 2013-04-01 05:13:11Z marcus $
 
 PORTNAME=	gnome-power-manager
 PORTVERSION=	3.4.0
@@ -20,11 +16,11 @@ LIB_DEPENDS=	upower-glib.1:${PORTSDIR}/sysutils/upower \
 CONFLICTS=	gnome-power-manager-2.[0-9]*
 
 LATEST_LINK=	gnome-power-manager3
-USE_GETTEXT=	yes
+USES=		gettext pathfix pkgconfig
 USE_XZ=		yes
 USE_GMAKE=	yes
 INSTALLS_ICONS=	yes
-USE_GNOME=	gnomeprefix gnomehack intlhack gtk30 gnomedocutils
+USE_GNOME=	gnomeprefix intlhack gtk30 gnomedocutils
 MAKE_JOBS_UNSAFE=yes
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS=	--with-doc-dir=${PREFIX}/share/doc \
diff --git a/sysutils/gnome-settings-daemon3/Makefile b/sysutils/gnome-settings-daemon3/Makefile
index 7ececbc44..4934c19b4 100644
--- a/sysutils/gnome-settings-daemon3/Makefile
+++ b/sysutils/gnome-settings-daemon3/Makefile
@@ -1,10 +1,6 @@
-# New ports collection makefile for:	gnome-settings-daemon
-# Date created:				14 Jan 2008
-# Whom:					Koop Mast <kwm@FreeBSD.org>
-#
+# Created by: Koop Mast <kwm@FreeBSD.org>
 # $FreeBSD$
-#   $MCom$
-#
+#   $MCom: ports/trunk/sysutils/gnome-settings-daemon3/Makefile 17268 2013-04-01 05:13:11Z marcus $
 
 PORTNAME=	gnome-settings-daemon
 PORTVERSION=	3.4.2
@@ -17,12 +13,12 @@ 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.0:${PORTSDIR}/audio/libcanberra-gtk3 \
-		polkit-gobject-1.0:${PORTSDIR}/sysutils/polkit \
-		colord.1:${PORTSDIR}/graphics/colord \
-		pulse.0:${PORTSDIR}/audio/pulseaudio \
-		gdbm.4:${PORTSDIR}/databases/gdbm \
-		notify.4:${PORTSDIR}/devel/libnotify
+LIB_DEPENDS=	canberra-gtk3:${PORTSDIR}/audio/libcanberra-gtk3 \
+		polkit-gobject-1:${PORTSDIR}/sysutils/polkit \
+		colord:${PORTSDIR}/graphics/colord \
+		pulse:${PORTSDIR}/audio/pulseaudio \
+		gdbm:${PORTSDIR}/databases/gdbm \
+		notify:${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
 
@@ -32,9 +28,8 @@ LATEST_LINK=	gnome-settings-daemon3
 USE_XORG=	xxf86misc
 USE_XZ=		yes
 USE_GMAKE=	yes
-USE_GNOME=	gnomeprefix intlhack gnomehack gnomedesktop3 libgnomekbd3 \
-		gnomehier
-USE_GETTEXT=	yes
+USE_GNOME=	gnomeprefix intlhack gnomedesktop3 libgnomekbd3	gnomehier
+USES=		gettext pathfix pkgconfig
 GNU_CONFIGURE=	yes
 INSTALLS_ICONS=	yes
 CONFIGURE_ARGS=	--disable-gudev \
diff --git a/sysutils/gnome-system-monitor/Makefile b/sysutils/gnome-system-monitor/Makefile
index 0d43c030e..af1ff15e1 100644
--- a/sysutils/gnome-system-monitor/Makefile
+++ b/sysutils/gnome-system-monitor/Makefile
@@ -1,10 +1,6 @@
-# New ports collection makefile for:	gnomesystemmonitor
-# Date created:				09 May 2002
-# Whom:					Joe Marcus Clarke <marcus@FreeBSD.org>
-#
+# Created by: Joe Marcus Clarke <marcus@FreeBSD.org>
 # $FreeBSD$
-#   $MCom$
-#
+#   $MCom: ports/trunk/sysutils/gnome-system-monitor/Makefile 17268 2013-04-01 05:13:11Z marcus $
 
 PORTNAME=	gnome-system-monitor
 PORTVERSION=	2.28.2
@@ -17,18 +13,17 @@ MAINTAINER=	gnome@FreeBSD.org
 COMMENT=	GNOME 2 system monitor program
 
 BUILD_DEPENDS=	${LOCALBASE}/libdata/pkgconfig/gnome-icon-theme.pc:${PORTSDIR}/misc/gnome-icon-theme
-LIB_DEPENDS=	gtop-2.0.7:${PORTSDIR}/devel/libgtop \
-		gtkmm-2.4.1:${PORTSDIR}/x11-toolkits/gtkmm24
+LIB_DEPENDS=	gtop-2.0:${PORTSDIR}/devel/libgtop \
+		gtkmm-2.4:${PORTSDIR}/x11-toolkits/gtkmm24
 RUN_DEPENDS=	${LOCALBASE}/libdata/pkgconfig/gnome-icon-theme.pc:${PORTSDIR}/misc/gnome-icon-theme
 
 CONFLICTS=	gnome-system-monitor-3.[0-9]*
 
 USE_BZIP2=	yes
-USE_GETTEXT=	yes
+USES=		gettext pathfix pkgconfig
 INSTALLS_OMF=	yes
 USE_GMAKE=	yes
-USE_GNOME=	gnomeprefix intlhack gnomehack libwnck gnomevfs2 gnomedocutils \
-		librsvg2
+USE_GNOME=	gnomeprefix intlhack libwnck gnomevfs2 gnomedocutils librsvg2
 GNU_CONFIGURE=	yes
 CPPFLAGS+=	-I${LOCALBASE}/include -DGLIB_COMPILATION
 LDFLAGS+=	-L${LOCALBASE}/lib -lutil
diff --git a/sysutils/gnome-system-monitor3/Makefile b/sysutils/gnome-system-monitor3/Makefile
index 16c31ea20..8a449f1df 100644
--- a/sysutils/gnome-system-monitor3/Makefile
+++ b/sysutils/gnome-system-monitor3/Makefile
@@ -1,10 +1,6 @@
-# New ports collection makefile for:	gnomesystemmonitor
-# Date created:				09 May 2002
-# Whom:					Joe Marcus Clarke <marcus@FreeBSD.org>
-#
+# Created by: Joe Marcus Clarke <marcus@FreeBSD.org>
 # $FreeBSD$
-#   $MCom$
-#
+#   $MCom: ports/trunk/sysutils/gnome-system-monitor3/Makefile 17268 2013-04-01 05:13:11Z marcus $
 
 PORTNAME=	gnome-system-monitor
 PORTVERSION=	3.4.1
@@ -16,19 +12,17 @@ MAINTAINER=	gnome@FreeBSD.org
 COMMENT=	GNOME 3 system monitor program
 
 BUILD_DEPENDS=	${LOCALBASE}/libdata/pkgconfig/gnome-icon-theme.pc:${PORTSDIR}/misc/gnome-icon-theme
-LIB_DEPENDS=	gtop-2.0:${PORTSDIR}/devel/libgtop \
-		gtkmm-3.0:${PORTSDIR}/x11-toolkits/gtkmm30
+LIB_DEPENDS=	gtop-2.0:${PORTSDIR}/devel/libgtop
 RUN_DEPENDS=	${LOCALBASE}/libdata/pkgconfig/gnome-icon-theme.pc:${PORTSDIR}/misc/gnome-icon-theme
 
 CONFLICTS=	gnome-system-monitor-2.[0-9]*
 
 LATEST_LINK=	gnome-system-monitor3
 USE_XZ=		yes
-USE_GETTEXT=	yes
+USES=		gettext pathfix
 INSTALLS_OMF=	yes
 USE_GMAKE=	yes
-USE_GNOME=	gnomeprefix intlhack gnomehack libwnck3 gnomedocutils \
-		librsvg2
+USE_GNOME=	gnomeprefix intlhack libwnck3 gnomedocutils librsvg2 gtkmm30
 GNU_CONFIGURE=	yes
 CPPFLAGS+=	-I${LOCALBASE}/include
 LDFLAGS+=	-L${LOCALBASE}/lib
diff --git a/sysutils/polkit-gnome/Makefile b/sysutils/polkit-gnome/Makefile
index a3279dc09..4a7b38fed 100644
--- a/sysutils/polkit-gnome/Makefile
+++ b/sysutils/polkit-gnome/Makefile
@@ -1,6 +1,6 @@
 # Created by: Koop Mast<kwm@FreeBSD.org>
 # $FreeBSD$
-#   $MCom$
+#   $MCom: ports/trunk/sysutils/polkit-gnome/Makefile 17268 2013-04-01 05:13:11Z marcus $
 
 PORTNAME=	polkit-gnome
 PORTVERSION=	0.102
@@ -14,8 +14,9 @@ LIB_DEPENDS=	polkit-gobject-1:${PORTSDIR}/sysutils/polkit
 
 USE_XZ=		yes
 USE_GMAKE=	yes
+USES=		gettext pathfix
 USE_GETTEXT=	yes
-USE_GNOME=	gnomehack gnomeprefix gtk20 intlhack
+USE_GNOME=	gnomeprefix gtk20 intlhack
 GNU_CONFIGURE=	yes
 USE_LDCONFIG=	yes
 CONFIGURE_ARGS=	--disable-gtk-doc \
diff --git a/sysutils/polkit/Makefile b/sysutils/polkit/Makefile
index 74e3a1d1b..0c570116e 100644
--- a/sysutils/polkit/Makefile
+++ b/sysutils/polkit/Makefile
@@ -1,6 +1,6 @@
 # Created by: Koop Mast<kwm@FreeBSD.org>
 # $FreeBSD$
-#   $MCom$
+#   $MCom: ports/trunk/sysutils/polkit/Makefile 17268 2013-04-01 05:13:11Z marcus $
 
 PORTNAME=	polkit
 PORTVERSION=	0.105
@@ -18,9 +18,8 @@ RUN_DEPENDS=	${LOCALBASE}/share/gir-1.0/GLib-2.0.gir:${PORTSDIR}/devel/gobject-i
 
 USE_GNOME=	gnomehack glib20 intlhack gnomehier
 USE_GMAKE=	yes
-USE_GETTEXT=	yes
+USES=		gettext pathfix pkgconfig
 GNU_CONFIGURE=	yes
-USE_PKGCONFIG=	build
 USE_LDCONFIG=	yes
 CONFIGURE_ARGS=	--disable-gtk-doc \
 		--with-authfw=pam \
diff --git a/sysutils/system-tools-backends/Makefile b/sysutils/system-tools-backends/Makefile
index 8fc921228..306b59bfb 100644
--- a/sysutils/system-tools-backends/Makefile
+++ b/sysutils/system-tools-backends/Makefile
@@ -1,10 +1,6 @@
-# New ports collection makefile for:	system-tools-backends
-# Date created:				11 February 2005
-# Whom:					Joe Marcus Clarke <marcus@FreeBSD.org>
-#
+# Created by: Joe Marcus Clarke <marcus@FreeBSD.org>
 # $FreeBSD$
-#   $MCom$
-#
+#   $MCom: ports/trunk/sysutils/system-tools-backends/Makefile 17268 2013-04-01 05:13:11Z marcus $
 
 PORTNAME=	system-tools-backends
 PORTVERSION=	2.10.2
@@ -16,14 +12,15 @@ MAINTAINER=	gnome@FreeBSD.org
 COMMENT=	Backend system admin scripts for gnome-system-tools
 
 BUILD_DEPENDS=	p5-Net-DBus>=0:${PORTSDIR}/devel/p5-Net-DBus
-LIB_DEPENDS=	dbus-glib-1.2:${PORTSDIR}/devel/dbus-glib \
-		polkit-gobject-1.0:${PORTSDIR}/sysutils/polkit
+LIB_DEPENDS=	dbus-glib-1:${PORTSDIR}/devel/dbus-glib \
+		polkit-gobject-1:${PORTSDIR}/sysutils/polkit
 RUN_DEPENDS=	p5-Net-DBus>=0:${PORTSDIR}/devel/p5-Net-DBus
 
 USE_BZIP2=	yes
 USE_GMAKE=	yes
 USE_PERL5=	yes
-USE_GNOME=	gnomehack intlhack glib20
+USES=		pathfix
+USE_GNOME=	intlhack glib20
 GNU_CONFIGURE=	yes
 USE_GNOME_SUBR=	yes
 CONFIGURE_ARGS=	--with-stb-group=wheel \
diff --git a/sysutils/upower/Makefile b/sysutils/upower/Makefile
index fc9a55495..58f6ab269 100644
--- a/sysutils/upower/Makefile
+++ b/sysutils/upower/Makefile
@@ -1,10 +1,6 @@
-# New ports collection makefile for:   DeviceKit-power
-# Date Created:			30 December 2009
-# Whom:				Joe Marcus Clarke <marcus@FreeBSD.org>
-#
+# Created by: Joe Marcus Clarke <marcus@FreeBSD.org>
 # $FreeBSD$
-#   $MCom$
-#
+#   $MCom: ports/trunk/sysutils/upower/Makefile 17268 2013-04-01 05:13:11Z marcus $
 
 PORTNAME=	upower
 PORTVERSION=	0.9.18
@@ -22,10 +18,10 @@ LIB_DEPENDS=	polkit-gobject-1:${PORTSDIR}/sysutils/polkit \
     		dbus-glib-1:${PORTSDIR}/devel/dbus-glib
 RUN_DEPENDS=	${LOCALBASE}/lib/girepository-1.0/GObject-2.0.typelib:${PORTSDIR}/devel/gobject-introspection
 
-USE_GETTEXT=	yes
+USES=		gettext pathfix
 USE_XZ=		yes
 USE_GMAKE=	yes
-USE_GNOME=	gnomehack intlhack ltverhack glib20
+USE_GNOME=	intlhack ltverhack glib20
 USE_AUTOTOOLS=	libtool
 USE_LDCONFIG=	yes
 USE_PYTHON=	yes