diff --git a/x11/xfce4/applications/Makefile.inc b/x11/xfce4/applications/Makefile.inc
index 1c17db9fb62..f78730c1f5d 100644
--- a/x11/xfce4/applications/Makefile.inc
+++ b/x11/xfce4/applications/Makefile.inc
@@ -1,8 +1,8 @@
-V?=	4.0.3
+V?=	4.0.5
 
 CATEGORIES?=	x11 x11/xfce4 x11/xfce4/applications
 
-MASTER_SITES?=	http://www.xfce.org/archive/xfce-${V}/src/
+MASTER_SITES?=	http://hannelore.f1.fhtw-berlin.de/mirrors/xfce4/xfce-${V}/src/
 DIST_SUBDIR?=	xfce4
 
 HOMEPAGE?=	http://xfce.org/index.php?page=overview
@@ -14,6 +14,7 @@ MAINTAINER?=	Jolan Luff <jolan@openbsd.org>
 # GPL:
 #	xfcalendar
 #	xfce4-iconbox
+#	xfce4-menueditor
 PERMIT_DISTFILES_CDROM?=Yes
 PERMIT_DISTFILES_FTP?=	Yes
 PERMIT_PACKAGE_CDROM?=	Yes
diff --git a/x11/xfce4/applications/xfcalendar/Makefile b/x11/xfce4/applications/xfcalendar/Makefile
index 90f3903427b..9b7a0a0d676 100644
--- a/x11/xfce4/applications/xfcalendar/Makefile
+++ b/x11/xfce4/applications/xfcalendar/Makefile
@@ -1,7 +1,7 @@
-# $OpenBSD: Makefile,v 1.1.1.1 2004/01/15 01:16:20 jolan Exp $
+# $OpenBSD: Makefile,v 1.2 2004/04/18 00:28:57 jolan Exp $
 
 COMMENT=	"time-managing application for xfce4"
-DISTNAME=	 xfcalendar-0.1.5
+DISTNAME=	 xfcalendar-0.1.8
 
 LIB_DEPENDS+=	dbh.1.0.::databases/dbh
 
diff --git a/x11/xfce4/applications/xfcalendar/distinfo b/x11/xfce4/applications/xfcalendar/distinfo
index 9dacfea0ff3..16c580377fa 100644
--- a/x11/xfce4/applications/xfcalendar/distinfo
+++ b/x11/xfce4/applications/xfcalendar/distinfo
@@ -1,3 +1,3 @@
-MD5 (xfce4/xfcalendar-0.1.5.tar.gz) = e08db4fa5f2486f3bbb8414036be22e4
-RMD160 (xfce4/xfcalendar-0.1.5.tar.gz) = 4b6fbe41b96a61f4e1bdfdb40dafc1d008125bbb
-SHA1 (xfce4/xfcalendar-0.1.5.tar.gz) = b5c18ee4d1bd5614bcafd781de64c668462981b2
+MD5 (xfce4/xfcalendar-0.1.8.tar.gz) = 83c615bb78d1782ff3589451bf30c8a7
+RMD160 (xfce4/xfcalendar-0.1.8.tar.gz) = ad4c885f5812208199683de6e8b7bc3e12d24887
+SHA1 (xfce4/xfcalendar-0.1.8.tar.gz) = 3b6d6e263af76057ec31c4751ed53f6270fcdf91
diff --git a/x11/xfce4/applications/xfcalendar/pkg/PLIST b/x11/xfce4/applications/xfcalendar/pkg/PLIST
index 754734e0cf5..50d03fe1781 100644
--- a/x11/xfce4/applications/xfcalendar/pkg/PLIST
+++ b/x11/xfce4/applications/xfcalendar/pkg/PLIST
@@ -1,19 +1,25 @@
-@comment $OpenBSD: PLIST,v 1.1.1.1 2004/01/15 01:16:20 jolan Exp $
+@comment $OpenBSD: PLIST,v 1.2 2004/04/18 00:28:57 jolan Exp $
 bin/xfcalendar
 lib/xfce4/mcs-plugins/xfcalendar_plugin.a
 lib/xfce4/mcs-plugins/xfcalendar_plugin.la
 lib/xfce4/mcs-plugins/xfcalendar_plugin.so
+share/locale/ar/LC_MESSAGES/xfcalendar.mo
 share/locale/az/LC_MESSAGES/xfcalendar.mo
+share/locale/bg/LC_MESSAGES/xfcalendar.mo
 share/locale/ca/LC_MESSAGES/xfcalendar.mo
 share/locale/cs/LC_MESSAGES/xfcalendar.mo
 share/locale/de/LC_MESSAGES/xfcalendar.mo
+share/locale/es/LC_MESSAGES/xfcalendar.mo
+share/locale/fa_IR/LC_MESSAGES/xfcalendar.mo
 share/locale/fr/LC_MESSAGES/xfcalendar.mo
 share/locale/hi/LC_MESSAGES/xfcalendar.mo
+share/locale/it/LC_MESSAGES/xfcalendar.mo
 share/locale/ko/LC_MESSAGES/xfcalendar.mo
 share/locale/ms/LC_MESSAGES/xfcalendar.mo
 share/locale/nl/LC_MESSAGES/xfcalendar.mo
 share/locale/no/LC_MESSAGES/xfcalendar.mo
 share/locale/pl/LC_MESSAGES/xfcalendar.mo
+share/locale/pt_BR/LC_MESSAGES/xfcalendar.mo
 share/locale/ru/LC_MESSAGES/xfcalendar.mo
 share/locale/sv/LC_MESSAGES/xfcalendar.mo
 share/locale/ta/LC_MESSAGES/xfcalendar.mo
diff --git a/x11/xfce4/applications/xfce4-iconbox/distinfo b/x11/xfce4/applications/xfce4-iconbox/distinfo
index 9bd5df033fa..7c0cc1873c5 100644
--- a/x11/xfce4/applications/xfce4-iconbox/distinfo
+++ b/x11/xfce4/applications/xfce4-iconbox/distinfo
@@ -1,3 +1,3 @@
-MD5 (xfce4/xfce4-iconbox-4.0.3.tar.gz) = edb216f7ed353895c622135cac28927e
-RMD160 (xfce4/xfce4-iconbox-4.0.3.tar.gz) = 43c406230aedd1a0f3dbd2779cc102afce0e7290
-SHA1 (xfce4/xfce4-iconbox-4.0.3.tar.gz) = bab303556926f61862a3437e67eaebc3110b6d9d
+MD5 (xfce4/xfce4-iconbox-4.0.5.tar.gz) = 8951437cc7c9166ca0856adb8da14e0d
+RMD160 (xfce4/xfce4-iconbox-4.0.5.tar.gz) = 0af745ee7cc91350ef1234f3e5a0ee37c2d0e9a8
+SHA1 (xfce4/xfce4-iconbox-4.0.5.tar.gz) = 25b11a03cfeddea57cc2b3fac153542b40a52296
diff --git a/x11/xfce4/applications/xfce4-iconbox/pkg/PLIST b/x11/xfce4/applications/xfce4-iconbox/pkg/PLIST
index 36866a0ec68..4b9f0fd0565 100644
--- a/x11/xfce4/applications/xfce4-iconbox/pkg/PLIST
+++ b/x11/xfce4/applications/xfce4-iconbox/pkg/PLIST
@@ -1,4 +1,4 @@
-@comment $OpenBSD: PLIST,v 1.3 2004/01/09 01:27:42 jolan Exp $
+@comment $OpenBSD: PLIST,v 1.4 2004/04/18 00:28:57 jolan Exp $
 bin/xfce4-iconbox
 lib/xfce4/mcs-plugins/xfce4-iconbox_settings.a
 lib/xfce4/mcs-plugins/xfce4-iconbox_settings.la
@@ -9,6 +9,7 @@ share/locale/cs/LC_MESSAGES/xfce4-iconbox.mo
 share/locale/de/LC_MESSAGES/xfce4-iconbox.mo
 share/locale/es/LC_MESSAGES/xfce4-iconbox.mo
 share/locale/es_MX/LC_MESSAGES/xfce4-iconbox.mo
+share/locale/fa_IR/LC_MESSAGES/xfce4-iconbox.mo
 share/locale/fr/LC_MESSAGES/xfce4-iconbox.mo
 share/locale/hi/LC_MESSAGES/xfce4-iconbox.mo
 share/locale/hu/LC_MESSAGES/xfce4-iconbox.mo
@@ -19,6 +20,7 @@ share/locale/ms/LC_MESSAGES/xfce4-iconbox.mo
 share/locale/nl/LC_MESSAGES/xfce4-iconbox.mo
 share/locale/no/LC_MESSAGES/xfce4-iconbox.mo
 share/locale/pl/LC_MESSAGES/xfce4-iconbox.mo
+share/locale/pt_BR/LC_MESSAGES/xfce4-iconbox.mo
 share/locale/pt_PT/LC_MESSAGES/xfce4-iconbox.mo
 share/locale/ru/LC_MESSAGES/xfce4-iconbox.mo
 share/locale/sv/LC_MESSAGES/xfce4-iconbox.mo
diff --git a/x11/xfce4/desktop/Makefile.inc b/x11/xfce4/desktop/Makefile.inc
index ff44cea7625..9f9f94f4ebe 100644
--- a/x11/xfce4/desktop/Makefile.inc
+++ b/x11/xfce4/desktop/Makefile.inc
@@ -1,8 +1,8 @@
-V?=		4.0.3
+V?=		4.0.5
 
 CATEGORIES?=	x11 x11/xfce4 x11/xfce4/desktop
 
-MASTER_SITES?=	http://www.xfce.org/archive/xfce-${V}/src/
+MASTER_SITES?=	http://hannelore.f1.fhtw-berlin.de/mirrors/xfce4/xfce-${V}/src/
 DIST_SUBDIR?=	xfce4
 
 HOMEPAGE?=	http://www.xfce.org/
