Substitute "XFce 4" with "Xfce" in DESCR and Makefile's COMMENT.

It is a lower-case f according to the official site.

84 files changed, 130 insertions, 130 deletions

diff --git a/audio/xfce4-mixer/DESCR b/audio/xfce4-mixer/DESCR
index 1d90bbbdeb1..e16d767993b 100644
--- a/audio/xfce4-mixer/DESCR
+++ b/audio/xfce4-mixer/DESCR
@@ -1 +1 @@
-Mixer plugin for XFce4.
+Mixer plugin for Xfce.
diff --git a/audio/xfce4-mixer/Makefile b/audio/xfce4-mixer/Makefile
index 6d988c3e278..a0eb47ad267 100644
--- a/audio/xfce4-mixer/Makefile
+++ b/audio/xfce4-mixer/Makefile
@@ -1,10 +1,10 @@
-# $NetBSD: Makefile,v 1.12 2005/01/17 12:56:13 martti Exp $
+# $NetBSD: Makefile,v 1.13 2005/11/09 07:09:04 martti Exp $
 
 .include "../../meta-pkgs/xfce4/Makefile.common"
 
 DISTNAME=	xfce4-mixer-${XFCE4_VERSION}
 CATEGORIES=	audio
-COMMENT=	XFce4 mixer plugin
+COMMENT=	Xfce mixer plugin
 
 .include "../../textproc/libxml2/buildlink3.mk"
 .include "../../x11/xfce4-panel/buildlink3.mk"
diff --git a/audio/xfce4-xmms-plugin/DESCR b/audio/xfce4-xmms-plugin/DESCR
index 33e9e65907f..cc548f0b2f8 100644
--- a/audio/xfce4-xmms-plugin/DESCR
+++ b/audio/xfce4-xmms-plugin/DESCR
@@ -1 +1 @@
-XMMS plugin for XFce4.
+XMMS plugin for Xfce.
diff --git a/audio/xfce4-xmms-plugin/Makefile b/audio/xfce4-xmms-plugin/Makefile
index cb2e791b73c..07e8ee9e624 100644
--- a/audio/xfce4-xmms-plugin/Makefile
+++ b/audio/xfce4-xmms-plugin/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.7 2005/06/23 07:23:56 martti Exp $
+# $NetBSD: Makefile,v 1.8 2005/11/09 07:09:04 martti Exp $
 
 .include "../../meta-pkgs/xfce4/Makefile.common"
 
@@ -7,7 +7,7 @@ XFCE4_VERSION=	0.3.1
 DISTNAME=	xfce4-xmms-plugin-${XFCE4_VERSION}
 CATEGORIES=	audio
 MASTER_SITES=	http://download.berlios.de/xfce-goodies/
-COMMENT=	XFce4 XMMS plugin
+COMMENT=	Xfce XMMS plugin
 
 EXTRACT_SUFX=	.tar.bz2
 
diff --git a/graphics/xfce4-artwork/DESCR b/graphics/xfce4-artwork/DESCR
index fb9c5790938..6549e7e57b9 100644
--- a/graphics/xfce4-artwork/DESCR
+++ b/graphics/xfce4-artwork/DESCR
@@ -1 +1 @@
-Additional artwork (backgrounds...) for the XFce4 desktop environment.
+Additional artwork (backgrounds...) for the Xfce desktop environment.
diff --git a/graphics/xfce4-artwork/Makefile b/graphics/xfce4-artwork/Makefile
index ca4532174be..20f3557632e 100644
--- a/graphics/xfce4-artwork/Makefile
+++ b/graphics/xfce4-artwork/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.6 2004/10/03 00:14:58 tv Exp $
+# $NetBSD: Makefile,v 1.7 2005/11/09 07:09:04 martti Exp $
 
 .include "../../meta-pkgs/xfce4/Makefile.common"
 
@@ -8,7 +8,7 @@ DISTNAME=	xfce4-artwork-${XFCE4_VERSION}
 PKGREVISION=	5
 CATEGORIES=	graphics
 MASTER_SITES=	http://download.berlios.de/xfce-goodies/
-COMMENT=	XFce4 artwork
+COMMENT=	Xfce artwork
 
 .include "../../x11/xfce4-desktop/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/graphics/xfce4-icon-theme/DESCR b/graphics/xfce4-icon-theme/DESCR
index 4640dd16308..b68e72b2fd4 100644
--- a/graphics/xfce4-icon-theme/DESCR
+++ b/graphics/xfce4-icon-theme/DESCR
@@ -1 +1 @@
-Icon themes for XFce4.
+Icon themes for Xfce.
diff --git a/graphics/xfce4-icon-theme/Makefile b/graphics/xfce4-icon-theme/Makefile
index e81ade8f86f..6ffdd9bfc98 100644
--- a/graphics/xfce4-icon-theme/Makefile
+++ b/graphics/xfce4-icon-theme/Makefile
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile,v 1.3 2005/05/18 06:10:30 martti Exp $
+# $NetBSD: Makefile,v 1.4 2005/11/09 07:09:04 martti Exp $
 
 .include "../../meta-pkgs/xfce4/Makefile.common"
 
 DISTNAME=	xfce4-icon-theme-${XFCE4_VERSION}
 CATEGORIES=	graphics
-COMMENT=	XFce4 icon themes
+COMMENT=	Xfce icon themes
 
 .include "../../mk/bsd.pkg.mk"
diff --git a/graphics/xfce4-iconbox/DESCR b/graphics/xfce4-iconbox/DESCR
index 3847344e582..c28d1199014 100644
--- a/graphics/xfce4-iconbox/DESCR
+++ b/graphics/xfce4-iconbox/DESCR
@@ -1 +1 @@
-Icon displayer for XFce4.
+Icon displayer for Xfce.
diff --git a/graphics/xfce4-iconbox/Makefile b/graphics/xfce4-iconbox/Makefile
index 086ff591131..65768afe96e 100644
--- a/graphics/xfce4-iconbox/Makefile
+++ b/graphics/xfce4-iconbox/Makefile
@@ -1,10 +1,10 @@
-# $NetBSD: Makefile,v 1.8 2005/01/17 12:56:13 martti Exp $
+# $NetBSD: Makefile,v 1.9 2005/11/09 07:09:04 martti Exp $
 
 .include "../../meta-pkgs/xfce4/Makefile.common"
 
 DISTNAME=	xfce4-iconbox-${XFCE4_VERSION}
 CATEGORIES=	graphics
-COMMENT=	XFce4 icon displayer
+COMMENT=	Xfce icon displayer
 
 .include "../../x11/xfce4-mcs-plugins/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/meta-pkgs/xfce4-extras/DESCR b/meta-pkgs/xfce4-extras/DESCR
