Change MOZILLA master sites difinitions, related to PR 37379.

There are three types Mozilla mirrors.
(http://www.mozilla.org/mirroring.html)
 * mozilla-current
        contains only the current version of Firefox and Thunderbird
 * mozilla-release
        contains Firefox, Thunderbird, and Sunbird releases
 * mozilla-all
        complete archive

Define following variables for mozilla master sites:
        MASTER_SITE_MOZILLA_ALL = mozilla-all
        MASTER_SITE_MOZILLA     = mozilla-release
and change some packages to use appropriate variable.

Update contents of MASTER_SITE_MOZILLA with master and primary mirrors
taken from http://www.mozilla.org/mirrors.html and add some sample definitions.

2 files changed, 31 insertions, 8 deletions

diff --git a/mk/defaults/mk.conf b/mk/defaults/mk.conf
index a9bbbe0c9ce..2e6a82947e3 100644
--- a/mk/defaults/mk.conf
+++ b/mk/defaults/mk.conf
@@ -1,4 +1,4 @@
-# $NetBSD: mk.conf,v 1.167 2007/12/05 21:38:06 tron Exp $
+# $NetBSD: mk.conf,v 1.168 2007/12/22 07:22:06 obache Exp $
 #
 
 # This file provides default values for variables that may be overridden
@@ -1854,7 +1854,7 @@ XEN12_USE_COM2?=	NO
 #MASTER_SITE_CYGWIN=	http://planetmirror.com/pub/sourceware/cygwin/
 #MASTER_SITE_GNOME=	http://public.planetmirror.com.au/pub/gnome/
 #MASTER_SITE_GNU=	http://public.planetmirror.com.au/pub/gnu/
-#MASTER_SITE_MOZILLA=	http://public.planetmirror.com.au/pub/mozilla/releases/
+#MASTER_SITE_MOZILLA=	http://mozilla.mirror.pacific.net.au/
 #MASTER_SITE_PERL_CPAN=	ftp://mirror.aarnet.edu.au/pub/cpan/modules/by-module/ \
 #			http://public.planetmirror.com.au/pub/perl/cpan/modules/by-module/
 #MASTER_SITE_OPENOFFICE=http://openoffice.mirrors.ilisys.com.au/ \
@@ -1899,6 +1899,7 @@ XEN12_USE_COM2?=	NO
 #MASTER_SITE_CYGWIN=	ftp://ftp.funet.fi/pub/mirrors/cygwin.com/pub/cygwin/
 #MASTER_SITE_XCONTRIB=	ftp://ftp.funet.fi/pub/X11/contrib/
 #MASTER_SITE_GNU= 	ftp://ftp.funet.fi/pub/gnu/gnu/
+#MASTER_SITE_MOZILLA=	ftp://ftp.funet.fi/pub/mirrors/ftp.mozilla.org/
 #MASTER_SITE_PERL_CPAN=	\
 #	ftp://ftp.funet.fi/pub/languages/perl/CPAN/modules/by-module/
 #MASTER_SITE_OPENOFFICE=ftp://ftp.funet.fi/pub/mirrors/openoffice.org/
@@ -1931,7 +1932,7 @@ XEN12_USE_COM2?=	NO
 #MASTER_SITE_CYGWIN=	ftp://ftp.t.ring.gr.jp/archives/pc/gnu-win32/
 #MASTER_SITE_GNOME=	ftp://ftp.t.ring.gr.jp/pub/X/gnome/
 #MASTER_SITE_GNU=	ftp://ftp.t.ring.gr.jp/pub/GNU/
-#MASTER_SITE_MOZILLA=	ftp://ftp.t.ring.gr.jp/pub/net/www/mozilla/mozilla/releases/
+#MASTER_SITE_MOZILLA=	ftp://ftp.t.ring.gr.jp/pub/net/www/mozilla/
 #MASTER_SITE_PERL_CPAN=	ftp://ftp.t.ring.gr.jp/pub/lang/perl/CPAN/modules/by-module/
 #MASTER_SITE_OPENOFFICE=ftp://ftp.kddlabs.co.jp/office/openoffice/ \
 #			ftp://ftp.t.ring.gr.jp/pub/misc/openoffice/
@@ -1947,6 +1948,7 @@ XEN12_USE_COM2?=	NO
 
 # Switzerland
 #
+#MASTER_SITE_MOZILLA=	ftp://mirror.switch.ch/mirror/mozilla/
 #MASTER_SITE_CYGWIN=	ftp://mirror.switch.ch/mirror/cygwin/
 #MASTER_SITE_OPENOFFICE=ftp://mirror.switch.ch/mirror/OpenOffice/
 #MASTER_SITE_SUSE=	\
@@ -1956,6 +1958,7 @@ XEN12_USE_COM2?=	NO
 #
 #MASTER_SITE_CYGWIN=	ftp://ftp.mirror.ac.uk/sites/sources.redhat.com/ftp/cygwin/
 #MASTER_SITE_GNU=	ftp://sunsite.org.uk/packages/gnu/
+#MASTER_SITE_MOZILLA=	ftp://ftp.mirrorservice.org/sites/ftp.mozilla.org/pub/mozilla.org/
 #MASTER_SITE_PERL_CPAN=	ftp://sunsite.org.uk/packages/perl/CPAN/modules/by-module/
 #MASTER_SITE_OPENOFFICE=ftp://ftp.mirror.ac.uk/sites/ny1.mirror.openoffice.org/
 #MASTER_SITE_TEX_CTAN=	ftp://sunsite.org.uk/packages/tex/uk-tex/
diff --git a/mk/fetch/sites.mk b/mk/fetch/sites.mk
index 2de381a628c..6c624228549 100644
--- a/mk/fetch/sites.mk
+++ b/mk/fetch/sites.mk
@@ -1,4 +1,4 @@
-# $NetBSD: sites.mk,v 1.34 2007/12/11 19:55:06 heinz Exp $
+# $NetBSD: sites.mk,v 1.35 2007/12/22 07:22:04 obache Exp $
 #
 # This Makefile fragment defines read-only MASTER_SITE_* variables
 # representing some well-known master distribution sites for software.
@@ -125,12 +125,32 @@ MASTER_SITE_SUSE+=	\
 	ftp://fr.rpmfind.net/linux/SuSE-Linux/${MACHINE_ARCH}/update/${SUSE_VERSION}/ \
 	ftp://fr2.rpmfind.net/linux/SuSE-Linux/${MACHINE_ARCH}/update/${SUSE_VERSION}/
 
-MASTER_SITE_MOZILLA+=   \
+MASTER_SITE_MOZILLA_ALL+=   \
 	http://ftp.mozilla.org/pub/mozilla.org/ \
 	ftp://ftp.mozilla.org/pub/mozilla.org/ \
-	ftp://ftp.fu-berlin.de/unix/network/www/ \
-	ftp://ftp.funet.fi/pub/mirrors/ftp.mozilla.org/ \
-	ftp://ftp.chg.ru/pub/WWW/mozilla/
+	ftp://ftp.belnet.be/mirror/ftp.mozilla.org/
+
+MASTER_SITE_MOZILLA+=	\
+	http://ftp.mozilla.org/pub/mozilla.org/ \
+	ftp://ftp.mozilla.org/pub/mozilla.org/ \
+	http://releases.mozilla.org/pub/mozilla.org/ \
+	ftp://releases.mozilla.org/pub/mozilla.org/ \
+	http://mozilla.isc.org/pub/mozilla.org/ \
+	ftp://mozilla.isc.org/pub/mozilla.org/ \
+	http://mozilla.ussg.indiana.edu/pub/mozilla.org/ \
+	ftp://mozilla.ussg.indiana.edu/pub/mozilla.org/ \
+	http://mozilla.osuosl.org/pub/mozilla.org/ \
+	ftp://ftp.osuosl.org/pub/mozilla.org/ \
+	http://mozilla.cs.utah.edu/pub/mozilla.org/ \
+	ftp://mozilla.cs.utah.edu/pub/mozilla.org/ \
+	http://mozilla.mirrors.tds.net/pub/mozilla.org/ \
+	ftp://mozilla.mirrors.tds.net/pub/mozilla.org/ \
+	ftp://ftp.scarlet.be/pub/mozilla.org/ \
+	http://ftp.scarlet.be/pub/mozilla.org/ \
+	ftp://ftp.uni-erlangen.de/pub/mozilla.org/ \
+	http://ftp.uni-erlangen.de/pub/mozilla.org/ \
+	http://sunsite.rediris.es/pub/mozilla.org/ \
+	ftp://sunsite.rediris.es/pub/mozilla.org/
 
 MASTER_SITE_XEMACS+=    \
 	ftp://ftp.xemacs.org/pub/xemacs/ \