- Bump PORTREVISION after update of x11/libxfce4util, and x11-wm/xfce4-panel

While I'm here,
- Finish to convert USES
- Trim Makefile header
- Remove ABI version in LIB_DEPENDS
- Remove desktopfileutils, because MimeType entry is not present in desktop file

10 files changed, 37 insertions, 48 deletions

diff --git a/sysutils/xfce4-battery-plugin/Makefile b/sysutils/xfce4-battery-plugin/Makefile
index 7edf71243267..583dacd79b23 100644
--- a/sysutils/xfce4-battery-plugin/Makefile
+++ b/sysutils/xfce4-battery-plugin/Makefile
@@ -1,12 +1,10 @@
-# New ports collection makefile for:	xfce-battery-plugin
-# Date created:		31 June 2003
-# Whom:			Thorsten Greiner <thorsten.greiner@web.de>
-#
+# Created by: Thorsten Greiner <thorsten.greiner@web.de>
 # $FreeBSD$
 #
 
 PORTNAME=	xfce4-battery-plugin
 PORTVERSION=	1.0.5
+PORTREVISION=	1
 CATEGORIES=	sysutils xfce
 MASTER_SITES=	${MASTER_SITE_XFCE}
 MASTER_SITE_SUBDIR=src/panel-plugins/${PORTNAME}/${PORTVERSION:R}
@@ -20,9 +18,10 @@ ONLY_FOR_ARCHS=	i386 amd64
 GNU_CONFIGURE=	yes
 USE_BZIP2=	yes
 USE_GMAKE=	yes
-USE_GNOME=	gnomehack gtk20 glib20 intltool intlhack pkgconfig
+USE_GNOME=	gtk20 glib20 intltool intlhack
 USE_XFCE=	configenv libmenu libutil panel
 INSTALLS_ICONS=	yes
+USES=	pathfix pkgconfig
 
 OPTIONS_DEFINE= NLS
 OPTIONS_DEFAULT=        NLS
diff --git a/sysutils/xfce4-cpugraph-plugin/Makefile b/sysutils/xfce4-cpugraph-plugin/Makefile
index 7bb681298b46..ce404e9bd7a5 100644
--- a/sysutils/xfce4-cpugraph-plugin/Makefile
+++ b/sysutils/xfce4-cpugraph-plugin/Makefile
@@ -1,12 +1,10 @@
-# New ports collection makefile for:	xfce4-cpugraph-plugin
-# Date created:		2004-06-07
-# Whom:			Matt Lancereau <matt@rimasec.net>
-#
+# Created by: Matt Lancereau <matt@rimasec.net>
 # $FreeBSD$
 #
 
 PORTNAME=	xfce4-cpugraph-plugin
 PORTVERSION=	1.0.5
+PORTREVISION=	1
 CATEGORIES=	sysutils xfce
 MASTER_SITES=	${MASTER_SITE_XFCE}
 MASTER_SITE_SUBDIR=	src/panel-plugins/${PORTNAME}/${PORTVERSION:R}
@@ -18,9 +16,10 @@ COMMENT=	Graphical representation of the CPU load
 GNU_CONFIGURE=	yes
 USE_BZIP2=	yes
 USE_GMAKE=	yes
-USE_GNOME=	gnomehack gtk20 intltool intlhack pkgconfig
+USE_GNOME=	gtk20 intltool intlhack
 USE_XFCE=	configenv libmenu panel
 INSTALLS_ICONS=	yes
+USES=	pathfix pkgconfig
 
 OPTIONS_DEFINE= NLS
 OPTIONS_DEFAULT=        NLS
diff --git a/sysutils/xfce4-fsguard-plugin/Makefile b/sysutils/xfce4-fsguard-plugin/Makefile
index 74b055fd85aa..589bf4e9dec5 100644
--- a/sysutils/xfce4-fsguard-plugin/Makefile
+++ b/sysutils/xfce4-fsguard-plugin/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	xfce4-fsguard-plugin
 PORTVERSION=	1.0.1
+PORTREVISION=	1
 CATEGORIES=	sysutils xfce
 MASTER_SITES=	${MASTER_SITE_XFCE}
 MASTER_SITE_SUBDIR=	src/panel-plugins/${PORTNAME}/${PORTVERSION:R}
@@ -15,10 +16,10 @@ GNU_CONFIGURE=	yes
 USE_BZIP2=	yes
 INSTALLS_ICONS=	yes
 USE_GMAKE=	yes
-USE_GNOME=	gnomehack gtk20 intltool intlhack
+USE_GNOME=	gtk20 intltool intlhack
 USE_XFCE=	configenv libmenu libutil panel
 USE_XORG=	x11
-USES=		pkgconfig
+USES=		pkgconfig pathfix
 
 OPTIONS_DEFINE= NLS
 