index aa9b21953bb..12d9ba4e11a 100644
--- a/meta-pkgs/xfce4-extras/DESCR
+++ b/meta-pkgs/xfce4-extras/DESCR
@@ -1 +1 @@
-This package installs XFce 4 and all available extras.
+This package installs Xfce and all available extras.
diff --git a/meta-pkgs/xfce4-extras/Makefile b/meta-pkgs/xfce4-extras/Makefile
index 5c0ceedeb2b..c7e162a6a7c 100644
--- a/meta-pkgs/xfce4-extras/Makefile
+++ b/meta-pkgs/xfce4-extras/Makefile
@@ -1,11 +1,11 @@
-# $NetBSD: Makefile,v 1.14 2005/10/28 06:45:30 martti Exp $
+# $NetBSD: Makefile,v 1.15 2005/11/09 07:09:04 martti Exp $
 
 .include "../../meta-pkgs/xfce4/Makefile.common"
 
 DISTNAME=	xfce4-extras-${XFCE4_VERSION}
 DISTFILES=	# empty
 CATEGORIES=	meta-pkgs
-COMMENT=	XFce4 extras
+COMMENT=	Xfce extras
 
 NO_CHECKSUM=	yes
 NO_CONFIGURE=	yes
diff --git a/meta-pkgs/xfce4/DESCR b/meta-pkgs/xfce4/DESCR
index 7322db16fdb..07634d67c23 100644
--- a/meta-pkgs/xfce4/DESCR
+++ b/meta-pkgs/xfce4/DESCR
@@ -1,9 +1,9 @@
-XFce 4 is the next generation of the popular XFce desktop.
+Xfce is the next generation of the popular Xfce desktop.
 
 This package does not contain anything by itself -- it is a
-"meta-package" that depends on other XFce4 packages. Its sole
+"meta-package" that depends on other Xfce packages. Its sole
 purpose is to require dependencies so users can install this
-package only and have all the XFce stuff pulled in by the package
+package only and have all the Xfce stuff pulled in by the package
 dependency mechanism.
 
-This package installs XFce 4 without any extras.
+This package installs Xfce without any extras.
diff --git a/meta-pkgs/xfce4/Makefile b/meta-pkgs/xfce4/Makefile
index 87835efda0c..20cc91e4e3b 100644
--- a/meta-pkgs/xfce4/Makefile
+++ b/meta-pkgs/xfce4/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.18 2005/11/09 06:42:58 martti Exp $
+# $NetBSD: Makefile,v 1.19 2005/11/09 07:09:04 martti Exp $
 
 .include "Makefile.common"
 
@@ -7,7 +7,7 @@ XFCE4_VERSION=	4.2.3.1
 DISTNAME=	xfce4-${XFCE4_VERSION}
 DISTFILES=	# empty
 CATEGORIES=	meta-pkgs
-COMMENT=	XFce4
+COMMENT=	Xfce
 
 NO_CHECKSUM=	yes
 NO_CONFIGURE=	yes
diff --git a/misc/xfce4-weather-plugin/DESCR b/misc/xfce4-weather-plugin/DESCR
index b48231756d9..dcc2263ec2b 100644
--- a/misc/xfce4-weather-plugin/DESCR
+++ b/misc/xfce4-weather-plugin/DESCR
@@ -1 +1 @@
-Weather plugin for XFce4.
+Weather plugin for Xfce.
diff --git a/misc/xfce4-weather-plugin/Makefile b/misc/xfce4-weather-plugin/Makefile
index 59293874815..8882f8a7018 100644
--- a/misc/xfce4-weather-plugin/Makefile
+++ b/misc/xfce4-weather-plugin/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.4 2005/03/07 14:15:57 adam Exp $
+# $NetBSD: Makefile,v 1.5 2005/11/09 07:09:04 martti Exp $
 
 .include "../../meta-pkgs/xfce4/Makefile.common"
 
@@ -7,7 +7,7 @@ XFCE4_VERSION=	0.4.9
 DISTNAME=	xfce4-weather-plugin-${XFCE4_VERSION}
 CATEGORIES=	misc
 MASTER_SITES=	http://download.berlios.de/xfce-goodies/
-COMMENT=	XFce4 weather plugin
+COMMENT=	Xfce weather plugin
 
 .include "../../x11/xfce4-panel/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/net/xfce4-wavelan-plugin/DESCR b/net/xfce4-wavelan-plugin/DESCR
index 969c949a290..10900de936f 100644
--- a/net/xfce4-wavelan-plugin/DESCR
+++ b/net/xfce4-wavelan-plugin/DESCR
@@ -1 +1 @@
-WLAN plugin for XFce4.
+WLAN plugin for Xfce.
diff --git a/net/xfce4-wavelan-plugin/Makefile b/net/xfce4-wavelan-plugin/Makefile
index 73568bc44a9..9662f5f6592 100644
--- a/net/xfce4-wavelan-plugin/Makefile
+++ b/net/xfce4-wavelan-plugin/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.7 2005/02/10 12:24:05 martti Exp $
+# $NetBSD: Makefile,v 1.8 2005/11/09 07:09:04 martti Exp $
 
 .include "../../meta-pkgs/xfce4/Makefile.common"
 
@@ -8,7 +8,7 @@ DISTNAME=	xfce4-wavelan-plugin-${XFCE4_VERSION}
 PKGREVISION=	1
 CATEGORIES=	sysutils
 MASTER_SITES=	http://download.berlios.de/xfce-goodies/
-COMMENT=	XFce4 WLAN plugin
+COMMENT=	Xfce WLAN plugin
 
 .include "../../x11/xfce4-panel/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/print/xfce4-print/DESCR b/print/xfce4-print/DESCR
index ad690ae7c35..7ccb761d52a 100644
--- a/print/xfce4-print/DESCR
+++ b/print/xfce4-print/DESCR
@@ -1 +1 @@
-Print dialog for XFce4.
+Print dialog for Xfce.
diff --git a/print/xfce4-print/Makefile b/print/xfce4-print/Makefile
index 1ce905ccf37..8b69e8957df 100644
--- a/print/xfce4-print/Makefile
+++ b/print/xfce4-print/Makefile
@@ -1,11 +1,11 @@
-# $NetBSD: Makefile,v 1.11 2005/05/18 12:16:53 abs Exp $
+# $NetBSD: Makefile,v 1.12 2005/11/09 07:09:04 martti Exp $
 
 .include "../../meta-pkgs/xfce4/Makefile.common"
 
 PKGNAME=	xfce4-print-${XFCE4_VERSION}
 DISTNAME=	xfprint-${XFCE4_VERSION}
 CATEGORIES=	print
-COMMENT=	XFce4 print dialog
+COMMENT=	Xfce print dialog
 
 CONFIGURE_ARGS+=	--with-printcap=/etc/printcap
 
diff --git a/sysutils/xfce4-appfinder/DESCR b/sysutils/xfce4-appfinder/DESCR
index 26e45ef1ebb..f7f6fec483f 100644
--- a/sysutils/xfce4-appfinder/DESCR
+++ b/sysutils/xfce4-appfinder/DESCR
@@ -1 +1 @@
-Application finder for XFce4.
+Application finder for Xfce.
diff --git a/sysutils/xfce4-appfinder/Makefile b/sysutils/xfce4-appfinder/Makefile
index 277e1bf84f9..31535ae2399 100644
--- a/sysutils/xfce4-appfinder/Makefile
+++ b/sysutils/xfce4-appfinder/Makefile
@@ -1,10 +1,10 @@
-# $NetBSD: Makefile,v 1.1.1.1 2005/01/17 12:48:36 martti Exp $
+# $NetBSD: Makefile,v 1.2 2005/11/09 07:09:04 martti Exp $
 
 .include "../../meta-pkgs/xfce4/Makefile.common"
 
 DISTNAME=	xfce4-appfinder-${XFCE4_VERSION}
 CATEGORIES=	sysutils
