Thu Jan 10 12:32:00 2013 UTC ()
* Reset PKGREVISION.
* Fix build on recent NetBSD current.


(ryoon)
diff -r1.10 -r1.11 pkgsrc/devel/xulrunner10/Makefile
diff -r1.11 -r1.12 pkgsrc/devel/xulrunner10/distinfo
diff -r1.1.1.1 -r1.2 pkgsrc/devel/xulrunner10/patches/patch-ipc_chromium_src_base_debug__util__posic.cc
cvs diff -r1.10 -r1.11 pkgsrc/devel/xulrunner10/Attic/Makefile (expand / switch to unified diff)

--- pkgsrc/devel/xulrunner10/Attic/Makefile 2012/12/12 11:12:20 1.10
+++ pkgsrc/devel/xulrunner10/Attic/Makefile 2013/01/10 12:31:59 1.11
@@ -1,18 +1,17 @@ @@ -1,18 +1,17 @@
1# $NetBSD: Makefile,v 1.10 2012/12/12 11:12:20 ryoon Exp $ 1# $NetBSD: Makefile,v 1.11 2013/01/10 12:31:59 ryoon Exp $
2 2
3.include "dist.mk" 3.include "dist.mk"
4PKGNAME= xulrunner10-${MOZ_BRANCH}${MOZ_BRANCH_MINOR} 4PKGNAME= xulrunner10-${MOZ_BRANCH}${MOZ_BRANCH_MINOR}
5PKGREVISION= 1 
6CATEGORIES= devel www 5CATEGORIES= devel www
7 6
8MAINTAINER= tnn@NetBSD.org 7MAINTAINER= tnn@NetBSD.org
9HOMEPAGE= http://developer.mozilla.org/en/docs/XULRunner 8HOMEPAGE= http://developer.mozilla.org/en/docs/XULRunner
10COMMENT= XML User Interface Language runtime environment 9COMMENT= XML User Interface Language runtime environment
11LICENSE= mpl-1.1 10LICENSE= mpl-1.1
12 11
13MOZILLA_DIR= # empty 12MOZILLA_DIR= # empty
14 13
15PKGCONFIG_OVERRIDE+= xulrunner/installer/libxul-embedding.pc.in 14PKGCONFIG_OVERRIDE+= xulrunner/installer/libxul-embedding.pc.in
16PKGCONFIG_OVERRIDE+= xulrunner/installer/libxul.pc.in 15PKGCONFIG_OVERRIDE+= xulrunner/installer/libxul.pc.in
17PKGCONFIG_OVERRIDE+= xulrunner/installer/mozilla-gtkmozembed-embedding.pc.in 16PKGCONFIG_OVERRIDE+= xulrunner/installer/mozilla-gtkmozembed-embedding.pc.in
18PKGCONFIG_OVERRIDE+= xulrunner/installer/mozilla-gtkmozembed.pc.in 17PKGCONFIG_OVERRIDE+= xulrunner/installer/mozilla-gtkmozembed.pc.in
cvs diff -r1.11 -r1.12 pkgsrc/devel/xulrunner10/Attic/distinfo (expand / switch to unified diff)

