Update MASTER_SITE_QT.

download.qt-project.org is a CDN and should redirect to the closest mirror
anyway, but a few more mirrors have been added just in case.

10 files changed, 21 insertions, 5 deletions

diff --git a/Mk/bsd.qt.mk b/Mk/bsd.qt.mk
index f462bd546ccd..93f3edf520c1 100644
--- a/Mk/bsd.qt.mk
+++ b/Mk/bsd.qt.mk
@@ -29,6 +29,7 @@ MAKE_ENV+=	QMAKESPEC="${QMAKESPEC}"
 .if defined(QT_DIST)
 DISTINFO_FILE=	${PORTSDIR}/devel/qt4/distinfo
 MASTER_SITES=	${MASTER_SITE_QT}
+MASTER_SITE_SUBDIR=	official_releases/qt/${QT4_VERSION:R}/${QT4_VERSION}
 DISTNAME=	qt-everywhere-opensource-src-${QT4_VERSION}
 DIST_SUBDIR=	KDE
 #CONFLICTS+=	Currently there are no conflicts \o/
diff --git a/Mk/bsd.sites.mk b/Mk/bsd.sites.mk
index 8fe99383917b..7d26b49078ea 100644
--- a/Mk/bsd.sites.mk
+++ b/Mk/bsd.sites.mk
@@ -1060,10 +1060,16 @@ MASTER_SITE_QMAIL+= \
 
 .if !defined(IGNORE_MASTER_SITE_QT)
 MASTER_SITE_QT+= \
-	http://releases.qt-project.org/qt4/source/%SUBDIR%/ \
-	ftp://ftp.heanet.ie/mirrors/trolltech/pub/qt/source/%SUBDIR%/ \
-	http://download.qt.nokia.com/qt/source/%SUBDIR%/ \
-	ftp://ftp.trolltech.com/qt/source/%SUBDIR%/
+	http://download.qt-project.org/%SUBDIR%/ \
+	http://master.qt-project.org/%SUBDIR%/ \
+	http://www.mirrorservice.org/sites/download.qt-project.org/%SUBDIR%/ \
+	http://www.nic.funet.fi/pub/mirrors/download.qt-project.org/%SUBDIR%/ \
+	http://qtmirror.ics.com/pub/qtproject/%SUBDIR%/ \
+	http://anychimirror101.mirrors.tds.net/pub/Qt/%SUBDIR%/ \
+	http://www.las.ic.unicamp.br/pub/qtproject/%SUBDIR%/ \
+	http://linorg.usp.br/Qt/%SUBDIR%/ \
+	http://ftp.jaist.ac.jp/pub/qtproject/%SUBDIR%/ \
+	http://mirrors.neusoft.edu.cn/qt/%SUBDIR%/
 .endif
 
 .if !defined(IGNORE_MASTER_SITE_REDHAT_LINUX)
diff --git a/databases/qt-odbc-plugin/Makefile b/databases/qt-odbc-plugin/Makefile
index 479720286027..b058fe82f2e6 100644
--- a/databases/qt-odbc-plugin/Makefile
+++ b/databases/qt-odbc-plugin/Makefile
@@ -6,6 +6,7 @@ PORTVERSION=	3.3.8
 PORTREVISION=	10
 CATEGORIES=	databases
 MASTER_SITES=	${MASTER_SITE_QT}
+MASTER_SITE_SUBDIR=	archive/qt/${PORTVERSION:R:R}
 DISTNAME=	qt-x11-free-${PORTVERSION}
 DIST_SUBDIR=	KDE
 
diff --git a/databases/qt-pgsql-plugin/Makefile b/databases/qt-pgsql-plugin/Makefile
index 49c30880d0fe..51278ac491d3 100644
--- a/databases/qt-pgsql-plugin/Makefile
+++ b/databases/qt-pgsql-plugin/Makefile
@@ -6,6 +6,7 @@ PORTVERSION=	3.3.8
 PORTREVISION=	9
 CATEGORIES=	databases
 MASTER_SITES=	${MASTER_SITE_QT}
+MASTER_SITE_SUBDIR=	archive/qt/${PORTVERSION:R:R}
 DISTNAME=	qt-x11-free-${PORTVERSION}
 DIST_SUBDIR=	KDE
 