-COMMENT=	XFce4 application finder
+COMMENT=	Xfce application finder
 
 .include "../../x11/libxfce4gui/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/sysutils/xfce4-cpugraph-plugin/DESCR b/sysutils/xfce4-cpugraph-plugin/DESCR
index 3346f68dae2..879cf1a5863 100644
--- a/sysutils/xfce4-cpugraph-plugin/DESCR
+++ b/sysutils/xfce4-cpugraph-plugin/DESCR
@@ -1 +1 @@
-CPU load plugin for XFce4.
+CPU load plugin for Xfce.
diff --git a/sysutils/xfce4-cpugraph-plugin/Makefile b/sysutils/xfce4-cpugraph-plugin/Makefile
index 05c130c54ec..434a76b6a51 100644
--- a/sysutils/xfce4-cpugraph-plugin/Makefile
+++ b/sysutils/xfce4-cpugraph-plugin/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.3 2004/10/03 00:18:17 tv Exp $
+# $NetBSD: Makefile,v 1.4 2005/11/09 07:09:04 martti Exp $
 
 .include "../../meta-pkgs/xfce4/Makefile.common"
 
@@ -8,7 +8,7 @@ DISTNAME=	xfce4-cpugraph-plugin-${XFCE4_VERSION}
 PKGREVISION=	1
 CATEGORIES=	sysutils
 MASTER_SITES=	http://download.berlios.de/xfce-goodies/
-COMMENT=	XFce4 CPU load plugin
+COMMENT=	Xfce CPU load plugin
 
 WRKSRC=		${WRKDIR}/xfce4-cpugraph-plugin
 
diff --git a/sysutils/xfce4-diskperf-plugin/DESCR b/sysutils/xfce4-diskperf-plugin/DESCR
index 3a495783c24..4a31f02c1c3 100644
--- a/sysutils/xfce4-diskperf-plugin/DESCR
+++ b/sysutils/xfce4-diskperf-plugin/DESCR
@@ -1 +1 @@
-Disk performance plugin for XFce4.
+Disk performance plugin for Xfce.
diff --git a/sysutils/xfce4-diskperf-plugin/Makefile b/sysutils/xfce4-diskperf-plugin/Makefile
index d1262ceae57..aab69f2b4f2 100644
--- a/sysutils/xfce4-diskperf-plugin/Makefile
+++ b/sysutils/xfce4-diskperf-plugin/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.8 2004/10/08 06:21:38 martti Exp $
+# $NetBSD: Makefile,v 1.9 2005/11/09 07:09:04 martti Exp $
 
 .include "../../meta-pkgs/xfce4/Makefile.common"
 
@@ -7,7 +7,7 @@ XFCE4_VERSION=	1.5
 DISTNAME=	xfce4-diskperf-plugin-${XFCE4_VERSION}
 CATEGORIES=	sysutils
 MASTER_SITES=	http://download.berlios.de/xfce-goodies/
-COMMENT=	XFce4 disk performance plugin
+COMMENT=	Xfce disk performance plugin
 
 .include "../../x11/xfce4-panel/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/sysutils/xfce4-fm/DESCR b/sysutils/xfce4-fm/DESCR
index b34c747dbcf..2f5647c473d 100644
--- a/sysutils/xfce4-fm/DESCR
+++ b/sysutils/xfce4-fm/DESCR
@@ -1 +1 @@
-Filemanager for XFce4.
+Filemanager for Xfce.
diff --git a/sysutils/xfce4-fm/Makefile b/sysutils/xfce4-fm/Makefile
index 5118b67fb7f..73686708d76 100644
--- a/sysutils/xfce4-fm/Makefile
+++ b/sysutils/xfce4-fm/Makefile
@@ -1,11 +1,11 @@
-# $NetBSD: Makefile,v 1.12 2005/01/17 12:56:13 martti Exp $
+# $NetBSD: Makefile,v 1.13 2005/11/09 07:09:04 martti Exp $
 
 .include "../../meta-pkgs/xfce4/Makefile.common"
 
 DISTNAME=	xffm-${XFCE4_VERSION}
 PKGNAME=	xfce4-fm-${XFCE4_VERSION}
 CATEGORIES=	sysutils
-COMMENT=	XFce4 filemanager
+COMMENT=	Xfce filemanager
 
 MESSAGE_SRC+=	${.CURDIR}/MESSAGE
 
diff --git a/sysutils/xfce4-fsguard-plugin/DESCR b/sysutils/xfce4-fsguard-plugin/DESCR
index 752702b7021..3a4d676e5d4 100644
--- a/sysutils/xfce4-fsguard-plugin/DESCR
+++ b/sysutils/xfce4-fsguard-plugin/DESCR
@@ -1 +1 @@
-Disk space plugin for XFce4.
+Disk space plugin for Xfce.
diff --git a/sysutils/xfce4-fsguard-plugin/Makefile b/sysutils/xfce4-fsguard-plugin/Makefile
index 4824556c002..12ee4982346 100644
--- a/sysutils/xfce4-fsguard-plugin/Makefile
+++ b/sysutils/xfce4-fsguard-plugin/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.1.1.1 2005/10/28 06:42:49 martti Exp $
+# $NetBSD: Makefile,v 1.2 2005/11/09 07:09:04 martti Exp $
 
 .include "../../meta-pkgs/xfce4/Makefile.common"
 
@@ -7,7 +7,7 @@ XFCE4_VERSION=	0.2.1
 DISTNAME=	xfce4-fsguard-plugin-${XFCE4_VERSION}
 CATEGORIES=	sysutils
 MASTER_SITES=	http://download.berlios.de/xfce-goodies/
-COMMENT=	XFce4 disk space plugin
+COMMENT=	Xfce disk space plugin
 
 .include "../../x11/xfce4-panel/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/sysutils/xfce4-minicmd-plugin/DESCR b/sysutils/xfce4-minicmd-plugin/DESCR
index 0a71f9084cc..f014df00970 100644
--- a/sysutils/xfce4-minicmd-plugin/DESCR
+++ b/sysutils/xfce4-minicmd-plugin/DESCR
@@ -1 +1 @@
-Command plugin for XFce4.
+Command plugin for Xfce.
diff --git a/sysutils/xfce4-minicmd-plugin/Makefile b/sysutils/xfce4-minicmd-plugin/Makefile
index d6e4102d982..4af134e967d 100644
--- a/sysutils/xfce4-minicmd-plugin/Makefile
+++ b/sysutils/xfce4-minicmd-plugin/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.10 2005/01/17 13:23:03 martti Exp $
+# $NetBSD: Makefile,v 1.11 2005/11/09 07:09:04 martti Exp $
 
 .include "../../meta-pkgs/xfce4/Makefile.common"
 
