[Midnightbsd-cvs] mports [18987] trunk/Mk/components/sites.mk: update sites list

laffer1 at midnightbsd.org laffer1 at midnightbsd.org
Fri May 15 19:25:59 EDT 2015 

Revision: 18987
          http://svnweb.midnightbsd.org/mports/?rev=18987
Author:   laffer1
Date:     2015-05-15 19:25:59 -0400 (Fri, 15 May 2015)
Log Message:
-----------
update sites list

Modified Paths:
--------------
    trunk/Mk/components/sites.mk

Modified: trunk/Mk/components/sites.mk
===================================================================
--- trunk/Mk/components/sites.mk	2015-05-15 23:25:48 UTC (rev 18986)
+++ trunk/Mk/components/sites.mk	2015-05-15 23:25:59 UTC (rev 18987)
@@ -68,7 +68,6 @@
 	ftp://ftp.forthnet.gr/pub/www/apache/%SUBDIR%/ \
 	ftp://xenia.sote.hu/pub/mirrors/www.apache.org/%SUBDIR%/ \
 	ftp://ftp.heanet.ie/mirrors/www.apache.org/dist/%SUBDIR%/ \
-	${MASTER_SITE_RINGSERVER:S,%SUBDIR%,net/apache/&,} \
 	ftp://ftp.sunet.se/pub/www/servers/apache/dist/%SUBDIR%/ \
 	http://mirrors.ircam.fr/pub/apache/%SUBDIR%/
 .endif
@@ -108,12 +107,6 @@
 	${MASTER_SITE_SOURCEFORGE}
 .endif
 
-.if !defined(IGNORE_MASTER_SITE_CENKES)
-MASTER_SITE_CENKES+= \
-	http://bsd2.cenkes.org/%SUBDIR%/ \
-	http://bsd3.cenkes.org/%SUBDIR%/
-.endif
-
 .if !defined(IGNORE_MASTER_SITE_CHEESESHOP)
 MASTER_SITE_CHEESESHOP+= \
 	http://pypi.python.org/packages/%SUBDIR%/ \
@@ -121,16 +114,6 @@
 	http://pypi.python.jp/${DISTNAME:S/${DISTVERSION}//:S/-//}/
 .endif
 
-.if !defined(IGNORE_MASTER_SITE_COMP_SOURCES)
-MASTER_SITE_COMP_SOURCES+= \
-	ftp://gatekeeper.dec.com/pub/usenet/comp.sources.%SUBDIR%/ \
-	ftp://ftp.uu.net/usenet/comp.sources.%SUBDIR%/
-.endif
-
-.if !defined(IGNORE_MASTER_SITE_CSME)
-MASTER_SITE_CSME+=	${MASTER_SITE_CENKES}
-.endif
-
 .if !defined(IGNORE_MASTER_SITE_DEBIAN)
 MASTER_SITE_DEBIAN+= \
 	http://cdn.debian.net/debian/%SUBDIR%/ \
@@ -158,7 +141,6 @@
 	ftp://ftp.is.debian.org/debian-non-US/%SUBDIR%/ \
 	ftp://ftp.it.debian.org/debian-non-US/%SUBDIR%/ \
 	ftp://ftp.jp.debian.org/debian-non-US/%SUBDIR%/ \
-	${MASTER_SITE_RINGSERVER:S,%SUBDIR%,linux/debian/debian-non-US/&,} \
 	ftp://ftp.nl.debian.org/debian-non-US/%SUBDIR%/ \
 	ftp://ftp.no.debian.org/debian-non-US/%SUBDIR%/ \
 	ftp://ftp.pl.debian.org/debian-non-US/%SUBDIR%/ \
@@ -405,6 +387,11 @@
 	ftp://mirrors.tummy.com/pub/fedora.redhat.com/fedora/linux/core/%SUBDIR%/
 .endif
 
+.if !defined(IGNORE_MASTER_SITE_FARSIGHT)
+MASTER_SITE_FARSIGHT+= \
+	https://dl.farsightsecurity.com/dist/%SUBDIR%/
+.endif
+
 .if !defined(IGNORE_MASTER_SITE_FESTIVAL)
 MASTER_SITE_FESTIVAL+= \
 	http://www.festvox.org/packed/festival/%SUBDIR%/ \
@@ -521,7 +508,7 @@
 # variables:
 #
 # GH_ACCOUNT    - account name of the GitHub user hosting the project
-#                 default: not set, mandatory
+#                 default: ${PORTNAME}
 #
 # GH_PROJECT    - name of the project on GitHub
 #                 default: ${PORTNAME}
@@ -528,30 +515,59 @@
 #
 # GH_TAGNAME    - name of the tag to download (2.0.1, hash, ...)
 #                 Using the name of a branch here is incorrect. It is
