Re: MASTER_SITE_MOZILLA (Re: pkg/37379)

To: pkgsrc-users%netbsd.org@localhost
Subject: Re: MASTER_SITE_MOZILLA (Re: pkg/37379)
From: "OBATA Akio" <obata%lins.jp@localhost>
Date: Sun, 09 Dec 2007 21:00:02 +0900

The attached patch is a proposal.

-- 
"Of course I love NetBSD":-)
OBATA Akio / obata%lins.jp@localhost

Index: mk/fetch/sites.mk
===================================================================
RCS file: /cvsroot/pkgsrc/mk/fetch/sites.mk,v
retrieving revision 1.33
diff -u -r1.33 sites.mk
--- mk/fetch/sites.mk   11 Sep 2007 17:22:18 -0000      1.33
+++ mk/fetch/sites.mk   9 Dec 2007 11:52:12 -0000
@@ -131,9 +131,28 @@
 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/
+       ftp://ftp.belnet.be/mirror/ftp.mozilla.org/
+
+MASTER_SITE_MOZILLA_RELEASE+=  \
+       ${MASTER_SITE_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/ \
Index: mk/defaults/mk.conf
===================================================================
RCS file: /cvsroot/pkgsrc/mk/defaults/mk.conf,v
retrieving revision 1.167
diff -u -r1.167 mk.conf
--- mk/defaults/mk.conf 5 Dec 2007 21:38:06 -0000       1.167
+++ mk/defaults/mk.conf 9 Dec 2007 11:52:13 -0000
@@ -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_RELEASE=  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_RELEASE=  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_RELEASE=  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_RELEASE=  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_RELEASE=  
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/
Index: devel/ldapsdk/Makefile
===================================================================
RCS file: /cvsroot/pkgsrc/devel/ldapsdk/Makefile,v
retrieving revision 1.26
diff -u -r1.26 Makefile
--- devel/ldapsdk/Makefile      18 Nov 2007 10:39:57 -0000      1.26
+++ devel/ldapsdk/Makefile      9 Dec 2007 11:52:13 -0000
@@ -4,7 +4,7 @@
 PKGNAME=       ${DISTNAME:S/_/-/}
 PKGREVISION=   2
 CATEGORIES=    devel databases
-MASTER_SITES=  ftp://ftp.mozilla.org/pub/directory/c-sdk/ancient/
+MASTER_SITES=  ${MASTER_SITE_MOZILLA:=directory/c-sdk/ancient/}
 
 MAINTAINER=    pkgsrc-users%NetBSD.org@localhost
 HOMEPAGE=      http://www.mozilla.org/directory/
Index: devel/nspr-reference/Makefile
===================================================================
RCS file: /cvsroot/pkgsrc/devel/nspr-reference/Makefile,v
retrieving revision 1.3
diff -u -r1.3 Makefile
--- devel/nspr-reference/Makefile       17 Jun 2006 20:41:17 -0000      1.3
+++ devel/nspr-reference/Makefile       9 Dec 2007 11:52:13 -0000
@@ -5,7 +5,7 @@
 PKGNAME=               ${DISTNAME}-0.1
 PKGREVISION=           1
 CATEGORIES=            devel
-MASTER_SITES=          ${MASTER_SITE_MOZILLA:=../../nspr/doc/}
+MASTER_SITES=          ${MASTER_SITE_MOZILLA:=nspr/doc/}
 
 MAINTAINER=            jschauma%NetBSD.org@localhost
 HOMEPAGE=              ftp://ftp.mozilla.org/pub/mozilla.org/nspr/doc/
Index: devel/nspr/Makefile
===================================================================
RCS file: /cvsroot/pkgsrc/devel/nspr/Makefile,v
retrieving revision 1.23
diff -u -r1.23 Makefile
--- devel/nspr/Makefile 17 Oct 2007 07:40:49 -0000      1.23
+++ devel/nspr/Makefile 9 Dec 2007 11:52:13 -0000
@@ -3,7 +3,7 @@
 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:=nspr/releases/v4.6.7/src/}
 
 MAINTAINER=            mjl%luckie.org.nz@localhost
 HOMEPAGE=              http://www.mozilla.org/projects/nspr/index.html
Index: devel/nss/Makefile
===================================================================
RCS file: /cvsroot/pkgsrc/devel/nss/Makefile,v
retrieving revision 1.25
diff -u -r1.25 Makefile
--- devel/nss/Makefile  9 Oct 2007 19:19:09 -0000       1.25
+++ devel/nss/Makefile  9 Dec 2007 11:52:13 -0000
@@ -2,8 +2,7 @@
 
 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:=security/nss/releases/NSS_3_11_5_RTM/src/}
 
 MAINTAINER=            mjl%luckie.org.nz@localhost
 HOMEPAGE=              http://www.mozilla.org/projects/security/pki/nss/
