3 files changed, 32 insertions, 43 deletions

diff --git a/Mk/bsd.kde.mk b/Mk/bsd.kde.mk
index 5ee5ee159d8d..db0640bc0f53 100644
--- a/Mk/bsd.kde.mk
+++ b/Mk/bsd.kde.mk
@@ -104,7 +104,7 @@ CONFIGURE_ENV+=	MOC="${MOC}" CPPFLAGS="${CPPFLAGS} ${QTCPPFLAGS}" LIBS="${QTCFGL
 
 # Yeah, it's namespace pollution, but this is really the best place for this
 # stuff. Arts does NOT use it anymore.
-KDE_VERSION=		3.5.6
+KDE_VERSION=		3.5.7
 KDE_ORIGVER=	${KDE_VERSION}
 KDE_PREFIX?=	${LOCALBASE}
 
diff --git a/Mk/bsd.kde4.mk b/Mk/bsd.kde4.mk
index 5ee5ee159d8d..db0640bc0f53 100644
--- a/Mk/bsd.kde4.mk
+++ b/Mk/bsd.kde4.mk
@@ -104,7 +104,7 @@ CONFIGURE_ENV+=	MOC="${MOC}" CPPFLAGS="${CPPFLAGS} ${QTCPPFLAGS}" LIBS="${QTCFGL
 
 # Yeah, it's namespace pollution, but this is really the best place for this
 # stuff. Arts does NOT use it anymore.
-KDE_VERSION=		3.5.6
+KDE_VERSION=		3.5.7
 KDE_ORIGVER=	${KDE_VERSION}
 KDE_PREFIX?=	${LOCALBASE}
 
diff --git a/Mk/bsd.sites.mk b/Mk/bsd.sites.mk
index 9c7730618896..44219671ec93 100644
--- a/Mk/bsd.sites.mk
+++ b/Mk/bsd.sites.mk
@@ -641,102 +641,91 @@ MASTER_SITE_ISC+=	\
 
 .if !defined(IGNORE_MASTER_SITE_KDE)
 MASTER_SITE_KDE+=	\
+	ftp://ftp.kde.org/pub/kde/%SUBDIR%/ \
 	http://ftp.scarlet.be/pub/kde/%SUBDIR%/ \
 	http://mirrors.isc.org/pub/kde/%SUBDIR%/ \
 	ftp://ftp.gtlib.cc.gatech.edu/pub/kde/%SUBDIR%/ \
+	ftp://ftp.informatik.hu-berlin.de/pub/Mirrors/ftp.kde.org/%SUBDIR%/ \
 	http://ftp.gtlib.cc.gatech.edu/pub/kde/%SUBDIR%/ \
 	ftp://ftp.oregonstate.edu/pub/kde/%SUBDIR%/ \
-	ftp://ftp.eu.uu.net/pub/kde/%SUBDIR%/ \
-	ftp://ftp.tiscali.nl/pub/mirrors/kde/%SUBDIR%/ \
-	http://ftp.tiscali.nl/kde/%SUBDIR%/ \
-	ftp://ftp.du.se/pub/mirrors/kde/%SUBDIR%/ \
-	http://ftp.du.se/pub/mirrors/kde/%SUBDIR%/ \
 	ftp://ftp.solnet.ch/mirror/KDE/%SUBDIR%/ \
-	ftp://sunsite.informatik.rwth-aachen.de/pub/Linux/kde/%SUBDIR%/ \
-	http://ftp-stud.fht-esslingen.de/Mirrors/ftp.kde.org/pub/kde/%SUBDIR%/ \
-	http://ftp.gwdg.de/pub/x11/kde/%SUBDIR%/ \
-	http://kde.mirrors.hoobly.com/%SUBDIR%/ \
-	ftp://ftp.informatik.uni-hamburg.de/pub/soft/X/contrib/kde/%SUBDIR%/ \
-	ftp://ftp.rediris.es/mirror/kde/pub/kde/%SUBDIR%/ \
-	http://sunsite.rediris.es/mirror/kde/pub/kde/%SUBDIR%/ \
-	ftp://ftp.mirrors.net.ar/pub/kde/%SUBDIR%/ \
-	ftp://ftp.man.szczecin.pl/pub/kde/%SUBDIR%/ \
 	ftp://gd.tuwien.ac.at/kde/%SUBDIR%/ \
 	http://gd.tuwien.ac.at/kde/%SUBDIR%/ \
-	ftp://ftp.informatik.hu-berlin.de/pub/Mirrors/ftp.kde.org/%SUBDIR%/ \
+	ftp://kde.mirrors.tds.net/pub/kde/%SUBDIR%/ \
+	http://kde.mirrors.tds.net/pub/kde/%SUBDIR%/ \
+	ftp://ftp.rz.uni-wuerzburg.de/pub/unix/kde/%SUBDIR%/ \
 	http://mirrors.dotsrc.org/kde/%SUBDIR%/ \
 	ftp://mirrors.dotsrc.org/kde/%SUBDIR%/ \
