Wed Mar 17 14:02:14 2010 UTC ()
match-mb: make BSD/x86 targets use the same XPTCall code as Linux.
patch-ab: NetBSD always has >4GB off_t, so use it.


(tnn)
diff -r1.25 -r1.26 pkgsrc/devel/xulrunner/distinfo
diff -r1.1.1.1 -r1.2 pkgsrc/devel/xulrunner/patches/patch-ab
diff -r1.2 -r1.3 pkgsrc/devel/xulrunner/patches/patch-mb
cvs diff -r1.25 -r1.26 pkgsrc/devel/xulrunner/Attic/distinfo (expand / switch to unified diff)

--- pkgsrc/devel/xulrunner/Attic/distinfo 2010/03/16 15:57:02 1.25
+++ pkgsrc/devel/xulrunner/Attic/distinfo 2010/03/17 14:02:14 1.26
@@ -1,20 +1,20 @@ @@ -1,20 +1,20 @@
1$NetBSD: distinfo,v 1.25 2010/03/16 15:57:02 tnn Exp $ 1$NetBSD: distinfo,v 1.26 2010/03/17 14:02:14 tnn Exp $
2 2
3SHA1 (f14062c981ba.tar.bz2) = 8965bf632ea401f1b7a783bae4a78217505d2db4 3SHA1 (f14062c981ba.tar.bz2) = 8965bf632ea401f1b7a783bae4a78217505d2db4
4RMD160 (f14062c981ba.tar.bz2) = ab698d457f293c8a26553adfa5f1c793806ea925 4RMD160 (f14062c981ba.tar.bz2) = ab698d457f293c8a26553adfa5f1c793806ea925
5Size (f14062c981ba.tar.bz2) = 48101977 bytes 5Size (f14062c981ba.tar.bz2) = 48101977 bytes
6SHA1 (patch-aa) = d719f801f340688102e3b1c07b53655f4053180a 6SHA1 (patch-aa) = d719f801f340688102e3b1c07b53655f4053180a
7SHA1 (patch-ab) = 5331bae45501013d3ca13d161226e311bc10aafe 7SHA1 (patch-ab) = a9a9db3f53ecac231007de9ed163bd99f2184462
8SHA1 (patch-ac) = e50356963fd235ea11fa45baae356fcf21c6669d 8SHA1 (patch-ac) = e50356963fd235ea11fa45baae356fcf21c6669d
9SHA1 (patch-ad) = 7afb960af4e4a311481e7a7b25008ca9b9f7fba1 9SHA1 (patch-ad) = 7afb960af4e4a311481e7a7b25008ca9b9f7fba1
10SHA1 (patch-ae) = 6679dd9c28f8029cc0ed2a32ae60da696099f351 10SHA1 (patch-ae) = 6679dd9c28f8029cc0ed2a32ae60da696099f351
11SHA1 (patch-af) = 13a9617cd2894cf342487d2a9cfe8cf3066ba0df 11SHA1 (patch-af) = 13a9617cd2894cf342487d2a9cfe8cf3066ba0df
12SHA1 (patch-ag) = 62e55040130d5e6cfb10b839fce6abd40a902f08 12SHA1 (patch-ag) = 62e55040130d5e6cfb10b839fce6abd40a902f08
13SHA1 (patch-ah) = 5f8bf19d5ac5ea7e263366a56d10d2eeeee61bac 13SHA1 (patch-ah) = 5f8bf19d5ac5ea7e263366a56d10d2eeeee61bac
14SHA1 (patch-ai) = 3444882b0f7f4b63273d8888af88be35ae60933a 14SHA1 (patch-ai) = 3444882b0f7f4b63273d8888af88be35ae60933a
15SHA1 (patch-aj) = 0e357b477aef423e7688dfb0be93cc8abc35e6e0 15SHA1 (patch-aj) = 0e357b477aef423e7688dfb0be93cc8abc35e6e0
16SHA1 (patch-ak) = 9c7d909d786791829bdcdb7155af66bae079683c 16SHA1 (patch-ak) = 9c7d909d786791829bdcdb7155af66bae079683c
17SHA1 (patch-al) = ca1a1fb5f875ab9c84c0afea5d913172a6f7ab57 17SHA1 (patch-al) = ca1a1fb5f875ab9c84c0afea5d913172a6f7ab57
18SHA1 (patch-am) = 75eb92d1941309ffc13f01d7f1946a2f09170220 18SHA1 (patch-am) = 75eb92d1941309ffc13f01d7f1946a2f09170220
19SHA1 (patch-an) = e975941955b578f1d3336d546e99f0c464cdd9d7 19SHA1 (patch-an) = e975941955b578f1d3336d546e99f0c464cdd9d7
20SHA1 (patch-ao) = 353d2098564c7b29849b6f5f4f80d9ac393b23f3 20SHA1 (patch-ao) = 353d2098564c7b29849b6f5f4f80d9ac393b23f3
@@ -23,27 +23,27 @@ SHA1 (patch-aq) = ffb927e222f98c7288e37d @@ -23,27 +23,27 @@ SHA1 (patch-aq) = ffb927e222f98c7288e37d
23SHA1 (patch-ar) = bfeaa055b7192e5874427615424496b41410f24b 23SHA1 (patch-ar) = bfeaa055b7192e5874427615424496b41410f24b
24SHA1 (patch-as) = aa83f9b834d796982a2b580ed908e188a28c6a41 24SHA1 (patch-as) = aa83f9b834d796982a2b580ed908e188a28c6a41
25SHA1 (patch-at) = 2d09714ba426632a5d67b1b100c2ac4d1e673536 25SHA1 (patch-at) = 2d09714ba426632a5d67b1b100c2ac4d1e673536
26SHA1 (patch-au) = f27b6c8b2c744da388e1d15d0776929e7165ee76 26SHA1 (patch-au) = f27b6c8b2c744da388e1d15d0776929e7165ee76
27SHA1 (patch-av) = e22c544894123a6ab8fc428067716b9e68685771 27SHA1 (patch-av) = e22c544894123a6ab8fc428067716b9e68685771
28SHA1 (patch-aw) = eed2f98b732fa776d2ca64d2b82e88677a207657 28SHA1 (patch-aw) = eed2f98b732fa776d2ca64d2b82e88677a207657
29SHA1 (patch-ax) = 579041ecba36dfa0d42d3ab576e79ecf2321749d 29SHA1 (patch-ax) = 579041ecba36dfa0d42d3ab576e79ecf2321749d
30SHA1 (patch-ay) = 6ddcbbd3f0197fb88622fc32d6d0fd602ec4ad34 30SHA1 (patch-ay) = 6ddcbbd3f0197fb88622fc32d6d0fd602ec4ad34
31SHA1 (patch-az) = 5a09ccfa14fab962c4e2916f00669a1fa4a8ade4 31SHA1 (patch-az) = 5a09ccfa14fab962c4e2916f00669a1fa4a8ade4
32SHA1 (patch-ba) = 9d4058f2a3a290429b26cb8335dd5b188bccc96d 32SHA1 (patch-ba) = 9d4058f2a3a290429b26cb8335dd5b188bccc96d
33SHA1 (patch-bb) = a764014f7aee2ecb75584ee652fd4a35ab647527 33SHA1 (patch-bb) = a764014f7aee2ecb75584ee652fd4a35ab647527
34SHA1 (patch-bc) = 6ea633380f427a24098129afa68fcd0112e68ca1 34SHA1 (patch-bc) = 6ea633380f427a24098129afa68fcd0112e68ca1
35SHA1 (patch-ma) = a20b263ff14c841fd0ae1634962b90a41173b524 35SHA1 (patch-ma) = a20b263ff14c841fd0ae1634962b90a41173b524
36SHA1 (patch-mb) = b3f2558098b6c744959626f1b60fdb7cbe7db2a0 36SHA1 (patch-mb) = 5b41f75ec70ef494c58af9eb4eaf4546a5d62e3a
37SHA1 (patch-md) = 6bf5242245b17fbd868a6a978eb5849726f81393 37SHA1 (patch-md) = 6bf5242245b17fbd868a6a978eb5849726f81393
38SHA1 (patch-me) = f5a8e29fc004ef7696b67d260384ab23fd1658c2 38SHA1 (patch-me) = f5a8e29fc004ef7696b67d260384ab23fd1658c2
39SHA1 (patch-mf) = 153dfd5cd611e4364fe1c540f4e8eb500115baff 39SHA1 (patch-mf) = 153dfd5cd611e4364fe1c540f4e8eb500115baff
40SHA1 (patch-mg) = 75ddcceaffae0bdb6ecb4efd1b5ffca68a8ae8a8 40SHA1 (patch-mg) = 75ddcceaffae0bdb6ecb4efd1b5ffca68a8ae8a8
41SHA1 (patch-mi) = 787cb043bb7e687936afaf8f0c67b6b3a7b03e5b 41SHA1 (patch-mi) = 787cb043bb7e687936afaf8f0c67b6b3a7b03e5b
42SHA1 (patch-mj) = 197fab0e00256dedc8a5f181ee0d0d6e42d8177f 42SHA1 (patch-mj) = 197fab0e00256dedc8a5f181ee0d0d6e42d8177f
43SHA1 (patch-mk) = 793dfa16e19e213d78995c893a28bc0d514135d9 43SHA1 (patch-mk) = 793dfa16e19e213d78995c893a28bc0d514135d9
44SHA1 (patch-ml) = 9003af056e5b671b2345d0a75e99836746369c00 44SHA1 (patch-ml) = 9003af056e5b671b2345d0a75e99836746369c00
45SHA1 (patch-mm) = 51d84cacbfa0430dad21f86f66979b6222299b31 45SHA1 (patch-mm) = 51d84cacbfa0430dad21f86f66979b6222299b31
46SHA1 (patch-mn) = 7d162a96959315a143c68b3ca2ca4dea6060f1f2 46SHA1 (patch-mn) = 7d162a96959315a143c68b3ca2ca4dea6060f1f2
47SHA1 (patch-mp) = 5edb7dbdde20f7aaf5c1bfa035f471ec6d871f95 47SHA1 (patch-mp) = 5edb7dbdde20f7aaf5c1bfa035f471ec6d871f95
48SHA1 (patch-nd) = f5156ca4d1e61dd1b355bbaa5ebd9cc490d8d865 48SHA1 (patch-nd) = f5156ca4d1e61dd1b355bbaa5ebd9cc490d8d865
49SHA1 (patch-pa) = 7dffaba78ee254a545c3f7669a3eb2a92196becc 49SHA1 (patch-pa) = 7dffaba78ee254a545c3f7669a3eb2a92196becc
cvs diff -r1.1.1.1 -r1.2 pkgsrc/devel/xulrunner/patches/Attic/patch-ab (expand / switch to unified diff)

