Import of pkgsrc-2016Q3

mk/fetch/fetch-list.mk

@@ -1,4 +1,4 @@
-# $NetBSD: fetch-list.mk,v 1.14 2011/06/19 10:23:56 plunky Exp $
+# $NetBSD: fetch-list.mk,v 1.15 2016/08/09 15:16:35 asau Exp $
 
 ######################################################################
 ### fetch-list (PUBLIC)
@@ -82,8 +82,16 @@ fetch-list-one-pkg:
 		${ECHO} "${MKDIR} ${_DISTDIR}";				\
 		${ECHO} 'cd ${_DISTDIR} && { [ -f ${fetchfile} -o -f ${fetchfile:T} ] ||'; \
 		${ECHO}	'for site in $$sites; do';			\
-		${ECHO} '	${_FETCH_CMD.${FETCH_USING}} ${_FETCH_BEFORE_ARGS.${FETCH_USING}} ${_FETCH_OUTPUT_ARGS.${FETCH_USING}} ${fetchfile:T} "$${site}${fetchfile:T}" ${_FETCH_AFTER_ARGS.${FETCH_USING}} && break ||'; \
-		${ECHO} '	${ECHO} ${fetchfile:T} not fetched';	\
+		${ECHO}	'	case "$${site}" in';			\
+		${ECHO}	'	-*)';					\
+		${ECHO} '		${_FETCH_CMD.${FETCH_USING}} ${_FETCH_BEFORE_ARGS.${FETCH_USING}} ${_FETCH_OUTPUT_ARGS.${FETCH_USING}} ${fetchfile:T} "$${site#-}" ${_FETCH_AFTER_ARGS.${FETCH_USING}} && break ||'; \
+		${ECHO} '		${ECHO} ${fetchfile:T} not fetched';	\
+		${ECHO}	'		;;';				\
+		${ECHO}	'	*)';					\
+		${ECHO} '		${_FETCH_CMD.${FETCH_USING}} ${_FETCH_BEFORE_ARGS.${FETCH_USING}} ${_FETCH_OUTPUT_ARGS.${FETCH_USING}} ${fetchfile:T} "$${site}${fetchfile:T}" ${_FETCH_AFTER_ARGS.${FETCH_USING}} && break ||'; \
+		${ECHO} '		${ECHO} ${fetchfile:T} not fetched';	\
+		${ECHO}	'		;;';				\
+		${ECHO}	'	esac;';			\
 		${ECHO}	'done; }';					\
 		${ECHO} ')';						\
 	fi)
@@ -100,8 +108,16 @@ fetch-list-one-pkg:
 		${ECHO} "${MKDIR} ${_DISTDIR}";				\
 		${ECHO} 'cd ${_DISTDIR} && { [ -f ${fetchfile} -o -f ${fetchfile:T} ] ||'; \
 		${ECHO}	'for site in $$sites; do';			\
-		${ECHO} '	${_FETCH_CMD.${FETCH_USING}} ${_FETCH_BEFORE_ARGS.${FETCH_USING}} ${_FETCH_OUTPUT_ARGS.${FETCH_USING}} ${fetchfile:T} "$${site}${fetchfile:T}" ${_FETCH_AFTER_ARGS.${FETCH_USING}} && break ||'; \
-		${ECHO} '	${ECHO} ${fetchfile:T} not fetched';	\
+		${ECHO}	'	case "$${site}" in';			\
+		${ECHO}	'	-*)';					\
+		${ECHO} '		${_FETCH_CMD.${FETCH_USING}} ${_FETCH_BEFORE_ARGS.${FETCH_USING}} ${_FETCH_OUTPUT_ARGS.${FETCH_USING}} ${fetchfile:T} "$${site#-}" ${_FETCH_AFTER_ARGS.${FETCH_USING}} && break ||'; \
+		${ECHO} '		${ECHO} ${fetchfile:T} not fetched';	\
+		${ECHO}	'		;;';				\
+		${ECHO}	'	*)';					\
+		${ECHO} '		${_FETCH_CMD.${FETCH_USING}} ${_FETCH_BEFORE_ARGS.${FETCH_USING}} ${_FETCH_OUTPUT_ARGS.${FETCH_USING}} ${fetchfile:T} "$${site}${fetchfile:T}" ${_FETCH_AFTER_ARGS.${FETCH_USING}} && break ||'; \
+		${ECHO} '		${ECHO} ${fetchfile:T} not fetched';	\
+		${ECHO}	'		;;';				\
+		${ECHO}	'	esac;';			\
 		${ECHO}	'done; }';					\
 	fi)
 .    endif

