Consistify spelling of "Xfce", and some other projects while there.

Also remove a commented out BROKEN line for x11/xfce4-clipman-plugin

PR:		ports/160730
Submitted by:	ryusuke

63 files changed, 64 insertions, 66 deletions

diff --git a/audio/xfce4-mixer/Makefile b/audio/xfce4-mixer/Makefile
index 069a1d8d74b8..d84295a82d9d 100644
--- a/audio/xfce4-mixer/Makefile
+++ b/audio/xfce4-mixer/Makefile
@@ -13,7 +13,7 @@ MASTER_SITE_SUBDIR=/src/apps/${PORTNAME}/${PORTVERSION:R}
 DIST_SUBDIR=	xfce4
 
 MAINTAINER=	xfce@FreeBSD.org
-COMMENT=	XFce 4 volume mixer module for xfce4-panel
+COMMENT=	Xfce 4 volume mixer module for xfce4-panel
 
 BUILD_DEPENDS+=	gstreamer-plugins-good>=0.10.22:${PORTSDIR}/multimedia/gstreamer-plugins-good
 RUN_DEPENDS+=	gstreamer-plugins-good>=0.10.22:${PORTSDIR}/multimedia/gstreamer-plugins-good
diff --git a/audio/xfce4-mpc-plugin/Makefile b/audio/xfce4-mpc-plugin/Makefile
index e3d487f26673..3c5e015c37f7 100644
--- a/audio/xfce4-mpc-plugin/Makefile
+++ b/audio/xfce4-mpc-plugin/Makefile
@@ -13,7 +13,7 @@ MASTER_SITE_SUBDIR=/src/panel-plugins/${PORTNAME}/${PORTVERSION:R}
 DIST_SUBDIR=	xfce4
 
 MAINTAINER=	xfce@FreeBSD.org
-COMMENT=	A mpc plugin for xfce
+COMMENT=	An MPC plugin for Xfce
 
 LIB_DEPENDS=	mpd.3:${PORTSDIR}/audio/libmpd
 
diff --git a/deskutils/orage/Makefile b/deskutils/orage/Makefile
index ba7db666a12f..fdfafc979503 100644
--- a/deskutils/orage/Makefile
+++ b/deskutils/orage/Makefile
@@ -13,7 +13,7 @@ MASTER_SITE_SUBDIR=/src/apps/${PORTNAME}/${PORTVERSION:R}
 DIST_SUBDIR=	xfce4
 
 MAINTAINER=	xfce@FreeBSD.org
-COMMENT=	A calendar application to manage your time with XFce 4
+COMMENT=	A calendar application to manage your time with Xfce 4
 
 LIB_DEPENDS=	popt.0:${PORTSDIR}/devel/popt
 
diff --git a/deskutils/xfce4-notes-plugin/Makefile b/deskutils/xfce4-notes-plugin/Makefile
index 8085088e55f7..a2b50fc62739 100644
--- a/deskutils/xfce4-notes-plugin/Makefile
+++ b/deskutils/xfce4-notes-plugin/Makefile
@@ -13,7 +13,7 @@ MASTER_SITE_SUBDIR=/src/panel-plugins/${PORTNAME}/${PORTVERSION:R}
 DIST_SUBDIR=	xfce4
 
 MAINTAINER=	xfce@FreeBSD.org
-COMMENT=	Sticky notes panel plugin for XFce4
+COMMENT=	Sticky notes panel plugin for Xfce4
 
 LIB_DEPENDS=	unique-1.0.2:${PORTSDIR}/x11-toolkits/unique
 
diff --git a/deskutils/xfce4-notes-plugin/pkg-descr b/deskutils/xfce4-notes-plugin/pkg-descr
index a83a3c336c62..7bb94c17cab6 100644
--- a/deskutils/xfce4-notes-plugin/pkg-descr
+++ b/deskutils/xfce4-notes-plugin/pkg-descr
@@ -1,3 +1,3 @@
-A sticky notes panel plugin for XFce4.
+A sticky notes panel plugin for Xfce4.
 
 WWW: http://www.xfce.org/
diff --git a/deskutils/xfce4-xkb-plugin/Makefile b/deskutils/xfce4-xkb-plugin/Makefile
index 0b8a49f197ed..fb8cc5dd8a7f 100644
--- a/deskutils/xfce4-xkb-plugin/Makefile
+++ b/deskutils/xfce4-xkb-plugin/Makefile
@@ -12,7 +12,7 @@ MASTER_SITES=	${MASTER_SITE_XFCE}
 MASTER_SITE_SUBDIR=	src/panel-plugins/${PORTNAME}/${PORTVERSION:C/^([0-9]+\.[0-9]+).*/\1/}
 
 MAINTAINER=	xfce@FreeBSD.org
-COMMENT=	Keyboard layout switching plugin for XFce4
+COMMENT=	Keyboard layout switching plugin for Xfce4
 
 LIB_DEPENDS=	xklavier.12:${PORTSDIR}/x11/libxklavier
 
diff --git a/devel/xfce4-dev-tools/Makefile b/devel/xfce4-dev-tools/Makefile
index 6d9c46fa3fb5..8c03ded5bfe3 100644
--- a/devel/xfce4-dev-tools/Makefile
+++ b/devel/xfce4-dev-tools/Makefile
@@ -12,7 +12,7 @@ MASTER_SITES=	${MASTER_SITE_XFCE}
 DIST_SUBDIR=	xfce4
 
 MAINTAINER=	xfce@FreeBSD.org
-COMMENT=	XFce 4 development tools
+COMMENT=	Xfce 4 development tools
 
 RUN_DEPENDS=	${LOCALBASE}/share/autotools:${PORTSDIR}/devel/autotools
 