-#                 possible to do GH_TAGNAME=${GH_COMMIT} to do a snapshot
+#                 possible to do GH_TAGNAME= GIT_HASH to do a snapshot.
 #                 default: ${DISTVERSION}
 #
 # GH_COMMIT     - first 7 digits of the commit that generated GH_TAGNAME
 #                 (man git-describe(1))
-#                 default: not set, mandatory
+#                 if this is not set, archive corresponding to tag is fetched
+#                 default: not set
+#                 This is a deprecated option. Just set the hash in GH_TAGNAME
+#                 instead.
 #
 .if defined(USE_GITHUB)
-.if defined(GH_TAGNAME) && ${GH_TAGNAME} == master
+.  if defined(GH_TAGNAME) && ${GH_TAGNAME} == master
 IGNORE?=	Using master as GH_TAGNAME is invalid. \
 		Must use a tag or commit hash so the upstream does \
 		not "reroll" as soon as the branch is updated
-.endif
-MASTER_SITE_GITHUB+=		https://codeload.github.com/%SUBDIR% \
-				http://codeload.github.com/%SUBDIR%
+.  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_RELEASE+=	https://github.com/%SUBDIR%
+MASTER_SITE_GITHUB_LEGACY+=	https://codeload.github.com/%SUBDIR%
 
-.if !defined(MASTER_SITES) || !${MASTER_SITES:MGH} && !${MASTER_SITES:MGHC} && !${MASTER_SITES:MGHR}
-MASTER_SITES+=	GH GHC GHR
-.endif
+.  if defined(GH_COMMIT)
+.    if !defined(MASTER_SITES) || !${MASTER_SITES:MGHL}
+MASTER_SITES+=	GHL
+.    endif
+.  else
+.    if !defined(MASTER_SITES) || !${MASTER_SITES:MGH} && !${MASTER_SITES:MGHC}
+MASTER_SITES+=	GH
+.    endif
+.  endif
 GH_ACCOUNT?=	${PORTNAME}
 GH_PROJECT?=	${PORTNAME}
+.  if defined(GH_COMMIT)
+# Use the old style for safety for now.
 GH_TAGNAME?=	${DISTVERSION}
+.  else
+# Use full PREFIX/SUFFIX and converted DISTVERSION
+GH_TAGNAME?=	${DISTVERSIONFULL}
+# This new scheme rerolls distfiles. Also ensure they are renamed to avoid
+# conflicts. Use _GITHUB_REV in case github changes their zipping or structure
+# which has happened before.
+_GITHUB_REV=	0
+.    if ${MASTER_SITES:MGH}
+DISTNAME:=	${DISTNAME}_GH${_GITHUB_REV}
+.    endif
+.  endif
+.  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
 .endif
 .endif
 
@@ -567,7 +583,6 @@
 	ftp://ftp.dti.ad.jp/pub/X/gnome/%SUBDIR%/ \
 	http://linorg.usp.br/gnome/%SUBDIR%/ \
 	http://mirror.aarnet.edu.au/pub/gnome/%SUBDIR%/ \
-	${MASTER_SITE_RINGSERVER:S,%SUBDIR%,X/gnome/&,} \
 	ftp://ftp.kddlabs.co.jp/pub/GNOME/%SUBDIR%/ \
 	ftp://ftp.mirrorservice.org/sites/ftp.gnome.org/pub/GNOME/%SUBDIR%/ \
 	ftp://ftp.nara.wide.ad.jp/pub/X11/GNOME/%SUBDIR%/ \
@@ -593,7 +608,6 @@
 	http://mirrors.kernel.org/gnu/%SUBDIR%/ \
 	ftp://ftp.kddlabs.co.jp/GNU/%SUBDIR%/ \
 	ftp://ftp.dti.ad.jp/pub/GNU/%SUBDIR%/ \
-	${MASTER_SITE_RINGSERVER:S,%SUBDIR%,GNU/&,} \
 	ftp://ftp.mirrorservice.org/sites/ftp.gnu.org/gnu/%SUBDIR%/ \
 	ftp://ftp.informatik.hu-berlin.de/pub/gnu/gnu/%SUBDIR%/ \
 	ftp://ftp.informatik.rwth-aachen.de/pub/mirror/ftp.gnu.org/pub/gnu/%SUBDIR%/ \
@@ -752,7 +766,6 @@
 	http://kde-mirror.freenux.org/%SUBDIR%/ \
 	http://ftp.fi.muni.cz/pub/kde/%SUBDIR%/ \
 	ftp://ftp-stud.fht-esslingen.de/pub/Mirrors/ftp.kde.org/pub/kde/%SUBDIR%/ \
-	${MASTER_SITE_RINGSERVER:S,%SUBDIR%,X/kde/&,} \
 	ftp://ftp.funet.fi/pub/mirrors/ftp.kde.org/pub/kde/%SUBDIR%/ \
 	http://ftp.funet.fi/pub/mirrors/ftp.kde.org/pub/kde/%SUBDIR%/
 .endif
