[pkgsrc/trunk]: pkgsrc/www seamonkey-bin/Makefile.common - allow override of ...

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

details:   https://anonhg.NetBSD.org/pkgsrc/rev/5ad489bc6b9d
branches:  trunk
changeset: 521880:5ad489bc6b9d
user:      jdolecek <jdolecek%pkgsrc.org@localhost>
date:      Sat Nov 25 21:38:51 2006 +0000

description:
seamonkey-bin/Makefile.common - allow override of MOZ_DIR

update firefox-bin and firefox2-bin to override MOZ_DIR to point
to the binary Linux distribution; kill their own MASTER_SITES

now firefox-bin and firefox2-bin automaticaly pick up mirror
changes in the master script

diffstat:

 www/firefox-bin/Makefile             |  4 ++--
 www/firefox-bin/Makefile.Linux.i386  |  9 ++-------
 www/firefox2-bin/Makefile            |  4 ++--
 www/firefox2-bin/Makefile.Linux.i386 |  6 ++----
 www/seamonkey-bin/Makefile.common    |  4 ++--
 5 files changed, 10 insertions(+), 17 deletions(-)

diffs (83 lines):

diff -r 3bf5a9e9fb0d -r 5ad489bc6b9d www/firefox-bin/Makefile
--- a/www/firefox-bin/Makefile  Sat Nov 25 21:33:39 2006 +0000
+++ b/www/firefox-bin/Makefile  Sat Nov 25 21:38:51 2006 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.23 2006/11/08 09:50:15 ghen Exp $
+# $NetBSD: Makefile,v 1.24 2006/11/25 21:38:51 jdolecek Exp $
 
 MOZILLA=       firefox
 MOZ_VER=       1.5.0.8
@@ -7,7 +7,7 @@
 HOMEPAGE=      http://www.mozilla.com/firefox/
 COMMENT=       Lightweight gecko-based web browser (binary package)
 
-DIST_SUBDIR=   ${MOZILLA}/${MOZ_DISTDIR}
+DIST_SUBDIR=   ${MOZILLA}/releases/${MOZ_DIR}
 # binary package is built against GTK2
 MOZ_GTK2=      YES
 
diff -r 3bf5a9e9fb0d -r 5ad489bc6b9d www/firefox-bin/Makefile.Linux.i386
--- a/www/firefox-bin/Makefile.Linux.i386       Sat Nov 25 21:33:39 2006 +0000
+++ b/www/firefox-bin/Makefile.Linux.i386       Sat Nov 25 21:38:51 2006 +0000
@@ -1,10 +1,5 @@
-# $NetBSD: Makefile.Linux.i386,v 1.7 2006/08/03 08:31:28 tron Exp $
+# $NetBSD: Makefile.Linux.i386,v 1.8 2006/11/25 21:38:51 jdolecek Exp $
 
 DISTNAME=      ${MOZILLA}-${MOZ_DISTVER}
-MOZ_DISTDIR=   releases/${MOZ_DIR}/linux-i686/en-US
-MASTER_SITES=  http://ftp.mozilla.org/pub/mozilla.org/firefox/${MOZ_DISTDIR}/ \
-               http://ftp.cvut.cz/mozilla/firefox/${MOZ_DISTDIR}/ \
-               http://www.mirrorservice.org/sites/ftp.mozilla.org/pub/mozilla.org/firefox/${MOZ_DISTDIR}/ \
-               ftp://ftp.fu-berlin.de/unix/www/firefox/${MOZ_DISTDIR}/
-
+MOZ_DIR=       ${MOZ_VER}/linux-i686/en-US
 MOZ_PLATFORM=  linux
diff -r 3bf5a9e9fb0d -r 5ad489bc6b9d www/firefox2-bin/Makefile
--- a/www/firefox2-bin/Makefile Sat Nov 25 21:33:39 2006 +0000
+++ b/www/firefox2-bin/Makefile Sat Nov 25 21:38:51 2006 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.1.1.1 2006/10/24 22:20:58 ghen Exp $
+# $NetBSD: Makefile,v 1.2 2006/11/25 21:38:51 jdolecek Exp $
 
 MOZILLA=               firefox
 MOZ_EXTRA=             2
@@ -8,7 +8,7 @@
 HOMEPAGE=              http://www.mozilla.com/en-US/firefox/2.0/releasenotes/
 COMMENT=               Lightweight gecko-based web browser (binary package)
 
-DIST_SUBDIR=           ${MOZILLA}/${MOZ_DISTDIR}
+DIST_SUBDIR=           ${MOZILLA}/releases/${MOZ_DIR}
 # binary package is built against GTK2
 MOZ_GTK2=              YES
 
diff -r 3bf5a9e9fb0d -r 5ad489bc6b9d www/firefox2-bin/Makefile.Linux.i386
--- a/www/firefox2-bin/Makefile.Linux.i386      Sat Nov 25 21:33:39 2006 +0000
+++ b/www/firefox2-bin/Makefile.Linux.i386      Sat Nov 25 21:38:51 2006 +0000
@@ -1,7 +1,5 @@
-# $NetBSD: Makefile.Linux.i386,v 1.1.1.1 2006/10/24 22:20:58 ghen Exp $
+# $NetBSD: Makefile.Linux.i386,v 1.2 2006/11/25 21:38:51 jdolecek Exp $
 
 DISTNAME=              firefox-${MOZ_DISTVER}
-MOZ_DISTDIR=           releases/${MOZ_DISTVER}/linux-i686/en-US
-MASTER_SITES=          http://ftp.mozilla.org/pub/mozilla.org/firefox/${MOZ_DISTDIR}/
-
+MOZ_DIR=               ${MOZ_DISTVER}/linux-i686/en-US
 MOZ_PLATFORM=          linux
diff -r 3bf5a9e9fb0d -r 5ad489bc6b9d www/seamonkey-bin/Makefile.common
--- a/www/seamonkey-bin/Makefile.common Sat Nov 25 21:33:39 2006 +0000
+++ b/www/seamonkey-bin/Makefile.common Sat Nov 25 21:38:51 2006 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.common,v 1.2 2006/11/25 20:28:49 jdolecek Exp $
+# $NetBSD: Makefile.common,v 1.3 2006/11/25 21:38:51 jdolecek Exp $
 
 DISTNAME=              # see Makefile.${OPSYS}.${ARCH}
 PKGNAME=               ${MOZILLA}${MOZ_EXTRA}-bin-${MOZ_VER}
@@ -26,7 +26,7 @@
 .endif
 
 MOZILLA_SHORT=         ${MOZILLA}
-MOZ_DIR=               ${MOZ_VER}
+MOZ_DIR?=              ${MOZ_VER}
 
 .if !defined(MASTER_SITES)
 _MASTER_SITES+=                http://ftp.mozilla.org/pub/mozilla.org/${MOZILLA_SHORT}/releases/${MOZ_DIR}/