diff --git a/editors/mousepad/Makefile b/editors/mousepad/Makefile
index 6478f680f33d..0bce676e905a 100644
--- a/editors/mousepad/Makefile
+++ b/editors/mousepad/Makefile
@@ -14,7 +14,7 @@ MASTER_SITE_SUBDIR=/src/apps/${PORTNAME}/${PORTVERSION:R}
 DIST_SUBDIR=	xfce4
 
 MAINTAINER=	xfce@FreeBSD.org
-COMMENT=	Simple xfce editor
+COMMENT=	Simple Xfce editor
 
 GNU_CONFIGURE=	yes
 USE_BZIP2=	yes
diff --git a/graphics/ristretto/Makefile b/graphics/ristretto/Makefile
index a7f974064a86..ab6318af67cf 100644
--- a/graphics/ristretto/Makefile
+++ b/graphics/ristretto/Makefile
@@ -13,7 +13,7 @@ MASTER_SITE_SUBDIR=	src/apps/${PORTNAME}/${PORTVERSION:R}
 DIST_SUBDIR=	xfce4
 
 MAINTAINER=	xfce@FreeBSD.org
-COMMENT=	An image-viewer with xfce-integration
+COMMENT=	An image viewer with Xfce integration
 
 LIB_DEPENDS=	exif.12:${PORTSDIR}/graphics/libexif \
 		dbus-glib-1.2:${PORTSDIR}/devel/dbus-glib \
diff --git a/misc/xfce4-weather-plugin/Makefile b/misc/xfce4-weather-plugin/Makefile
index 60703060e808..25d229e42007 100644
--- a/misc/xfce4-weather-plugin/Makefile
+++ b/misc/xfce4-weather-plugin/Makefile
@@ -13,7 +13,7 @@ MASTER_SITE_SUBDIR=/src/panel-plugins/${PORTNAME}/${PORTVERSION:R}
 DIST_SUBDIR=	xfce4
 
 MAINTAINER=	xfce@FreeBSD.org
-COMMENT=	XFce 4 weather module for xfce4-panel
+COMMENT=	Xfce 4 weather module for xfce4-panel
 
 GNU_CONFIGURE=	yes
 INSTALLS_ICONS=	yes
diff --git a/misc/xfce4-weather-plugin/pkg-descr b/misc/xfce4-weather-plugin/pkg-descr
index 8b45ee75ed3d..d6520902d6d6 100644
--- a/misc/xfce4-weather-plugin/pkg-descr
+++ b/misc/xfce4-weather-plugin/pkg-descr
@@ -1,4 +1,4 @@
-XFce 4 weather module for xfce4-panel. It displays weather situation
+Xfce 4 weather module for xfce4-panel. It displays weather situation
 and forecasts. 
 
 Author: Bob Schlaermann <blackhole@atreidis.nl.eu.org>
diff --git a/misc/xfce4-wm-themes/Makefile b/misc/xfce4-wm-themes/Makefile
index b9e1e8e8a0e7..0490c8f658c2 100644
--- a/misc/xfce4-wm-themes/Makefile
+++ b/misc/xfce4-wm-themes/Makefile
@@ -15,7 +15,7 @@ DIST_SUBDIR=	xfce4
 
 MASTER_SITE_SUBDIR=xfce/4.6.0/src
 MAINTAINER=	xfce@FreeBSD.org
-COMMENT=	XFce 4 window decoration themes for xfwm4
+COMMENT=	Xfce 4 window decoration themes for xfwm4
 
 GNU_CONFIGURE=	yes
 INSTALLS_ICONS=	yes
diff --git a/misc/xfce4-wm-themes/pkg-descr b/misc/xfce4-wm-themes/pkg-descr
index 649379a3880d..ff4890eba6f4 100644
--- a/misc/xfce4-wm-themes/pkg-descr
+++ b/misc/xfce4-wm-themes/pkg-descr
@@ -1,4 +1,4 @@
-XFce 4 window decoration themes for xfwm4. Currently there are 55
+Xfce 4 window decoration themes for xfwm4. Currently there are 55
 themes included.
 
 WWW: http://www.xfce.org/
diff --git a/multimedia/xfce4-media/Makefile b/multimedia/xfce4-media/Makefile
index 0809533f1148..5f3a308304f5 100644
--- a/multimedia/xfce4-media/Makefile
+++ b/multimedia/xfce4-media/Makefile
@@ -18,7 +18,7 @@ COMMENT=	Lightweight media player for Xfce4 based on the xine engine
 
 LIB_DEPENDS=	xine.1:${PORTSDIR}/multimedia/libxine
 
-BROKEN=		Does not work with xfce 4.8
+BROKEN=		Does not work with Xfce 4.8
 
 GNU_CONFIGURE=	yes
 INSTALLS_ICONS=	yes
diff --git a/multimedia/xfce4-xmms-plugin/Makefile b/multimedia/xfce4-xmms-plugin/Makefile
index c0f303a9ed60..71e073650b39 100644
--- a/multimedia/xfce4-xmms-plugin/Makefile
+++ b/multimedia/xfce4-xmms-plugin/Makefile
@@ -14,7 +14,7 @@ MASTER_SITE_SUBDIR=/src/panel-plugins/${PORTNAME}/${PORTVERSION:R}
 DIST_SUBDIR=	xfce4
 
 MAINTAINER=	xfce@FreeBSD.org
-COMMENT=	XFce 4 xmms control plugin for xfce4-panel
+COMMENT=	Xfce4 XMMS control plugin for xfce4-panel
 
 GNU_CONFIGURE=	yes
 USE_BZIP2=	yes