@@ -762,14 +775,6 @@
 	http://dev-www.libreoffice.org/src/%SUBDIR%/
 .endif
 
-.if !defined(IGNORE_MASTER_SITE_LOGILAB)
-MASTER_SITE_LOGILAB+= \
-	http://download.logilab.org/pub/%SUBDIR%/ \
-	http://ftp.logilab.org/pub/%SUBDIR%/ \
-	ftp://ftp.logilab.org/pub/%SUBDIR%/ \
-	ftp://ftp.logilab.fr/pub/%SUBDIR%/
-.endif
-
 .if !defined(IGNORE_MASTER_SITE_MATE)
 MASTER_SITE_MATE+= \
 	http://pub.mate-desktop.org/releases/%SUBDIR%/
@@ -811,7 +816,6 @@
 	ftp://ftp.mozilla.org/pub/mozilla.org/%SUBDIR%/ \
 	ftp://ftp.fh-wolfenbuettel.de/pub/www/mozilla/%SUBDIR%/ \
 	ftp://ftp.informatik.rwth-aachen.de/pub/mirror/ftp.mozilla.org/pub/%SUBDIR%/ \
-	${MASTER_SITE_RINGSERVER:S,%SUBDIR%,net/www/mozilla/&,} \
 	http://ftp.twaren.net/Unix/Mozilla/%SUBDIR%/
 .endif
 
@@ -878,7 +882,6 @@
 	ftp://sunsite.uio.no/bsd/unix/NetBSD/packages/distfiles/%SUBDIR%/ \
 	ftp://ftp.sunet.se/pub/NetBSD/packages/distfiles/%SUBDIR%/ \
 	ftp://ftp.demon.co.uk/pub/mirrors/NetBSD/packages/distfiles/%SUBDIR%/ \
-	${MASTER_SITE_RINGSERVER:S,%SUBDIR%,NetBSD/packages/distfiles/&,} \
 	ftp://ftp.dti.ad.jp/pub/NetBSD/packages/distfiles/%SUBDIR%/ \
 	ftp://ftp.funet.fi/pub/NetBSD/packages/distfiles/%SUBDIR%/
 .endif
@@ -885,18 +888,12 @@
 
 .if !defined(IGNORE_MASTER_SITE_NETLIB)
 MASTER_SITE_NETLIB+= \
-	ftp://ftp.netlib.org/%SUBDIR%/ \
 	http://www.netlib.org/%SUBDIR%/ \
 	ftp://ftp.mirrorservice.org/sites/ftp.netlib.org/%SUBDIR%/ \
 	http://www.mirrorservice.org/sites/ftp.netlib.org/%SUBDIR%/ \
-	ftp://ftp.netlib.no/netlib/%SUBDIR%/ \
 	http://www.netlib.no/netlib/%SUBDIR%/ \
 	ftp://ftp.irisa.fr/pub/netlib/%SUBDIR%/ \
-	http://artfiles.org/netlib.org/%SUBDIR%/ \
-	http://netlib.amss.ac.cn/%SUBDIR%/ \
-	http://netlib.caspur.it/%SUBDIR%/ \
-	http://netlib.sandia.gov/%SUBDIR%/ \
-	http://phase.hpcc.jp/mirrors/netlib/%SUBDIR%/
+	http://netlib.sandia.gov/%SUBDIR%/
 .endif
 
 .if !defined(IGNORE_MASTER_SITE_NVIDIA)
@@ -1069,8 +1066,7 @@
 	http://uk3.php.net/%SUBDIR%/ \
 	http://us2.php.net/%SUBDIR%/ \
 	http://br.php.net/%SUBDIR%/ \
-	http://cn.php.net/%SUBDIR%/ \
-	${MASTER_SITE_RINGSERVER:S,%SUBDIR%,net/www/php/&,}
+	http://cn.php.net/%SUBDIR%/
 .endif
 
 .if !defined(IGNORE_MASTER_SITE_PYTHON)
@@ -1115,31 +1111,6 @@
 	ftp://ftp.kddlabs.co.jp/pub/Linux/packages/RedHat/redhat/linux/%SUBDIR%/
 .endif
 
-#
-# RingServers in Japan
-#
-#
-# Note: If you know which of the RingServers is nearest to you,
-# please specify it in your /etc/make.conf. (The server list is
-# available at http://www.ring.gr.jp/)
-#
-# You can choose either http or ftp to access to a server:
-#
-#	http://<server>/archives/%SUBDIR%/
-#	ftp://<server>/pub/%SUBDIR%/
-#
-# {www,ftp}.dnsbalance.ring.gr.jp redirects requests to one of the
-# least busy servers at the moment at the DNS lookup level. (safe to
-# use with "fetch -A")
-#
-# {www,ftp}.t.ring.gr.jp redirects requests to one of the nearest
-# servers at the DNS lookup level. (safe to use with "fetch -A")
-#
-.if !defined(IGNORE_MASTER_SITE_RINGSERVER)
-MASTER_SITE_RINGSERVER+= \
-	http://ring.nict.go.jp/archives/%SUBDIR%/
-.endif
-
 .if !defined(IGNORE_MASTER_SITE_RUBY)
 MASTER_SITE_RUBY+= \
 	http://cache.ruby-lang.org/pub/ruby/%SUBDIR%/ \