mk/fetch/fetch.mk

@@ -1,4 +1,4 @@
-# $NetBSD: fetch.mk,v 1.67 2015/09/14 08:27:13 joerg Exp $
+# $NetBSD: fetch.mk,v 1.68 2016/01/06 07:38:25 dholland Exp $
 
 .if empty(INTERACTIVE_STAGE:Mfetch) && empty(FETCH_MESSAGE:U)
 _MASTER_SITE_BACKUP=	${MASTER_SITE_BACKUP:=${DIST_SUBDIR}${DIST_SUBDIR:D/}}
@@ -260,7 +260,7 @@ _FETCH_CMD=	${PKGSRC_SETENV} CHECKSUM=${_CHECKSUM_CMD:Q}	\
 
 _FETCH_ARGS+=	${PKG_VERBOSE:D-v}
 .if exists(${DISTINFO_FILE})
-_FETCH_ARGS+=	${FAILOVER_FETCH:D-c} -f ${DISTINFO_FILE:Q}
+_FETCH_ARGS+=	${FAILOVER_FETCH:D-c} -f ${DISTINFO_FILE:tA:Q}
 .endif
 .if !empty(PKG_RESUME_TRANSFERS:M[yY][eE][sS])
 _FETCH_ARGS+=	-r

mk/fetch/github.mk

@@ -1,4 +1,4 @@
-# $NetBSD: github.mk,v 1.8 2015/03/12 21:00:01 tnn Exp $
+# $NetBSD: github.mk,v 1.9 2015/10/19 14:24:26 tnn Exp $
 #
 # github.com master site handling
 #
@@ -54,7 +54,7 @@ GITHUB_TYPE=	tag
 .    endif
 .  endif
 
-.  if defined(GITHUB_TAG) && !empty(GITHUB_TAG:M[a-f0-9][a-f0-9][a-f0-9][a-f0-9][a-f0-9][a-f0-9][a-f0-9]*)
+.  if !empty(GITHUB_TYPE:Mtag) && !empty(GITHUB_TAG:M[a-f0-9][a-f0-9][a-f0-9][a-f0-9][a-f0-9][a-f0-9][a-f0-9]*)
 # If the github tag is a git hash (7 or more hex digits), encode it in the
 # distfile name.
 _GITHUB_DEFAULT_DISTFILES=	${DISTNAME}-${GITHUB_TAG}${EXTRACT_SUFX}

mk/fetch/pypi.mk

@@ -1,11 +1,11 @@
-# $NetBSD: pypi.mk,v 1.2 2015/07/06 05:03:33 rodent Exp $
+# $NetBSD: pypi.mk,v 1.3 2016/06/01 12:39:40 wiz Exp $
 #
 # pypi.python.org master site handling
 #
 # To use, set in the pkgsrc Makefile:
 #
 # DISTNAME=	pyfoo-1.0.0
-# MASTER_SITES=	${MASTER_SITE_PYPI}
+# MASTER_SITES=	${MASTER_SITE_PYPI:=p/pyfoo/}
 #
 # Then, PKGNAME and HOMEPAGE will be set automatically (can be overridden).
 #

mk/fetch/sites.mk

@@ -1,4 +1,4 @@
-# $NetBSD: sites.mk,v 1.134 2015/08/11 23:41:41 ryoon Exp $
+# $NetBSD: sites.mk,v 1.146 2016/09/11 13:04:28 wiz Exp $
 #
 # This Makefile fragment defines read-only MASTER_SITE_* variables
 # representing some well-known master distribution sites for software.
@@ -28,8 +28,15 @@ MASTER_SITE_GNUSTEP+=   \
 	ftp://ftp.gnustep.org/pub/gnustep/
 
 MASTER_SITE_OSDN+=	\
-	http://jaist.dl.sourceforge.jp/ \
-	http://iij.dl.sourceforge.jp/ \
+	http://jaist.dl.osdn.jp/ \
+	http://iij.dl.osdn.jp/ \
+	http://tcpdiag.dl.osdn.jp/ \
+	http://c3sl.dl.osdn.jp/ \
+	http://cznic.dl.osdn.jp/ \
+	http://onet.dl.osdn.jp/ \
+	http://nchc.dl.osdn.jp/ \
+	http://rwthaachen.dl.osdn.jp/ \
+	http://giganet.dl.osdn.jp/ \
 	http://osdn.dl.osdn.jp/
 
 MASTER_SITE_PERL_CPAN+= \