--- pkgsrc/devel/xulrunner/patches/Attic/patch-ab 2009/08/05 02:59:48 1.1.1.1
+++ pkgsrc/devel/xulrunner/patches/Attic/patch-ab 2010/03/17 14:02:14 1.2
@@ -1,17 +1,26 @@ @@ -1,17 +1,26 @@
1$NetBSD: patch-ab,v 1.1.1.1 2009/08/05 02:59:48 tnn Exp $ 1$NetBSD: patch-ab,v 1.2 2010/03/17 14:02:14 tnn Exp $
2 2
3--- nsprpub/pr/include/md/_netbsd.h.orig 2009-06-29 18:15:06.000000000 +0200 3--- nsprpub/pr/include/md/_netbsd.h.orig 2010-03-15 14:56:04.000000000 +0000
4+++ nsprpub/pr/include/md/_netbsd.h 4+++ nsprpub/pr/include/md/_netbsd.h
 5@@ -79,7 +79,7 @@
 6 #define HAVE_DLL
 7 #define USE_DLFCN
 8 #define _PR_HAVE_SOCKADDR_LEN
 9-#define _PR_NO_LARGE_FILES
 10+#define _PR_HAVE_LARGE_OFF_T
 11 #define _PR_STAT_HAS_ST_ATIMESPEC
 12 #define _PR_POLL_AVAILABLE
 13 #define _PR_USE_POLL