diff --git a/databases/qt-sqlite-plugin/Makefile b/databases/qt-sqlite-plugin/Makefile
index e757b31cb788..faaa04b3da81 100644
--- a/databases/qt-sqlite-plugin/Makefile
+++ b/databases/qt-sqlite-plugin/Makefile
@@ -6,6 +6,7 @@ PORTVERSION=	3.3.8
 PORTREVISION=	9
 CATEGORIES=	databases
 MASTER_SITES=	${MASTER_SITE_QT}
+MASTER_SITE_SUBDIR=	archive/qt/${PORTVERSION:R:R}
 DISTNAME=	qt-x11-free-${PORTVERSION}
 DIST_SUBDIR=	KDE
 
diff --git a/devel/qmake/Makefile b/devel/qmake/Makefile
index f41bb194acb7..eccb6b252f30 100644
--- a/devel/qmake/Makefile
+++ b/devel/qmake/Makefile
@@ -6,6 +6,7 @@ PORTVERSION=	3.3.8
 PORTREVISION=	1
 CATEGORIES=	devel
 MASTER_SITES=	${MASTER_SITE_QT}
+MASTER_SITE_SUBDIR=	archive/qt/${PORTVERSION:R:R}
 DISTNAME=	qt-x11-free-${PORTVERSION}
 DIST_SUBDIR=	KDE
 
diff --git a/devel/qt4-assistant-adp/Makefile b/devel/qt4-assistant-adp/Makefile
index df46c222062b..e84313f9dfc7 100644
--- a/devel/qt4-assistant-adp/Makefile
+++ b/devel/qt4-assistant-adp/Makefile
@@ -6,6 +6,7 @@ PORTVERSION=	4.6.3
 PORTREVISION=	1
 CATEGORIES?=	devel
 MASTER_SITES=	${MASTER_SITE_QT}
+MASTER_SITE_SUBDIR=	archive/qt/${PORTVERSION:R}
 PKGNAMEPREFIX=	qt4-
 PKGNAMESUFFIX=	-adp
 DISTNAME=	qt-assistant-qassistantclient-library-compat-src-${PORTVERSION}
diff --git a/devel/qt4-libqtassistantclient/Makefile b/devel/qt4-libqtassistantclient/Makefile
index 499ba5186001..193a57d5714e 100644
--- a/devel/qt4-libqtassistantclient/Makefile
+++ b/devel/qt4-libqtassistantclient/Makefile
@@ -6,6 +6,7 @@ PORTVERSION=	4.6.3
 PORTREVISION=	1
 CATEGORIES?=	devel
 MASTER_SITES=	${MASTER_SITE_QT}
+MASTER_SITE_SUBDIR=	archive/qt/${PORTVERSION:R}
 PKGNAMEPREFIX=	qt4-
 DISTNAME=	qt-assistant-qassistantclient-library-compat-src-${PORTVERSION}
 DIST_SUBDIR=	KDE
diff --git a/devel/qtcreator/Makefile b/devel/qtcreator/Makefile
index 6e42a60d79df..df46e054721b 100644
--- a/devel/qtcreator/Makefile
+++ b/devel/qtcreator/Makefile
@@ -4,8 +4,10 @@
 PORTNAME=	qtcreator
 DISTVERSION=	2.6.1
 CATEGORIES=	devel
-MASTER_SITES=	http://releases.qt-project.org/${PORTNAME}/${DISTVERSION}/:qtcreator \
+MASTER_SITES=	${MASTER_SITE_QT:S/$/:qtcreator/} \
 		${MASTER_SITE_QT}
+MASTER_SITE_SUBDIR=	official_releases/qtcreator/${DISTVERSION:R}/${DISTVERSION}/:qtcreator \
+			official_releases/qt/${QT4_VERSION:R}/${QT4_VERSION}
 DISTNAME=	qt-creator-${DISTVERSION}-src
 DISTFILES=	${DISTNAME}${EXTRACT_SUFX}:qtcreator \
 		${QT_DISTNAME}.tar.gz
diff --git a/x11-toolkits/qt33/Makefile b/x11-toolkits/qt33/Makefile
index 9756c134f3da..fce4e55b82e9 100644
--- a/x11-toolkits/qt33/Makefile
+++ b/x11-toolkits/qt33/Makefile
@@ -6,6 +6,7 @@ PORTVERSION=	3.3.8
 PORTREVISION=	14
 CATEGORIES?=	x11-toolkits ipv6
 MASTER_SITES=	${MASTER_SITE_QT}
+MASTER_SITE_SUBDIR=	archive/qt/${PORTVERSION:R:R}
 DISTNAME=	qt-x11-free-${PORTVERSION}
 DIST_SUBDIR=	KDE