Pullup ticket 75 to the pkgsrc-2004Q2 branch, requested by Grant Beattie

sites changes to bsd.sites.mk

	Module Name:    pkgsrc
	Committed By:   wiz
	Date:           Fri Jun 25 16:16:51 UTC 2004

	Modified Files:
		pkgsrc/mk: bsd.sites.mk

	Log Message:
	Add switch and voxel sourceforge mirrors, and reenable aleron,
	since it is currently working.

and

	Module Name:    pkgsrc
	Committed By:   grant
	Date:           Sun Jun 27 16:16:11 UTC 2004

	Modified Files:
		pkgsrc/mk: bsd.sites.mk

	Log Message:
	s/planetmirror.com/public.planetmirror.com.au/ to help MASTER_SORT.

and

	Module Name:    pkgsrc
	Committed By:   gavan
	Date:           Sat Jul  3 12:35:04 UTC 2004

	Modified Files:
		pkgsrc/mk: bsd.sites.mk

	Log Message:
	Use http instead of ftp from ftp.fi.NetBSD.org. This provides at least
	one MASTER_SITE_BACKUP which is available by http, to be nice to people
	behind proxies or who have difficulty with ftp.

2 files changed, 9 insertions, 5 deletions

diff --git a/doc/CHANGES-pkgsrc-2004Q2 b/doc/CHANGES-pkgsrc-2004Q2
index 26744a08150..7ffe755addd 100644
--- a/doc/CHANGES-pkgsrc-2004Q2
+++ b/doc/CHANGES-pkgsrc-2004Q2
@@ -1,4 +1,4 @@
-$NetBSD: CHANGES-pkgsrc-2004Q2,v 1.1.2.38 2004/07/28 21:06:07 agc Exp $
+$NetBSD: CHANGES-pkgsrc-2004Q2,v 1.1.2.39 2004/07/29 21:31:00 agc Exp $
 
 Changes to the packages collection and infrastructure on the
 pkgsrc-2004Q2 branch:
@@ -72,4 +72,6 @@ Pullup ticket 73, requested by Grant Beattie [agc 2004-07-26]
 	Build fix for ghostscript-esp
 Pullup ticket 74, requested by Grant Beattie [agc 2004-07-28]
 	PLIST fix for fltk
+Pullup ticket 75, requested by Grant Beattie [agc 2004-07-29]
+	sites changes to bsd.sites.mk
 
diff --git a/mk/bsd.sites.mk b/mk/bsd.sites.mk
index 7f8da05ffef..c9133fc1c5a 100644
--- a/mk/bsd.sites.mk
+++ b/mk/bsd.sites.mk
@@ -1,4 +1,4 @@
-# $NetBSD: bsd.sites.mk,v 1.3 2004/06/15 13:05:10 grant Exp $
+# $NetBSD: bsd.sites.mk,v 1.3.2.1 2004/07/29 21:31:00 agc Exp $
 #
 # Default MASTER_SITES
 
@@ -117,6 +117,7 @@ MASTER_SITE_GNOME+=     \
 	ftp://ftp.mirror.ac.uk/sites/ftp.gnome.org/pub/GNOME/
 
 MASTER_SITE_SOURCEFORGE+=	\
+	http://aleron.dl.sourceforge.net/sourceforge/ \
 	http://belnet.dl.sourceforge.net/sourceforge/ \
 	http://cesnet.dl.sourceforge.net/sourceforge/ \
 	http://easynews.dl.sourceforge.net/sourceforge/ \
@@ -124,14 +125,15 @@ MASTER_SITE_SOURCEFORGE+=	\
 	http://keihanna.dl.sourceforge.net/sourceforge/ \
 	http://osdn.dl.sourceforge.net/sourceforge/ \
 	http://optusnet.dl.sourceforge.net/sourceforge/ \
+	http://switch.dl.sourceforge.net/sourceforge/ \
 	http://telia.dl.sourceforge.net/sourceforge/ \
 	http://twtelecom.dl.sourceforge.net/sourceforge/ \
 	http://umn.dl.sourceforge.net/sourceforge/ \
 	http://unc.dl.sourceforge.net/sourceforge/ \
+	http://voxel.dl.sourceforge.net/sourceforge/ \
 	ftp://ftp3.sourceforge.net/pub/sourceforge/ \
 	ftp://ftp.tuwien.ac.at/linux/sourceforge/
 #	http://flow.dl.sourceforge.net/sourceforge/
-#	http://aleron.dl.sourceforge.net/sourceforge/
 
 MASTER_SITE_SUSE+=	\
 	http://altruistic.lbl.gov/mirrors/suse/${MACHINE_ARCH}/${SUSE_VERSION}/suse/ \
@@ -285,7 +287,7 @@ MASTER_SITE_OPENOFFICE+=	\
 	ftp://ftp.ksu.edu.tr/pub/OpenOffice/ \
 	ftp://ftp.mirror.ac.uk/sites/ny1.mirror.openoffice.org/ \
 	http://mirror.pacific.net.au/openoffice/ \
-	http://planetmirror.com/pub/openoffice/ \
+	http://public.planetmirror.com.au/pub/openoffice/ \
 	http://komo.vlsm.org/openoffice/ \
 	ftp://ftp.kddlabs.co.jp/office/openoffice/ \
 	ftp://ftp.ring.gr.jp/pub/misc/openoffice/ \
@@ -295,7 +297,7 @@ MASTER_SITE_OPENOFFICE+=	\
  
 # The primary backup site. 
 MASTER_SITE_BACKUP?=	\
-	ftp://ftp.fi.NetBSD.org/pub/NetBSD/packages/distfiles/ \
+	http://ftp.fi.NetBSD.org/pub/NetBSD/packages/distfiles/ \
 	ftp://ftp.cz.NetBSD.org/pub/NetBSD/packages/distfiles/ \
 	ftp://ftp.NetBSD.org/pub/NetBSD/packages/distfiles/ \
 	ftp://ftp.FreeBSD.org/pub/FreeBSD/distfiles/