@@ -1147,7 +1118,6 @@
 	ftp://ftp.SpringDaemons.com/pub/ruby/ruby/%SUBDIR%/ \
 	http://www.ibiblio.org/pub/languages/ruby/%SUBDIR%/ \
 	ftp://xyz.lcs.mit.edu/pub/ruby/%SUBDIR%/ \
-	${MASTER_SITE_RINGSERVER:S,%SUBDIR%,lang/ruby/&,} \
 	ftp://ftp.fu-berlin.de/unix/languages/ruby/%SUBDIR%/ \
 	ftp://ftp.easynet.be/ruby/ruby/%SUBDIR%/ \
 	ftp://ftp.ntua.gr/pub/lang/ruby/%SUBDIR%/ \
@@ -1168,8 +1138,7 @@
 	http://ftp.samba.org/pub/%SUBDIR%/ \
 	ftp://ca.samba.org/pub/%SUBDIR%/ \
 	ftp://de.samba.org/pub/%SUBDIR%/ \
-	ftp://ftp.easynet.be/%SUBDIR%/ \
-	${MASTER_SITE_RINGSERVER:S,%SUBDIR%,net/samba/&,}
+	ftp://ftp.easynet.be/%SUBDIR%/
 .endif
 
 # List:	http://download.savannah.gnu.org/mirmon/
@@ -1191,7 +1160,7 @@
 MASTER_SITE_SOURCEFORGE+= http://downloads.sourceforge.net/project/%SUBDIR%/
 .for mirror in heanet sunet iweb switch freefr garr aarnet jaist master \
 	nchc ncu internode waix hivelocity superb-dca3 ufpr tenet \
-	netcologne ignum kent kaz
+	netcologne ignum kent
 MASTER_SITE_SOURCEFORGE+= \
 	http://${mirror}.dl.sourceforge.net/project/%SUBDIR%/
 .endfor
@@ -1258,81 +1227,9 @@
 	ftp://ftp.sun.ac.za/pub/mirrors/sunsite.unc.edu/pub/Linux/%SUBDIR%/
 .endif
 
