From owner-freebsd-ports  Mon Jul 10 19:44:43 1995
Return-Path: ports-owner
Received: (from majordom@localhost)
          by freefall.cdrom.com (8.6.10/8.6.6) id TAA01872
          for ports-outgoing; Mon, 10 Jul 1995 19:44:43 -0700
Received: from silvia.HIP.Berkeley.EDU (silvia.HIP.Berkeley.EDU [136.152.64.181])
          by freefall.cdrom.com (8.6.10/8.6.6) with ESMTP id TAA01865
          for <ports@freebsd.org>; Mon, 10 Jul 1995 19:44:36 -0700
Received: (from asami@localhost) by silvia.HIP.Berkeley.EDU (8.6.11/8.6.9) id TAA02025; Mon, 10 Jul 1995 19:44:26 -0700
Date: Mon, 10 Jul 1995 19:44:26 -0700
Message-Id: <199507110244.TAA02025@silvia.HIP.Berkeley.EDU>
To: mmead@Glock.COM
CC: ports@freebsd.org
In-reply-to: <199507072019.QAA09747@Glock.COM> (mmead@Glock.COM)
Subject: Re: diffs to make Makefiles do MASTER_SITES+=
From: asami@cs.berkeley.edu (Satoshi Asami)
Sender: ports-owner@freebsd.org
Precedence: bulk

 * 	I changed the MASTER_SITES= lines in all the Makefiles which use it
 * to MASTER_SITES+= so that when I want to have a package grabbed from a
 * closer mirror I can do it as such: make
 * MASTER_SITES="ftp://some.where/some/path" ... here's the context diffs for
 * the entire ports tree.

Wow thanks, that is a good idea but I don't know if it is really
necessary to patch all the Makefiles.  There is a hook called
"MASTER_SITE_OVERRIDE" already in bsd.port.mk to override the master
sites.

It used to just override the MASTER_SITES setting, I think we can
change it to put it in front of the original MASTER_SITES.  Try this
patch to /usr/share/mk/bsd.port.mk and

make MASTER_SITE_OVERRIDE=ftp://some.where/some/path

Tell me how it goes.  It should try this "some.where" first, and then
go to the MASTER_SITES in the ports Makefile only if it failed.
Thanks.

Satoshi
-------
diff -u -r1.171 bsd.port.mk
--- 1.171       1995/07/11 02:15:35
+++ bsd.port.mk 1995/07/11 02:27:35
@@ -313,8 +313,8 @@
 MASTER_SITES+= ftp://ftp.freebsd.org/pub/FreeBSD/distfiles/
 PATCH_SITES+=  ftp://ftp.freebsd.org/pub/FreeBSD/distfiles/${PATCH_PRFX}
 .else
-MASTER_SITES=  ${MASTER_SITE_OVERRIDE}
-PATCH_SITES=   ${MASTER_SITE_OVERRIDE}${PATCH_PRFX}
+MASTER_SITES:= ${MASTER_SITE_OVERRIDE} ${MASTER_SITES}
+PATCH_SITES:=  ${MASTER_SITE_OVERRIDE}${PATCH_PRFX} ${PATCH_SITES}
 .endif
 
 .if defined(PATCH_PRFX)