@@ -7,7 +7,7 @@ XFCE4_VERSION=	0.3.0
 DISTNAME=	xfce4-minicmd-plugin-${XFCE4_VERSION}
 CATEGORIES=	sysutils
 MASTER_SITES=	http://download.berlios.de/xfce-goodies/
-COMMENT=	XFce4 command plugin
+COMMENT=	Xfce command plugin
 
 .include "../../x11/xfce4-panel/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/sysutils/xfce4-netload-plugin/DESCR b/sysutils/xfce4-netload-plugin/DESCR
index b8d987ede8c..74496aa4112 100644
--- a/sysutils/xfce4-netload-plugin/DESCR
+++ b/sysutils/xfce4-netload-plugin/DESCR
@@ -1 +1 @@
-Network Load plugin for XFce4.
+Network Load plugin for Xfce.
diff --git a/sysutils/xfce4-netload-plugin/Makefile b/sysutils/xfce4-netload-plugin/Makefile
index d2db1a81de1..c9e594a4f6a 100644
--- a/sysutils/xfce4-netload-plugin/Makefile
+++ b/sysutils/xfce4-netload-plugin/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.11 2005/10/28 06:59:18 martti Exp $
+# $NetBSD: Makefile,v 1.12 2005/11/09 07:09:04 martti Exp $
 
 .include "../../meta-pkgs/xfce4/Makefile.common"
 
@@ -7,7 +7,7 @@ XFCE4_VERSION=	0.3.3
 DISTNAME=	xfce4-netload-plugin-${XFCE4_VERSION}
 CATEGORIES=	sysutils
 MASTER_SITES=	http://download.berlios.de/xfce-goodies/
-COMMENT=	XFce4 network load plugin
+COMMENT=	Xfce network load plugin
 
 EXTRACT_SUFX=	.tar.bz2
 
diff --git a/sysutils/xfce4-quicklauncher-plugin/DESCR b/sysutils/xfce4-quicklauncher-plugin/DESCR
index f735752e3db..e59fb1c193e 100644
--- a/sysutils/xfce4-quicklauncher-plugin/DESCR
+++ b/sysutils/xfce4-quicklauncher-plugin/DESCR
@@ -1 +1 @@
-Quicklaunch plugin for XFce4.
+Quicklaunch plugin for Xfce.
diff --git a/sysutils/xfce4-quicklauncher-plugin/Makefile b/sysutils/xfce4-quicklauncher-plugin/Makefile
index 62ae0540cc7..3ffa9332af1 100644
--- a/sysutils/xfce4-quicklauncher-plugin/Makefile
+++ b/sysutils/xfce4-quicklauncher-plugin/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.2 2005/11/03 03:10:23 minskim Exp $
+# $NetBSD: Makefile,v 1.3 2005/11/09 07:09:04 martti Exp $
 
 .include "../../meta-pkgs/xfce4/Makefile.common"
 
@@ -8,7 +8,7 @@ DISTNAME=	xfce4-quicklauncher-plugin-${XFCE4_VERSION}
 PKGREVISION=	1
 CATEGORIES=	sysutils
 MASTER_SITES=	http://download.berlios.de/xfce-goodies/
-COMMENT=	XFce4 quicklaunch plugin
+COMMENT=	Xfce quicklaunch plugin
 
 .include "../../x11/xfce4-panel/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/sysutils/xfce4-showdesktop-plugin/DESCR b/sysutils/xfce4-showdesktop-plugin/DESCR
index 4aeb73ec582..17c2dddd857 100644
--- a/sysutils/xfce4-showdesktop-plugin/DESCR
+++ b/sysutils/xfce4-showdesktop-plugin/DESCR
@@ -1 +1 @@
-Show desktop plugin for XFce4.
+Show desktop plugin for Xfce.
diff --git a/sysutils/xfce4-showdesktop-plugin/Makefile b/sysutils/xfce4-showdesktop-plugin/Makefile
index 6745421c6cc..ad699483166 100644
--- a/sysutils/xfce4-showdesktop-plugin/Makefile
+++ b/sysutils/xfce4-showdesktop-plugin/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.8 2004/11/28 09:55:49 martti Exp $
+# $NetBSD: Makefile,v 1.9 2005/11/09 07:09:04 martti Exp $
 
 .include "../../meta-pkgs/xfce4/Makefile.common"
 
@@ -7,7 +7,7 @@ XFCE4_VERSION=	0.4.0
 DISTNAME=	xfce4-showdesktop-plugin-${XFCE4_VERSION}
 CATEGORIES=	sysutils
 MASTER_SITES=	http://download.berlios.de/xfce-goodies/
-COMMENT=	XFce4 showdesktop plugin
+COMMENT=	Xfce showdesktop plugin
 
 WRKSRC=		${WRKDIR}/xfce4-showdesktop-plugin
 
diff --git a/sysutils/xfce4-systemload-plugin/DESCR b/sysutils/xfce4-systemload-plugin/DESCR
index 231947d1461..05e33c8a871 100644
--- a/sysutils/xfce4-systemload-plugin/DESCR
+++ b/sysutils/xfce4-systemload-plugin/DESCR
@@ -1 +1 @@
-System Load plugin for XFce4.
+System Load plugin for Xfce.
diff --git a/sysutils/xfce4-systemload-plugin/Makefile b/sysutils/xfce4-systemload-plugin/Makefile
index c4296a0cb04..753fa0bcf4f 100644
--- a/sysutils/xfce4-systemload-plugin/Makefile
+++ b/sysutils/xfce4-systemload-plugin/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.9 2005/09/14 11:55:57 martti Exp $
+# $NetBSD: Makefile,v 1.10 2005/11/09 07:09:05 martti Exp $
 
 .include "../../meta-pkgs/xfce4/Makefile.common"
 
@@ -8,7 +8,7 @@ DISTNAME=	xfce4-systemload-plugin-${XFCE4_VERSION}
 PKGREVISION=	1
 CATEGORIES=	sysutils
 MASTER_SITES=	http://download.berlios.de/xfce-goodies/
-COMMENT=	XFce4 system load plugin
+COMMENT=	Xfce system load plugin
 
 .include "../../x11/xfce4-panel/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/sysutils/xfce4-systray/DESCR b/sysutils/xfce4-systray/DESCR
index a03e04010ee..0c33a665a4c 100644
--- a/sysutils/xfce4-systray/DESCR
+++ b/sysutils/xfce4-systray/DESCR
@@ -1 +1 @@
-Systray plugin for XFce4.
+Systray plugin for Xfce.
diff --git a/sysutils/xfce4-systray/Makefile b/sysutils/xfce4-systray/Makefile
index 5124feea27f..28a8186d3d1 100644
--- a/sysutils/xfce4-systray/Makefile
+++ b/sysutils/xfce4-systray/Makefile
@@ -1,10 +1,10 @@
-# $NetBSD: Makefile,v 1.11 2005/01/17 12:56:13 martti Exp $
+# $NetBSD: Makefile,v 1.12 2005/11/09 07:09:05 martti Exp $
 
 .include "../../meta-pkgs/xfce4/Makefile.common"
 
 DISTNAME=	xfce4-systray-${XFCE4_VERSION}
 CATEGORIES=	sysutils
