PR: misc/6031

Patch applied as per PR - enables preferential fetch from local mirrors

etc/defaults/make.conf

@@ -1,4 +1,4 @@
-# $Id: make.conf,v 1.62 1998/04/16 08:21:24 ache Exp $
+# $Id: make.conf,v 1.63 1998/05/08 20:15:39 phk Exp $
 #
 # This file, if present, will be read by make (see /usr/share/mk/sys.mk).
 # It allows you to override macro definitions to make without changing
@@ -127,13 +127,55 @@
 #FORCE_PKG_REGISTER=    YES
 #
 #
-# Port master sites.
+# Port mirror sites...
+#
+# If you have a ports distribution in one or more FTP sites closeby
+# (such as a mirror on your own lan) you can list them here. Sites listed here
+# will be checked after checking your cd rom but before any other
+# FTP site.
+#
+#LOCAL_SITE_LIST?=      ftp://ftp.my.domain.au/ \
+#                       ftp://ftp.my.friends.domain.au/
+#
+# Uncomment your nearest location for preferred official mirrors. These will be
+# checked after any local sites (set above) but before the default master sites.
+#
+#LOCALE?=	Argentina
+#LOCALE?=	Australia
+#LOCALE?=	Brazil
+#LOCALE?=	Canada
+#LOCALE?=	Czech Republic
+#LOCALE?=	Estonia
+#LOCALE?=	Finland
+#LOCALE?=	France
+#LOCALE?=	Germany
+#LOCALE?=	Holland
+#LOCALE?=	Hong Kong
+#LOCALE?=	Iceland
+#LOCALE?=	Ireland
+#LOCALE?=	Israel
+#LOCALE?=	Japan
+#LOCALE?=	Korea
+#LOCALE?=	Poland
+#LOCALE?=	Portugal
+#LOCALE?=	Russia
+#LOCALE?=	South Africa
+#LOCALE?=	Sweden
+#LOCALE?=	Taiwan
+#LOCALE?=	UK
+#LOCALE?=	USA
+#
+# Port master sites...
 #
 # If you want your port fetches to go somewhere else than the default
 # (specified below) in case the distfile/patchfile was not found,
 # uncomment this and change it to a location nearest you.  (Don't
 # remove the "/${DIST_SUBDIR}/" part.)
 #
+# This site will be checked as a last resort unless MASTER_SITE_OVERRIDE
+# is set (see below) in which case it is checked immediately after your
+# local and "locale" sites.
+#
 #MASTER_SITE_BACKUP?=	\
 #	ftp://ftp.freebsd.org/pub/FreeBSD/distfiles/${DIST_SUBDIR}/
 #

etc/make.conf

@@ -1,4 +1,4 @@
-# $Id: make.conf,v 1.62 1998/04/16 08:21:24 ache Exp $
+# $Id: make.conf,v 1.63 1998/05/08 20:15:39 phk Exp $
 #
 # This file, if present, will be read by make (see /usr/share/mk/sys.mk).
 # It allows you to override macro definitions to make without changing
@@ -127,13 +127,55 @@
 #FORCE_PKG_REGISTER=    YES
 #
 #
-# Port master sites.
+# Port mirror sites...
+#
+# If you have a ports distribution in one or more FTP sites closeby
+# (such as a mirror on your own lan) you can list them here. Sites listed here
+# will be checked after checking your cd rom but before any other
+# FTP site.
+#
+#LOCAL_SITE_LIST?=      ftp://ftp.my.domain.au/ \
+#                       ftp://ftp.my.friends.domain.au/
+#
+# Uncomment your nearest location for preferred official mirrors. These will be
+# checked after any local sites (set above) but before the default master sites.
+#
+#LOCALE?=	Argentina
+#LOCALE?=	Australia
+#LOCALE?=	Brazil
+#LOCALE?=	Canada
+#LOCALE?=	Czech Republic
+#LOCALE?=	Estonia
+#LOCALE?=	Finland
+#LOCALE?=	France
+#LOCALE?=	Germany
+#LOCALE?=	Holland
+#LOCALE?=	Hong Kong
+#LOCALE?=	Iceland
+#LOCALE?=	Ireland
+#LOCALE?=	Israel
+#LOCALE?=	Japan
+#LOCALE?=	Korea
+#LOCALE?=	Poland
+#LOCALE?=	Portugal
+#LOCALE?=	Russia
+#LOCALE?=	South Africa
+#LOCALE?=	Sweden
+#LOCALE?=	Taiwan
+#LOCALE?=	UK
+#LOCALE?=	USA
+#
+# Port master sites...
 #
 # If you want your port fetches to go somewhere else than the default
 # (specified below) in case the distfile/patchfile was not found,
 # uncomment this and change it to a location nearest you.  (Don't
 # remove the "/${DIST_SUBDIR}/" part.)
 #