diff --git a/multimedia/xfce4-xmms-plugin/pkg-descr b/multimedia/xfce4-xmms-plugin/pkg-descr
index 61e85c363d4b..72192a19fcdd 100644
--- a/multimedia/xfce4-xmms-plugin/pkg-descr
+++ b/multimedia/xfce4-xmms-plugin/pkg-descr
@@ -1,4 +1,4 @@
-XFce 4 XMMS control module for xfce4-panel.
+Xfce 4 XMMS control module for xfce4-panel.
 
 Author: Patrick van Staveren <pvanstav@cs.wmich.edu>
 WWW: http://goodies.xfce.org/projects/panel-plugins/xfce4-xmms-plugin
diff --git a/multimedia/xfmedia-remote-plugin/Makefile b/multimedia/xfmedia-remote-plugin/Makefile
index 1875993c2311..78cc54e489e6 100644
--- a/multimedia/xfmedia-remote-plugin/Makefile
+++ b/multimedia/xfmedia-remote-plugin/Makefile
@@ -14,11 +14,11 @@ MASTER_SITE_SUBDIR=/src/panel-plugins//${PORTNAME}/${PORTVERSION:R}
 DIST_SUBDIR=	xfce4
 
 MAINTAINER=	xfce@FreeBSD.org
-COMMENT=	XFce 4 media remote plugin for xfce4-panel
+COMMENT=	Xfce 4 media remote plugin for xfce4-panel
 
 BUILD_DEPENDS=	xfce4-media>=0.9.2:${PORTSDIR}/multimedia/xfce4-media
 
-BROKEN=		Does not work with xfce 4.8
+BROKEN=		Does not work with Xfce 4.8
 
 GNU_CONFIGURE=	yes
 USE_BZIP2=	yes
diff --git a/multimedia/xfmedia-remote-plugin/pkg-descr b/multimedia/xfmedia-remote-plugin/pkg-descr
index 6ff4519106ed..baa781774b2d 100644
--- a/multimedia/xfmedia-remote-plugin/pkg-descr
+++ b/multimedia/xfmedia-remote-plugin/pkg-descr
@@ -1,4 +1,4 @@
-xfmedia remote plugin enables control of xfce4 media player via a
+Xfmedia remote plugin enables control of Xfce4 media player via a
 Xfce panel icon. It includes ability to control playback (play, pause, stop,
 etc.) and playlist (add/remove songs) and more.
 
diff --git a/net-im/xfce4-messenger-plugin/Makefile b/net-im/xfce4-messenger-plugin/Makefile
index 914a5d22c3a6..692336269108 100644
--- a/net-im/xfce4-messenger-plugin/Makefile
+++ b/net-im/xfce4-messenger-plugin/Makefile
@@ -13,7 +13,7 @@ MASTER_SITES=	ftp://ftp.berlios.de/pub/xfce-goodies/panel-plugins/4.4/
 DIST_SUBDIR=	xfce4
 
 MAINTAINER=	xfce@FreeBSD.org
-COMMENT=	Messenger plugin for xfce
+COMMENT=	Messenger plugin for Xfce
 
 LIB_DEPENDS=	dbus-glib-1.2:${PORTSDIR}/devel/dbus-glib
 
diff --git a/net-im/xfce4-messenger-plugin/pkg-descr b/net-im/xfce4-messenger-plugin/pkg-descr
index 7aaee88bcc8f..4ab382ef3188 100644
--- a/net-im/xfce4-messenger-plugin/pkg-descr
+++ b/net-im/xfce4-messenger-plugin/pkg-descr
@@ -1,3 +1,3 @@
-Is a Messenger Plugin for xfce4
+Is a Messenger Plugin for Xfce4
 
 WWW: http://goodies.xfce.org/
diff --git a/print/xfce4-print/Makefile b/print/xfce4-print/Makefile
index 337130dc0dd3..58a4998300df 100644
--- a/print/xfce4-print/Makefile
+++ b/print/xfce4-print/Makefile
@@ -15,7 +15,7 @@ DISTNAME=	xfprint-${PORTVERSION}
 DIST_SUBDIR=	xfce4
 
 MAINTAINER=	xfce@FreeBSD.org
-COMMENT=	XFce 4 graphical frontend for printing
+COMMENT=	Xfce 4 graphical frontend for printing
 
 GNU_CONFIGURE=	yes
 INSTALLS_ICONS= yes
diff --git a/sysutils/garcon/Makefile b/sysutils/garcon/Makefile
index 6f947d4d8a81..c58187c3a1dd 100644
--- a/sysutils/garcon/Makefile
+++ b/sysutils/garcon/Makefile
@@ -13,7 +13,7 @@ MASTER_SITE_SUBDIR=/src/xfce/${PORTNAME}/${PORTVERSION:R}
 DIST_SUBDIR=	xfce4
 
 MAINTAINER=	xfce@FreeBSD.org
-COMMENT=	XFce 4 essential utilities and scripts
+COMMENT=	Xfce 4 essential utilities and scripts
 
 USE_AUTOTOOLS=	libtool
 GNU_CONFIGURE=	yes
diff --git a/sysutils/thunar-volman-plugin/Makefile b/sysutils/thunar-volman-plugin/Makefile
index f8ad117a89f1..a26a57b069e7 100644
--- a/sysutils/thunar-volman-plugin/Makefile
+++ b/sysutils/thunar-volman-plugin/Makefile
@@ -19,7 +19,7 @@ COMMENT=	A Device manager plugin.
 LIB_DEPENDS=	hal.1:${PORTSDIR}/sysutils/hal \
 	dbus-glib-1.2:${PORTSDIR}/devel/dbus-glib
 
-BROKEN=		Does not work with xfce 4.8
+BROKEN=		Does not work with Xfce 4.8
 
 USE_BZIP2=	yes
 USE_GMAKE=	yes
