Skip site navigation (1)Skip section navigation (2)
Date:      Wed, 19 Jun 2019 16:14:27 +0000 (UTC)
From:      Guido Falsi <madpilot@FreeBSD.org>
To:        ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org
Subject:   svn commit: r504557 - in head: Mk Mk/Uses archivers/squeeze archivers/thunar-archive-plugin audio/thunar-media-tags-plugin audio/xfce4-mixer audio/xfce4-mpc-plugin audio/xfce4-pulseaudio-plugin aud...
Message-ID:  <201906191614.x5JGERE9012543@repo.freebsd.org>

next in thread | raw e-mail | index | archive | help
Author: madpilot
Date: Wed Jun 19 16:14:27 2019
New Revision: 504557
URL: https://svnweb.freebsd.org/changeset/ports/504557

Log:
  - 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

Modified:
  head/Mk/Uses/xfce.mk
  head/Mk/bsd.sites.mk
  head/archivers/squeeze/Makefile
  head/archivers/thunar-archive-plugin/Makefile
  head/audio/thunar-media-tags-plugin/Makefile
  head/audio/xfce4-mixer/Makefile
  head/audio/xfce4-mpc-plugin/Makefile
  head/audio/xfce4-pulseaudio-plugin/Makefile
  head/audio/xfmpc/Makefile
  head/deskutils/orage/Makefile
  head/deskutils/xfce4-notes-plugin/Makefile
  head/deskutils/xfce4-notifyd/Makefile
  head/deskutils/xfce4-tumbler/Makefile
  head/deskutils/xfce4-volumed-pulse/Makefile
  head/deskutils/xfce4-volumed/Makefile
  head/deskutils/xfce4-xkb-plugin/Makefile
  head/devel/thunar-vcs-plugin/Makefile
  head/devel/xfce4-vala/Makefile
  head/editors/mousepad/Makefile
  head/graphics/ristretto/Makefile
  head/mail/xfce4-mailwatch-plugin/Makefile
  head/math/xfce4-calculator-plugin/Makefile
  head/misc/xfce4-weather-plugin/Makefile
  head/misc/xfce4-wm-themes/Makefile
  head/multimedia/xfce4-parole/Makefile
  head/print/xfce4-print/Makefile
  head/science/xfce4-equake-plugin/Makefile
  head/sysutils/catfish/Makefile
  head/sysutils/garcon/Makefile
  head/sysutils/gigolo/Makefile
  head/sysutils/xfburn/Makefile
  head/sysutils/xfce4-battery-plugin/Makefile
  head/sysutils/xfce4-cpugraph-plugin/Makefile
  head/sysutils/xfce4-diskperf-plugin/Makefile
  head/sysutils/xfce4-fsguard-plugin/Makefile
  head/sysutils/xfce4-genmon-plugin/Makefile
  head/sysutils/xfce4-mount-plugin/Makefile
  head/sysutils/xfce4-netload-plugin/Makefile
  head/sysutils/xfce4-power-manager/Makefile
  head/sysutils/xfce4-settings/Makefile
  head/sysutils/xfce4-systemload-plugin/Makefile
  head/sysutils/xfce4-wavelan-plugin/Makefile
  head/textproc/xfce4-dict-plugin/Makefile
  head/www/xfce4-smartbookmark-plugin/Makefile
  head/x11-clocks/xfce4-datetime-plugin/Makefile
  head/x11-clocks/xfce4-timer-out-plugin/Makefile
  head/x11-clocks/xfce4-timer-plugin/Makefile
  head/x11-fm/thunar-vfs/Makefile
  head/x11-fm/thunar/Makefile
  head/x11-themes/gtk-xfce-engine/Makefile
  head/x11-toolkits/libxfce4gui/Makefile
  head/x11-wm/xfce4-desktop/Makefile
  head/x11-wm/xfce4-panel-profiles/Makefile
  head/x11-wm/xfce4-panel/Makefile
  head/x11-wm/xfce4-session/Makefile
  head/x11-wm/xfce4-wm/Makefile
  head/x11/libexo/Makefile
  head/x11/libxfce4menu/Makefile
  head/x11/xfce4-clipman-plugin/Makefile
  head/x11/xfce4-conf/Makefile
  head/x11/xfce4-dashboard/Makefile
  head/x11/xfce4-embed-plugin/Makefile
  head/x11/xfce4-quicklauncher-plugin/Makefile
  head/x11/xfce4-screensaver/Makefile
  head/x11/xfce4-screenshooter-plugin/Makefile
  head/x11/xfce4-taskmanager/Makefile
  head/x11/xfce4-terminal/Makefile
  head/x11/xfce4-verve-plugin/Makefile
  head/x11/xfce4-whiskermenu-plugin/Makefile
  head/x11/xfce4-wmdock-plugin/Makefile

