[Midnightbsd-cvs] mports [21670] trunk/Mk/components/sites.mk: update master list of sites
laffer1 at midnightbsd.org
laffer1 at midnightbsd.org
Mon Aug 15 08:34:01 EDT 2016
Revision: 21670
http://svnweb.midnightbsd.org/mports/?rev=21670
Author: laffer1
Date: 2016-08-15 08:32:56 -0400 (Mon, 15 Aug 2016)
Log Message:
-----------
update master list of sites
Modified Paths:
--------------
trunk/Mk/components/sites.mk
Modified: trunk/Mk/components/sites.mk
===================================================================
--- trunk/Mk/components/sites.mk 2016-08-15 12:24:47 UTC (rev 21669)
+++ trunk/Mk/components/sites.mk 2016-08-15 12:32:56 UTC (rev 21670)
@@ -106,10 +106,12 @@
.endif
.if !defined(IGNORE_MASTER_SITE_CHEESESHOP)
+# PEP-449 Compatible MASTER_SITES
+# Removal of the PyPI Mirror Auto Discovery and Naming Scheme
+# Reference: https://www.python.org/dev/peps/pep-0449/
MASTER_SITE_CHEESESHOP+= \
- http://pypi.python.org/packages/%SUBDIR%/ \
- http://pypi.crate.io/packages/%SUBDIR%/ \
- http://pypi.python.jp/${DISTNAME:S/${DISTVERSION}//:S/-//}/
+ https://pypi.python.org/packages/%SUBDIR%/ \
+ https://files.pythonhosted.org/packages/%SUBDIR%/
.endif
.if !defined(IGNORE_MASTER_SITE_COMP_SOURCES)
@@ -182,7 +184,8 @@
ftp://sunsite.cnlab-switch.ch/mirror/eclipse/%SUBDIR%/ \
ftp://sunsite.cnlab-switch.ch/mirror/eclipse/eclipse/downloads/drops/%SUBDIR%/ \
ftp://sunsite.cnlab-switch.ch/mirror/eclipse/eclipse/downloads/drops4/%SUBDIR%/ \
- http://www.mirrorservice.org/sites/download.eclipse.org/eclipseMirror/%SUBDIR%/
+ http://www.mirrorservice.org/sites/download.eclipse.org/eclipseMirror/%SUBDIR%/ \
+ http://eclipse.stu.edu.tw/%SUBDIR%/
.endif
.if !defined(IGNORE_MASTER_SITE_EXIM)
@@ -226,7 +229,7 @@
http://mirror.tje.me.uk/pub/mirrors/ftp.exim.org/exim/%SUBDIR%/ \
ftp://ftp.fsckit.net/pub/exim/exim/%SUBDIR%/ \
ftp://idcnetwork.org/pub/exim/exim/%SUBDIR%/ \
- http://ftp.exim.llorien.org/exim/%SUBDIR%
+ http://ftp.exim.llorien.org/exim/%SUBDIR%/
.endif
.if !defined(IGNORE_MASTER_SITE_CENTOS_LINUX)
@@ -241,6 +244,7 @@
.if !defined(IGNORE_MASTER_SITE_CENTOS_LINUX)
MASTER_SITE_CENTOS_LINUX_UPDATES+= \
http://mirror.centos.org/centos/${LINUX_DIST_VER}/updates/${LINUX_REPO_ARCH}/Packages/ \
+ http://vault.centos.org/${LINUX_DIST_VER}/updates/${LINUX_REPO_ARCH}/Packages/ \
http://vault.centos.org/${LINUX_DIST_VER}/updates/Source/SPackages/:SOURCE
.endif
@@ -457,7 +461,6 @@
http://gcc.cybermirror.org/%SUBDIR%/ \
http://gcc-uk.internet.bs/%SUBDIR%/ \
http://www.netgull.com/gcc/%SUBDIR%/ \
- http://mirrors.webhostinggeeks.com/gcc/%SUBDIR%/ \
http://robotlab.itk.ppke.hu/gcc/%SUBDIR%/ \
http://gcc.fyxm.net/%SUBDIR%/ \
http://gcc.igor.onlinedirect.bg/%SUBDIR%/ \
@@ -488,6 +491,7 @@
http://ftp.rhnet.is/pub/gentoo/%SUBDIR%/ \
http://gentoo.gg3.net/%SUBDIR%/ \
http://gentoo.kems.net/%SUBDIR%/ \
+ http://mirrors.163.com/gentoo/%SUBDIR%/ \
ftp://ftp.gtlib.gatech.edu/pub/gentoo/%SUBDIR%/ \
ftp://mirror.iawnet.sandia.gov/pub/gentoo/%SUBDIR%/ \
ftp://ftp.ussg.iu.edu/pub/linux/gentoo/%SUBDIR%/ \
@@ -523,6 +527,7 @@
# Using the name of a branch here is incorrect. It is
# possible to do GH_TAGNAME= GIT_HASH to do a snapshot.
# default: ${DISTVERSION}
+# GH_TUPLE - above shortened to account:project:tagname[:group]
#
.if defined(USE_GITHUB)
. if defined(GH_TAGNAME) && ${GH_TAGNAME} == master
@@ -530,10 +535,24 @@
Must use a tag or commit hash so the upstream does \
not "reroll" as soon as the branch is updated
. endif
+. if defined(GH_TUPLE)
+.for _tuple in ${GH_TUPLE}
+_t_tmp=${_tuple}
+.if ${_t_tmp:C@^([^:]*):([^:]*):([^:]*)((:[^:]*)?)@\4@:S/://:C/[a-zA-Z0-9_]//g}
+check-makevars::
+ @${ECHO_MSG} "The ${_tuple} GH_TUPLE line has"
+ @${ECHO_MSG} "a tag containing something else than [a-zA-Z0-9_]"
+ @${FALSE}
+.endif
+.endfor
+GH_ACCOUNT+= ${GH_TUPLE:C@^([^:]*):([^:]*):([^:]*)((:[^:]*)?)@\1\4@}
+GH_PROJECT+= ${GH_TUPLE:C@^([^:]*):([^:]*):([^:]*)((:[^:]*)?)@\2\4@}
+GH_TAGNAME+= ${GH_TUPLE:C@^([^:]*):([^:]*):([^:]*)((:[^:]*)?)@\3\4@}
+. endif
# We are cheating and using backend URLS for Github here. See ports/194898
# comment #15 for explanation as to why and how to deal with it if it breaks.
MASTER_SITE_GITHUB+= https://codeload.github.com/%SUBDIR%
-MASTER_SITE_GITHUB_CLOUD+= http://cloud.github.com/downloads/%SUBDIR%
+MASTER_SITE_GITHUB_CLOUD+= https://cloud.github.com/downloads/%SUBDIR%
. if !defined(MASTER_SITES) || !${MASTER_SITES:MGH} && !${MASTER_SITES:MGHC} && !${USE_GITHUB:Mnodefault}
MASTER_SITES+= GH
@@ -547,66 +566,66 @@
GH_TAGNAME?= ${GH_TAGNAME_DEFAULT}
# Iterate over GH_ACCOUNT, GH_PROJECT and GH_TAGNAME to extract groups
_GITHUB_GROUPS= DEFAULT
-.for _A in ${GH_ACCOUNT}
+. for _A in ${GH_ACCOUNT}
_S_TEMP= ${_A:S/^${_A:C@:[^/:]+$@@}//:S/^://}
-. if !empty(_S_TEMP)
-. for _group in ${_S_TEMP:S/,/ /g}
+. if !empty(_S_TEMP)
+. for _group in ${_S_TEMP:S/,/ /g}
_G_TEMP= ${_group}
-. if ${_G_TEMP} == all || ${_G_TEMP} == ALL || ${_G_TEMP} == default
+. if ${_G_TEMP} == all || ${_G_TEMP} == ALL || ${_G_TEMP} == default
check-makevars::
@${ECHO_MSG} "Makefile error: the words all, ALL and default are reserved and cannot be"
@${ECHO_MSG} "used in group definitions. Please fix your GH_ACCOUNT"
@${FALSE}
-. endif
-. if !${_GITHUB_GROUPS:M${_group}}
+. endif
+. if !${_GITHUB_GROUPS:M${_group}}
_GITHUB_GROUPS+= ${_group}
-. endif
+. endif
GH_ACCOUNT_${_group}= ${_A:C@^(.*):[^/:]+$@\1@}
-. endfor
-. else
+. endfor
+. else
GH_ACCOUNT_DEFAULT= ${_A:C@^(.*):[^/:]+$@\1@}
-. endif
-.endfor
-.for _P in ${GH_PROJECT}
+. endif
+. endfor
+. for _P in ${GH_PROJECT}
_S_TEMP= ${_P:S/^${_P:C@:[^/:]+$@@}//:S/^://}
-. if !empty(_S_TEMP)
-. for _group in ${_S_TEMP:S/,/ /g}
+. if !empty(_S_TEMP)
+. for _group in ${_S_TEMP:S/,/ /g}
_G_TEMP= ${_group}
-. if ${_G_TEMP} == all || ${_G_TEMP} == ALL || ${_G_TEMP} == default
+. if ${_G_TEMP} == all || ${_G_TEMP} == ALL || ${_G_TEMP} == default
check-makevars::
@${ECHO_MSG} "Makefile error: the words all, ALL and default are reserved and cannot be"
@${ECHO_MSG} "used in group definitions. Please fix your GH_PROJECT"
@${FALSE}
-. endif
-. if !${_GITHUB_GROUPS:M${_group}}
+. endif
+. if !${_GITHUB_GROUPS:M${_group}}
_GITHUB_GROUPS+= ${_group}
-. endif
+. endif
GH_PROJECT_${_group}= ${_P:C@^(.*):[^/:]+$@\1@}
-. endfor
-. else
+. endfor
+. else
GH_PROJECT_DEFAULT= ${_P:C@^(.*):[^/:]+$@\1@}
-. endif
-.endfor
-.for _T in ${GH_TAGNAME}
+. endif
+. endfor
+. for _T in ${GH_TAGNAME}
_S_TEMP= ${_T:S/^${_T:C@:[^/:]+$@@}//:S/^://}
-. if !empty(_S_TEMP)
-. for _group in ${_S_TEMP:S/,/ /g}
+. if !empty(_S_TEMP)
+. for _group in ${_S_TEMP:S/,/ /g}
_G_TEMP= ${_group}
-. if ${_G_TEMP} == all || ${_G_TEMP} == ALL || ${_G_TEMP} == default
+. if ${_G_TEMP} == all || ${_G_TEMP} == ALL || ${_G_TEMP} == default
check-makevars::
@${ECHO_MSG} "Makefile error: the words all, ALL and default are reserved and cannot be"
@${ECHO_MSG} "used in group definitions. Please fix your GH_TAGNAME"
@${FALSE}
-. endif
-. if !${_GITHUB_GROUPS:M${_group}}
+. endif
+. if !${_GITHUB_GROUPS:M${_group}}
_GITHUB_GROUPS+= ${_group}
-. endif
+. endif
GH_TAGNAME_${_group}= ${_T:C@^(.*):[^/:]+$@\1@}
-. endfor
-. else
+. endfor
+. else
GH_TAGNAME_DEFAULT= ${_T:C@^(.*):[^/:]+$@\1@}
-. endif
-.endfor
+. endif
+. endfor
# Put the default values back into the variables so that the *default* behavior
# is not changed.
GH_ACCOUNT:= ${GH_ACCOUNT_DEFAULT}
@@ -615,9 +634,9 @@
. if defined(GH_TAGNAME)
GH_TAGNAME_SANITIZED= ${GH_TAGNAME:S,/,-,}
# Github silently converts tags starting with v to not have v in the filename
-# and extraction directory.
-GH_TAGNAME_EXTRACT= ${GH_TAGNAME_SANITIZED:C/^[vV]([0-9])/\1/}
-. endif
+# and extraction directory. It also replaces + with -.
+GH_TAGNAME_EXTRACT= ${GH_TAGNAME_SANITIZED:C/^[vV]([0-9])/\1/:S/+/-/g}
+. endif
. if defined(_GITHUB_MUST_SET_DISTNAME)
# GH_TAGNAME defaults to DISTVERSIONFULL; Avoid adding DISTVERSIONFULL in twice
. if ${GH_TAGNAME} != ${DISTVERSIONFULL}
@@ -633,18 +652,17 @@
. if ${MASTER_SITES:MGH}
DISTNAME:= ${DISTNAME}_GH${_GITHUB_REV}
. endif
-.endif
_GITHUB_EXTRACT_SUFX= .tar.gz
-# If there are non default groups
-.if !empty(_GITHUB_GROUPS:NDEFAULT)
# Put the DEFAULT distfile first
-.if !${USE_GITHUB:Mnodefault}
+. if !${USE_GITHUB:Mnodefault} && defined(_GITHUB_MUST_SET_DISTNAME)
DISTFILES+= ${DISTNAME}${_GITHUB_EXTRACT_SUFX}
-.endif
+. endif
+# If there are non default groups
+. if !empty(_GITHUB_GROUPS:NDEFAULT)
# Then for each of the remaining groups, add DISTFILES and MASTER_SITES
# entries with the correct group and create {WRKSRC,DISTNAME,DISTFILES}_group
# helper variables.
-. for _group in ${_GITHUB_GROUPS:NDEFAULT}
+. for _group in ${_GITHUB_GROUPS:NDEFAULT}
GH_ACCOUNT_${_group}?= ${GH_ACCOUNT_DEFAULT}
GH_PROJECT_${_group}?= ${GH_PROJECT_DEFAULT}
GH_TAGNAME_${_group}?= ${GH_TAGNAME_DEFAULT}
@@ -655,9 +673,10 @@
DISTFILES:= ${DISTFILES} ${DISTFILE_${_group}}:${_group}
MASTER_SITES:= ${MASTER_SITES} ${MASTER_SITE_GITHUB:S@%SUBDIR%@${GH_ACCOUNT_${_group}}/${GH_PROJECT_${_group}}/tar.gz/${GH_TAGNAME_${_group}}?dummy=/:${_group}@}
WRKSRC_${_group}:= ${WRKDIR}/${GH_PROJECT_${_group}}-${GH_TAGNAME_${_group}_EXTRACT}
-. endfor
-.endif
-.endif
+. endfor
+. endif
+.endif # defined(USE_GITHUB)
+.endif # !defined(IGNORE_MASTER_SITE_GITHUB)
.if !defined(IGNORE_MASTER_SITE_GNOME)
MASTER_SITE_GNOME+= \
@@ -704,26 +723,18 @@
.if !defined(IGNORE_MASTER_SITE_GNUPG)
MASTER_SITE_GNUPG+= \
- http://www.mirrorservice.org/sites/ftp.gnupg.org/gcrypt/%SUBDIR%/ \
- http://mirror.tje.me.uk/pub/mirrors/ftp.gnupg.org/%SUBDIR%/ \
- ftp://ftp.surfnet.nl/pub/security/gnupg/%SUBDIR%/ \
+ http://artfiles.org/gnupg.org/%SUBDIR%/ \
http://ftp.heanet.ie/mirrors/ftp.gnupg.org/gcrypt/%SUBDIR%/ \
+ ftp://ftp.sunet.se/pub/security/gnupg/%SUBDIR%/ \
ftp://ftp.franken.de/pub/crypt/mirror/ftp.gnupg.org/gcrypt/%SUBDIR%/ \
- ftp://ftp.gnupg.org/gcrypt/%SUBDIR%/ \
- ftp://ftp.bit.nl/mirror/gnupg/%SUBDIR%/ \
ftp://mirror.switch.ch/mirror/gnupg/%SUBDIR%/ \
- http://artfiles.org/gnupg.org/%SUBDIR%/ \
+ http://gd.tuwien.ac.at/privacy/gnupg/%SUBDIR%/ \
+ http://mirrors.dotsrc.org/gcrypt/%SUBDIR%/ \
ftp://ftp.freenet.de/pub/ftp.gnupg.org/gcrypt/%SUBDIR%/ \
ftp://ftp.crysys.hu/pub/gnupg/%SUBDIR%/ \
- http://gd.tuwien.ac.at/privacy/gnupg/%SUBDIR%/ \
- ftp://mirror.cict.fr/gnupg/%SUBDIR%/ \
- http://mirrors.dotsrc.org/%SUBDIR%/ \
- ftp://ftp.iasi.roedu.net/pub/mirrors/ftp.gnupg.org/%SUBDIR%/ \
- ftp://ftp.sunet.se/pub/security/gnupg/%SUBDIR%/ \
- ftp://ftp.hi.is/pub/mirrors/gnupg/%SUBDIR%/ \
- ftp://ftp.jyu.fi/pub/crypt/gcrypt/%SUBDIR%/ \
- http://dist.gnupg.pt/%SUBDIR%/ \
- http://gnupg.org.favoritelinks.net/%SUBDIR%/
+ http://www.mirrorservice.org/sites/ftp.gnupg.org/gcrypt/%SUBDIR%/ \
+ ftp://ftp.gnupg.org/gcrypt/%SUBDIR%/ \
+ http://mirror.tje.me.uk/pub/mirrors/ftp.gnupg.org/%SUBDIR%/
.endif
.if !defined(IGNORE_MASTER_SITE_GNUSTEP)
@@ -880,10 +891,8 @@
.if !defined(IGNORE_MASTER_SITE_MOZILLA)
MASTER_SITE_MOZILLA+= \
- http://releases.mozilla.org/pub/mozilla.org/%SUBDIR%/ \
- https://ftp.mozilla.org/pub/mozilla.org/%SUBDIR%/ \
- http://ftp.mozilla.org/pub/mozilla.org/%SUBDIR%/ \
- ftp://ftp.mozilla.org/pub/mozilla.org/%SUBDIR%/
+ http://download.cdn.mozilla.net/pub/%SUBDIR%/ \
+ https://archive.mozilla.org/pub/%SUBDIR%/
.endif
.if !defined(IGNORE_MASTER_SITE_MOZILLA_ADDONS)
@@ -1076,6 +1085,7 @@
MASTER_SITE_PERL_CPAN_BY+= \
http://cpan.metacpan.org/%CPANSORT%/%SUBDIR%/ \
+ http://cpan.metacpan.org/modules/by-module/%SUBDIRPLUS%/ \
http://www.cpan.org/%CPANSORT%/%SUBDIR%/ \
ftp://ftp.cpan.org/pub/CPAN/%CPANSORT%/%SUBDIR%/ \
http://www.cpan.dk/%CPANSORT%/%SUBDIR%/ \
@@ -1087,8 +1097,7 @@
http://backpan.perl.org/%CPANSORT%/%SUBDIR%/ \
ftp://ftp.funet.fi/pub/languages/perl/CPAN/%CPANSORT%/%SUBDIR%/ \
http://ftp.twaren.net/Unix/Lang/CPAN/%CPANSORT%/%SUBDIR%/ \
- ftp://ftp.cpan.org/pub/CPAN/modules/by-module/%SUBDIR%/ \
- http://www.cpan.dk/modules/by-module/%SUBDIR%/
+ ftp://ftp.cpan.org/pub/CPAN/modules/by-module/%SUBDIRPLUS%/
_PERL_CPAN_FLAG=${MASTER_SITE_SUBDIR:C/(CPAN):.*$/\1/}
_PERL_CPAN_ID= ${MASTER_SITE_SUBDIR:C/^CPAN:(.)(.)(.*)$/\1\/\1\2\/\1\2\3/}
@@ -1095,9 +1104,9 @@
.if !empty(_PERL_CPAN_ID) && ${_PERL_CPAN_FLAG:tl} == "cpan"
_PERL_CPAN_SORT=authors/id/${_PERL_CPAN_ID}
- MASTER_SITE_PERL_CPAN=${MASTER_SITE_PERL_CPAN_BY:S/%CPANSORT%/${_PERL_CPAN_SORT}/:S/%SUBDIR%\///}
+ MASTER_SITE_PERL_CPAN=${MASTER_SITE_PERL_CPAN_BY:S/%CPANSORT%/${_PERL_CPAN_SORT}/:S/%SUBDIR%\///:S/%SUBDIRPLUS%\//${PORTNAME:C/-.*//}\//}
.else
- MASTER_SITE_PERL_CPAN=${MASTER_SITE_PERL_CPAN_BY:S/%CPANSORT%/${_PERL_CPAN_SORT}/}
+ MASTER_SITE_PERL_CPAN=${MASTER_SITE_PERL_CPAN_BY:S/%CPANSORT%/${_PERL_CPAN_SORT}/:S/%SUBDIRPLUS%\///}
.endif
.endif
@@ -1114,11 +1123,9 @@
.if !defined(IGNORE_MASTER_SITE_PHP)
MASTER_SITE_PHP+= \
- http://dk1.php.net/%SUBDIR%/ \
http://de.php.net/%SUBDIR%/ \
http://es.php.net/%SUBDIR%/ \
http://fr.php.net/%SUBDIR%/ \
- http://gr.php.net/%SUBDIR%/ \
http://it.php.net/%SUBDIR%/ \
http://jp.php.net/%SUBDIR%/ \
http://se.php.net/%SUBDIR%/ \
@@ -1173,15 +1180,10 @@
.if !defined(IGNORE_MASTER_SITE_RUBY)
MASTER_SITE_RUBY+= \
http://cache.ruby-lang.org/pub/ruby/%SUBDIR%/ \
+ http://ftp.ruby-lang.org/pub/ruby/%SUBDIR%/ \
ftp://ftp.ruby-lang.org/pub/ruby/%SUBDIR%/ \
- ftp://ftp.SpringDaemons.com/pub/ruby/ruby/%SUBDIR%/ \
- http://www.ibiblio.org/pub/languages/ruby/%SUBDIR%/ \
- ftp://xyz.lcs.mit.edu/pub/ruby/%SUBDIR%/ \
ftp://ftp.fu-berlin.de/unix/languages/ruby/%SUBDIR%/ \
- ftp://ftp.easynet.be/ruby/ruby/%SUBDIR%/ \
- ftp://ftp.ntua.gr/pub/lang/ruby/%SUBDIR%/ \
ftp://ftp.kr.FreeBSD.org/pub/ruby/%SUBDIR%/ \
- http://mirrors.sunsite.dk/ruby/%SUBDIR%/ \
ftp://ftp.iDaemons.org/pub/mirror/ftp.ruby-lang.org/ruby/%SUBDIR%/
.endif
@@ -1188,8 +1190,7 @@
# See http://rubygems.org/pages/about
.if !defined(IGNORE_MASTER_SITE_RUBYGEMS)
MASTER_SITE_RUBYGEMS+= \
- http://production.s3.rubygems.org/gems/%SUBDIR%/ \
- http://production.cf.rubygems.org/gems/%SUBDIR%/
+ https://rubygems.global.ssl.fastly.net/gems/%SUBDIR%/
.endif
.if !defined(IGNORE_MASTER_SITE_SAMBA)
@@ -1196,8 +1197,7 @@
MASTER_SITE_SAMBA+= \
http://ftp.samba.org/pub/%SUBDIR%/ \
ftp://ca.samba.org/pub/%SUBDIR%/ \
- ftp://de.samba.org/pub/%SUBDIR%/ \
- ftp://ftp.easynet.be/%SUBDIR%/
+ ftp://de.samba.org/pub/%SUBDIR%/
.endif
# List: http://download.savannah.gnu.org/mirmon/
More information about the Midnightbsd-cvs
mailing list