diff --git a/x11/xfce4/desktop/xfce-mcs-manager/distinfo b/x11/xfce4/desktop/xfce-mcs-manager/distinfo
index 039bc167111..9f0fc861b02 100644
--- a/x11/xfce4/desktop/xfce-mcs-manager/distinfo
+++ b/x11/xfce4/desktop/xfce-mcs-manager/distinfo
@@ -1,3 +1,3 @@
-MD5 (xfce4/xfce-mcs-manager-4.0.3.tar.gz) = 565be534261f16e936207eb75b5da203
-RMD160 (xfce4/xfce-mcs-manager-4.0.3.tar.gz) = 628ff7417413f2abbaa98328588a617f7beabaaf
-SHA1 (xfce4/xfce-mcs-manager-4.0.3.tar.gz) = a4a125348cf4af37128a29aaea64097fbbc74d83
+MD5 (xfce4/xfce-mcs-manager-4.0.5.tar.gz) = 7b56465800c3c5665caf5c48f21f5087
+RMD160 (xfce4/xfce-mcs-manager-4.0.5.tar.gz) = c2075986374ab555e4a13b6fdc5e54a052990ab4
+SHA1 (xfce4/xfce-mcs-manager-4.0.5.tar.gz) = 1d89232284964b32ba6ca9d4921d779127232028
diff --git a/x11/xfce4/desktop/xfce-mcs-manager/pkg/PLIST b/x11/xfce4/desktop/xfce-mcs-manager/pkg/PLIST
index 2d0ce7a9afe..ddfa33c4e6c 100644
--- a/x11/xfce4/desktop/xfce-mcs-manager/pkg/PLIST
+++ b/x11/xfce4/desktop/xfce-mcs-manager/pkg/PLIST
@@ -1,15 +1,17 @@
-@comment $OpenBSD: PLIST,v 1.3 2004/01/09 01:27:42 jolan Exp $
+@comment $OpenBSD: PLIST,v 1.4 2004/04/18 00:28:57 jolan Exp $
 bin/xfce-mcs-manager
 bin/xfce-setting-show
 include/xfce4/xfce-mcs-manager/manager-plugin.h
 lib/pkgconfig/xfce-mcs-manager.pc
 share/locale/ar/LC_MESSAGES/xfce-mcs-manager.mo
 share/locale/az/LC_MESSAGES/xfce-mcs-manager.mo
+share/locale/bg/LC_MESSAGES/xfce-mcs-manager.mo
 share/locale/ca/LC_MESSAGES/xfce-mcs-manager.mo
 share/locale/cs/LC_MESSAGES/xfce-mcs-manager.mo
 share/locale/de/LC_MESSAGES/xfce-mcs-manager.mo
 share/locale/es/LC_MESSAGES/xfce-mcs-manager.mo
 share/locale/es_MX/LC_MESSAGES/xfce-mcs-manager.mo
+share/locale/fa_IR/LC_MESSAGES/xfce-mcs-manager.mo
 share/locale/fi/LC_MESSAGES/xfce-mcs-manager.mo
 share/locale/fr/LC_MESSAGES/xfce-mcs-manager.mo
 share/locale/hi/LC_MESSAGES/xfce-mcs-manager.mo
@@ -22,6 +24,7 @@ share/locale/ms/LC_MESSAGES/xfce-mcs-manager.mo
 share/locale/nl/LC_MESSAGES/xfce-mcs-manager.mo
 share/locale/no/LC_MESSAGES/xfce-mcs-manager.mo
 share/locale/pl/LC_MESSAGES/xfce-mcs-manager.mo
+share/locale/pt_BR/LC_MESSAGES/xfce-mcs-manager.mo
 share/locale/pt_PT/LC_MESSAGES/xfce-mcs-manager.mo
 share/locale/ru/LC_MESSAGES/xfce-mcs-manager.mo
 share/locale/sv/LC_MESSAGES/xfce-mcs-manager.mo
@@ -48,6 +51,8 @@ share/xfce4/doc/fr/xfce-mcs-manager.html
 @dirrm share/xfce4/doc
 @dirrm share/locale/pt_PT/LC_MESSAGES
 @dirrm share/locale/pt_PT
+@dirrm share/locale/fa_IR/LC_MESSAGES
+@dirrm share/locale/fa_IR
 @dirrm share/locale/es_MX/LC_MESSAGES
 @dirrm share/locale/es_MX
 @dirrm include/xfce4/xfce-mcs-manager
diff --git a/x11/xfce4/desktop/xfce-mcs-plugins/distinfo b/x11/xfce4/desktop/xfce-mcs-plugins/distinfo
index 45e75ba0219..3c872cb18b6 100644
--- a/x11/xfce4/desktop/xfce-mcs-plugins/distinfo
+++ b/x11/xfce4/desktop/xfce-mcs-plugins/distinfo
@@ -1,3 +1,3 @@
-MD5 (xfce4/xfce-mcs-plugins-4.0.3.tar.gz) = 28518aad1e31844b6ab557ae0a58b643
-RMD160 (xfce4/xfce-mcs-plugins-4.0.3.tar.gz) = f9265786e0370feb9fc9635b851e5616f2342c07
-SHA1 (xfce4/xfce-mcs-plugins-4.0.3.tar.gz) = 00964151a67d035648a8e507fcdeed17b625e263
+MD5 (xfce4/xfce-mcs-plugins-4.0.5.tar.gz) = a57755ea2a02fd18eb1560b6347ade89
+RMD160 (xfce4/xfce-mcs-plugins-4.0.5.tar.gz) = 95dea834a95fc1240596c02eae8d2c2e87a89f5c
+SHA1 (xfce4/xfce-mcs-plugins-4.0.5.tar.gz) = c6917b6d495534ba1b25cf191359ab511354cdf0
diff --git a/x11/xfce4/desktop/xfce-mcs-plugins/pkg/PLIST b/x11/xfce4/desktop/xfce-mcs-plugins/pkg/PLIST
index 76083f93238..6c9c187560f 100644
--- a/x11/xfce4/desktop/xfce-mcs-plugins/pkg/PLIST
+++ b/x11/xfce4/desktop/xfce-mcs-plugins/pkg/PLIST
@@ -1,4 +1,4 @@
-@comment $OpenBSD: PLIST,v 1.3 2004/01/09 01:27:42 jolan Exp $
+@comment $OpenBSD: PLIST,v 1.4 2004/04/18 00:28:57 jolan Exp $
 lib/xfce4/mcs-plugins/keyboard_plugin.a
 lib/xfce4/mcs-plugins/keyboard_plugin.la
 lib/xfce4/mcs-plugins/keyboard_plugin.so
@@ -10,11 +10,13 @@ lib/xfce4/mcs-plugins/ui_plugin.la
 lib/xfce4/mcs-plugins/ui_plugin.so
 share/locale/ar/LC_MESSAGES/xfce-mcs-plugins.mo
 share/locale/az/LC_MESSAGES/xfce-mcs-plugins.mo
+share/locale/bg/LC_MESSAGES/xfce-mcs-plugins.mo
 share/locale/ca/LC_MESSAGES/xfce-mcs-plugins.mo
 share/locale/cs/LC_MESSAGES/xfce-mcs-plugins.mo
 share/locale/de/LC_MESSAGES/xfce-mcs-plugins.mo
 share/locale/es/LC_MESSAGES/xfce-mcs-plugins.mo
 share/locale/es_MX/LC_MESSAGES/xfce-mcs-plugins.mo
+share/locale/fa_IR/LC_MESSAGES/xfce-mcs-plugins.mo
 share/locale/fi/LC_MESSAGES/xfce-mcs-plugins.mo
 share/locale/fr/LC_MESSAGES/xfce-mcs-plugins.mo
 share/locale/hi/LC_MESSAGES/xfce-mcs-plugins.mo
@@ -27,6 +29,7 @@ share/locale/ms/LC_MESSAGES/xfce-mcs-plugins.mo
 share/locale/nl/LC_MESSAGES/xfce-mcs-plugins.mo
 share/locale/no/LC_MESSAGES/xfce-mcs-plugins.mo
 share/locale/pl/LC_MESSAGES/xfce-mcs-plugins.mo
+share/locale/pt_BR/LC_MESSAGES/xfce-mcs-plugins.mo
 share/locale/pt_PT/LC_MESSAGES/xfce-mcs-plugins.mo
 share/locale/ru/LC_MESSAGES/xfce-mcs-plugins.mo
 share/locale/sv/LC_MESSAGES/xfce-mcs-plugins.mo
diff --git a/x11/xfce4/desktop/xfce-utils/distinfo b/x11/xfce4/desktop/xfce-utils/distinfo
index 237316a6d19..09216d4fdc8 100644
--- a/x11/xfce4/desktop/xfce-utils/distinfo
+++ b/x11/xfce4/desktop/xfce-utils/distinfo
@@ -1,3 +1,3 @@
-MD5 (xfce4/xfce-utils-4.0.3.tar.gz) = b0cd19f9f06885a878730fa78afef415
-RMD160 (xfce4/xfce-utils-4.0.3.tar.gz) = d19c18d3f50637231af0088ef0ee3b7d31b934bf
-SHA1 (xfce4/xfce-utils-4.0.3.tar.gz) = 297ff4b1da8a52f6689a4200255b37e2730de606
+MD5 (xfce4/xfce-utils-4.0.5.tar.gz) = 105e906b6f21a9360cc9a898dfb28604
+RMD160 (xfce4/xfce-utils-4.0.5.tar.gz) = 6ea0f3c709e74b4fc9295c31394f4714d589a471
+SHA1 (xfce4/xfce-utils-4.0.5.tar.gz) = c1cef77209bb9b84551d467184accb0cfd2e34d6
diff --git a/x11/xfce4/desktop/xfce-utils/patches/patch-scripts_Makefile_in b/x11/xfce4/desktop/xfce-utils/patches/patch-scripts_Makefile_in
index 089ebb9235d..0adb4839967 100644
--- a/x11/xfce4/desktop/xfce-utils/patches/patch-scripts_Makefile_in
+++ b/x11/xfce4/desktop/xfce-utils/patches/patch-scripts_Makefile_in
@@ -1,10 +1,10 @@
-$OpenBSD: patch-scripts_Makefile_in,v 1.1.1.1 2003/12/15 06:11:34 jolan Exp $
---- scripts/Makefile.in.orig	2003-11-11 09:03:30.000000000 -0600
-+++ scripts/Makefile.in	2003-12-02 22:03:37.000000000 -0600
-@@ -192,7 +192,7 @@ edit = sed \
+$OpenBSD: patch-scripts_Makefile_in,v 1.2 2004/04/18 00:28:57 jolan Exp $
+--- scripts/Makefile.in.orig	2004-04-13 15:52:20.000000000 -0500
++++ scripts/Makefile.in	2004-04-17 14:33:04.000000000 -0500
+@@ -210,7 +210,7 @@ edit = sed \
+         -e 's,@sysconfdir\@,$(sysconfdir),g' \
  	-e 's,@BROWSER_DEFAULT\@,@BROWSER_DEFAULT@,g'
  
- 
 -conffilesdir = @sysconfdir@/xfce4
 +conffilesdir = $(prefix)/share/examples/xfce-utils
  conffiles_DATA = \
diff --git a/x11/xfce4/desktop/xfce-utils/patches/patch-scripts_xinitrc b/x11/xfce4/desktop/xfce-utils/patches/patch-scripts_xinitrc
index d3aab80e91b..685b4d4712d 100644
--- a/x11/xfce4/desktop/xfce-utils/patches/patch-scripts_xinitrc
+++ b/x11/xfce4/desktop/xfce-utils/patches/patch-scripts_xinitrc
@@ -1,12 +1,12 @@
-$OpenBSD: patch-scripts_xinitrc,v 1.1.1.1 2003/12/15 06:11:34 jolan Exp $
---- scripts/xinitrc.orig	2003-10-13 13:01:21.000000000 -0500
-+++ scripts/xinitrc	2003-12-09 21:39:09.000000000 -0600
+$OpenBSD: patch-scripts_xinitrc,v 1.2 2004/04/18 00:28:57 jolan Exp $
+--- scripts/xinitrc.orig	2004-03-06 06:27:35.000000000 -0600
++++ scripts/xinitrc	2004-04-17 14:34:02.000000000 -0500
 @@ -24,19 +24,19 @@ test -f $HOME/.Xmodmap && xmodmap $HOME/
  # test -f $HOME/.Xdefaults && xrdb -merge $HOME/.Xdefaults
  
  # Launch xscreensaver (if available), but only as non-root user