Index: devel/p5-LDAP/Makefile
===================================================================
RCS file: /cvsroot/pkgsrc/devel/p5-LDAP/Makefile,v
retrieving revision 1.16
diff -u -r1.16 Makefile
--- devel/p5-LDAP/Makefile      4 Mar 2006 21:29:22 -0000       1.16
+++ devel/p5-LDAP/Makefile      9 Dec 2007 11:52:13 -0000
@@ -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:=directory/perldap/}
 EXTRACT_SUFX=  .tgz
 
 MAINTAINER=    pkgsrc-users%NetBSD.org@localhost
Index: mail/thunderbird/Makefile-thunderbird.common
===================================================================
RCS file: /cvsroot/pkgsrc/mail/thunderbird/Makefile-thunderbird.common,v
retrieving revision 1.31
diff -u -r1.31 Makefile-thunderbird.common
--- mail/thunderbird/Makefile-thunderbird.common        15 Nov 2007 15:05:23 
-0000      1.31
+++ mail/thunderbird/Makefile-thunderbird.common        9 Dec 2007 11:52:13 
-0000
@@ -5,8 +5,7 @@
 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_RELEASE:=thunderbird/releases/${MOZ_VER}/source/}
 
 HOMEPAGE=              http://www.mozilla.com/en-US/thunderbird/
 
Index: mail/thunderbird15/Makefile-thunderbird.common
===================================================================
RCS file: /cvsroot/pkgsrc/mail/thunderbird15/Makefile-thunderbird.common,v
retrieving revision 1.3
diff -u -r1.3 Makefile-thunderbird.common
--- mail/thunderbird15/Makefile-thunderbird.common      24 Aug 2007 14:53:31 
-0000      1.3
+++ mail/thunderbird15/Makefile-thunderbird.common      9 Dec 2007 11:52:13 
-0000
@@ -5,8 +5,7 @@
 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_RELEASE:=thunderbird/releases/${MOZ_VER}/source/}
 
 HOMEPAGE=              http://www.mozilla.org/projects/thunderbird/
 
Index: time/sunbird/Makefile-sunbird.common
===================================================================
RCS file: /cvsroot/pkgsrc/time/sunbird/Makefile-sunbird.common,v
retrieving revision 1.11
diff -u -r1.11 Makefile-sunbird.common
--- time/sunbird/Makefile-sunbird.common        2 Mar 2007 09:34:18 -0000       
1.11
+++ time/sunbird/Makefile-sunbird.common        9 Dec 2007 11:52:13 -0000
@@ -5,8 +5,7 @@
 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_RELEASE:=calendar/sunbird/releases/${MOZ_VER}/source/}
 
 HOMEPAGE=              http://www.mozilla.org/projects/calendar/sunbird/
 
Index: www/firefox/Makefile-firefox.common
===================================================================
RCS file: /cvsroot/pkgsrc/www/firefox/Makefile-firefox.common,v
retrieving revision 1.52
diff -u -r1.52 Makefile-firefox.common
--- www/firefox/Makefile-firefox.common 1 Dec 2007 21:43:23 -0000       1.52
+++ www/firefox/Makefile-firefox.common 9 Dec 2007 11:52:13 -0000
@@ -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_RELEASE:=firefox/releases/${MOZ_VER}/source/}
 
 HOMEPAGE=              http://www.mozilla.com/en-US/firefox/
 
Index: www/firefox/Makefile.common
===================================================================
RCS file: /cvsroot/pkgsrc/www/firefox/Makefile.common,v
retrieving revision 1.23
diff -u -r1.23 Makefile.common
--- www/firefox/Makefile.common 23 Aug 2007 20:27:19 -0000      1.23
+++ www/firefox/Makefile.common 9 Dec 2007 11:52:13 -0000
@@ -3,7 +3,7 @@
 MOZ_DIST_VER?=         ${MOZ_VER}
 DISTNAME?=             mozilla-${MOZ_DIST_VER}-source
 PKGNAME=               ${MOZILLA}-${MOZ_VER}
-MASTER_SITES?=         ${MASTER_SITE_MOZILLA:=mozilla${MOZ_DIST_VER}/source/}
+MASTER_SITES?=         
${MASTER_SITE_MOZILLA_RELEASE:=mozilla${MOZ_DIST_VER}/source/}
 CATEGORIES=            www
 
 MAINTAINER=            taya%NetBSD.org@localhost
Index: www/firefox15/Makefile-firefox.common
===================================================================
RCS file: /cvsroot/pkgsrc/www/firefox15/Makefile-firefox.common,v
retrieving revision 1.3
diff -u -r1.3 Makefile-firefox.common
--- www/firefox15/Makefile-firefox.common       16 Jun 2007 01:14:48 -0000      
1.3
+++ www/firefox15/Makefile-firefox.common       9 Dec 2007 11:52:13 -0000
@@ -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_RELEASE:=firefox/releases/${MOZ_VER}/source/}
 
 HOMEPAGE=              http://www.mozilla.org/projects/firefox/
 