5@@ -94,6 +94,12 @@ 14@@ -94,6 +94,12 @@
6 #define _PR_INET6_PROBE 15 #define _PR_INET6_PROBE
7 #endif 16 #endif
8  17
9+#if __NetBSD_Version__ >= 106370000 18+#if __NetBSD_Version__ >= 106370000
10+/* NetBSD 1.6ZK */ 19+/* NetBSD 1.6ZK */
11+#define _PR_HAVE_GETPROTO_R 20+#define _PR_HAVE_GETPROTO_R
12+#define _PR_HAVE_GETPROTO_R_INT 21+#define _PR_HAVE_GETPROTO_R_INT
13+#endif 22+#endif
14+ 23+
15 #define USE_SETJMP 24 #define USE_SETJMP
16  25
17 #ifndef _PR_PTHREADS 26 #ifndef _PR_PTHREADS
cvs diff -r1.2 -r1.3 pkgsrc/devel/xulrunner/patches/Attic/patch-mb (expand / switch to unified diff)

--- pkgsrc/devel/xulrunner/patches/Attic/patch-mb 2010/03/16 15:57:02 1.2
+++ pkgsrc/devel/xulrunner/patches/Attic/patch-mb 2010/03/17 14:02:14 1.3
@@ -1,86 +1,85 @@ @@ -1,86 +1,85 @@
1$NetBSD: patch-mb,v 1.2 2010/03/16 15:57:02 tnn Exp $ 1$NetBSD: patch-mb,v 1.3 2010/03/17 14:02:14 tnn Exp $
2 2
3--- xpcom/reflect/xptcall/src/md/unix/Makefile.in.orig 2009-11-25 05:13:10.000000000 +0100 3--- xpcom/reflect/xptcall/src/md/unix/Makefile.in.orig 2010-03-15 14:56:04.000000000 +0000
4+++ xpcom/reflect/xptcall/src/md/unix/Makefile.in 4+++ xpcom/reflect/xptcall/src/md/unix/Makefile.in
5@@ -76,7 +76,7 @@ endif 5@@ -76,7 +76,7 @@ endif
6 endif 6 endif
7 endif 7 endif
8  8
9-ifneq (,$(filter FreeBSD NetBSD OpenBSD BSD_OS,$(OS_ARCH))) 9-ifneq (,$(filter FreeBSD NetBSD OpenBSD BSD_OS,$(OS_ARCH)))
10+ifneq (,$(filter FreeBSD DragonFly NetBSD OpenBSD BSD_OS,$(OS_ARCH))) 10+ifneq (,$(filter BSD_OS,$(OS_ARCH)))
11 ifeq (86,$(findstring 86,$(OS_TEST))) 11 ifeq (86,$(findstring 86,$(OS_TEST)))
12 CPPSRCS := xptcinvoke_unixish_x86.cpp xptcstubs_unixish_x86.cpp 12 CPPSRCS := xptcinvoke_unixish_x86.cpp xptcstubs_unixish_x86.cpp
13 endif 13 endif
14@@ -108,12 +108,28 @@ endif 14@@ -85,7 +85,7 @@ endif
15 ifeq ($(OS_ARCH)$(OS_TEST),OpenBSDx86_64) 15 # New code for Linux, et. al., with gcc
16 CPPSRCS := xptcinvoke_amd64_openbsd.cpp xptcstubs_amd64_openbsd.cpp 16 # Migrate other platforms here after testing
 17 #
 18-ifneq (,$(filter Linux GNU_%,$(OS_ARCH)))
 19+ifneq (,$(filter Linux NetBSD DragonFly FreeBSD OpenBSD GNU_%,$(OS_ARCH)))
 20 # Linux/x86-64
 21 ifeq (x86_64,$(OS_TEST))
 22 CPPSRCS := xptcinvoke_x86_64_unix.cpp xptcstubs_x86_64_linux.cpp
 23@@ -103,18 +103,6 @@ ASFILES := xptcstubs_asm_ipf64.s xptcin