+# This site will be checked as a last resort unless MASTER_SITE_OVERRIDE
+# is set (see below) in which case it is checked immediately after your
+# local and "locale" sites.
+#
 #MASTER_SITE_BACKUP?=	\
 #	ftp://ftp.freebsd.org/pub/FreeBSD/distfiles/${DIST_SUBDIR}/
 #

share/examples/etc/make.conf

@@ -1,4 +1,4 @@
-# $Id: make.conf,v 1.62 1998/04/16 08:21:24 ache Exp $
+# $Id: make.conf,v 1.63 1998/05/08 20:15:39 phk Exp $
 #
 # This file, if present, will be read by make (see /usr/share/mk/sys.mk).
 # It allows you to override macro definitions to make without changing
@@ -127,13 +127,55 @@
 #FORCE_PKG_REGISTER=    YES
 #
 #
-# Port master sites.
+# Port mirror sites...
+#
+# If you have a ports distribution in one or more FTP sites closeby
+# (such as a mirror on your own lan) you can list them here. Sites listed here
+# will be checked after checking your cd rom but before any other
+# FTP site.
+#
+#LOCAL_SITE_LIST?=      ftp://ftp.my.domain.au/ \
+#                       ftp://ftp.my.friends.domain.au/
+#
+# Uncomment your nearest location for preferred official mirrors. These will be
+# checked after any local sites (set above) but before the default master sites.
+#
+#LOCALE?=	Argentina
+#LOCALE?=	Australia
+#LOCALE?=	Brazil
+#LOCALE?=	Canada
+#LOCALE?=	Czech Republic
+#LOCALE?=	Estonia
+#LOCALE?=	Finland
+#LOCALE?=	France
+#LOCALE?=	Germany
+#LOCALE?=	Holland
+#LOCALE?=	Hong Kong
+#LOCALE?=	Iceland
+#LOCALE?=	Ireland
+#LOCALE?=	Israel
+#LOCALE?=	Japan
+#LOCALE?=	Korea
+#LOCALE?=	Poland
+#LOCALE?=	Portugal
+#LOCALE?=	Russia
+#LOCALE?=	South Africa
+#LOCALE?=	Sweden
+#LOCALE?=	Taiwan
+#LOCALE?=	UK
+#LOCALE?=	USA
+#
+# Port master sites...
 #
 # If you want your port fetches to go somewhere else than the default
 # (specified below) in case the distfile/patchfile was not found,
 # uncomment this and change it to a location nearest you.  (Don't
 # remove the "/${DIST_SUBDIR}/" part.)
 #
+# This site will be checked as a last resort unless MASTER_SITE_OVERRIDE
+# is set (see below) in which case it is checked immediately after your
+# local and "locale" sites.
+#
 #MASTER_SITE_BACKUP?=	\
 #	ftp://ftp.freebsd.org/pub/FreeBSD/distfiles/${DIST_SUBDIR}/
 #

share/mk/bsd.README

@@ -1,5 +1,5 @@
 #	@(#)bsd.README	8.2 (Berkeley) 4/2/94
-#	$Id$
+#	$Id: bsd.README,v 1.11 1997/03/09 15:51:07 wosch Exp $
 
 XXX This document is seriously out of date, it is currenly being revised.
 
@@ -87,6 +87,11 @@ environment or otherwise.  You probably don't want to touch this file.
 
 =-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=
 
+bsd.locale.mk - a list of location specific parameters (currently this is
+used to list official ports mirrors only)
+
+=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=
+
 The include file <bsd.man.mk> handles installing manual pages and their
 links.
 

share/mk/bsd.port.mk

@@ -1,7 +1,7 @@
 #-*- mode: Fundamental; tab-width: 4; -*-
 # ex:ts=4
 #
-#	$Id: bsd.port.mk,v 1.273 1998/03/24 03:34:51 asami Exp $
+#	$Id: bsd.port.mk,v 1.274 1998/05/04 04:01:26 steve Exp $
 #	$NetBSD: $
 #
 #	bsd.port.mk - 940820 Jordan K. Hubbard.
@@ -270,6 +270,8 @@ ARCH!=	uname -m
 # Get the operating system type
 OPSYS!=	uname -s
 
+.include <bsd.locale.mk>
+
 .if exists(${.CURDIR}/../Makefile.inc)
 .include "${.CURDIR}/../Makefile.inc"
 .endif
@@ -588,6 +590,11 @@ MASTER_SITE_KDE+=	\
 MASTER_SITES?=
 PATCH_SITES?=
 
+# If the user has this set, try it first
+.if defined(NEAR_SITE_LIST)
+MASTER_SITES:=  ${NEAR_SITE_LIST} ${MASTER_SITES}
+.endif
+
 # To avoid double-slashes
 MASTER_SITE_SUBDIR?=	.
 PATCH_SITE_SUBDIR?=	.