--test $UID -gt 0 && xscreensaver -no-splash &
-+#test $UID -gt 0 && xscreensaver -no-splash &
+-test $UID -gt 0 && test -z $VNCSESSION && xscreensaver -no-splash &
++#test $UID -gt 0 && test -z $VNCSESSION && xscreensaver -no-splash &
  
  # Run xfce4-session if installed
 -xfcesm=`which xfce4-session`
diff --git a/x11/xfce4/desktop/xfce-utils/patches/patch-xfce4-about_Makefile_in b/x11/xfce4/desktop/xfce-utils/patches/patch-xfce4-about_Makefile_in
deleted file mode 100644
index 22ddbd008c1..00000000000
--- a/x11/xfce4/desktop/xfce-utils/patches/patch-xfce4-about_Makefile_in
+++ /dev/null
@@ -1,21 +0,0 @@
-$OpenBSD: patch-xfce4-about_Makefile_in,v 1.2 2004/01/27 20:02:07 jolan Exp $
---- xfce4-about/Makefile.in.orig	2004-01-07 13:42:22.000000000 -0600
-+++ xfce4-about/Makefile.in	2004-01-27 13:46:23.000000000 -0600
-@@ -173,7 +173,7 @@ sbindir = @sbindir@
- sharedstatedir = @sharedstatedir@
- sysconfdir = @sysconfdir@
- target_alias = @target_alias@
--aboutdir = $(datadir)/xfce4
-+aboutdir = $(datadir)/doc/xfce4
- 
- about_DATA = \
- 	AUTHORS								\
-@@ -217,7 +217,7 @@ xfce4_about_CFLAGS = \
- 	@LIBGTKHTML_CFLAGS@						\
- 	@LIBXFCEGUI4_CFLAGS@						\
- 	-DPACKAGE_LOCALE_DIR=\"$(localedir)\"				\
--	-DDATADIR=\"$(datadir)/xfce4\"
-+	-DDATADIR=\"$(aboutdir)\"
- 
- 
- xfce4_about_LDADD = \
diff --git a/x11/xfce4/desktop/xfce-utils/pkg/PLIST b/x11/xfce4/desktop/xfce-utils/pkg/PLIST
index 22adf7bc1ea..6c72aaddbd0 100644
--- a/x11/xfce4/desktop/xfce-utils/pkg/PLIST
+++ b/x11/xfce4/desktop/xfce-utils/pkg/PLIST
@@ -1,4 +1,4 @@
-@comment $OpenBSD: PLIST,v 1.3 2004/01/09 01:27:42 jolan Exp $
+@comment $OpenBSD: PLIST,v 1.4 2004/04/18 00:28:57 jolan Exp $
 bin/startxfce4
 bin/xfce4-about
 bin/xfhelp4
@@ -10,41 +10,16 @@ bin/xfterm4
 lib/xfce4/mcs-plugins/xftaskbar_plugin.a
 lib/xfce4/mcs-plugins/xftaskbar_plugin.la
 lib/xfce4/mcs-plugins/xftaskbar_plugin.so
-share/doc/xfce4/AUTHORS
-share/doc/xfce4/AUTHORS.az
-share/doc/xfce4/AUTHORS.ca
-share/doc/xfce4/AUTHORS.de
-share/doc/xfce4/AUTHORS.fr
-share/doc/xfce4/AUTHORS.html
-share/doc/xfce4/AUTHORS.html.az
-share/doc/xfce4/AUTHORS.html.ca
-share/doc/xfce4/AUTHORS.html.de
-share/doc/xfce4/AUTHORS.html.fr
-share/doc/xfce4/AUTHORS.vi
-share/doc/xfce4/BSD
-share/doc/xfce4/BSD.html
-share/doc/xfce4/COPYING
-share/doc/xfce4/COPYING.html
-share/doc/xfce4/COPYING.vi
-share/doc/xfce4/GPL
-share/doc/xfce4/GPL.html
-share/doc/xfce4/INFO
-share/doc/xfce4/INFO.ca
-share/doc/xfce4/INFO.fr
-share/doc/xfce4/INFO.html
-share/doc/xfce4/INFO.html.ca
-share/doc/xfce4/INFO.html.de
-share/doc/xfce4/INFO.html.fr
-share/doc/xfce4/INFO.vi
-share/doc/xfce4/LGPL
-share/doc/xfce4/LGPL.html
 share/examples/xfce-utils/xinitrc
+share/locale/ar/LC_MESSAGES/xfce-utils.mo
 share/locale/az/LC_MESSAGES/xfce-utils.mo
+share/locale/bg/LC_MESSAGES/xfce-utils.mo
 share/locale/ca/LC_MESSAGES/xfce-utils.mo
 share/locale/cs/LC_MESSAGES/xfce-utils.mo
 share/locale/de/LC_MESSAGES/xfce-utils.mo
 share/locale/es/LC_MESSAGES/xfce-utils.mo
 share/locale/es_MX/LC_MESSAGES/xfce-utils.mo
+share/locale/fa_IR/LC_MESSAGES/xfce-utils.mo
 share/locale/fi/LC_MESSAGES/xfce-utils.mo
 share/locale/fr/LC_MESSAGES/xfce-utils.mo
 share/locale/hi/LC_MESSAGES/xfce-utils.mo
@@ -57,6 +32,7 @@ share/locale/ms/LC_MESSAGES/xfce-utils.mo
 share/locale/nl/LC_MESSAGES/xfce-utils.mo
 share/locale/no/LC_MESSAGES/xfce-utils.mo
 share/locale/pl/LC_MESSAGES/xfce-utils.mo
+share/locale/pt_BR/LC_MESSAGES/xfce-utils.mo
 share/locale/pt_PT/LC_MESSAGES/xfce-utils.mo
 share/locale/ru/LC_MESSAGES/xfce-utils.mo
 share/locale/sv/LC_MESSAGES/xfce-utils.mo
@@ -66,6 +42,42 @@ share/locale/uk/LC_MESSAGES/xfce-utils.mo
 share/locale/vi/LC_MESSAGES/xfce-utils.mo
 share/locale/zh_CN/LC_MESSAGES/xfce-utils.mo
 share/locale/zh_TW/LC_MESSAGES/xfce-utils.mo
+share/xfce4/AUTHORS
+share/xfce4/AUTHORS.az
+share/xfce4/AUTHORS.ca
+share/xfce4/AUTHORS.de
+share/xfce4/AUTHORS.es
+share/xfce4/AUTHORS.fr
+share/xfce4/AUTHORS.html
+share/xfce4/AUTHORS.html.az
+share/xfce4/AUTHORS.html.ca
+share/xfce4/AUTHORS.html.de
+share/xfce4/AUTHORS.html.es
+share/xfce4/AUTHORS.html.fr
+share/xfce4/AUTHORS.html.it
+share/xfce4/AUTHORS.it
+share/xfce4/AUTHORS.vi
+share/xfce4/BSD
+share/xfce4/BSD.html
+share/xfce4/COPYING
+share/xfce4/COPYING.html
+share/xfce4/COPYING.vi
+share/xfce4/GPL
+share/xfce4/GPL.html
+share/xfce4/INFO
+share/xfce4/INFO.ca
+share/xfce4/INFO.es
+share/xfce4/INFO.fr
+share/xfce4/INFO.html
+share/xfce4/INFO.html.ca
+share/xfce4/INFO.html.de
+share/xfce4/INFO.html.es
+share/xfce4/INFO.html.fr
+share/xfce4/INFO.html.it
+share/xfce4/INFO.it
+share/xfce4/INFO.vi
+share/xfce4/LGPL
+share/xfce4/LGPL.html
 share/xfce4/doc/C/BSD.html
 share/xfce4/doc/C/GPL.html
 share/xfce4/doc/C/LGPL.html
@@ -96,6 +108,5 @@ share/xfce4/doc/fr/xfce4-use.html
 share/xfce4/doc/fr/xfce4-user-guide.html
 share/xfce4/doc/xfce.css
 @dirrm share/examples/xfce-utils
-@dirrm share/doc/xfce4
 @dirrm lib/xfce4/mcs-plugins
 @dirrm lib/xfce4
diff --git a/x11/xfce4/desktop/xfce4-panel/distinfo b/x11/xfce4/desktop/xfce4-panel/distinfo
index 7ab9f7a9464..ea76ffdd8ab 100644
--- a/x11/xfce4/desktop/xfce4-panel/distinfo
+++ b/x11/xfce4/desktop/xfce4-panel/distinfo
@@ -1,3 +1,3 @@
-MD5 (xfce4/xfce4-panel-4.0.3.tar.gz) = af8e2bce97c99b1ce23d270320e8c8ce
-RMD160 (xfce4/xfce4-panel-4.0.3.tar.gz) = 6479a899ad7ef2e53519c5ff28da7612f328dc82
-SHA1 (xfce4/xfce4-panel-4.0.3.tar.gz) = ab587f3e9137f746276504b9e753e48401acdc9d
+MD5 (xfce4/xfce4-panel-4.0.5.tar.gz) = e45c70fd08edf3fadd23571f3151ac5e
+RMD160 (xfce4/xfce4-panel-4.0.5.tar.gz) = cfca8f61e5168b3f43118387dac235dc3629f85c
+SHA1 (xfce4/xfce4-panel-4.0.5.tar.gz) = 9e41c4f1d71761c2e485ca819c0dcc068cac0e59
diff --git a/x11/xfce4/desktop/xfce4-panel/patches/patch-Makefile_in b/x11/xfce4/desktop/xfce4-panel/patches/patch-Makefile_in
index 7c723848c5d..bfa75e15538 100644
--- a/x11/xfce4/desktop/xfce4-panel/patches/patch-Makefile_in
+++ b/x11/xfce4/desktop/xfce4-panel/patches/patch-Makefile_in
@@ -1,12 +1,12 @@
-$OpenBSD: patch-Makefile_in,v 1.2 2003/12/22 21:47:59 jolan Exp $
---- Makefile.in.orig	2003-12-16 15:34:36.000000000 -0600
-+++ Makefile.in	2003-12-21 17:31:05.000000000 -0600
-@@ -174,7 +174,7 @@ sharedstatedir = @sharedstatedir@
+$OpenBSD: patch-Makefile_in,v 1.3 2004/04/18 00:28:57 jolan Exp $
+--- Makefile.in.orig	2004-04-13 15:53:39.000000000 -0500
++++ Makefile.in	2004-04-17 14:41:55.000000000 -0500
+@@ -215,7 +215,7 @@ sbindir = @sbindir@
+ sharedstatedir = @sharedstatedir@
  sysconfdir = @sysconfdir@
  target_alias = @target_alias@