17 endif 24 endif
18+ 
19+# 
20+# NetBSD/amd64 
21+# 
22+ifeq ($(OS_ARCH)$(OS_TEST),NetBSDx86_64) 
23+CPPSRCS := xptcinvoke_amd64_openbsd.cpp xptcstubs_amd64_openbsd.cpp 
24+endif 
25+ 
26 # 
27 # FreeBSD/amd64 
28 # 
29 ifeq ($(OS_ARCH)$(OS_TEST),FreeBSDx86_64) 
30 CPPSRCS := xptcinvoke_amd64_linux.cpp xptcstubs_amd64_linux.cpp 
31 endif 25 endif
32+ 
33+# 
34+# DragonFlyBSD/amd64 
35+# 
36+ifeq ($(OS_ARCH)$(OS_TEST),DragonFlyx86_64) 
37+CPPSRCS := xptcinvoke_amd64_linux.cpp xptcstubs_amd64_linux.cpp 
38+endif 
39+ 
40 # 26 #
 27-# OpenBSD/amd64
 28-#
 29-ifeq ($(OS_ARCH)$(OS_TEST),OpenBSDx86_64)
 30-CPPSRCS := xptcinvoke_amd64_openbsd.cpp xptcstubs_amd64_openbsd.cpp
 31-endif
 32-#
 33-# FreeBSD/amd64
 34-#
 35-ifeq ($(OS_ARCH)$(OS_TEST),FreeBSDx86_64)
 36-CPPSRCS := xptcinvoke_amd64_linux.cpp xptcstubs_amd64_linux.cpp
 37-endif
 38-#
41 # BeOS/Intel (uses the same unixish_x86 code) 39 # BeOS/Intel (uses the same unixish_x86 code)
42 # 40 #
43@@ -200,7 +216,7 @@ endif 41 ifeq ($(OS_ARCH)$(OS_TEST),BeOSBePC)
 42@@ -200,7 +188,7 @@ endif
