[pkgsrc/trunk]: pkgsrc/www/mozilla Force gcc34 and use the right varargs macr...

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

details:   https://anonhg.NetBSD.org/pkgsrc/rev/a4e332bdc7d4
branches:  trunk
changeset: 482325:a4e332bdc7d4
user:      sekiya <sekiya%pkgsrc.org@localhost>
date:      Mon Oct 25 13:02:15 2004 +0000

description:
Force gcc34 and use the right varargs macro for amd64.  Mozilla (and its
derivatives) now appears to work properly on amd64.

Patches from Nicholas Joly.

diffstat:

 www/mozilla/Makefile.common  |  6 +++++-
 www/mozilla/distinfo         |  4 ++--
 www/mozilla/patches/patch-bt |  4 ++--
 3 files changed, 9 insertions(+), 5 deletions(-)

diffs (56 lines):

diff -r c4126fa9adde -r a4e332bdc7d4 www/mozilla/Makefile.common
--- a/www/mozilla/Makefile.common       Mon Oct 25 12:44:44 2004 +0000
+++ b/www/mozilla/Makefile.common       Mon Oct 25 13:02:15 2004 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.common,v 1.44 2004/08/31 02:37:57 danw Exp $
+# $NetBSD: Makefile.common,v 1.45 2004/10/25 13:02:15 sekiya Exp $
 
 MOZ_DIST_VER?= ${MOZ_VER}
 DISTNAME?=     mozilla-source-${MOZ_DIST_VER}
@@ -130,6 +130,10 @@
 
 PTHREAD_OPTS+= native optional
 
+.if (${OPSYS} == "NetBSD" && ${MACHINE_ARCH} == "x86_64")
+GCC_REQD+=     3.4
+.endif
+
 .include "../../mk/compiler.mk"
 .if !empty(CC_VERSION:Mgcc*)
 COPTS?=                        -O2
diff -r c4126fa9adde -r a4e332bdc7d4 www/mozilla/distinfo
--- a/www/mozilla/distinfo      Mon Oct 25 12:44:44 2004 +0000
+++ b/www/mozilla/distinfo      Mon Oct 25 13:02:15 2004 +0000
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.67 2004/10/04 11:52:09 grant Exp $
+$NetBSD: distinfo,v 1.68 2004/10/25 13:02:15 sekiya Exp $
 
 SHA1 (mozilla-source-1.7.3.tar.bz2) = ca588b12d944d478ebe193a76d4b487f8db1e38c
 Size (mozilla-source-1.7.3.tar.bz2) = 29716200 bytes
@@ -27,7 +27,7 @@
 SHA1 (patch-bq) = 2a08f3eb1b6a8ea00e712d08b4bcafad3b766a81
 SHA1 (patch-br) = 52d5b595f1e25ac5d6664864ab0cbe5e14012168
 SHA1 (patch-bs) = fb9f8f13ce481c04a0f7ecfd0ad4d8016cddc2e4
-SHA1 (patch-bt) = 02c84d908156e42b2d60f0c680eab1a89eb5b330
+SHA1 (patch-bt) = 70746626648624b38cc6e8795eb9c061be992342
 SHA1 (patch-bu) = db33b8651e3cb1fbf9a18dbe78e1e8288cfda0ee
 SHA1 (patch-bv) = 4f23dfd885131ea866f31370f1421e7c19706860
 SHA1 (patch-bw) = fc3a518d3762be6e85104a6dc7fffd5ae1a463c8
diff -r c4126fa9adde -r a4e332bdc7d4 www/mozilla/patches/patch-bt
--- a/www/mozilla/patches/patch-bt      Mon Oct 25 12:44:44 2004 +0000
+++ b/www/mozilla/patches/patch-bt      Mon Oct 25 13:02:15 2004 +0000
@@ -1,4 +1,4 @@
-$NetBSD: patch-bt,v 1.2 2004/06/21 14:14:01 taya Exp $
+$NetBSD: patch-bt,v 1.3 2004/10/25 13:02:15 sekiya Exp $
 
 diff -ru ../Orig/mozilla/nsprpub/pr/src/io/prprf.c ./nsprpub/pr/src/io/prprf.c
 --- ../Orig/mozilla/nsprpub/pr/src/io/prprf.c  2004-03-09 12:18:19.000000000 +0900
@@ -11,7 +11,7 @@
 +      (defined(__amd64__) || \
 +      (defined(__powerpc__) && __NetBSD_Version__ >= 105000000)))
 +#include <stdarg.h>
-+#define VARARGS_ASSIGN(foo, bar) va_copy((foo), (bar))
++#define VARARGS_ASSIGN(foo, bar) __va_copy((foo), (bar))
  #elif (defined(LINUX) && defined(__powerpc__)) || \
      (defined(LINUX) && defined(__s390__)) || \
      (defined(LINUX) && defined(__s390x__)) || \