Modified: head/Mk/Uses/xfce.mk
==============================================================================
--- head/Mk/Uses/xfce.mk	Wed Jun 19 15:25:26 2019	(r504556)
+++ head/Mk/Uses/xfce.mk	Wed Jun 19 16:14:27 2019	(r504557)
@@ -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

Modified: head/Mk/bsd.sites.mk
==============================================================================
--- head/Mk/bsd.sites.mk	Wed Jun 19 15:25:26 2019	(r504556)
+++ head/Mk/bsd.sites.mk	Wed Jun 19 16:14:27 2019	(r504557)
@@ -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:${PORTNA
 			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*\:/*}
 

Modified: head/archivers/squeeze/Makefile
==============================================================================
--- head/archivers/squeeze/Makefile	Wed Jun 19 15:25:26 2019	(r504556)
+++ head/archivers/squeeze/Makefile	Wed Jun 19 16:14:27 2019	(r504557)
@@ -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

Modified: head/archivers/thunar-archive-plugin/Makefile
==============================================================================
--- head/archivers/thunar-archive-plugin/Makefile	Wed Jun 19 15:25:26 2019	(r504556)
+++ head/archivers/thunar-archive-plugin/Makefile	Wed Jun 19 16:14:27 2019	(r504557)
@@ -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

Modified: head/audio/thunar-media-tags-plugin/Makefile
==============================================================================
--- head/audio/thunar-media-tags-plugin/Makefile	Wed Jun 19 15:25:26 2019	(r504556)
+++ head/audio/thunar-media-tags-plugin/Makefile	Wed Jun 19 16:14:27 2019	(r504557)
@@ -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

Modified: head/audio/xfce4-mixer/Makefile
==============================================================================
--- head/audio/xfce4-mixer/Makefile	Wed Jun 19 15:25:26 2019	(r504556)
+++ head/audio/xfce4-mixer/Makefile	Wed Jun 19 16:14:27 2019	(r504557)
@@ -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

Modified: head/audio/xfce4-mpc-plugin/Makefile
==============================================================================
--- head/audio/xfce4-mpc-plugin/Makefile	Wed Jun 19 15:25:26 2019	(r504556)
+++ head/audio/xfce4-mpc-plugin/Makefile	Wed Jun 19 16:14:27 2019	(r504557)
@@ -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

Modified: head/audio/xfce4-pulseaudio-plugin/Makefile
==============================================================================
--- head/audio/xfce4-pulseaudio-plugin/Makefile	Wed Jun 19 15:25:26 2019	(r504556)
+++ head/audio/xfce4-pulseaudio-plugin/Makefile	Wed Jun 19 16:14:27 2019	(r504557)
@@ -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

Modified: head/audio/xfmpc/Makefile
==============================================================================
--- head/audio/xfmpc/Makefile	Wed Jun 19 15:25:26 2019	(r504556)
+++ head/audio/xfmpc/Makefile	Wed Jun 19 16:14:27 2019	(r504557)
@@ -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

Modified: head/deskutils/orage/Makefile
==============================================================================
--- head/deskutils/orage/Makefile	Wed Jun 19 15:25:26 2019	(r504556)
+++ head/deskutils/orage/Makefile	Wed Jun 19 16:14:27 2019	(r504557)
@@ -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

Modified: head/deskutils/xfce4-notes-plugin/Makefile
==============================================================================
--- head/deskutils/xfce4-notes-plugin/Makefile	Wed Jun 19 15:25:26 2019	(r504556)
+++ head/deskutils/xfce4-notes-plugin/Makefile	Wed Jun 19 16:14:27 2019	(r504557)
@@ -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

Modified: head/deskutils/xfce4-notifyd/Makefile
==============================================================================
--- head/deskutils/xfce4-notifyd/Makefile	Wed Jun 19 15:25:26 2019	(r504556)
+++ head/deskutils/xfce4-notifyd/Makefile	Wed Jun 19 16:14:27 2019	(r504557)
@@ -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

Modified: head/deskutils/xfce4-tumbler/Makefile
==============================================================================
--- head/deskutils/xfce4-tumbler/Makefile	Wed Jun 19 15:25:26 2019	(r504556)
+++ head/deskutils/xfce4-tumbler/Makefile	Wed Jun 19 16:14:27 2019	(r504557)
@@ -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
 

Modified: head/deskutils/xfce4-volumed-pulse/Makefile
==============================================================================
--- head/deskutils/xfce4-volumed-pulse/Makefile	Wed Jun 19 15:25:26 2019	(r504556)
+++ head/deskutils/xfce4-volumed-pulse/Makefile	Wed Jun 19 16:14:27 2019	(r504557)
@@ -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

Modified: head/deskutils/xfce4-volumed/Makefile
==============================================================================
--- head/deskutils/xfce4-volumed/Makefile	Wed Jun 19 15:25:26 2019	(r504556)
+++ head/deskutils/xfce4-volumed/Makefile	Wed Jun 19 16:14:27 2019	(r504557)
@@ -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

Modified: head/deskutils/xfce4-xkb-plugin/Makefile
==============================================================================
--- head/deskutils/xfce4-xkb-plugin/Makefile	Wed Jun 19 15:25:26 2019	(r504556)
+++ head/deskutils/xfce4-xkb-plugin/Makefile	Wed Jun 19 16:14:27 2019	(r504557)
@@ -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

Modified: head/devel/thunar-vcs-plugin/Makefile
==============================================================================
--- head/devel/thunar-vcs-plugin/Makefile	Wed Jun 19 15:25:26 2019	(r504556)
+++ head/devel/thunar-vcs-plugin/Makefile	Wed Jun 19 16:14:27 2019	(r504557)
@@ -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

Modified: head/devel/xfce4-vala/Makefile
==============================================================================
--- head/devel/xfce4-vala/Makefile	Wed Jun 19 15:25:26 2019	(r504556)
+++ head/devel/xfce4-vala/Makefile	Wed Jun 19 16:14:27 2019	(r504557)
@@ -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

Modified: head/editors/mousepad/Makefile
==============================================================================
--- head/editors/mousepad/Makefile	Wed Jun 19 15:25:26 2019	(r504556)
+++ head/editors/mousepad/Makefile	Wed Jun 19 16:14:27 2019	(r504557)
@@ -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

Modified: head/graphics/ristretto/Makefile
==============================================================================
--- head/graphics/ristretto/Makefile	Wed Jun 19 15:25:26 2019	(r504556)
+++ head/graphics/ristretto/Makefile	Wed Jun 19 16:14:27 2019	(r504557)
@@ -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

Modified: head/mail/xfce4-mailwatch-plugin/Makefile
==============================================================================
--- head/mail/xfce4-mailwatch-plugin/Makefile	Wed Jun 19 15:25:26 2019	(r504556)
+++ head/mail/xfce4-mailwatch-plugin/Makefile	Wed Jun 19 16:14:27 2019	(r504557)
@@ -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

Modified: head/math/xfce4-calculator-plugin/Makefile
==============================================================================
--- head/math/xfce4-calculator-plugin/Makefile	Wed Jun 19 15:25:26 2019	(r504556)
+++ head/math/xfce4-calculator-plugin/Makefile	Wed Jun 19 16:14:27 2019	(r504557)
@@ -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

Modified: head/misc/xfce4-weather-plugin/Makefile
==============================================================================
--- head/misc/xfce4-weather-plugin/Makefile	Wed Jun 19 15:25:26 2019	(r504556)
+++ head/misc/xfce4-weather-plugin/Makefile	Wed Jun 19 16:14:27 2019	(r504557)
@@ -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

Modified: head/misc/xfce4-wm-themes/Makefile
==============================================================================
--- head/misc/xfce4-wm-themes/Makefile	Wed Jun 19 15:25:26 2019	(r504556)
+++ head/misc/xfce4-wm-themes/Makefile	Wed Jun 19 16:14:27 2019	(r504557)
@@ -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

Modified: head/multimedia/xfce4-parole/Makefile
==============================================================================
--- head/multimedia/xfce4-parole/Makefile	Wed Jun 19 15:25:26 2019	(r504556)
+++ head/multimedia/xfce4-parole/Makefile	Wed Jun 19 16:14:27 2019	(r504557)
@@ -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

Modified: head/print/xfce4-print/Makefile
==============================================================================
--- head/print/xfce4-print/Makefile	Wed Jun 19 15:25:26 2019	(r504556)
+++ head/print/xfce4-print/Makefile	Wed Jun 19 16:14:27 2019	(r504557)
@@ -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

Modified: head/science/xfce4-equake-plugin/Makefile
==============================================================================
--- head/science/xfce4-equake-plugin/Makefile	Wed Jun 19 15:25:26 2019	(r504556)
+++ head/science/xfce4-equake-plugin/Makefile	Wed Jun 19 16:14:27 2019	(r504557)
@@ -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

Modified: head/sysutils/catfish/Makefile
==============================================================================
--- head/sysutils/catfish/Makefile	Wed Jun 19 15:25:26 2019	(r504556)
+++ head/sysutils/catfish/Makefile	Wed Jun 19 16:14:27 2019	(r504557)
@@ -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

Modified: head/sysutils/garcon/Makefile
==============================================================================
--- head/sysutils/garcon/Makefile	Wed Jun 19 15:25:26 2019	(r504556)
+++ head/sysutils/garcon/Makefile	Wed Jun 19 16:14:27 2019	(r504557)
@@ -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

Modified: head/sysutils/gigolo/Makefile
==============================================================================
--- head/sysutils/gigolo/Makefile	Wed Jun 19 15:25:26 2019	(r504556)
+++ head/sysutils/gigolo/Makefile	Wed Jun 19 16:14:27 2019	(r504557)
@@ -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

Modified: head/sysutils/xfburn/Makefile
==============================================================================
--- head/sysutils/xfburn/Makefile	Wed Jun 19 15:25:26 2019	(r504556)
+++ head/sysutils/xfburn/Makefile	Wed Jun 19 16:14:27 2019	(r504557)
@@ -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

Modified: head/sysutils/xfce4-battery-plugin/Makefile
==============================================================================
--- head/sysutils/xfce4-battery-plugin/Makefile	Wed Jun 19 15:25:26 2019	(r504556)
+++ head/sysutils/xfce4-battery-plugin/Makefile	Wed Jun 19 16:14:27 2019	(r504557)
@@ -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

Modified: head/sysutils/xfce4-cpugraph-plugin/Makefile
==============================================================================
--- head/sysutils/xfce4-cpugraph-plugin/Makefile	Wed Jun 19 15:25:26 2019	(r504556)
+++ head/sysutils/xfce4-cpugraph-plugin/Makefile	Wed Jun 19 16:14:27 2019	(r504557)
@@ -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

Modified: head/sysutils/xfce4-diskperf-plugin/Makefile
==============================================================================
--- head/sysutils/xfce4-diskperf-plugin/Makefile	Wed Jun 19 15:25:26 2019	(r504556)
+++ head/sysutils/xfce4-diskperf-plugin/Makefile	Wed Jun 19 16:14:27 2019	(r504557)
@@ -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

Modified: head/sysutils/xfce4-fsguard-plugin/Makefile
==============================================================================
--- head/sysutils/xfce4-fsguard-plugin/Makefile	Wed Jun 19 15:25:26 2019	(r504556)
+++ head/sysutils/xfce4-fsguard-plugin/Makefile	Wed Jun 19 16:14:27 2019	(r504557)
@@ -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

Modified: head/sysutils/xfce4-genmon-plugin/Makefile
==============================================================================
--- head/sysutils/xfce4-genmon-plugin/Makefile	Wed Jun 19 15:25:26 2019	(r504556)
+++ head/sysutils/xfce4-genmon-plugin/Makefile	Wed Jun 19 16:14:27 2019	(r504557)
@@ -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

Modified: head/sysutils/xfce4-mount-plugin/Makefile
==============================================================================
--- head/sysutils/xfce4-mount-plugin/Makefile	Wed Jun 19 15:25:26 2019	(r504556)
+++ head/sysutils/xfce4-mount-plugin/Makefile	Wed Jun 19 16:14:27 2019	(r504557)
@@ -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

Modified: head/sysutils/xfce4-netload-plugin/Makefile
==============================================================================
--- head/sysutils/xfce4-netload-plugin/Makefile	Wed Jun 19 15:25:26 2019	(r504556)
+++ head/sysutils/xfce4-netload-plugin/Makefile	Wed Jun 19 16:14:27 2019	(r504557)
@@ -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

Modified: head/sysutils/xfce4-power-manager/Makefile
==============================================================================
--- head/sysutils/xfce4-power-manager/Makefile	Wed Jun 19 15:25:26 2019	(r504556)
+++ head/sysutils/xfce4-power-manager/Makefile	Wed Jun 19 16:14:27 2019	(r504557)
@@ -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

Modified: head/sysutils/xfce4-settings/Makefile
==============================================================================
--- head/sysutils/xfce4-settings/Makefile	Wed Jun 19 15:25:26 2019	(r504556)
+++ head/sysutils/xfce4-settings/Makefile	Wed Jun 19 16:14:27 2019	(r504557)
@@ -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

Modified: head/sysutils/xfce4-systemload-plugin/Makefile
==============================================================================
--- head/sysutils/xfce4-systemload-plugin/Makefile	Wed Jun 19 15:25:26 2019	(r504556)
+++ head/sysutils/xfce4-systemload-plugin/Makefile	Wed Jun 19 16:14:27 2019	(r504557)
@@ -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

Modified: head/sysutils/xfce4-wavelan-plugin/Makefile
==============================================================================
--- head/sysutils/xfce4-wavelan-plugin/Makefile	Wed Jun 19 15:25:26 2019	(r504556)
+++ head/sysutils/xfce4-wavelan-plugin/Makefile	Wed Jun 19 16:14:27 2019	(r504557)
@@ -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

Modified: head/textproc/xfce4-dict-plugin/Makefile
==============================================================================
--- head/textproc/xfce4-dict-plugin/Makefile	Wed Jun 19 15:25:26 2019	(r504556)
+++ head/textproc/xfce4-dict-plugin/Makefile	Wed Jun 19 16:14:27 2019	(r504557)
@@ -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
 

Modified: head/www/xfce4-smartbookmark-plugin/Makefile
==============================================================================
--- head/www/xfce4-smartbookmark-plugin/Makefile	Wed Jun 19 15:25:26 2019	(r504556)
+++ head/www/xfce4-smartbookmark-plugin/Makefile	Wed Jun 19 16:14:27 2019	(r504557)
@@ -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

Modified: head/x11-clocks/xfce4-datetime-plugin/Makefile
==============================================================================
--- head/x11-clocks/xfce4-datetime-plugin/Makefile	Wed Jun 19 15:25:26 2019	(r504556)
+++ head/x11-clocks/xfce4-datetime-plugin/Makefile	Wed Jun 19 16:14:27 2019	(r504557)
@@ -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

Modified: head/x11-clocks/xfce4-timer-out-plugin/Makefile
==============================================================================
--- head/x11-clocks/xfce4-timer-out-plugin/Makefile	Wed Jun 19 15:25:26 2019	(r504556)
+++ head/x11-clocks/xfce4-timer-out-plugin/Makefile	Wed Jun 19 16:14:27 2019	(r504557)
@@ -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

Modified: head/x11-clocks/xfce4-timer-plugin/Makefile
==============================================================================
--- head/x11-clocks/xfce4-timer-plugin/Makefile	Wed Jun 19 15:25:26 2019	(r504556)
+++ head/x11-clocks/xfce4-timer-plugin/Makefile	Wed Jun 19 16:14:27 2019	(r504557)
@@ -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

Modified: head/x11-fm/thunar-vfs/Makefile
==============================================================================
--- head/x11-fm/thunar-vfs/Makefile	Wed Jun 19 15:25:26 2019	(r504556)
+++ head/x11-fm/thunar-vfs/Makefile	Wed Jun 19 16:14:27 2019	(r504557)
@@ -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

Modified: head/x11-fm/thunar/Makefile
==============================================================================
--- head/x11-fm/thunar/Makefile	Wed Jun 19 15:25:26 2019	(r504556)
+++ head/x11-fm/thunar/Makefile	Wed Jun 19 16:14:27 2019	(r504557)
@@ -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

Modified: head/x11-themes/gtk-xfce-engine/Makefile
==============================================================================
--- head/x11-themes/gtk-xfce-engine/Makefile	Wed Jun 19 15:25:26 2019	(r504556)
+++ head/x11-themes/gtk-xfce-engine/Makefile	Wed Jun 19 16:14:27 2019	(r504557)
@@ -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

Modified: head/x11-toolkits/libxfce4gui/Makefile
==============================================================================
--- head/x11-toolkits/libxfce4gui/Makefile	Wed Jun 19 15:25:26 2019	(r504556)
+++ head/x11-toolkits/libxfce4gui/Makefile	Wed Jun 19 16:14:27 2019	(r504557)
@@ -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

Modified: head/x11-wm/xfce4-desktop/Makefile
==============================================================================
--- head/x11-wm/xfce4-desktop/Makefile	Wed Jun 19 15:25:26 2019	(r504556)
+++ head/x11-wm/xfce4-desktop/Makefile	Wed Jun 19 16:14:27 2019	(r504557)
@@ -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

Modified: head/x11-wm/xfce4-panel-profiles/Makefile
==============================================================================
--- head/x11-wm/xfce4-panel-profiles/Makefile	Wed Jun 19 15:25:26 2019	(r504556)
+++ head/x11-wm/xfce4-panel-profiles/Makefile	Wed Jun 19 16:14:27 2019	(r504557)
@@ -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

Modified: head/x11-wm/xfce4-panel/Makefile
==============================================================================
--- head/x11-wm/xfce4-panel/Makefile	Wed Jun 19 15:25:26 2019	(r504556)
+++ head/x11-wm/xfce4-panel/Makefile	Wed Jun 19 16:14:27 2019	(r504557)
@@ -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

Modified: head/x11-wm/xfce4-session/Makefile
==============================================================================
--- head/x11-wm/xfce4-session/Makefile	Wed Jun 19 15:25:26 2019	(r504556)
+++ head/x11-wm/xfce4-session/Makefile	Wed Jun 19 16:14:27 2019	(r504557)
@@ -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

Modified: head/x11-wm/xfce4-wm/Makefile
==============================================================================
--- head/x11-wm/xfce4-wm/Makefile	Wed Jun 19 15:25:26 2019	(r504556)
+++ head/x11-wm/xfce4-wm/Makefile	Wed Jun 19 16:14:27 2019	(r504557)
@@ -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

Modified: head/x11/libexo/Makefile
==============================================================================
--- head/x11/libexo/Makefile	Wed Jun 19 15:25:26 2019	(r504556)
+++ head/x11/libexo/Makefile	Wed Jun 19 16:14:27 2019	(r504557)
@@ -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

Modified: head/x11/libxfce4menu/Makefile
==============================================================================
--- head/x11/libxfce4menu/Makefile	Wed Jun 19 15:25:26 2019	(r504556)
+++ head/x11/libxfce4menu/Makefile	Wed Jun 19 16:14:27 2019	(r504557)
@@ -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

Modified: head/x11/xfce4-clipman-plugin/Makefile
==============================================================================
--- head/x11/xfce4-clipman-plugin/Makefile	Wed Jun 19 15:25:26 2019	(r504556)
+++ head/x11/xfce4-clipman-plugin/Makefile	Wed Jun 19 16:14:27 2019	(r504557)
@@ -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

Modified: head/x11/xfce4-conf/Makefile
==============================================================================
--- head/x11/xfce4-conf/Makefile	Wed Jun 19 15:25:26 2019	(r504556)
+++ head/x11/xfce4-conf/Makefile	Wed Jun 19 16:14:27 2019	(r504557)
@@ -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

Modified: head/x11/xfce4-dashboard/Makefile
==============================================================================
--- head/x11/xfce4-dashboard/Makefile	Wed Jun 19 15:25:26 2019	(r504556)
+++ head/x11/xfce4-dashboard/Makefile	Wed Jun 19 16:14:27 2019	(r504557)
@@ -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

Modified: head/x11/xfce4-embed-plugin/Makefile
==============================================================================
--- head/x11/xfce4-embed-plugin/Makefile	Wed Jun 19 15:25:26 2019	(r504556)
+++ head/x11/xfce4-embed-plugin/Makefile	Wed Jun 19 16:14:27 2019	(r504557)
@@ -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

Modified: head/x11/xfce4-quicklauncher-plugin/Makefile
==============================================================================
--- head/x11/xfce4-quicklauncher-plugin/Makefile	Wed Jun 19 15:25:26 2019	(r504556)
+++ head/x11/xfce4-quicklauncher-plugin/Makefile	Wed Jun 19 16:14:27 2019	(r504557)
@@ -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

Modified: head/x11/xfce4-screensaver/Makefile
==============================================================================
--- head/x11/xfce4-screensaver/Makefile	Wed Jun 19 15:25:26 2019	(r504556)
+++ head/x11/xfce4-screensaver/Makefile	Wed Jun 19 16:14:27 2019	(r504557)
@@ -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

Modified: head/x11/xfce4-screenshooter-plugin/Makefile
==============================================================================
--- head/x11/xfce4-screenshooter-plugin/Makefile	Wed Jun 19 15:25:26 2019	(r504556)
+++ head/x11/xfce4-screenshooter-plugin/Makefile	Wed Jun 19 16:14:27 2019	(r504557)
@@ -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

Modified: head/x11/xfce4-taskmanager/Makefile
==============================================================================
--- head/x11/xfce4-taskmanager/Makefile	Wed Jun 19 15:25:26 2019	(r504556)
+++ head/x11/xfce4-taskmanager/Makefile	Wed Jun 19 16:14:27 2019	(r504557)
@@ -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

Modified: head/x11/xfce4-terminal/Makefile
==============================================================================
--- head/x11/xfce4-terminal/Makefile	Wed Jun 19 15:25:26 2019	(r504556)
+++ head/x11/xfce4-terminal/Makefile	Wed Jun 19 16:14:27 2019	(r504557)
@@ -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

Modified: head/x11/xfce4-verve-plugin/Makefile
==============================================================================
--- head/x11/xfce4-verve-plugin/Makefile	Wed Jun 19 15:25:26 2019	(r504556)
+++ head/x11/xfce4-verve-plugin/Makefile	Wed Jun 19 16:14:27 2019	(r504557)
@@ -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

Modified: head/x11/xfce4-whiskermenu-plugin/Makefile
==============================================================================
--- head/x11/xfce4-whiskermenu-plugin/Makefile	Wed Jun 19 15:25:26 2019	(r504556)
+++ head/x11/xfce4-whiskermenu-plugin/Makefile	Wed Jun 19 16:14:27 2019	(r504557)
@@ -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

Modified: head/x11/xfce4-wmdock-plugin/Makefile
==============================================================================
--- head/x11/xfce4-wmdock-plugin/Makefile	Wed Jun 19 15:25:26 2019	(r504556)
+++ head/x11/xfce4-wmdock-plugin/Makefile	Wed Jun 19 16:14:27 2019	(r504557)
@@ -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



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201906191614.x5JGERE9012543>