svn commit: r355068 - branches/2014Q2/Mk

[Bryan Drewery]

Author: bdrewery
Date: Sat May 24 18:05:30 2014
New Revision: 355068
URL: http://svnweb.freebsd.org/changeset/ports/355068
QAT: https://qat.redports.org/buildarchive/r355068/

Log:
  MFH: r354962
  
  Point MASTER_SITES_BACKUP / MASTER_SITES_LOCAL to distcache.FreeBSD.org

Modified:
  branches/2014Q2/Mk/bsd.port.mk
  branches/2014Q2/Mk/bsd.sites.mk
Directory Properties:
  branches/2014Q2/   (props changed)

Modified: branches/2014Q2/Mk/bsd.port.mk
==============================================================================
--- branches/2014Q2/Mk/bsd.port.mk	Sat May 24 18:05:08 2014	(r355067)
+++ branches/2014Q2/Mk/bsd.port.mk	Sat May 24 18:05:30 2014	(r355068)
@@ -144,7 +144,7 @@ FreeBSD_MAINTAINER=	portmgr at FreeBSD.org
 #				- Backup location(s) for distribution files and patch
 #				  files if not found locally and ${MASTER_SITES}/${PATCH_SITES}
 #				  Default:
-#				  http://ftp.FreeBSD.org/pub/FreeBSD/ports/distfiles/${DIST_SUBDIR}/
+#				  http://distcache.FreeBSD.org/ports-distfiles/${DIST_SUBDIR}/
 # MASTER_SITE_OVERRIDE
 #				- If set, override the MASTER_SITES setting with this
 #				  value.
@@ -2489,7 +2489,7 @@ PATCH_SITES_TMP=
 
 # The primary backup site.
 MASTER_SITE_BACKUP?=	\
-	http://ftp.FreeBSD.org/pub/FreeBSD/ports/distfiles/${DIST_SUBDIR}/
+	http://distcache.FreeBSD.org/ports-distfiles/${DIST_SUBDIR}/
 MASTER_SITE_BACKUP:=	${MASTER_SITE_BACKUP:S^\${DIST_SUBDIR}/^^}
 
 # If the user has MASTER_SITE_FREEBSD set, go to the FreeBSD repository

Modified: branches/2014Q2/Mk/bsd.sites.mk
==============================================================================
--- branches/2014Q2/Mk/bsd.sites.mk	Sat May 24 18:05:08 2014	(r355067)
+++ branches/2014Q2/Mk/bsd.sites.mk	Sat May 24 18:05:30 2014	(r355068)
@@ -26,6 +26,7 @@
 # Where to put distfiles that don't have any other master site
 .if !defined(IGNORE_MASTER_SITE_LOCAL)
 MASTER_SITE_LOCAL+= \
+	http://distcache.FreeBSD.org/local-distfiles/%SUBDIR%/ \
 	http://ftp.FreeBSD.org/pub/FreeBSD/ports/local-distfiles/%SUBDIR%/ \
 	ftp://ftp.FreeBSD.org/pub/FreeBSD/ports/local-distfiles/%SUBDIR%/ \
 	ftp://ftp.se.FreeBSD.org/pub/FreeBSD/ports/local-distfiles/%SUBDIR%/ \