-	ftp://mirrors.ibiblio.org/pub/mirrors/kde/%SUBDIR%/ \
+	ftp://ibiblio.org/pub/mirrors/kde/%SUBDIR%/ \
 	http://ibiblio.org/pub/mirrors/kde/%SUBDIR%/ \
-	ftp://ftp.roedu.net/pub/mirrors/ftp.kde.org/%SUBDIR%/ \
+	http://kambing.vlsm.org/kde/%SUBDIR%/ \
+	http://mirrors.evolva.ro/kdeftp/%SUBDIR%/ \
+	ftp://ftp.iasi.roedu.net/pub/mirrors/ftp.kde.org/%SUBDIR%/ \
 	ftp://ftp.fi.muni.cz/pub/kde/%SUBDIR%/ \
-	ftp://ftp.fh-heilbronn.de/pub/mirrors/kde/%SUBDIR%/ \
 	http://ftp.fi.muni.cz/pub/kde/%SUBDIR%/ \
+	ftp://ftp.tu-chemnitz.de/pub/X11/kde/%SUBDIR%/ \
 	ftp://ftp.tuniv.szczecin.pl/pub/kde/%SUBDIR%/ \
 	http://ftp.tuniv.szczecin.pl/pub/kde/%SUBDIR%/ \
+	ftp://sunsite.icm.edu.pl/pub/unix/kde/%SUBDIR%/ \
 	http://sunsite.icm.edu.pl/pub/unix/kde/%SUBDIR%/ \
-	ftp://mirror.switch.ch/mirror/kde/%SUBDIR%/ \
-	http://mirror.switch.ch/ftp/mirror/kde/%SUBDIR%/ \
 	ftp://ftp.sunet.se/pub/kde/%SUBDIR%/ \
 	http://ftp.sunet.se/pub/kde/%SUBDIR%/ \
-	ftp://ftp.rz.uni-wuerzburg.de/pub/unix/kde/%SUBDIR%/ \
-	ftp://ftp.dataplus.se/pub/linux/kde/%SUBDIR%/ \
-	ftp://ftp.duth.gr/pub/kde/%SUBDIR%/ \
-	http://ftp.duth.gr/pub/kde/%SUBDIR%/ \
 	ftp://ftp.unina.it/pub/Linux/kde/%SUBDIR%/ \
 	http://ftp.unina.it/pub/Linux/kde/%SUBDIR%/ \
-	ftp://ftp.gwdg.de/pub/x11/kde/%SUBDIR%/ \
-	ftp://ftp.kde.org.yu/kde/%SUBDIR%/ \
-	http://ftp.kde.org.yu/kde/%SUBDIR%/ \
 	ftp://ftp.belnet.be/packages/kde/%SUBDIR%/ \
+	ftp://ftp.gwdg.de/pub/x11/kde/%SUBDIR%/ \
 	http://ftp.belnet.be/packages/kde/%SUBDIR%/ \
 	ftp://ftp.lip6.fr/pub/X11/kde/%SUBDIR%/ \
 	http://www-ftp.lip6.fr/pub/X11/kde/%SUBDIR%/ \
-	ftp://ftp.tu-chemnitz.de/pub/X11/kde/%SUBDIR%/ \
-	ftp://ftp.uvsq.fr/pub/X11/kde/%SUBDIR%/ \
 	ftp://ftp.rhnet.is/pub/kde/%SUBDIR%/ \
 	http://ftp.rhnet.is/pub/kde/%SUBDIR%/ \
+	http://ftp-stud.fht-esslingen.de/Mirrors/ftp.kde.org/pub/kde/%SUBDIR%/ \
 	ftp://ftp.esat.net/mirrors/ftp.kde.org/pub/kde/%SUBDIR%/ \
 	http://ftp.esat.net/mirrors/ftp.kde.org/pub/kde/%SUBDIR%/ \
-	ftp://ftp.mirror.ac.uk/sites/ftp.kde.org/pub/kde/%SUBDIR%/ \
-	http://download.mirror.ac.uk/sites/ftp.kde.org/pub/kde/%SUBDIR%/ \
 	ftp://kde.paralax.org/kde/%SUBDIR%/ \
 	ftp://ftp.cronyx.ru/pub/mirror/kde/%SUBDIR%/ \
-	ftp://ftp.fu-berlin.de/pub/unix/X11/gui/kde/%SUBDIR%/ \
 	ftp://linux.cis.nctu.edu.tw/X/wm/kde/%SUBDIR%/ \
 	ftp://ftp.na.kde.org/pub/kde/%SUBDIR%/ \
-	http://ftp.sun.ac.za/sites/ftp.kde.org/pub/kde/%SUBDIR%/ \
+	ftp://ftp.fu-berlin.de/pub/unix/X11/gui/kde/%SUBDIR%/ \
 	ftp://ftp.estpak.ee/pub/kde/%SUBDIR%/ \