44 # NetBSD/ARM 43 # NetBSD/ARM
45 # 44 #
46 ifeq ($(OS_ARCH),NetBSD) 45 ifeq ($(OS_ARCH),NetBSD)
47-ifneq (,$(filter arm% sa110,$(OS_TEST))) 46-ifneq (,$(filter arm% sa110,$(OS_TEST)))
48+ifneq (,$(filter arm%,$(TARGET_CPU))) 47+ifneq (,$(filter arm%,$(TARGET_CPU)))
49 CPPSRCS := xptcinvoke_arm_netbsd.cpp xptcstubs_arm_netbsd.cpp 48 CPPSRCS := xptcinvoke_arm_netbsd.cpp xptcstubs_arm_netbsd.cpp
50 endif 49 endif
51 endif 50 endif
52@@ -255,7 +271,7 @@ endif 51@@ -255,7 +243,7 @@ endif
53 # NetBSD/m68k 52 # NetBSD/m68k
54 # 53 #
55 ifeq ($(OS_ARCH),NetBSD) 54 ifeq ($(OS_ARCH),NetBSD)
56-ifneq (,$(filter amiga atari hp300 mac68k mvme68k next68k sun3 sun3x x68k,$(OS_TEST))) 55-ifneq (,$(filter amiga atari hp300 mac68k mvme68k next68k sun3 sun3x x68k,$(OS_TEST)))
57+ifneq (,$(filter m68k,$(TARGET_CPU))) 56+ifneq (,$(filter m68k,$(TARGET_CPU)))
58 CPPSRCS := xptcinvoke_netbsd_m68k.cpp xptcstubs_netbsd_m68k.cpp 57 CPPSRCS := xptcinvoke_netbsd_m68k.cpp xptcstubs_netbsd_m68k.cpp
59 endif 58 endif
60 endif 59 endif
61@@ -340,9 +356,10 @@ endif 60@@ -340,9 +328,10 @@ endif
62 # 61 #
63 # NetBSD/PPC 62 # NetBSD/PPC
64 # 63 #
65-ifneq (,$(filter NetBSDmacppc NetBSDbebox NetBSDofppc NetBSDprep NetBSDamigappc,$(OS_ARCH)$(OS_TEST)))  64-ifneq (,$(filter NetBSDmacppc NetBSDbebox NetBSDofppc NetBSDprep NetBSDamigappc,$(OS_ARCH)$(OS_TEST)))
66+ifeq ($(OS_ARCH)$(OS_TEST),NetBSDpowerpc) 65+ifeq ($(OS_ARCH)$(OS_TEST),NetBSDpowerpc)
67 CPPSRCS := xptcinvoke_ppc_netbsd.cpp xptcstubs_ppc_netbsd.cpp 66 CPPSRCS := xptcinvoke_ppc_netbsd.cpp xptcstubs_ppc_netbsd.cpp
68 ASFILES := xptcinvoke_asm_ppc_netbsd.s xptcstubs_asm_ppc_netbsd.s 67 ASFILES := xptcinvoke_asm_ppc_netbsd.s xptcstubs_asm_ppc_netbsd.s
69+AS := $(CC) -c -x assembler-with-cpp 68+AS := $(CC) -c -x assembler-with-cpp
70 endif 69 endif
71  70
72 # 71 #
73@@ -414,6 +431,13 @@ CPPSRCS := xptcinvoke_sparc64_openbsd.c 72@@ -414,6 +403,13 @@ CPPSRCS := xptcinvoke_sparc64_openbsd.c
74 ASFILES := xptcinvoke_asm_sparc64_openbsd.s xptcstubs_asm_sparc64_openbsd.s 73 ASFILES := xptcinvoke_asm_sparc64_openbsd.s xptcstubs_asm_sparc64_openbsd.s
75 endif 74 endif
76 # 75 #
77+# NetBSD/SPARC64 76+# NetBSD/SPARC64
78+# 77+#
79+ifeq ($(OS_ARCH)$(OS_TEST),NetBSDsparc64) 78+ifeq ($(OS_ARCH)$(OS_TEST),NetBSDsparc64)
80+CPPSRCS := xptcinvoke_sparc64_netbsd.cpp xptcstubs_sparc64_netbsd.cpp 79+CPPSRCS := xptcinvoke_sparc64_netbsd.cpp xptcstubs_sparc64_netbsd.cpp
81+ASFILES := xptcinvoke_asm_sparc64_netbsd.s xptcstubs_asm_sparc64_netbsd.s 80+ASFILES := xptcinvoke_asm_sparc64_netbsd.s xptcstubs_asm_sparc64_netbsd.s
82+endif 81+endif
83+# 82+#
84 # Solaris/SPARC 83 # Solaris/SPARC
85 # 84 #
86 ifeq ($(OS_ARCH),SunOS) 85 ifeq ($(OS_ARCH),SunOS)