Update to 4.0.0 release.

42 files changed, 89 insertions, 132 deletions

diff --git a/audio/xfce4-mixer/Makefile b/audio/xfce4-mixer/Makefile
index 47a171cbec2e..3d5cf334f603 100644
--- a/audio/xfce4-mixer/Makefile
+++ b/audio/xfce4-mixer/Makefile
@@ -6,13 +6,10 @@
 #
 
 PORTNAME=	xfce4-mixer
-PORTVERSION=	3.99.3
+PORTVERSION=	4.0.0
 CATEGORIES=	audio xfce
-MASTER_SITES=	http://www.xfce.org/archive/xfce4-rc3/src/ \
-		ftp://ftp.unix-ag.org/user/bmeurer/xfce4/rc3/separate/ \
-		http://usuarios.lycos.es/xfce4/tarballs/rc3/separate/ \
-		http://linux.imp.mx/xfce4/rc2/xfce4-rc3/src/
-DIST_SUBDIR=	xfce4
+MASTER_SITES=	http://www.xfce.org/archive/xfce-${PORTVERSION}/src/ \
+		http://linux.imp.mx/xfce4/xfce_${PORTVERSION}/src/
 
 MAINTAINER=	oliver@FreeBSD.org
 COMMENT=	XFce 4 volume mixer module for xfce4-panel
diff --git a/audio/xfce4-mixer/distinfo b/audio/xfce4-mixer/distinfo
index f760c8ed12b2..8d967460fe75 100644
--- a/audio/xfce4-mixer/distinfo
+++ b/audio/xfce4-mixer/distinfo
@@ -1 +1 @@
-MD5 (xfce4/xfce4-mixer-3.99.3.tar.gz) = c9c5e7fb04b57e743005f5e2660ff58f
+MD5 (xfce4-mixer-4.0.0.tar.gz) = 1c5038b557f144b3230b1898b2c96889
diff --git a/games/xfce4-toys/Makefile b/games/xfce4-toys/Makefile
index c4cf56154d75..df3d4500d8ce 100644
--- a/games/xfce4-toys/Makefile
+++ b/games/xfce4-toys/Makefile
@@ -6,13 +6,10 @@
 #
 
 PORTNAME=	xfce4-toys
-PORTVERSION=	3.99.3
+PORTVERSION=	4.0.0
 CATEGORIES=	games xfce
-MASTER_SITES=	http://www.xfce.org/archive/xfce4-rc3/src/ \
-		ftp://ftp.unix-ag.org/user/bmeurer/xfce4/rc3/separate/ \
-		http://usuarios.lycos.es/xfce4/tarballs/rc3/separate/ \
-		http://linux.imp.mx/xfce4/rc2/xfce4-rc3/src/
-DIST_SUBDIR=	xfce4
+MASTER_SITES=	http://www.xfce.org/archive/xfce-${PORTVERSION}/src/ \
+		http://linux.imp.mx/xfce4/xfce_${PORTVERSION}/src/
 
 MAINTAINER=	oliver@FreeBSD.org
 COMMENT=	Toys for the XFce 4 panel
diff --git a/games/xfce4-toys/distinfo b/games/xfce4-toys/distinfo
index e40dc237d6ba..d76adaeed137 100644
--- a/games/xfce4-toys/distinfo
+++ b/games/xfce4-toys/distinfo
@@ -1 +1 @@
-MD5 (xfce4/xfce4-toys-3.99.3.tar.gz) = a62744b799efe4756c6c0b47612c0316
+MD5 (xfce4-toys-4.0.0.tar.gz) = b4077de7b2e69fa57798ffad00df5d6a
diff --git a/misc/xfce4-iconbox/Makefile b/misc/xfce4-iconbox/Makefile
index 55ea257f7131..4fb677d68b7e 100644
--- a/misc/xfce4-iconbox/Makefile
+++ b/misc/xfce4-iconbox/Makefile
@@ -6,13 +6,10 @@
 #
 
 PORTNAME=	xfce4-iconbox
-PORTVERSION=	3.99.3
+PORTVERSION=	4.0.0
 CATEGORIES=	misc xfce
-MASTER_SITES=	http://www.xfce.org/archive/xfce4-rc3/src/ \
-		ftp://ftp.unix-ag.org/user/bmeurer/xfce4/rc3/separate/ \
-		http://usuarios.lycos.es/xfce4/tarballs/rc3/separate/ \
-		http://linux.imp.mx/xfce4/rc2/xfce4-rc3/src/
-DIST_SUBDIR=	xfce4
+MASTER_SITES=	http://www.xfce.org/archive/xfce-${PORTVERSION}/src/ \
+		http://linux.imp.mx/xfce4/xfce_${PORTVERSION}/src/
 
 MAINTAINER=	oliver@FreeBSD.org
 COMMENT=	XFce 4 icon box, an alternative taskbar
