match-mb: make BSD/x86 targets use the same XPTCall code as Linux.

patch-ab: NetBSD always has >4GB off_t, so use it.

3 files changed, 44 insertions, 36 deletions

diff --git a/devel/xulrunner/distinfo b/devel/xulrunner/distinfo
index 8e3ce672e2c..b966467fde0 100644
--- a/devel/xulrunner/distinfo
+++ b/devel/xulrunner/distinfo
@@ -1,10 +1,10 @@
-$NetBSD: distinfo,v 1.25 2010/03/16 15:57:02 tnn Exp $
+$NetBSD: distinfo,v 1.26 2010/03/17 14:02:14 tnn Exp $
 
 SHA1 (f14062c981ba.tar.bz2) = 8965bf632ea401f1b7a783bae4a78217505d2db4
 RMD160 (f14062c981ba.tar.bz2) = ab698d457f293c8a26553adfa5f1c793806ea925
 Size (f14062c981ba.tar.bz2) = 48101977 bytes
 SHA1 (patch-aa) = d719f801f340688102e3b1c07b53655f4053180a
-SHA1 (patch-ab) = 5331bae45501013d3ca13d161226e311bc10aafe
+SHA1 (patch-ab) = a9a9db3f53ecac231007de9ed163bd99f2184462
 SHA1 (patch-ac) = e50356963fd235ea11fa45baae356fcf21c6669d
 SHA1 (patch-ad) = 7afb960af4e4a311481e7a7b25008ca9b9f7fba1
 SHA1 (patch-ae) = 6679dd9c28f8029cc0ed2a32ae60da696099f351
@@ -33,7 +33,7 @@ SHA1 (patch-ba) = 9d4058f2a3a290429b26cb8335dd5b188bccc96d
 SHA1 (patch-bb) = a764014f7aee2ecb75584ee652fd4a35ab647527
 SHA1 (patch-bc) = 6ea633380f427a24098129afa68fcd0112e68ca1
 SHA1 (patch-ma) = a20b263ff14c841fd0ae1634962b90a41173b524
-SHA1 (patch-mb) = b3f2558098b6c744959626f1b60fdb7cbe7db2a0
+SHA1 (patch-mb) = 5b41f75ec70ef494c58af9eb4eaf4546a5d62e3a
 SHA1 (patch-md) = 6bf5242245b17fbd868a6a978eb5849726f81393
 SHA1 (patch-me) = f5a8e29fc004ef7696b67d260384ab23fd1658c2
 SHA1 (patch-mf) = 153dfd5cd611e4364fe1c540f4e8eb500115baff
diff --git a/devel/xulrunner/patches/patch-ab b/devel/xulrunner/patches/patch-ab
index 900fa483543..3af5e54ffc6 100644
--- a/devel/xulrunner/patches/patch-ab
+++ b/devel/xulrunner/patches/patch-ab
@@ -1,7 +1,16 @@
-$NetBSD: patch-ab,v 1.1.1.1 2009/08/05 02:59:48 tnn Exp $
+$NetBSD: patch-ab,v 1.2 2010/03/17 14:02:14 tnn Exp $
 
---- nsprpub/pr/include/md/_netbsd.h.orig	2009-06-29 18:15:06.000000000 +0200
+--- nsprpub/pr/include/md/_netbsd.h.orig	2010-03-15 14:56:04.000000000 +0000
 +++ nsprpub/pr/include/md/_netbsd.h
+@@ -79,7 +79,7 @@
+ #define HAVE_DLL
+ #define USE_DLFCN
+ #define _PR_HAVE_SOCKADDR_LEN
+-#define _PR_NO_LARGE_FILES
++#define _PR_HAVE_LARGE_OFF_T
+ #define _PR_STAT_HAS_ST_ATIMESPEC
+ #define _PR_POLL_AVAILABLE
+ #define _PR_USE_POLL
 @@ -94,6 +94,12 @@
  #define _PR_INET6_PROBE
  #endif
diff --git a/devel/xulrunner/patches/patch-mb b/devel/xulrunner/patches/patch-mb
index d6b7a4d459d..f2e3437d519 100644
--- a/devel/xulrunner/patches/patch-mb
+++ b/devel/xulrunner/patches/patch-mb
@@ -1,46 +1,45 @@
-$NetBSD: patch-mb,v 1.2 2010/03/16 15:57:02 tnn Exp $
+$NetBSD: patch-mb,v 1.3 2010/03/17 14:02:14 tnn Exp $
 
---- xpcom/reflect/xptcall/src/md/unix/Makefile.in.orig	2009-11-25 05:13:10.000000000 +0100
+--- xpcom/reflect/xptcall/src/md/unix/Makefile.in.orig	2010-03-15 14:56:04.000000000 +0000
 +++ xpcom/reflect/xptcall/src/md/unix/Makefile.in
 @@ -76,7 +76,7 @@ endif
  endif
  endif
  
 -ifneq (,$(filter FreeBSD NetBSD OpenBSD BSD_OS,$(OS_ARCH)))
