- 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

14 files changed, 19 insertions, 19 deletions

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