-.if !defined(IGNORE_MASTER_SITE_SUSE)
-MASTER_SITE_SUSE+= \
-	http://mirrors.usc.edu/pub/linux/distributions/suse/%SUBDIR%/ \
-	http://mirror.usu.edu/mirrors/suse/%SUBDIR%/ \
-	ftp://mirror.mcs.anl.gov/pub/suse/%SUBDIR%/ \
-	ftp://chuck.ucs.indiana.edu/linux/suse/suse/%SUBDIR%/ \
-	ftp://ftp.oregonstate.edu/pub/suse/suse/%SUBDIR%/ \
-	ftp://ftp.sunsite.utk.edu/pub/linux/suse/suse/%SUBDIR%/ \
-	http://sunsite.utk.edu/ftp/pub/linux/suse/suse/%SUBDIR%/ \
-	http://mirror.tamu.edu/suse/%SUBDIR%/ \
-	ftp://ftp.empiricalnetworks.com/pub/suse/%SUBDIR%/ \
-	http://suse.cs.utah.edu/suse/%SUBDIR%/ \
-	ftp://ftp.belnet.be/linux/suse/suse/%SUBDIR%/ \
-	http://ftp.unicamp.br/pub/suse/%SUBDIR%/ \
-	ftp://mirrors.netbg.com/suse/%SUBDIR%/ \
-	http://ftp.sh.cvut.cz/MIRRORS/SuSE/pub/%SUBDIR%/ \
-	ftp://ftp.linux.ee/pub/suse/suse/%SUBDIR%/ \
-	ftp://garbo.uwasa.fi/pub/mirrors/suse/%SUBDIR%/ \
-	http://fr2.rpmfind.net/linux/SuSE-Linux/%SUBDIR%/ \
-	http://ftp.iut-bm.univ-fcomte.fr/Suse/suse/%SUBDIR%/ \
-	ftp://ftp.gwdg.de/pub/linux/suse/ftp.suse.com/suse/%SUBDIR%/ \
-	ftp://sunsite.informatik.rwth-aachen.de/pub/Linux/suse/%SUBDIR%/ \
-	ftp://ftp.rz.hu-berlin.de/pub/mirrors/ftp.suse.com/pub/suse/%SUBDIR%/ \
-	ftp://ftp.tu-chemnitz.de/pub/linux/suse/ftp.suse.com/suse/%SUBDIR%/ \
-	ftp://ftp.tu-cottbus.de/pub/unix/linux/suse.com/suse/%SUBDIR%/ \
-	http://ftp.uni-erlangen.de/pub/Linux/MIRROR.suse/pub/suse/%SUBDIR%/ \
-	http://ftp-stud.fht-esslingen.de/pub/Mirrors/ftp.suse.com/pub/suse/%SUBDIR%/ \
-	ftp://ftp.hs.uni-hamburg.de/pub/unix/linux/suse/%SUBDIR%/ \
-	ftp://ftp.rrzn.uni-hannover.de/pub/mirror/linux/suse/%SUBDIR%/ \
-	http://ftp.tu-ilmenau.de/Mirrors/ftp.suse.com/%SUBDIR%/ \
-	ftp://ftp.uni-kassel.de/pub/linux/suse/%SUBDIR%/ \
-	ftp://ftp.uni-rostock.de/pub/systems/unix/linux/suse/%SUBDIR%/ \
-	ftp://ftp.mpi-sb.mpg.de/pub/linux/mirror/ftp.suse.com/suse/%SUBDIR%/ \
-	ftp://ftp.uni-kl.de/pub/linux/suse/%SUBDIR%/ \
-	ftp://ftp.uni-siegen.de/pub/suse/%SUBDIR%/ \
-	ftp://ftp.uni-mainz.de/pub/software/Linux/suse/%SUBDIR%/ \
-	ftp://ftp.uni-heidelberg.de/pub/linux/suse/%SUBDIR%/ \
-	ftp://ftp.rz.uni-ulm.de/pub/mirrors/suse/%SUBDIR%/ \
-	ftp://ftp.rz.uni-wuerzburg.de/pub/linux/MIRROR.suse/%SUBDIR%/ \
-	ftp://ftp.freenet.de/pub/.disk1/ftp.suse.com/pub/suse/%SUBDIR%/ \
-	ftp://ftp.hu-berlin.de/pub/mirrors/ftp.suse.com/pub/suse/%SUBDIR%/ \
-	ftp://ftp.rz.uni-kiel.de/pub2/linux/suse/%SUBDIR%/ \
-	http://mirrors.sth.sze.hu/linux/suse/%SUBDIR%/ \
-	ftp://ftp.heanet.ie/mirrors/ftp.suse.com/pub/suse/ftp.suse.com/suse/%SUBDIR%/ \
-	ftp://ftp.unina.it/pub/linux/distributions/SuSE/ftp.suse.com/suse/%SUBDIR%/ \
-	ftp://ftp.uniroma2.it/Linux/suse/pub/suse/%SUBDIR%/ \
-	ftp://ftp.riken.jp/Linux/suse/suse/%SUBDIR%/ \
-	ftp://ftp.kddilabs.jp/Linux/packages/SuSE/suse/%SUBDIR%/ \
-	ftp://ftp.novell.co.jp/pub/suse/suse/%SUBDIR%/ \
-	ftp://ftp.kreonet.re.kr/pub/Linux/suse/%SUBDIR%/ \
-	http://ftp.tpnet.pl/vol/d7/ftp.suse.com/%SUBDIR%/ \
-	ftp://ftp.icm.edu.pl/packages/linux-suse/%SUBDIR%/ \
-	http://ftp.idilis.ro/mirrors/ftp.suse.com/pub/suse/%SUBDIR%/ \
-	ftp://ftp.sunet.se/pub/Linux/distributions/suse/suse/%SUBDIR%/ \
-	ftp://ftp.solnet.ch/mirror/SuSE/%SUBDIR%/ \
-	ftp://sunsite.cnlab-switch.ch/mirror/SuSE/suse/%SUBDIR%/ \
-	http://ftp.isu.edu.tw/pub/Linux/SuSE/%SUBDIR%/ \
-	ftp://ftp.kde.org/pub/suse/ftp.suse.com/suse/%SUBDIR%/ \
-	ftp://ftp.suse.com/pub/suse/%SUBDIR%/ \
-	ftp://ftp.softnet.tuc.gr/pub/linux/suse/suse/%SUBDIR%/ \
-	http://ftp.softnet.tuc.gr/pub/linux/suse/suse/%SUBDIR%/ \
-	ftp://ftp.is.co.za/linux/distributions/suse/%SUBDIR%/ \
-	http://ftp.sun.ac.za/ftp/mirrorsites/suse/%SUBDIR%/ \
-	ftp://ftp.rediris.es/pub/linux/distributions/suse/pub/suse/%SUBDIR%/ \
-	ftp://ftp.cb.spb.ru/.1/Linux-Distrib/Suse/%SUBDIR%/ \
-	ftp://ftp.neva.ru/.1/Linux-Distrib/Suse/%SUBDIR%/ \
-	ftp://ftp.chg.ru/pub/Linux/SuSE/suse/%SUBDIR%/ \
-	http://mirror.pacific.net.au/linux/suse/%SUBDIR%/ \
-	ftp://mirror.aarnet.edu.au/pub/suse/%SUBDIR%/
-.endif
-
 .if !defined(IGNORE_MASTER_SITE_TCLTK)
 MASTER_SITE_TCLTK+= \
 	ftp://ftp.tcl.tk/pub/tcl/%SUBDIR%/ \
