summaryrefslogtreecommitdiff
path: root/www/mozilla-bin
diff options
context:
space:
mode:
authorgrant <grant@pkgsrc.org>2004-07-16 09:51:32 +0000
committergrant <grant@pkgsrc.org>2004-07-16 09:51:32 +0000
commita708cb4b2970ee95631ee23c0972373089bed78d (patch)
tree77a5a1102261ceddd0422f1ed1c9dbdc81042f7c /www/mozilla-bin
parentfdc3a9bbaa2ba92fb15cf5ed1828aa98920b3e07 (diff)
downloadpkgsrc-a708cb4b2970ee95631ee23c0972373089bed78d.tar.gz
define MASTER_SITES after including the os/arch specific Makefile
fragment so the right MOZ_VER is picked up.
Diffstat (limited to 'www/mozilla-bin')
-rw-r--r--www/mozilla-bin/Makefile.common42
1 files changed, 21 insertions, 21 deletions
diff --git a/www/mozilla-bin/Makefile.common b/www/mozilla-bin/Makefile.common
index d114167bafd..b142b06c84e 100644
--- a/www/mozilla-bin/Makefile.common
+++ b/www/mozilla-bin/Makefile.common
@@ -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
HOMEPAGE?= http://www.mozilla.org/
@@ -46,6 +26,26 @@ ARCH=${MACHINE_ARCH:C/i[3-6]86/i386/g}
. 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