@@ -55,19 +62,14 @@ MASTER_SITE_R_CRAN+=    \
 
 MASTER_SITE_TEX_CTAN+= \
 	ftp://ftp.funet.fi/pub/TeX/CTAN/ \
-	ftp://ftp.tex.ac.uk/tex-archive/ \
 	ftp://ftp.dante.de/tex-archive/ \
 	ftp://www.dnsbalance.ring.gr.jp/pub/text/CTAN/ \
 	http://www.dnsbalance.ring.gr.jp/archives/text/CTAN/
 
 MASTER_SITE_SUNSITE+=   \
-	ftp://sunsite.unc.edu/pub/Linux/ \
-	ftp://ftp.kddlabs.co.jp/Linux/metalab.unc.edu/ \
 	ftp://ftp.icm.edu.pl/pub/Linux/sunsite/ \
 	ftp://ftp.nvg.ntnu.no/pub/mirrors/metalab.unc.edu/ \
-	ftp://ftp.lip6.fr/pub/linux/sunsite/ \
-	ftp://ftp.cs.tu-berlin.de/pub/linux/Mirrors/sunsite.unc.edu/ \
-	http://ftp.tuwien.ac.at/pub/linux/ibiblio/
+	ftp://ftp.lip6.fr/pub/linux/sunsite/
 
 MASTER_SITE_GNOME+=     \
 	http://ftp.gnome.org/pub/GNOME/ \
@@ -75,7 +77,6 @@ MASTER_SITE_GNOME+=     \
 	http://ftp.tuwien.ac.at/hci/gnome.org/ \
 	ftp://ftp.cse.buffalo.edu/pub/Gnome/ \
 	ftp://ftp.kddlabs.co.jp/pub/GNOME/ \
-	ftp://ftp.dit.upm.es/linux/gnome/ \
 	https://download.gnome.org/
 
 MASTER_SITE_KDE+=	\
@@ -83,11 +84,9 @@ MASTER_SITE_KDE+=	\
 	ftp://www.dnsbalance.ring.gr.jp/pub/X/kde/stable/ \
 	http://www.dnsbalance.ring.gr.jp/archives/X/kde/stable/ \
 	ftp://ftp.kddlabs.co.jp/pub/X/kde/stable/ \
-	http://mirrors.isc.org/pub/kde/stable/ \
 	ftp://ftp.gtlib.gatech.edu/pub/kde/stable/ \
 	ftp://kde.mirrors.tds.net/pub/kde/stable/ \
 	http://gd.tuwien.ac.at/kde/stable/ \
-	ftp://ftp.solnet.ch/mirror/KDE/stable/ \
 	ftp://ftp-stud.fht-esslingen.de/pub/Mirrors/ftp.kde.org/pub/kde/stable/ \
 	ftp://mirrors.dotsrc.org/kde/stable/ \
 	ftp://ftp.fi.muni.cz/pub/kde/stable/
@@ -102,7 +101,6 @@ MASTER_SITE_SUSE+=	\
 
 MASTER_SITE_MOZILLA_ALL+=   \
 	http://download-origin.cdn.mozilla.net/pub/mozilla.org/ \
-	http://dm-download02.mozilla.org/pub/mozilla.org/ \
 	http://ftp.mozilla.org/pub/mozilla.org/
 
 # see http://www.mozilla.org/mirrors.html
@@ -110,7 +108,6 @@ MASTER_SITE_MOZILLA+=	\
 	http://releases.mozilla.org/pub/mozilla.org/ \
 	http://mirror.atlanticmetro.net/mozilla/ \
 	http://ftp.cvut.cz/mozilla/ \
-	http://ftp.heanet.ie/mirrors/ftp.mozilla.org/pub/mozilla.org/ \
 	http://mirror.waia.asn.au/pub/mozilla/ \
 	http://download-origin.cdn.mozilla.net/pub/mozilla.org/
 
@@ -133,9 +130,7 @@ MASTER_SITE_XEMACS+=    \
 MASTER_SITE_APACHE+=    \
 	http://www.apache.org/dist/ \
 	http://www.eu.apache.org/dist/ \
-	http://apache.mirror.aussiehq.net.au/ \
 	http://apache.oregonstate.edu/ \
-	http://mirror.nyi.net/apache/ \
 	http://apache.mirrors.tds.net/ \
 	http://ftp.unicamp.br/pub/apache/ \
 	http://www.mirrorservice.org/sites/ftp.apache.org/ \
