- Simplify XFCE MASTER_SITES usage

- Update XFCE Master sites list

Submitted by:		olivierd
Reviewed by:		mat
Approved by:		portmgr (mat)
Differential Revision:	https://reviews.freebsd.org/D8416

70 files changed, 87 insertions, 89 deletions

diff --git a/Mk/Uses/xfce.mk b/Mk/Uses/xfce.mk
index 62be9dc92a4d..c67a5e5fceb7 100644
--- a/Mk/Uses/xfce.mk
+++ b/Mk/Uses/xfce.mk
@@ -19,8 +19,6 @@ _USES_POST+=	xfce
 
 _USE_XFCE_ALL=	garcon libexo libgui libmenu libutil panel thunar xfconf
 
-XFCE_MASTER_SITE_VER=	4.12
-
 xfce_ARGS?=	# empty
 
 CPPFLAGS+=	-I${LOCALBASE}/include
diff --git a/Mk/bsd.sites.mk b/Mk/bsd.sites.mk
index 0f5b646ace6a..865bcd28bb04 100644
--- a/Mk/bsd.sites.mk
+++ b/Mk/bsd.sites.mk
@@ -1175,15 +1175,15 @@ MASTER_SITE_XCONTRIB+= \
 .endif
 
 .if !defined(IGNORE_MASTER_SITE_XFCE)
