pkg/34457: adjust MASTER_SITEs (patch included)

[j+nbsd%2006.salmi.ch@localhost]

>Number:         34457
>Category:       pkg
>Synopsis:       adjust MASTER_SITEs (patch included)
>Confidential:   no
>Severity:       non-critical
>Priority:       medium
>Responsible:    pkg-manager
>State:          open
>Class:          change-request
>Submitter-Id:   net
>Arrival-Date:   Sun Sep 03 10:10:00 +0000 2006
>Originator:     Jukka Salmi
>Release:        pkgsrc HEAD
>Environment:
n/a
>Description:
The mirror at `sunsite.cnlab-switch.ch' changed its
                hostname and domain to `mirror.switch.ch'. Furthermore (and 
according
                to ftp://mirror.switch.ch/mirror/linux/README.txt), the 
contents of
                `mirror/linux' are gone.
>How-To-Repeat:
n/a
>Fix:
Index: mk/defaults/mk.conf
===================================================================
RCS file: /cvsroot/pkgsrc/mk/defaults/mk.conf,v
retrieving revision 1.128
diff -u -p -r1.128 mk.conf
--- mk/defaults/mk.conf 10 Aug 2006 03:35:33 -0000      1.128
+++ mk/defaults/mk.conf 3 Sep 2006 08:12:01 -0000
@@ -1821,7 +1821,7 @@ XEN12_USE_COM2?=  NO
 #MASTER_SITE_CYGWIN=   ftp://mirror.switch.ch/mirror/cygwin/
 #MASTER_SITE_OPENOFFICE=ftp://mirror.switch.ch/mirror/OpenOffice/
 #MASTER_SITE_SUSE=     \
-#      
ftp://sunsite.cnlab-switch.ch/mirror/SuSE/suse/${MACHINE_ARCH}/${SUSE_VERSION}/suse/
+#      
ftp://mirror.switch.ch/mirror/SuSE/suse/${MACHINE_ARCH}/${SUSE_VERSION}/suse/
 
 # United Kingdom
 #
Index: mk/fetch/sites.mk
===================================================================
RCS file: /cvsroot/pkgsrc/mk/fetch/sites.mk,v
retrieving revision 1.8
diff -u -p -r1.8 sites.mk
--- mk/fetch/sites.mk   6 Aug 2006 04:56:50 -0000       1.8
+++ mk/fetch/sites.mk   3 Sep 2006 08:12:02 -0000
@@ -9,7 +9,7 @@ MASTER_SITE_XCONTRIB+=  \
        ftp://sunsite.doc.ic.ac.uk/sites/ftp.x.org/contrib/ \
        ftp://sunsite.sut.ac.jp/pub/archives/X11/contrib/ \
        ftp://sunsite.icm.edu.pl/pub/X11/contrib/ \
-       ftp://sunsite.cnlab-switch.ch/mirror/X11/contrib/ \
+       ftp://mirror.switch.ch/mirror/X11/contrib/ \
        ftp://ftp.cica.es/pub/X/contrib/ \
        ftp://ftp.unicamp.br/pub/X11/contrib/ \
        ftp://ftp.x.org/contrib/
@@ -76,7 +76,6 @@ MASTER_SITE_SUNSITE+=   \
        ftp://ftp.lip6.fr/pub/linux/sunsite/ \
        ftp://ftp.uni-stuttgart.de/pub/mirror/sunsite.unc.edu/pub/Linux/ \
        ftp://ftp.cs.tu-berlin.de/pub/linux/Mirrors/sunsite.unc.edu/ \
-       ftp://sunsite.cnlab-switch.ch/mirror/linux/sunsite/ \
        ftp://ftp.tuwien.ac.at/pub/linux/ibiblio/
 
 MASTER_SITE_GNOME+=     \
@@ -142,7 +141,7 @@ MASTER_SITE_SUSE+=  \
        
ftp://fr2.rpmfind.net/linux/SuSE-Linux/${MACHINE_ARCH}/update/${SUSE_VERSION}/ \
        ftp://ftp.duth.gr/pub/suse/suse/${MACHINE_ARCH}/${SUSE_VERSION}/suse/ \
        
ftp://ftp.kddlabs.co.jp/Linux/packages/SuSE/suse/${MACHINE_ARCH}/${SUSE_VERSION}/suse/
 \
-       
ftp://sunsite.cnlab-switch.ch/mirror/SuSE/suse/${MACHINE_ARCH}/${SUSE_VERSION}/suse/
 \
+       
ftp://mirror.switch.ch/mirror/SuSE/suse/${MACHINE_ARCH}/${SUSE_VERSION}/suse/ \
        
ftp://ftp.mirror.ac.uk/sites/ftp.suse.com/${MACHINE_ARCH}/${SUSE_VERSION}/suse/ 
\
        
ftp://mirror.mcs.anl.gov/pub/ftp.suse.com/${MACHINE_ARCH}/${SUSE_VERSION}/suse/