10 files changed, 53 insertions, 26 deletions

diff --git a/sysutils/xfce4-battery-plugin/Makefile b/sysutils/xfce4-battery-plugin/Makefile
index eb403dc77c76..2309e34e459c 100644
--- a/sysutils/xfce4-battery-plugin/Makefile
+++ b/sysutils/xfce4-battery-plugin/Makefile
@@ -12,20 +12,20 @@ DIST_SUBDIR=	xfce4
 MAINTAINER=	xfce@FreeBSD.org
 COMMENT=	Battery monitor panel plugin for Xfce4
 
+LICENSE=	GPLv2
+
 ONLY_FOR_ARCHS=	i386 amd64
 
 GNU_CONFIGURE=	yes
 USE_BZIP2=	yes
-USE_GMAKE=	yes
 USE_GNOME=	gtk20 glib20 intltool intlhack
 USE_XFCE=	configenv libmenu libutil panel
 INSTALLS_ICONS=	yes
-USES=	pathfix pkgconfig
+USES=	pkgconfig gmake
 
 OPTIONS_DEFINE= NLS
 OPTIONS_DEFAULT=        NLS
 
-NO_STAGE=	yes
 .include <bsd.port.options.mk>
 
 .if ${PORT_OPTIONS:MNLS}
diff --git a/sysutils/xfce4-battery-plugin/files/patch-configure b/sysutils/xfce4-battery-plugin/files/patch-configure
new file mode 100644
index 000000000000..e424a9c01a05
--- /dev/null
+++ b/sysutils/xfce4-battery-plugin/files/patch-configure
@@ -0,0 +1,11 @@
+--- ./configure.orig	2012-06-30 07:50:07.000000000 +0000
++++ ./configure	2014-01-30 14:32:38.000000000 +0000
+@@ -13225,7 +13225,7 @@
+ 
+     fi
+   fi
+-     USE_NLS=yes
++#     USE_NLS=yes
+ 
+ 
+     gt_cv_have_gettext=no
diff --git a/sysutils/xfce4-cpugraph-plugin/Makefile b/sysutils/xfce4-cpugraph-plugin/Makefile
index 2dd7322148bf..b45151757e83 100644
--- a/sysutils/xfce4-cpugraph-plugin/Makefile
+++ b/sysutils/xfce4-cpugraph-plugin/Makefile
@@ -12,18 +12,18 @@ DIST_SUBDIR=	xfce4
 MAINTAINER=	xfce@FreeBSD.org
 COMMENT=	Graphical representation of the CPU load
 
+LICENSE=	GPLv2
+
 GNU_CONFIGURE=	yes
 USE_BZIP2=	yes
-USE_GMAKE=	yes
 USE_GNOME=	gtk20 intltool intlhack
 USE_XFCE=	configenv libmenu panel
 INSTALLS_ICONS=	yes
-USES=	pathfix pkgconfig
+USES=	pkgconfig gmake
 
 OPTIONS_DEFINE= NLS
 OPTIONS_DEFAULT=        NLS
 
-NO_STAGE=	yes
 .include <bsd.port.options.mk>
 
 .if ${PORT_OPTIONS:MNLS}
diff --git a/sysutils/xfce4-cpugraph-plugin/files/patch-configure b/sysutils/xfce4-cpugraph-plugin/files/patch-configure
new file mode 100644
index 000000000000..ef4645796d7e
--- /dev/null
+++ b/sysutils/xfce4-cpugraph-plugin/files/patch-configure
@@ -0,0 +1,11 @@
+--- ./configure.orig	2012-07-04 14:30:00.000000000 +0000
++++ ./configure	2014-01-30 14:21:45.000000000 +0000
+@@ -14658,7 +14658,7 @@
+ 
+     fi
+   fi
+-     USE_NLS=yes
++#     USE_NLS=yes
+ 
+ 
+     gt_cv_have_gettext=no
diff --git a/sysutils/xfce4-fsguard-plugin/Makefile b/sysutils/xfce4-fsguard-plugin/Makefile
index b194de7575fb..1c8bf2a54059 100644
--- a/sysutils/xfce4-fsguard-plugin/Makefile
+++ b/sysutils/xfce4-fsguard-plugin/Makefile
@@ -10,20 +10,18 @@ MASTER_SITE_SUBDIR=	src/panel-plugins/${PORTNAME}/${PORTVERSION:R}
 DIST_SUBDIR=	xfce4
 
 MAINTAINER=	xfce@FreeBSD.org
-COMMENT=	Xfce4 panel plugin to check a mountpoint for free disk space
+COMMENT=	Panel plugin which displays free space of mountpoint
 
 GNU_CONFIGURE=	yes
 USE_BZIP2=	yes
 INSTALLS_ICONS=	yes
-USE_GMAKE=	yes
 USE_GNOME=	gtk20 intltool intlhack
 USE_XFCE=	configenv libmenu libutil panel
 USE_XORG=	x11
-USES=		pkgconfig pathfix
+USES=		pkgconfig gmake
 
 OPTIONS_DEFINE= NLS
 
