add config for arm, armel, armeb

4 files changed, 46 insertions, 13 deletions

diff --git a/www/mozilla/Makefile b/www/mozilla/Makefile
index d8a45ae281c..8ee2e2e6bf7 100644
--- a/www/mozilla/Makefile
+++ b/www/mozilla/Makefile
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile,v 1.91 2002/07/04 03:45:30 taya Exp $
+# $NetBSD: Makefile,v 1.92 2002/07/12 13:07:27 taya Exp $
 
 MOZ_VER=	1.0
 DISTNAME=	mozilla-source-${MOZ_VER}
 PKGNAME=	mozilla-${MOZ_VER}
-PKGREVISION=	1
+PKGREVISION=	2
 WRKSRC=		${WRKDIR}/mozilla
 CATEGORIES=	www
 MASTER_SITES=	${MASTER_SITE_MOZILLA:=mozilla${MOZ_VER}/src/}
diff --git a/www/mozilla/distinfo b/www/mozilla/distinfo
index 8d50a00cdd1..07439f83a73 100644
--- a/www/mozilla/distinfo
+++ b/www/mozilla/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.23 2002/07/04 03:45:30 taya Exp $
+$NetBSD: distinfo,v 1.24 2002/07/12 13:07:27 taya Exp $
 
 SHA1 (mozilla-source-1.0.tar.bz2) = 92d44f3196dca3182ffe64414fc0a574a5aa7416
 Size (mozilla-source-1.0.tar.bz2) = 29620700 bytes
@@ -6,8 +6,8 @@ SHA1 (patch-aa) = f1bbdd178534d889091c19f042abb08566cdae30
 SHA1 (patch-ab) = a95161cdd0aaf8761dd36fd88dddd35ff588fcd0
 SHA1 (patch-am) = f2579e2729d18335101ea46dc96fb7463c819ef3
 SHA1 (patch-aw) = d0e738f5ed84aaf390de56a6d741de0e8ee69d3a
-SHA1 (patch-ba) = f165b8b82e5d1f89ae7af12cf93566e116391f77
-SHA1 (patch-bb) = cff7139dd754fb9c800839b54c7697eb3fd32f93
+SHA1 (patch-ba) = b3dd4948fd735ac9d7d9b98a8a2619199c64a082
+SHA1 (patch-bb) = 5c6ebfa4a248d2b584ec801834daa16055de9971
 SHA1 (patch-bc) = cb1cb5b6e2010f561042e16e184abc5870f41c72
 SHA1 (patch-be) = 230639b8f5a2f9d228fbc1ac6fdb71c83bd5379b
 SHA1 (patch-bf) = 9d594a9eec7d396d93c8cee0b911c4c89a67a335
diff --git a/www/mozilla/patches/patch-ba b/www/mozilla/patches/patch-ba
index e151f7ea956..850571e3d5a 100644
--- a/www/mozilla/patches/patch-ba
+++ b/www/mozilla/patches/patch-ba
@@ -1,12 +1,23 @@
-$NetBSD: patch-ba,v 1.9 2002/06/06 02:05:58 taya Exp $
+$NetBSD: patch-ba,v 1.10 2002/07/12 13:07:27 taya Exp $
 
 diff -ru ../Orig/mozilla/nsprpub/pr/include/md/_netbsd.cfg ./nsprpub/pr/include/md/_netbsd.cfg
 --- ../Orig/mozilla/nsprpub/pr/include/md/_netbsd.cfg	Wed Apr 10 12:16:42 2002
-+++ ./nsprpub/pr/include/md/_netbsd.cfg	Thu Jun  6 09:13:25 2002
-@@ -91,6 +91,52 @@
++++ ./nsprpub/pr/include/md/_netbsd.cfg	Wed Jul 10 22:51:15 2002
+@@ -45,7 +45,8 @@
+ 
+ #define PR_AF_INET6 24  /* same as AF_INET6 */
+ 
+-#if defined(__i386__) || defined(__arm32__) || defined(__MIPSEL__)
++#if defined(__i386__) || defined(__arm32__) || defined(__arm__) || \
++	defined(__armel__) || defined(__MIPSEL__)
+ 
+ #define IS_LITTLE_ENDIAN 1
+ #undef  IS_BIG_ENDIAN
+@@ -91,7 +92,53 @@
  #define PR_ALIGN_OF_DOUBLE  4
  #define PR_ALIGN_OF_POINTER 4
  
