planetmirror -> http (the ftp server has a 250 user limit), use

`planetmirror.com.au' to help MASTER_SORT and add planetmirror to a
few MASTER_SITES.

2 files changed, 15 insertions, 12 deletions

diff --git a/mk/bsd.pkg.defaults.mk b/mk/bsd.pkg.defaults.mk
index c77ded10f15..fc6e8c44c5d 100644
--- a/mk/bsd.pkg.defaults.mk
+++ b/mk/bsd.pkg.defaults.mk
@@ -1,4 +1,4 @@
-# $NetBSD: bsd.pkg.defaults.mk,v 1.138 2003/04/03 22:47:42 rh Exp $
+# $NetBSD: bsd.pkg.defaults.mk,v 1.139 2003/04/10 20:32:29 grant Exp $
 #
 
 # A file providing defaults for pkgsrc and the packages collection.
@@ -1786,16 +1786,16 @@ XCHAT_USE_SSL?=	YES
 
 # Australia.
 #
-#MASTER_SITE_GNOME=	ftp://www.planetmirror.com.au/pub/GNOME/
-#MASTER_SITE_GNU=	ftp://www.planetmirror.com.au/pub/gnu/
-#MASTER_SITE_MOZILLA=	ftp://www.planetmirror.com.au/pub/mozilla/releases/
-#MASTER_SITE_PERL_CPAN=	ftp://www.planetmirror.com.au/pub/perl/CPAN/modules/by-module/
-#MASTER_SITE_SUNSITE=	ftp://www.planetmirror.com.au/pub/sunsite/
-#MASTER_SITE_SUSE=	ftp://www.planetmirror.com.au/pub/suse/${MACHINE_ARCH}/${SUSE_VERSION}/suse/ 
-#MASTER_SITE_TEX_CTAN=	ftp://www.planetmirror.com.au/pub/tex-archive/
+#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_PERL_CPAN=	http://public.planetmirror.com.au/pub/perl/CPAN/modules/by-module/
+#MASTER_SITE_SUNSITE=	http://public.planetmirror.com.au/pub/sunsite/
+#MASTER_SITE_SUSE=	http://public.planetmirror.com.au/pub/suse/${MACHINE_ARCH}/${SUSE_VERSION}/suse/ 
+#MASTER_SITE_TEX_CTAN=	http://public.planetmirror.com.au/pub/tex-archive/
 #MASTER_SITE_SOURCEFORGE=http://flow.dl.sourceforge.net/sourceforge/ \
-#			ftp://www.planetmirror.com.au/pub/sourceforge/
-#MASTER_SITE_XCONTRIB=	ftp://www.planetmirror.com.au/pub/X11/contrib/
+#			http://public.planetmirror.com.au/pub/sourceforge/
+#MASTER_SITE_XCONTRIB=	http://public.planetmirror.com.au/pub/X11/contrib/
 #MASTER_SITE_XEMACS=	ftp://ftp.au.xemacs.org/pub/xemacs/
 #MASTER_SITE_BACKUP=	ftp://ftp.au.netbsd.org/pub/NetBSD/packages/distfiles/ \
 #			ftp://ftp.netbsd.org/pub/NetBSD/packages/distfiles/
diff --git a/mk/bsd.pkg.mk b/mk/bsd.pkg.mk
index b9d93615888..017d311c2df 100644
--- a/mk/bsd.pkg.mk
+++ b/mk/bsd.pkg.mk
@@ -1,4 +1,4 @@
-#	$NetBSD: bsd.pkg.mk,v 1.1163 2003/04/10 20:29:08 grant Exp $
+#	$NetBSD: bsd.pkg.mk,v 1.1164 2003/04/10 20:32:28 grant Exp $
 #
 # This file is in the public domain.
 #
@@ -747,7 +747,7 @@ MASTER_SITE_GNU+=	\
 
 MASTER_SITE_GNUSTEP+=	\
 	ftp://ftp.gnustep.org/pub/gnustep/ \
-	ftp://ftp.planetmirror.com/pub/gnustep/gnustep/ \
+	http://public.planetmirror.com.au/pub/gnustep/gnustep/ \
 	http://www.peanuts.org/peanuts/Mirrors/GNUstep/gnustep/ \
 	ftp://archive.progeny.com/gnustep/ \
 	http://archive.progeny.com/gnustep/ \
@@ -852,6 +852,7 @@ MASTER_SITE_MOZILLA+=	\
 	ftp://sunsite.auc.dk/pub/mozilla/ \
 	ftp://ftp.funet.fi/pub/mirrors/ftp.mozilla.org/pub/ \
 	ftp://ftp.sunsite.kth.se/archive/www/ftp.mozilla.org/ \
+	http://public.planetmirror.com.au/pub/mozilla/releases/ \
 	ftp://ftp2.sinica.edu.tw/pub3/www/mozilla/ \
 	ftp://ftp.is.co.za/networking/info-service/www/clients/netscape/mozilla/ \
 	ftp://ftp.rediris.es/mirror/mozilla/ \
@@ -863,6 +864,7 @@ MASTER_SITE_XEMACS+=	\
 	ftp://ftp.jaist.ac.jp/pub/GNU/xemacs/ \
 	ftp://ftp.pasteur.fr/pub/computing/xemacs/ \
 	ftp://ftp.tu-darmstadt.de/pub/editors/xemacs/ \
+	http://public.planetmirror.com.au/pub/xemacs/ \
 	ftp://mirror.aarnet.edu.au/pub/xemacs/ \
 	ftp://mirror.cict.fr/xemacs/ \
 	ftp://mirror.nucba.ac.jp/mirror/xemacs/ \
@@ -886,6 +888,7 @@ MASTER_SITE_APACHE+=	\
 	http://www.tux.org/pub/net/apache/dist/ \
 	http://apache.secsup.org/dist/ \
 	http://ftp.epix.net/apache/ \
+	http://public.planetmirror.com.au/pub/apache/dist/ \
 	ftp://ftp.rge.com/pub/infosystems/apache/ \
 	ftp://ftp.epix.net/pub/apache/ \
 	ftp://ftp.ccs.neu.edu/net/mirrors/Apache/dist/ \