[pkgsrc/trunk]: pkgsrc/www/mozilla-bin don't to try to figure out where the d...

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

details:   https://anonhg.NetBSD.org/pkgsrc/rev/d0e894ca88d1
branches:  trunk
changeset: 477310:d0e894ca88d1
user:      grant <grant%pkgsrc.org@localhost>
date:      Tue Jun 29 14:19:42 2004 +0000

description:
don't to try to figure out where the distfile might be and don't
hardcode it, just look in the official and contrib binary directories.

diffstat:

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

diffs (45 lines):

diff -r 59bf4402b099 -r d0e894ca88d1 www/mozilla-bin/Makefile.common
--- a/www/mozilla-bin/Makefile.common   Tue Jun 29 13:49:34 2004 +0000
+++ b/www/mozilla-bin/Makefile.common   Tue Jun 29 14:19:42 2004 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.common,v 1.20 2004/06/23 13:32:05 grant Exp $
+# $NetBSD: Makefile.common,v 1.21 2004/06/29 14:19:42 grant Exp $
 #
 
 DISTNAME=              # see Makefile.${OPSYS}.${ARCH}
@@ -13,11 +13,17 @@
 MOZ_DIR=               ${MOZ_VER}
 .endif
 
-MASTER_SITES?=         http://ftp.mozilla.org/pub/mozilla.org/${MOZILLA_SHORT}/releases/${MOZ_DIR}/${MOZ_CONTRIB} \
-                       ftp://ftp.mozilla.org/pub/mozilla.org/${MOZILLA_SHORT}/releases/${MOZ_DIR}/${MOZ_CONTRIB} \
-                       http://public.planetmirror.com.au/pub/${MOZILLA_SHORT}/releases/${MOZ_DIR}/${MOZ_CONTRIB} \
-                       ftp://public.planetmirror.com.au/pub/${MOZILLA_SHORT}/releases/${MOZ_DIR}/${MOZ_CONTRIB} \
-                       ftp://ftp.tuwien.ac.at/infosys/browsers/${MOZILLA_SHORT}/releases/${MOZ_DIR}/${MOZ_CONTRIB}
+.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/
@@ -63,12 +69,6 @@
 MESSAGE_SRC+=  ${.CURDIR}/../../www/mozilla-bin/MESSAGE.compat_linux
 .  endif
 
-# non-linux builds are "unofficial" and in contrib/
-MOZ_CONTRIB?=  contrib/
-.  if defined(MOZ_PLATFORM) && ${MOZ_PLATFORM} == "linux"
-MOZ_CONTRIB?=  # empty
-.  endif
-
 # Linux builds on NetBSD
 .  if ${OPSYS} == "NetBSD" && ${MOZ_PLATFORM} == "linux"
 .    include "../../emulators/suse_linux/Makefile.application"