[pkgsrc/trunk]: pkgsrc/www/mozilla-bin define MASTER_SITES after including th...

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

details:   https://anonhg.NetBSD.org/pkgsrc/rev/bf3589386632
branches:  trunk
changeset: 478076:bf3589386632
user:      grant <grant%pkgsrc.org@localhost>
date:      Fri Jul 16 09:51:32 2004 +0000

description:
define MASTER_SITES after including the os/arch specific Makefile
fragment so the right MOZ_VER is picked up.

diffstat:

 www/mozilla-bin/Makefile.common |  42 ++++++++++++++++++++--------------------
 1 files changed, 21 insertions(+), 21 deletions(-)

diffs (62 lines):

diff -r c24051bc7cbc -r bf3589386632 www/mozilla-bin/Makefile.common
--- a/www/mozilla-bin/Makefile.common   Fri Jul 16 07:47:53 2004 +0000
+++ b/www/mozilla-bin/Makefile.common   Fri Jul 16 09:51:32 2004 +0000
@@ -1,30 +1,10 @@
-# $NetBSD: Makefile.common,v 1.21 2004/06/29 14:19:42 grant Exp $
+# $NetBSD: Makefile.common,v 1.22 2004/07/16 09:51:32 grant Exp $
 #
 
 DISTNAME=              # see Makefile.${OPSYS}.${ARCH}
 PKGNAME=               ${MOZILLA}${MOZ_EXTRA}-bin-${MOZ_VER}
 CATEGORIES=            www
 
-.if ${MOZILLA} == "mozilla"
-MOZILLA_SHORT=         ${MOZILLA}
-MOZ_DIR=               mozilla${MOZ_VER}
-.else
-MOZILLA_SHORT=         ${MOZILLA}
-MOZ_DIR=               ${MOZ_VER}
-.endif
-
-.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}/
-.  for _site_ in ${_MASTER_SITES}
-MASTER_SITES+=         ${_site_}
-MASTER_SITES+=         ${_site_}contrib/
-.  endfor
-.endif
-
 MAINTAINER=            grant%NetBSD.org@localhost
 HOMEPAGE?=             http://www.mozilla.org/
 
@@ -46,6 +26,26 @@
 .  include "${.CURDIR}/Makefile.${OPSYS}.${ARCH}"
 .endif
 
+.if ${MOZILLA} == "mozilla"
+MOZILLA_SHORT=         ${MOZILLA}
+MOZ_DIR=               mozilla${MOZ_VER}
+.else
+MOZILLA_SHORT=         ${MOZILLA}
+MOZ_DIR=               ${MOZ_VER}
+.endif
+
+.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}/
+.  for _site_ in ${_MASTER_SITES}
+MASTER_SITES+=         ${_site_}
+MASTER_SITES+=         ${_site_}contrib/
+.  endfor
+.endif
+
 # suffix gtk2 builds with -gtk2
 .if defined(MOZ_GTK2) && ${MOZ_GTK2} == "YES"
 MOZ_EXTRA?=    -gtk2