diff --git a/sysutils/xfce4-battery-plugin/Makefile b/sysutils/xfce4-battery-plugin/Makefile
index 702f3146358f..e2fb8146be93 100644
--- a/sysutils/xfce4-battery-plugin/Makefile
+++ b/sysutils/xfce4-battery-plugin/Makefile
@@ -14,7 +14,7 @@ MASTER_SITE_SUBDIR=/src/panel-plugins/${PORTNAME}/${PORTVERSION:R}
 DIST_SUBDIR=	xfce4
 
 MAINTAINER=	xfce@FreeBSD.org
-COMMENT=	Battery monitor panel plugin for XFce4
+COMMENT=	Battery monitor panel plugin for Xfce4
 
 ONLY_FOR_ARCHS=	i386 amd64
 
diff --git a/sysutils/xfce4-battery-plugin/pkg-descr b/sysutils/xfce4-battery-plugin/pkg-descr
index ebeeca3d4ea1..b8fcf38ce005 100644
--- a/sysutils/xfce4-battery-plugin/pkg-descr
+++ b/sysutils/xfce4-battery-plugin/pkg-descr
@@ -1,3 +1,3 @@
-Battery monitor panel plugin for XFce4.
+Battery monitor panel plugin for Xfce4.
 
 WWW: http://goodies.xfce.org/projects/panel-plugins/xfce4-battery-plugin
diff --git a/sysutils/xfce4-cpugraph-plugin/Makefile b/sysutils/xfce4-cpugraph-plugin/Makefile
index 83415009721e..13f31eeab3c0 100644
--- a/sysutils/xfce4-cpugraph-plugin/Makefile
+++ b/sysutils/xfce4-cpugraph-plugin/Makefile
@@ -14,7 +14,7 @@ MASTER_SITE_SUBDIR=	src/panel-plugins/${PORTNAME}/${PORTVERSION:R}
 DIST_SUBDIR=	xfce4
 
 MAINTAINER=	duchateau.olivier@gmail.com
-COMMENT=	XFce4 systemload plugin with multiple CPU display modes
+COMMENT=	Xfce4 systemload plugin with multiple CPU display modes
 
 GNU_CONFIGURE=	yes
 USE_BZIP2=	yes
diff --git a/sysutils/xfce4-fsguard-plugin/Makefile b/sysutils/xfce4-fsguard-plugin/Makefile
index f154707b5d78..5c77ea969d69 100644
--- a/sysutils/xfce4-fsguard-plugin/Makefile
+++ b/sysutils/xfce4-fsguard-plugin/Makefile
@@ -14,7 +14,7 @@ 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=	Xfce4 panel plugin to check a mountpoint for free disk space
 
 GNU_CONFIGURE=	yes
 USE_BZIP2=	yes
diff --git a/sysutils/xfce4-genmon-plugin/Makefile b/sysutils/xfce4-genmon-plugin/Makefile
index f566c32b90a3..6fa2f8891709 100644
--- a/sysutils/xfce4-genmon-plugin/Makefile
+++ b/sysutils/xfce4-genmon-plugin/Makefile
@@ -13,7 +13,7 @@ MASTER_SITE_SUBDIR=	src/panel-plugins/${PORTNAME}/${PORTVERSION:R}
 DIST_SUBDIR=	xfce4
 
 MAINTAINER=	xfce@FreeBSD.org
-COMMENT=	Generic Monitor XFce4 panel plugin
+COMMENT=	Generic Monitor Xfce4 panel plugin
 
 GNU_CONFIGURE=	yes
 USE_BZIP2=	yes
diff --git a/sysutils/xfce4-places-plugin/Makefile b/sysutils/xfce4-places-plugin/Makefile
index 8abc5b1bc36d..e35ddbe2a3d8 100644
--- a/sysutils/xfce4-places-plugin/Makefile
+++ b/sysutils/xfce4-places-plugin/Makefile
@@ -16,7 +16,7 @@ DIST_SUBDIR=	xfce4
 MAINTAINER=	xfce@FreeBSD.org
 COMMENT=	A file browser launcher for XFce4 panel plugin
 
-BROKEN=		Does not work with xfce 4.8
+BROKEN=		Does not work with Xfce 4.8
 
 USE_BZIP2=	yes
 GNU_CONFIGURE=	yes
diff --git a/sysutils/xfce4-power-manager/Makefile b/sysutils/xfce4-power-manager/Makefile
index 771150b0cc68..67ce75b7b900 100644
--- a/sysutils/xfce4-power-manager/Makefile
+++ b/sysutils/xfce4-power-manager/Makefile
@@ -14,7 +14,7 @@ MASTER_SITE_SUBDIR=	src/xfce/${PORTNAME}/${PORTVERSION:R}
 DIST_SUBDIR=	xfce4
 
 MAINTAINER=	xfce@FreeBSD.org
-COMMENT=	XFce4 power manager
+COMMENT=	Xfce4 power manager
 
 LIB_DEPENDS=	notify.4:${PORTSDIR}/devel/libnotify
 
diff --git a/sysutils/xfce4-power-manager/pkg-descr b/sysutils/xfce4-power-manager/pkg-descr
index af911f408137..5a2152d9eb29 100644
--- a/sysutils/xfce4-power-manager/pkg-descr
+++ b/sysutils/xfce4-power-manager/pkg-descr
@@ -1,3 +1,3 @@
-Written by Ali Abdallah, this is a power manager for the xfce desktop.
+Written by Ali Abdallah, this is a power manager for the Xfce desktop.
 
 WWW: http://goodies.xfce.org/projects/applications/xfce4-power-manager