-COMMENT=	XFce4 systray plugin
+COMMENT=	Xfce systray plugin
 
 .include "../../textproc/libxml2/buildlink3.mk"
 .include "../../x11/xfce4-panel/buildlink3.mk"
diff --git a/sysutils/xfce4-xkb-plugin/DESCR b/sysutils/xfce4-xkb-plugin/DESCR
index 77d880ce32e..cf6ee73dd07 100644
--- a/sysutils/xfce4-xkb-plugin/DESCR
+++ b/sysutils/xfce4-xkb-plugin/DESCR
@@ -1 +1 @@
-Keyboard plugin for XFce4.
+Keyboard plugin for Xfce.
diff --git a/sysutils/xfce4-xkb-plugin/Makefile b/sysutils/xfce4-xkb-plugin/Makefile
index db623b379cb..22afccf6e7a 100644
--- a/sysutils/xfce4-xkb-plugin/Makefile
+++ b/sysutils/xfce4-xkb-plugin/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.3 2004/10/03 00:18:17 tv Exp $
+# $NetBSD: Makefile,v 1.4 2005/11/09 07:09:05 martti Exp $
 
 .include "../../meta-pkgs/xfce4/Makefile.common"
 
@@ -8,7 +8,7 @@ DISTNAME=	xfce4-xkb-plugin-${XFCE4_VERSION}
 PKGREVISION=	1
 CATEGORIES=	sysutils
 MASTER_SITES=	http://download.berlios.de/xfce-goodies/
-COMMENT=	XFce4 Keyboard plugin
+COMMENT=	Xfce Keyboard plugin
 
 .include "../../x11/xfce4-panel/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/time/xfce4-calendar/DESCR b/time/xfce4-calendar/DESCR
index 318860bee1c..0aa7db5c1aa 100644
--- a/time/xfce4-calendar/DESCR
+++ b/time/xfce4-calendar/DESCR
@@ -1 +1 @@
-Calendar for XFce4.
+Calendar for Xfce.
diff --git a/time/xfce4-calendar/Makefile b/time/xfce4-calendar/Makefile
index 1e7fa0367af..dc7411f1b93 100644
--- a/time/xfce4-calendar/Makefile
+++ b/time/xfce4-calendar/Makefile
@@ -1,11 +1,11 @@
-# $NetBSD: Makefile,v 1.1.1.1 2005/01/17 12:51:16 martti Exp $
+# $NetBSD: Makefile,v 1.2 2005/11/09 07:09:05 martti Exp $
 
 .include "../../meta-pkgs/xfce4/Makefile.common"
 
 DISTNAME=	xfcalendar-${XFCE4_VERSION}
 PKGNAME=	xfce4-calendar-${XFCE4_VERSION}
 CATEGORIES=	time
-COMMENT=	XFce4 calendar
+COMMENT=	Xfce calendar
 
 .include "../../databases/dbh/buildlink3.mk"
 .include "../../x11/xfce4-mcs-plugins/buildlink3.mk"
diff --git a/time/xfce4-datetime-plugin/DESCR b/time/xfce4-datetime-plugin/DESCR
index faa88dcf6c2..9ba75f1abef 100644
--- a/time/xfce4-datetime-plugin/DESCR
+++ b/time/xfce4-datetime-plugin/DESCR
@@ -1 +1 @@
-Calendar plugin for XFce4.
+Calendar plugin for Xfce.
diff --git a/time/xfce4-datetime-plugin/Makefile b/time/xfce4-datetime-plugin/Makefile
index 1509fcbe855..fb0d8c1ded1 100644
--- a/time/xfce4-datetime-plugin/Makefile
+++ b/time/xfce4-datetime-plugin/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.9 2004/10/08 06:23:08 martti Exp $
+# $NetBSD: Makefile,v 1.10 2005/11/09 07:09:05 martti Exp $
 
 .include "../../meta-pkgs/xfce4/Makefile.common"
 
@@ -7,7 +7,7 @@ XFCE4_VERSION=	0.3.1
 DISTNAME=	xfce4-datetime-plugin-${XFCE4_VERSION}
 CATEGORIES=	time
 MASTER_SITES=	http://download.berlios.de/xfce-goodies/
-COMMENT=	XFce4 calendar plugin
+COMMENT=	Xfce calendar plugin
 
 .include "../../x11/xfce4-panel/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/wm/xfce4-wm-themes/DESCR b/wm/xfce4-wm-themes/DESCR
index ec75d8c6700..d7819c9b659 100644
--- a/wm/xfce4-wm-themes/DESCR
+++ b/wm/xfce4-wm-themes/DESCR
@@ -1 +1 @@
-Additional window manager themes for XFce4.
+Additional window manager themes for Xfce.
diff --git a/wm/xfce4-wm-themes/Makefile b/wm/xfce4-wm-themes/Makefile
index 291fd4047f6..52947599b59 100644
--- a/wm/xfce4-wm-themes/Makefile
+++ b/wm/xfce4-wm-themes/Makefile
@@ -1,11 +1,11 @@
-# $NetBSD: Makefile,v 1.9 2005/01/17 12:56:13 martti Exp $
+# $NetBSD: Makefile,v 1.10 2005/11/09 07:09:05 martti Exp $
 
 .include "../../meta-pkgs/xfce4/Makefile.common"
 
 DISTNAME=	xfwm4-themes-${XFCE4_VERSION}
 PKGNAME=	xfce4-wm-themes-${XFCE4_VERSION}
 CATEGORIES=	wm
-COMMENT=	XFce4 window manager themes
+COMMENT=	Xfce window manager themes
 
 .include "../../wm/xfce4-wm/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/wm/xfce4-wm/DESCR b/wm/xfce4-wm/DESCR
index 95141d2d6fc..f6a19ca9c74 100644
--- a/wm/xfce4-wm/DESCR
+++ b/wm/xfce4-wm/DESCR
@@ -1 +1 @@
-Window manager for XFce4.
+Window manager for Xfce.
diff --git a/wm/xfce4-wm/Makefile b/wm/xfce4-wm/Makefile
index 6751e2d89cc..0efd25a9570 100644
--- a/wm/xfce4-wm/Makefile
+++ b/wm/xfce4-wm/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.11 2005/11/09 06:42:58 martti Exp $
+# $NetBSD: Makefile,v 1.12 2005/11/09 07:09:05 martti Exp $
 
 .include "../../meta-pkgs/xfce4/Makefile.common"
 
@@ -7,7 +7,7 @@ XFCE4_VERSION=	4.2.3.1
 DISTNAME=	xfwm4-${XFCE4_VERSION}
 PKGNAME=	xfce4-wm-${XFCE4_VERSION}
 CATEGORIES=	wm