-	ftp://sunsite.utk.edu/pub/tcl/%SUBDIR%/ \
 	ftp://ftp.kddlabs.co.jp/lang/tcl/ftp.scriptics.com/%SUBDIR%/ \
 	ftp://ftp.mirrorservice.org/sites/ftp.tcl.tk/pub/tcl/%SUBDIR%/ \
 	ftp://ftp.funet.fi/pub/languages/tcl/tcl/%SUBDIR%/
@@ -1345,18 +1242,11 @@
 	ftp://ftp.kddlabs.co.jp/CTAN/%SUBDIR%/ \
 	ftp://ctan.tug.org/tex-archive/%SUBDIR%/ \
 	ftp://ftp.dante.de/tex-archive/%SUBDIR%/ \
-	${MASTER_SITE_RINGSERVER:S,%SUBDIR%,text/CTAN/&,} \
 	ftp://ftp.chg.ru/pub/TeX/CTAN/%SUBDIR%/ \
 	ftp://mirror.macomnet.net/pub/CTAN/%SUBDIR%/ \
 	ftp://ftp.funet.fi/pub/TeX/CTAN/%SUBDIR%/
 .endif
 
-.if !defined(IGNORE_MASTER_SITE_THEMES)
-MASTER_SITE_THEMES+= \
-	http://download.freshmeat.net/themes/%SUBDIR%/ \
-	ftp://gd.tuwien.ac.at/opsys/linux/freshmeat/themes/%SUBDIR%/
-.endif
-
 # Derived from: https://www.torproject.org/getinvolved/mirrors.html.en
 .if !defined(IGNORE_MASTER_SITE_TOR)
 MASTER_SITE_TOR+= \
@@ -1401,53 +1291,14 @@
 .endif
 
 .if !defined(IGNORE_MASTER_SITE_TUCOWS)
-.for mirror in ankara blueyonder casemanl chariot clix dataphone dialog epix \
-	fastweb genotec hellasonline iinets inspirenet latvia mclink netvisao \
-	ns-linux nyi otenet personainternet pl-task ukms
 MASTER_SITE_TUCOWS+= \
-	http://${mirror}.linux.tucows.com/files/%SUBDIR%/
-.endfor
-MASTER_SITE_TUCOWS+= \
-	http://www12.tucows.com/linux/files/%SUBDIR%/ \
-	http://linux.tucows.gunadarma.ac.id/files/%SUBDIR%/
+	http://iinets.linux.tucows.com/files/%SUBDIR%/
 .endif
 
-# List:		http://www.vim.org/mirrors.php
-# Updated:	2015-01-03
-# Please make sure mirrors end in /unix/
-.if !defined(IGNORE_MASTER_SITE_VIM)
-MASTER_SITE_VIM+= \
-	http://mirrors-usa.go-parts.com/pub/vim/unix/ \
-	http://ftp2.uk.vim.org/pub/vim/unix/ \
-	http://ftp.vim.ossmirror.de/pub/vim/unix/ \
-	http://ftp.stust.edu.tw/vim/unix/ \
-	http://vim.cybermirror.org/unix/ \
-	http://www.netgull.com/vim/unix/ \
-	http://ftp2.jp.vim.org/pub/vim/unix/ \
-	http://mirrors.go-parts.com/pub/vim/unix/ \
-	http://artfiles.org/vim.org/unix/ \
-	http://ftp2.kr.vim.org/pub/vim/unix/ \
-	http://mirror.netinch.com/pub/vim/unix/ \
-	http://ftp.es.vim.org/pub/vim/unix/ \
-	http://ftp.gr.vim.org/pub/vim/unix/ \
-	http://tweedo.com/mirror/ftp.vim.org/unix/ \
-	http://mirrors-br.go-parts.com/pub/vim/unix/ \
-	http://ftp2.tw.vim.org/pub/vim/unix/ \
-	http://mirrors-au.go-parts.com/pub/vim/unix/ \
-	http://mirrors-uk.go-parts.com/pub/vim/unix/ \
-	http://ftp.tw.vim.org/pub/vim/unix/ \
-	http://funnyshare.org/mirrors/vim/unix/ \
-	http://mirrors-ru.go-parts.com/pub/vim/unix/ \
-	http://servingzone.com/mirrors/vim/unix/ \
-	http://ftp.ro.vim.org/mirrors/ftp.vim.org/unix/ \
-	http://vim.mirror.fr/unix/
-.endif
-
 .if !defined(IGNORE_MASTER_SITE_WINDOWMAKER)
 MASTER_SITE_WINDOWMAKER+= \
 	ftp://ftp.windowmaker.info/pub/%SUBDIR%/ \