diff --git a/sysutils/xfce4-genmon-plugin/Makefile b/sysutils/xfce4-genmon-plugin/Makefile
index 0d876a36a9a9..e75003f05085 100644
--- a/sysutils/xfce4-genmon-plugin/Makefile
+++ b/sysutils/xfce4-genmon-plugin/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	xfce4-genmon-plugin
 PORTVERSION=	3.4.0
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	sysutils xfce
 MASTER_SITES=	${MASTER_SITE_XFCE}
 MASTER_SITE_SUBDIR=	src/panel-plugins/${PORTNAME}/${PORTVERSION:R}
@@ -15,8 +15,8 @@ COMMENT=	Generic Monitor Xfce4 panel plugin
 GNU_CONFIGURE=	yes
 USE_BZIP2=	yes
 USE_GMAKE=	yes
-USES=        pathfix gettext
-USE_GNOME=	gtk20 intltool intlhack pkgconfig
+USES=        pathfix gettext pkgconfig
+USE_GNOME=	gtk20 intltool intlhack
 USE_XFCE=	configenv libmenu panel
 
 WRKSRC=	${WRKDIR}/${PORTNAME}-${PORTVERSION:R}
diff --git a/sysutils/xfce4-minicmd-plugin/Makefile b/sysutils/xfce4-minicmd-plugin/Makefile
index bf7116051064..4bb2cad9eaa1 100644
--- a/sysutils/xfce4-minicmd-plugin/Makefile
+++ b/sysutils/xfce4-minicmd-plugin/Makefile
@@ -1,13 +1,10 @@
-# New ports collection makefile for:	minicmd plugin for xfce4
-# Date created:				16 August 2003
-# Whom:					Dmitry Sivachenko <demon@FreeBSD.org>
-#
+# Created by: Dmitry Sivachenko <demon@FreeBSD.org>
 # $FreeBSD$
 #
 
 PORTNAME=	xfce4-minicmd-plugin
 PORTVERSION=	0.4
-PORTREVISION=	15
+PORTREVISION=	16
 CATEGORIES=	sysutils xfce
 MASTER_SITES=	ftp://ftp.berlios.de/pub/xfce-goodies/panel-plugins/4.4/
 DIST_SUBDIR=	xfce4
@@ -17,9 +14,9 @@ COMMENT=	Displays a mini-command line on the xfce4-panel
 
 GNU_CONFIGURE=	yes
 USE_BZIP2=	yes
-USES=		gettext
+USES=		gettext pkgconfig
 USE_GMAKE=	yes
-USE_GNOME=	gtk20 intltool intlhack pkgconfig
+USE_GNOME=	gtk20 intltool intlhack
 USE_XFCE=	libgui configenv panel
 
 .include <bsd.port.mk>
diff --git a/sysutils/xfce4-mount-plugin/Makefile b/sysutils/xfce4-mount-plugin/Makefile
index c2b2489fa405..18d93f04ee54 100644
--- a/sysutils/xfce4-mount-plugin/Makefile
+++ b/sysutils/xfce4-mount-plugin/Makefile
@@ -1,12 +1,10 @@
-# New ports collection makefile for: xfce4-mount-plugin
-# Date created: 2012-04-17
-# Whom: Olivier Duchateau <duchateau.olivier@gmail.com>
-#
+# Created by: Olivier Duchateau <duchateau.olivier@gmail.com>
 # $FreeBSD$
 #
 
 PORTNAME=	xfce4-mount-plugin
 PORTVERSION=	0.6.4
+PORTREVISION=	1
 CATEGORIES=	sysutils xfce
 MASTER_SITES=	${MASTER_SITE_XFCE}
 MASTER_SITE_SUBDIR=	src/panel-plugins/${PORTNAME}/${PORTVERSION:R}
@@ -18,8 +16,8 @@ COMMENT=	Mount and umount utility for the Xfce4 panel
 USE_BZIP2=	yes
 GNU_CONFIGURE=	yes
 USE_GMAKE=	yes
-USE_GNOME=	gnomehack intltool intlhack pkgconfig
-USES=		gettext
+USE_GNOME=	intltool intlhack
+USES=		gettext pathfix pkgconfig
 USE_LDCONFIG=	yes
 INSTALLS_ICONS=	yes
 USE_XFCE=	configenv libmenu panel
diff --git a/sysutils/xfce4-netload-plugin/Makefile b/sysutils/xfce4-netload-plugin/Makefile
index fd8cfc4bf368..79ca82431e05 100644
--- a/sysutils/xfce4-netload-plugin/Makefile
+++ b/sysutils/xfce4-netload-plugin/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	xfce4-netload-plugin
 PORTVERSION=	1.2.0
+PORTREVISION=	1
 CATEGORIES=	sysutils xfce
 MASTER_SITES=	${MASTER_SITE_XFCE}
 MASTER_SITE_SUBDIR=	src/panel-plugins/${PORTNAME}/${PORTVERSION:R}
@@ -14,9 +15,9 @@ COMMENT=	Network Load plugin for Xfce4
 GNU_CONFIGURE=	yes
 USE_BZIP2=	yes
 USE_GMAKE=	yes
-USE_GNOME=	gnomehack intltool intlhack
+USE_GNOME=	intltool intlhack
 USE_XFCE=	configenv libmenu panel
