Complete back-out of the bsd.locale.mk change.

OK'd by:	asami
This commit is contained in:
Jordan K. Hubbard 1998-05-20 22:27:18 +00:00
parent 4b33025b1b
commit 1c43d7e198
4 changed files with 3 additions and 157 deletions

View File

@ -3,9 +3,9 @@
FILES= bsd.README
FILES+= bsd.dep.mk bsd.doc.mk bsd.info.mk bsd.kern.mk bsd.kmod.mk
FILES+= bsd.lib.mk bsd.libnames.mk bsd.locale.mk bsd.man.mk bsd.obj.mk
FILES+= bsd.own.mk bsd.port.mk bsd.port.subdir.mk bsd.prog.mk bsd.sgml.mk
FILES+= bsd.subdir.mk sys.mk
FILES+= bsd.lib.mk bsd.libnames.mk bsd.man.mk bsd.obj.mk bsd.own.mk
FILES+= bsd.port.mk bsd.port.subdir.mk bsd.prog.mk bsd.sgml.mk bsd.subdir.mk
FILES+= sys.mk
NOOBJ= noobj
all clean cleandir depend lint tags:

View File

@ -87,11 +87,6 @@ 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.

View File

@ -1,142 +0,0 @@
# locale.mk peter@clari.net.au 7/3/98
#
# location-specific settings
#
# $Id$
.if !defined(LOCALE)
LOCALE= USA
.endif
.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

View File

@ -270,8 +270,6 @@ 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
@ -590,11 +588,6 @@ 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?= .