diff --git a/sysutils/xfce4-settings/Makefile b/sysutils/xfce4-settings/Makefile
index 85da917bcbd6..231096d59086 100644
--- a/sysutils/xfce4-settings/Makefile
+++ b/sysutils/xfce4-settings/Makefile
@@ -14,7 +14,7 @@ MASTER_SITE_SUBDIR=	src/xfce/${PORTNAME}/${PORTVERSION:R}
 DIST_SUBDIR=	xfce4
 
 MAINTAINER=	xfce@FreeBSD.org
-COMMENT=	XFce 4 settings application
+COMMENT=	Xfce 4 settings application
 
 LIB_DEPENDS=	dbus-glib-1.2:${PORTSDIR}/devel/dbus-glib
 
diff --git a/sysutils/xfce4-utils/Makefile b/sysutils/xfce4-utils/Makefile
index 9cc6bfad3ae6..d4d8a18c7567 100644
--- a/sysutils/xfce4-utils/Makefile
+++ b/sysutils/xfce4-utils/Makefile
@@ -14,7 +14,7 @@ DISTNAME=	xfce-utils-${PORTVERSION}
 DIST_SUBDIR=	xfce4
 
 MAINTAINER=	xfce@FreeBSD.org
-COMMENT=	XFce 4 essential utilities and scripts
+COMMENT=	Xfce 4 essential utilities and scripts
 
 CONFLICTS=	xfce4-utils-4.6*
 
diff --git a/www/xfce4-smartbookmark-plugin/Makefile b/www/xfce4-smartbookmark-plugin/Makefile
index 44d5902cf5f3..7b1225df1ca0 100644
--- a/www/xfce4-smartbookmark-plugin/Makefile
+++ b/www/xfce4-smartbookmark-plugin/Makefile
@@ -14,7 +14,7 @@ MASTER_SITE_SUBDIR=/src/panel-plugins/${PORTNAME}/${PORTVERSION:R}
 DIST_SUBDIR=	xfce4
 
 MAINTAINER=	xfce@FreeBSD.org
-COMMENT=	A bookmark plugin for xfce panel.
+COMMENT=	A bookmark plugin for Xfce panel.
 
 USE_GMAKE=	yes
 INSTALLS_ICONS=	yes
diff --git a/x11-clocks/xfce4-datetime-plugin/Makefile b/x11-clocks/xfce4-datetime-plugin/Makefile
index 4024f4ec213f..623db840ae71 100644
--- a/x11-clocks/xfce4-datetime-plugin/Makefile
+++ b/x11-clocks/xfce4-datetime-plugin/Makefile
@@ -14,7 +14,7 @@ MASTER_SITE_SUBDIR=/src/panel-plugins/${PORTNAME}/${PORTVERSION:R}
 DIST_SUBDIR=	xfce4
 
 MAINTAINER=	xfce@FreeBSD.org
-COMMENT=	A datetime plugin for xfce
+COMMENT=	A datetime plugin for Xfce
 
 USE_GMAKE=	yes
 USE_BZIP2=	yes
diff --git a/x11-clocks/xfce4-datetime-plugin/pkg-descr b/x11-clocks/xfce4-datetime-plugin/pkg-descr
index 98a36af2e5f1..3e68bfd195bb 100644
--- a/x11-clocks/xfce4-datetime-plugin/pkg-descr
+++ b/x11-clocks/xfce4-datetime-plugin/pkg-descr
@@ -1,3 +1,3 @@
-Datetime plugin for the xfce panel.
+Datetime plugin for the Xfce panel.
 
 WWW:	http://goodies.xfce.org/projects/panel-plugins/xfce4-datetime-plugin
diff --git a/x11-clocks/xfce4-timer-out-plugin/Makefile b/x11-clocks/xfce4-timer-out-plugin/Makefile
index 556079c626aa..cec7240fde3c 100644
--- a/x11-clocks/xfce4-timer-out-plugin/Makefile
+++ b/x11-clocks/xfce4-timer-out-plugin/Makefile
@@ -13,7 +13,7 @@ MASTER_SITE_SUBDIR=/src/panel-plugins/${PORTNAME}/${PORTVERSION:R}
 DIST_SUBDIR=	xfce4
 
 MAINTAINER=	xfce@FreeBSD.org
-COMMENT=	A timer out plugin for xfce
+COMMENT=	A timer out plugin for Xfce
 
 USE_BZIP2=	yes
 USE_GMAKE=	yes
diff --git a/x11-clocks/xfce4-timer-plugin/Makefile b/x11-clocks/xfce4-timer-plugin/Makefile
index 879c862ba898..28ef364de711 100644
--- a/x11-clocks/xfce4-timer-plugin/Makefile
+++ b/x11-clocks/xfce4-timer-plugin/Makefile
@@ -13,7 +13,7 @@ MASTER_SITE_SUBDIR=/src/panel-plugins/${PORTNAME}/${PORTVERSION:R}
 DIST_SUBDIR=	xfce4
 
 MAINTAINER=	xfce@FreeBSD.org
-COMMENT=	A timer plugin for xfce
+COMMENT=	A timer plugin for Xfce
 
 USE_BZIP2=	yes
 USE_GMAKE=	yes
diff --git a/x11-fm/thunar/Makefile b/x11-fm/thunar/Makefile
index 4f1c34b2364c..7f574414fe7f 100644
--- a/x11-fm/thunar/Makefile
+++ b/x11-fm/thunar/Makefile
@@ -14,7 +14,7 @@ MASTER_SITE_SUBDIR=	src/xfce/${PORTNAME:L}/${PORTVERSION:R}
 DIST_SUBDIR=	xfce4
 
 MAINTAINER=	xfce@FreeBSD.org