-	ftp://ftp-stud.fht-esslingen.de/pub/Mirrors/ftp.kde.org/pub/kde/%SUBDIR%/ \
-	ftp://ftp.kde.org/pub/kde/%SUBDIR%/ \
+	ftp://sunsite.informatik.rwth-aachen.de/pub/Linux/kde/%SUBDIR%/ \
+	http://www.qtopia.org.cn/ftp/mirror/ftp.kde.org/%SUBDIR%/ \
+	ftp://ftp.qtopia.org.cn/mirror/ftp.kde.org/%SUBDIR%/ \
 	ftp://ftp.ntua.gr/pub/X11/kde/%SUBDIR%/ \
 	http://ftp.ntua.gr/pub/X11/kde/%SUBDIR%/ \
 	ftp://ftp.hol.gr/pub/mirror/kde/%SUBDIR%/ \
 	http://ftp.hol.gr/mirror/kde/%SUBDIR%/ \
-	ftp://ftp.pbone.net/mirror/ftp.kde.org/pub/kde/%SUBDIR%/ \
 	ftp://ftp.heanet.ie/mirrors/ftp.kde.org/%SUBDIR%/ \
 	http://ftp.heanet.ie/mirrors/ftp.kde.org/%SUBDIR%/ \
-	ftp://linux3.cc.ntu.edu.tw/pub/kde/%SUBDIR%/ \
-	http://linux3.cc.ntu.edu.tw/pub/kde/%SUBDIR%/ \
 	ftp://mi.mirror.garr.it/pub/mirrors/KDE/%SUBDIR%/ \
 	http://mi.mirror.garr.it/mirrors/KDE/%SUBDIR%/ \
-	ftp://ftp.iway.fr/pub/kde/%SUBDIR%/ \
 	ftp://ftp.kddlabs.co.jp/pub/X11/kde/%SUBDIR%/ \
 	http://ftp.kddlabs.co.jp/pub/X11/kde/%SUBDIR%/ \
+	ftp://ftp.informatik.uni-hamburg.de/pub/soft/X/contrib/kde/%SUBDIR%/ \
 	ftp://ftp.no.kde.org/pub/kde/%SUBDIR%/ \
 	ftp://ftp.yz.yamagata-u.ac.jp/pub/X11/wm/kde/%SUBDIR%/ \
 	http://ftp.yz.yamagata-u.ac.jp/pub/X11/wm/kde/%SUBDIR%/ \
 	ftp://ftp.funet.fi/pub/mirrors/ftp.kde.org/pub/kde/%SUBDIR%/ \
 	http://ftp.funet.fi/pub/mirrors/ftp.kde.org/pub/kde/%SUBDIR%/ \
 	ftp://ftp.planetmirror.com/pub/kde/%SUBDIR%/ \
+	http://public.planetmirror.com/pub/kde/%SUBDIR%/ \
 	ftp://ftp.ussg.iu.edu/pub/kde/%SUBDIR%/ \
 	http://ftp.ussg.iu.edu/kde/%SUBDIR%/ \
+	ftp://mirror.pacific.net.au/kde/%SUBDIR%/ \
+	http://mirror.pacific.net.au/kde/%SUBDIR%/ \
+	ftp://ftp.sayclub.com/pub/X/KDE/%SUBDIR%/ \
+	http://ftp.sayclub.com/pub/X/KDE/%SUBDIR%/ \
 	ftp://carroll.aset.psu.edu/pub/kde/%SUBDIR%/ \
-	ftp://chernabog.cc.vt.edu/pub/projects/kde/%SUBDIR%/ \
-	http://chernabog.cc.vt.edu/pub/projects/kde/%SUBDIR%/ \
 	http://mirror.cc.columbia.edu/pub/software/kde/%SUBDIR%/ \
+	ftp://fr2.rpmfind.net/linux/KDE/%SUBDIR%/ \
+	http://fr2.rpmfind.net/linux/KDE/%SUBDIR%/ \
+	ftp://ftp.chg.ru/pub/kde/%SUBDIR%/ \
 	http://ftp.chg.ru/pub/kde/%SUBDIR%/ \
+	ftp://ftp.mirrorservice.org/sites/ftp.kde.org/pub/kde/%SUBDIR%/ \
 	http://www.mirrorservice.org/sites/ftp.kde.org/pub/kde/%SUBDIR%/ \
+	ftp://ftp.xcp.kiev.ua/ftp.kde.org/%SUBDIR%/ \
+	ftp://ftp-stud.fht-esslingen.de/pub/Mirrors/ftp.kde.org/pub/kde/%SUBDIR%/ \
+	http://ftp.gwdg.de/pub/x11/kde/%SUBDIR%/ \
 	${MASTER_SITE_RINGSERVER:S,%SUBDIR%,X/kde/&,}
 .endif