-COMMENT=	XFce4 window manager
+COMMENT=	Xfce window manager
 
 .include "../../graphics/xpm/buildlink3.mk"
 .include "../../x11/xfce4-mcs-plugins/buildlink3.mk"
diff --git a/x11/libxfce4gui/DESCR b/x11/libxfce4gui/DESCR
index a91ae11148f..59b2d79f1e7 100644
--- a/x11/libxfce4gui/DESCR
+++ b/x11/libxfce4gui/DESCR
@@ -1 +1 @@
-Widget library for XFce4.
+Widget library for Xfce.
diff --git a/x11/libxfce4gui/Makefile b/x11/libxfce4gui/Makefile
index a670a488f42..cdfe92c7d39 100644
--- a/x11/libxfce4gui/Makefile
+++ b/x11/libxfce4gui/Makefile
@@ -1,11 +1,11 @@
-# $NetBSD: Makefile,v 1.13 2005/11/09 06:42:58 martti Exp $
+# $NetBSD: Makefile,v 1.14 2005/11/09 07:09:05 martti Exp $
 
 .include "../../meta-pkgs/xfce4/Makefile.common"
 
 DISTNAME=	libxfcegui4-${XFCE4_VERSION}
 PKGNAME=	libxfce4gui-${XFCE4_VERSION}
 CATEGORIES=	x11
-COMMENT=	XFce4 widget library
+COMMENT=	Xfce widget library
 
 #PKGREVISION=	1
 
diff --git a/x11/libxfce4mcs/DESCR b/x11/libxfce4mcs/DESCR
index 5cf3f98c7db..f45b5bf8b20 100644
--- a/x11/libxfce4mcs/DESCR
+++ b/x11/libxfce4mcs/DESCR
@@ -1 +1 @@
-Settings management library for XFce4.
+Settings management library for Xfce.
diff --git a/x11/libxfce4mcs/Makefile b/x11/libxfce4mcs/Makefile
index 3551c5060b6..4adf00c9653 100644
--- a/x11/libxfce4mcs/Makefile
+++ b/x11/libxfce4mcs/Makefile
@@ -1,10 +1,10 @@
-# $NetBSD: Makefile,v 1.7 2005/11/09 06:42:59 martti Exp $
+# $NetBSD: Makefile,v 1.8 2005/11/09 07:09:05 martti Exp $
 
 .include "../../meta-pkgs/xfce4/Makefile.common"
 
 DISTNAME=	libxfce4mcs-${XFCE4_VERSION}
 CATEGORIES=	x11
-COMMENT=	XFce4 settings management library
+COMMENT=	Xfce settings management library
 
 #PKGREVISION=	1
 
diff --git a/x11/libxfce4util/DESCR b/x11/libxfce4util/DESCR
index 2f9c9499561..9e7b4a9fc64 100644
--- a/x11/libxfce4util/DESCR
+++ b/x11/libxfce4util/DESCR
@@ -1 +1 @@
-Basic utility library for XFce4.
+Basic utility library for Xfce.
diff --git a/x11/libxfce4util/Makefile b/x11/libxfce4util/Makefile
index 92d5a99f125..ae8854f308f 100644
--- a/x11/libxfce4util/Makefile
+++ b/x11/libxfce4util/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.6 2005/11/09 06:42:59 martti Exp $
+# $NetBSD: Makefile,v 1.7 2005/11/09 07:09:05 martti Exp $
 
 .include "../../meta-pkgs/xfce4/Makefile.common"
 
@@ -7,7 +7,7 @@ XFCE4_VERSION=	4.2.3.1
 DISTNAME=	libxfce4util-${XFCE4_VERSION}
 #PKGREVISION=	1
 CATEGORIES=	x11
-COMMENT=	XFce4 basic library
+COMMENT=	Xfce basic library
 
 CONFIGURE_ARGS+=	--with-html-dir=${PREFIX}/share/doc/html
 
diff --git a/x11/xfce4-clipman-plugin/DESCR b/x11/xfce4-clipman-plugin/DESCR
index 27baa458049..f37886152da 100644
--- a/x11/xfce4-clipman-plugin/DESCR
+++ b/x11/xfce4-clipman-plugin/DESCR
@@ -1 +1 @@
-Clipboard plugin for XFce4.
+Clipboard plugin for Xfce.
diff --git a/x11/xfce4-clipman-plugin/Makefile b/x11/xfce4-clipman-plugin/Makefile
index bd6810e1958..ffd0548899c 100644
--- a/x11/xfce4-clipman-plugin/Makefile
+++ b/x11/xfce4-clipman-plugin/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.8 2004/10/08 06:23:36 martti Exp $
+# $NetBSD: Makefile,v 1.9 2005/11/09 07:09:05 martti Exp $
 
 .include "../../meta-pkgs/xfce4/Makefile.common"
 
@@ -7,7 +7,7 @@ XFCE4_VERSION=	0.4.1
 DISTNAME=	xfce4-clipman-plugin-${XFCE4_VERSION}
 CATEGORIES=	sysutils
 MASTER_SITES=	http://download.berlios.de/xfce-goodies/
-COMMENT=	XFce4 clipboard plugin
+COMMENT=	Xfce clipboard plugin
 
 .include "../../x11/xfce4-panel/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/x11/xfce4-desktop/DESCR b/x11/xfce4-desktop/DESCR
index b6339b757b8..68ced69aa20 100644
--- a/x11/xfce4-desktop/DESCR
+++ b/x11/xfce4-desktop/DESCR
@@ -1 +1 @@
-Desktop background manager for XFce4.
+Desktop background manager for Xfce.
diff --git a/x11/xfce4-desktop/Makefile b/x11/xfce4-desktop/Makefile
index 8aca9555afb..aa700e7fc9e 100644
--- a/x11/xfce4-desktop/Makefile
+++ b/x11/xfce4-desktop/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.14 2005/11/09 06:42:59 martti Exp $
+# $NetBSD: Makefile,v 1.15 2005/11/09 07:09:05 martti Exp $
 
 .include "../../meta-pkgs/xfce4/Makefile.common"
 
@@ -6,7 +6,7 @@ DISTNAME=	xfdesktop-${XFCE4_VERSION}
 PKGNAME=	xfce4-desktop-${XFCE4_VERSION}
 #PKGREVISION=	1
 CATEGORIES=	x11
-COMMENT=	XFce4 desktop background manager
+COMMENT=	Xfce desktop background manager
 
 USE_PKGINSTALL=		yes
 
diff --git a/x11/xfce4-gtk2-engines/DESCR b/x11/xfce4-gtk2-engines/DESCR
index 80f7f0bfb10..d6abd0b1a4f 100644
--- a/x11/xfce4-gtk2-engines/DESCR
+++ b/x11/xfce4-gtk2-engines/DESCR
@@ -1 +1 @@
-GTK2 theme engine for XFce4.
+GTK2 theme engine for Xfce.
diff --git a/x11/xfce4-gtk2-engines/Makefile b/x11/xfce4-gtk2-engines/Makefile
index ca619743a2a..22cf514429f 100644
--- a/x11/xfce4-gtk2-engines/Makefile
+++ b/x11/xfce4-gtk2-engines/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.20 2005/11/09 06:42:59 martti Exp $
+# $NetBSD: Makefile,v 1.21 2005/11/09 07:09:05 martti Exp $
 #
 
 .include "../../meta-pkgs/xfce4/Makefile.common"