- 
 -confdir = $(sysconfdir)/xfce4
 +confdir = $(prefix)/share/examples/xfce4-panel
  conf_DATA = \
  	xfce4rc 							\
- 	xfce4rc.az 							\
+ 	xfce4rc.ar							\
diff --git a/x11/xfce4/desktop/xfce4-panel/pkg/PLIST b/x11/xfce4/desktop/xfce4-panel/pkg/PLIST
index ba840079f6c..7e4ae780d4f 100644
--- a/x11/xfce4/desktop/xfce4-panel/pkg/PLIST
+++ b/x11/xfce4/desktop/xfce4-panel/pkg/PLIST
@@ -1,4 +1,4 @@
-@comment $OpenBSD: PLIST,v 1.4 2004/01/09 01:27:42 jolan Exp $
+@comment $OpenBSD: PLIST,v 1.5 2004/04/18 00:28:57 jolan Exp $
 bin/xfce4-panel
 include/xfce4/panel/controls.h
 include/xfce4/panel/global.h
@@ -26,21 +26,27 @@ lib/xfce4/panel-plugins/libswitcher.so
 lib/xfce4/panel-plugins/libsystembuttons.la
 lib/xfce4/panel-plugins/libsystembuttons.so
 share/examples/xfce4-panel/xfce4rc
+share/examples/xfce4-panel/xfce4rc.ar
 share/examples/xfce4-panel/xfce4rc.az
 share/examples/xfce4-panel/xfce4rc.ca
 share/examples/xfce4-panel/xfce4rc.hu
+share/examples/xfce4-panel/xfce4rc.it
 share/examples/xfce4-panel/xfce4rc.nl
 share/examples/xfce4-panel/xfce4rc.vi
+share/locale/ar/LC_MESSAGES/xfce4-panel.mo
 share/locale/az/LC_MESSAGES/xfce4-panel.mo
+share/locale/bg/LC_MESSAGES/xfce4-panel.mo
 share/locale/ca/LC_MESSAGES/xfce4-panel.mo
 share/locale/cs/LC_MESSAGES/xfce4-panel.mo
 share/locale/de/LC_MESSAGES/xfce4-panel.mo
 share/locale/es/LC_MESSAGES/xfce4-panel.mo
 share/locale/es_MX/LC_MESSAGES/xfce4-panel.mo
+share/locale/fa_IR/LC_MESSAGES/xfce4-panel.mo
 share/locale/fi/LC_MESSAGES/xfce4-panel.mo
 share/locale/fr/LC_MESSAGES/xfce4-panel.mo
 share/locale/hi/LC_MESSAGES/xfce4-panel.mo
 share/locale/hu/LC_MESSAGES/xfce4-panel.mo
+share/locale/it/LC_MESSAGES/xfce4-panel.mo
 share/locale/ja/LC_MESSAGES/xfce4-panel.mo
 share/locale/ko/LC_MESSAGES/xfce4-panel.mo
 share/locale/lt/LC_MESSAGES/xfce4-panel.mo
@@ -48,6 +54,7 @@ share/locale/ms/LC_MESSAGES/xfce4-panel.mo
 share/locale/nl/LC_MESSAGES/xfce4-panel.mo
 share/locale/no/LC_MESSAGES/xfce4-panel.mo
 share/locale/pl/LC_MESSAGES/xfce4-panel.mo
+share/locale/pt_BR/LC_MESSAGES/xfce4-panel.mo
 share/locale/pt_PT/LC_MESSAGES/xfce4-panel.mo
 share/locale/ru/LC_MESSAGES/xfce4-panel.mo
 share/locale/sv/LC_MESSAGES/xfce4-panel.mo
diff --git a/x11/xfce4/desktop/xfdesktop/distinfo b/x11/xfce4/desktop/xfdesktop/distinfo
index 5d7de7b8b7c..3295be3822c 100644
--- a/x11/xfce4/desktop/xfdesktop/distinfo
+++ b/x11/xfce4/desktop/xfdesktop/distinfo
@@ -1,3 +1,3 @@
-MD5 (xfce4/xfdesktop-4.0.3.tar.gz) = 21eace73c6daecdc948f789d759e4a38
-RMD160 (xfce4/xfdesktop-4.0.3.tar.gz) = 1b843a0276608ca744396b508a61c8b1b4b40af9
-SHA1 (xfce4/xfdesktop-4.0.3.tar.gz) = a3370768f5ec3bcad4ee581a9c67dec772e999a4
+MD5 (xfce4/xfdesktop-4.0.5.tar.gz) = eef02de6de0ac2b8343f4ce2c2f8cf12
+RMD160 (xfce4/xfdesktop-4.0.5.tar.gz) = f197ab60da3dc2e4006b2de0cfccb8322607c969
+SHA1 (xfce4/xfdesktop-4.0.5.tar.gz) = bc438536eca85c396c4342f48d7bb21606cfc6e4
diff --git a/x11/xfce4/desktop/xfdesktop/patches/patch-Makefile_in b/x11/xfce4/desktop/xfdesktop/patches/patch-Makefile_in
index fb9b8d87975..284b3013111 100644
--- a/x11/xfce4/desktop/xfdesktop/patches/patch-Makefile_in
+++ b/x11/xfce4/desktop/xfdesktop/patches/patch-Makefile_in
@@ -1,12 +1,12 @@
-$OpenBSD: patch-Makefile_in,v 1.1.1.1 2003/12/15 06:11:34 jolan Exp $
---- Makefile.in.orig	2003-11-11 09:20:20.000000000 -0600
-+++ Makefile.in	2003-12-02 21:30:30.000000000 -0600
-@@ -173,7 +173,7 @@ target_alias = @target_alias@
- 
+$OpenBSD: patch-Makefile_in,v 1.2 2004/04/18 00:28:57 jolan Exp $
+--- Makefile.in.orig	2004-04-13 15:56:02.000000000 -0500
++++ Makefile.in	2004-04-17 14:47:51.000000000 -0500
+@@ -213,7 +213,7 @@ sharedstatedir = @sharedstatedir@
+ sysconfdir = @sysconfdir@
+ target_alias = @target_alias@
  SUBDIRS = backdrops common doc po settings src
- 
 -confdir = $(sysconfdir)/xfce4
 +confdir = $(prefix)/share/examples/xfdesktop
- 
  conf_DATA = \
  	menu.xml 							\
+ 	menu.xml.az 							\
diff --git a/x11/xfce4/desktop/xfdesktop/pkg/PLIST b/x11/xfce4/desktop/xfdesktop/pkg/PLIST
index 84cb5e9c1c6..25ee6bd8e49 100644
--- a/x11/xfce4/desktop/xfdesktop/pkg/PLIST
+++ b/x11/xfce4/desktop/xfdesktop/pkg/PLIST
@@ -1,4 +1,4 @@
-@comment $OpenBSD: PLIST,v 1.3 2004/01/09 01:27:42 jolan Exp $
+@comment $OpenBSD: PLIST,v 1.4 2004/04/18 00:28:57 jolan Exp $
 bin/xfdesktop
 lib/xfce4/mcs-plugins/backdrop_settings.a
 lib/xfce4/mcs-plugins/backdrop_settings.la
@@ -12,18 +12,22 @@ share/examples/xfdesktop/menu.xml.ca
 share/examples/xfdesktop/menu.xml.de
 share/examples/xfdesktop/menu.xml.fr
 share/examples/xfdesktop/menu.xml.hu
+share/examples/xfdesktop/menu.xml.it
 share/examples/xfdesktop/menu.xml.nl
 share/examples/xfdesktop/menu.xml.ta
 share/examples/xfdesktop/menu.xml.tr
 share/examples/xfdesktop/menu.xml.vi
 share/examples/xfdesktop/menu.xml.zh_CN
 share/examples/xfdesktop/menu.xml.zh_TW
+share/locale/ar/LC_MESSAGES/xfdesktop.mo
 share/locale/az/LC_MESSAGES/xfdesktop.mo
+share/locale/bg/LC_MESSAGES/xfdesktop.mo
 share/locale/ca/LC_MESSAGES/xfdesktop.mo
 share/locale/cs/LC_MESSAGES/xfdesktop.mo
 share/locale/de/LC_MESSAGES/xfdesktop.mo
 share/locale/es/LC_MESSAGES/xfdesktop.mo
 share/locale/es_MX/LC_MESSAGES/xfdesktop.mo
+share/locale/fa_IR/LC_MESSAGES/xfdesktop.mo
 share/locale/fi/LC_MESSAGES/xfdesktop.mo
 share/locale/fr/LC_MESSAGES/xfdesktop.mo
 share/locale/hi/LC_MESSAGES/xfdesktop.mo
@@ -36,6 +40,7 @@ share/locale/ms/LC_MESSAGES/xfdesktop.mo
 share/locale/nl/LC_MESSAGES/xfdesktop.mo
 share/locale/no/LC_MESSAGES/xfdesktop.mo
 share/locale/pl/LC_MESSAGES/xfdesktop.mo
+share/locale/pt_BR/LC_MESSAGES/xfdesktop.mo
 share/locale/pt_PT/LC_MESSAGES/xfdesktop.mo
 share/locale/ru/LC_MESSAGES/xfdesktop.mo
 share/locale/sv/LC_MESSAGES/xfdesktop.mo