+-#elif defined(__sparc__) || defined(__MIPSEB__)
 +#elif defined(__sparc_v9__)
 +
 +#undef IS_LITTLE_ENDIAN
@@ -53,6 +64,7 @@ diff -ru ../Orig/mozilla/nsprpub/pr/include/md/_netbsd.cfg ./nsprpub/pr/include/
 +#define PR_ALIGN_OF_DOUBLE  8 
 +#define PR_ALIGN_OF_POINTER 8 
 +
- #elif defined(__sparc__) || defined(__MIPSEB__)
++#elif defined(__sparc__) || defined(__MIPSEB__) || defined(__armeb__)
  
  #undef IS_LITTLE_ENDIAN
+ #define  IS_BIG_ENDIAN 1
diff --git a/www/mozilla/patches/patch-bb b/www/mozilla/patches/patch-bb
index cf2f6d50b2f..caf26b194b9 100644
--- a/www/mozilla/patches/patch-bb
+++ b/www/mozilla/patches/patch-bb
@@ -1,9 +1,9 @@
-$NetBSD: patch-bb,v 1.9 2002/06/06 02:05:58 taya Exp $
+$NetBSD: patch-bb,v 1.10 2002/07/12 13:07:27 taya Exp $
 
 diff -ru ../Orig/mozilla/nsprpub/pr/include/md/_netbsd.h ./nsprpub/pr/include/md/_netbsd.h
 --- ../Orig/mozilla/nsprpub/pr/include/md/_netbsd.h	Wed Apr 10 12:16:43 2002
-+++ ./nsprpub/pr/include/md/_netbsd.h	Thu Jun  6 09:13:29 2002
-@@ -48,6 +48,8 @@
++++ ./nsprpub/pr/include/md/_netbsd.h	Wed Jul 10 22:53:43 2002
+@@ -48,12 +48,20 @@
  #define _PR_SI_ARCHITECTURE "m68k"
  #elif defined(__powerpc__)
  #define _PR_SI_ARCHITECTURE "powerpc"
@@ -12,7 +12,19 @@ diff -ru ../Orig/mozilla/nsprpub/pr/include/md/_netbsd.h ./nsprpub/pr/include/md
  #elif defined(__sparc__)
  #define _PR_SI_ARCHITECTURE "sparc"
  #elif defined(__mips__)
-@@ -106,7 +108,17 @@
+ #define _PR_SI_ARCHITECTURE "mips"
+ #elif defined(__arm32__)
+ #define _PR_SI_ARCHITECTURE "arm32"
++#elif defined(__arm__)
++#define _PR_SI_ARCHITECTURE "arm"
++#elif defined(__armel__)
++#define _PR_SI_ARCHITECTURE "armel"
++#elif defined(__armeb__)
++#define _PR_SI_ARCHITECTURE "armeb"
+ #endif
+ 
+ #if defined(__ELF__)
+@@ -106,7 +114,17 @@
  }
  #define	_MD_GET_SP(_thread)	CONTEXT(_thread)[2]
  #endif
@@ -31,3 +43,12 @@ diff -ru ../Orig/mozilla/nsprpub/pr/include/md/_netbsd.h ./nsprpub/pr/include/md
  #define _MD_INIT_CONTEXT(_thread, _sp, _main, status)			\
  {									\
      sigsetjmp(CONTEXT(_thread), 1);					\
+@@ -148,7 +166,7 @@
+ }
+ #define	_MD_GET_SP(_thread)	CONTEXT(_thread)[32]
+ #endif
+-#ifdef __arm32__
++#if defined(__arm32__) || defined(__arm__) || defined(__armel__) || defined(__armeb__)
+ #define _MD_INIT_CONTEXT(_thread, _sp, _main, status)			\
+ {									\
+     sigsetjmp(CONTEXT(_thread), 1);					\