@@ -9,7 +9,7 @@ DISTNAME=	gtk-xfce-engine-${XFCE4_VERSION}
 PKGNAME=	xfce4-gtk2-engine-${XFCE4_VERSION}
 #PKGREVISION=	1
 CATEGORIES=	x11
-COMMENT=	XFce4 GTK2 themes
+COMMENT=	Xfce GTK2 themes
 
 USE_DIRS+=	xdg-1.1
 
diff --git a/x11/xfce4-mcs-manager/DESCR b/x11/xfce4-mcs-manager/DESCR
index 541f847ffad..37312fba43e 100644
--- a/x11/xfce4-mcs-manager/DESCR
+++ b/x11/xfce4-mcs-manager/DESCR
@@ -1,2 +1,2 @@
-The XFce 4 settings manager provides access to the settings of
-all XFce 4 components.
+The Xfce settings manager provides access to the settings of
+all Xfce components.
diff --git a/x11/xfce4-mcs-manager/Makefile b/x11/xfce4-mcs-manager/Makefile
index e2e4dd0d83f..19146eb66de 100644
--- a/x11/xfce4-mcs-manager/Makefile
+++ b/x11/xfce4-mcs-manager/Makefile
@@ -1,11 +1,11 @@
-# $NetBSD: Makefile,v 1.11 2005/01/17 12:56:13 martti Exp $
+# $NetBSD: Makefile,v 1.12 2005/11/09 07:09:05 martti Exp $
 
 .include "../../meta-pkgs/xfce4/Makefile.common"
 
 DISTNAME=	xfce-mcs-manager-${XFCE4_VERSION}
 PKGNAME=	xfce4-mcs-manager-${XFCE4_VERSION}
 CATEGORIES=	x11
-COMMENT=	XFce4 settings manager
+COMMENT=	Xfce settings manager
 
 PKGCONFIG_OVERRIDE=	xfce-mcs-manager/xfce-mcs-manager.pc.in
 PTHREAD_AUTO_VARS=	yes
diff --git a/x11/xfce4-mcs-plugins/DESCR b/x11/xfce4-mcs-plugins/DESCR
index 6e47bb21b69..aede338368c 100644
--- a/x11/xfce4-mcs-plugins/DESCR
+++ b/x11/xfce4-mcs-plugins/DESCR
@@ -1 +1 @@
-Settings manager plugins for XFce4.
+Settings manager plugins for Xfce.
diff --git a/x11/xfce4-mcs-plugins/Makefile b/x11/xfce4-mcs-plugins/Makefile
index 89e3af785a0..d33084a88c5 100644
--- a/x11/xfce4-mcs-plugins/Makefile
+++ b/x11/xfce4-mcs-plugins/Makefile
@@ -1,11 +1,11 @@
-# $NetBSD: Makefile,v 1.8 2005/01/17 12:56:13 martti Exp $
+# $NetBSD: Makefile,v 1.9 2005/11/09 07:09:05 martti Exp $
 
 .include "../../meta-pkgs/xfce4/Makefile.common"
 
 DISTNAME=	xfce-mcs-plugins-${XFCE4_VERSION}
 PKGNAME=	xfce4-mcs-plugins-${XFCE4_VERSION}
 CATEGORIES=	x11
-COMMENT=	XFce4 settings manager plugins
+COMMENT=	Xfce settings manager plugins
 
 .include "../../x11/xfce4-mcs-manager/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/x11/xfce4-notes-plugin/DESCR b/x11/xfce4-notes-plugin/DESCR
index 825ec34ee79..34d90ef4c0d 100644
--- a/x11/xfce4-notes-plugin/DESCR
+++ b/x11/xfce4-notes-plugin/DESCR
@@ -1 +1 @@
-Notes plugin for XFce4.
+Notes plugin for Xfce.
diff --git a/x11/xfce4-notes-plugin/Makefile b/x11/xfce4-notes-plugin/Makefile
index ad52a7b9ab5..f90652c3501 100644
--- a/x11/xfce4-notes-plugin/Makefile
+++ b/x11/xfce4-notes-plugin/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.8 2005/10/28 07:03:31 martti Exp $
+# $NetBSD: Makefile,v 1.9 2005/11/09 07:09:05 martti Exp $
 
 .include "../../meta-pkgs/xfce4/Makefile.common"
 
@@ -7,7 +7,7 @@ XFCE4_VERSION=	0.11.1
 DISTNAME=	xfce4-notes-plugin-${XFCE4_VERSION}
 CATEGORIES=	sysutils
 MASTER_SITES=	http://download.berlios.de/xfce-goodies/
-COMMENT=	XFce4 notes plugin
+COMMENT=	Xfce notes plugin
 
 .include "../../x11/xfce4-panel/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/x11/xfce4-panel/DESCR b/x11/xfce4-panel/DESCR
index f73fe709533..fb7e5aad838 100644
--- a/x11/xfce4-panel/DESCR
+++ b/x11/xfce4-panel/DESCR
@@ -1 +1 @@
-GTK2 based panel for XFce4.
+GTK2 based panel for Xfce.
diff --git a/x11/xfce4-panel/Makefile b/x11/xfce4-panel/Makefile
index 48d438f2ac4..d0f1cca1086 100644
--- a/x11/xfce4-panel/Makefile
+++ b/x11/xfce4-panel/Makefile
@@ -1,11 +1,11 @@
-# $NetBSD: Makefile,v 1.19 2005/11/09 06:42:59 martti Exp $
+# $NetBSD: Makefile,v 1.20 2005/11/09 07:09:05 martti Exp $
 
 .include "../../meta-pkgs/xfce4/Makefile.common"
 
 DISTNAME=	xfce4-panel-${XFCE4_VERSION}
 #PKGREVISION=	1
 CATEGORIES=	x11
-COMMENT=	XFce4 panel
+COMMENT=	Xfce panel
 
 PKGCONFIG_OVERRIDE=	panel/xfce4-panel-1.0.pc.in
 PTHREAD_AUTO_VARS=	yes
diff --git a/x11/xfce4-session/DESCR b/x11/xfce4-session/DESCR
index 257eebd41f3..fba3a1d325f 100644
--- a/x11/xfce4-session/DESCR
+++ b/x11/xfce4-session/DESCR
@@ -1 +1 @@
-Session manager for XFce4.
+Session manager for Xfce.
diff --git a/x11/xfce4-session/Makefile b/x11/xfce4-session/Makefile
index 39eb8f8c814..62043f7ab18 100644
--- a/x11/xfce4-session/Makefile
+++ b/x11/xfce4-session/Makefile
@@ -1,11 +1,11 @@
-# $NetBSD: Makefile,v 1.5 2005/11/09 06:42:59 martti Exp $
+# $NetBSD: Makefile,v 1.6 2005/11/09 07:09:05 martti Exp $
 
 .include "../../meta-pkgs/xfce4/Makefile.common"
 
 DISTNAME=	xfce4-session-${XFCE4_VERSION}
 #PKGREVISION=	1
 CATEGORIES=	x11