-+ifneq (,$(filter FreeBSD DragonFly NetBSD OpenBSD BSD_OS,$(OS_ARCH)))
++ifneq (,$(filter BSD_OS,$(OS_ARCH)))
  ifeq (86,$(findstring 86,$(OS_TEST)))
  CPPSRCS		:= xptcinvoke_unixish_x86.cpp xptcstubs_unixish_x86.cpp
  endif
-@@ -108,12 +108,28 @@ endif
- ifeq ($(OS_ARCH)$(OS_TEST),OpenBSDx86_64)
- CPPSRCS		:= xptcinvoke_amd64_openbsd.cpp xptcstubs_amd64_openbsd.cpp
- endif
-+
-+#
-+# NetBSD/amd64
-+#
-+ifeq ($(OS_ARCH)$(OS_TEST),NetBSDx86_64)
-+CPPSRCS		:= xptcinvoke_amd64_openbsd.cpp xptcstubs_amd64_openbsd.cpp
-+endif
-+
- #
- # FreeBSD/amd64
+@@ -85,7 +85,7 @@ endif
+ # New code for Linux, et. al., with gcc
+ # Migrate other platforms here after testing
  #
- ifeq ($(OS_ARCH)$(OS_TEST),FreeBSDx86_64)
- CPPSRCS		:= xptcinvoke_amd64_linux.cpp xptcstubs_amd64_linux.cpp
+-ifneq (,$(filter Linux GNU_%,$(OS_ARCH)))
++ifneq (,$(filter Linux NetBSD DragonFly FreeBSD OpenBSD GNU_%,$(OS_ARCH)))
+ # Linux/x86-64
+ ifeq (x86_64,$(OS_TEST))
+ CPPSRCS		:= xptcinvoke_x86_64_unix.cpp xptcstubs_x86_64_linux.cpp
+@@ -103,18 +103,6 @@ ASFILES		:= xptcstubs_asm_ipf64.s xptcin
+ endif
  endif
-+
-+#
-+# DragonFlyBSD/amd64
-+#
-+ifeq ($(OS_ARCH)$(OS_TEST),DragonFlyx86_64)
-+CPPSRCS		:= xptcinvoke_amd64_linux.cpp xptcstubs_amd64_linux.cpp
-+endif
-+
  #
+-# OpenBSD/amd64
+-#
+-ifeq ($(OS_ARCH)$(OS_TEST),OpenBSDx86_64)
+-CPPSRCS		:= xptcinvoke_amd64_openbsd.cpp xptcstubs_amd64_openbsd.cpp
+-endif
+-#
+-# FreeBSD/amd64
+-#
+-ifeq ($(OS_ARCH)$(OS_TEST),FreeBSDx86_64)
+-CPPSRCS		:= xptcinvoke_amd64_linux.cpp xptcstubs_amd64_linux.cpp
+-endif
+-#
  # BeOS/Intel (uses the same unixish_x86 code)
  #
-@@ -200,7 +216,7 @@ endif
+ ifeq ($(OS_ARCH)$(OS_TEST),BeOSBePC)
+@@ -200,7 +188,7 @@ endif
  # NetBSD/ARM
  #
  ifeq ($(OS_ARCH),NetBSD)
@@ -49,7 +48,7 @@ $NetBSD: patch-mb,v 1.2 2010/03/16 15:57:02 tnn Exp $
  CPPSRCS		:= xptcinvoke_arm_netbsd.cpp xptcstubs_arm_netbsd.cpp
  endif
  endif
-@@ -255,7 +271,7 @@ endif
+@@ -255,7 +243,7 @@ endif
  # NetBSD/m68k
  #
  ifeq ($(OS_ARCH),NetBSD)
@@ -58,7 +57,7 @@ $NetBSD: patch-mb,v 1.2 2010/03/16 15:57:02 tnn Exp $
  CPPSRCS		:= xptcinvoke_netbsd_m68k.cpp xptcstubs_netbsd_m68k.cpp
  endif
  endif
-@@ -340,9 +356,10 @@ endif
+@@ -340,9 +328,10 @@ endif
  #
  # NetBSD/PPC
  #
@@ -70,7 +69,7 @@ $NetBSD: patch-mb,v 1.2 2010/03/16 15:57:02 tnn Exp $
  endif
  
  #
-@@ -414,6 +431,13 @@ CPPSRCS		:= xptcinvoke_sparc64_openbsd.c
+@@ -414,6 +403,13 @@ CPPSRCS		:= xptcinvoke_sparc64_openbsd.c
  ASFILES		:= xptcinvoke_asm_sparc64_openbsd.s xptcstubs_asm_sparc64_openbsd.s
  endif
  #