diff --git a/misc/xfce4-iconbox/distinfo b/misc/xfce4-iconbox/distinfo
index e70283b66e98..66a28f9bd600 100644
--- a/misc/xfce4-iconbox/distinfo
+++ b/misc/xfce4-iconbox/distinfo
@@ -1 +1 @@
-MD5 (xfce4/xfce4-iconbox-3.99.3.tar.gz) = 52e2674b2ab27706bb3912640287189b
+MD5 (xfce4-iconbox-4.0.0.tar.gz) = c38a8baeb16098b8251b000e6a6f459e
diff --git a/misc/xfce4-panel-themes/Makefile b/misc/xfce4-panel-themes/Makefile
index 8e5d85bc4ead..85c3ee7f262a 100644
--- a/misc/xfce4-panel-themes/Makefile
+++ b/misc/xfce4-panel-themes/Makefile
@@ -6,14 +6,11 @@
 #
 
 PORTNAME=	xfce4-panel-themes
-PORTVERSION=	3.99.3
+PORTVERSION=	4.0.0
 CATEGORIES=	misc xfce
-MASTER_SITES=	http://www.xfce.org/archive/xfce4-rc3/src/ \
-		ftp://ftp.unix-ag.org/user/bmeurer/xfce4/rc3/separate/ \
-		http://usuarios.lycos.es/xfce4/tarballs/rc3/separate/ \
-		http://linux.imp.mx/xfce4/rc2/xfce4-rc3/src/
+MASTER_SITES=	http://www.xfce.org/archive/xfce-${PORTVERSION}/src/ \
+		http://linux.imp.mx/xfce4/xfce_${PORTVERSION}/src/
 DISTNAME=	xfce4-themes-${PORTVERSION}
-DIST_SUBDIR=	xfce4
 
 MAINTAINER=	oliver@FreeBSD.org
 COMMENT=	Icon themes for the XFce 4 panel
diff --git a/misc/xfce4-panel-themes/distinfo b/misc/xfce4-panel-themes/distinfo
index e1647f744bb5..fee1d8bdb00d 100644
--- a/misc/xfce4-panel-themes/distinfo
+++ b/misc/xfce4-panel-themes/distinfo
@@ -1 +1 @@
-MD5 (xfce4/xfce4-themes-3.99.3.tar.gz) = 8570fa9b7acbfbfb0294c63373217ac8
+MD5 (xfce4-themes-4.0.0.tar.gz) = 0527f2257c14e619cf1b2c4599c95765
diff --git a/misc/xfce4-wm-themes/Makefile b/misc/xfce4-wm-themes/Makefile
index 6ddde3abfe2d..705287203ee5 100644
--- a/misc/xfce4-wm-themes/Makefile
+++ b/misc/xfce4-wm-themes/Makefile
@@ -6,14 +6,11 @@
 #
 
 PORTNAME=	xfce4-wm-themes
-PORTVERSION=	3.99.3
+PORTVERSION=	4.0.0
 CATEGORIES=	misc xfce
-MASTER_SITES=	http://www.xfce.org/archive/xfce4-rc3/src/ \
-		ftp://ftp.unix-ag.org/user/bmeurer/xfce4/rc3/separate/ \
-		http://usuarios.lycos.es/xfce4/tarballs/rc3/separate/ \
-		http://linux.imp.mx/xfce4/rc2/xfce4-rc3/src/
+MASTER_SITES=	http://www.xfce.org/archive/xfce-${PORTVERSION}/src/ \
+		http://linux.imp.mx/xfce4/xfce_${PORTVERSION}/src/
 DISTNAME=	xfwm4-themes-${PORTVERSION}
-DIST_SUBDIR=	xfce4
 
 MAINTAINER=	oliver@FreeBSD.org
 COMMENT=	XFce 4 window decoration themes for xfwm4
diff --git a/misc/xfce4-wm-themes/distinfo b/misc/xfce4-wm-themes/distinfo
index 0971ce255261..8a4b23ba0c03 100644
--- a/misc/xfce4-wm-themes/distinfo
+++ b/misc/xfce4-wm-themes/distinfo
@@ -1 +1 @@
-MD5 (xfce4/xfwm4-themes-3.99.3.tar.gz) = e630452918b80fff280a8744825f89f5
+MD5 (xfwm4-themes-4.0.0.tar.gz) = f9c0d0b053122ec4f20a76257d6607d1
diff --git a/misc/xfce4-wm-themes/pkg-plist b/misc/xfce4-wm-themes/pkg-plist
index bc847bb5c3d9..1a8aa07e86d2 100644
--- a/misc/xfce4-wm-themes/pkg-plist
+++ b/misc/xfce4-wm-themes/pkg-plist
@@ -1864,6 +1864,9 @@ share/xfwm4/themes/redmond/left-inactive.xpm
 share/xfwm4/themes/redmond/maximize-active.xpm
 share/xfwm4/themes/redmond/maximize-inactive.xpm
 share/xfwm4/themes/redmond/maximize-pressed.xpm
+share/xfwm4/themes/redmond/maximize-toggled-active.xpm
+share/xfwm4/themes/redmond/maximize-toggled-inactive.xpm
+share/xfwm4/themes/redmond/maximize-toggled-pressed.xpm
 share/xfwm4/themes/redmond/menu-active.xpm
 share/xfwm4/themes/redmond/menu-inactive.xpm
 share/xfwm4/themes/redmond/menu-pressed.xpm