-COMMENT=	XFce4 session manager
+COMMENT=	Xfce session manager
 
 USE_PKGINSTALL=	yes
 
diff --git a/x11/xfce4-taskbar-plugin/DESCR b/x11/xfce4-taskbar-plugin/DESCR
index d94691c47e8..f632c8fe851 100644
--- a/x11/xfce4-taskbar-plugin/DESCR
+++ b/x11/xfce4-taskbar-plugin/DESCR
@@ -1 +1 @@
-Taskbar plugin for XFce4.
+Taskbar plugin for Xfce.
diff --git a/x11/xfce4-taskbar-plugin/Makefile b/x11/xfce4-taskbar-plugin/Makefile
index 2313a3a8e4c..125ebe9c4b0 100644
--- a/x11/xfce4-taskbar-plugin/Makefile
+++ b/x11/xfce4-taskbar-plugin/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.5 2005/01/17 13:20:22 martti Exp $
+# $NetBSD: Makefile,v 1.6 2005/11/09 07:09:05 martti Exp $
 
 .include "../../meta-pkgs/xfce4/Makefile.common"
 
@@ -7,7 +7,7 @@ XFCE4_VERSION=	0.2.2
 DISTNAME=	xfce4-taskbar-plugin-${XFCE4_VERSION}
 CATEGORIES=	sysutils
 MASTER_SITES=	http://download.berlios.de/xfce-goodies/
-COMMENT=	XFce4 taskbar plugin
+COMMENT=	Xfce taskbar plugin
 
 .include "../../x11/xfce4-panel/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/x11/xfce4-toys/DESCR b/x11/xfce4-toys/DESCR
index eee5965be22..0639fe6d7f9 100644
--- a/x11/xfce4-toys/DESCR
+++ b/x11/xfce4-toys/DESCR
@@ -1 +1 @@
-Additional toys for XFce4.
+Additional toys for Xfce.
diff --git a/x11/xfce4-toys/Makefile b/x11/xfce4-toys/Makefile
index 2e6e161fa15..0374b68d17b 100644
--- a/x11/xfce4-toys/Makefile
+++ b/x11/xfce4-toys/Makefile
@@ -1,10 +1,10 @@
-# $NetBSD: Makefile,v 1.11 2005/01/17 12:56:14 martti Exp $
+# $NetBSD: Makefile,v 1.12 2005/11/09 07:09:05 martti Exp $
 
 .include "../../meta-pkgs/xfce4/Makefile.common"
 
 DISTNAME=	xfce4-toys-${XFCE4_VERSION}
 CATEGORIES=	x11
-COMMENT=	XFce4 toys
+COMMENT=	Xfce toys
 
 .include "../../textproc/libxml2/buildlink3.mk"
 .include "../../x11/xfce4-panel/buildlink3.mk"
diff --git a/x11/xfce4-trigger-launcher/DESCR b/x11/xfce4-trigger-launcher/DESCR
index 0407c5afe5a..56b2d8231f0 100644
--- a/x11/xfce4-trigger-launcher/DESCR
+++ b/x11/xfce4-trigger-launcher/DESCR
@@ -1 +1 @@
-Trigger launcher for XFce4.
+Trigger launcher for Xfce.
diff --git a/x11/xfce4-trigger-launcher/Makefile b/x11/xfce4-trigger-launcher/Makefile
index 9b82c8a1d7b..8257d3a8e67 100644
--- a/x11/xfce4-trigger-launcher/Makefile
+++ b/x11/xfce4-trigger-launcher/Makefile
@@ -1,10 +1,10 @@
-# $NetBSD: Makefile,v 1.11 2005/01/17 12:56:14 martti Exp $
+# $NetBSD: Makefile,v 1.12 2005/11/09 07:09:05 martti Exp $
 
 .include "../../meta-pkgs/xfce4/Makefile.common"
 
 DISTNAME=	xfce4-trigger-launcher-${XFCE4_VERSION}
 CATEGORIES=	x11
-COMMENT=	XFce4 trigger-launcher
+COMMENT=	Xfce trigger-launcher
 
 .include "../../x11/xfce4-panel/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/x11/xfce4-utils/DESCR b/x11/xfce4-utils/DESCR
index 03fb935eb30..e258135e72b 100644
--- a/x11/xfce4-utils/DESCR
+++ b/x11/xfce4-utils/DESCR
@@ -1 +1 @@
-Utilities for XFce4.
+Utilities for Xfce.
diff --git a/x11/xfce4-utils/Makefile b/x11/xfce4-utils/Makefile
index ebf4fdbad67..2c6cedad9c3 100644
--- a/x11/xfce4-utils/Makefile
+++ b/x11/xfce4-utils/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.16 2005/11/09 06:42:59 martti Exp $
+# $NetBSD: Makefile,v 1.17 2005/11/09 07:09:05 martti Exp $
 
 .include "../../meta-pkgs/xfce4/Makefile.common"
 
@@ -6,7 +6,7 @@ DISTNAME=	xfce-utils-${XFCE4_VERSION}
 PKGNAME=	xfce4-utils-${XFCE4_VERSION}
 #PKGREVISION=	1
 CATEGORIES=	x11
-COMMENT=	XFce4 utilities
+COMMENT=	Xfce utilities
 
 USE_PKGINSTALL=		yes
 
diff --git a/x11/xfce4-windowlist-plugin/DESCR b/x11/xfce4-windowlist-plugin/DESCR
index 7e79b37f9ec..f07e423555b 100644
--- a/x11/xfce4-windowlist-plugin/DESCR
+++ b/x11/xfce4-windowlist-plugin/DESCR
@@ -1 +1 @@
-Window list plugin for XFce4.
+Window list plugin for Xfce.
diff --git a/x11/xfce4-windowlist-plugin/Makefile b/x11/xfce4-windowlist-plugin/Makefile
index 890b40e0cd1..8106f2e19fd 100644
--- a/x11/xfce4-windowlist-plugin/Makefile
+++ b/x11/xfce4-windowlist-plugin/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.2 2004/10/03 00:18:39 tv Exp $
+# $NetBSD: Makefile,v 1.3 2005/11/09 07:09:06 martti Exp $
 
 .include "../../meta-pkgs/xfce4/Makefile.common"
 
@@ -8,7 +8,7 @@ DISTNAME=	xfce4-windowlist-plugin-${XFCE4_VERSION}
 PKGREVISION=	1
 CATEGORIES=	x11
 MASTER_SITES=	http://download.berlios.de/xfce-goodies/
-COMMENT=	XFce4 window list plugin
+COMMENT=	Xfce window list plugin
 
 WRKSRC=		${WRKDIR}/xfce4-windowlist-plugin