Index: Mk/Uses/xfce.mk =================================================================== --- Mk/Uses/xfce.mk +++ Mk/Uses/xfce.mk @@ -19,8 +19,6 @@ _USE_XFCE_ALL= garcon libexo libgui libmenu libutil panel thunar xfconf -XFCE_MASTER_SITE_VER= 4.12 - xfce_ARGS?= # empty CPPFLAGS+= -I${LOCALBASE}/include Index: Mk/bsd.sites.mk =================================================================== --- Mk/bsd.sites.mk +++ Mk/bsd.sites.mk @@ -1175,15 +1175,15 @@ .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 @@ 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*\:/*} Index: archivers/squeeze/Makefile =================================================================== --- archivers/squeeze/Makefile +++ archivers/squeeze/Makefile @@ -5,7 +5,7 @@ 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 Index: archivers/thunar-archive-plugin/Makefile =================================================================== --- archivers/thunar-archive-plugin/Makefile +++ archivers/thunar-archive-plugin/Makefile @@ -5,7 +5,7 @@ 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 Index: audio/thunar-media-tags-plugin/Makefile =================================================================== --- audio/thunar-media-tags-plugin/Makefile +++ audio/thunar-media-tags-plugin/Makefile @@ -5,7 +5,7 @@ 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 Index: audio/xfce4-mixer/Makefile =================================================================== --- audio/xfce4-mixer/Makefile +++ audio/xfce4-mixer/Makefile @@ -5,7 +5,7 @@ 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 Index: audio/xfce4-mpc-plugin/Makefile =================================================================== --- audio/xfce4-mpc-plugin/Makefile +++ 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 Index: audio/xfce4-pulseaudio-plugin/Makefile =================================================================== --- audio/xfce4-pulseaudio-plugin/Makefile +++ audio/xfce4-pulseaudio-plugin/Makefile @@ -5,7 +5,7 @@ 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 Index: audio/xfmpc/Makefile =================================================================== --- audio/xfmpc/Makefile +++ audio/xfmpc/Makefile @@ -5,7 +5,7 @@ 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 Index: deskutils/orage/Makefile =================================================================== --- deskutils/orage/Makefile +++ deskutils/orage/Makefile @@ -5,7 +5,7 @@ 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 Index: deskutils/xfce4-notes-plugin/Makefile =================================================================== --- deskutils/xfce4-notes-plugin/Makefile +++ deskutils/xfce4-notes-plugin/Makefile @@ -5,7 +5,7 @@ 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 Index: deskutils/xfce4-notifyd/Makefile =================================================================== --- deskutils/xfce4-notifyd/Makefile +++ 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 Index: deskutils/xfce4-tumbler/Makefile =================================================================== --- deskutils/xfce4-tumbler/Makefile +++ deskutils/xfce4-tumbler/Makefile @@ -5,7 +5,7 @@ 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 Index: deskutils/xfce4-volumed-pulse/Makefile =================================================================== --- deskutils/xfce4-volumed-pulse/Makefile +++ deskutils/xfce4-volumed-pulse/Makefile @@ -5,7 +5,7 @@ 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 Index: deskutils/xfce4-volumed/Makefile =================================================================== --- deskutils/xfce4-volumed/Makefile +++ deskutils/xfce4-volumed/Makefile @@ -5,7 +5,7 @@ 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 Index: deskutils/xfce4-xkb-plugin/Makefile =================================================================== --- deskutils/xfce4-xkb-plugin/Makefile +++ deskutils/xfce4-xkb-plugin/Makefile @@ -4,7 +4,7 @@ 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 Index: devel/thunar-vcs-plugin/Makefile =================================================================== --- devel/thunar-vcs-plugin/Makefile +++ devel/thunar-vcs-plugin/Makefile @@ -5,7 +5,7 @@ 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 Index: devel/xfce4-vala/Makefile =================================================================== --- devel/xfce4-vala/Makefile +++ devel/xfce4-vala/Makefile @@ -5,7 +5,7 @@ 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 Index: editors/mousepad/Makefile =================================================================== --- editors/mousepad/Makefile +++ editors/mousepad/Makefile @@ -5,7 +5,7 @@ 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 Index: graphics/ristretto/Makefile =================================================================== --- graphics/ristretto/Makefile +++ 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 Index: mail/xfce4-mailwatch-plugin/Makefile =================================================================== --- mail/xfce4-mailwatch-plugin/Makefile +++ mail/xfce4-mailwatch-plugin/Makefile @@ -5,7 +5,7 @@ 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 Index: math/xfce4-calculator-plugin/Makefile =================================================================== --- math/xfce4-calculator-plugin/Makefile +++ 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 Index: misc/xfce4-weather-plugin/Makefile =================================================================== --- misc/xfce4-weather-plugin/Makefile +++ 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 Index: misc/xfce4-wm-themes/Makefile =================================================================== --- misc/xfce4-wm-themes/Makefile +++ misc/xfce4-wm-themes/Makefile @@ -5,8 +5,8 @@ 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 Index: multimedia/xfce4-parole/Makefile =================================================================== --- multimedia/xfce4-parole/Makefile +++ 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 Index: print/xfce4-print/Makefile =================================================================== --- print/xfce4-print/Makefile +++ print/xfce4-print/Makefile @@ -5,8 +5,8 @@ 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 Index: science/xfce4-equake-plugin/Makefile =================================================================== --- science/xfce4-equake-plugin/Makefile +++ 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 Index: sysutils/catfish/Makefile =================================================================== --- sysutils/catfish/Makefile +++ 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 Index: sysutils/garcon/Makefile =================================================================== --- sysutils/garcon/Makefile +++ 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 Index: sysutils/gigolo/Makefile =================================================================== --- sysutils/gigolo/Makefile +++ 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 Index: sysutils/xfburn/Makefile =================================================================== --- sysutils/xfburn/Makefile +++ sysutils/xfburn/Makefile @@ -5,7 +5,7 @@ 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 Index: sysutils/xfce4-battery-plugin/Makefile =================================================================== --- sysutils/xfce4-battery-plugin/Makefile +++ 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 Index: sysutils/xfce4-cpugraph-plugin/Makefile =================================================================== --- sysutils/xfce4-cpugraph-plugin/Makefile +++ sysutils/xfce4-cpugraph-plugin/Makefile @@ -5,7 +5,7 @@ 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 Index: sysutils/xfce4-diskperf-plugin/Makefile =================================================================== --- sysutils/xfce4-diskperf-plugin/Makefile +++ 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 Index: sysutils/xfce4-fsguard-plugin/Makefile =================================================================== --- sysutils/xfce4-fsguard-plugin/Makefile +++ 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 Index: sysutils/xfce4-genmon-plugin/Makefile =================================================================== --- sysutils/xfce4-genmon-plugin/Makefile +++ 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 Index: sysutils/xfce4-mount-plugin/Makefile =================================================================== --- sysutils/xfce4-mount-plugin/Makefile +++ 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 Index: sysutils/xfce4-netload-plugin/Makefile =================================================================== --- sysutils/xfce4-netload-plugin/Makefile +++ 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 Index: sysutils/xfce4-power-manager/Makefile =================================================================== --- sysutils/xfce4-power-manager/Makefile +++ 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 Index: sysutils/xfce4-settings/Makefile =================================================================== --- sysutils/xfce4-settings/Makefile +++ sysutils/xfce4-settings/Makefile @@ -5,7 +5,7 @@ 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 Index: sysutils/xfce4-systemload-plugin/Makefile =================================================================== --- sysutils/xfce4-systemload-plugin/Makefile +++ sysutils/xfce4-systemload-plugin/Makefile @@ -4,7 +4,7 @@ PORTNAME= xfce4-systemload-plugin PORTVERSION= 1.2.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 Index: sysutils/xfce4-wavelan-plugin/Makefile =================================================================== --- sysutils/xfce4-wavelan-plugin/Makefile +++ sysutils/xfce4-wavelan-plugin/Makefile @@ -5,7 +5,7 @@ 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 Index: textproc/xfce4-dict-plugin/Makefile =================================================================== --- textproc/xfce4-dict-plugin/Makefile +++ 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 Index: www/xfce4-smartbookmark-plugin/Makefile =================================================================== --- www/xfce4-smartbookmark-plugin/Makefile +++ 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 Index: x11-clocks/xfce4-datetime-plugin/Makefile =================================================================== --- x11-clocks/xfce4-datetime-plugin/Makefile +++ 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 Index: x11-clocks/xfce4-timer-out-plugin/Makefile =================================================================== --- x11-clocks/xfce4-timer-out-plugin/Makefile +++ x11-clocks/xfce4-timer-out-plugin/Makefile @@ -5,7 +5,7 @@ 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 Index: x11-clocks/xfce4-timer-plugin/Makefile =================================================================== --- x11-clocks/xfce4-timer-plugin/Makefile +++ x11-clocks/xfce4-timer-plugin/Makefile @@ -5,7 +5,7 @@ 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 Index: x11-fm/thunar-vfs/Makefile =================================================================== --- x11-fm/thunar-vfs/Makefile +++ x11-fm/thunar-vfs/Makefile @@ -5,7 +5,7 @@ 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 Index: x11-fm/thunar/Makefile =================================================================== --- x11-fm/thunar/Makefile +++ 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 Index: x11-themes/gtk-xfce-engine/Makefile =================================================================== --- x11-themes/gtk-xfce-engine/Makefile +++ 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 Index: x11-toolkits/libxfce4gui/Makefile =================================================================== --- x11-toolkits/libxfce4gui/Makefile +++ x11-toolkits/libxfce4gui/Makefile @@ -5,8 +5,8 @@ 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 Index: x11-wm/xfce4-desktop/Makefile =================================================================== --- x11-wm/xfce4-desktop/Makefile +++ 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 Index: x11-wm/xfce4-panel-profiles/Makefile =================================================================== --- x11-wm/xfce4-panel-profiles/Makefile +++ 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 Index: x11-wm/xfce4-panel/Makefile =================================================================== --- x11-wm/xfce4-panel/Makefile +++ 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 Index: x11-wm/xfce4-session/Makefile =================================================================== --- x11-wm/xfce4-session/Makefile +++ x11-wm/xfce4-session/Makefile @@ -5,7 +5,7 @@ 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 Index: x11-wm/xfce4-wm/Makefile =================================================================== --- x11-wm/xfce4-wm/Makefile +++ x11-wm/xfce4-wm/Makefile @@ -5,8 +5,8 @@ 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 Index: x11/libexo/Makefile =================================================================== --- x11/libexo/Makefile +++ x11/libexo/Makefile @@ -4,8 +4,8 @@ PORTNAME= libexo PORTVERSION= 0.12.5 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 Index: x11/libxfce4menu/Makefile =================================================================== --- x11/libxfce4menu/Makefile +++ x11/libxfce4menu/Makefile @@ -5,8 +5,8 @@ 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 Index: x11/xfce4-clipman-plugin/Makefile =================================================================== --- x11/xfce4-clipman-plugin/Makefile +++ x11/xfce4-clipman-plugin/Makefile @@ -5,7 +5,7 @@ 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 Index: x11/xfce4-conf/Makefile =================================================================== --- x11/xfce4-conf/Makefile +++ 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 Index: x11/xfce4-dashboard/Makefile =================================================================== --- x11/xfce4-dashboard/Makefile +++ x11/xfce4-dashboard/Makefile @@ -5,7 +5,7 @@ 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 Index: x11/xfce4-embed-plugin/Makefile =================================================================== --- x11/xfce4-embed-plugin/Makefile +++ x11/xfce4-embed-plugin/Makefile @@ -5,7 +5,7 @@ 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 Index: x11/xfce4-quicklauncher-plugin/Makefile =================================================================== --- x11/xfce4-quicklauncher-plugin/Makefile +++ x11/xfce4-quicklauncher-plugin/Makefile @@ -5,7 +5,7 @@ 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 Index: x11/xfce4-screensaver/Makefile =================================================================== --- x11/xfce4-screensaver/Makefile +++ x11/xfce4-screensaver/Makefile @@ -4,7 +4,7 @@ PORTVERSION= 0.1.4 PORTREVISION= 1 CATEGORIES= x11 xfce -MASTER_SITES= XFCE/src/apps/${PORTNAME}/${PORTVERSION:R} +MASTER_SITES= XFCE/apps DIST_SUBDIR= xfce4 MAINTAINER= xfce@FreeBSD.org Index: x11/xfce4-screenshooter-plugin/Makefile =================================================================== --- x11/xfce4-screenshooter-plugin/Makefile +++ 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 Index: x11/xfce4-taskmanager/Makefile =================================================================== --- x11/xfce4-taskmanager/Makefile +++ x11/xfce4-taskmanager/Makefile @@ -5,7 +5,7 @@ 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 Index: x11/xfce4-terminal/Makefile =================================================================== --- x11/xfce4-terminal/Makefile +++ x11/xfce4-terminal/Makefile @@ -5,7 +5,7 @@ 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 Index: x11/xfce4-verve-plugin/Makefile =================================================================== --- x11/xfce4-verve-plugin/Makefile +++ x11/xfce4-verve-plugin/Makefile @@ -5,9 +5,9 @@ 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 Index: x11/xfce4-whiskermenu-plugin/Makefile =================================================================== --- x11/xfce4-whiskermenu-plugin/Makefile +++ 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 Index: x11/xfce4-wmdock-plugin/Makefile =================================================================== --- x11/xfce4-wmdock-plugin/Makefile +++ x11/xfce4-wmdock-plugin/Makefile @@ -5,7 +5,7 @@ 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