@@ -1908,6 +1911,9 @@ share/xfwm4/themes/redmondxp/left-inactive.xpm
 share/xfwm4/themes/redmondxp/maximize-active.xpm
 share/xfwm4/themes/redmondxp/maximize-inactive.xpm
 share/xfwm4/themes/redmondxp/maximize-pressed.xpm
+share/xfwm4/themes/redmondxp/maximize-toggled-active.xpm
+share/xfwm4/themes/redmondxp/maximize-toggled-inactive.xpm
+share/xfwm4/themes/redmondxp/maximize-toggled-pressed.xpm
 share/xfwm4/themes/redmondxp/menu-active.xpm
 share/xfwm4/themes/redmondxp/menu-inactive.xpm
 share/xfwm4/themes/redmondxp/menu-pressed.xpm
diff --git a/print/xfce4-print/Makefile b/print/xfce4-print/Makefile
index 97203f743d30..3b336aac4920 100644
--- a/print/xfce4-print/Makefile
+++ b/print/xfce4-print/Makefile
@@ -6,14 +6,11 @@
 #
 
 PORTNAME=	xfce4-print
-PORTVERSION=	3.99.3
+PORTVERSION=	4.0.0
 CATEGORIES=	print xfce
-MASTER_SITES=	http://www.xfce.org/archive/xfce4-rc3/src/ \
-		ftp://ftp.unix-ag.org/user/bmeurer/xfce4/rc3/separate/ \
-		http://usuarios.lycos.es/xfce4/tarballs/rc3/separate/ \
-		http://linux.imp.mx/xfce4/rc2/xfce4-rc3/src/
+MASTER_SITES=	http://www.xfce.org/archive/xfce-${PORTVERSION}/src/ \
+		http://linux.imp.mx/xfce4/xfce_${PORTVERSION}/src/
 DISTNAME=	xfprint-${PORTVERSION}
-DIST_SUBDIR=	xfce4
 
 MAINTAINER=	oliver@FreeBSD.org
 COMMENT=	XFce 4 graphical frontend for printing
diff --git a/print/xfce4-print/distinfo b/print/xfce4-print/distinfo
index 25b51ed7d6f1..fecadc01fdf3 100644
--- a/print/xfce4-print/distinfo
+++ b/print/xfce4-print/distinfo
@@ -1 +1 @@
-MD5 (xfce4/xfprint-3.99.3.tar.gz) = 1d5da9ce4f894d55d625afc22efcbd07
+MD5 (xfprint-4.0.0.tar.gz) = b2ba1fa91737294785ce7a8b8a282d78
diff --git a/sysutils/xfce4-mcs-manager/Makefile b/sysutils/xfce4-mcs-manager/Makefile
index 897d40ab14f8..537cbb647f79 100644
--- a/sysutils/xfce4-mcs-manager/Makefile
+++ b/sysutils/xfce4-mcs-manager/Makefile
@@ -6,14 +6,11 @@
 #
 
 PORTNAME=	xfce4-mcs-manager
-PORTVERSION=	3.99.3
+PORTVERSION=	4.0.0
 CATEGORIES=	sysutils xfce
-MASTER_SITES=	http://www.xfce.org/archive/xfce4-rc3/src/ \
-		ftp://ftp.unix-ag.org/user/bmeurer/xfce4/rc3/separate/ \
-		http://usuarios.lycos.es/xfce4/tarballs/rc3/separate/ \
-		http://linux.imp.mx/xfce4/rc2/xfce4-rc3/src/
+MASTER_SITES=	http://www.xfce.org/archive/xfce-${PORTVERSION}/src/ \
+		http://linux.imp.mx/xfce4/xfce_${PORTVERSION}/src/
 DISTNAME=	xfce-mcs-manager-${PORTVERSION}
-DIST_SUBDIR=	xfce4
 
 MAINTAINER=	oliver@FreeBSD.org
 COMMENT=	XFce 4 settings manager
diff --git a/sysutils/xfce4-mcs-manager/distinfo b/sysutils/xfce4-mcs-manager/distinfo
index f761132fd804..bda272044981 100644
--- a/sysutils/xfce4-mcs-manager/distinfo
+++ b/sysutils/xfce4-mcs-manager/distinfo
@@ -1 +1 @@
-MD5 (xfce4/xfce-mcs-manager-3.99.3.tar.gz) = efa0059cf4ffcf877f2046fc09ebaf16
+MD5 (xfce-mcs-manager-4.0.0.tar.gz) = f6da38c4a0f906944e67fdb766860065
diff --git a/sysutils/xfce4-mcs-plugins/Makefile b/sysutils/xfce4-mcs-plugins/Makefile
index 3c70f2c9647f..8d8a43f66953 100644
--- a/sysutils/xfce4-mcs-plugins/Makefile
+++ b/sysutils/xfce4-mcs-plugins/Makefile
@@ -6,14 +6,11 @@
 #
 
 PORTNAME=	xfce4-mcs-plugins
-PORTVERSION=	3.99.3
+PORTVERSION=	4.0.0
 CATEGORIES=	sysutils xfce