-NO_STAGE=	yes
 .include <bsd.port.options.mk>
 
 .if ${PORT_OPTIONS:MNLS}
diff --git a/sysutils/xfce4-fsguard-plugin/pkg-descr b/sysutils/xfce4-fsguard-plugin/pkg-descr
index f0526e7a887d..ad961d4e0bfa 100644
--- a/sysutils/xfce4-fsguard-plugin/pkg-descr
+++ b/sysutils/xfce4-fsguard-plugin/pkg-descr
@@ -1,10 +1,6 @@
-Written by Andre Lerche, this plugin checks the 
-chosen mountpoint for free disk space.  
-It displays 4 different icons (red, yellow, green, unknown) 
-and a message box, depending on the free space. 
-The amount of free disk space is visible in a tooltip. 
-If you left-click on its icon, it opens the 
-mountpoint directory in the file manager.
+The FSGuard panel plugin checks free space on a chosen mount point and displays
+a message when a limit is reached. There are two limits:
+- a warning limit where only the icon changes
+- an urgent limit that advise the user with a message
 
-Author:	Andre Lerche <a.lerche@gmx.net>
 WWW: http://goodies.xfce.org/projects/panel-plugins/xfce4-fsguard-plugin
diff --git a/sysutils/xfce4-mount-plugin/Makefile b/sysutils/xfce4-mount-plugin/Makefile
index 7e626174612c..9368d5477d8d 100644
--- a/sysutils/xfce4-mount-plugin/Makefile
+++ b/sysutils/xfce4-mount-plugin/Makefile
@@ -12,14 +12,14 @@ DIST_SUBDIR=	xfce4
 MAINTAINER=	xfce@FreeBSD.org
 COMMENT=	Mount and umount utility for the Xfce4 panel
 
+LICENSE=	GPLv2
+
 USE_BZIP2=	yes
 GNU_CONFIGURE=	yes
-USE_GMAKE=	yes
 USE_GNOME=	intltool intlhack
-USES=		gettext pathfix pkgconfig
+USES=		gettext pkgconfig gmake
 USE_LDCONFIG=	yes
 INSTALLS_ICONS=	yes
 USE_XFCE=	configenv libmenu panel
 
-NO_STAGE=	yes
 .include <bsd.port.mk>
diff --git a/sysutils/xfce4-mount-plugin/pkg-descr b/sysutils/xfce4-mount-plugin/pkg-descr
index 18d60fd8f186..ef136d932266 100644
--- a/sysutils/xfce4-mount-plugin/pkg-descr
+++ b/sysutils/xfce4-mount-plugin/pkg-descr
@@ -1,4 +1,4 @@
 Mount plugin allows to mount/umount external devices, cd/dvd-rom and
 networked filesystems listed in your /etc/fstab.
 
-WWW:	http://goodies.xfce.org/projects/panel-plugins/xfce4-mount-plugin
+WWW: http://goodies.xfce.org/projects/panel-plugins/xfce4-mount-plugin
diff --git a/sysutils/xfce4-systemload-plugin/Makefile b/sysutils/xfce4-systemload-plugin/Makefile
index ef364ee87d2a..b131d418c559 100644
--- a/sysutils/xfce4-systemload-plugin/Makefile
+++ b/sysutils/xfce4-systemload-plugin/Makefile
@@ -12,19 +12,19 @@ DIST_SUBDIR=	xfce4
 MAINTAINER=	xfce@FreeBSD.org
 COMMENT=	System Load plugin for XFce4
 
-LIB_DEPENDS=	upower-glib.1:${PORTSDIR}/sysutils/upower
+LICENSE=	BSD
+
+LIB_DEPENDS=	libupower-glib.so:${PORTSDIR}/sysutils/upower
 
 GNU_CONFIGURE=	yes
 USE_BZIP2=	yes
-USE_GMAKE=	yes
 USE_GNOME=	gtk20 intltool intlhack
 USE_XFCE=	configenv libmenu libutil panel
-USES=	pathfix pkgconfig
+USES=	pkgconfig gmake
 
 OPTIONS_DEFINE= NLS
 OPTIONS_DEFAULT=        NLS
 
-NO_STAGE=	yes
 .include <bsd.port.options.mk>
 
 .if ${PORT_OPTIONS:MNLS}
diff --git a/sysutils/xfce4-systemload-plugin/files/patch-configure b/sysutils/xfce4-systemload-plugin/files/patch-configure
new file mode 100644
index 000000000000..b46c4308c33c
--- /dev/null
+++ b/sysutils/xfce4-systemload-plugin/files/patch-configure
@@ -0,0 +1,11 @@
+--- ./configure.orig	2012-06-30 07:54:42.000000000 +0000
++++ ./configure	2014-01-30 14:45:44.000000000 +0000
+@@ -13178,7 +13178,7 @@
+ 
+     fi
+   fi
+-     USE_NLS=yes
++#     USE_NLS=yes
+ 
+ 
+     gt_cv_have_gettext=no