-	ftp://ftp.uvsq.fr/pub/X11/window-managers/windowmaker/%SUBDIR%/ \
-	ftp://ftp.dti.ad.jp/pub/X/WindowMaker/%SUBDIR%/
+	ftp://ftp.uvsq.fr/pub/X11/window-managers/windowmaker/%SUBDIR%/
 .endif
 
 .if !defined(IGNORE_MASTER_SITE_XCONTRIB)
@@ -1457,35 +1308,9 @@
 	ftp://ftp.sunet.se/pub/X11/ftp.x.org/contrib/%SUBDIR%/ \
 	ftp://ftp.dti.ad.jp/pub/X/XFree86/mirror/X.Org/contrib/%SUBDIR%/ \
 	ftp://ftp.kddlabs.co.jp/X11/ftp.x.org/contrib/%SUBDIR%/ \
-	ftp://ftp2.x.org/contrib/%SUBDIR%/ \
-	${MASTER_SITE_RINGSERVER:S,%SUBDIR%,X/opengroup/contrib/&,}
+	ftp://ftp2.x.org/contrib/%SUBDIR%/
 .endif
 
-.if !defined(IGNORE_MASTER_SITE_XEMACS)
-MASTER_SITE_XEMACS+= \
-	http://ftp.it.xemacs.org/%SUBDIR%/ \
-	http://ftp.pt.xemacs.org/%SUBDIR%/ \
-	http://xemacsftp.hkmirror.org/%SUBDIR%/ \
-	http://ftp.dti.ad.jp/pub/unix/editor/xemacs/%SUBDIR%/ \
-	http://ftp.xemacs.org/pub/xemacs/%SUBDIR%/ \
-	ftp://ftp.be.xemacs.org/xemacs/%SUBDIR%/ \
-	ftp://ftp.ch.xemacs.org/mirror/xemacs/%SUBDIR%/ \
-	ftp://ftp.de.xemacs.org/pub/ftp.xemacs.org/tux/xemacs/%SUBDIR%/ \
-	ftp://ftp.fi.xemacs.org/pub/mirrors/ftp.xemacs.org/pub/tux/xemacs/%SUBDIR%/ \
-	ftp://ftp.fr.xemacs.org/pub/xemacs/%SUBDIR%/ \
-	ftp://ftp.gr.xemacs.org/mirrors/XEmacs/ftp/%SUBDIR%/ \
-	ftp://ftp.heanet.ie/mirrors/ftp.xemacs.org/%SUBDIR%/ \
-	ftp://ftp.ie.xemacs.org/mirrors/ftp.xemacs.org/pub/xemacs/%SUBDIR%/ \
-	ftp://ftp.no.xemacs.org/pub/xemacs/%SUBDIR%/ \
-	ftp://ftp.pasteur.fr/pub/computing/xemacs/%SUBDIR%/ \
-	ftp://ftp.sa.xemacs.org/pub/xemacs.org/%SUBDIR%/ \
-	ftp://ftp.se.xemacs.org/pub/gnu/xemacs/%SUBDIR%/ \
-	ftp://ftp.tw.xemacs.org/Unix/Editors/XEmacs/%SUBDIR%/ \
-	ftp://ftp.uk.xemacs.org/sites/ftp.xemacs.org/pub/xemacs/%SUBDIR%/ \
-	ftp://ftp.yz.yamagata-u.ac.jp/pub/misc/xemacs/%SUBDIR%/ \
-	${MASTER_SITE_RINGSERVER:S,%SUBDIR%,text/xemacs/&,}
-.endif
-
 .if !defined(IGNORE_MASTER_SITE_XFCE)
 MASTER_SITE_XFCE+= \
 	http://mirror.perldude.de/archive.xfce.org/%SUBDIR%/ \
@@ -1537,38 +1362,41 @@
 MASTER_SITES_ABBREVS=	CPAN:PERL_CPAN \
 			GH:GITHUB \
 			GHC:GITHUB_CLOUD \
-			GHR:GITHUB_RELEASE \
+			GHL:GITHUB_LEGACY \
 			LODEV:LIBREOFFICE_DEV \
 			NL:NETLIB \
+			RG:RUBYGEMS \
 			SF:SOURCEFORGE \
-			SFJP:SOURCEFORGE_JP \
-			RG:RUBYGEMS
-MASTER_SITES_SUBDIRS=	APACHE_JAKARTA:${PORTNAME:S,-,/,}/source \
+			SFJP:SOURCEFORGE_JP
+MASTER_SITES_SUBDIRS=	APACHE_COMMONS_BINARIES:${PORTNAME:S,commons-,,} \
+			APACHE_COMMONS_SOURCE:${PORTNAME:S,commons-,,} \
+			APACHE_JAKARTA:${PORTNAME:S,-,/,}/source \
 			BERLIOS:${PORTNAME:tl}.berlios \