-MASTER_SITES=	http://www.xfce.org/archive/xfce4-rc3/src/ \
-		ftp://ftp.unix-ag.org/user/bmeurer/xfce4/rc3/separate/ \
-		http://usuarios.lycos.es/xfce4/tarballs/rc3/separate/ \
-		http://linux.imp.mx/xfce4/rc2/xfce4-rc3/src/
+MASTER_SITES=	http://www.xfce.org/archive/xfce-${PORTVERSION}/src/ \
+		http://linux.imp.mx/xfce4/xfce_${PORTVERSION}/src/
 DISTNAME=	xfce-mcs-plugins-${PORTVERSION}
-DIST_SUBDIR=	xfce4
 
 MAINTAINER=	oliver@FreeBSD.org
 COMMENT=	XFce 4 settings manager plugins
diff --git a/sysutils/xfce4-mcs-plugins/distinfo b/sysutils/xfce4-mcs-plugins/distinfo
index 8bcf63bbe021..87aa83c6dec4 100644
--- a/sysutils/xfce4-mcs-plugins/distinfo
+++ b/sysutils/xfce4-mcs-plugins/distinfo
@@ -1 +1 @@
-MD5 (xfce4/xfce-mcs-plugins-3.99.3.tar.gz) = 241f57181a7799b14d50972fce88d1ae
+MD5 (xfce-mcs-plugins-4.0.0.tar.gz) = 7cdab07c5be1e57d344f7b8ed5bf2990
diff --git a/sysutils/xfce4-utils/Makefile b/sysutils/xfce4-utils/Makefile
index 8822c028d6e8..cb3c9f80e820 100644
--- a/sysutils/xfce4-utils/Makefile
+++ b/sysutils/xfce4-utils/Makefile
@@ -6,14 +6,11 @@
 #
 
 PORTNAME=	xfce4-utils
-PORTVERSION=	3.99.3
+PORTVERSION=	4.0.0
 CATEGORIES=	sysutils xfce
-MASTER_SITES=	http://www.xfce.org/archive/xfce4-rc3/src/ \
-		ftp://ftp.unix-ag.org/user/bmeurer/xfce4/rc3/separate/ \
-		http://usuarios.lycos.es/xfce4/tarballs/rc3/separate/ \
-		http://linux.imp.mx/xfce4/rc2/xfce4-rc3/src/
+MASTER_SITES=	http://www.xfce.org/archive/xfce-${PORTVERSION}/src/ \
+		http://linux.imp.mx/xfce4/xfce_${PORTVERSION}/src/
 DISTNAME=	xfce-utils-${PORTVERSION}
-DIST_SUBDIR=	xfce4
 
 MAINTAINER=	oliver@FreeBSD.org
 COMMENT=	XFce 4 essential utilities and scripts
@@ -23,7 +20,6 @@ LIB_DEPENDS=	xfce4util.1:${PORTSDIR}/x11/libxfce4util \
 		xfce4mcs-manager.1:${PORTSDIR}/sysutils/xfce4-mcs-manager
 
 USE_GNOME=	gtk20
-#USE_REINPLACE=	yes
 USE_X_PREFIX=	yes
 GNU_CONFIGURE=	yes
 CONFIGURE_TARGET=	--build=${ARCH}-portbld-freebsd${OSREL}
diff --git a/sysutils/xfce4-utils/distinfo b/sysutils/xfce4-utils/distinfo
index aaded0e01e62..9b0a8a5b961c 100644
--- a/sysutils/xfce4-utils/distinfo
+++ b/sysutils/xfce4-utils/distinfo
@@ -1 +1 @@
-MD5 (xfce4/xfce-utils-3.99.3.tar.gz) = 5b41384c6351bb80f5bd2f2941e0d453
+MD5 (xfce-utils-4.0.0.tar.gz) = dea0838049c21300ba0232297b8d8126
diff --git a/sysutils/xfce4-utils/pkg-plist b/sysutils/xfce4-utils/pkg-plist
index 36c7a34ee0be..70224ef0d883 100644
--- a/sysutils/xfce4-utils/pkg-plist
+++ b/sysutils/xfce4-utils/pkg-plist
@@ -19,9 +19,13 @@ share/xfce4/AUTHORS.html.ca
 share/xfce4/AUTHORS.html.de
 share/xfce4/AUTHORS.html.fr
 share/xfce4/COPYING
+share/xfce4/COPYING.html
 share/xfce4/BSD
+share/xfce4/BSD.html
 share/xfce4/LGPL
+share/xfce4/LGPL.html
 share/xfce4/GPL
+share/xfce4/GPL.html
 share/xfce4/INFO
 share/xfce4/INFO.ca
 share/xfce4/INFO.fr
diff --git a/x11-fm/xfce4-fm-icons/Makefile b/x11-fm/xfce4-fm-icons/Makefile
index efe4f0558af5..b4b6da66a9d8 100644
--- a/x11-fm/xfce4-fm-icons/Makefile
+++ b/x11-fm/xfce4-fm-icons/Makefile
@@ -6,14 +6,11 @@
 #
 
 PORTNAME=	xfce4-fm-icons
