From 82bf28973f8612f247fefdfb30f5e55527435361 Mon Sep 17 00:00:00 2001
From: grant <grant>
Date: Tue, 29 Jun 2004 14:19:42 +0000
Subject: 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.

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

(limited to 'www/mozilla-bin')

diff --git a/www/mozilla-bin/Makefile.common b/www/mozilla-bin/Makefile.common
index d9614f37ea0..d114167bafd 100644
--- a/www/mozilla-bin/Makefile.common
+++ b/www/mozilla-bin/Makefile.common
@@ -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 @@ MOZILLA_SHORT=		${MOZILLA}
 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
 HOMEPAGE?=		http://www.mozilla.org/
@@ -63,12 +69,6 @@ PLIST_SRC=	${WRKDIR}/PLIST_DYNAMIC
 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"
-- 
cgit v1.2.3