summaryrefslogtreecommitdiff
path: root/www/mozilla-bin
diff options
context:
space:
mode:
authorgrant <grant>2004-06-29 14:19:42 +0000
committergrant <grant>2004-06-29 14:19:42 +0000
commit82bf28973f8612f247fefdfb30f5e55527435361 (patch)
tree2d70a236e7b49e26dc02e8548f8abd9e7c10c906 /www/mozilla-bin
parent3b81e9282f2f931b8f020052efc7ea4db7e26926 (diff)
downloadpkgsrc-82bf28973f8612f247fefdfb30f5e55527435361.tar.gz
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 (limited to 'www/mozilla-bin')
-rw-r--r--www/mozilla-bin/Makefile.common24
1 files changed, 12 insertions, 12 deletions
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"