--- pkgsrc/devel/xulrunner10/Attic/distinfo 2013/01/10 12:01:02 1.11
+++ pkgsrc/devel/xulrunner10/Attic/distinfo 2013/01/10 12:31:59 1.12
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1$NetBSD: distinfo,v 1.11 2013/01/10 12:01:02 is Exp $ 1$NetBSD: distinfo,v 1.12 2013/01/10 12:31:59 ryoon Exp $
2 2
3SHA1 (firefox-10.0.12esr.source.tar.bz2) = d9086cabf06e04ef5200a8731288c0df27eb84d7 3SHA1 (firefox-10.0.12esr.source.tar.bz2) = d9086cabf06e04ef5200a8731288c0df27eb84d7
4RMD160 (firefox-10.0.12esr.source.tar.bz2) = b112325fa37435d62e5e2737f2e87caf58f25b3c 4RMD160 (firefox-10.0.12esr.source.tar.bz2) = b112325fa37435d62e5e2737f2e87caf58f25b3c
5Size (firefox-10.0.12esr.source.tar.bz2) = 75510903 bytes 5Size (firefox-10.0.12esr.source.tar.bz2) = 75510903 bytes
6SHA1 (patch-aa) = 3724d682a564b0a47b1313c4e5403d5b43b1904a 6SHA1 (patch-aa) = 3724d682a564b0a47b1313c4e5403d5b43b1904a
7SHA1 (patch-ab) = b1efa63d3f9e0dca0247037696839dbce756f88c 7SHA1 (patch-ab) = b1efa63d3f9e0dca0247037696839dbce756f88c
8SHA1 (patch-ac) = 4194776ef3978f261cdade72617c05c08bd33aa6 8SHA1 (patch-ac) = 4194776ef3978f261cdade72617c05c08bd33aa6
9SHA1 (patch-ad) = c5589daa0a2ec33bab17e1b6994b43313e3ba8e3 9SHA1 (patch-ad) = c5589daa0a2ec33bab17e1b6994b43313e3ba8e3
10SHA1 (patch-ae) = ca217066945938eece33a6ee41ca8b8d2ccbf6f0 10SHA1 (patch-ae) = ca217066945938eece33a6ee41ca8b8d2ccbf6f0
11SHA1 (patch-af) = 57bb4796db6e039ece84641c07f18b27e372f650 11SHA1 (patch-af) = 57bb4796db6e039ece84641c07f18b27e372f650
12SHA1 (patch-ag) = 588c45ed234065f86b047e2a794d979d4bad71fb 12SHA1 (patch-ag) = 588c45ed234065f86b047e2a794d979d4bad71fb
13SHA1 (patch-ai) = aa72079de6e9baf601858ab55d7300c1ed280156 13SHA1 (patch-ai) = aa72079de6e9baf601858ab55d7300c1ed280156
14SHA1 (patch-aj) = 66c1ef5c3c7d9535852de2c22e792999a6a5f0a7 14SHA1 (patch-aj) = 66c1ef5c3c7d9535852de2c22e792999a6a5f0a7
@@ -27,27 +27,27 @@ SHA1 (patch-ay) = 17ecad1d8318d7b2bf7f5c @@ -27,27 +27,27 @@ SHA1 (patch-ay) = 17ecad1d8318d7b2bf7f5c
27SHA1 (patch-az) = a67db6a9177608db285543024a038057000236b4 27SHA1 (patch-az) = a67db6a9177608db285543024a038057000236b4
28SHA1 (patch-ba) = 6b89bca6bf1386727c7524a27eb6542a95f0942e 28SHA1 (patch-ba) = 6b89bca6bf1386727c7524a27eb6542a95f0942e
29SHA1 (patch-bd) = 5587f869954c9468924c42200f87910b49c0f153 29SHA1 (patch-bd) = 5587f869954c9468924c42200f87910b49c0f153
30SHA1 (patch-bf) = e47c21494521a39f71132cc0badf727e7050bd9c 30SHA1 (patch-bf) = e47c21494521a39f71132cc0badf727e7050bd9c
31SHA1 (patch-bg) = 669ca920b137d5fdd10b621013a7a02f78bfba6b 31SHA1 (patch-bg) = 669ca920b137d5fdd10b621013a7a02f78bfba6b
32SHA1 (patch-bi) = 9e76596ab9a48abdab0bfbcd9f8bb3d067c6f7bd 32SHA1 (patch-bi) = 9e76596ab9a48abdab0bfbcd9f8bb3d067c6f7bd
33SHA1 (patch-build_autoconf_gcc-pr49911.m4) = d994d058116875255af451c4bf411929caf8c1a9 33SHA1 (patch-build_autoconf_gcc-pr49911.m4) = d994d058116875255af451c4bf411929caf8c1a9
34SHA1 (patch-build_autoconf_nss.m4) = a4519ad6274102512f73eabce1c4821801aa7e77 34SHA1 (patch-build_autoconf_nss.m4) = a4519ad6274102512f73eabce1c4821801aa7e77
35SHA1 (patch-dom_plugins_ipc_PluginModuleChild.cpp) = ac6bd27d98b25ebe393d40ec607a152e12783e6b 35SHA1 (patch-dom_plugins_ipc_PluginModuleChild.cpp) = ac6bd27d98b25ebe393d40ec607a152e12783e6b
36SHA1 (patch-dom_plugins_ipc_PluginModuleChild.h) = 927c08622eae442bcf0bb40253d801b3fb2902db 36SHA1 (patch-dom_plugins_ipc_PluginModuleChild.h) = 927c08622eae442bcf0bb40253d801b3fb2902db
37SHA1 (patch-ipc_chromium_Makefile.in) = 0bdad52dfb4ef6d4440147395c70f75b2a990a1c 37SHA1 (patch-ipc_chromium_Makefile.in) = 0bdad52dfb4ef6d4440147395c70f75b2a990a1c
38SHA1 (patch-ipc_chromium_chromium-config.mk) = ef9eb54c84b3b88818b136dc7ce4f67bf057c079 38SHA1 (patch-ipc_chromium_chromium-config.mk) = ef9eb54c84b3b88818b136dc7ce4f67bf057c079
39SHA1 (patch-ipc_chromium_src_base_base__paths.h) = 99f2ed0597e8b1fd2b791f54948eecc8bd712260 39SHA1 (patch-ipc_chromium_src_base_base__paths.h) = 99f2ed0597e8b1fd2b791f54948eecc8bd712260
40SHA1 (patch-ipc_chromium_src_base_debug__util__posic.cc) = 56b8d6614fa9a49e4b850be04ba755d6f48f10ab 40SHA1 (patch-ipc_chromium_src_base_debug__util__posic.cc) = 7e17052441aef7997ae3c4bef3a26538a334fed4
41SHA1 (patch-ipc_chromium_src_base_file__util.h) = e84b723a4a6965c6e7e3867a147841269287fb1d 41SHA1 (patch-ipc_chromium_src_base_file__util.h) = e84b723a4a6965c6e7e3867a147841269287fb1d
42SHA1 (patch-ipc_chromium_src_base_file__util__bsd.cc) = 6f3be0c99789031f1ec1a452260b827b09578848 42SHA1 (patch-ipc_chromium_src_base_file__util__bsd.cc) = 6f3be0c99789031f1ec1a452260b827b09578848
43SHA1 (patch-ipc_chromium_src_base_file__util__posix.cc) = 39b5d75daedc20e2074946d68df9606d5da85b7a 43SHA1 (patch-ipc_chromium_src_base_file__util__posix.cc) = 39b5d75daedc20e2074946d68df9606d5da85b7a
44SHA1 (patch-ipc_chromium_src_base_message__loop.cc) = a74e738aabf54ef6241274a94ea6cbaa33ae4528 44SHA1 (patch-ipc_chromium_src_base_message__loop.cc) = a74e738aabf54ef6241274a94ea6cbaa33ae4528
45SHA1 (patch-ipc_chromium_src_base_platform__file__posix.cc) = b94143682aefa761d7bb862194f3731a2945ff27 45SHA1 (patch-ipc_chromium_src_base_platform__file__posix.cc) = b94143682aefa761d7bb862194f3731a2945ff27
46SHA1 (patch-ipc_chromium_src_base_platform__thread.h) = e4cc75547773b908da1cded05a5dd3b49670f844 46SHA1 (patch-ipc_chromium_src_base_platform__thread.h) = e4cc75547773b908da1cded05a5dd3b49670f844
47SHA1 (patch-ipc_chromium_src_base_platform__thread__posix.cc) = 1c524bc9834ffec2c0d7960f9205d573a79b47fc 47SHA1 (patch-ipc_chromium_src_base_platform__thread__posix.cc) = 1c524bc9834ffec2c0d7960f9205d573a79b47fc
48SHA1 (patch-ipc_chromium_src_base_process__util.h) = 50a9ab0edc44ef4dab2be55195fdc327d529ba43 48SHA1 (patch-ipc_chromium_src_base_process__util.h) = 50a9ab0edc44ef4dab2be55195fdc327d529ba43
49SHA1 (patch-ipc_chromium_src_base_process__util__bsd.cc) = 09a8b16a14f75999b934e21ec784a7f0b3f4f2d3 49SHA1 (patch-ipc_chromium_src_base_process__util__bsd.cc) = 09a8b16a14f75999b934e21ec784a7f0b3f4f2d3
50SHA1 (patch-ipc_chromium_src_base_process__util__posix.cc) = 0a465abc906dfb44dcdb5570d4ab1b9ac522156d 50SHA1 (patch-ipc_chromium_src_base_process__util__posix.cc) = 0a465abc906dfb44dcdb5570d4ab1b9ac522156d
51SHA1 (patch-ipc_chromium_src_base_sys__info__posix.cc) = 432a5ad9db122304c16f2f34549b16cb5a71612f 51SHA1 (patch-ipc_chromium_src_base_sys__info__posix.cc) = 432a5ad9db122304c16f2f34549b16cb5a71612f
52SHA1 (patch-ipc_chromium_src_base_third__party_nspr_prcpucfg.h) = a47b502d7e10fb929419bf8dfe2356f3084f2f0f 52SHA1 (patch-ipc_chromium_src_base_third__party_nspr_prcpucfg.h) = a47b502d7e10fb929419bf8dfe2356f3084f2f0f
53SHA1 (patch-ipc_chromium_src_base_third__party_nspr_prtime.cc) = 95c740db41392752ce7d93fb0908a8df845891ff 53SHA1 (patch-ipc_chromium_src_base_third__party_nspr_prtime.cc) = 95c740db41392752ce7d93fb0908a8df845891ff
cvs diff -r1.1.1.1 -r1.2 pkgsrc/devel/xulrunner10/patches/Attic/patch-ipc_chromium_src_base_debug__util__posic.cc (expand / switch to unified diff)