-PORTVERSION=	3.99.3
+PORTVERSION=	4.0.0
 CATEGORIES=	x11-fm xfce
-MASTER_SITES=	http://www.xfce.org/archive/xfce4-rc3/src/ \
-		ftp://ftp.unix-ag.org/user/bmeurer/xfce4/rc3/separate/ \
-		http://usuarios.lycos.es/xfce4/tarballs/rc3/separate/ \
-		http://linux.imp.mx/xfce4/rc2/xfce4-rc3/src/
+MASTER_SITES=	http://www.xfce.org/archive/xfce-${PORTVERSION}/src/ \
+		http://linux.imp.mx/xfce4/xfce_${PORTVERSION}/src/
 DISTNAME=	xffm-icons-${PORTVERSION}
-DIST_SUBDIR=	xfce4
 
 MAINTAINER=	oliver@FreeBSD.org
 COMMENT=	XFce 4 icon themes for the xffm file manager
diff --git a/x11-fm/xfce4-fm-icons/distinfo b/x11-fm/xfce4-fm-icons/distinfo
index 3aec8f57cf89..c3a805020829 100644
--- a/x11-fm/xfce4-fm-icons/distinfo
+++ b/x11-fm/xfce4-fm-icons/distinfo
@@ -1 +1 @@
-MD5 (xfce4/xffm-icons-3.99.3.tar.gz) = b1e1e98610bd5bc075fc6d70c6c6a184
+MD5 (xffm-icons-4.0.0.tar.gz) = b3577adcf9cef0364f16c03368e1e6fa
diff --git a/x11-fm/xfce4-fm/Makefile b/x11-fm/xfce4-fm/Makefile
index 3d058470066e..a13659645997 100644
--- a/x11-fm/xfce4-fm/Makefile
+++ b/x11-fm/xfce4-fm/Makefile
@@ -6,14 +6,11 @@
 #
 
 PORTNAME=	xfce4-fm
-PORTVERSION=	3.99.3
+PORTVERSION=	4.0.0
 CATEGORIES=	x11-fm xfce
-MASTER_SITES=	http://www.xfce.org/archive/xfce4-rc3/src/ \
-		ftp://ftp.unix-ag.org/user/bmeurer/xfce4/rc3/separate/ \
-		http://usuarios.lycos.es/xfce4/tarballs/rc3/separate/ \
-		http://linux.imp.mx/xfce4/rc2/xfce4-rc3/src/
+MASTER_SITES=	http://www.xfce.org/archive/xfce-${PORTVERSION}/src/ \
+		http://linux.imp.mx/xfce4/xfce_${PORTVERSION}/src/
 DISTNAME=	xffm-${PORTVERSION}
-DIST_SUBDIR=	xfce4
 
 MAINTAINER=	oliver@FreeBSD.org
 COMMENT=	XFce 4 file manager
diff --git a/x11-fm/xfce4-fm/distinfo b/x11-fm/xfce4-fm/distinfo
index 57784678d3b5..2d44db6e2da5 100644
--- a/x11-fm/xfce4-fm/distinfo
+++ b/x11-fm/xfce4-fm/distinfo
@@ -1 +1 @@
-MD5 (xfce4/xffm-3.99.3.tar.gz) = e2ee3e062610589059ba1801b06725a7
+MD5 (xffm-4.0.0.tar.gz) = 1ab4292007dd0d1e3e4b94c413c3434d
diff --git a/x11-fm/xfce4-fm/pkg-plist b/x11-fm/xfce4-fm/pkg-plist
index cbad0072cbd8..e9aa09e22f5e 100644
--- a/x11-fm/xfce4-fm/pkg-plist
+++ b/x11-fm/xfce4-fm/pkg-plist
@@ -44,9 +44,7 @@ lib/xfce4/mcs-plugins/libxffmsettings.so
 libdata/pkgconfig/xffm-1.0.pc
 share/xfce4/doc/C/xffm.html
 share/xffm/AUTHORS
-share/xffm/pixmaps/Makefile
-share/xffm/pixmaps/Makefile.am
-share/xffm/pixmaps/Makefile.in
+share/xffm/applications.xml
 share/xffm/pixmaps/comp1.xpm
 share/xffm/pixmaps/empty.xpm
 share/xffm/pixmaps/network-36.png
diff --git a/x11-toolkits/libxfce4gui/Makefile b/x11-toolkits/libxfce4gui/Makefile
index d96d2cbdd613..cdc116d612eb 100644
--- a/x11-toolkits/libxfce4gui/Makefile
+++ b/x11-toolkits/libxfce4gui/Makefile
@@ -6,14 +6,11 @@
 #
 
 PORTNAME=	libxfce4gui
-PORTVERSION=	3.99.3
+PORTVERSION=	4.0.0
 CATEGORIES=	x11-toolkits xfce
-MASTER_SITES=	http://www.xfce.org/archive/xfce4-rc3/src/ \
-		ftp://ftp.unix-ag.org/user/bmeurer/xfce4/rc3/separate/ \
-		http://usuarios.lycos.es/xfce4/tarballs/rc3/separate/ \
-		http://linux.imp.mx/xfce4/rc2/xfce4-rc3/src/
+MASTER_SITES=	http://www.xfce.org/archive/xfce-${PORTVERSION}/src/ \
+		http://linux.imp.mx/xfce4/xfce_${PORTVERSION}/src/
 DISTNAME=	libxfcegui4-${PORTVERSION}