@@ -143,7 +138,6 @@ MASTER_SITE_APACHE+=    \
 	http://ftp.twaren.net/Unix/Web/apache/ \
 	http://ftp.cuhk.edu.hk/pub/packages/apache.org/ \
 	ftp://ftp.oregonstate.edu/pub/apache/ \
-	ftp://mirror.nyi.net/apache/ \
 	ftp://apache.mirrors.tds.net/pub/apache.org/ \
 	ftp://ftp.mirrorservice.org/sites/ftp.apache.org/ \
 	http://gd.tuwien.ac.at/pub/infosys/servers/http/apache/dist/ \
@@ -152,12 +146,10 @@ MASTER_SITE_APACHE+=    \
 
 MASTER_SITE_MYSQL+=	\
 	http://mysql.mirror.kangaroot.net/Downloads/ \
-	ftp://mysql.mirror.kangaroot.net/pub/mysql/Downloads/ \
 	http://mysql.linux.cz/Downloads/ \
 	ftp://ftp.fi.muni.cz/pub/mysql/Downloads/ \
 	http://mirrors.dotsrc.org/mysql/Downloads/ \
 	ftp://mirrors.dotsrc.org/mysql/Downloads/ \
-	http://mysql.borsen.dk/Downloads/ \
 	http://mirrors.ircam.fr/pub/mysql/Downloads/ \
 	ftp://mirrors.ircam.fr/pub/mysql/Downloads/ \
 	http://ftp.gwdg.de/pub/misc/mysql/Downloads/ \
@@ -172,36 +164,21 @@ MASTER_SITE_MYSQL+=	\
 	http://ftp.heanet.ie/mirrors/www.mysql.com/Downloads/ \
 	ftp://ftp.heanet.ie/mirrors/www.mysql.com/Downloads/ \
 	http://na.mirror.garr.it/mirrors/MySQL/Downloads/ \
-	http://mysql.nfsi.pt/Downloads/ \
-	ftp://ftp.nfsi.pt/pub/mysql/Downloads/ \
 	http://mirrors.xservers.ro/mysql/Downloads/ \
-	http://mysql.dataphone.se/Downloads/ \
-	ftp://mirror2.dataphone.se/pub/mysql/Downloads/ \
-	ftp://ftp.solnet.ch/mirror/mysql/Downloads/ \
 	http://mirror.switch.ch/ftp/mirror/mysql/Downloads/ \
 	ftp://mirror.switch.ch/mirror/mysql/Downloads/ \
-	http://ftp.itu.edu.tr/Mirror/Mysql/Downloads/ \
-	ftp://ftp.itu.edu.tr/Mirror/Mysql/Downloads/ \
 	http://mysql.infocom.ua/Downloads/ \
 	http://mirrors.dedipower.com/www.mysql.com/Downloads/ \
 	http://www.mirrorservice.org/sites/ftp.mysql.com/Downloads/ \
 	ftp://ftp.mirrorservice.org/sites/ftp.mysql.com/Downloads/ \
-	http://mysql.mirror.rafal.ca/Downloads/ \
-	ftp://mysql.mirror.rafal.ca/pub/mysql/Downloads/ \
 	http://mirror.csclub.uwaterloo.ca/mysql/Downloads/ \
 	ftp://mirror.csclub.uwaterloo.ca/mysql/Downloads/ \
 	http://mirror.trouble-free.net/mysql_mirror/Downloads/ \
-	http://mysql.llarian.net/Downloads/ \
-	ftp://mirror.anl.gov/pub/mysql/Downloads/ \
 	http://mysql.he.net/Downloads/ \
 	http://mysql.mirrors.arminco.com/Downloads/ \
 	http://mysql.spd.co.il/Downloads/ \
 	http://ftp.iij.ad.jp/pub/db/mysql/Downloads/ \
 	ftp://ftp.iij.ad.jp/pub/db/mysql/Downloads/ \
-	http://mysql.cs.pu.edu.tw/Downloads/ \
-	http://mysql.ntu.edu.tw/Downloads/ \
-	ftp://ftp.ntu.edu.tw/pub/MySQL/Downloads/ \
-	http://mysql.cdpa.nsysu.edu.tw/Downloads/ \
 	ftp://mysql.cdpa.nsysu.edu.tw/Unix/Database/MySQL/Downloads/ \
 	http://mirror-fpt-telecom.fpt.net/mysql/Downloads/ \
 	http://mysql.mirror.ac.za/Downloads/ \
