Ticket #15456: d.m.o.diff

src/port1.0/portfetch.tcl

@@ -94 +94 @@
 default fetch.remote_time "no"
 
 default fallback_mirror_site "macports"
+default global_mirror_site "macports_distfiles"
 default mirror_sites.listfile {"mirror_sites.tcl"}
 default mirror_sites.listpath {"${portresourcepath}/fetch/"}
 
@@ -218 +219 @@
 # sites
 proc checksites {args} {
     global patch_sites master_sites master_sites.mirror_subdir \
-        patch_sites.mirror_subdir fallback_mirror_site env
+        patch_sites.mirror_subdir fallback_mirror_site global_mirror_site env
     
-    append master_sites " ${fallback_mirror_site}"
+    append master_sites " ${global_mirror_site} ${fallback_mirror_site}"
     if {[info exists env(MASTER_SITE_LOCAL)]} {
         set master_sites [concat $env(MASTER_SITE_LOCAL) $master_sites]
     }
     
+    # we probably want to mirror downloaded patches
+    # on distfiles.macports.org too, but we don't currently
     append patch_sites " ${fallback_mirror_site}"
     if {[info exists env(PATCH_SITE_LOCAL)]} {
         set patch_sites [concat $env(PATCH_SITE_LOCAL) $patch_sites]

src/port1.0/resources/fetch/mirror_sites.tcl

@@ -180 +180 @@
     http://svn.macports.org/repository/macports/downloads/
 }
 
+set portfetch::mirror_sites::sites(macports_distfiles) {
+    http://distfiles.macports.org/:mirror
+}
+
 set portfetch::mirror_sites::sites(openbsd) {
     http://mirror.roothell.org/pub/OpenBSD/
     http://www.mirrorservice.org/sites/ftp.openbsd.org/pub/OpenBSD/