-DIST_SUBDIR=	xfce4
 
 MAINTAINER=	oliver@FreeBSD.org
 COMMENT=	XFce 4 widget library required by xfce4 and xfwm4
diff --git a/x11-toolkits/libxfce4gui/distinfo b/x11-toolkits/libxfce4gui/distinfo
index 9354c03fae39..ec23d1798cfe 100644
--- a/x11-toolkits/libxfce4gui/distinfo
+++ b/x11-toolkits/libxfce4gui/distinfo
@@ -1 +1 @@
-MD5 (xfce4/libxfcegui4-3.99.3.tar.gz) = 99d18c964f8593af39d0ead8ea363932
+MD5 (libxfcegui4-4.0.0.tar.gz) = 8c9f565d416d1e1c11587de6bc26b3cd
diff --git a/x11-wm/xfce4-desktop/Makefile b/x11-wm/xfce4-desktop/Makefile
index 6df550a60a98..9913e1ef83e2 100644
--- a/x11-wm/xfce4-desktop/Makefile
+++ b/x11-wm/xfce4-desktop/Makefile
@@ -6,14 +6,11 @@
 #
 
 PORTNAME=	xfce4-desktop
-PORTVERSION=	3.99.3
+PORTVERSION=	4.0.0
 CATEGORIES=	x11-wm xfce
-MASTER_SITES=	http://www.xfce.org/archive/xfce4-rc3/src/ \
-		ftp://ftp.unix-ag.org/user/bmeurer/xfce4/rc3/separate/ \
-		http://usuarios.lycos.es/xfce4/tarballs/rc3/separate/ \
-		http://linux.imp.mx/xfce4/rc2/xfce4-rc3/src/
+MASTER_SITES=	http://www.xfce.org/archive/xfce-${PORTVERSION}/src/ \
+		http://linux.imp.mx/xfce4/xfce_${PORTVERSION}/src/
 DISTNAME=	xfdesktop-${PORTVERSION}
-DIST_SUBDIR=	xfce4
 
 MAINTAINER=	oliver@FreeBSD.org
 COMMENT=	XFce 4 desktop background manager and root menu
@@ -22,7 +19,7 @@ BUILD_DEPENDS=	xfce-mcs-manager:${PORTSDIR}/sysutils/xfce4-mcs-manager
 LIB_DEPENDS=	xml2.5:${PORTSDIR}/textproc/libxml2 \
 		xfce4util.1:${PORTSDIR}/x11/libxfce4util \
 		xfcegui4.1:${PORTSDIR}/x11-toolkits/libxfce4gui
-
+RUN_DEPENDS=	xfce-mcs-manager:${PORTSDIR}/sysutils/xfce4-mcs-manager
 
 USE_GNOME=	gtk20
 USE_X_PREFIX=	yes
diff --git a/x11-wm/xfce4-desktop/distinfo b/x11-wm/xfce4-desktop/distinfo
index e35a129231d0..06ba1ff549f2 100644
--- a/x11-wm/xfce4-desktop/distinfo
+++ b/x11-wm/xfce4-desktop/distinfo
@@ -1 +1 @@
-MD5 (xfce4/xfdesktop-3.99.3.tar.gz) = 298c03e496ee042be0b76d0b0a871f9d
+MD5 (xfdesktop-4.0.0.tar.gz) = c2fa7652a76ae5cc9d12a9fe4a1e64d0
diff --git a/x11-wm/xfce4-desktop/pkg-plist b/x11-wm/xfce4-desktop/pkg-plist
index c69201f6df85..a1bc58fdb34f 100644
--- a/x11-wm/xfce4-desktop/pkg-plist
+++ b/x11-wm/xfce4-desktop/pkg-plist
@@ -3,8 +3,10 @@ etc/xfce4/menu.xml
 etc/xfce4/menu.xml.ca
 etc/xfce4/menu.xml.de
 etc/xfce4/menu.xml.fr
+etc/xfce4/menu.xml.hu
 etc/xfce4/menu.xml.nl
 etc/xfce4/menu.xml.zh_CN
+etc/xfce4/menu.xml.zh_TW
 lib/xfce4/mcs-plugins/backdrop_settings.a
 lib/xfce4/mcs-plugins/backdrop_settings.la
 lib/xfce4/mcs-plugins/backdrop_settings.so
diff --git a/x11-wm/xfce4-panel/Makefile b/x11-wm/xfce4-panel/Makefile
index ccb31c787812..1f1ec8b2dccc 100644
--- a/x11-wm/xfce4-panel/Makefile
+++ b/x11-wm/xfce4-panel/Makefile
@@ -6,13 +6,10 @@
 #
 
 PORTNAME=	xfce4-panel
-PORTVERSION=	3.99.3
+PORTVERSION=	4.0.0
 CATEGORIES=	x11-wm xfce
