7 files changed, 16 insertions, 22 deletions

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