[pkgsrc/trunk]: pkgsrc Add MASTER_SITE_MOZILLA_ESR, for Extended Support Rele...

[ryoon <ryoon%pkgsrc.org@localhost>]

details:   https://anonhg.NetBSD.org/pkgsrc/rev/835bb8c3355c
branches:  trunk
changeset: 603311:835bb8c3355c
user:      ryoon <ryoon%pkgsrc.org@localhost>
date:      Fri May 04 00:08:07 2012 +0000

description:
Add MASTER_SITE_MOZILLA_ESR, for Extended Support Release version of
mozilla.org products (firefox and thunderbird).
Suggested by obache on pkgsrc-changes@.

diffstat:

 devel/xulrunner10/dist.mk        |  5 ++---
 mail/thunderbird10-l10n/Makefile |  5 ++---
 mail/thunderbird10/Makefile      |  5 ++---
 mk/fetch/sites.mk                |  9 +++++++--
 www/firefox10-l10n/Makefile      |  5 ++---
 5 files changed, 15 insertions(+), 14 deletions(-)

diffs (103 lines):

diff -r 3a14a3d4f954 -r 835bb8c3355c devel/xulrunner10/dist.mk
--- a/devel/xulrunner10/dist.mk Thu May 03 22:58:12 2012 +0000
+++ b/devel/xulrunner10/dist.mk Fri May 04 00:08:07 2012 +0000
@@ -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 @@
 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 -r 3a14a3d4f954 -r 835bb8c3355c mail/thunderbird10-l10n/Makefile
--- a/mail/thunderbird10-l10n/Makefile  Thu May 03 22:58:12 2012 +0000
+++ b/mail/thunderbird10-l10n/Makefile  Fri May 04 00:08:07 2012 +0000
@@ -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@localhost
 HOMEPAGE=      http://www.mozillamessaging.com/en-US/thunderbird/
diff -r 3a14a3d4f954 -r 835bb8c3355c mail/thunderbird10/Makefile
--- a/mail/thunderbird10/Makefile       Thu May 03 22:58:12 2012 +0000
+++ b/mail/thunderbird10/Makefile       Fri May 04 00:08:07 2012 +0000
@@ -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@localhost
diff -r 3a14a3d4f954 -r 835bb8c3355c mk/fetch/sites.mk
--- a/mk/fetch/sites.mk Thu May 03 22:58:12 2012 +0000
+++ b/mk/fetch/sites.mk Fri May 04 00:08:07 2012 +0000
@@ -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 @@
 # 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 @@
        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 -r 3a14a3d4f954 -r 835bb8c3355c www/firefox10-l10n/Makefile
--- a/www/firefox10-l10n/Makefile       Thu May 03 22:58:12 2012 +0000
+++ b/www/firefox10-l10n/Makefile       Fri May 04 00:08:07 2012 +0000
@@ -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@localhost
 HOMEPAGE=      http://www.mozilla.com/en-US/firefox/