-MASTER_SITES=	http://www.xfce.org/archive/xfce4-rc3/src/ \
-		ftp://ftp.unix-ag.org/user/bmeurer/xfce4/rc3/separate/ \
-		http://usuarios.lycos.es/xfce4/tarballs/rc3/separate/ \
-		http://linux.imp.mx/xfce4/rc2/xfce4-rc3/src/
-DIST_SUBDIR=	xfce4
+MASTER_SITES=	http://www.xfce.org/archive/xfce-${PORTVERSION}/src/ \
+		http://linux.imp.mx/xfce4/xfce_${PORTVERSION}/src/
 
 MAINTAINER=	oliver@FreeBSD.org
 COMMENT=	XFce 4 panel module
diff --git a/x11-wm/xfce4-panel/distinfo b/x11-wm/xfce4-panel/distinfo
index 1e74bb21b3d8..3137e292091b 100644
--- a/x11-wm/xfce4-panel/distinfo
+++ b/x11-wm/xfce4-panel/distinfo
@@ -1 +1 @@
-MD5 (xfce4/xfce4-panel-3.99.3.tar.gz) = 56eb61e9eb789bcc9e56ba07ce33ecbe
+MD5 (xfce4-panel-4.0.0.tar.gz) = 7f00b5a9757aa98f18b83e8031dc0035
diff --git a/x11-wm/xfce4-panel/pkg-plist b/x11-wm/xfce4-panel/pkg-plist
index 530a9e8c6f3e..55f7f2fc6834 100644
--- a/x11-wm/xfce4-panel/pkg-plist
+++ b/x11-wm/xfce4-panel/pkg-plist
@@ -1,6 +1,7 @@
 bin/xfce4-panel
 etc/xfce4/xfce4rc
 etc/xfce4/xfce4rc.ca
+etc/xfce4/xfce4rc.hu
 etc/xfce4/xfce4rc.nl
 include/xfce4/panel/controls.h
 include/xfce4/panel/global.h
diff --git a/x11-wm/xfce4-systray/Makefile b/x11-wm/xfce4-systray/Makefile
index df240671c652..e3d30c0114d0 100644
--- a/x11-wm/xfce4-systray/Makefile
+++ b/x11-wm/xfce4-systray/Makefile
@@ -6,13 +6,10 @@
 #
 
 PORTNAME=	xfce4-systray
-PORTVERSION=	3.99.3
+PORTVERSION=	4.0.0
 CATEGORIES=	x11-wm xfce
-MASTER_SITES=	http://www.xfce.org/archive/xfce4-rc3/src/ \
-		ftp://ftp.unix-ag.org/user/bmeurer/xfce4/rc3/separate/ \
-		http://usuarios.lycos.es/xfce4/tarballs/rc3/separate/ \
-		http://linux.imp.mx/xfce4/rc2/xfce4-rc3/src/
-DIST_SUBDIR=	xfce4
+MASTER_SITES=	http://www.xfce.org/archive/xfce-${PORTVERSION}/src/ \
+		http://linux.imp.mx/xfce4/xfce_${PORTVERSION}/src/
 
 MAINTAINER=	oliver@FreeBSD.org
 COMMENT=	XFce 4 system tray module for xfce4-panel
diff --git a/x11-wm/xfce4-systray/distinfo b/x11-wm/xfce4-systray/distinfo
index b7764625d3cd..929e5129bb82 100644
--- a/x11-wm/xfce4-systray/distinfo
+++ b/x11-wm/xfce4-systray/distinfo
@@ -1 +1 @@
-MD5 (xfce4/xfce4-systray-3.99.3.tar.gz) = 7923918bd8a8f9e2d89a7beb69c422d5
+MD5 (xfce4-systray-4.0.0.tar.gz) = c507099f09b307f9ca08460c96847886
diff --git a/x11-wm/xfce4-wm/Makefile b/x11-wm/xfce4-wm/Makefile
index bd9fc5663b04..20e8e28da868 100644
--- a/x11-wm/xfce4-wm/Makefile
+++ b/x11-wm/xfce4-wm/Makefile
@@ -6,14 +6,11 @@
 #
 
 PORTNAME=	xfce4-wm
-PORTVERSION=	3.99.3
+PORTVERSION=	4.0.0
 CATEGORIES=	x11-wm xfce
-MASTER_SITES=	http://www.xfce.org/archive/xfce4-rc3/src/ \
-		ftp://ftp.unix-ag.org/user/bmeurer/xfce4/rc3/separate/ \
-		http://usuarios.lycos.es/xfce4/tarballs/rc3/separate/ \
-		http://linux.imp.mx/xfce4/rc2/xfce4-rc3/src/
+MASTER_SITES=	http://www.xfce.org/archive/xfce-${PORTVERSION}/src/ \
+		http://linux.imp.mx/xfce4/xfce_${PORTVERSION}/src/
 DISTNAME=	xfwm4-${PORTVERSION}
-DIST_SUBDIR=	xfce4
 
 MAINTAINER=	oliver@FreeBSD.org
 COMMENT=	XFce 4 window manager