@@ -238,23 +215,13 @@ MASTER_SITE_DEBIAN+= \
 	http://ftp.us.debian.org/debian/
 
 MASTER_SITE_OPENOFFICE+=	\
-	http://mirrors.isc.org/pub/openoffice/ \
-	http://openoffice.mirrors.ilisys.com.au/ \
 	ftp://ftp.ussg.iu.edu/pub/openoffice/ \
 	http://gd.tuwien.ac.at/office/openoffice/ \
-	http://ftp.sh.cvut.cz/MIRRORS/OpenOffice/ \
-	ftp://ftp.funet.fi/pub/mirrors/openoffice.org/ \
 	ftp://sunsite.informatik.rwth-aachen.de/pub/mirror/OpenOffice/ \
 	ftp://ftp-stud.fht-esslingen.de/pub/Mirrors/ftp.openoffice.org/ \
 	http://ftp.ntua.gr/pub/OpenOffice/ \
 	http://na.mirror.garr.it/mirrors/openoffice/ \
 	http://vlaai.snt.utwente.nl/pub/software/openoffice/ \
-	http://niihau.student.utwente.nl/openoffice/ \
-	http://borft.student.utwente.nl/openoffice/ \
-	http://ftp.iasi.roedu.net/mirrors/openoffice.org/ \
-	ftp://ftp.arnes.si/packages/OpenOffice.org/ \
-	ftp://ftp.saix.net/pub/OpenOffice.org/ \
-	ftp://mirror.switch.ch/mirror/OpenOffice/ \
 	ftp://ftp.kddlabs.co.jp/office/openoffice/ \
 	ftp://ftp.dnsbalance.ring.gr.jp/pub/misc/openoffice/ \
 	ftp://ftp.kr.freebsd.org/pub/openoffice/
@@ -282,7 +249,6 @@ MASTER_SITE_GENTOO+= \
 	http://ftp.ds.karen.hj.se/gentoo/ \
 	ftp://ftp.free.fr/mirrors/ftp.gentoo.org/ \
 	ftp://sunsite.informatik.rwth-aachen.de/pub/Linux/gentoo/ \
-	http://darkstar.ist.utl.pt/gentoo/ \
 	http://gentoo-euetib.upc.es/mirror/gentoo/ \
 	http://ftp.ntua.gr/pub/linux/gentoo/ \
 	http://www.las.ic.unicamp.br/pub/gentoo/ \
@@ -290,7 +256,6 @@ MASTER_SITE_GENTOO+= \
 	http://ftp.swin.edu.au/gentoo/ \
 	http://ftp.iij.ad.jp/pub/linux/gentoo/ \
 	http://ftp.jaist.ac.jp/pub/Linux/Gentoo/ \
-	http://ftp.cs.pu.edu.tw/Linux/Gentoo/ \
 	http://distfiles.gentoo.org/
 
 MASTER_SITE_XORG+= \
@@ -311,21 +276,23 @@ MASTER_SITE_NETLIB+= \
 	http://www.mirrorservice.org/sites/netlib.bell-labs.com/netlib/
 
 MASTER_SITE_OPENBSD+= \
-	ftp://ftp.OpenBSD.org/pub/OpenBSD/ \
+	http://ftp.OpenBSD.org/pub/OpenBSD/ \
 	ftp://ftp3.usa.openbsd.org/pub/OpenBSD/ \
 	ftp://ftp.jaist.ac.jp/pub/OpenBSD/
 
 MASTER_SITE_RUBYGEMS+= \
-	http://rubygems.org/downloads/
+	https://rubygems.org/gems/
 
 MASTER_SITE_PYPI+= \
-	https://pypi.python.org/packages/source/
+	https://files.pythonhosted.org/packages/source/
 
 MASTER_SITE_HASKELL_HACKAGE+=	\
 	http://hackage.haskell.org/package/
 
 # The primary backup site.
 MASTER_SITE_BACKUP?=	\
+	http://cdn.NetBSD.org/pub/pkgsrc/distfiles/ \
+	http://ftp6.NetBSD.org/pub/pkgsrc/distfiles/ \
 	ftp://ftp.fr.NetBSD.org/pub/pkgsrc/distfiles/ \
 	http://ftp.fr.NetBSD.org/pub/pkgsrc/distfiles/ \
 	ftp://ftp.NetBSD.org/pub/pkgsrc/distfiles/ \