Index: www/seamonkey-bin/Makefile.common
===================================================================
RCS file: /cvsroot/pkgsrc/www/seamonkey-bin/Makefile.common,v
retrieving revision 1.10
diff -u -r1.10 Makefile.common
--- www/seamonkey-bin/Makefile.common   25 Oct 2007 21:04:25 -0000      1.10
+++ www/seamonkey-bin/Makefile.common   9 Dec 2007 11:52:13 -0000
@@ -42,14 +42,7 @@
 MOZ_PLATFORM?=         ${LOWER_OPSYS}
 
 .if !defined(MASTER_SITES)
-_MASTER_SITES+=                
http://ftp.mozilla.org/pub/mozilla.org/${MOZILLA_SHORT}/releases/${MOZ_DIR}/
-_MASTER_SITES+=                
ftp://ftp.mozilla.org/pub/mozilla.org/${MOZILLA_SHORT}/releases/${MOZ_DIR}/
-_MASTER_SITES+=                
http://public.planetmirror.com.au/pub/${MOZILLA_SHORT}/releases/${MOZ_DIR}/
-_MASTER_SITES+=                
ftp://public.planetmirror.com.au/pub/${MOZILLA_SHORT}/releases/${MOZ_DIR}/
-_MASTER_SITES+=                
ftp://ftp.tuwien.ac.at/infosys/browsers/${MOZILLA_SHORT}/releases/${MOZ_DIR}/
-_MASTER_SITES+=                
ftp://ftp.uni-erlangen.de/pub/mozilla.org/${MOZILLA_SHORT}/releases/${MOZ_DIR}/
-_MASTER_SITES+=                
ftp://ftp.fu-berlin.de/unix/network/www/${MOZILLA_SHORT}/releases/${MOZ_DIR}/
-_MASTER_SITES+=                
http://ftp.cvut.cz/mozilla/${MOZILLA_SHORT}/releases/${MOZ_DIR}/
+_MASTER_SITES+=                
${MASTER_SITE_MOZILLA_RELEASE:=${MOZILLA_SHORT}/releases/${MOZ_DIR}/}
 .  for _site_ in ${_MASTER_SITES}
 MASTER_SITES+=         ${_site_}
 MASTER_SITES+=         ${_site_}contrib/
Index: www/seamonkey/Makefile-seamonkey.common
===================================================================
RCS file: /cvsroot/pkgsrc/www/seamonkey/Makefile-seamonkey.common,v
retrieving revision 1.15
diff -u -r1.15 Makefile-seamonkey.common
--- www/seamonkey/Makefile-seamonkey.common     3 Dec 2007 10:56:27 -0000       
1.15
+++ www/seamonkey/Makefile-seamonkey.common     9 Dec 2007 11:52:13 -0000
@@ -5,7 +5,7 @@
 EXTRACT_SUFX=          .tar.bz2
 DISTNAME=              seamonkey-${MOZ_DIST_VER}.source
 
-MASTER_SITES=          
${MASTER_SITE_MOZILLA:=seamonkey/releases/${MOZ_DIST_VER}/}
+MASTER_SITES=          
${MASTER_SITE_MOZILLA_RELEASE:=seamonkey/releases/${MOZ_DIST_VER}/}
 CATEGORIES=            www
 
 MAINTAINER=            ghen%NetBSD.org@localhost
Index: www/seamonkey/Makefile.common
===================================================================
RCS file: /cvsroot/pkgsrc/www/seamonkey/Makefile.common,v
retrieving revision 1.28
diff -u -r1.28 Makefile.common
--- www/seamonkey/Makefile.common       21 Sep 2007 22:07:54 -0000      1.28
+++ www/seamonkey/Makefile.common       9 Dec 2007 11:52:13 -0000
@@ -3,7 +3,7 @@
 MOZ_DIST_VER?=         ${MOZ_VER}
 DISTNAME?=             seamonkey-${MOZ_DIST_VER}.source
 PKGNAME=               ${MOZILLA}-${MOZ_VER}
-MASTER_SITES?=         
${MASTER_SITE_MOZILLA:=seamonkey/releases/${MOZ_DIST_VER}/}
+MASTER_SITES?=         
${MASTER_SITE_MOZILLA_RELEASE:=seamonkey/releases/${MOZ_DIST_VER}/}
 CATEGORIES?=           www
 
 MAINTAINER?=           ghen%NetBSD.org@localhost

References:
- MASTER_SITE_MOZILLA (Re: pkg/37379)
  - From: OBATA Akio

Prev by Date: Re: iSCSI, lvm, storage and the future
Next by Date: audio/xmms-crossfade fails to build on SPARC Solaris
Previous by Thread: MASTER_SITE_MOZILLA (Re: pkg/37379)
Next by Thread: devel/pth pthread.3 man page installation
Indexes:

Home | Main Index | Thread Index | Old Index