aboutsummaryrefslogtreecommitdiff
path: root/Mk
diff options
context:
space:
mode:
authorGuido Falsi <madpilot@FreeBSD.org>2019-06-19 16:14:27 +0000
committerGuido Falsi <madpilot@FreeBSD.org>2019-06-19 16:14:27 +0000
commitad1ecbc81b46440c342b06228071a8c1bd4f1383 (patch)
tree609f5bcb0d52c5819588b493a293bacf7d7fe5d0 /Mk
parent0aa6df75f5e221202384e8ef9c592e14d6dc32eb (diff)
downloadports-ad1ecbc81b46440c342b06228071a8c1bd4f1383.tar.gz
ports-ad1ecbc81b46440c342b06228071a8c1bd4f1383.zip
Notes
Diffstat (limited to 'Mk')
-rw-r--r--Mk/Uses/xfce.mk2
-rw-r--r--Mk/bsd.sites.mk18
2 files changed, 9 insertions, 11 deletions
diff --git a/Mk/Uses/xfce.mk b/Mk/Uses/xfce.mk
index 62be9dc92a4d..c67a5e5fceb7 100644
--- a/Mk/Uses/xfce.mk
+++ b/Mk/Uses/xfce.mk
@@ -19,8 +19,6 @@ _USES_POST+= xfce
_USE_XFCE_ALL= garcon libexo libgui libmenu libutil panel thunar xfconf
-XFCE_MASTER_SITE_VER= 4.12
-
xfce_ARGS?= # empty
CPPFLAGS+= -I${LOCALBASE}/include
diff --git a/Mk/bsd.sites.mk b/Mk/bsd.sites.mk
index 0f5b646ace6a..865bcd28bb04 100644
--- a/Mk/bsd.sites.mk
+++ b/Mk/bsd.sites.mk
@@ -1175,15 +1175,15 @@ MASTER_SITE_XCONTRIB+= \
.endif
.if !defined(IGNORE_MASTER_SITE_XFCE)
+_XFCE_PATH= ${DISTNAME:S/-${DISTVERSIONFULL}//:tl}/${DISTVERSION:C/^([0-9]+\.[0-9]+).*/\1/}
+
MASTER_SITE_XFCE+= \
- https://mirror.netcologne.de/xfce/%SUBDIR%/ \
- http://ftp.udc.es/xfce/%SUBDIR%/ \
- http://xfce.mirror.uber.com.au/%SUBDIR%/ \
- https://archive.be.xfce.org/%SUBDIR%/ \
- http://archive.be2.xfce.org/%SUBDIR%/ \
- https://archive.al-us.xfce.org/%SUBDIR%/ \
- http://mirrors.tummy.com/pub/archive.xfce.org/%SUBDIR%/ \
- http://mirror.perldude.de/archive.xfce.org/%SUBDIR%/
+ https://archive.xfce.org/src/%SUBDIR%/${_XFCE_PATH}/ \
+ https://mirror.netcologne.de/xfce/src/%SUBDIR%/${_XFCE_PATH}/ \
+ https://ftp.cixug.es/xfce/src/%SUBDIR%/${_XFCE_PATH}/ \
+ https://archive.be.xfce.org/src/%SUBDIR%/${_XFCE_PATH}/ \
+ https://archive.al-us.xfce.org/src/%SUBDIR%/${_XFCE_PATH}/ \
+ http://mirror.perldude.de/archive.xfce.org/src/%SUBDIR%/${_XFCE_PATH}/
.endif
.if !defined(IGNORE_MASTER_SITE_XORG)
@@ -1262,7 +1262,7 @@ MASTER_SITES_SUBDIRS= APACHE_COMMONS_BINARIES:${PORTNAME:S,commons-,,} \
SAMBA:${PORTNAME} \
SAVANNAH:${PORTNAME:tl} \
SOURCEFORGE:${PORTNAME:tl}/${PORTNAME:tl}/${PORTVERSION} \
- XFCE:xfce/${XFCE_MASTER_SITE_VER}/src
+ XFCE:xfce
.if defined(MASTER_SITES) && ${MASTER_SITES:N*\:/*}