diff --git a/x11/xfce4/desktop/xffm/distinfo b/x11/xfce4/desktop/xffm/distinfo
index e7112f798cb..9271494caa6 100644
--- a/x11/xfce4/desktop/xffm/distinfo
+++ b/x11/xfce4/desktop/xffm/distinfo
@@ -1,3 +1,3 @@
-MD5 (xfce4/xffm-4.0.3.tar.gz) = 5d19a3d96ff540e0ac52453117fa2d81
-RMD160 (xfce4/xffm-4.0.3.tar.gz) = a4005cb638d7ab0abe421794ae3c6a9a63c9cc9e
-SHA1 (xfce4/xffm-4.0.3.tar.gz) = 46be2f9fd138446dbb5ec02430d0b9ba0a7691af
+MD5 (xfce4/xffm-4.0.5.tar.gz) = 556af9b2bd6fdf6bf0e644088200a9e7
+RMD160 (xfce4/xffm-4.0.5.tar.gz) = d9940b7495b0812bdee4fc092161559a634e7422
+SHA1 (xfce4/xffm-4.0.5.tar.gz) = bc72f95d815b10ceb002fd9a5b1846736fa7e0e8
diff --git a/x11/xfce4/desktop/xffm/patches/gcc-patch-src_Makefile_in b/x11/xfce4/desktop/xffm/patches/gcc-patch-src_Makefile_in
index 914461af6c4..9e216ef1452 100644
--- a/x11/xfce4/desktop/xffm/patches/gcc-patch-src_Makefile_in
+++ b/x11/xfce4/desktop/xffm/patches/gcc-patch-src_Makefile_in
@@ -1,7 +1,7 @@
-$OpenBSD: gcc-patch-src_Makefile_in,v 1.1.1.1 2003/12/15 06:11:41 jolan Exp $
---- src/Makefile.in.orig	2003-11-11 09:25:15.000000000 -0600
-+++ src/Makefile.in	2003-12-03 01:16:56.000000000 -0600
-@@ -628,7 +628,7 @@ xffm-glade_gui.o: glade_gui.c
+$OpenBSD: gcc-patch-src_Makefile_in,v 1.2 2004/04/18 00:28:58 jolan Exp $
+--- src/Makefile.in.orig	2004-04-13 15:56:44.000000000 -0500
++++ src/Makefile.in	2004-04-17 14:56:46.000000000 -0500
+@@ -605,7 +605,7 @@ xffm-glade_gui.o: glade_gui.c
  @AMDEP_TRUE@@am__fastdepCC_FALSE@	source='glade_gui.c' object='xffm-glade_gui.o' libtool=no @AMDEPBACKSLASH@
  @AMDEP_TRUE@@am__fastdepCC_FALSE@	depfile='$(DEPDIR)/xffm-glade_gui.Po' tmpdepfile='$(DEPDIR)/xffm-glade_gui.TPo' @AMDEPBACKSLASH@
  @AMDEP_TRUE@@am__fastdepCC_FALSE@	$(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
@@ -9,4 +9,4 @@ $OpenBSD: gcc-patch-src_Makefile_in,v 1.1.1.1 2003/12/15 06:11:41 jolan Exp $
 +@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(xffm_CFLAGS) $(CFLAGS) -O0 -c -o xffm-glade_gui.o `test -f 'glade_gui.c' || echo '$(srcdir)/'`glade_gui.c
  
  xffm-glade_gui.obj: glade_gui.c
- @am__fastdepCC_TRUE@	if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(xffm_CFLAGS) $(CFLAGS) -MT xffm-glade_gui.obj -MD -MP -MF "$(DEPDIR)/xffm-glade_gui.Tpo" \
+ @am__fastdepCC_TRUE@	if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(xffm_CFLAGS) $(CFLAGS) -MT xffm-glade_gui.obj -MD -MP -MF "$(DEPDIR)/xffm-glade_gui.Tpo" -c -o xffm-glade_gui.obj `if test -f 'glade_gui.c'; then $(CYGPATH_W) 'glade_gui.c'; else $(CYGPATH_W) '$(srcdir)/glade_gui.c'; fi`; \
diff --git a/x11/xfce4/desktop/xffm/pkg/PLIST b/x11/xfce4/desktop/xffm/pkg/PLIST
index 1d5a506b6f7..b4b84f661ed 100644
--- a/x11/xfce4/desktop/xffm/pkg/PLIST
+++ b/x11/xfce4/desktop/xffm/pkg/PLIST
@@ -1,4 +1,4 @@
-@comment $OpenBSD: PLIST,v 1.3 2004/01/09 01:27:42 jolan Exp $
+@comment $OpenBSD: PLIST,v 1.4 2004/04/18 00:28:58 jolan Exp $
 bin/fgr
 bin/scramble
 bin/xfapps
@@ -26,21 +26,26 @@ lib/pkgconfig/xffm-1.0.pc
 lib/xfce4/mcs-plugins/libxffmsettings.la
 lib/xfce4/mcs-plugins/libxffmsettings.so
 man/man1/fgr.1
+share/locale/ar/LC_MESSAGES/xffm.mo
 share/locale/az/LC_MESSAGES/xffm.mo
+share/locale/bg/LC_MESSAGES/xffm.mo
 share/locale/ca/LC_MESSAGES/xffm.mo
 share/locale/cs/LC_MESSAGES/xffm.mo
 share/locale/de/LC_MESSAGES/xffm.mo
 share/locale/es/LC_MESSAGES/xffm.mo
 share/locale/es_MX/LC_MESSAGES/xffm.mo
+share/locale/fa_IR/LC_MESSAGES/xffm.mo
 share/locale/fr/LC_MESSAGES/xffm.mo
 share/locale/hi/LC_MESSAGES/xffm.mo
 share/locale/hu/LC_MESSAGES/xffm.mo
+share/locale/it/LC_MESSAGES/xffm.mo
 share/locale/ja/LC_MESSAGES/xffm.mo
 share/locale/lt/LC_MESSAGES/xffm.mo
 share/locale/ms/LC_MESSAGES/xffm.mo
 share/locale/nl/LC_MESSAGES/xffm.mo
 share/locale/no/LC_MESSAGES/xffm.mo
 share/locale/pl/LC_MESSAGES/xffm.mo
+share/locale/pt_BR/LC_MESSAGES/xffm.mo
 share/locale/pt_PT/LC_MESSAGES/xffm.mo
 share/locale/sv/LC_MESSAGES/xffm.mo
 share/locale/ta/LC_MESSAGES/xffm.mo
diff --git a/x11/xfce4/desktop/xfprint/distinfo b/x11/xfce4/desktop/xfprint/distinfo
index 5d8849e5205..7451c3bcc33 100644
--- a/x11/xfce4/desktop/xfprint/distinfo
+++ b/x11/xfce4/desktop/xfprint/distinfo
@@ -1,3 +1,3 @@
-MD5 (xfce4/xfprint-4.0.3.tar.gz) = a3ba44561cebab37c8113e1059f2b142
-RMD160 (xfce4/xfprint-4.0.3.tar.gz) = dbf024c59090ad7ca460004bbae7bd93686a4667
-SHA1 (xfce4/xfprint-4.0.3.tar.gz) = 01402b9259902e46c0a54f4892431545b81d4796
+MD5 (xfce4/xfprint-4.0.5.tar.gz) = 62e53823c1cfd4094f3df914abd5e691
+RMD160 (xfce4/xfprint-4.0.5.tar.gz) = c7b517be673115c2e86d80eaba998bddb641701a
+SHA1 (xfce4/xfprint-4.0.5.tar.gz) = 2c0fbef22fe2e69fbd166b117905dfaff0ae0472
diff --git a/x11/xfce4/desktop/xfprint/pkg/PLIST b/x11/xfce4/desktop/xfprint/pkg/PLIST
index 89b65f149d7..06c51054a9c 100644
--- a/x11/xfce4/desktop/xfprint/pkg/PLIST
+++ b/x11/xfce4/desktop/xfprint/pkg/PLIST
@@ -1,23 +1,28 @@
-@comment $OpenBSD: PLIST,v 1.3 2004/01/09 01:27:42 jolan Exp $
+@comment $OpenBSD: PLIST,v 1.4 2004/04/18 00:28:58 jolan Exp $
 bin/xfprint-manager
 bin/xfprint4
 lib/libxfprint.a
 lib/libxfprint.la
+share/locale/ar/LC_MESSAGES/xfprint.mo
 share/locale/az/LC_MESSAGES/xfprint.mo
+share/locale/bg/LC_MESSAGES/xfprint.mo
 share/locale/ca/LC_MESSAGES/xfprint.mo
 share/locale/cs/LC_MESSAGES/xfprint.mo
 share/locale/de/LC_MESSAGES/xfprint.mo
 share/locale/es/LC_MESSAGES/xfprint.mo
 share/locale/es_MX/LC_MESSAGES/xfprint.mo
+share/locale/fa_IR/LC_MESSAGES/xfprint.mo
 share/locale/fr/LC_MESSAGES/xfprint.mo
 share/locale/hi/LC_MESSAGES/xfprint.mo
 share/locale/hu/LC_MESSAGES/xfprint.mo
+share/locale/it/LC_MESSAGES/xfprint.mo
 share/locale/ja/LC_MESSAGES/xfprint.mo
 share/locale/lt/LC_MESSAGES/xfprint.mo
 share/locale/ms/LC_MESSAGES/xfprint.mo
 share/locale/nl/LC_MESSAGES/xfprint.mo
 share/locale/no/LC_MESSAGES/xfprint.mo
 share/locale/pl/LC_MESSAGES/xfprint.mo
+share/locale/pt_BR/LC_MESSAGES/xfprint.mo
 share/locale/pt_PT/LC_MESSAGES/xfprint.mo
 share/locale/ru/LC_MESSAGES/xfprint.mo
 share/locale/sv/LC_MESSAGES/xfprint.mo
@@ -30,5 +35,7 @@ share/locale/zh_TW/LC_MESSAGES/xfprint.mo
 %%SHARED%%
 @dirrm share/locale/pt_PT/LC_MESSAGES
 @dirrm share/locale/pt_PT
+@dirrm share/locale/fa_IR/LC_MESSAGES
+@dirrm share/locale/fa_IR
 @dirrm share/locale/es_MX/LC_MESSAGES
 @dirrm share/locale/es_MX
diff --git a/x11/xfce4/desktop/xfwm4/Makefile b/x11/xfce4/desktop/xfwm4/Makefile
index ae12444e98b..5882c3b4a71 100644
--- a/x11/xfce4/desktop/xfwm4/Makefile
+++ b/x11/xfce4/desktop/xfwm4/Makefile
@@ -1,6 +1,5 @@
-# $OpenBSD: Makefile,v 1.4 2004/01/14 00:51:57 jolan Exp $
+# $OpenBSD: Makefile,v 1.5 2004/04/18 00:28:58 jolan Exp $
 
-V=	4.0.3.1
 COMMENT=	"xfce4 window mananger"
 DISTNAME=	xfwm4-${V}
 
diff --git a/x11/xfce4/desktop/xfwm4/distinfo b/x11/xfce4/desktop/xfwm4/distinfo
index 45da0849a11..d237a4f8b13 100644
--- a/x11/xfce4/desktop/xfwm4/distinfo
+++ b/x11/xfce4/desktop/xfwm4/distinfo
@@ -1,3 +1,3 @@
-MD5 (xfce4/xfwm4-4.0.3.1.tar.gz) = 0140fdd9ad66538691c33e8139c44629
-RMD160 (xfce4/xfwm4-4.0.3.1.tar.gz) = 92345c5faadee369add950cf923750cc1ae07ebc
-SHA1 (xfce4/xfwm4-4.0.3.1.tar.gz) = 10e692153b6a020d60ee0d11e35de1ce8030e355
+MD5 (xfce4/xfwm4-4.0.5.tar.gz) = bc061116aec0e4c45aad6d8725e619c5
+RMD160 (xfce4/xfwm4-4.0.5.tar.gz) = 72a2453c7dd1b334191429004273efcee4b5b508
+SHA1 (xfce4/xfwm4-4.0.5.tar.gz) = 5a21c7ecb130837a02598107076637e519e84ae1
diff --git a/x11/xfce4/desktop/xfwm4/pkg/PLIST b/x11/xfce4/desktop/xfwm4/pkg/PLIST
index adfa12cecca..fb57dd86117 100644
--- a/x11/xfce4/desktop/xfwm4/pkg/PLIST
+++ b/x11/xfce4/desktop/xfwm4/pkg/PLIST
@@ -1,4 +1,4 @@
-@comment $OpenBSD: PLIST,v 1.3 2004/01/09 01:27:42 jolan Exp $
+@comment $OpenBSD: PLIST,v 1.4 2004/04/18 00:28:58 jolan Exp $
 bin/xfwm4
 lib/xfce4/mcs-plugins/margins_plugin.a
 lib/xfce4/mcs-plugins/margins_plugin.la
@@ -8,15 +8,18 @@ lib/xfce4/mcs-plugins/xfwm4_plugin.la
 lib/xfce4/mcs-plugins/xfwm4_plugin.so
 share/locale/ar/LC_MESSAGES/xfwm4.mo
 share/locale/az/LC_MESSAGES/xfwm4.mo
+share/locale/bg/LC_MESSAGES/xfwm4.mo
 share/locale/ca/LC_MESSAGES/xfwm4.mo
 share/locale/cs/LC_MESSAGES/xfwm4.mo
 share/locale/de/LC_MESSAGES/xfwm4.mo
 share/locale/es/LC_MESSAGES/xfwm4.mo
 share/locale/es_MX/LC_MESSAGES/xfwm4.mo
+share/locale/fa_IR/LC_MESSAGES/xfwm4.mo
 share/locale/fi/LC_MESSAGES/xfwm4.mo
 share/locale/fr/LC_MESSAGES/xfwm4.mo
 share/locale/hi/LC_MESSAGES/xfwm4.mo
 share/locale/hu/LC_MESSAGES/xfwm4.mo
+share/locale/it/LC_MESSAGES/xfwm4.mo
 share/locale/ja/LC_MESSAGES/xfwm4.mo
 share/locale/ko/LC_MESSAGES/xfwm4.mo
 share/locale/lt/LC_MESSAGES/xfwm4.mo
@@ -24,6 +27,7 @@ share/locale/ms/LC_MESSAGES/xfwm4.mo
 share/locale/nl/LC_MESSAGES/xfwm4.mo
 share/locale/no/LC_MESSAGES/xfwm4.mo
 share/locale/pl/LC_MESSAGES/xfwm4.mo
+share/locale/pt_BR/LC_MESSAGES/xfwm4.mo
 share/locale/pt_PT/LC_MESSAGES/xfwm4.mo
 share/locale/ru/LC_MESSAGES/xfwm4.mo
 share/locale/sv/LC_MESSAGES/xfwm4.mo
diff --git a/x11/xfce4/libraries/Makefile.inc b/x11/xfce4/libraries/Makefile.inc
index 56735fcb8d6..507994cd3ec 100644
--- a/x11/xfce4/libraries/Makefile.inc
+++ b/x11/xfce4/libraries/Makefile.inc
@@ -1,8 +1,8 @@
-V?=	4.0.3
+V?=	4.0.5
 
 CATEGORIES?=	x11 x11/xfce4 x11/xfce4/libraries
 
-MASTER_SITES?=	http://www.xfce.org/archive/xfce-${V}/src/
+MASTER_SITES?=	http://hannelore.f1.fhtw-berlin.de/mirrors/xfce4/xfce-${V}/src/
 DIST_SUBDIR?=	xfce4
 
 HOMEPAGE?=	http://xfce.org/index.php?page=overview
diff --git a/x11/xfce4/libraries/libxfce4mcs/distinfo b/x11/xfce4/libraries/libxfce4mcs/distinfo
index f5bd27e0e2f..3b678983ecd 100644
--- a/x11/xfce4/libraries/libxfce4mcs/distinfo
+++ b/x11/xfce4/libraries/libxfce4mcs/distinfo
@@ -1,3 +1,3 @@
-MD5 (xfce4/libxfce4mcs-4.0.3.tar.gz) = 580d87efb633ac54f0e13eb543def65a
-RMD160 (xfce4/libxfce4mcs-4.0.3.tar.gz) = 057df7576a59c16be4ff384b924f703662ab2f70
-SHA1 (xfce4/libxfce4mcs-4.0.3.tar.gz) = 0c88de06a0237dbaeb9425c0e552167cd9987dff
+MD5 (xfce4/libxfce4mcs-4.0.5.tar.gz) = a8d19a7d754f6800eb73e4e22c91424d
+RMD160 (xfce4/libxfce4mcs-4.0.5.tar.gz) = e12f6d2c0f202680f5062267287e6c746e4b9c22
+SHA1 (xfce4/libxfce4mcs-4.0.5.tar.gz) = d75a2339778682973119470c6dec1731a8818fff
diff --git a/x11/xfce4/libraries/libxfce4util/distinfo b/x11/xfce4/libraries/libxfce4util/distinfo
index b39f233f3d3..b8fdd419bbb 100644
--- a/x11/xfce4/libraries/libxfce4util/distinfo
+++ b/x11/xfce4/libraries/libxfce4util/distinfo
@@ -1,3 +1,3 @@
-MD5 (xfce4/libxfce4util-4.0.3.tar.gz) = d537061181177f5777f0b3c48af5294b
-RMD160 (xfce4/libxfce4util-4.0.3.tar.gz) = 5d954d653d9698f415bf3231585d37cc7e5ca7cc
-SHA1 (xfce4/libxfce4util-4.0.3.tar.gz) = 14bdb44fc1317081dad56bf45f86d961a546e967
+MD5 (xfce4/libxfce4util-4.0.5.tar.gz) = 88cfd1c646233621c2e5c2fa170ccc6c
+RMD160 (xfce4/libxfce4util-4.0.5.tar.gz) = 893ffb570e7ab5f2a540909518641af95422bace
+SHA1 (xfce4/libxfce4util-4.0.5.tar.gz) = 45a0286d342d5ef937f9ba703cd994662edbcbab
diff --git a/x11/xfce4/libraries/libxfce4util/pkg/PLIST b/x11/xfce4/libraries/libxfce4util/pkg/PLIST
index 8e2a00a8d9a..7744c852790 100644
--- a/x11/xfce4/libraries/libxfce4util/pkg/PLIST
+++ b/x11/xfce4/libraries/libxfce4util/pkg/PLIST
@@ -1,6 +1,8 @@
-@comment $OpenBSD: PLIST,v 1.2 2003/12/22 21:48:00 jolan Exp $
+@comment $OpenBSD: PLIST,v 1.3 2004/04/18 00:28:58 jolan Exp $
 include/xfce4/libxfce4util/debug.h
 include/xfce4/libxfce4util/i18n.h
+include/xfce4/libxfce4util/libxfce4util-config.h
+include/xfce4/libxfce4util/libxfce4util.h
 include/xfce4/libxfce4util/utf8.h
 include/xfce4/libxfce4util/util.h
 lib/libxfce4util.a
diff --git a/x11/xfce4/libraries/libxfcegui4/distinfo b/x11/xfce4/libraries/libxfcegui4/distinfo
index 6800966c8f8..bb3b9a5d618 100644
--- a/x11/xfce4/libraries/libxfcegui4/distinfo
+++ b/x11/xfce4/libraries/libxfcegui4/distinfo
@@ -1,3 +1,3 @@
-MD5 (xfce4/libxfcegui4-4.0.3.tar.gz) = 36c32e545df8261905fade645a9430f6
-RMD160 (xfce4/libxfcegui4-4.0.3.tar.gz) = dc53249cc077158c076986de3ec8c87e39642e94
-SHA1 (xfce4/libxfcegui4-4.0.3.tar.gz) = c774342a8136ca0603229be4afb92a4585a7e101
+MD5 (xfce4/libxfcegui4-4.0.5.tar.gz) = 97c2cb99c284b2e55270d5723cd422d6
+RMD160 (xfce4/libxfcegui4-4.0.5.tar.gz) = 6b90fca194719ff5ad41c4203d3172f1911060fb
+SHA1 (xfce4/libxfcegui4-4.0.5.tar.gz) = cb7e7c729886b0f74e5e570965fd350f772dcf71
diff --git a/x11/xfce4/libraries/libxfcegui4/pkg/PFRAG.shared b/x11/xfce4/libraries/libxfcegui4/pkg/PFRAG.shared
index 98aa513650a..9514c47c936 100644
--- a/x11/xfce4/libraries/libxfcegui4/pkg/PFRAG.shared
+++ b/x11/xfce4/libraries/libxfcegui4/pkg/PFRAG.shared
@@ -1,3 +1,3 @@
-@comment $OpenBSD: PFRAG.shared,v 1.2 2003/12/22 21:48:00 jolan Exp $
-lib/libxfcegui4.so.1.6
+@comment $OpenBSD: PFRAG.shared,v 1.3 2004/04/18 00:28:58 jolan Exp $
+lib/libxfcegui4.so.1.9
 DYNLIBDIR(%D/lib)
diff --git a/x11/xfce4/plugins/Makefile.inc b/x11/xfce4/plugins/Makefile.inc
index 340e39c75bc..6fff2063da4 100644
--- a/x11/xfce4/plugins/Makefile.inc
+++ b/x11/xfce4/plugins/Makefile.inc
@@ -1,8 +1,8 @@
-V?=	4.0.3
+V?=	4.0.5
 
 CATEGORIES?=	x11 x11/xfce4 x11/xfce4-plugins
 
-MASTER_SITE_EXTRAS=	http://www.xfce.org/archive/xfce-${V}/src/
+MASTER_SITE_EXTRAS=	http://hannelore.f1.fhtw-berlin.de/mirrors/xfce4/xfce-${V}/src/
 MASTER_SITE_GOODIES=	http://download.berlios.de/xfce-goodies/
 DIST_SUBDIR?=	xfce4
 
diff --git a/x11/xfce4/plugins/xfce4-mixer/distinfo b/x11/xfce4/plugins/xfce4-mixer/distinfo
index bdbd8922fad..138535681f4 100644
--- a/x11/xfce4/plugins/xfce4-mixer/distinfo
+++ b/x11/xfce4/plugins/xfce4-mixer/distinfo
@@ -1,3 +1,3 @@
-MD5 (xfce4/xfce4-mixer-4.0.3.tar.gz) = 242cd1abe47e1cc35e5888f76ac4f3da
-RMD160 (xfce4/xfce4-mixer-4.0.3.tar.gz) = 6d3d3ca037b89f5fe8f72552d61ce8557c3b02bd
-SHA1 (xfce4/xfce4-mixer-4.0.3.tar.gz) = 93c92fd9bf318abc4108a404a079bac91d45a305
+MD5 (xfce4/xfce4-mixer-4.0.5.tar.gz) = 01d5e15d3740b87a8860557af07d5fbb
+RMD160 (xfce4/xfce4-mixer-4.0.5.tar.gz) = cee7fc480b256050dbb929cdf5b355253940807a
+SHA1 (xfce4/xfce4-mixer-4.0.5.tar.gz) = fc990b3d1c5d136735e5c1633f8406cabf208e41
diff --git a/x11/xfce4/plugins/xfce4-mixer/pkg/PLIST b/x11/xfce4/plugins/xfce4-mixer/pkg/PLIST
index 111a4868d31..b65d9520857 100644
--- a/x11/xfce4/plugins/xfce4-mixer/pkg/PLIST
+++ b/x11/xfce4/plugins/xfce4-mixer/pkg/PLIST
@@ -1,21 +1,27 @@
-@comment $OpenBSD: PLIST,v 1.1.1.1 2004/01/16 04:31:18 jolan Exp $
+@comment $OpenBSD: PLIST,v 1.2 2004/04/18 00:28:58 jolan Exp $
 lib/xfce4/panel-plugins/libmixer.a
 lib/xfce4/panel-plugins/libmixer.la
 lib/xfce4/panel-plugins/libmixer.so
+share/locale/ar/LC_MESSAGES/xfce4-mixer.mo
 share/locale/az/LC_MESSAGES/xfce4-mixer.mo
+share/locale/bg/LC_MESSAGES/xfce4-mixer.mo
 share/locale/ca/LC_MESSAGES/xfce4-mixer.mo
 share/locale/cs/LC_MESSAGES/xfce4-mixer.mo
 share/locale/de/LC_MESSAGES/xfce4-mixer.mo
+share/locale/es/LC_MESSAGES/xfce4-mixer.mo
+share/locale/fa_IR/LC_MESSAGES/xfce4-mixer.mo
 share/locale/fr/LC_MESSAGES/xfce4-mixer.mo
 share/locale/hi/LC_MESSAGES/xfce4-mixer.mo
 share/locale/hu/LC_MESSAGES/xfce4-mixer.mo
 share/locale/it/LC_MESSAGES/xfce4-mixer.mo
+share/locale/ja/LC_MESSAGES/xfce4-mixer.mo
 share/locale/ko/LC_MESSAGES/xfce4-mixer.mo
 share/locale/lt/LC_MESSAGES/xfce4-mixer.mo
 share/locale/ms/LC_MESSAGES/xfce4-mixer.mo
 share/locale/nl/LC_MESSAGES/xfce4-mixer.mo
 share/locale/no/LC_MESSAGES/xfce4-mixer.mo
 share/locale/pl/LC_MESSAGES/xfce4-mixer.mo
+share/locale/pt_BR/LC_MESSAGES/xfce4-mixer.mo
 share/locale/pt_PT/LC_MESSAGES/xfce4-mixer.mo
 share/locale/ru/LC_MESSAGES/xfce4-mixer.mo
 share/locale/ta/LC_MESSAGES/xfce4-mixer.mo
diff --git a/x11/xfce4/plugins/xfce4-systray/distinfo b/x11/xfce4/plugins/xfce4-systray/distinfo
index 327a30b4aeb..45eeabc2b46 100644
--- a/x11/xfce4/plugins/xfce4-systray/distinfo
+++ b/x11/xfce4/plugins/xfce4-systray/distinfo
@@ -1,3 +1,3 @@
-MD5 (xfce4/xfce4-systray-4.0.3.tar.gz) = 149f189e9cbaaa7ce8ed420dc0967dc4
-RMD160 (xfce4/xfce4-systray-4.0.3.tar.gz) = 1d321d96c672b72476c106390a057cdc912b06f1
-SHA1 (xfce4/xfce4-systray-4.0.3.tar.gz) = daf18a16596042a493d9781656970d091d02762a
+MD5 (xfce4/xfce4-systray-4.0.5.tar.gz) = 560d321dd0140d0f47a9f4a9de4801fe
+RMD160 (xfce4/xfce4-systray-4.0.5.tar.gz) = b29656ce842467439768a3b6af89a88a6832fe1f
+SHA1 (xfce4/xfce4-systray-4.0.5.tar.gz) = 136ef8056b110feb88040108c1da168e1ac4fe3a
diff --git a/x11/xfce4/plugins/xfce4-toys/distinfo b/x11/xfce4/plugins/xfce4-toys/distinfo
index 0f9c7411cc4..74214d355bf 100644
--- a/x11/xfce4/plugins/xfce4-toys/distinfo
+++ b/x11/xfce4/plugins/xfce4-toys/distinfo
@@ -1,3 +1,3 @@
-MD5 (xfce4/xfce4-toys-4.0.3.tar.gz) = 70e3f2c70edff5e74b81dcb95cd25022
-RMD160 (xfce4/xfce4-toys-4.0.3.tar.gz) = f053215061c0a096d68e055c7bf7d7227260c558
-SHA1 (xfce4/xfce4-toys-4.0.3.tar.gz) = 44cbfbfc07a3aeb2070226d4d9d799cc9844369d
+MD5 (xfce4/xfce4-toys-4.0.5.tar.gz) = 3ea43308a2c70cb5cac2197215a6d317
+RMD160 (xfce4/xfce4-toys-4.0.5.tar.gz) = 2ba49d3beb86b14e107fbcf9ba255d664f094bd7
+SHA1 (xfce4/xfce4-toys-4.0.5.tar.gz) = e7ec544af90935ffed8cce7b6fc73cc1b19bc2d8
diff --git a/x11/xfce4/plugins/xfce4-toys/pkg/PLIST b/x11/xfce4/plugins/xfce4-toys/pkg/PLIST
index 052cc42d1a5..1a8114efc24 100644
--- a/x11/xfce4/plugins/xfce4-toys/pkg/PLIST
+++ b/x11/xfce4/plugins/xfce4-toys/pkg/PLIST
@@ -1,12 +1,16 @@
-@comment $OpenBSD: PLIST,v 1.3 2004/01/09 01:27:43 jolan Exp $
+@comment $OpenBSD: PLIST,v 1.4 2004/04/18 00:28:58 jolan Exp $
 bin/xfce4-tips
 lib/xfce4/panel-plugins/libeyes.a
 lib/xfce4/panel-plugins/libeyes.la
 lib/xfce4/panel-plugins/libeyes.so
+share/locale/ar/LC_MESSAGES/xfce4-toys.mo
 share/locale/az/LC_MESSAGES/xfce4-toys.mo
+share/locale/bg/LC_MESSAGES/xfce4-toys.mo
 share/locale/ca/LC_MESSAGES/xfce4-toys.mo
 share/locale/cs/LC_MESSAGES/xfce4-toys.mo
 share/locale/de/LC_MESSAGES/xfce4-toys.mo
+share/locale/es/LC_MESSAGES/xfce4-toys.mo
+share/locale/fa_IR/LC_MESSAGES/xfce4-toys.mo
 share/locale/fr/LC_MESSAGES/xfce4-toys.mo
 share/locale/hi/LC_MESSAGES/xfce4-toys.mo
 share/locale/hu/LC_MESSAGES/xfce4-toys.mo
@@ -17,6 +21,7 @@ share/locale/ms/LC_MESSAGES/xfce4-toys.mo
 share/locale/nl/LC_MESSAGES/xfce4-toys.mo
 share/locale/no/LC_MESSAGES/xfce4-toys.mo
 share/locale/pl/LC_MESSAGES/xfce4-toys.mo
+share/locale/pt_BR/LC_MESSAGES/xfce4-toys.mo
 share/locale/pt_PT/LC_MESSAGES/xfce4-toys.mo
 share/locale/ru/LC_MESSAGES/xfce4-toys.mo
 share/locale/sv/LC_MESSAGES/xfce4-toys.mo
diff --git a/x11/xfce4/plugins/xfce4-trigger-launcher/distinfo b/x11/xfce4/plugins/xfce4-trigger-launcher/distinfo
index 0069d131ffe..6f2aa130b9f 100644
--- a/x11/xfce4/plugins/xfce4-trigger-launcher/distinfo
+++ b/x11/xfce4/plugins/xfce4-trigger-launcher/distinfo
@@ -1,3 +1,3 @@
-MD5 (xfce4/xfce4-trigger-launcher-4.0.3.tar.gz) = fac20eb491536c9ea042cc651db07180
-RMD160 (xfce4/xfce4-trigger-launcher-4.0.3.tar.gz) = 66aa0adb7d9bfa861936cb55304b4c7745a5a988
-SHA1 (xfce4/xfce4-trigger-launcher-4.0.3.tar.gz) = 84a6d057cdd3877204f19a6de433db2b25233c1b
+MD5 (xfce4/xfce4-trigger-launcher-4.0.5.tar.gz) = 01812b93a4f072eec89f03d8dd2c20f8
+RMD160 (xfce4/xfce4-trigger-launcher-4.0.5.tar.gz) = 7a6c025ef95e86b00537a2405b0e06d52791103a
+SHA1 (xfce4/xfce4-trigger-launcher-4.0.5.tar.gz) = afb6c518ee1d5ad2278209b3e1ca59ee1ce64e22
diff --git a/x11/xfce4/plugins/xfce4-trigger-launcher/pkg/PLIST b/x11/xfce4/plugins/xfce4-trigger-launcher/pkg/PLIST
index 8ca546d66c7..093539eca8f 100644
--- a/x11/xfce4/plugins/xfce4-trigger-launcher/pkg/PLIST
+++ b/x11/xfce4/plugins/xfce4-trigger-launcher/pkg/PLIST
@@ -1,11 +1,15 @@
-@comment $OpenBSD: PLIST,v 1.3 2004/01/09 01:27:43 jolan Exp $
+@comment $OpenBSD: PLIST,v 1.4 2004/04/18 00:28:58 jolan Exp $
 lib/xfce4/panel-plugins/libtriggerlauncher.a
 lib/xfce4/panel-plugins/libtriggerlauncher.la
 lib/xfce4/panel-plugins/libtriggerlauncher.so
+share/locale/ar/LC_MESSAGES/xfce4-trigger-launcher.mo
 share/locale/az/LC_MESSAGES/xfce4-trigger-launcher.mo
+share/locale/bg/LC_MESSAGES/xfce4-trigger-launcher.mo
 share/locale/ca/LC_MESSAGES/xfce4-trigger-launcher.mo
 share/locale/cs/LC_MESSAGES/xfce4-trigger-launcher.mo
 share/locale/de/LC_MESSAGES/xfce4-trigger-launcher.mo
+share/locale/es/LC_MESSAGES/xfce4-trigger-launcher.mo
+share/locale/fa_IR/LC_MESSAGES/xfce4-trigger-launcher.mo
 share/locale/fr/LC_MESSAGES/xfce4-trigger-launcher.mo
 share/locale/hi/LC_MESSAGES/xfce4-trigger-launcher.mo
 share/locale/hu/LC_MESSAGES/xfce4-trigger-launcher.mo
@@ -16,6 +20,7 @@ share/locale/ms/LC_MESSAGES/xfce4-trigger-launcher.mo
 share/locale/nl/LC_MESSAGES/xfce4-trigger-launcher.mo
 share/locale/no/LC_MESSAGES/xfce4-trigger-launcher.mo
 share/locale/pl/LC_MESSAGES/xfce4-trigger-launcher.mo
+share/locale/pt_BR/LC_MESSAGES/xfce4-trigger-launcher.mo
 share/locale/pt_PT/LC_MESSAGES/xfce4-trigger-launcher.mo
 share/locale/ru/LC_MESSAGES/xfce4-trigger-launcher.mo
 share/locale/sv/LC_MESSAGES/xfce4-trigger-launcher.mo
diff --git a/x11/xfce4/plugins/xfce4-weather-plugin/Makefile b/x11/xfce4/plugins/xfce4-weather-plugin/Makefile
index 2cf23d47e13..588f55d8e07 100644
--- a/x11/xfce4/plugins/xfce4-weather-plugin/Makefile
+++ b/x11/xfce4/plugins/xfce4-weather-plugin/Makefile
@@ -1,4 +1,5 @@
-# $OpenBSD: Makefile,v 1.1.1.1 2004/04/08 01:56:44 jolan Exp $
+# $OpenBSD: Makefile,v 1.2 2004/04/18 00:28:58 jolan Exp $
+ONLY_FOR_ARCHS=	i386
 
 COMMENT=	"xfce4 plugin showing the temperature/weather conditions"
 DISTNAME=	xfce4-weather-plugin-0.3.0
diff --git a/x11/xfce4/themes/Makefile.inc b/x11/xfce4/themes/Makefile.inc
index d8dfd998589..03008dbec5a 100644
--- a/x11/xfce4/themes/Makefile.inc
+++ b/x11/xfce4/themes/Makefile.inc
@@ -1,8 +1,8 @@
-V?=	4.0.3
+V?=	4.0.5
 
 CATEGORIES?=	x11 x11/xfce4 x11/xfce4/themes
 
-MASTER_SITES?=	http://www.xfce.org/archive/xfce-${V}/src/
+MASTER_SITES?=	http://hannelore.f1.fhtw-berlin.de/mirrors/xfce4/xfce-${V}/src/
 DIST_SUBDIR?=	xfce4
 
 HOMEPAGE?=	http://www.xfce.org/
diff --git a/x11/xfce4/themes/gtk-xfce-engine-2/Makefile b/x11/xfce4/themes/gtk-xfce-engine-2/Makefile
index 53c2b3d4756..5fc0492699d 100644
--- a/x11/xfce4/themes/gtk-xfce-engine-2/Makefile
+++ b/x11/xfce4/themes/gtk-xfce-engine-2/Makefile
@@ -1,7 +1,7 @@
-# $OpenBSD: Makefile,v 1.2 2004/01/09 01:27:43 jolan Exp $
+# $OpenBSD: Makefile,v 1.3 2004/04/18 00:28:58 jolan Exp $
 
 COMMENT=	"theme engine for gtk+2"
-DISTNAME=	gtk-xfce-engine-2.1.8
+DISTNAME=	gtk-xfce-engine-2.1.9
 
 BUILD_DEPENDS=	${PKG}
 RUN_DEPENDS=	${XFDESK}
diff --git a/x11/xfce4/themes/gtk-xfce-engine-2/distinfo b/x11/xfce4/themes/gtk-xfce-engine-2/distinfo
index 1690242447e..a0fea5d8e8f 100644
--- a/x11/xfce4/themes/gtk-xfce-engine-2/distinfo
+++ b/x11/xfce4/themes/gtk-xfce-engine-2/distinfo
@@ -1,3 +1,3 @@
-MD5 (xfce4/gtk-xfce-engine-2.1.8.tar.gz) = 3e201017bd75523795091360958e1978
-RMD160 (xfce4/gtk-xfce-engine-2.1.8.tar.gz) = b26bd07da387616bf73b399c7c9d0f16bb8b9069
-SHA1 (xfce4/gtk-xfce-engine-2.1.8.tar.gz) = ae75c7cfcb71ef879d6b1628bda25bac4849d763
+MD5 (xfce4/gtk-xfce-engine-2.1.9.tar.gz) = f2a057cb840777684102cf127b38f40b
+RMD160 (xfce4/gtk-xfce-engine-2.1.9.tar.gz) = 010fc49b75746790da734eff6b8d039da748b115
+SHA1 (xfce4/gtk-xfce-engine-2.1.9.tar.gz) = 5c0e374aad0685d4132a9bfa5a82b3e31384f4f7
diff --git a/x11/xfce4/themes/xfce4-artwork/Makefile b/x11/xfce4/themes/xfce4-artwork/Makefile
index fd9c583820a..6aaaac59484 100644
--- a/x11/xfce4/themes/xfce4-artwork/Makefile
+++ b/x11/xfce4/themes/xfce4-artwork/Makefile
@@ -1,4 +1,5 @@
-# $OpenBSD: Makefile,v 1.1.1.1 2003/12/15 06:11:52 jolan Exp $
+# $OpenBSD: Makefile,v 1.2 2004/04/18 00:28:58 jolan Exp $
+PKG_ARCH=	*
 
 COMMENT=	"additional background images for xfce4"
 DISTNAME=	xfce4-artwork-0.0.4
diff --git a/x11/xfce4/themes/xfce4-themes/Makefile b/x11/xfce4/themes/xfce4-themes/Makefile
index 5902814f0bb..6d684bb8884 100644
--- a/x11/xfce4/themes/xfce4-themes/Makefile
+++ b/x11/xfce4/themes/xfce4-themes/Makefile
@@ -1,4 +1,5 @@
-# $OpenBSD: Makefile,v 1.2 2004/01/09 01:27:43 jolan Exp $
+# $OpenBSD: Makefile,v 1.3 2004/04/18 00:28:58 jolan Exp $
+PKG_ARCH=	*
 
 COMMENT=	"icon themes for the xfce4 panel"
 DISTNAME=	xfce4-themes-${V}
diff --git a/x11/xfce4/themes/xfce4-themes/distinfo b/x11/xfce4/themes/xfce4-themes/distinfo
index 0ad5713eeee..be4bf47a19c 100644
--- a/x11/xfce4/themes/xfce4-themes/distinfo
+++ b/x11/xfce4/themes/xfce4-themes/distinfo
@@ -1,3 +1,3 @@
-MD5 (xfce4/xfce4-themes-4.0.3.tar.gz) = 9ab6df01dd7c461b3f13c97d6579ed46
-RMD160 (xfce4/xfce4-themes-4.0.3.tar.gz) = b4affc85e6209db6d3f4c65db08b16adda7b5e71
-SHA1 (xfce4/xfce4-themes-4.0.3.tar.gz) = 85da77514c8e589cb54c82d4b4628bc34d719a2b
+MD5 (xfce4/xfce4-themes-4.0.5.tar.gz) = 2edc83712f0d7594ba04fa042e4beba5
+RMD160 (xfce4/xfce4-themes-4.0.5.tar.gz) = a9cd76e4bff9299490e1d4fd20788fc7516ef11c
+SHA1 (xfce4/xfce4-themes-4.0.5.tar.gz) = 779e6cf7eb095c16c0710194136658e63e6f09e3
diff --git a/x11/xfce4/themes/xffm-icons/Makefile b/x11/xfce4/themes/xffm-icons/Makefile
index 33e937c6cca..6ee888cb37c 100644
--- a/x11/xfce4/themes/xffm-icons/Makefile
+++ b/x11/xfce4/themes/xffm-icons/Makefile
@@ -1,4 +1,5 @@
-# $OpenBSD: Makefile,v 1.2 2004/01/09 01:27:43 jolan Exp $
+# $OpenBSD: Makefile,v 1.3 2004/04/18 00:28:58 jolan Exp $
+PKG_ARCH=	*
 
 COMMENT=	"icon themes for the xffm file manager"
 DISTNAME=	xffm-icons-${V}
diff --git a/x11/xfce4/themes/xffm-icons/distinfo b/x11/xfce4/themes/xffm-icons/distinfo
index 3222df57a01..ab85e696bdc 100644
--- a/x11/xfce4/themes/xffm-icons/distinfo
+++ b/x11/xfce4/themes/xffm-icons/distinfo
@@ -1,3 +1,3 @@
-MD5 (xfce4/xffm-icons-4.0.3.tar.gz) = d7a0cd85ea3a967364f084c07a802b76
-RMD160 (xfce4/xffm-icons-4.0.3.tar.gz) = 548d30867a05bb08fb4a1814b7cbd9faeac09f2f
-SHA1 (xfce4/xffm-icons-4.0.3.tar.gz) = a44f65c94a37c9fa1aee4a26092f2ac80e9dbdce
+MD5 (xfce4/xffm-icons-4.0.5.tar.gz) = d9c3248c3f42c61b739ffcb7de1d2b20
+RMD160 (xfce4/xffm-icons-4.0.5.tar.gz) = 57078e8206eabcdfad7bcda0eb0b9a9551339c9d
+SHA1 (xfce4/xffm-icons-4.0.5.tar.gz) = a873c9f0123d1941d25bccc2fdfd0179adaa4dd1
diff --git a/x11/xfce4/themes/xfwm4-themes/Makefile b/x11/xfce4/themes/xfwm4-themes/Makefile
index 8ecdb9cf6f5..4dbd1cc0abd 100644
--- a/x11/xfce4/themes/xfwm4-themes/Makefile
+++ b/x11/xfce4/themes/xfwm4-themes/Makefile
@@ -1,4 +1,5 @@
-# $OpenBSD: Makefile,v 1.2 2004/01/09 01:27:43 jolan Exp $
+# $OpenBSD: Makefile,v 1.3 2004/04/18 00:28:58 jolan Exp $
+PKG_ARCH=	*
 
 COMMENT=	"window decoration themes for xfwm4"
 DISTNAME=	xfwm4-themes-${V}
diff --git a/x11/xfce4/themes/xfwm4-themes/distinfo b/x11/xfce4/themes/xfwm4-themes/distinfo
index 12236ce0a99..a41232a35ad 100644
--- a/x11/xfce4/themes/xfwm4-themes/distinfo
+++ b/x11/xfce4/themes/xfwm4-themes/distinfo
@@ -1,3 +1,3 @@
-MD5 (xfce4/xfwm4-themes-4.0.3.tar.gz) = 96f17790120c74fcc5ab9e0c53cb7ba8
-RMD160 (xfce4/xfwm4-themes-4.0.3.tar.gz) = a008355f28ef90d2812e39b86ba74840775de7d8
-SHA1 (xfce4/xfwm4-themes-4.0.3.tar.gz) = 14c6693cf154837b46f74faf24c28bff9b42c313
+MD5 (xfce4/xfwm4-themes-4.0.5.tar.gz) = f1335faac992076deea0446c2c30d288
+RMD160 (xfce4/xfwm4-themes-4.0.5.tar.gz) = e6317cc284cc7b38dd69320dcbd9d3f6faefb347
+SHA1 (xfce4/xfwm4-themes-4.0.5.tar.gz) = 320ac3c54cee104de7c1586935d0bdd22f0d592e