Add MASTER_SITE_MOZILLA_ESR, for Extended Support Release version of

mozilla.org products (firefox and thunderbird).
Suggested by obache on pkgsrc-changes@.

5 files changed, 15 insertions, 14 deletions

diff --git a/devel/xulrunner10/dist.mk b/devel/xulrunner10/dist.mk
index a808ee1a555..9ca8088afaa 100644
--- a/devel/xulrunner10/dist.mk
+++ b/devel/xulrunner10/dist.mk
@@ -1,4 +1,4 @@
-# $NetBSD: dist.mk,v 1.3 2012/04/29 16:30:08 ryoon Exp $
+# $NetBSD: dist.mk,v 1.4 2012/05/04 00:08:07 ryoon Exp $
 #
 # used by devel/xulrunner10/Makefile
 # used by www/firefox10/Makefile
@@ -7,8 +7,7 @@ DISTNAME=	firefox-${FIREFOX_VER}esr.source
 FIREFOX_VER=	${MOZ_BRANCH}${MOZ_BRANCH_MINOR}
 MOZ_BRANCH=	10.0
 MOZ_BRANCH_MINOR=	.4
-MASTER_SITES=	${MASTER_SITE_MOZILLA:=firefox/releases/${FIREFOX_VER}esr/source/} \
-		${MASTER_SITE_MOZILLA_ALL:=firefox/releases/${FIREFOX_VER}esr/source/}
+MASTER_SITES=	${MASTER_SITE_MOZILLA_ESR:=firefox/releases/${FIREFOX_VER}esr/source/}
 EXTRACT_SUFX=	.tar.bz2
 
 DISTINFO_FILE=	${.CURDIR}/../../devel/xulrunner10/distinfo
diff --git a/mail/thunderbird10-l10n/Makefile b/mail/thunderbird10-l10n/Makefile
index 2abdb897d39..c92bc62de29 100644
--- a/mail/thunderbird10-l10n/Makefile
+++ b/mail/thunderbird10-l10n/Makefile
@@ -1,12 +1,11 @@
-# $NetBSD: Makefile,v 1.2 2012/04/29 20:36:30 ryoon Exp $
+# $NetBSD: Makefile,v 1.3 2012/05/04 00:08:07 ryoon Exp $
 #
 
 TB_VER=		10.0.4
 PKGNAME=	thunderbird10-l10n-${TB_VER}
 DISTNAME=	# empty
 CATEGORIES=	mail
-MASTER_SITES=	${MASTER_SITE_MOZILLA:=thunderbird/releases/${TB_VER}esr/linux-i686/xpi/} \
-		${MASTER_SITE_MOZILLA_ALL:=thunderbird/releases/${TB_VER}esr/linux-i686/xpi/}
+MASTER_SITES=	${MASTER_SITE_MOZILLA_ESR:=thunderbird/releases/${TB_VER}esr/linux-i686/xpi/}
 
 MAINTAINER=	tnn@NetBSD.org
 HOMEPAGE=	http://www.mozillamessaging.com/en-US/thunderbird/
diff --git a/mail/thunderbird10/Makefile b/mail/thunderbird10/Makefile
index 98ee211cf2b..0d7d337f9bc 100644
--- a/mail/thunderbird10/Makefile
+++ b/mail/thunderbird10/Makefile
@@ -1,12 +1,11 @@
-# $NetBSD: Makefile,v 1.3 2012/04/29 20:36:30 ryoon Exp $
+# $NetBSD: Makefile,v 1.4 2012/05/04 00:08:07 ryoon Exp $
 #
 
 DISTNAME=	thunderbird-${TB_VER}esr.source
 PKGNAME=	thunderbird10-${TB_VER}
 TB_VER=		10.0.4
 CATEGORIES=	mail
-MASTER_SITES=	${MASTER_SITE_MOZILLA:=thunderbird/releases/${TB_VER}esr/source/} \
-		${MASTER_SITE_MOZILLA_ALL:=thunderbird/releases/${TB_VER}esr/source/}
+MASTER_SITES=	${MASTER_SITE_MOZILLA_ESR:=thunderbird/releases/${TB_VER}esr/source/}
 EXTRACT_SUFX=	.tar.bz2
 
 MAINTAINER=	tnn@NetBSD.org
diff --git a/mk/fetch/sites.mk b/mk/fetch/sites.mk
index d14b1e701f6..0c4ec9f1ef7 100644
--- a/mk/fetch/sites.mk
+++ b/mk/fetch/sites.mk
@@ -1,4 +1,4 @@
-# $NetBSD: sites.mk,v 1.91 2012/04/30 09:10:06 obache Exp $
+# $NetBSD: sites.mk,v 1.92 2012/05/04 00:08:07 ryoon Exp $
 #
 # This Makefile fragment defines read-only MASTER_SITE_* variables
 # representing some well-known master distribution sites for software.
@@ -112,7 +112,6 @@ MASTER_SITE_MOZILLA_ALL+=   \
 # see http://www.mozilla.org/mirrors.html
 MASTER_SITE_MOZILLA+=	\
 	http://releases.mozilla.org/pub/mozilla.org/ \
-	http://pv-mirror01.mozilla.org/pub/mozilla.org/ \
 	http://mirror.atlanticmetro.net/mozilla/ \
 	ftp://releases.mozilla.org/pub/mozilla.org/ \
 	http://www.artfiles.org/mozilla.org/ \
@@ -130,6 +129,12 @@ MASTER_SITE_MOZILLA+=	\
 	http://mirror.waia.asn.au/pub/mozilla/ \
 	http://mozilla.mirror.ihug.co.nz/
 
+# for Extended Support Release version
+MASTER_SITE_MOZILLA_ESR+=	\
+	http://pv-mirror01.mozilla.org/pub/mozilla.org/ \
+	http://dm-download02.mozilla.org/pub/mozilla.org/firefox/releases/ \
+	ftp://ftp.mozilla.org/pub/mozilla.org/
+
 MASTER_SITE_XEMACS+=    \
 	ftp://ftp.xemacs.org/pub/xemacs/ \
 	ftp://ftp.dti.ad.jp/pub/unix/editor/xemacs/ \
diff --git a/www/firefox10-l10n/Makefile b/www/firefox10-l10n/Makefile
index be4caf10ab8..dffbd2c99fb 100644
--- a/www/firefox10-l10n/Makefile
+++ b/www/firefox10-l10n/Makefile
@@ -1,12 +1,11 @@
-# $NetBSD: Makefile,v 1.2 2012/04/29 16:30:08 ryoon Exp $
+# $NetBSD: Makefile,v 1.3 2012/05/04 00:08:07 ryoon Exp $
 #
 
 FIREFOX_VER=	10.0.4
 PKGNAME=	firefox10-l10n-${FIREFOX_VER}
 DISTNAME=	# empty
 CATEGORIES=	www
-MASTER_SITES=	${MASTER_SITE_MOZILLA:=firefox/releases/${FIREFOX_VER}esr/linux-i686/xpi/} \
-		${MASTER_SITE_MOZILLA_ALL:=firefox/releases/${FIREFOX_VER}esr/linux-i686/xpi/}
+MASTER_SITES=	${MASTER_SITE_MOZILLA_ESR:=firefox/releases/${FIREFOX_VER}esr/linux-i686/xpi/}
 
 MAINTAINER=	tnn@NetBSD.org
 HOMEPAGE=	http://www.mozilla.com/en-US/firefox/