+_XFCE_PATH=	${DISTNAME:S/-${DISTVERSIONFULL}//:tl}/${DISTVERSION:C/^([0-9]+\.[0-9]+).*/\1/}
+
 MASTER_SITE_XFCE+= \
-	https://mirror.netcologne.de/xfce/%SUBDIR%/ \
-	http://ftp.udc.es/xfce/%SUBDIR%/ \
-	http://xfce.mirror.uber.com.au/%SUBDIR%/ \
-	https://archive.be.xfce.org/%SUBDIR%/ \
-	http://archive.be2.xfce.org/%SUBDIR%/ \
-	https://archive.al-us.xfce.org/%SUBDIR%/ \
-	http://mirrors.tummy.com/pub/archive.xfce.org/%SUBDIR%/ \
-	http://mirror.perldude.de/archive.xfce.org/%SUBDIR%/
+	https://archive.xfce.org/src/%SUBDIR%/${_XFCE_PATH}/ \
+	https://mirror.netcologne.de/xfce/src/%SUBDIR%/${_XFCE_PATH}/ \
+	https://ftp.cixug.es/xfce/src/%SUBDIR%/${_XFCE_PATH}/ \
+	https://archive.be.xfce.org/src/%SUBDIR%/${_XFCE_PATH}/ \
+	https://archive.al-us.xfce.org/src/%SUBDIR%/${_XFCE_PATH}/ \
+	http://mirror.perldude.de/archive.xfce.org/src/%SUBDIR%/${_XFCE_PATH}/
 .endif
 
 .if !defined(IGNORE_MASTER_SITE_XORG)
@@ -1262,7 +1262,7 @@ MASTER_SITES_SUBDIRS=	APACHE_COMMONS_BINARIES:${PORTNAME:S,commons-,,} \
 			SAMBA:${PORTNAME} \
 			SAVANNAH:${PORTNAME:tl} \
 			SOURCEFORGE:${PORTNAME:tl}/${PORTNAME:tl}/${PORTVERSION} \
-			XFCE:xfce/${XFCE_MASTER_SITE_VER}/src
+			XFCE:xfce
 
 .if defined(MASTER_SITES) && ${MASTER_SITES:N*\:/*}
 
diff --git a/archivers/squeeze/Makefile b/archivers/squeeze/Makefile
index 41e7383bf0f6..743ba29c0f13 100644
--- a/archivers/squeeze/Makefile
+++ b/archivers/squeeze/Makefile
@@ -5,7 +5,7 @@ PORTNAME=	squeeze
 PORTVERSION=	0.2.3
 PORTREVISION=	10
 CATEGORIES=	archivers xfce
-MASTER_SITES=	XFCE/src/apps/${PORTNAME}/${PORTVERSION:R}
+MASTER_SITES=	XFCE/apps
 DIST_SUBDIR=	xfce4
 
 MAINTAINER=	xfce@FreeBSD.org
diff --git a/archivers/thunar-archive-plugin/Makefile b/archivers/thunar-archive-plugin/Makefile
index 8341405bcdfd..66663e905b03 100644
--- a/archivers/thunar-archive-plugin/Makefile
+++ b/archivers/thunar-archive-plugin/Makefile
@@ -5,7 +5,7 @@ PORTNAME=	thunar-archive-plugin
 PORTVERSION=	0.3.1
 PORTREVISION=	6
 CATEGORIES=	archivers xfce
-MASTER_SITES=	XFCE/src/thunar-plugins/${PORTNAME}/${PORTVERSION:R}
+MASTER_SITES=	XFCE/thunar-plugins
 DIST_SUBDIR=	xfce4
 
 MAINTAINER=	xfce@FreeBSD.org
diff --git a/audio/thunar-media-tags-plugin/Makefile b/audio/thunar-media-tags-plugin/Makefile
index 027088f44d74..bd9732d3a264 100644
--- a/audio/thunar-media-tags-plugin/Makefile
+++ b/audio/thunar-media-tags-plugin/Makefile
@@ -5,7 +5,7 @@ PORTNAME=	thunar-media-tags-plugin
 PORTVERSION=	0.2.1
 PORTREVISION=	5
 CATEGORIES=	audio xfce
-MASTER_SITES=	XFCE/src/thunar-plugins/${PORTNAME}/${PORTVERSION:R}
+MASTER_SITES=	XFCE/thunar-plugins
 DIST_SUBDIR=	xfce4
 
 MAINTAINER=	xfce@FreeBSD.org
diff --git a/audio/xfce4-mixer/Makefile b/audio/xfce4-mixer/Makefile
index 42924acc7a1a..c24d54bfbdd0 100644
--- a/audio/xfce4-mixer/Makefile
+++ b/audio/xfce4-mixer/Makefile
@@ -5,7 +5,7 @@ PORTNAME=	xfce4-mixer
 PORTVERSION=	4.11.0
 PORTREVISION=	4
 CATEGORIES=	audio xfce
-MASTER_SITES=	XFCE/src/apps/${PORTNAME}/${PORTVERSION:R}
+MASTER_SITES=	XFCE/apps
 DIST_SUBDIR=	xfce4
 
 MAINTAINER=	xfce@FreeBSD.org
diff --git a/audio/xfce4-mpc-plugin/Makefile b/audio/xfce4-mpc-plugin/Makefile
index a7e63f26a9b9..f0f0aeb756cd 100644
--- a/audio/xfce4-mpc-plugin/Makefile
+++ b/audio/xfce4-mpc-plugin/Makefile
@@ -4,7 +4,7 @@
 PORTNAME=	xfce4-mpc-plugin
 PORTVERSION=	0.5.1
 CATEGORIES=	audio xfce
-MASTER_SITES=	XFCE/src/panel-plugins/${PORTNAME}/${PORTVERSION:R}
+MASTER_SITES=	XFCE/panel-plugins
 DIST_SUBDIR=	xfce4
 
 MAINTAINER=	xfce@FreeBSD.org
diff --git a/audio/xfce4-pulseaudio-plugin/Makefile b/audio/xfce4-pulseaudio-plugin/Makefile
index f3b69e6d1896..6d7bdb3924d3 100644
--- a/audio/xfce4-pulseaudio-plugin/Makefile
+++ b/audio/xfce4-pulseaudio-plugin/Makefile
@@ -5,7 +5,7 @@ PORTNAME=	xfce4-pulseaudio-plugin
 PORTVERSION=	0.4.1
 PORTREVISION=	2
 CATEGORIES=	audio xfce
-MASTER_SITES=	XFCE/src/panel-plugins/${PORTNAME}/${PORTVERSION:R}
+MASTER_SITES=	XFCE/panel-plugins
 DIST_SUBDIR=	xfce4
 
 MAINTAINER=	xfce@FreeBSD.org
diff --git a/audio/xfmpc/Makefile b/audio/xfmpc/Makefile
index 48e8fe2e4f2e..e87193ff3294 100644
--- a/audio/xfmpc/Makefile
+++ b/audio/xfmpc/Makefile
@@ -5,7 +5,7 @@ PORTNAME=	xfmpc
 PORTVERSION=	0.2.3
 PORTREVISION=	1
 CATEGORIES=	audio xfce
-MASTER_SITES=	XFCE/src/apps/${PORTNAME}/${PORTVERSION:R}
+MASTER_SITES=	XFCE/apps
 DIST_SUBDIR=	xfce4
 
 MAINTAINER=	xfce@FreeBSD.org
diff --git a/deskutils/orage/Makefile b/deskutils/orage/Makefile
index 8112ed4337b4..5af034fab308 100644
--- a/deskutils/orage/Makefile
+++ b/deskutils/orage/Makefile
@@ -5,7 +5,7 @@ PORTNAME=	orage
 PORTVERSION=	4.12.1
 PORTREVISION=	9
 CATEGORIES=	deskutils xfce
-MASTER_SITES=	XFCE/src/apps/${PORTNAME}/${PORTVERSION:R}/
+MASTER_SITES=	XFCE/apps
 DIST_SUBDIR=	xfce4
 
 MAINTAINER=	xfce@FreeBSD.org
diff --git a/deskutils/xfce4-notes-plugin/Makefile b/deskutils/xfce4-notes-plugin/Makefile
index 00b805447c1d..56caac9b9ca3 100644
--- a/deskutils/xfce4-notes-plugin/Makefile
+++ b/deskutils/xfce4-notes-plugin/Makefile
@@ -5,7 +5,7 @@ PORTNAME=	xfce4-notes-plugin
 PORTVERSION=	1.8.1
 PORTREVISION=	1
 CATEGORIES=	deskutils xfce
-MASTER_SITES=	XFCE/src/panel-plugins/${PORTNAME}/${PORTVERSION:R}
+MASTER_SITES=	XFCE/panel-plugins
 DIST_SUBDIR=	xfce4
 
 MAINTAINER=	xfce@FreeBSD.org
diff --git a/deskutils/xfce4-notifyd/Makefile b/deskutils/xfce4-notifyd/Makefile
index 653522cb79b0..2ae2cb19fcbe 100644
--- a/deskutils/xfce4-notifyd/Makefile
+++ b/deskutils/xfce4-notifyd/Makefile
@@ -8,7 +8,7 @@
 PORTNAME=	xfce4-notifyd
 PORTVERSION=	0.4.4
 CATEGORIES=	deskutils xfce
-MASTER_SITES=	XFCE/src/apps/${PORTNAME}/${PORTVERSION:R}
+MASTER_SITES=	XFCE/apps
 DIST_SUBDIR=	xfce4
 
 MAINTAINER=	ehaupt@FreeBSD.org
diff --git a/deskutils/xfce4-tumbler/Makefile b/deskutils/xfce4-tumbler/Makefile
index 54da340bfde6..7193222f4297 100644
--- a/deskutils/xfce4-tumbler/Makefile
+++ b/deskutils/xfce4-tumbler/Makefile
@@ -5,7 +5,7 @@ PORTNAME=	tumbler
 PORTVERSION=	0.2.4
 PORTREVISION=	1
 CATEGORIES=	deskutils xfce
-MASTER_SITES=	XFCE/src/xfce/${PORTNAME}/${PORTVERSION:R}/
+MASTER_SITES=	XFCE
 PKGNAMEPREFIX=	xfce4-
 DIST_SUBDIR=	xfce4
 
diff --git a/deskutils/xfce4-volumed-pulse/Makefile b/deskutils/xfce4-volumed-pulse/Makefile
index 0c1f64d3f765..2f578762e52b 100644
--- a/deskutils/xfce4-volumed-pulse/Makefile
+++ b/deskutils/xfce4-volumed-pulse/Makefile
@@ -5,7 +5,7 @@ PORTNAME=	xfce4-volumed-pulse
 PORTVERSION=	0.2.3
 PORTREVISION=	2
 CATEGORIES=	deskutils xfce
-MASTER_SITES=	XFCE/src/apps/${PORTNAME}/${PORTVERSION:R}
+MASTER_SITES=	XFCE/apps
 DIST_SUBDIR=	xfce4
 
 MAINTAINER=	xfce@FreeBSD.org
diff --git a/deskutils/xfce4-volumed/Makefile b/deskutils/xfce4-volumed/Makefile
index faef17dad217..c8be189cfed8 100644
--- a/deskutils/xfce4-volumed/Makefile
+++ b/deskutils/xfce4-volumed/Makefile
@@ -5,7 +5,7 @@ PORTNAME=	xfce4-volumed
 PORTVERSION=	0.1.13
 PORTREVISION=	3
 CATEGORIES=	deskutils xfce
-MASTER_SITES=	XFCE/src/apps/${PORTNAME}/${PORTVERSION:R}
+MASTER_SITES=	XFCE/apps
 DIST_SUBDIR=	xfce4
 
 MAINTAINER=	sergey.dyatko@gmail.com
diff --git a/deskutils/xfce4-xkb-plugin/Makefile b/deskutils/xfce4-xkb-plugin/Makefile
index 939f952a6106..0be243e040cd 100644
--- a/deskutils/xfce4-xkb-plugin/Makefile
+++ b/deskutils/xfce4-xkb-plugin/Makefile
@@ -4,7 +4,7 @@ PORTNAME=	xfce4-xkb-plugin
 PORTVERSION=	0.8.1
 PORTREVISION=	1
 CATEGORIES=	deskutils xfce
-MASTER_SITES=	XFCE/src/panel-plugins/${PORTNAME}/${PORTVERSION:R}
+MASTER_SITES=	XFCE/panel-plugins
 
 MAINTAINER=	xfce@FreeBSD.org
 COMMENT=	Keyboard layout switching plugin for the Xfce panel
diff --git a/devel/thunar-vcs-plugin/Makefile b/devel/thunar-vcs-plugin/Makefile
index bc363a2ceb51..97caf7ba5f8b 100644
--- a/devel/thunar-vcs-plugin/Makefile
+++ b/devel/thunar-vcs-plugin/Makefile
@@ -5,7 +5,7 @@ PORTNAME=	thunar-vcs-plugin
 PORTVERSION=	0.1.5
 PORTREVISION=	1
 CATEGORIES=	devel xfce
-MASTER_SITES=	XFCE/src/thunar-plugins/${PORTNAME}/${PORTVERSION:R}
+MASTER_SITES=	XFCE/thunar-plugins
 DIST_SUBDIR=	xfce4
 
 MAINTAINER=	sergey.dyatko@gmail.com
diff --git a/devel/xfce4-vala/Makefile b/devel/xfce4-vala/Makefile
index 178ce654287c..063d2634968e 100644
--- a/devel/xfce4-vala/Makefile
+++ b/devel/xfce4-vala/Makefile
@@ -5,7 +5,7 @@ PORTNAME=	xfce4-vala
 PORTVERSION=	4.10.3
 PORTREVISION=	5
 CATEGORIES=	devel xfce
-MASTER_SITES=	XFCE/src/bindings/${PORTNAME}/${PORTVERSION:R}
+MASTER_SITES=	XFCE/bindings
 DIST_SUBDIR=	xfce4
 
 MAINTAINER=	xfce@FreeBSD.org
diff --git a/editors/mousepad/Makefile b/editors/mousepad/Makefile
index fe0ba1ac14ce..e63d38185ef7 100644
--- a/editors/mousepad/Makefile
+++ b/editors/mousepad/Makefile
@@ -5,7 +5,7 @@ PORTNAME=	mousepad
 PORTVERSION=	0.4.1
 PORTREVISION=	1
 CATEGORIES=	editors xfce
-MASTER_SITES=	XFCE/src/apps/${PORTNAME}/${PORTVERSION:R}
+MASTER_SITES=	XFCE/apps
 DIST_SUBDIR=	xfce4
 
 MAINTAINER=	xfce@FreeBSD.org
diff --git a/graphics/ristretto/Makefile b/graphics/ristretto/Makefile
index 140898028b1d..1dc572045078 100644
--- a/graphics/ristretto/Makefile
+++ b/graphics/ristretto/Makefile
@@ -4,7 +4,7 @@
 PORTNAME=	ristretto
 PORTVERSION=	0.8.4
 CATEGORIES=	graphics xfce
-MASTER_SITES=	XFCE/src/apps/${PORTNAME}/${PORTVERSION:R}
+MASTER_SITES=	XFCE/apps
 DIST_SUBDIR=	xfce4
 
 MAINTAINER=	xfce@FreeBSD.org
diff --git a/mail/xfce4-mailwatch-plugin/Makefile b/mail/xfce4-mailwatch-plugin/Makefile
index 50d33b85a9ea..398b33a0ae03 100644
--- a/mail/xfce4-mailwatch-plugin/Makefile
+++ b/mail/xfce4-mailwatch-plugin/Makefile
@@ -5,7 +5,7 @@ PORTNAME=	xfce4-mailwatch-plugin
 PORTVERSION=	1.2.0
 PORTREVISION=	9
 CATEGORIES=	mail xfce
-MASTER_SITES=	XFCE/src/panel-plugins/${PORTNAME}/${PORTVERSION:R}
+MASTER_SITES=	XFCE/panel-plugins
 DIST_SUBDIR=	xfce4
 
 MAINTAINER=	xfce@FreeBSD.org
diff --git a/math/xfce4-calculator-plugin/Makefile b/math/xfce4-calculator-plugin/Makefile
index 05734f2838eb..bd03fe1489ea 100644
--- a/math/xfce4-calculator-plugin/Makefile
+++ b/math/xfce4-calculator-plugin/Makefile
@@ -4,7 +4,7 @@
 PORTNAME=	xfce4-calculator-plugin
 PORTVERSION=	0.7.0
 CATEGORIES=	math xfce
-MASTER_SITES=	XFCE/src/panel-plugins/${PORTNAME}/${PORTVERSION:R}
+MASTER_SITES=	XFCE/panel-plugins
 DIST_SUBDIR=	xfce4
 
 MAINTAINER=	xfce@FreeBSD.org
diff --git a/misc/xfce4-weather-plugin/Makefile b/misc/xfce4-weather-plugin/Makefile
index ad5d5fbd78c7..810257a6325e 100644
--- a/misc/xfce4-weather-plugin/Makefile
+++ b/misc/xfce4-weather-plugin/Makefile
@@ -4,7 +4,7 @@
 PORTNAME=	xfce4-weather-plugin
 PORTVERSION=	0.9.1
 CATEGORIES=	misc xfce geography
-MASTER_SITES=	XFCE/src/panel-plugins/${PORTNAME}/${PORTVERSION:R}
+MASTER_SITES=	XFCE/panel-plugins
 DIST_SUBDIR=	xfce4
 
 MAINTAINER=	xfce@FreeBSD.org
diff --git a/misc/xfce4-wm-themes/Makefile b/misc/xfce4-wm-themes/Makefile
index 462e6a78e2ea..cae415871e9c 100644
--- a/misc/xfce4-wm-themes/Makefile
+++ b/misc/xfce4-wm-themes/Makefile
@@ -5,8 +5,8 @@ PORTNAME=	xfce4-wm-themes
 PORTVERSION=	4.10.0
 PORTREVISION=	1
 CATEGORIES=	misc xfce
-MASTER_SITES=	XFCE/src/art/xfwm4-themes/${PORTVERSION:R}
-DISTNAME=	xfwm4-themes-${PORTVERSION}
+MASTER_SITES=	XFCE/art
+DISTNAME=	xfwm4-themes-${DISTVERSIONFULL}
 DIST_SUBDIR=	xfce4
 
 MAINTAINER=	xfce@FreeBSD.org
diff --git a/multimedia/xfce4-parole/Makefile b/multimedia/xfce4-parole/Makefile
index 4a3da777af5a..bf0a25515ab7 100644
--- a/multimedia/xfce4-parole/Makefile
+++ b/multimedia/xfce4-parole/Makefile
@@ -4,7 +4,7 @@
 PORTNAME=	parole
 PORTVERSION=	1.0.2
 CATEGORIES=	multimedia xfce
-MASTER_SITES=	XFCE/src/apps/${PORTNAME}/${PORTVERSION:R}/
+MASTER_SITES=	XFCE/apps
 DIST_SUBDIR=	xfce4
 
 MAINTAINER=	xfce@FreeBSD.org
diff --git a/print/xfce4-print/Makefile b/print/xfce4-print/Makefile
index 73b0ecbd9302..07daae627b14 100644
--- a/print/xfce4-print/Makefile
+++ b/print/xfce4-print/Makefile
@@ -5,8 +5,8 @@ PORTNAME=	xfce4-print
 PORTVERSION=	4.6.1
 PORTREVISION=	15
 CATEGORIES=	print xfce
-MASTER_SITES=	XFCE/src/archive/xfprint/${PORTVERSION:R}
-DISTNAME=	xfprint-${PORTVERSION}
+MASTER_SITES=	XFCE/archive
+DISTNAME=	xfprint-${DISTVERSIONFULL}
 DIST_SUBDIR=	xfce4
 
 MAINTAINER=	xfce@FreeBSD.org
diff --git a/science/xfce4-equake-plugin/Makefile b/science/xfce4-equake-plugin/Makefile
index cca365650b0a..098c828b6e9d 100644
--- a/science/xfce4-equake-plugin/Makefile
+++ b/science/xfce4-equake-plugin/Makefile
@@ -4,7 +4,7 @@
 PORTNAME=	xfce4-equake-plugin
 PORTVERSION=	1.3.8.1
 CATEGORIES=	science xfce
-MASTER_SITES=	XFCE/src/panel-plugins/${PORTNAME}/${PORTVERSION:C/^([0-9]+\.[0-9]+).*/\1/}
+MASTER_SITES=	XFCE/panel-plugins
 DIST_SUBDIR=	xfce4
 
 MAINTAINER=	xfce@FreeBSD.org
diff --git a/sysutils/catfish/Makefile b/sysutils/catfish/Makefile
index 35b1882667a2..929a6975cc99 100644
--- a/sysutils/catfish/Makefile
+++ b/sysutils/catfish/Makefile
@@ -4,7 +4,7 @@
 PORTNAME=	catfish
 PORTVERSION=	1.4.7
 CATEGORIES=	sysutils
-MASTER_SITES=	XFCE/src/apps/${PORTNAME:tl}/${PORTVERSION:R}
+MASTER_SITES=	XFCE/apps
 DIST_SUBDIR=	xfce4
 
 MAINTAINER=	xfce@FreeBSD.org
diff --git a/sysutils/garcon/Makefile b/sysutils/garcon/Makefile
index abda462b4af7..650db4e86516 100644
--- a/sysutils/garcon/Makefile
+++ b/sysutils/garcon/Makefile
@@ -4,7 +4,7 @@
 PORTNAME=	garcon
 PORTVERSION=	0.6.2
 CATEGORIES=	sysutils xfce
-MASTER_SITES=	XFCE/src/xfce/${PORTNAME}/${PORTVERSION:R}
+MASTER_SITES=	XFCE
 DIST_SUBDIR=	xfce4
 
 MAINTAINER=	xfce@FreeBSD.org
diff --git a/sysutils/gigolo/Makefile b/sysutils/gigolo/Makefile
index b96030354a3e..6b6f43fffce3 100644
--- a/sysutils/gigolo/Makefile
+++ b/sysutils/gigolo/Makefile
@@ -4,7 +4,7 @@
 PORTNAME=	gigolo
 PORTVERSION=	0.4.91
 CATEGORIES=	sysutils
-MASTER_SITES=	XFCE/src/apps/${PORTNAME}/${PORTVERSION:R}
+MASTER_SITES=	XFCE/apps
 
 MAINTAINER=	koalative@gmail.com
 COMMENT=	Frontend to easily manage filesystem connections
diff --git a/sysutils/xfburn/Makefile b/sysutils/xfburn/Makefile
index b6b73013a6d4..1a8e7bca497e 100644
--- a/sysutils/xfburn/Makefile
+++ b/sysutils/xfburn/Makefile
@@ -5,7 +5,7 @@ PORTNAME=	xfburn
 PORTVERSION=	0.5.5
 PORTREVISION=	1
 CATEGORIES=	sysutils
-MASTER_SITES=	XFCE/src/apps/${PORTNAME}/${PORTVERSION:R}
+MASTER_SITES=	XFCE/apps
 DIST_SUBDIR=	xfce4
 
 MAINTAINER=	xfce@FreeBSD.org
diff --git a/sysutils/xfce4-battery-plugin/Makefile b/sysutils/xfce4-battery-plugin/Makefile
index 7d872a0db26c..c723de90aff3 100644
--- a/sysutils/xfce4-battery-plugin/Makefile
+++ b/sysutils/xfce4-battery-plugin/Makefile
@@ -4,7 +4,7 @@
 PORTNAME=	xfce4-battery-plugin
 PORTVERSION=	1.1.2
 CATEGORIES=	sysutils xfce
-MASTER_SITES=	XFCE/src/panel-plugins/${PORTNAME}/${PORTVERSION:R}
+MASTER_SITES=	XFCE/panel-plugins
 DIST_SUBDIR=	xfce4
 
 MAINTAINER=	xfce@FreeBSD.org
diff --git a/sysutils/xfce4-cpugraph-plugin/Makefile b/sysutils/xfce4-cpugraph-plugin/Makefile
index 2f94bf1c67ac..c1a17cc4f3de 100644
--- a/sysutils/xfce4-cpugraph-plugin/Makefile
+++ b/sysutils/xfce4-cpugraph-plugin/Makefile
@@ -5,7 +5,7 @@ PORTNAME=	xfce4-cpugraph-plugin
 PORTVERSION=	1.0.5
 PORTREVISION=	5
 CATEGORIES=	sysutils xfce
-MASTER_SITES=	XFCE/src/panel-plugins/${PORTNAME}/${PORTVERSION:R}
+MASTER_SITES=	XFCE/panel-plugins
 DIST_SUBDIR=	xfce4
 
 MAINTAINER=	xfce@FreeBSD.org
diff --git a/sysutils/xfce4-diskperf-plugin/Makefile b/sysutils/xfce4-diskperf-plugin/Makefile
index 895e79cd4175..5491bd978f3b 100644
--- a/sysutils/xfce4-diskperf-plugin/Makefile
+++ b/sysutils/xfce4-diskperf-plugin/Makefile
@@ -4,7 +4,7 @@
 PORTNAME=	xfce4-diskperf-plugin
 PORTVERSION=	2.6.1
 CATEGORIES=	sysutils xfce
-MASTER_SITES=	XFCE/src/panel-plugins/${PORTNAME}/${PORTVERSION:R}
+MASTER_SITES=	XFCE/panel-plugins
 DIST_SUBDIR=	xfce4
 
 MAINTAINER=	danilo@FreeBSD.org
diff --git a/sysutils/xfce4-fsguard-plugin/Makefile b/sysutils/xfce4-fsguard-plugin/Makefile
index 4b6aa4550eba..db4444274756 100644
--- a/sysutils/xfce4-fsguard-plugin/Makefile
+++ b/sysutils/xfce4-fsguard-plugin/Makefile
@@ -4,7 +4,7 @@
 PORTNAME=	xfce4-fsguard-plugin
 PORTVERSION=	1.1.0
 CATEGORIES=	sysutils xfce
-MASTER_SITES=	XFCE/src/panel-plugins/${PORTNAME}/${PORTVERSION:R}
+MASTER_SITES=	XFCE/panel-plugins
 DIST_SUBDIR=	xfce4
 
 MAINTAINER=	xfce@FreeBSD.org
diff --git a/sysutils/xfce4-genmon-plugin/Makefile b/sysutils/xfce4-genmon-plugin/Makefile
index 43c99c6dc709..427b7e28c1c0 100644
--- a/sysutils/xfce4-genmon-plugin/Makefile
+++ b/sysutils/xfce4-genmon-plugin/Makefile
@@ -4,7 +4,7 @@
 PORTNAME=	xfce4-genmon-plugin
 PORTVERSION=	4.0.1
 CATEGORIES=	sysutils xfce
-MASTER_SITES=	XFCE/src/panel-plugins/${PORTNAME}/${PORTVERSION:R}
+MASTER_SITES=	XFCE/panel-plugins
 DIST_SUBDIR=	xfce4
 
 MAINTAINER=	xfce@FreeBSD.org
diff --git a/sysutils/xfce4-mount-plugin/Makefile b/sysutils/xfce4-mount-plugin/Makefile
index a3995d54e501..ab3142c89dde 100644
--- a/sysutils/xfce4-mount-plugin/Makefile
+++ b/sysutils/xfce4-mount-plugin/Makefile
@@ -4,7 +4,7 @@
 PORTNAME=	xfce4-mount-plugin
 PORTVERSION=	1.1.3
 CATEGORIES=	sysutils xfce
-MASTER_SITES=	XFCE/src/panel-plugins/${PORTNAME}/${PORTVERSION:R}
+MASTER_SITES=	XFCE/panel-plugins
 DIST_SUBDIR=	xfce4
 
 MAINTAINER=	xfce@FreeBSD.org
diff --git a/sysutils/xfce4-netload-plugin/Makefile b/sysutils/xfce4-netload-plugin/Makefile
index 034a97151dad..37cf5b7c5886 100644
--- a/sysutils/xfce4-netload-plugin/Makefile
+++ b/sysutils/xfce4-netload-plugin/Makefile
@@ -4,7 +4,7 @@
 PORTNAME=	xfce4-netload-plugin
 PORTVERSION=	1.3.1
 CATEGORIES=	sysutils xfce
-MASTER_SITES=	XFCE/src/panel-plugins/${PORTNAME}/${PORTVERSION:R}
+MASTER_SITES=	XFCE/panel-plugins
 DIST_SUBDIR=	xfce4
 
 MAINTAINER=	xfce@FreeBSD.org
diff --git a/sysutils/xfce4-power-manager/Makefile b/sysutils/xfce4-power-manager/Makefile
index c655ddbd6a87..2ffdbaeab236 100644
--- a/sysutils/xfce4-power-manager/Makefile
+++ b/sysutils/xfce4-power-manager/Makefile
@@ -4,7 +4,7 @@
 PORTNAME=	xfce4-power-manager
 PORTVERSION=	1.6.2
 CATEGORIES=	sysutils xfce
-MASTER_SITES=	XFCE/src/xfce/${PORTNAME}/${PORTVERSION:R}/
+MASTER_SITES=	XFCE
 DIST_SUBDIR=	xfce4
 
 MAINTAINER=	xfce@FreeBSD.org
diff --git a/sysutils/xfce4-settings/Makefile b/sysutils/xfce4-settings/Makefile
index 61a17076e74c..0be50f9f96d7 100644
--- a/sysutils/xfce4-settings/Makefile
+++ b/sysutils/xfce4-settings/Makefile
@@ -5,7 +5,7 @@ PORTNAME=	xfce4-settings
 PORTVERSION=	4.12.4
 PORTREVISION=	3
 CATEGORIES=	sysutils xfce
-MASTER_SITES=	XFCE/src/xfce/${PORTNAME}/${PORTVERSION:R}
+MASTER_SITES=	XFCE
 DIST_SUBDIR=	xfce4
 
 MAINTAINER=	xfce@FreeBSD.org
diff --git a/sysutils/xfce4-systemload-plugin/Makefile b/sysutils/xfce4-systemload-plugin/Makefile
index a4630f2d918d..a15cb530591f 100644
--- a/sysutils/xfce4-systemload-plugin/Makefile
+++ b/sysutils/xfce4-systemload-plugin/Makefile
@@ -5,7 +5,7 @@ PORTNAME=	xfce4-systemload-plugin
 PORTVERSION=	1.2.2
 PORTREVISION=	1
 CATEGORIES=	sysutils xfce
-MASTER_SITES=	XFCE/src/panel-plugins/${PORTNAME}/${PORTVERSION:R}
+MASTER_SITES=	XFCE/panel-plugins
 DIST_SUBDIR=	xfce4
 
 MAINTAINER=	xfce@FreeBSD.org
diff --git a/sysutils/xfce4-wavelan-plugin/Makefile b/sysutils/xfce4-wavelan-plugin/Makefile
index 6404c6d8acd3..fc2fd698e9a6 100644
--- a/sysutils/xfce4-wavelan-plugin/Makefile
+++ b/sysutils/xfce4-wavelan-plugin/Makefile
@@ -5,7 +5,7 @@ PORTNAME=	xfce4-wavelan-plugin
 PORTVERSION=	0.6.0
 PORTREVISION=	1
 CATEGORIES=	sysutils xfce
-MASTER_SITES=	XFCE/src/panel-plugins/${PORTNAME}/${PORTVERSION:R}
+MASTER_SITES=	XFCE/panel-plugins
 DIST_SUBDIR=	xfce4
 
 MAINTAINER=	xfce@FreeBSD.org
diff --git a/textproc/xfce4-dict-plugin/Makefile b/textproc/xfce4-dict-plugin/Makefile
index 4b845e0cae97..c90692f22492 100644
--- a/textproc/xfce4-dict-plugin/Makefile
+++ b/textproc/xfce4-dict-plugin/Makefile
@@ -4,7 +4,7 @@
 PORTNAME=	xfce4-dict
 PORTVERSION=	0.8.2
 CATEGORIES=	textproc xfce
-MASTER_SITES=	XFCE/src/apps/${PORTNAME}/${PORTVERSION:R}
+MASTER_SITES=	XFCE/apps
 PKGNAMESUFFIX=	-plugin
 DIST_SUBDIR=	xfce4
 
diff --git a/www/xfce4-smartbookmark-plugin/Makefile b/www/xfce4-smartbookmark-plugin/Makefile
index f29e3abcc376..d9d651e3e2ef 100644
--- a/www/xfce4-smartbookmark-plugin/Makefile
+++ b/www/xfce4-smartbookmark-plugin/Makefile
@@ -4,7 +4,7 @@
 PORTNAME=	xfce4-smartbookmark-plugin
 PORTVERSION=	0.5.0
 CATEGORIES=	www xfce
-MASTER_SITES=	XFCE/src/panel-plugins/${PORTNAME}/${PORTVERSION:R}
+MASTER_SITES=	XFCE/panel-plugins
 DIST_SUBDIR=	xfce4
 
 MAINTAINER=	xfce@FreeBSD.org
diff --git a/x11-clocks/xfce4-datetime-plugin/Makefile b/x11-clocks/xfce4-datetime-plugin/Makefile
index 12b015ddedca..fb6d6860da69 100644
--- a/x11-clocks/xfce4-datetime-plugin/Makefile
+++ b/x11-clocks/xfce4-datetime-plugin/Makefile
@@ -4,7 +4,7 @@
 PORTNAME=	xfce4-datetime-plugin
 PORTVERSION=	0.7.0
 CATEGORIES=	x11-clocks xfce
-MASTER_SITES=	XFCE/src/panel-plugins/${PORTNAME}/${PORTVERSION:R}
+MASTER_SITES=	XFCE/panel-plugins
 DIST_SUBDIR=	xfce4
 
 MAINTAINER=	xfce@FreeBSD.org
diff --git a/x11-clocks/xfce4-timer-out-plugin/Makefile b/x11-clocks/xfce4-timer-out-plugin/Makefile
index 6fdd815e4052..422376fc0340 100644
--- a/x11-clocks/xfce4-timer-out-plugin/Makefile
+++ b/x11-clocks/xfce4-timer-out-plugin/Makefile
@@ -5,7 +5,7 @@ PORTNAME=	xfce4-time-out-plugin
 PORTVERSION=	1.0.2
 PORTREVISION=	2
 CATEGORIES=	x11-clocks xfce
-MASTER_SITES=	XFCE/src/panel-plugins/${PORTNAME}/${PORTVERSION:R}
+MASTER_SITES=	XFCE/panel-plugins
 DIST_SUBDIR=	xfce4
 
 MAINTAINER=	xfce@FreeBSD.org
diff --git a/x11-clocks/xfce4-timer-plugin/Makefile b/x11-clocks/xfce4-timer-plugin/Makefile
index e87994563049..5dbc09709839 100644
--- a/x11-clocks/xfce4-timer-plugin/Makefile
+++ b/x11-clocks/xfce4-timer-plugin/Makefile
@@ -5,7 +5,7 @@ PORTNAME=	xfce4-timer-plugin
 PORTVERSION=	1.7.0
 PORTREVISION=	1
 CATEGORIES=	x11-clocks xfce
-MASTER_SITES=	XFCE/src/panel-plugins/${PORTNAME}/${PORTVERSION:R}
+MASTER_SITES=	XFCE/panel-plugins
 DIST_SUBDIR=	xfce4
 
 MAINTAINER=	xfce@FreeBSD.org
diff --git a/x11-fm/thunar-vfs/Makefile b/x11-fm/thunar-vfs/Makefile
index e5040d41554d..5249f0ea9d7a 100644
--- a/x11-fm/thunar-vfs/Makefile
+++ b/x11-fm/thunar-vfs/Makefile
@@ -5,7 +5,7 @@ PORTNAME=	thunar-vfs
 PORTVERSION=	1.2.0
 PORTREVISION=	12
 CATEGORIES=	x11-fm xfce
-MASTER_SITES=	XFCE/src/archive/${PORTNAME}/${PORTVERSION:R}
+MASTER_SITES=	XFCE/archive
 DIST_SUBDIR=	xfce4
 
 MAINTAINER=	xfce@FreeBSD.org
diff --git a/x11-fm/thunar/Makefile b/x11-fm/thunar/Makefile
index 7b934f5643fc..4e2b92e52836 100644
--- a/x11-fm/thunar/Makefile
+++ b/x11-fm/thunar/Makefile
@@ -4,7 +4,7 @@
 PORTNAME=	Thunar
 DISTVERSION=	1.6.17
 CATEGORIES=	x11-fm xfce
-MASTER_SITES=	XFCE/src/xfce/${PORTNAME:tl}/${PORTVERSION:R}
+MASTER_SITES=	XFCE
 DIST_SUBDIR=	xfce4
 
 MAINTAINER=	xfce@FreeBSD.org
diff --git a/x11-themes/gtk-xfce-engine/Makefile b/x11-themes/gtk-xfce-engine/Makefile
index 41cc946365da..150fed0969be 100644
--- a/x11-themes/gtk-xfce-engine/Makefile
+++ b/x11-themes/gtk-xfce-engine/Makefile
@@ -4,7 +4,7 @@
 PORTNAME=	gtk-xfce-engine
 PORTVERSION=	3.2.0
 CATEGORIES=	x11-themes xfce
-MASTER_SITES=	XFCE/src/xfce/${PORTNAME}/${PORTVERSION:R}
+MASTER_SITES=	XFCE
 DIST_SUBDIR=	xfce4
 
 MAINTAINER=	xfce@FreeBSD.org
diff --git a/x11-toolkits/libxfce4gui/Makefile b/x11-toolkits/libxfce4gui/Makefile
index 4b35ea8624e9..3a8f4f2a16f4 100644
--- a/x11-toolkits/libxfce4gui/Makefile
+++ b/x11-toolkits/libxfce4gui/Makefile
@@ -5,8 +5,8 @@ PORTNAME=	libxfce4gui
 PORTVERSION=	4.10.0
 PORTREVISION=	6
 CATEGORIES=	x11-toolkits xfce
-MASTER_SITES=	XFCE/src/archive/libxfcegui4/${PORTVERSION:R}
-DISTNAME=	libxfcegui4-${PORTVERSION}
+MASTER_SITES=	XFCE/archive
+DISTNAME=	libxfcegui4-${DISTVERSIONFULL}
 DIST_SUBDIR=	xfce4
 
 MAINTAINER=	xfce@FreeBSD.org
diff --git a/x11-wm/xfce4-desktop/Makefile b/x11-wm/xfce4-desktop/Makefile
index faf9773bf2b0..7f97cc13ef09 100644
--- a/x11-wm/xfce4-desktop/Makefile
+++ b/x11-wm/xfce4-desktop/Makefile
@@ -4,8 +4,8 @@
 PORTNAME=	xfce4-desktop
 PORTVERSION=	4.12.5
 CATEGORIES=	x11-wm xfce
-MASTER_SITES=	XFCE/src/xfce/xfdesktop/${PORTVERSION:R}/
-DISTNAME=	xfdesktop-${PORTVERSION}
+MASTER_SITES=	XFCE
+DISTNAME=	xfdesktop-${DISTVERSIONFULL}
 DIST_SUBDIR=	xfce4
 
 MAINTAINER=	xfce@FreeBSD.org
diff --git a/x11-wm/xfce4-panel-profiles/Makefile b/x11-wm/xfce4-panel-profiles/Makefile
index 3a583cb8dfc2..1279ab92920e 100644
--- a/x11-wm/xfce4-panel-profiles/Makefile
+++ b/x11-wm/xfce4-panel-profiles/Makefile
@@ -3,7 +3,7 @@
 PORTNAME=	xfce4-panel-profiles
 PORTVERSION=	1.0.8
 CATEGORIES=	x11-wm xfce
-MASTER_SITES=	XFCE/src/apps/${PORTNAME}/${PORTVERSION:R}
+MASTER_SITES=	XFCE/apps
 DIST_SUBDIR=	xfce4
 
 MAINTAINER=	xfce@FreeBSD.org
diff --git a/x11-wm/xfce4-panel/Makefile b/x11-wm/xfce4-panel/Makefile
index f0e403c6a82a..878ea4d67f7e 100644
--- a/x11-wm/xfce4-panel/Makefile
+++ b/x11-wm/xfce4-panel/Makefile
@@ -4,7 +4,7 @@
 PORTNAME=	xfce4-panel
 PORTVERSION=	4.12.2
 CATEGORIES=	x11-wm xfce
-MASTER_SITES=	XFCE/src/xfce/${PORTNAME}/${PORTVERSION:R}
+MASTER_SITES=	XFCE
 DIST_SUBDIR=	xfce4
 
 MAINTAINER=	xfce@FreeBSD.org
diff --git a/x11-wm/xfce4-session/Makefile b/x11-wm/xfce4-session/Makefile
index 6233c8e04193..89b3bd019343 100644
--- a/x11-wm/xfce4-session/Makefile
+++ b/x11-wm/xfce4-session/Makefile
@@ -5,7 +5,7 @@ PORTNAME=	xfce4-session
 PORTVERSION=	4.12.1
 PORTREVISION=	6
 CATEGORIES=	x11-wm xfce
-MASTER_SITES=	XFCE/src/xfce/${PORTNAME}/${PORTVERSION:R}
+MASTER_SITES=	XFCE
 DIST_SUBDIR=	xfce4
 
 MAINTAINER=	xfce@FreeBSD.org
diff --git a/x11-wm/xfce4-wm/Makefile b/x11-wm/xfce4-wm/Makefile
index 1e7cbe6b6590..045e39967c04 100644
--- a/x11-wm/xfce4-wm/Makefile
+++ b/x11-wm/xfce4-wm/Makefile
@@ -5,8 +5,8 @@ PORTNAME=	xfce4-wm
 PORTVERSION=	4.12.5
 PORTREVISION=	1
 CATEGORIES=	x11-wm xfce
-MASTER_SITES=	XFCE/src/xfce/xfwm4/${PORTVERSION:R}
-DISTNAME=	xfwm4-${PORTVERSION}
+MASTER_SITES=	XFCE
+DISTNAME=	xfwm4-${DISTVERSIONFULL}
 DIST_SUBDIR=	xfce4
 
 MAINTAINER=	xfce@FreeBSD.org
diff --git a/x11/libexo/Makefile b/x11/libexo/Makefile
index 599f1061bd69..063bdc0162d4 100644
--- a/x11/libexo/Makefile
+++ b/x11/libexo/Makefile
@@ -4,8 +4,8 @@
 PORTNAME=	libexo
 PORTVERSION=	0.12.6
 CATEGORIES=	x11 xfce
-MASTER_SITES=	XFCE/src/xfce/${PORTNAME:C/lib//}/${PORTVERSION:R}
-DISTNAME=	exo-${PORTVERSION}
+MASTER_SITES=	XFCE
+DISTNAME=	exo-${DISTVERSIONFULL}
 DIST_SUBDIR=	xfce4
 
 MAINTAINER=	xfce@FreeBSD.org
diff --git a/x11/libxfce4menu/Makefile b/x11/libxfce4menu/Makefile
index 47d8e9fdaac3..9ae5bbac8d41 100644
--- a/x11/libxfce4menu/Makefile
+++ b/x11/libxfce4menu/Makefile
@@ -5,8 +5,8 @@ PORTNAME=	libxfce4menu
 PORTVERSION=	4.12.1
 PORTREVISION=	2
 CATEGORIES=	x11 xfce
-MASTER_SITES=	XFCE/src/xfce/libxfce4ui/${PORTVERSION:R}
-DISTNAME=	libxfce4ui-${PORTVERSION}
+MASTER_SITES=	XFCE
+DISTNAME=	libxfce4ui-${DISTVERSIONFULL}
 DIST_SUBDIR=	xfce4
 
 MAINTAINER=	xfce@FreeBSD.org
diff --git a/x11/xfce4-clipman-plugin/Makefile b/x11/xfce4-clipman-plugin/Makefile
index 0784784c9725..e57ca0472df5 100644
--- a/x11/xfce4-clipman-plugin/Makefile
+++ b/x11/xfce4-clipman-plugin/Makefile
@@ -5,7 +5,7 @@ PORTNAME=	xfce4-clipman-plugin
 PORTVERSION=	1.4.3
 PORTREVISION=	1
 CATEGORIES=	x11 xfce
-MASTER_SITES=	XFCE/src/panel-plugins/${PORTNAME}/${PORTVERSION:R}
+MASTER_SITES=	XFCE/panel-plugins
 DIST_SUBDIR=	xfce4
 
 MAINTAINER=	xfce@FreeBSD.org
diff --git a/x11/xfce4-conf/Makefile b/x11/xfce4-conf/Makefile
index 482b494b0947..003e17bff94e 100644
--- a/x11/xfce4-conf/Makefile
+++ b/x11/xfce4-conf/Makefile
@@ -4,8 +4,8 @@
 PORTNAME=	xfce4-conf
 PORTVERSION=	4.12.1
 CATEGORIES=	x11 xfce
-MASTER_SITES=	XFCE/src/xfce/xfconf/${PORTVERSION:R}
-DISTNAME=	xfconf-${PORTVERSION}
+MASTER_SITES=	XFCE
+DISTNAME=	xfconf-${DISTVERSIONFULL}
 DIST_SUBDIR=	xfce4
 
 MAINTAINER=	xfce@FreeBSD.org
diff --git a/x11/xfce4-dashboard/Makefile b/x11/xfce4-dashboard/Makefile
index 70725db3068f..d79730e58a3f 100644
--- a/x11/xfce4-dashboard/Makefile
+++ b/x11/xfce4-dashboard/Makefile
@@ -5,7 +5,7 @@ PORTNAME=	dashboard
 PORTVERSION=	0.6.1
 PORTREVISION=	1
 CATEGORIES=	x11 xfce
-MASTER_SITES=	XFCE/src/apps/xfdashboard/${PORTVERSION:R}/
+MASTER_SITES=	XFCE/apps
 PKGNAMEPREFIX=	xfce4-
 DISTNAME=	xfdashboard-${DISTVERSIONFULL}
 DIST_SUBDIR=	xfce4
diff --git a/x11/xfce4-embed-plugin/Makefile b/x11/xfce4-embed-plugin/Makefile
index 510e38a3d917..83d56e3fab61 100644
--- a/x11/xfce4-embed-plugin/Makefile
+++ b/x11/xfce4-embed-plugin/Makefile
@@ -5,7 +5,7 @@ PORTNAME=	xfce4-embed-plugin
 PORTVERSION=	1.6.0
 PORTREVISION=	1
 CATEGORIES=	x11 xfce
-MASTER_SITES=	XFCE/src/panel-plugins/${PORTNAME}/${PORTVERSION:R}
+MASTER_SITES=	XFCE/panel-plugins
 DIST_SUBDIR=	xfce4
 
 MAINTAINER=	xfce@FreeBSD.org
diff --git a/x11/xfce4-quicklauncher-plugin/Makefile b/x11/xfce4-quicklauncher-plugin/Makefile
index b0719ac558ef..0e801c88ea16 100644
--- a/x11/xfce4-quicklauncher-plugin/Makefile
+++ b/x11/xfce4-quicklauncher-plugin/Makefile
@@ -5,7 +5,7 @@ PORTNAME=	xfce4-quicklauncher-plugin
 PORTVERSION=	1.9.4
 PORTREVISION=	18
 CATEGORIES=	x11 xfce
-MASTER_SITES=	XFCE/src/panel-plugins/${PORTNAME}/${PORTVERSION:R}
+MASTER_SITES=	XFCE/panel-plugins
 DIST_SUBDIR=	xfce4
 
 MAINTAINER=	xfce@FreeBSD.org
diff --git a/x11/xfce4-screensaver/Makefile b/x11/xfce4-screensaver/Makefile
index bbe3c68f4202..6a05de812e33 100644
--- a/x11/xfce4-screensaver/Makefile
+++ b/x11/xfce4-screensaver/Makefile
@@ -3,7 +3,7 @@
 PORTNAME=	xfce4-screensaver
 PORTVERSION=	0.1.5
 CATEGORIES=	x11 xfce
-MASTER_SITES=	XFCE/src/apps/${PORTNAME}/${PORTVERSION:R}
+MASTER_SITES=	XFCE/apps
 DIST_SUBDIR=	xfce4
 
 MAINTAINER=	xfce@FreeBSD.org
diff --git a/x11/xfce4-screenshooter-plugin/Makefile b/x11/xfce4-screenshooter-plugin/Makefile
index ef4de19a4a0e..e1e185047454 100644
--- a/x11/xfce4-screenshooter-plugin/Makefile
+++ b/x11/xfce4-screenshooter-plugin/Makefile
@@ -4,8 +4,8 @@
 PORTNAME=	xfce4-screenshooter-plugin
 PORTVERSION=	1.9.5
 CATEGORIES=	x11 xfce
-MASTER_SITES=	XFCE/src/apps/xfce4-screenshooter/${PORTVERSION:R}
-DISTNAME=	xfce4-screenshooter-${PORTVERSION}
+MASTER_SITES=	XFCE/apps
+DISTNAME=	xfce4-screenshooter-${DISTVERSIONFULL}
 DIST_SUBDIR=	xfce4
 
 MAINTAINER=	xfce@FreeBSD.org
diff --git a/x11/xfce4-taskmanager/Makefile b/x11/xfce4-taskmanager/Makefile
index 75abab7b5d4a..53f899ed5b3b 100644
--- a/x11/xfce4-taskmanager/Makefile
+++ b/x11/xfce4-taskmanager/Makefile
@@ -5,7 +5,7 @@ PORTNAME=	xfce4-taskmanager
 PORTVERSION=	1.2.2
 PORTREVISION=	1
 CATEGORIES=	x11 xfce
-MASTER_SITES=	XFCE/src/apps/${PORTNAME}/${PORTVERSION:R}
+MASTER_SITES=	XFCE/apps
 DIST_SUBDIR=	xfce4
 
 MAINTAINER=	xfce@FreeBSD.org
diff --git a/x11/xfce4-terminal/Makefile b/x11/xfce4-terminal/Makefile
index 34709614ce3f..7cf4b944e7a4 100644
--- a/x11/xfce4-terminal/Makefile
+++ b/x11/xfce4-terminal/Makefile
@@ -5,7 +5,7 @@ PORTNAME=	xfce4-terminal
 PORTVERSION=	0.8.7.4
 PORTREVISION=	2
 CATEGORIES=	x11 xfce
-MASTER_SITES=	XFCE/src/apps/${PORTNAME}/${PORTVERSION:R:R}
+MASTER_SITES=	XFCE/apps
 DIST_SUBDIR=	xfce4
 
 MAINTAINER=	xfce@FreeBSD.org
diff --git a/x11/xfce4-verve-plugin/Makefile b/x11/xfce4-verve-plugin/Makefile
index 35a33f1c8933..d75d6993bca6 100644
--- a/x11/xfce4-verve-plugin/Makefile
+++ b/x11/xfce4-verve-plugin/Makefile
@@ -5,9 +5,9 @@ PORTNAME=	verve-plugin
 PORTVERSION=	1.1.1
 PORTREVISION=	1
 CATEGORIES=	x11 xfce
-MASTER_SITES=	XFCE/src/panel-plugins/${PKGNAMEPREFIX}${PORTNAME}/${PORTVERSION:R}
+MASTER_SITES=	XFCE/panel-plugins
 PKGNAMEPREFIX=	xfce4-
-DISTNAME=	${PKGNAMEPREFIX}${PORTNAME}-${PORTVERSION}
+DISTNAME=	${PKGNAMEPREFIX}${PORTNAME}-${DISTVERSIONFULL}
 DIST_SUBDIR=	xfce4
 
 MAINTAINER=	xfce@FreeBSD.org
diff --git a/x11/xfce4-whiskermenu-plugin/Makefile b/x11/xfce4-whiskermenu-plugin/Makefile
index 90e01a25cabd..abf3f0141020 100644
--- a/x11/xfce4-whiskermenu-plugin/Makefile
+++ b/x11/xfce4-whiskermenu-plugin/Makefile
@@ -4,7 +4,7 @@
 PORTNAME=	xfce4-whiskermenu-plugin
 PORTVERSION=	2.3.2
 CATEGORIES=	x11 xfce
-MASTER_SITES=	XFCE/src/panel-plugins/${PORTNAME}/${PORTVERSION:R}
+MASTER_SITES=	XFCE/panel-plugins
 DIST_SUBDIR=	xfce4
 
 MAINTAINER=	xfce@FreeBSD.org
diff --git a/x11/xfce4-wmdock-plugin/Makefile b/x11/xfce4-wmdock-plugin/Makefile
index 0a657232f926..2aa56a5c3f22 100644
--- a/x11/xfce4-wmdock-plugin/Makefile
+++ b/x11/xfce4-wmdock-plugin/Makefile
@@ -5,7 +5,7 @@ PORTNAME=	xfce4-wmdock-plugin
 PORTVERSION=	0.6.0
 PORTREVISION=	3
 CATEGORIES=	x11 xfce
-MASTER_SITES=	XFCE/src/panel-plugins/xfce4-wmdock-plugin/0.6
+MASTER_SITES=	XFCE/panel-plugins
 DIST_SUBDIR=	xfce4
 
 MAINTAINER=	xfce@FreeBSD.org