-COMMENT=	XFce 4 file manager
+COMMENT=	Xfce 4 file manager
 
 LIB_DEPENDS=	tumbler-1.0:${PORTSDIR}/deskutils/xfce4-tumbler
 
diff --git a/x11-themes/gtk-xfce-engine/Makefile b/x11-themes/gtk-xfce-engine/Makefile
index 6a723e2abacc..bededcc0de61 100644
--- a/x11-themes/gtk-xfce-engine/Makefile
+++ b/x11-themes/gtk-xfce-engine/Makefile
@@ -14,7 +14,7 @@ MASTER_SITE_SUBDIR=	src/xfce/${PORTNAME}/${PORTVERSION:R}
 DIST_SUBDIR=	xfce4
 
 MAINTAINER=	xfce@FreeBSD.org
-COMMENT=	An XFCE engine for GTK 2.0
+COMMENT=	An Xfce engine for GTK 2.0
 
 GNU_CONFIGURE=	yes
 USE_BZIP2=	yes
diff --git a/x11-themes/gtk-xfce-engine/pkg-descr b/x11-themes/gtk-xfce-engine/pkg-descr
index 1fc2e16620fd..e7b7f7c987cc 100644
--- a/x11-themes/gtk-xfce-engine/pkg-descr
+++ b/x11-themes/gtk-xfce-engine/pkg-descr
@@ -1,3 +1,3 @@
-An XFCE engine for GTK 2.
+An Xfce engine for GTK 2.
 
 WWW: http://www.xfce4.org/
diff --git a/x11-themes/lila-xfwm4/Makefile b/x11-themes/lila-xfwm4/Makefile
index 11cea2b0a0db..570c3cea5fe6 100644
--- a/x11-themes/lila-xfwm4/Makefile
+++ b/x11-themes/lila-xfwm4/Makefile
@@ -13,7 +13,7 @@ DISTNAME=	lila-xfwm-${PORTVERSION}
 DIST_SUBDIR=	xfce4
 
 MAINTAINER=	xfce@FreeBSD.org
-COMMENT=	XFce 4 Lila window decoration theme for xfwm4
+COMMENT=	Xfce 4 Lila window decoration theme for Xfwm4
 
 RUN_DEPENDS=	xfwm4:${PORTSDIR}/x11-wm/xfce4-wm
 
diff --git a/x11-toolkits/libxfce4gui/Makefile b/x11-toolkits/libxfce4gui/Makefile
index df370b7d606d..ba24e5438b38 100644
--- a/x11-toolkits/libxfce4gui/Makefile
+++ b/x11-toolkits/libxfce4gui/Makefile
@@ -14,7 +14,7 @@ DISTNAME=	libxfcegui4-${PORTVERSION}
 DIST_SUBDIR=	xfce4
 
 MAINTAINER=	xfce@FreeBSD.org
-COMMENT=	XFce 4 widget library required by xfce4 and xfwm4
+COMMENT=	Xfce 4 widget library required by Xfce4 and Xfwm4
 
 USE_AUTOTOOLS=	libtool
 GNU_CONFIGURE=	yes
diff --git a/x11-toolkits/libxfce4gui/pkg-descr b/x11-toolkits/libxfce4gui/pkg-descr
index 2b9c3f9de8ce..56c8562e1c08 100644
--- a/x11-toolkits/libxfce4gui/pkg-descr
+++ b/x11-toolkits/libxfce4gui/pkg-descr
@@ -1,3 +1,3 @@
-XFce 4 unified widget library
+Xfce 4 unified widget library
 
 WWW: http://www.xfce.org/projects/libraries/
diff --git a/x11-wm/xfce4-desktop/Makefile b/x11-wm/xfce4-desktop/Makefile
index aa7a4b2ccc23..bb09510ddf34 100644
--- a/x11-wm/xfce4-desktop/Makefile
+++ b/x11-wm/xfce4-desktop/Makefile
@@ -15,7 +15,7 @@ DISTNAME=	xfdesktop-${PORTVERSION}
 DIST_SUBDIR=	xfce4
 
 MAINTAINER=	xfce@FreeBSD.org
-COMMENT=	XFce 4 desktop background manager and root menu
+COMMENT=	Xfce 4 desktop background manager and root menu
 
 DOCSDIR=	${PREFIX}/share/doc/xfdesktop
 
diff --git a/x11-wm/xfce4-panel/Makefile b/x11-wm/xfce4-panel/Makefile
index e05835b15f35..edeb2e98d887 100644
--- a/x11-wm/xfce4-panel/Makefile
+++ b/x11-wm/xfce4-panel/Makefile
@@ -13,7 +13,7 @@ MASTER_SITE_SUBDIR=src/xfce/${PORTNAME}/${PORTVERSION:R}
 DIST_SUBDIR=	xfce4
 
 MAINTAINER=	xfce@FreeBSD.org
-COMMENT=	XFce 4 panel module
+COMMENT=	Xfce 4 panel module
 
 LIB_DEPENDS=	wnck-1.22:${PORTSDIR}/x11-toolkits/libwnck \
 		cairo.2:${PORTSDIR}/graphics/cairo \
diff --git a/x11-wm/xfce4-wm/Makefile b/x11-wm/xfce4-wm/Makefile
index c86bb5376d22..3be7b6aea945 100644
--- a/x11-wm/xfce4-wm/Makefile
+++ b/x11-wm/xfce4-wm/Makefile
@@ -14,7 +14,7 @@ DISTNAME=	xfwm4-${PORTVERSION}
 DIST_SUBDIR=	xfce4
 
 MAINTAINER=	xfce@FreeBSD.org
-COMMENT=	XFce 4 window manager
+COMMENT=	Xfce 4 window manager
 
 CONFIGURE_ARGS=	--enable-xinerama
 GNU_CONFIGURE=	yes