-USES=		pkgconfig
+USES=		pkgconfig pathfix
 INSTALLS_ICONS=	yes
 
 OPTIONS_DEFINE=	NLS
diff --git a/sysutils/xfce4-power-manager/Makefile b/sysutils/xfce4-power-manager/Makefile
index a0c4578e19a7..baf17f62729c 100644
--- a/sysutils/xfce4-power-manager/Makefile
+++ b/sysutils/xfce4-power-manager/Makefile
@@ -1,12 +1,10 @@
-# New ports collection makefile for:	xfce4-power-manager
-# Date created:		2009-06-20
-# Whom:			J.R. Oldroyd <fbsd@opal.com>
-#
+# Created by: J.R. Oldroyd <fbsd@opal.com>
 # $FreeBSD$
 #
 
 PORTNAME=	xfce4-power-manager
 PORTVERSION=	1.2.0
+PORTREVISION=	1
 CATEGORIES=	sysutils xfce
 MASTER_SITES=	${MASTER_SITE_XFCE}
 MASTER_SITE_SUBDIR=	src/xfce/${PORTNAME}/${PORTVERSION:R}
@@ -19,9 +17,9 @@ LIB_DEPENDS=	notify:${PORTSDIR}/devel/libnotify
 
 GNU_CONFIGURE=	yes
 USE_BZIP2=	yes
-USES=		gettext
+USES=		gettext pkgconfig
 USE_GMAKE=	yes
-USE_GNOME=	gtk20 intltool intlhack pkgconfig
+USE_GNOME=	gtk20 intltool intlhack
 USE_XFCE=	configenv libutil libgui panel
 INSTALLS_ICONS=	yes
 CONFIGURE_ARGS=	--disable-network-manager \
diff --git a/sysutils/xfce4-systemload-plugin/Makefile b/sysutils/xfce4-systemload-plugin/Makefile
index 09c367cc6e64..9531d74eecdf 100644
--- a/sysutils/xfce4-systemload-plugin/Makefile
+++ b/sysutils/xfce4-systemload-plugin/Makefile
@@ -1,12 +1,10 @@
-# New ports collection makefile for:	xfce-systemload-plugin
-# Date created:		31 June 2003
-# Whom:			Thorsten Greiner <thorsten.greiner@web.de>
-#
+# Created by: Thorsten Greiner <thorsten.greiner@web.de>
 # $FreeBSD$
 #
 
 PORTNAME=	xfce4-systemload-plugin
 PORTVERSION=	1.1.1
+PORTREVISION=	1
 CATEGORIES=	sysutils xfce
 MASTER_SITES=	${MASTER_SITE_XFCE}
 MASTER_SITE_SUBDIR=	src/panel-plugins/${PORTNAME}/${PORTVERSION:R}
@@ -20,8 +18,9 @@ LIB_DEPENDS=	upower-glib.1:${PORTSDIR}/sysutils/upower
 GNU_CONFIGURE=	yes
 USE_BZIP2=	yes
 USE_GMAKE=	yes
-USE_GNOME=	gnomehack gtk20 intltool intlhack pkgconfig
+USE_GNOME=	gtk20 intltool intlhack
 USE_XFCE=	configenv libmenu libutil panel
+USES=	pathfix pkgconfig
 
 OPTIONS_DEFINE= NLS
 OPTIONS_DEFAULT=        NLS
diff --git a/sysutils/xfce4-wavelan-plugin/Makefile b/sysutils/xfce4-wavelan-plugin/Makefile
index 5923ade74427..97c995824c4a 100644
--- a/sysutils/xfce4-wavelan-plugin/Makefile
+++ b/sysutils/xfce4-wavelan-plugin/Makefile
@@ -1,13 +1,10 @@
-# New ports collection makefile for:	xfce-wavelan-plugin
-# Date created:				22 May 2004
-# Whom:					Manuel Rabade Garica <mig@mig-29.net>
-#
+# Created by: Manuel Rabade Garica <mig@mig-29.net>
 # $FreeBSD$
 #    $MCom: ports/sysutils/xfce4-wavelan-plugin/Makefile,v 1.1 2006/10/02 20:43:59 ahze Exp $
 
 PORTNAME=	xfce4-wavelan-plugin
 PORTVERSION=	0.5.4
-PORTREVISION=	17
+PORTREVISION=	18
 CATEGORIES=	sysutils xfce
 MASTER_SITES=	${MASTER_SITE_XFCE}
 MASTER_SITE_SUBDIR=/src/panel-plugins/${PORTNAME}/${PORTVERSION:R}
@@ -19,9 +16,9 @@ COMMENT=	Displays various information about a WaveLAN device
 LIB_DEPENDS=	png15:${PORTSDIR}/graphics/png
 
 GNU_CONFIGURE=	yes
-USES=		gettext
+USES=		gettext pkgconfig
 USE_GMAKE=	yes
-USE_GNOME=	gtk20 intltool intlhack pkgconfig
+USE_GNOME=	gtk20 intltool intlhack
 USE_XFCE=	configenv libutil libgui panel
 
 post-patch: