pkgsrc-Changes-HG archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

[pkgsrc/trunk]: pkgsrc Change MOZILLA master sites difinitions, related to PR...



details:   https://anonhg.NetBSD.org/pkgsrc/rev/2e0bf062e0c4
branches:  trunk
changeset: 536769:2e0bf062e0c4
user:      obache <obache%pkgsrc.org@localhost>
date:      Sat Dec 22 07:22:04 2007 +0000

description:
Change MOZILLA master sites difinitions, related to PR 37379.

There are three types Mozilla mirrors.
(http://www.mozilla.org/mirroring.html)
 * mozilla-current
        contains only the current version of Firefox and Thunderbird
 * mozilla-release
        contains Firefox, Thunderbird, and Sunbird releases
 * mozilla-all
        complete archive

Define following variables for mozilla master sites:
        MASTER_SITE_MOZILLA_ALL = mozilla-all
        MASTER_SITE_MOZILLA     = mozilla-release
and change some packages to use appropriate variable.

Update contents of MASTER_SITE_MOZILLA with master and primary mirrors
taken from http://www.mozilla.org/mirrors.html and add some sample definitions.

diffstat:

 devel/bugzilla/Makefile                        |   4 +-
 devel/bugzilla3/Makefile                       |   4 +-
 devel/ldapsdk/Makefile                         |   4 +-
 devel/nspr-reference/Makefile                  |   4 +-
 devel/nspr/Makefile                            |   4 +-
 devel/nss/Makefile                             |   5 +--
 devel/p5-LDAP/Makefile                         |   4 +-
 mail/thunderbird/Makefile-thunderbird.common   |   5 +--
 mail/thunderbird15/Makefile-thunderbird.common |   5 +--
 mk/defaults/mk.conf                            |   9 +++++--
 mk/fetch/sites.mk                              |  30 +++++++++++++++++++++----
 time/sunbird/Makefile-sunbird.common           |   5 +--
 www/firefox/Makefile-firefox.common            |   7 +----
 www/firefox15/Makefile-firefox.common          |   7 +----
 www/seamonkey-bin/Makefile.common              |  11 +-------
 15 files changed, 57 insertions(+), 51 deletions(-)

diffs (truncated from 329 to 300 lines):

diff -r d839dbec5887 -r 2e0bf062e0c4 devel/bugzilla/Makefile
--- a/devel/bugzilla/Makefile   Sat Dec 22 04:29:47 2007 +0000
+++ b/devel/bugzilla/Makefile   Sat Dec 22 07:22:04 2007 +0000
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile,v 1.26 2007/08/25 09:49:33 adrianp Exp $
+# $NetBSD: Makefile,v 1.27 2007/12/22 07:22:06 obache Exp $
 #
 
 DISTNAME=      bugzilla-2.22.3
 CATEGORIES=    www devel
-MASTER_SITES=  ${MASTER_SITE_MOZILLA:=webtools/}
+MASTER_SITES=  ${MASTER_SITE_MOZILLA_ALL:=webtools/}
 
 MAINTAINER=    adrianp%NetBSD.org@localhost
 HOMEPAGE=      http://www.bugzilla.org/
diff -r d839dbec5887 -r 2e0bf062e0c4 devel/bugzilla3/Makefile
--- a/devel/bugzilla3/Makefile  Sat Dec 22 04:29:47 2007 +0000
+++ b/devel/bugzilla3/Makefile  Sat Dec 22 07:22:04 2007 +0000
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile,v 1.2 2007/09/19 22:06:29 adrianp Exp $
+# $NetBSD: Makefile,v 1.3 2007/12/22 07:22:07 obache Exp $
 #
 
 DISTNAME=      bugzilla-3.0.2
 CATEGORIES=    www devel
-MASTER_SITES=  ${MASTER_SITE_MOZILLA:=webtools/}
+MASTER_SITES=  ${MASTER_SITE_MOZILLA_ALL:=webtools/}
 
 MAINTAINER=    adrianp%NetBSD.org@localhost
 HOMEPAGE=      http://www.bugzilla.org/
diff -r d839dbec5887 -r 2e0bf062e0c4 devel/ldapsdk/Makefile
--- a/devel/ldapsdk/Makefile    Sat Dec 22 04:29:47 2007 +0000
+++ b/devel/ldapsdk/Makefile    Sat Dec 22 07:22:04 2007 +0000
@@ -1,10 +1,10 @@
-# $NetBSD: Makefile,v 1.26 2007/11/18 10:39:57 wiz Exp $
+# $NetBSD: Makefile,v 1.27 2007/12/22 07:22:07 obache Exp $
 
 DISTNAME=      ldapsdk_12311998
 PKGNAME=       ${DISTNAME:S/_/-/}
 PKGREVISION=   2
 CATEGORIES=    devel databases
-MASTER_SITES=  ftp://ftp.mozilla.org/pub/directory/c-sdk/ancient/
+MASTER_SITES=  ${MASTER_SITE_MOZILLA_ALL:=directory/c-sdk/ancient/}
 
 MAINTAINER=    pkgsrc-users%NetBSD.org@localhost
 HOMEPAGE=      http://www.mozilla.org/directory/
diff -r d839dbec5887 -r 2e0bf062e0c4 devel/nspr-reference/Makefile
--- a/devel/nspr-reference/Makefile     Sat Dec 22 04:29:47 2007 +0000
+++ b/devel/nspr-reference/Makefile     Sat Dec 22 07:22:04 2007 +0000
@@ -1,11 +1,11 @@
-# $NetBSD: Makefile,v 1.3 2006/06/17 20:41:17 rillig Exp $
+# $NetBSD: Makefile,v 1.4 2007/12/22 07:22:08 obache Exp $
 #
 
 DISTNAME=              nspr-reference
 PKGNAME=               ${DISTNAME}-0.1
 PKGREVISION=           1
 CATEGORIES=            devel
-MASTER_SITES=          ${MASTER_SITE_MOZILLA:=../../nspr/doc/}
+MASTER_SITES=          ${MASTER_SITE_MOZILLA_ALL:=nspr/doc/}
 
 MAINTAINER=            jschauma%NetBSD.org@localhost
 HOMEPAGE=              ftp://ftp.mozilla.org/pub/mozilla.org/nspr/doc/
diff -r d839dbec5887 -r 2e0bf062e0c4 devel/nspr/Makefile
--- a/devel/nspr/Makefile       Sat Dec 22 04:29:47 2007 +0000
+++ b/devel/nspr/Makefile       Sat Dec 22 07:22:04 2007 +0000
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile,v 1.23 2007/10/17 07:40:49 bjs Exp $
+# $NetBSD: Makefile,v 1.24 2007/12/22 07:22:08 obache Exp $
 
 DISTNAME=              nspr-4.6.7
 PKGREVISION=           1
 CATEGORIES=            devel
-MASTER_SITES=          ${MASTER_SITE_MOZILLA:=/nspr/releases/v4.6.7/src/}
+MASTER_SITES=          ${MASTER_SITE_MOZILLA_ALL:=nspr/releases/v4.6.7/src/}
 
 MAINTAINER=            mjl%luckie.org.nz@localhost
 HOMEPAGE=              http://www.mozilla.org/projects/nspr/index.html
diff -r d839dbec5887 -r 2e0bf062e0c4 devel/nss/Makefile
--- a/devel/nss/Makefile        Sat Dec 22 04:29:47 2007 +0000
+++ b/devel/nss/Makefile        Sat Dec 22 07:22:04 2007 +0000
@@ -1,9 +1,8 @@
-# $NetBSD: Makefile,v 1.25 2007/10/09 19:19:09 martti Exp $
+# $NetBSD: Makefile,v 1.26 2007/12/22 07:22:08 obache Exp $
 
 DISTNAME=              nss-3.11.5
 CATEGORIES=            security
-MASTER_SITES=          http://ftp.mozilla.org/pub/mozilla.org/security/nss/releases/NSS_3_11_5_RTM/src/ \
-                       ftp://ftp.mozilla.org/pub/mozilla.org/security/nss/releases/NSS_3_11_5_RTM/src/
+MASTER_SITES=          ${MASTER_SITE_MOZILLA_ALL:=security/nss/releases/NSS_3_11_5_RTM/src/}
 
 MAINTAINER=            mjl%luckie.org.nz@localhost
 HOMEPAGE=              http://www.mozilla.org/projects/security/pki/nss/
diff -r d839dbec5887 -r 2e0bf062e0c4 devel/p5-LDAP/Makefile
--- a/devel/p5-LDAP/Makefile    Sat Dec 22 04:29:47 2007 +0000
+++ b/devel/p5-LDAP/Makefile    Sat Dec 22 07:22:04 2007 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.16 2006/03/04 21:29:22 jlam Exp $
+# $NetBSD: Makefile,v 1.17 2007/12/22 07:22:09 obache Exp $
 #
 
 DISTNAME=      perldap-1.2.2
@@ -6,7 +6,7 @@
 SVR4_PKGNAME=  p5lda
 PKGREVISION=   3
 CATEGORIES=    devel perl5 databases
-MASTER_SITES=  ftp://ftp.mozilla.org/pub/directory/perldap/
+MASTER_SITES=  ${MASTER_SITE_MOZILLA_ALL:=directory/perldap/ancient/}
 EXTRACT_SUFX=  .tgz
 
 MAINTAINER=    pkgsrc-users%NetBSD.org@localhost
diff -r d839dbec5887 -r 2e0bf062e0c4 mail/thunderbird/Makefile-thunderbird.common
--- a/mail/thunderbird/Makefile-thunderbird.common      Sat Dec 22 04:29:47 2007 +0000
+++ b/mail/thunderbird/Makefile-thunderbird.common      Sat Dec 22 07:22:04 2007 +0000
@@ -1,12 +1,11 @@
-# $NetBSD: Makefile-thunderbird.common,v 1.31 2007/11/15 15:05:23 tron Exp $
+# $NetBSD: Makefile-thunderbird.common,v 1.32 2007/12/22 07:22:09 obache Exp $
 
 MOZILLA_BIN=           thunderbird-bin
 MOZ_VER=               2.0.0.9
 EXTRACT_SUFX=          .tar.bz2
 DISTNAME=              thunderbird-${MOZ_VER}-source
 CATEGORIES=            mail
-MASTER_SITES=          http://ftp.mozilla.org/pub/mozilla.org/thunderbird/releases/${MOZ_VER}/source/
-MASTER_SITES+=         ftp://ftp.mozilla.org/pub/mozilla.org/thunderbird/releases/${MOZ_VER}/source/
+MASTER_SITES=          ${MASTER_SITE_MOZILLA:=thunderbird/releases/${MOZ_VER}/source/}
 
 HOMEPAGE=              http://www.mozilla.com/en-US/thunderbird/
 
diff -r d839dbec5887 -r 2e0bf062e0c4 mail/thunderbird15/Makefile-thunderbird.common
--- a/mail/thunderbird15/Makefile-thunderbird.common    Sat Dec 22 04:29:47 2007 +0000
+++ b/mail/thunderbird15/Makefile-thunderbird.common    Sat Dec 22 07:22:04 2007 +0000
@@ -1,12 +1,11 @@
-# $NetBSD: Makefile-thunderbird.common,v 1.3 2007/08/24 14:53:31 ghen Exp $
+# $NetBSD: Makefile-thunderbird.common,v 1.4 2007/12/22 07:22:10 obache Exp $
 
 MOZILLA_BIN=           thunderbird-bin
 MOZ_VER=               1.5.0.13
 EXTRACT_SUFX=          .tar.bz2
 DISTNAME=              thunderbird-${MOZ_VER}-source
 CATEGORIES=            mail
-MASTER_SITES=          http://ftp.mozilla.org/pub/mozilla.org/thunderbird/releases/${MOZ_VER}/source/
-MASTER_SITES+=         ftp://ftp.mozilla.org/pub/mozilla.org/thunderbird/releases/${MOZ_VER}/source/
+MASTER_SITES=          ${MASTER_SITE_MOZILLA:=thunderbird/releases/${MOZ_VER}/source/}
 
 HOMEPAGE=              http://www.mozilla.org/projects/thunderbird/
 
diff -r d839dbec5887 -r 2e0bf062e0c4 mk/defaults/mk.conf
--- a/mk/defaults/mk.conf       Sat Dec 22 04:29:47 2007 +0000
+++ b/mk/defaults/mk.conf       Sat Dec 22 07:22:04 2007 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: mk.conf,v 1.167 2007/12/05 21:38:06 tron Exp $
+# $NetBSD: mk.conf,v 1.168 2007/12/22 07:22:06 obache Exp $
 #
 
 # This file provides default values for variables that may be overridden
@@ -1854,7 +1854,7 @@
 #MASTER_SITE_CYGWIN=   http://planetmirror.com/pub/sourceware/cygwin/
 #MASTER_SITE_GNOME=    http://public.planetmirror.com.au/pub/gnome/
 #MASTER_SITE_GNU=      http://public.planetmirror.com.au/pub/gnu/
-#MASTER_SITE_MOZILLA=  http://public.planetmirror.com.au/pub/mozilla/releases/
+#MASTER_SITE_MOZILLA=  http://mozilla.mirror.pacific.net.au/
 #MASTER_SITE_PERL_CPAN=        ftp://mirror.aarnet.edu.au/pub/cpan/modules/by-module/ \
 #                      http://public.planetmirror.com.au/pub/perl/cpan/modules/by-module/
 #MASTER_SITE_OPENOFFICE=http://openoffice.mirrors.ilisys.com.au/ \
@@ -1899,6 +1899,7 @@
 #MASTER_SITE_CYGWIN=   ftp://ftp.funet.fi/pub/mirrors/cygwin.com/pub/cygwin/
 #MASTER_SITE_XCONTRIB= ftp://ftp.funet.fi/pub/X11/contrib/
 #MASTER_SITE_GNU=      ftp://ftp.funet.fi/pub/gnu/gnu/
+#MASTER_SITE_MOZILLA=  ftp://ftp.funet.fi/pub/mirrors/ftp.mozilla.org/
 #MASTER_SITE_PERL_CPAN=        \
 #      ftp://ftp.funet.fi/pub/languages/perl/CPAN/modules/by-module/
 #MASTER_SITE_OPENOFFICE=ftp://ftp.funet.fi/pub/mirrors/openoffice.org/
@@ -1931,7 +1932,7 @@
 #MASTER_SITE_CYGWIN=   ftp://ftp.t.ring.gr.jp/archives/pc/gnu-win32/
 #MASTER_SITE_GNOME=    ftp://ftp.t.ring.gr.jp/pub/X/gnome/
 #MASTER_SITE_GNU=      ftp://ftp.t.ring.gr.jp/pub/GNU/
-#MASTER_SITE_MOZILLA=  ftp://ftp.t.ring.gr.jp/pub/net/www/mozilla/mozilla/releases/
+#MASTER_SITE_MOZILLA=  ftp://ftp.t.ring.gr.jp/pub/net/www/mozilla/
 #MASTER_SITE_PERL_CPAN=        ftp://ftp.t.ring.gr.jp/pub/lang/perl/CPAN/modules/by-module/
 #MASTER_SITE_OPENOFFICE=ftp://ftp.kddlabs.co.jp/office/openoffice/ \
 #                      ftp://ftp.t.ring.gr.jp/pub/misc/openoffice/
@@ -1947,6 +1948,7 @@
 
 # Switzerland
 #
+#MASTER_SITE_MOZILLA=  ftp://mirror.switch.ch/mirror/mozilla/
 #MASTER_SITE_CYGWIN=   ftp://mirror.switch.ch/mirror/cygwin/
 #MASTER_SITE_OPENOFFICE=ftp://mirror.switch.ch/mirror/OpenOffice/
 #MASTER_SITE_SUSE=     \
@@ -1956,6 +1958,7 @@
 #
 #MASTER_SITE_CYGWIN=   ftp://ftp.mirror.ac.uk/sites/sources.redhat.com/ftp/cygwin/
 #MASTER_SITE_GNU=      ftp://sunsite.org.uk/packages/gnu/
+#MASTER_SITE_MOZILLA=  ftp://ftp.mirrorservice.org/sites/ftp.mozilla.org/pub/mozilla.org/
 #MASTER_SITE_PERL_CPAN=        ftp://sunsite.org.uk/packages/perl/CPAN/modules/by-module/
 #MASTER_SITE_OPENOFFICE=ftp://ftp.mirror.ac.uk/sites/ny1.mirror.openoffice.org/
 #MASTER_SITE_TEX_CTAN= ftp://sunsite.org.uk/packages/tex/uk-tex/
diff -r d839dbec5887 -r 2e0bf062e0c4 mk/fetch/sites.mk
--- a/mk/fetch/sites.mk Sat Dec 22 04:29:47 2007 +0000
+++ b/mk/fetch/sites.mk Sat Dec 22 07:22:04 2007 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: sites.mk,v 1.34 2007/12/11 19:55:06 heinz Exp $
+# $NetBSD: sites.mk,v 1.35 2007/12/22 07:22:04 obache Exp $
 #
 # This Makefile fragment defines read-only MASTER_SITE_* variables
 # representing some well-known master distribution sites for software.
@@ -125,12 +125,32 @@
        ftp://fr.rpmfind.net/linux/SuSE-Linux/${MACHINE_ARCH}/update/${SUSE_VERSION}/ \
        ftp://fr2.rpmfind.net/linux/SuSE-Linux/${MACHINE_ARCH}/update/${SUSE_VERSION}/
 
-MASTER_SITE_MOZILLA+=   \
+MASTER_SITE_MOZILLA_ALL+=   \
+       http://ftp.mozilla.org/pub/mozilla.org/ \
+       ftp://ftp.mozilla.org/pub/mozilla.org/ \
+       ftp://ftp.belnet.be/mirror/ftp.mozilla.org/
+
+MASTER_SITE_MOZILLA+=  \
        http://ftp.mozilla.org/pub/mozilla.org/ \
        ftp://ftp.mozilla.org/pub/mozilla.org/ \
-       ftp://ftp.fu-berlin.de/unix/network/www/ \
-       ftp://ftp.funet.fi/pub/mirrors/ftp.mozilla.org/ \
-       ftp://ftp.chg.ru/pub/WWW/mozilla/
+       http://releases.mozilla.org/pub/mozilla.org/ \
+       ftp://releases.mozilla.org/pub/mozilla.org/ \
+       http://mozilla.isc.org/pub/mozilla.org/ \
+       ftp://mozilla.isc.org/pub/mozilla.org/ \
+       http://mozilla.ussg.indiana.edu/pub/mozilla.org/ \
+       ftp://mozilla.ussg.indiana.edu/pub/mozilla.org/ \
+       http://mozilla.osuosl.org/pub/mozilla.org/ \
+       ftp://ftp.osuosl.org/pub/mozilla.org/ \
+       http://mozilla.cs.utah.edu/pub/mozilla.org/ \
+       ftp://mozilla.cs.utah.edu/pub/mozilla.org/ \
+       http://mozilla.mirrors.tds.net/pub/mozilla.org/ \
+       ftp://mozilla.mirrors.tds.net/pub/mozilla.org/ \
+       ftp://ftp.scarlet.be/pub/mozilla.org/ \
+       http://ftp.scarlet.be/pub/mozilla.org/ \
+       ftp://ftp.uni-erlangen.de/pub/mozilla.org/ \
+       http://ftp.uni-erlangen.de/pub/mozilla.org/ \
+       http://sunsite.rediris.es/pub/mozilla.org/ \
+       ftp://sunsite.rediris.es/pub/mozilla.org/
 
 MASTER_SITE_XEMACS+=    \
        ftp://ftp.xemacs.org/pub/xemacs/ \
diff -r d839dbec5887 -r 2e0bf062e0c4 time/sunbird/Makefile-sunbird.common
--- a/time/sunbird/Makefile-sunbird.common      Sat Dec 22 04:29:47 2007 +0000
+++ b/time/sunbird/Makefile-sunbird.common      Sat Dec 22 07:22:04 2007 +0000
@@ -1,12 +1,11 @@
-# $NetBSD: Makefile-sunbird.common,v 1.11 2007/03/02 09:34:18 ghen Exp $
+# $NetBSD: Makefile-sunbird.common,v 1.12 2007/12/22 07:22:10 obache Exp $
 
 MOZILLA_BIN=           sunbird-bin
 MOZ_VER=               0.3.1
 EXTRACT_SUFX=          .tar.bz2
 DISTNAME=              sunbird-${MOZ_VER}.source
 CATEGORIES=            time
-MASTER_SITES=          http://ftp.mozilla.org/pub/mozilla.org/calendar/sunbird/releases/${MOZ_VER}/source/
-MASTER_SITES+=         ftp://ftp.mozilla.org/pub/mozilla.org/calendar/sunbird/releases/${MOZ_VER}/source/
+MASTER_SITES=          ${MASTER_SITE_MOZILLA:=calendar/sunbird/releases/${MOZ_VER}/source/}
 
 HOMEPAGE=              http://www.mozilla.org/projects/calendar/sunbird/
 
diff -r d839dbec5887 -r 2e0bf062e0c4 www/firefox/Makefile-firefox.common
--- a/www/firefox/Makefile-firefox.common       Sat Dec 22 04:29:47 2007 +0000
+++ b/www/firefox/Makefile-firefox.common       Sat Dec 22 07:22:04 2007 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile-firefox.common,v 1.52 2007/12/01 21:43:23 ghen Exp $
+# $NetBSD: Makefile-firefox.common,v 1.53 2007/12/22 07:22:10 obache Exp $
 
 MOZILLA_BIN=           firefox-bin
 MOZ_VER=               2.0.0.11
@@ -6,10 +6,7 @@
 
 DISTNAME=              firefox-${MOZ_VER}-source
 
-MASTER_SITES=          http://ftp.mozilla.org/pub/mozilla.org/firefox/releases/${MOZ_VER}/source/
-MASTER_SITES+=         ftp://ftp.mozilla.org/pub/mozilla.org/firefox/releases/${MOZ_VER}/source/
-MASTER_SITES+=         http://public.planetmirror.com.au/pub/firefox/releases/${MOZ_VER}/source/
-MASTER_SITES+=         ftp://public.planetmirror.com.au/pub/firefox/releases/${MOZ_VER}/source/
+MASTER_SITES=          ${MASTER_SITE_MOZILLA:=firefox/releases/${MOZ_VER}/source/}
 
 HOMEPAGE=              http://www.mozilla.com/en-US/firefox/
 
diff -r d839dbec5887 -r 2e0bf062e0c4 www/firefox15/Makefile-firefox.common
--- a/www/firefox15/Makefile-firefox.common     Sat Dec 22 04:29:47 2007 +0000
+++ b/www/firefox15/Makefile-firefox.common     Sat Dec 22 07:22:04 2007 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile-firefox.common,v 1.3 2007/06/16 01:14:48 dmcmahill Exp $
+# $NetBSD: Makefile-firefox.common,v 1.4 2007/12/22 07:22:10 obache Exp $
 
 MOZILLA_BIN=           firefox-bin
 MOZ_VER=               1.5.0.12
@@ -6,10 +6,7 @@
 
 DISTNAME=              firefox-${MOZ_VER}-source
 
-MASTER_SITES=          http://ftp.mozilla.org/pub/mozilla.org/firefox/releases/${MOZ_VER}/source/
-MASTER_SITES+=         ftp://ftp.mozilla.org/pub/mozilla.org/firefox/releases/${MOZ_VER}/source/
-MASTER_SITES+=         http://public.planetmirror.com.au/pub/firefox/releases/${MOZ_VER}/source/
-MASTER_SITES+=         ftp://public.planetmirror.com.au/pub/firefox/releases/${MOZ_VER}/source/



Home | Main Index | Thread Index | Old Index