diff --git a/x11/libxfce4menu/Makefile b/x11/libxfce4menu/Makefile
index f936cbc8a8a9..9f90e3faaf8e 100644
--- a/x11/libxfce4menu/Makefile
+++ b/x11/libxfce4menu/Makefile
@@ -13,7 +13,7 @@ DISTNAME=	libxfce4ui-${PORTVERSION}
 DIST_SUBDIR=	xfce4
 
 MAINTAINER=	xfce@FreeBSD.org
-COMMENT=	XFce 4 library for a freedesktop.org compliant menu implementation
+COMMENT=	Xfce 4 library for a freedesktop.org compliant menu implementation
 
 USE_AUTOTOOLS=	libtool
 GNU_CONFIGURE=	yes
diff --git a/x11/libxfce4menu/pkg-descr b/x11/libxfce4menu/pkg-descr
index 4a27783036f0..3cdd840050c4 100644
--- a/x11/libxfce4menu/pkg-descr
+++ b/x11/libxfce4menu/pkg-descr
@@ -1,3 +1,3 @@
-XFce 4 library for a freedesktop.org compliant menu implementation
+Xfce 4 library for a freedesktop.org compliant menu implementation
 
 WWW: http://www.xfce.org/projects/libraries/
diff --git a/x11/libxfce4util/Makefile b/x11/libxfce4util/Makefile
index b4f11c85a598..aeec158019b7 100644
--- a/x11/libxfce4util/Makefile
+++ b/x11/libxfce4util/Makefile
@@ -13,7 +13,7 @@ MASTER_SITE_SUBDIR=	src/xfce/${PORTNAME}/${PORTVERSION:R}
 DIST_SUBDIR=	xfce4
 
 MAINTAINER=	xfce@FreeBSD.org
-COMMENT=	XFce 4 library with non-graphical helper functions
+COMMENT=	Xfce 4 library with non-graphical helper functions
 
 USE_AUTOTOOLS=	libtool
 GNU_CONFIGURE=	yes
diff --git a/x11/libxfce4util/pkg-descr b/x11/libxfce4util/pkg-descr
index 1afb4299820b..3f7d079c2e4c 100644
--- a/x11/libxfce4util/pkg-descr
+++ b/x11/libxfce4util/pkg-descr
@@ -1,3 +1,3 @@
-XFce 4 library providing basic utilities. 
+Xfce 4 library providing basic utilities. 
 
 WWW: http://www.xfce.org/projects/libraries/
diff --git a/x11/xfce4-clipman-plugin/Makefile b/x11/xfce4-clipman-plugin/Makefile
index 0b26eadb3e51..da0b20fb6364 100644
--- a/x11/xfce4-clipman-plugin/Makefile
+++ b/x11/xfce4-clipman-plugin/Makefile
@@ -14,15 +14,13 @@ MASTER_SITE_SUBDIR=/src/panel-plugins/${PORTNAME}/${PORTVERSION:R}
 DIST_SUBDIR=	xfce4
 
 MAINTAINER=	xfce@FreeBSD.org
-COMMENT=	XFce 4 clipboard module for xfce4-panel
+COMMENT=	Xfce 4 clipboard module for xfce4-panel
 
 LICENSE=	GPLv2
 LICENSE_FILE=	${WRKSRC}/COPYING
 
 OPTIONS=	UNIQUE	"Enable Unique (single instance) support" on
 
-#BROKEN=		Does not work with xfce 4.8
-
 GNU_CONFIGURE=	yes
 USE_BZIP2=	yes
 USE_GETTEXT=	yes
diff --git a/x11/xfce4-clipman-plugin/pkg-descr b/x11/xfce4-clipman-plugin/pkg-descr
index a273fee79f4f..0d220dacb81c 100644
--- a/x11/xfce4-clipman-plugin/pkg-descr
+++ b/x11/xfce4-clipman-plugin/pkg-descr
@@ -1,4 +1,4 @@
-XFce 4 clipboard module for xfce4-panel.  This plugin is a clipboard history
+Xfce 4 clipboard module for xfce4-panel.  This plugin is a clipboard history
 for the panel. It now includes a "Clear clipboard" option, and a drag-and-drop
 paste feature contributed by Andre Lerche.
 
diff --git a/x11/xfce4-conf/Makefile b/x11/xfce4-conf/Makefile
index 98225f628f97..bc1baa87d43a 100644
--- a/x11/xfce4-conf/Makefile
+++ b/x11/xfce4-conf/Makefile
@@ -13,7 +13,7 @@ DISTNAME=	xfconf-${PORTVERSION}
 DIST_SUBDIR=	xfce4
 
 MAINTAINER=	xfce@FreeBSD.org
-COMMENT=	XFce 4 configuration mananger
+COMMENT=	Xfce 4 configuration mananger
 
 LIB_DEPENDS=	dbus-glib-1.2:${PORTSDIR}/devel/dbus-glib
 
diff --git a/x11/xfce4-conf/pkg-descr b/x11/xfce4-conf/pkg-descr
index 465c9a16c8ac..fb1ff718a398 100644
--- a/x11/xfce4-conf/pkg-descr
+++ b/x11/xfce4-conf/pkg-descr
@@ -1,3 +1,3 @@
-XFce 4 configuration mananger
+Xfce 4 configuration mananger
 
 WWW: http://www.xfce.org/projects/libraries/