-			CENKES:myports \
 			CHEESESHOP:source/${DISTNAME:C/(.).*/\1/}/${DISTNAME:C/(.*)-[0-9].*/\1/} \
-			CSME:myports \
 			DEBIAN:pool/main/${PORTNAME:C/^((lib)?.).*$/\1/}/${PORTNAME} \
+			FARSIGHT:${PORTNAME} \
+			FESTIVAL:${PORTVERSION} \
 			GCC:releases/${DISTNAME} \
-			GITHUB:${GH_ACCOUNT}/${GH_PROJECT}/legacy.tar.gz/${GH_TAGNAME}?dummy=/ \
+			GENTOO:distfiles \
+			GIMP:${PORTNAME}/${PORTVERSION:R}/ \
+			GITHUB:${GH_ACCOUNT}/${GH_PROJECT}/tar.gz/${GH_TAGNAME}?dummy=/ \
 			GITHUB_CLOUD:${GH_ACCOUNT}/${GH_PROJECT}/ \
-			GITHUB_RELEASE:${GH_ACCOUNT}/${GH_PROJECT}/archive/${DISTVERSIONPREFIX}${DISTVERSION:C/:(.)/\1/g}${DISTVERSIONSUFFIX}${EXTRACT_SUFX}?dummy=/ \
+			GITHUB_LEGACY:${GH_ACCOUNT}/${GH_PROJECT}/legacy.tar.gz/${GH_TAGNAME}?dummy=/ \
 			GNOME:sources/${PORTNAME}/${PORTVERSION:C/^([0-9]+\.[0-9]+).*/\1/} \
-			GIMP:${PORTNAME}/${PORTVERSION:R}/ \
 			GNU:${PORTNAME} \
+			GNUPG:${PORTNAME} \
 			GNU_ALPHA:${PORTNAME} \
 			HORDE:${PORTNAME} \
-			LOGILAB:${PORTNAME} \
 			LIBREOFFICE_DEV:${PORTNAME} \
 			MATE:${PORTVERSION:C/^([0-9]+\.[0-9]+).*/\1/} \
 			MOZDEV:${PORTNAME:tl} \
 			NETLIB:${PORTNAME} \
 			PERL_CPAN:${PORTNAME:C/-.*//} \
-			PNET:${PNET_MASTER_SITE_SUBDIR} \
-			RUBY_DBI:${RUBY_DBI_MASTER_SITE_SUBDIR} \
-			RUBY_GNOME:${RUBY_GNOME_MASTER_SITE_SUBDIR} \
+			QT:archive/qt/${PORTVERSION:R} \
+			SAMBA:${PORTNAME} \
 			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*\:/*}
 
@@ -1592,11 +1420,13 @@
 _site_url_=	${_abbrev_:C/.*://}
 .			endif
 .		endfor
-.		for _subdir_ in ${MASTER_SITES_SUBDIRS}
-.			if ${_site_url_} == ${_subdir_:C/:.*//} && !defined(MASTER_SITE_SUBDIR)
+.		if !defined(MASTER_SITE_SUBDIR)
+.			for _subdir_ in ${MASTER_SITES_SUBDIRS}
+.				if ${_site_url_} == ${_subdir_:C/:.*//}
 _site_subdir_?=	${_subdir_:C/.*://}
-.			endif
-.		endfor
+.				endif
+.			endfor
+.		endif
 .		ifdef MASTER_SITE_${_site_url_}
 .			ifdef _site_subdir_
 MASTER_SITES_EXP+=	${MASTER_SITE_${_site_url_}:S^%SUBDIR%^${_site_subdir_}^:S/$/:${_site_group_}/:S/:$//}
@@ -1633,11 +1463,13 @@
 _site_url_=	${_abbrev_:C/.*://}
 .			endif
 .		endfor
-.		for _subdir_ in ${MASTER_SITES_SUBDIRS}
-.			if ${_site_url_} == ${_subdir_:C/:.*//} && !defined(MASTER_SITE_SUBDIR)
+.		if !defined(MASTER_SITE_SUBDIR)
+.			for _subdir_ in ${MASTER_SITES_SUBDIRS}
+.				if ${_site_url_} == ${_subdir_:C/:.*//}
 _site_subdir_?=	${_subdir_:C/.*://}
-.			endif
-.		endfor
+.				endif
+.			endfor
+.		endif
 .		ifdef MASTER_SITE_${_site_url_}
 .			ifdef _site_subdir_
 PATCH_SITES_EXP+=	${MASTER_SITE_${_site_url_}:S^%SUBDIR%^${_site_subdir_}^:S/$/:${_site_group_}/:S/:$//}

More information about the Midnightbsd-cvs mailing list