--- pkgsrc/devel/xulrunner10/patches/Attic/patch-ipc_chromium_src_base_debug__util__posic.cc 2012/03/15 08:58:28 1.1.1.1
+++ pkgsrc/devel/xulrunner10/patches/Attic/patch-ipc_chromium_src_base_debug__util__posic.cc 2013/01/10 12:32:00 1.2
@@ -1,16 +1,16 @@ @@ -1,16 +1,16 @@
1$NetBSD: patch-ipc_chromium_src_base_debug__util__posic.cc,v 1.1.1.1 2012/03/15 08:58:28 ryoon Exp $ 1$NetBSD: patch-ipc_chromium_src_base_debug__util__posic.cc,v 1.2 2013/01/10 12:32:00 ryoon Exp $
2 2
3--- ipc/chromium/src/base/debug_util_posix.cc.orig 2012-03-09 22:20:16.000000000 +0000 3--- ipc/chromium/src/base/debug_util_posix.cc.orig 2013-01-03 17:43:14.000000000 +0000
4+++ ipc/chromium/src/base/debug_util_posix.cc 4+++ ipc/chromium/src/base/debug_util_posix.cc
5@@ -5,7 +5,7 @@ 5@@ -5,7 +5,7 @@
6 #include "build/build_config.h" 6 #include "build/build_config.h"
7 #include "base/debug_util.h" 7 #include "base/debug_util.h"
8  8
9-#define MOZ_HAVE_EXECINFO_H (!defined(ANDROID) && !defined(__OpenBSD__)) 9-#define MOZ_HAVE_EXECINFO_H (!defined(ANDROID) && !defined(__OpenBSD__))
10+#define MOZ_HAVE_EXECINFO_H (defined(__linux__) && !defined(ANDROID)) 10+#define MOZ_HAVE_EXECINFO_H (defined(__linux__) && !defined(ANDROID))
11  11
12 #include <errno.h> 12 #include <errno.h>
13 #include <fcntl.h> 13 #include <fcntl.h>
14@@ -17,8 +17,11 @@ 14@@ -17,8 +17,11 @@
15 #include <unistd.h> 15 #include <unistd.h>
16 #if MOZ_HAVE_EXECINFO_H 16 #if MOZ_HAVE_EXECINFO_H
@@ -23,25 +23,54 @@ $NetBSD: patch-ipc_chromium_src_base_deb @@ -23,25 +23,54 @@ $NetBSD: patch-ipc_chromium_src_base_deb
23+#include <sys/sysctl.h> 23+#include <sys/sysctl.h>
24  24
25 #include "base/basictypes.h" 25 #include "base/basictypes.h"
26 #include "base/eintr_wrapper.h" 26 #include "base/eintr_wrapper.h"
27@@ -32,7 +35,7 @@ bool DebugUtil::SpawnDebuggerOnProcess(u 27@@ -32,7 +35,7 @@ bool DebugUtil::SpawnDebuggerOnProcess(u
28 return false; 28 return false;
29 } 29 }
30  30
31-#if defined(OS_MACOSX) 31-#if defined(OS_MACOSX)
32+#if defined(OS_MACOSX) || defined(OS_BSD) 32+#if defined(OS_MACOSX) || defined(OS_BSD)
33  33
34 // Based on Apple's recommended method as described in 34 // Based on Apple's recommended method as described in
35 // http://developer.apple.com/qa/qa2004/qa1361.html 35 // http://developer.apple.com/qa/qa2004/qa1361.html
36@@ -71,7 +74,11 @@ bool DebugUtil::BeingDebugged() { 36@@ -51,14 +54,22 @@ bool DebugUtil::BeingDebugged() {
 37 // we're looking for information about a specific process ID.
 38 int mib[] = {
 39 CTL_KERN,
 40+#if defined(OS_NETBSD)
 41+ KERN_PROC2,
 42+#else
 43 KERN_PROC,
 44+#endif
 45 KERN_PROC_PID,
 46 getpid()
 47 };
 48
 49 // Caution: struct kinfo_proc is marked __APPLE_API_UNSTABLE. The source and
 50 // binary interfaces may change.
 51+#if defined(OS_NETBSD)
 52+ struct kinfo_proc2 info;
 53+#else
 54 struct kinfo_proc info;
 55+#endif
 56 size_t info_size = sizeof(info);
 57
 58 int sysctl_result = sysctl(mib, arraysize(mib), &info, &info_size, NULL, 0);
 59@@ -71,7 +82,17 @@ bool DebugUtil::BeingDebugged() {
37  60
38 // This process is being debugged if the P_TRACED flag is set. 61 // This process is being debugged if the P_TRACED flag is set.
39 is_set = true; 62 is_set = true;
40+#if defined(__DragonFly__) 63+#if defined(__DragonFly__)
41+ being_debugged = (info.kp_flags & P_TRACED) != 0; 64+ being_debugged = (info.kp_flags & P_TRACED) != 0;
 65+#elif defined(OS_FREEBSD)
 66+ being_debugged = (info.ki_flag & P_TRACED) != 0;
 67+#elif defined(OS_OPENBSD)
 68+ being_debugged = (info.p_flag & P_TRACED) != 0;
 69+#elif defined(OS_NETBSD)
 70+ being_debugged = (info.p_flag & P_TRACED) != 0;
42+#else 71+#else
43 being_debugged = (info.kp_proc.p_flag & P_TRACED) != 0; 72 being_debugged = (info.kp_proc.p_flag & P_TRACED) != 0;
44+#endif 73+#endif
45 return being_debugged; 74 return being_debugged;
46 } 75 }
47  76