diff --git a/x11/xfce4-quicklauncher-plugin/Makefile b/x11/xfce4-quicklauncher-plugin/Makefile
index dcdc34998c1e..56340c0bb1fa 100644
--- a/x11/xfce4-quicklauncher-plugin/Makefile
+++ b/x11/xfce4-quicklauncher-plugin/Makefile
@@ -14,7 +14,7 @@ MASTER_SITE_SUBDIR=/src/panel-plugins/${PORTNAME}/${PORTVERSION:R}
 DIST_SUBDIR=	xfce4
 
 MAINTAINER=	xfce@FreeBSD.org
-COMMENT=	Quicklauncher plugin for xfce
+COMMENT=	Quicklauncher plugin for Xfce
 
 BROKEN=		does not configure
 
diff --git a/x11/xfce4-screenshooter-plugin/Makefile b/x11/xfce4-screenshooter-plugin/Makefile
index adb7e21e4bcd..9a1c3152538f 100644
--- a/x11/xfce4-screenshooter-plugin/Makefile
+++ b/x11/xfce4-screenshooter-plugin/Makefile
@@ -14,7 +14,7 @@ DIST_SUBDIR=	xfce4
 DISTNAME=	xfce4-screenshooter-${PORTVERSION}
 
 MAINTAINER=	xfce@FreeBSD.org
-COMMENT=	Desktop Screenshot plugin for xfce
+COMMENT=	Desktop Screenshot plugin for Xfce
 
 LIB_DEPENDS=	soup-2.4.1:${PORTSDIR}/devel/libsoup
 
diff --git a/x11/xfce4-taskmanager/Makefile b/x11/xfce4-taskmanager/Makefile
index 78fb12ca09c2..7a2eec189d50 100644
--- a/x11/xfce4-taskmanager/Makefile
+++ b/x11/xfce4-taskmanager/Makefile
@@ -13,7 +13,7 @@ MASTER_SITE_SUBDIR=	src/apps/${PORTNAME}/${PORTVERSION:R}
 DIST_SUBDIR=	xfce4
 
 MAINTAINER=	xfce@FreeBSD.org
-COMMENT=	A task manager for XFCE
+COMMENT=	A task manager for Xfce
 
 LIB_DEPENDS=	cairo.2:${PORTSDIR}/graphics/cairo \
 	wnck-1.22:${PORTSDIR}/x11-toolkits/libwnck
diff --git a/x11/xfce4-taskmanager/pkg-descr b/x11/xfce4-taskmanager/pkg-descr
index f13a0bee0a7a..98bd00bf9ea9 100644
--- a/x11/xfce4-taskmanager/pkg-descr
+++ b/x11/xfce4-taskmanager/pkg-descr
@@ -1,4 +1,4 @@
 This is a port of the xfce-goodies plugin that adds a task
-manager to XFCE.
+manager to Xfce.
 
 WWW: http://www.xfce.org/
diff --git a/x11/xfce4-verve-plugin/Makefile b/x11/xfce4-verve-plugin/Makefile
index e13778f1d1ec..67f18a9815b9 100644
--- a/x11/xfce4-verve-plugin/Makefile
+++ b/x11/xfce4-verve-plugin/Makefile
@@ -16,7 +16,7 @@ PKGNAMEPREFIX=	xfce4-
 DISTNAME=	${PKGNAMEPREFIX}${PORTNAME}-${PORTVERSION}
 
 MAINTAINER=	xfce@FreeBSD.org
-COMMENT=	A command line plugin for xfce4
+COMMENT=	A command line plugin for Xfce4
 
 LIB_DEPENDS=	pcre.0:${PORTSDIR}/devel/pcre
 
diff --git a/x11/xfce4-wmdock-plugin/Makefile b/x11/xfce4-wmdock-plugin/Makefile
index 83523a9deac8..15c600c5b68c 100644
--- a/x11/xfce4-wmdock-plugin/Makefile
+++ b/x11/xfce4-wmdock-plugin/Makefile
@@ -11,7 +11,7 @@ CATEGORIES=	x11 xfce
 MASTER_SITES=	http://www.ibh.de/~ellguth/develop/
 
 MAINTAINER=	xfce@FreeBSD.org
-COMMENT=	WMdock plugin for XFCE
+COMMENT=	WMdock plugin for Xfce
 
 USE_BZIP2=	yes
 GNU_CONFIGURE=	yes
diff --git a/x11/xfce4-wmdock-plugin/pkg-descr b/x11/xfce4-wmdock-plugin/pkg-descr
index 0878da18b8c5..75ab1bfb9d53 100644
--- a/x11/xfce4-wmdock-plugin/pkg-descr
+++ b/x11/xfce4-wmdock-plugin/pkg-descr
@@ -1,5 +1,5 @@
 The WMdock plugin is a compatibility layer for running WindowMaker dockapps
-on the XFCE desktop. It integrates the dockapps into a panel, closely
+on the Xfce desktop. It integrates the dockapps into a panel, closely
 resembling the look and feel of the WindowMaker dock or clip, respectively.
 
 WWW: http://www.ibh.de/~ellguth/xfce4-wmdock-plugin.html
diff --git a/x11/xfce4-xfapplet-plugin/Makefile b/x11/xfce4-xfapplet-plugin/Makefile
index edfb4c827eee..55363a86c24e 100644
--- a/x11/xfce4-xfapplet-plugin/Makefile
+++ b/x11/xfce4-xfapplet-plugin/Makefile
@@ -14,7 +14,7 @@ MASTER_SITE_SUBDIR=/src/panel-plugins/${PORTNAME}/${PORTVERSION:R}
 DIST_SUBDIR=	xfce4
 
 MAINTAINER=	xfce@FreeBSD.org
-COMMENT=	Xfapplet plugin for xfce
+COMMENT=	Xfapplet plugin for Xfce
 
 LIB_DEPENDS=	panelappletmm-2.6:${PORTSDIR}/x11-toolkits/libpanelappletmm