diff options
49 files changed, 50 insertions, 89 deletions
diff --git a/Mk/Uses/xfce.mk b/Mk/Uses/xfce.mk index 6ceb9ca407c4..f0a225cab995 100644 --- a/Mk/Uses/xfce.mk +++ b/Mk/Uses/xfce.mk @@ -20,7 +20,7 @@ _USES_POST+= xfce _USE_XFCE_ALL= garcon libexo libgui libmenu libutil panel thunar xfconf -MASTER_SITE_SUBDIR?= xfce/4.12/src +XFCE_MASTER_SITE_VER= 4.12 xfce_ARGS?= # empty diff --git a/Mk/bsd.sites.mk b/Mk/bsd.sites.mk index e7daeecffd52..b2c0867068b8 100644 --- a/Mk/bsd.sites.mk +++ b/Mk/bsd.sites.mk @@ -1358,7 +1358,8 @@ MASTER_SITES_SUBDIRS= APACHE_JAKARTA:${PORTNAME:S,-,/,}/source \ NETLIB:${PORTNAME} \ PERL_CPAN:${PORTNAME:C/-.*//} \ SAVANNAH:${PORTNAME:tl} \ - SOURCEFORGE:${PORTNAME:tl}/${PORTNAME:tl}/${PORTVERSION} + SOURCEFORGE:${PORTNAME:tl}/${PORTNAME:tl}/${PORTVERSION} \ + XFCE:xfce/${XFCE_MASTER_SITE_VER}/src .if defined(MASTER_SITES) && ${MASTER_SITES:N*\:/*} diff --git a/archivers/squeeze/Makefile b/archivers/squeeze/Makefile index 98ebb9163269..d4c0874698d4 100644 --- a/archivers/squeeze/Makefile +++ b/archivers/squeeze/Makefile @@ -5,8 +5,7 @@ PORTNAME= squeeze PORTVERSION= 0.2.3 PORTREVISION= 10 CATEGORIES= archivers xfce -MASTER_SITES= ${MASTER_SITE_XFCE} -MASTER_SITE_SUBDIR= src/apps/${PORTNAME}/${PORTVERSION:R} +MASTER_SITES= XFCE/src/apps/${PORTNAME}/${PORTVERSION:R} DIST_SUBDIR= xfce4 MAINTAINER= xfce@FreeBSD.org diff --git a/archivers/thunar-archive-plugin/Makefile b/archivers/thunar-archive-plugin/Makefile index a57d8963dfde..7759bc4b4773 100644 --- a/archivers/thunar-archive-plugin/Makefile +++ b/archivers/thunar-archive-plugin/Makefile @@ -5,8 +5,7 @@ PORTNAME= thunar-archive-plugin PORTVERSION= 0.3.1 PORTREVISION= 4 CATEGORIES= archivers xfce -MASTER_SITES= ${MASTER_SITE_XFCE} -MASTER_SITE_SUBDIR=src/thunar-plugins/${PORTNAME}/${PORTVERSION:R} +MASTER_SITES= XFCE/src/thunar-plugins/${PORTNAME}/${PORTVERSION:R} DIST_SUBDIR= xfce4 MAINTAINER= xfce@FreeBSD.org diff --git a/audio/thunar-media-tags-plugin/Makefile b/audio/thunar-media-tags-plugin/Makefile index 3336d42b04fb..6367a696e4a9 100644 --- a/audio/thunar-media-tags-plugin/Makefile +++ b/audio/thunar-media-tags-plugin/Makefile @@ -5,8 +5,7 @@ PORTNAME= thunar-media-tags-plugin PORTVERSION= 0.2.1 PORTREVISION= 4 CATEGORIES= audio xfce -MASTER_SITES= ${MASTER_SITE_XFCE} -MASTER_SITE_SUBDIR=src/thunar-plugins/${PORTNAME}/${PORTVERSION:R} +MASTER_SITES= XFCE/src/thunar-plugins/${PORTNAME}/${PORTVERSION:R} DIST_SUBDIR= xfce4 MAINTAINER= xfce@FreeBSD.org diff --git a/audio/xfce4-mixer/Makefile b/audio/xfce4-mixer/Makefile index abf2ebbca8f6..585a2014bfe1 100644 --- a/audio/xfce4-mixer/Makefile +++ b/audio/xfce4-mixer/Makefile @@ -5,8 +5,7 @@ PORTNAME= xfce4-mixer PORTVERSION= 4.11.0 PORTREVISION= 2 CATEGORIES= audio xfce -MASTER_SITES= ${MASTER_SITE_XFCE} -MASTER_SITE_SUBDIR= src/apps/${PORTNAME}/${PORTVERSION:R} +MASTER_SITES= XFCE/src/apps/${PORTNAME}/${PORTVERSION:R} DIST_SUBDIR= xfce4 MAINTAINER= xfce@FreeBSD.org diff --git a/audio/xfce4-mpc-plugin/Makefile b/audio/xfce4-mpc-plugin/Makefile index 31b6397ba2a8..c69cd1388959 100644 --- a/audio/xfce4-mpc-plugin/Makefile +++ b/audio/xfce4-mpc-plugin/Makefile @@ -4,8 +4,7 @@ PORTNAME= xfce4-mpc-plugin PORTVERSION= 0.4.5 CATEGORIES= audio xfce -MASTER_SITES= ${MASTER_SITE_XFCE} -MASTER_SITE_SUBDIR=src/panel-plugins/${PORTNAME}/${PORTVERSION:R} +MASTER_SITES= XFCE/src/panel-plugins/${PORTNAME}/${PORTVERSION:R} DIST_SUBDIR= xfce4 MAINTAINER= xfce@FreeBSD.org diff --git a/audio/xfmpc/Makefile b/audio/xfmpc/Makefile index 099e6fc8384e..ed7e1265d0c2 100644 --- a/audio/xfmpc/Makefile +++ b/audio/xfmpc/Makefile @@ -5,8 +5,7 @@ PORTNAME= xfmpc PORTVERSION= 0.2.2 PORTREVISION= 6 CATEGORIES= audio xfce -MASTER_SITES= ${MASTER_SITE_XFCE} -MASTER_SITE_SUBDIR=/src/apps/${PORTNAME}/${PORTVERSION:R} +MASTER_SITES= XFCE/src/apps/${PORTNAME}/${PORTVERSION:R} DIST_SUBDIR= xfce4 MAINTAINER= xfce@FreeBSD.org diff --git a/deskutils/xfce4-tumbler/Makefile b/deskutils/xfce4-tumbler/Makefile index 08503d0c95b8..4a48543327f7 100644 --- a/deskutils/xfce4-tumbler/Makefile +++ b/deskutils/xfce4-tumbler/Makefile @@ -4,7 +4,7 @@ PORTNAME= tumbler PORTVERSION= 0.1.31 CATEGORIES= deskutils xfce -MASTER_SITES= ${MASTER_SITE_XFCE} +MASTER_SITES= XFCE PKGNAMEPREFIX= xfce4- DIST_SUBDIR= xfce4 diff --git a/deskutils/xfce4-xkb-plugin/Makefile b/deskutils/xfce4-xkb-plugin/Makefile index 78ca0848aaae..126f86b3ba06 100644 --- a/deskutils/xfce4-xkb-plugin/Makefile +++ b/deskutils/xfce4-xkb-plugin/Makefile @@ -3,8 +3,7 @@ PORTNAME= xfce4-xkb-plugin PORTVERSION= 0.7.1 CATEGORIES= deskutils xfce -MASTER_SITES= ${MASTER_SITE_XFCE} -MASTER_SITE_SUBDIR= src/panel-plugins/${PORTNAME}/${PORTVERSION:R} +MASTER_SITES= XFCE/src/panel-plugins/${PORTNAME}/${PORTVERSION:R} 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 19246723d899..16991bbc891e 100644 --- a/devel/thunar-vcs-plugin/Makefile +++ b/devel/thunar-vcs-plugin/Makefile @@ -5,8 +5,7 @@ PORTNAME= thunar-vcs-plugin PORTVERSION= 0.1.4 PORTREVISION= 13 CATEGORIES= devel xfce -MASTER_SITES= ${MASTER_SITE_XFCE} -MASTER_SITE_SUBDIR= src/thunar-plugins/${PORTNAME}/${PORTVERSION:R} +MASTER_SITES= XFCE/src/thunar-plugins/${PORTNAME}/${PORTVERSION:R} DIST_SUBDIR= xfce4 MAINTAINER= sergey.dyatko@gmail.com diff --git a/devel/xfce4-dev-tools/Makefile b/devel/xfce4-dev-tools/Makefile index df253705c5cf..fd92132d2ec1 100644 --- a/devel/xfce4-dev-tools/Makefile +++ b/devel/xfce4-dev-tools/Makefile @@ -4,7 +4,7 @@ PORTNAME= xfce4-dev-tools PORTVERSION= 4.12.0 CATEGORIES= devel xfce -MASTER_SITES= ${MASTER_SITE_XFCE} +MASTER_SITES= XFCE DIST_SUBDIR= xfce4 MAINTAINER= xfce@FreeBSD.org diff --git a/devel/xfce4-vala/Makefile b/devel/xfce4-vala/Makefile index a71342f386f6..81d1ff5b5248 100644 --- a/devel/xfce4-vala/Makefile +++ b/devel/xfce4-vala/Makefile @@ -5,8 +5,7 @@ PORTNAME= xfce4-vala PORTVERSION= 4.10.3 PORTREVISION= 1 CATEGORIES= devel xfce -MASTER_SITES= ${MASTER_SITE_XFCE} -MASTER_SITE_SUBDIR= src/bindings/${PORTNAME}/${PORTVERSION:R} +MASTER_SITES= XFCE/src/bindings/${PORTNAME}/${PORTVERSION:R} DIST_SUBDIR= xfce4 MAINTAINER= xfce@FreeBSD.org diff --git a/editors/mousepad/Makefile b/editors/mousepad/Makefile index d6bc2128de54..25f0e70e0e0a 100644 --- a/editors/mousepad/Makefile +++ b/editors/mousepad/Makefile @@ -5,8 +5,7 @@ PORTNAME= mousepad PORTVERSION= 0.4.0 PORTREVISION= 1 CATEGORIES= editors xfce -MASTER_SITES= ${MASTER_SITE_XFCE} -MASTER_SITE_SUBDIR=src/apps/${PORTNAME}/${PORTVERSION:R} +MASTER_SITES= XFCE/src/apps/${PORTNAME}/${PORTVERSION:R} DIST_SUBDIR= xfce4 MAINTAINER= xfce@FreeBSD.org diff --git a/graphics/ristretto/Makefile b/graphics/ristretto/Makefile index bb1fb086c44c..b9e4e9e9e34b 100644 --- a/graphics/ristretto/Makefile +++ b/graphics/ristretto/Makefile @@ -4,8 +4,7 @@ PORTNAME= ristretto PORTVERSION= 0.8.0 CATEGORIES= graphics xfce -MASTER_SITES= ${MASTER_SITE_XFCE} -MASTER_SITE_SUBDIR= src/apps/${PORTNAME}/${PORTVERSION:R} +MASTER_SITES= XFCE/src/apps/${PORTNAME}/${PORTVERSION:R} DIST_SUBDIR= xfce4 MAINTAINER= xfce@FreeBSD.org diff --git a/mail/xfce4-mailwatch-plugin/Makefile b/mail/xfce4-mailwatch-plugin/Makefile index 6b022b062259..90fb3aa42200 100644 --- a/mail/xfce4-mailwatch-plugin/Makefile +++ b/mail/xfce4-mailwatch-plugin/Makefile @@ -5,8 +5,7 @@ PORTNAME= xfce4-mailwatch-plugin PORTVERSION= 1.2.0 PORTREVISION= 7 CATEGORIES= mail xfce -MASTER_SITES= ${MASTER_SITE_XFCE} -MASTER_SITE_SUBDIR= src/panel-plugins/${PORTNAME}/${PORTVERSION:R} +MASTER_SITES= XFCE/src/panel-plugins/${PORTNAME}/${PORTVERSION:R} DIST_SUBDIR= xfce4 MAINTAINER= xfce@FreeBSD.org diff --git a/misc/xfce4-appfinder/Makefile b/misc/xfce4-appfinder/Makefile index 35980cbafa5a..ea103962c7f0 100644 --- a/misc/xfce4-appfinder/Makefile +++ b/misc/xfce4-appfinder/Makefile @@ -4,7 +4,7 @@ PORTNAME= xfce4-appfinder PORTVERSION= 4.12.0 CATEGORIES= misc xfce -MASTER_SITES= ${MASTER_SITE_XFCE} +MASTER_SITES= XFCE DIST_SUBDIR= xfce4 MAINTAINER= xfce@FreeBSD.org diff --git a/misc/xfce4-weather-plugin/Makefile b/misc/xfce4-weather-plugin/Makefile index 0ffd77abf473..b70a80044816 100644 --- a/misc/xfce4-weather-plugin/Makefile +++ b/misc/xfce4-weather-plugin/Makefile @@ -5,8 +5,7 @@ PORTNAME= xfce4-weather-plugin PORTVERSION= 0.8.5 PORTREVISION= 1 CATEGORIES= misc xfce geography -MASTER_SITES= ${MASTER_SITE_XFCE} -MASTER_SITE_SUBDIR=src/panel-plugins/${PORTNAME}/${PORTVERSION:R} +MASTER_SITES= XFCE/src/panel-plugins/${PORTNAME}/${PORTVERSION:R} DIST_SUBDIR= xfce4 MAINTAINER= xfce@FreeBSD.org diff --git a/misc/xfce4-wm-themes/Makefile b/misc/xfce4-wm-themes/Makefile index 3cc4dd38c819..462e6a78e2ea 100644 --- a/misc/xfce4-wm-themes/Makefile +++ b/misc/xfce4-wm-themes/Makefile @@ -5,8 +5,7 @@ PORTNAME= xfce4-wm-themes PORTVERSION= 4.10.0 PORTREVISION= 1 CATEGORIES= misc xfce -MASTER_SITES= ${MASTER_SITE_XFCE} -MASTER_SITE_SUBDIR= src/art/xfwm4-themes/${PORTVERSION:R} +MASTER_SITES= XFCE/src/art/xfwm4-themes/${PORTVERSION:R} DISTNAME= xfwm4-themes-${PORTVERSION} DIST_SUBDIR= xfce4 @@ -15,7 +14,6 @@ COMMENT= Additional themes for xfwm4 GNU_CONFIGURE= yes INSTALLS_ICONS= yes -USE_XFCE= configenv # to get MASTER_SITE_SUBDIR something has to be defined USES= gmake tar:bzip2 .include <bsd.port.mk> diff --git a/print/xfce4-print/Makefile b/print/xfce4-print/Makefile index c3fcfb2fe0c3..06fc6f9aa379 100644 --- a/print/xfce4-print/Makefile +++ b/print/xfce4-print/Makefile @@ -5,8 +5,7 @@ PORTNAME= xfce4-print PORTVERSION= 4.6.1 PORTREVISION= 13 CATEGORIES= print xfce -MASTER_SITES= ${MASTER_SITE_XFCE} -MASTER_SITE_SUBDIR= src/archive/xfprint/${PORTVERSION:R} +MASTER_SITES= XFCE/src/archive/xfprint/${PORTVERSION:R} DISTNAME= xfprint-${PORTVERSION} DIST_SUBDIR= xfce4 diff --git a/sysutils/garcon/Makefile b/sysutils/garcon/Makefile index 987416021d96..44665615b84a 100644 --- a/sysutils/garcon/Makefile +++ b/sysutils/garcon/Makefile @@ -4,7 +4,7 @@ PORTNAME= garcon PORTVERSION= 0.4.0 CATEGORIES= sysutils xfce -MASTER_SITES= ${MASTER_SITE_XFCE} +MASTER_SITES= XFCE DIST_SUBDIR= xfce4 MAINTAINER= xfce@FreeBSD.org diff --git a/sysutils/xfburn/Makefile b/sysutils/xfburn/Makefile index 7086ec24cb58..61aa8ec84060 100644 --- a/sysutils/xfburn/Makefile +++ b/sysutils/xfburn/Makefile @@ -5,8 +5,7 @@ PORTNAME= xfburn PORTVERSION= 0.5.2 PORTREVISION= 2 CATEGORIES= sysutils -MASTER_SITES= ${MASTER_SITE_XFCE} -MASTER_SITE_SUBDIR=src/apps/${PORTNAME}/${PORTVERSION:R} +MASTER_SITES= XFCE/src/apps/${PORTNAME}/${PORTVERSION:R} DIST_SUBDIR= xfce4 MAINTAINER= xfce@FreeBSD.org diff --git a/sysutils/xfce4-battery-plugin/Makefile b/sysutils/xfce4-battery-plugin/Makefile index 7495872ba0ec..ac0ccfa85440 100644 --- a/sysutils/xfce4-battery-plugin/Makefile +++ b/sysutils/xfce4-battery-plugin/Makefile @@ -5,8 +5,7 @@ PORTNAME= xfce4-battery-plugin PORTVERSION= 1.0.5 PORTREVISION= 3 CATEGORIES= sysutils xfce -MASTER_SITES= ${MASTER_SITE_XFCE} -MASTER_SITE_SUBDIR=src/panel-plugins/${PORTNAME}/${PORTVERSION:R} +MASTER_SITES= XFCE/src/panel-plugins/${PORTNAME}/${PORTVERSION:R} DIST_SUBDIR= xfce4 MAINTAINER= xfce@FreeBSD.org diff --git a/sysutils/xfce4-cpugraph-plugin/Makefile b/sysutils/xfce4-cpugraph-plugin/Makefile index a05b2d3b6dc4..4d9964b8b538 100644 --- a/sysutils/xfce4-cpugraph-plugin/Makefile +++ b/sysutils/xfce4-cpugraph-plugin/Makefile @@ -5,8 +5,7 @@ PORTNAME= xfce4-cpugraph-plugin PORTVERSION= 1.0.5 PORTREVISION= 3 CATEGORIES= sysutils xfce -MASTER_SITES= ${MASTER_SITE_XFCE} -MASTER_SITE_SUBDIR= src/panel-plugins/${PORTNAME}/${PORTVERSION:R} +MASTER_SITES= XFCE/src/panel-plugins/${PORTNAME}/${PORTVERSION:R} DIST_SUBDIR= xfce4 MAINTAINER= xfce@FreeBSD.org diff --git a/sysutils/xfce4-diskperf-plugin/Makefile b/sysutils/xfce4-diskperf-plugin/Makefile index 27e1eed41497..41de35f960ba 100644 --- a/sysutils/xfce4-diskperf-plugin/Makefile +++ b/sysutils/xfce4-diskperf-plugin/Makefile @@ -4,8 +4,7 @@ PORTNAME= xfce4-diskperf-plugin PORTVERSION= 2.5.5 CATEGORIES= sysutils xfce -MASTER_SITES= ${MASTER_SITE_XFCE} -MASTER_SITE_SUBDIR= src/panel-plugins/${PORTNAME}/${PORTVERSION:R} +MASTER_SITES= XFCE/src/panel-plugins/${PORTNAME}/${PORTVERSION:R} DIST_SUBDIR= xfce4 MAINTAINER= danilo@FreeBSD.org diff --git a/sysutils/xfce4-fsguard-plugin/Makefile b/sysutils/xfce4-fsguard-plugin/Makefile index 4725bcdf4d6e..e0976535facf 100644 --- a/sysutils/xfce4-fsguard-plugin/Makefile +++ b/sysutils/xfce4-fsguard-plugin/Makefile @@ -4,8 +4,7 @@ PORTNAME= xfce4-fsguard-plugin PORTVERSION= 1.0.2 CATEGORIES= sysutils xfce -MASTER_SITES= ${MASTER_SITE_XFCE} -MASTER_SITE_SUBDIR= src/panel-plugins/${PORTNAME}/${PORTVERSION:R} +MASTER_SITES= XFCE/src/panel-plugins/${PORTNAME}/${PORTVERSION:R} DIST_SUBDIR= xfce4 MAINTAINER= xfce@FreeBSD.org diff --git a/sysutils/xfce4-genmon-plugin/Makefile b/sysutils/xfce4-genmon-plugin/Makefile index a261a9e2f763..2e60c7e270b6 100644 --- a/sysutils/xfce4-genmon-plugin/Makefile +++ b/sysutils/xfce4-genmon-plugin/Makefile @@ -5,8 +5,7 @@ PORTNAME= xfce4-genmon-plugin PORTVERSION= 3.4.0 PORTREVISION= 4 CATEGORIES= sysutils xfce -MASTER_SITES= ${MASTER_SITE_XFCE} -MASTER_SITE_SUBDIR= src/panel-plugins/${PORTNAME}/${PORTVERSION:R} +MASTER_SITES= XFCE/src/panel-plugins/${PORTNAME}/${PORTVERSION:R} DIST_SUBDIR= xfce4 MAINTAINER= xfce@FreeBSD.org diff --git a/sysutils/xfce4-mount-plugin/Makefile b/sysutils/xfce4-mount-plugin/Makefile index 5bd3c4335845..be4d6b2d4a93 100644 --- a/sysutils/xfce4-mount-plugin/Makefile +++ b/sysutils/xfce4-mount-plugin/Makefile @@ -5,8 +5,7 @@ PORTNAME= xfce4-mount-plugin PORTVERSION= 0.6.7 PORTREVISION= 2 CATEGORIES= sysutils xfce -MASTER_SITES= ${MASTER_SITE_XFCE} -MASTER_SITE_SUBDIR= src/panel-plugins/${PORTNAME}/${PORTVERSION:R} +MASTER_SITES= XFCE/src/panel-plugins/${PORTNAME}/${PORTVERSION:R} DIST_SUBDIR= xfce4 MAINTAINER= xfce@FreeBSD.org diff --git a/sysutils/xfce4-netload-plugin/Makefile b/sysutils/xfce4-netload-plugin/Makefile index afd5deb3940d..d2b0f67cc5ef 100644 --- a/sysutils/xfce4-netload-plugin/Makefile +++ b/sysutils/xfce4-netload-plugin/Makefile @@ -5,8 +5,7 @@ PORTNAME= xfce4-netload-plugin PORTVERSION= 1.2.4 PORTREVISION= 1 CATEGORIES= sysutils xfce -MASTER_SITES= ${MASTER_SITE_XFCE} -MASTER_SITE_SUBDIR= src/panel-plugins/${PORTNAME}/${PORTVERSION:R} +MASTER_SITES= XFCE/src/panel-plugins/${PORTNAME}/${PORTVERSION:R} DIST_SUBDIR= xfce4 MAINTAINER= xfce@FreeBSD.org diff --git a/sysutils/xfce4-settings/Makefile b/sysutils/xfce4-settings/Makefile index e7d658018890..922d3ff60de1 100644 --- a/sysutils/xfce4-settings/Makefile +++ b/sysutils/xfce4-settings/Makefile @@ -4,7 +4,7 @@ PORTNAME= xfce4-settings PORTVERSION= 4.12.0 CATEGORIES= sysutils xfce -MASTER_SITES= ${MASTER_SITE_XFCE} +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 ac244cef3bac..e6473f412c35 100644 --- a/sysutils/xfce4-systemload-plugin/Makefile +++ b/sysutils/xfce4-systemload-plugin/Makefile @@ -5,8 +5,7 @@ PORTNAME= xfce4-systemload-plugin PORTVERSION= 1.1.2 PORTREVISION= 1 CATEGORIES= sysutils xfce -MASTER_SITES= ${MASTER_SITE_XFCE} -MASTER_SITE_SUBDIR= src/panel-plugins/${PORTNAME}/${PORTVERSION:R} +MASTER_SITES= XFCE/src/panel-plugins/${PORTNAME}/${PORTVERSION:R} DIST_SUBDIR= xfce4 MAINTAINER= xfce@FreeBSD.org diff --git a/sysutils/xfce4-wavelan-plugin/Makefile b/sysutils/xfce4-wavelan-plugin/Makefile index bd7ba4a02f96..de43d360daef 100644 --- a/sysutils/xfce4-wavelan-plugin/Makefile +++ b/sysutils/xfce4-wavelan-plugin/Makefile @@ -4,8 +4,7 @@ PORTNAME= xfce4-wavelan-plugin PORTVERSION= 0.5.12 CATEGORIES= sysutils xfce -MASTER_SITES= ${MASTER_SITE_XFCE} -MASTER_SITE_SUBDIR=src/panel-plugins/${PORTNAME}/${PORTVERSION:R} +MASTER_SITES= XFCE/src/panel-plugins/${PORTNAME}/${PORTVERSION:R} DIST_SUBDIR= xfce4 MAINTAINER= xfce@FreeBSD.org diff --git a/www/xfce4-smartbookmark-plugin/Makefile b/www/xfce4-smartbookmark-plugin/Makefile index 00ca64111e6e..4242fe73adc2 100644 --- a/www/xfce4-smartbookmark-plugin/Makefile +++ b/www/xfce4-smartbookmark-plugin/Makefile @@ -4,8 +4,7 @@ PORTNAME= xfce4-smartbookmark-plugin PORTVERSION= 0.4.6 CATEGORIES= www xfce -MASTER_SITES= ${MASTER_SITE_XFCE} -MASTER_SITE_SUBDIR= src/panel-plugins/${PORTNAME}/${PORTVERSION:R} +MASTER_SITES= XFCE/src/panel-plugins/${PORTNAME}/${PORTVERSION:R} DIST_SUBDIR= xfce4 MAINTAINER= xfce@FreeBSD.org diff --git a/x11-clocks/xfce4-datetime-plugin/Makefile b/x11-clocks/xfce4-datetime-plugin/Makefile index 5a42d30ff0ed..3a9c82afc877 100644 --- a/x11-clocks/xfce4-datetime-plugin/Makefile +++ b/x11-clocks/xfce4-datetime-plugin/Makefile @@ -5,8 +5,7 @@ PORTNAME= xfce4-datetime-plugin PORTVERSION= 0.6.2 PORTREVISION= 3 CATEGORIES= x11-clocks xfce -MASTER_SITES= ${MASTER_SITE_XFCE} -MASTER_SITE_SUBDIR=src/panel-plugins/${PORTNAME}/${PORTVERSION:R} +MASTER_SITES= XFCE/src/panel-plugins/${PORTNAME}/${PORTVERSION:R} 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 76ede9f5da8a..69dc061147b1 100644 --- a/x11-clocks/xfce4-timer-out-plugin/Makefile +++ b/x11-clocks/xfce4-timer-out-plugin/Makefile @@ -4,8 +4,7 @@ PORTNAME= xfce4-time-out-plugin PORTVERSION= 1.0.2 CATEGORIES= x11-clocks xfce -MASTER_SITES= ${MASTER_SITE_XFCE} -MASTER_SITE_SUBDIR=src/panel-plugins/${PORTNAME}/${PORTVERSION:R} +MASTER_SITES= XFCE/src/panel-plugins/${PORTNAME}/${PORTVERSION:R} DIST_SUBDIR= xfce4 MAINTAINER= xfce@FreeBSD.org diff --git a/x11-clocks/xfce4-timer-plugin/Makefile b/x11-clocks/xfce4-timer-plugin/Makefile index e6e447bec553..99d91cf2acae 100644 --- a/x11-clocks/xfce4-timer-plugin/Makefile +++ b/x11-clocks/xfce4-timer-plugin/Makefile @@ -5,8 +5,7 @@ PORTNAME= xfce4-timer-plugin PORTVERSION= 1.6.0 PORTREVISION= 1 CATEGORIES= x11-clocks xfce -MASTER_SITES= ${MASTER_SITE_XFCE} -MASTER_SITE_SUBDIR=src/panel-plugins/${PORTNAME}/${PORTVERSION:R} +MASTER_SITES= XFCE/src/panel-plugins/${PORTNAME}/${PORTVERSION:R} DIST_SUBDIR= xfce4 MAINTAINER= xfce@FreeBSD.org diff --git a/x11-fm/thunar-vfs/Makefile b/x11-fm/thunar-vfs/Makefile index 9499d7ec1dff..0e8ad8988118 100644 --- a/x11-fm/thunar-vfs/Makefile +++ b/x11-fm/thunar-vfs/Makefile @@ -5,8 +5,7 @@ PORTNAME= thunar-vfs PORTVERSION= 1.2.0 PORTREVISION= 11 CATEGORIES= x11-fm xfce -MASTER_SITES= ${MASTER_SITE_XFCE} -MASTER_SITE_SUBDIR= src/archive/${PORTNAME}/${PORTVERSION:R} +MASTER_SITES= XFCE/src/archive/${PORTNAME}/${PORTVERSION:R} DIST_SUBDIR= xfce4 MAINTAINER= xfce@FreeBSD.org diff --git a/x11-themes/gtk-xfce-engine/Makefile b/x11-themes/gtk-xfce-engine/Makefile index 8c5d55a6532e..41cc946365da 100644 --- a/x11-themes/gtk-xfce-engine/Makefile +++ b/x11-themes/gtk-xfce-engine/Makefile @@ -4,8 +4,7 @@ PORTNAME= gtk-xfce-engine PORTVERSION= 3.2.0 CATEGORIES= x11-themes xfce -MASTER_SITES= ${MASTER_SITE_XFCE} -MASTER_SITE_SUBDIR= src/xfce/${PORTNAME}/${PORTVERSION:R} +MASTER_SITES= XFCE/src/xfce/${PORTNAME}/${PORTVERSION:R} DIST_SUBDIR= xfce4 MAINTAINER= xfce@FreeBSD.org diff --git a/x11-toolkits/libxfce4gui/Makefile b/x11-toolkits/libxfce4gui/Makefile index 0cb5ad049710..8adfc0795c1b 100644 --- a/x11-toolkits/libxfce4gui/Makefile +++ b/x11-toolkits/libxfce4gui/Makefile @@ -5,8 +5,7 @@ PORTNAME= libxfce4gui PORTVERSION= 4.10.0 PORTREVISION= 5 CATEGORIES= x11-toolkits xfce -MASTER_SITES= ${MASTER_SITE_XFCE} -MASTER_SITE_SUBDIR= src/archive/libxfcegui4/${PORTVERSION:R} +MASTER_SITES= XFCE/src/archive/libxfcegui4/${PORTVERSION:R} DISTNAME= libxfcegui4-${PORTVERSION} DIST_SUBDIR= xfce4 diff --git a/x11-wm/xfce4-panel/Makefile b/x11-wm/xfce4-panel/Makefile index b04b9d89f99c..12b7bfb3d1d7 100644 --- a/x11-wm/xfce4-panel/Makefile +++ b/x11-wm/xfce4-panel/Makefile @@ -4,7 +4,7 @@ PORTNAME= xfce4-panel PORTVERSION= 4.12.0 CATEGORIES= x11-wm xfce -MASTER_SITES= ${MASTER_SITE_XFCE} +MASTER_SITES= XFCE DIST_SUBDIR= xfce4 MAINTAINER= xfce@FreeBSD.org diff --git a/x11/libxfce4util/Makefile b/x11/libxfce4util/Makefile index 311bad627ff0..5cf4c72abbbf 100644 --- a/x11/libxfce4util/Makefile +++ b/x11/libxfce4util/Makefile @@ -4,7 +4,7 @@ PORTNAME= libxfce4util PORTVERSION= 4.12.1 CATEGORIES= x11 xfce -MASTER_SITES= ${MASTER_SITE_XFCE} +MASTER_SITES= XFCE DIST_SUBDIR= xfce4 MAINTAINER= xfce@FreeBSD.org diff --git a/x11/xfce4-clipman-plugin/Makefile b/x11/xfce4-clipman-plugin/Makefile index 387c621968cf..94f24e501631 100644 --- a/x11/xfce4-clipman-plugin/Makefile +++ b/x11/xfce4-clipman-plugin/Makefile @@ -5,8 +5,7 @@ PORTNAME= xfce4-clipman-plugin PORTVERSION= 1.2.6 PORTREVISION= 2 CATEGORIES= x11 xfce -MASTER_SITES= ${MASTER_SITE_XFCE} -MASTER_SITE_SUBDIR= src/panel-plugins/${PORTNAME}/${PORTVERSION:R} +MASTER_SITES= XFCE/src/panel-plugins/${PORTNAME}/${PORTVERSION:R} DIST_SUBDIR= xfce4 MAINTAINER= xfce@FreeBSD.org diff --git a/x11/xfce4-conf/Makefile b/x11/xfce4-conf/Makefile index 7a478268a1c9..89354214a102 100644 --- a/x11/xfce4-conf/Makefile +++ b/x11/xfce4-conf/Makefile @@ -4,7 +4,7 @@ PORTNAME= xfce4-conf PORTVERSION= 4.12.0 CATEGORIES= x11 xfce -MASTER_SITES= ${MASTER_SITE_XFCE} +MASTER_SITES= XFCE DISTNAME= xfconf-${PORTVERSION} DIST_SUBDIR= xfce4 diff --git a/x11/xfce4-embed-plugin/Makefile b/x11/xfce4-embed-plugin/Makefile index 400d2a799397..704b590da4bf 100644 --- a/x11/xfce4-embed-plugin/Makefile +++ b/x11/xfce4-embed-plugin/Makefile @@ -5,8 +5,7 @@ PORTNAME= xfce4-embed-plugin PORTVERSION= 1.4.1 PORTREVISION= 2 CATEGORIES= x11 xfce -MASTER_SITES= ${MASTER_SITE_XFCE} -MASTER_SITE_SUBDIR= src/panel-plugins/${PORTNAME}/${PORTVERSION:R} +MASTER_SITES= XFCE/src/panel-plugins/${PORTNAME}/${PORTVERSION:R} DIST_SUBDIR= xfce4 MAINTAINER= xfce@FreeBSD.org diff --git a/x11/xfce4-quicklauncher-plugin/Makefile b/x11/xfce4-quicklauncher-plugin/Makefile index 7dde7d01774e..c98af71f546e 100644 --- a/x11/xfce4-quicklauncher-plugin/Makefile +++ b/x11/xfce4-quicklauncher-plugin/Makefile @@ -5,8 +5,7 @@ PORTNAME= xfce4-quicklauncher-plugin PORTVERSION= 1.9.4 PORTREVISION= 17 CATEGORIES= x11 xfce -MASTER_SITES= ${MASTER_SITE_XFCE} -MASTER_SITE_SUBDIR=src/panel-plugins/${PORTNAME}/${PORTVERSION:R} +MASTER_SITES= XFCE/src/panel-plugins/${PORTNAME}/${PORTVERSION:R} DIST_SUBDIR= xfce4 MAINTAINER= xfce@FreeBSD.org diff --git a/x11/xfce4-screenshooter-plugin/Makefile b/x11/xfce4-screenshooter-plugin/Makefile index 636eee34c1d6..0ba287d735f2 100644 --- a/x11/xfce4-screenshooter-plugin/Makefile +++ b/x11/xfce4-screenshooter-plugin/Makefile @@ -5,8 +5,7 @@ PORTNAME= xfce4-screenshooter-plugin PORTVERSION= 1.8.2 PORTREVISION= 1 CATEGORIES= x11 xfce -MASTER_SITES= ${MASTER_SITE_XFCE} -MASTER_SITE_SUBDIR=src/apps/xfce4-screenshooter/${PORTVERSION:R} +MASTER_SITES= XFCE/src/apps/xfce4-screenshooter/${PORTVERSION:R} DISTNAME= xfce4-screenshooter-${PORTVERSION} DIST_SUBDIR= xfce4 diff --git a/x11/xfce4-taskmanager/Makefile b/x11/xfce4-taskmanager/Makefile index 923bc93c5ee6..0d6f9d9ad192 100644 --- a/x11/xfce4-taskmanager/Makefile +++ b/x11/xfce4-taskmanager/Makefile @@ -5,8 +5,7 @@ PORTNAME= xfce4-taskmanager PORTVERSION= 1.1.0 PORTREVISION= 1 CATEGORIES= x11 xfce -MASTER_SITES= ${MASTER_SITE_XFCE} -MASTER_SITE_SUBDIR= src/apps/${PORTNAME}/${PORTVERSION:R} +MASTER_SITES= XFCE/src/apps/${PORTNAME}/${PORTVERSION:R} DIST_SUBDIR= xfce4 MAINTAINER= xfce@FreeBSD.org diff --git a/x11/xfce4-terminal/Makefile b/x11/xfce4-terminal/Makefile index 9c0cdc755e18..1fbaf76bac3a 100644 --- a/x11/xfce4-terminal/Makefile +++ b/x11/xfce4-terminal/Makefile @@ -5,8 +5,7 @@ PORTNAME= xfce4-terminal PORTVERSION= 0.6.3 PORTREVISION= 2 CATEGORIES= x11 xfce -MASTER_SITES= ${MASTER_SITE_XFCE} -MASTER_SITE_SUBDIR= src/apps/${PORTNAME}/${PORTVERSION:R} +MASTER_SITES= XFCE/src/apps/${PORTNAME}/${PORTVERSION:R} DIST_SUBDIR= xfce4 MAINTAINER= xfce@FreeBSD.org diff --git a/x11/xfce4-verve-plugin/Makefile b/x11/xfce4-verve-plugin/Makefile index c3e3af8569fc..93767354a25c 100644 --- a/x11/xfce4-verve-plugin/Makefile +++ b/x11/xfce4-verve-plugin/Makefile @@ -5,8 +5,7 @@ PORTNAME= verve-plugin PORTVERSION= 1.0.1 PORTREVISION= 1 CATEGORIES= x11 xfce -MASTER_SITES= ${MASTER_SITE_XFCE} -MASTER_SITE_SUBDIR=src/panel-plugins/${PKGNAMEPREFIX}${PORTNAME}/${PORTVERSION:R} +MASTER_SITES= XFCE/src/panel-plugins/${PKGNAMEPREFIX}${PORTNAME}/${PORTVERSION:R} PKGNAMEPREFIX= xfce4- DISTNAME= ${PKGNAMEPREFIX}${PORTNAME}-${PORTVERSION} DIST_SUBDIR= xfce4 |