From owner-freebsd-bugs Mon Mar 16 02:50:04 1998 Return-Path: Received: (from majordom@localhost) by hub.freebsd.org (8.8.8/8.8.8) id CAA11263 for freebsd-bugs-outgoing; Mon, 16 Mar 1998 02:50:04 -0800 (PST) (envelope-from owner-freebsd-bugs@FreeBSD.ORG) Received: (from gnats@localhost) by hub.freebsd.org (8.8.8/8.8.8) id CAA11229; Mon, 16 Mar 1998 02:50:02 -0800 (PST) (envelope-from gnats) Received: from dana.clari.net.au (dana.clari.net.au [203.27.85.21]) by hub.freebsd.org (8.8.8/8.8.8) with ESMTP id CAA10940 for ; Mon, 16 Mar 1998 02:46:41 -0800 (PST) (envelope-from peter@dana.clari.net.au) Received: (from peter@localhost) by dana.clari.net.au (8.8.7/8.8.7) id VAA22551; Mon, 16 Mar 1998 21:46:29 +1100 (EST) (envelope-from peter) Message-Id: <199803161046.VAA22551@dana.clari.net.au> Date: Mon, 16 Mar 1998 21:46:29 +1100 (EST) From: Peter Hawkins Reply-To: peter@dana.clari.net.au To: FreeBSD-gnats-submit@FreeBSD.ORG X-Send-Pr-Version: 3.2 Subject: misc/6031: mk enhancements Sender: owner-freebsd-bugs@FreeBSD.ORG Precedence: bulk X-Loop: FreeBSD.org >Number: 6031 >Category: misc >Synopsis: ports.mk doesn't prefer local sites outside USA >Confidential: no >Severity: non-critical >Priority: medium >Responsible: freebsd-bugs >State: open >Quarter: >Keywords: >Date-Required: >Class: change-request >Submitter-Id: current-users >Arrival-Date: Mon Mar 16 02:50:01 PST 1998 >Last-Modified: >Originator: Peter Hawkins >Organization: Clarinet Internet >Release: FreeBSD 2.2.5-RELEASE i386 >Environment: >Description: A change in the standard mk includes is required to tune it for locality. While we're at it, we can set the USA_RESIDENT variable for DES and we can cause ports to be downloaded from nearby mirrors by default. A further enhancement enables those of us with our own FTP sites or mirrors, or a lan to configure a set of preferred servers. >How-To-Repeat: N/A >Fix: Apply the following patch: diff -u -P mk.orig/bsd.README mk/bsd.README --- mk.orig/bsd.README Sat Mar 7 18:47:48 1998 +++ mk/bsd.README Sat Mar 7 18:33:25 1998 @@ -69,6 +69,11 @@ =-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-= +locale.mk tunes the rules for your location. You should set the variables +in it appropriately. + +=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-= + The include file handles installing manual pages and their links. diff -u -P mk.orig/bsd.port.mk mk/bsd.port.mk --- mk.orig/bsd.port.mk Sat Mar 7 18:47:48 1998 +++ mk/bsd.port.mk Sat Mar 7 18:32:06 1998 @@ -265,6 +265,8 @@ # Get the operating system type OPSYS!= uname -s +.include + .if exists(${.CURDIR}/../Makefile.inc) .include "${.CURDIR}/../Makefile.inc" .endif @@ -564,6 +566,11 @@ # Empty declaration to avoid "variable MASTER_SITES recursive" error 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 # Substitute subdirectory names MASTER_SITES:= ${MASTER_SITES:S/%SUBDIR%/${MASTER_SITE_SUBDIR}/} diff -u -P mk.orig/locale.mk mk/locale.mk --- mk.orig/locale.mk Thu Jan 1 10:00:00 1970 +++ mk/locale.mk Sat Mar 7 18:46:29 1998 @@ -0,0 +1,163 @@ +# locale.mk peter@clari.net.au 7/3/98 +# +# location-specific settings +# + + + +# if you have a ports distribution in one or more FTP sites closeby +# (such as on your own lan) you can list them here + +#LOCAL_SITE_LIST?= ftp://ftp.my.domain.au/ \ +# ftp://ftp.my.friends.domain.au/ + +# blank by default +LOCAL_SITE_LIST?= + +# define this to be your nearest location (see below for available options) +LOCALE?= USA + +# Can we legally obtain DES from a US ftp site? USA citizens should change +# this. (For safety, assume NO here) +USA_RESIDENT?= NO +#USA_RESIDENT?= YES + + + + + +#--------------------- no need to modify below here -------------------- +# + +.if ${LOCALE} == "Argentina" +NEAR_SITE_LIST?= ${LOCAL_SITE_LIST} \ + ftp://ftp.ar.freebsd.org/pub/FreeBSD/ + +.elif ${LOCALE} == "Australia" +NEAR_SITE_LIST?= ${LOCAL_SITE_LIST} \ + ftp://ftp.au.freebsd.org/pub/FreeBSD/ \ + ftp://ftp2.au.freebsd.org/pub/FreeBSD/ \ + ftp://ftp3.au.freebsd.org/pub/FreeBSD/ \ + ftp://ftp4.au.freebsd.org/pub/FreeBSD/ \ + ftp://ftp5.au.freebsd.org/pub/FreeBSD/ + +.elif ${LOCALE} == "Brazil" +NEAR_SITE_LIST?= ${LOCAL_SITE_LIST} \ + ftp://ftp.br.freebsd.org/pub/FreeBSD/ \ + ftp://ftp2.br.freebsd.org/pub/FreeBSD/ \ + ftp://ftp3.br.freebsd.org/pub/FreeBSD/ \ + ftp://ftp4.br.freebsd.org/pub/FreeBSD/ \ + ftp://ftp5.br.freebsd.org/pub/FreeBSD/ \ + ftp://ftp6.br.freebsd.org/pub/FreeBSD/ \ + ftp://ftp7.br.freebsd.org/pub/FreeBSD/ + +.elif ${LOCALE} == "Canada" +NEAR_SITE_LIST?= ${LOCAL_SITE_LIST} \ + ftp://ftp.ca.freebsd.org/pub/FreeBSD/ + +.elif ${LOCALE} == "Czech Republic" +NEAR_SITE_LIST?= ${LOCAL_SITE_LIST} \ + ftp://ftp.cz.freebsd.org/pub/FreeBSD/ + +.elif ${LOCALE} == "Estonia" +NEAR_SITE_LIST?= ${LOCAL_SITE_LIST} \ + ftp://ftp.ee.freebsd.org/pub/FreeBSD/ + +.elif ${LOCALE} == "Finland" +NEAR_SITE_LIST?= ${LOCAL_SITE_LIST} \ + ftp://ftp.fi.freebsd.org/pub/FreeBSD/ + +.elif ${LOCALE} == "France" +NEAR_SITE_LIST?= ${LOCAL_SITE_LIST} \ + ftp://ftp2.fr.freebsd.org/pub/FreeBSD/ \ + ftp://ftp.fr.freebsd.org/pub/FreeBSD/ + +.elif ${LOCALE} == "Germany" +NEAR_SITE_LIST?= ${LOCAL_SITE_LIST} \ + ftp://ftp.de.freebsd.org/pub/FreeBSD/ \ + ftp://ftp2.de.freebsd.org/pub/FreeBSD/ \ + ftp://ftp3.de.freebsd.org/pub/FreeBSD/ \ + ftp://ftp4.de.freebsd.org/pub/FreeBSD/ \ + ftp://ftp5.de.freebsd.org/pub/FreeBSD/ \ + ftp://ftp6.de.freebsd.org/pub/FreeBSD/ \ + ftp://ftp7.de.freebsd.org/pub/FreeBSD/ + +.elif ${LOCALE} == "Holland" +NEAR_SITE_LIST?= ${LOCAL_SITE_LIST} \ + ftp://ftp.nl.freebsd.org/pub/FreeBSD/ + +.elif ${LOCALE} == "Hong Kong" +NEAR_SITE_LIST?= ${LOCAL_SITE_LIST} \ + ftp://ftp.hk.super.net/pub/FreeBSD/ + +.elif ${LOCALE} == "Iceland" +NEAR_SITE_LIST?= ${LOCAL_SITE_LIST} \ + ftp://ftp.is.freebsd.org/pub/FreeBSD/ + +.elif ${LOCALE} == "Ireland" +NEAR_SITE_LIST?= ${LOCAL_SITE_LIST} \ + ftp://ftp.ie.freebsd.org/pub/FreeBSD/ + +.elif ${LOCALE} == "Israel" +NEAR_SITE_LIST?= ${LOCAL_SITE_LIST} \ + ftp://ftp.il.freebsd.org/pub/FreeBSD/ \ + ftp://ftp2.il.freebsd.org/pub/FreeBSD/ + +.elif ${LOCALE} == "Japan" +NEAR_SITE_LIST?= ${LOCAL_SITE_LIST} \ + ftp://ftp.jp.freebsd.org/pub/FreeBSD/ \ + ftp://ftp2.jp.freebsd.org/pub/FreeBSD/ \ + ftp://ftp3.jp.freebsd.org/pub/FreeBSD/ \ + ftp://ftp4.jp.freebsd.org/pub/FreeBSD/ \ + ftp://ftp5.jp.freebsd.org/pub/FreeBSD/ \ + ftp://ftp6.jp.freebsd.org/pub/FreeBSD/ + +.elif ${LOCALE} == "Korea" +NEAR_SITE_LIST?= ${LOCAL_SITE_LIST} \ + ftp://ftp.kr.freebsd.org/pub/FreeBSD/ \ + ftp://ftp2.kr.freebsd.org/pub/FreeBSD/ + +.elif ${LOCALE} == "Poland" +NEAR_SITE_LIST?= ${LOCAL_SITE_LIST} \ + ftp://ftp.pl.freebsd.org/pub/FreeBSD/ + +.elif ${LOCALE} == "Portugal" +NEAR_SITE_LIST?= ${LOCAL_SITE_LIST} \ + ftp://ftp.pt.freebsd.org/pub/misc/FreeBSD/ \ + ftp://ftp2.pt.freebsd.org/pub/FreeBSD/ + +.elif ${LOCALE} == "Russia" +NEAR_SITE_LIST?= ${LOCAL_SITE_LIST} \ + ftp://ftp.ru.freebsd.org/pub/FreeBSD/ \ + ftp://ftp2.ru.freebsd.org/pub/FreeBSD/ \ + ftp://ftp3.ru.freebsd.org/pub/FreeBSD/ + +.elif ${LOCALE} == "South Africa" +NEAR_SITE_LIST?= ${LOCAL_SITE_LIST} \ + ftp://ftp.za.freebsd.org/pub/FreeBSD/ \ + ftp://ftp2.za.freebsd.org/pub/FreeBSD/ \ + ftp://ftp3.za.freebsd.org/pub/FreeBSD/ \ + ftp://ftp4.za.freebsd.org/pub/FreeBSD/ + +.elif ${LOCALE} == "Sweden" +NEAR_SITE_LIST?= ${LOCAL_SITE_LIST} \ + ftp://ftp.se.freebsd.org/pub/FreeBSD/ \ + ftp://ftp2.se.freebsd.org/pub/FreeBSD/ \ + ftp://ftp3.se.freebsd.org/pub/FreeBSD/ + +.elif ${LOCALE} == "Taiwan" +NEAR_SITE_LIST?= ${LOCAL_SITE_LIST} \ + ftp://ftp.tw.freebsd.org/pub/FreeBSD \ + ftp://ftp2.tw.freebsd.org/pub/FreeBSD \ + ftp://ftp3.tw.freebsd.org/pub/FreeBSD/ + +.elif ${LOCALE} == "UK" +NEAR_SITE_LIST?= ${LOCAL_SITE_LIST} \ + ftp://ftp.uk.freebsd.org/pub/FreeBSD/ \ + ftp://ftp2.uk.freebsd.org/pub/FreeBSD/ \ + ftp://ftp3.uk.freebsd.org/pub/FreeBSD/ \ + ftp://ftp4.uk.freebsd.org/pub/FreeBSD/ + +.elif ${LOCALE} == "USA" +# master sites in usa are included by default +.endif >Audit-Trail: >Unformatted: To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe freebsd-bugs" in the body of the message