@@ -22,6 +19,7 @@ BUILD_DEPENDS=	xfce-mcs-manager:${PORTSDIR}/sysutils/xfce4-mcs-manager
 LIB_DEPENDS=	startup-notification-1.0:${PORTSDIR}/x11/startup-notification \
 		xfce4util.1:${PORTSDIR}/x11/libxfce4util \
 		xfcegui4.1:${PORTSDIR}/x11-toolkits/libxfce4gui
+RUN_DEPENDS=	xfce-mcs-manager:${PORTSDIR}/sysutils/xfce4-mcs-manager
 
 USE_GNOME=	gtk20
 USE_X_PREFIX=	yes
diff --git a/x11-wm/xfce4-wm/distinfo b/x11-wm/xfce4-wm/distinfo
index 423960ed390e..07c64eb4b013 100644
--- a/x11-wm/xfce4-wm/distinfo
+++ b/x11-wm/xfce4-wm/distinfo
@@ -1 +1 @@
-MD5 (xfce4/xfwm4-3.99.3.tar.gz) = dc845c5fa88ff5a83d6733b786c111da
+MD5 (xfwm4-4.0.0.tar.gz) = aa339ec01961c9073b703d2d903183b9
diff --git a/x11-wm/xfce4/Makefile b/x11-wm/xfce4/Makefile
index 49dc2db1a761..a4530ab8148a 100644
--- a/x11-wm/xfce4/Makefile
+++ b/x11-wm/xfce4/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	xfce
-PORTVERSION=	4.0.r3
+PORTVERSION=	4.0.0
 CATEGORIES=	x11-wm xfce
 MASTER_SITES=	# empty
 DISTFILES=	# empty
diff --git a/x11/libxfce4mcs/Makefile b/x11/libxfce4mcs/Makefile
index c174fd66bc3b..1237f36c0ed6 100644
--- a/x11/libxfce4mcs/Makefile
+++ b/x11/libxfce4mcs/Makefile
@@ -6,13 +6,10 @@
 #
 
 PORTNAME=	libxfce4mcs
-PORTVERSION=	3.99.3
+PORTVERSION=	4.0.0
 CATEGORIES=	x11 xfce
-MASTER_SITES=	http://www.xfce.org/archive/xfce4-rc3/src/ \
-		ftp://ftp.unix-ag.org/user/bmeurer/xfce4/rc3/separate/ \
-		http://usuarios.lycos.es/xfce4/tarballs/rc3/separate/ \
-		http://linux.imp.mx/xfce4/rc2/xfce4-rc3/src/
-DIST_SUBDIR=	xfce4
+MASTER_SITES=	http://www.xfce.org/archive/xfce-${PORTVERSION}/src/ \
+		http://linux.imp.mx/xfce4/xfce_${PORTVERSION}/src/
 
 MAINTAINER=	oliver@FreeBSD.org
 COMMENT=	XFce 4 settings management library used by most XFce 4 modules
diff --git a/x11/libxfce4mcs/distinfo b/x11/libxfce4mcs/distinfo
index 22195cd79649..5113669312e3 100644
--- a/x11/libxfce4mcs/distinfo
+++ b/x11/libxfce4mcs/distinfo
@@ -1 +1 @@
-MD5 (xfce4/libxfce4mcs-3.99.3.tar.gz) = a7de8eeb533fd64ef31b280bda6ea8ac
+MD5 (libxfce4mcs-4.0.0.tar.gz) = 44c46e4bea1f6dd62114eb86783bc9ff
diff --git a/x11/libxfce4util/Makefile b/x11/libxfce4util/Makefile
index 4a83894f8cae..a3bc4698b1d1 100644
--- a/x11/libxfce4util/Makefile
+++ b/x11/libxfce4util/Makefile
@@ -6,13 +6,10 @@
 #
 
 PORTNAME=	libxfce4util
-PORTVERSION=	3.99.3
+PORTVERSION=	4.0.0
 CATEGORIES=	x11 xfce
-MASTER_SITES=	http://www.xfce.org/archive/xfce4-rc3/src/ \
-		ftp://ftp.unix-ag.org/user/bmeurer/xfce4/rc3/separate/ \
-		http://usuarios.lycos.es/xfce4/tarballs/rc3/separate/ \
-		http://linux.imp.mx/xfce4/rc2/xfce4-rc3/src/
-DIST_SUBDIR=	xfce4
+MASTER_SITES=	http://www.xfce.org/archive/xfce-${PORTVERSION}/src/ \
+		http://linux.imp.mx/xfce4/xfce_${PORTVERSION}/src/
 
 MAINTAINER=	oliver@FreeBSD.org
 COMMENT=	XFce 4 library with non-graphical helper functions
diff --git a/x11/libxfce4util/distinfo b/x11/libxfce4util/distinfo
index ad50a4274756..64805261d090 100644
--- a/x11/libxfce4util/distinfo
+++ b/x11/libxfce4util/distinfo
@@ -1 +1 @@
-MD5 (xfce4/libxfce4util-3.99.3.tar.gz) = e7d22f2a80fd5cacf46b39b432ee1734
+MD5 (libxfce4util-4.0.0.tar.gz) = 49528f20c76217ef1def60c23cc00564