Bump PKGREVISION.

* Fix build on NetBSD 5.2, use pthread_attr_get_np on NetBSD.
* Fix broken binary on NetBSD 5.2 and gcc45.

5 files changed, 32 insertions, 9 deletions

diff --git a/devel/xulrunner/Makefile b/devel/xulrunner/Makefile
index 9071cc710f7..2feeb818a4d 100644
--- a/devel/xulrunner/Makefile
+++ b/devel/xulrunner/Makefile
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.101 2013/03/25 08:47:13 sbd Exp $
+# $NetBSD: Makefile,v 1.102 2013/03/30 20:03:08 ryoon Exp $
 
 .include "dist.mk"
 PKGNAME=	xulrunner-${MOZ_BRANCH}${MOZ_BRANCH_MINOR:S/esr//}
+PKGREVISION=	1
 CATEGORIES=	devel www
 
 MAINTAINER=	pkgsrc-users@NetBSD.org
@@ -27,8 +28,6 @@ ALL_ENV+=		MOZILLA_PKG_NAME=xulrunner
 
 MAKE_ENV+=		FREEBL_NO_DEPEND=0
 
-GCC_REQD+=		4.5
-
 # workround for link of xulrunner-bin etc.
 LDFLAGS+=		${COMPILER_RPATH_FLAG}${PREFIX}/lib/xulrunner ${COMPILER_RPATH_FLAG}${PREFIX}/lib
 LDFLAGS.SunOS+=		-lm
diff --git a/devel/xulrunner/distinfo b/devel/xulrunner/distinfo
index 7ee711ce4a7..0bd0ad74e3b 100644
--- a/devel/xulrunner/distinfo
+++ b/devel/xulrunner/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.99 2013/03/28 14:11:34 ryoon Exp $
+$NetBSD: distinfo,v 1.100 2013/03/30 20:03:08 ryoon Exp $
 
 SHA1 (firefox-19.0.2.source.tar.bz2) = d108d356225379a86d69a4906c706289135f6342
 RMD160 (firefox-19.0.2.source.tar.bz2) = 37518c9d64f4b441d9601debd0aa440b5af66d20
@@ -23,7 +23,7 @@ SHA1 (patch-ay) = 70c68275b6dc41e66fcf8330e9ebcc4743363926
 SHA1 (patch-az) = 2012a7fef2eac59f48ff21fea0e205e89b313e46
 SHA1 (patch-ba) = 1692053c1b0e65dd38bcf37cc1a80390cce081eb
 SHA1 (patch-bd) = 1a24cb9e4dc312725d0a6ffdf202b6f3e98d17fb
-SHA1 (patch-bf) = a24b88b0f12bf787d1adee9574404747b29b8a6b
+SHA1 (patch-bf) = ac5689eaec8cc79d5255a692b255de8a8690539a
 SHA1 (patch-bg) = e5af56b3dca81ad67149c09942580ebd9062b38d
 SHA1 (patch-bi) = 3dd927d93431afe000cd4a45b4d9920e63158a85
 SHA1 (patch-build_autoconf_nss.m4) = 4731f46a41f6d4ff31a6da07c9badb328a0f676f
@@ -34,6 +34,7 @@ SHA1 (patch-gfx_skia_src_sfnt_SkOTTable__head.h) = 493fced792610ea1ce5ab6b1e043e
 SHA1 (patch-gfx_skia_src_sfnt_SkOTTable__name.h) = 61a6611b3dd08f5bd56681244eefbfa3f209f6a1
 SHA1 (patch-gfx_skia_src_sfnt_SkSFNTHeader.h) = 9d997d23ed80370e5b36648b9b35d80c5db88be8
 SHA1 (patch-gfx_thebes_gfxPlatform.cpp) = 1ebc8e894e9d63961f49ba0798ad3eed100d95a6
+SHA1 (patch-ipc_chromium_src_base_platform__thread__posix.cc) = a6175d1e97966944f14cb96ed3527e879412534b
 SHA1 (patch-ipc_glue_GeckoChildProcessHost.cpp) = faed34d94646453cd01acbdec1da2d9ec0f3d05f
 SHA1 (patch-ipc_ipdl_ipdl_lower.py) = 4025c0a4e149d9b2087331e10b342734fa77a905
 SHA1 (patch-js_src_jsgc.cpp) = c514b7fb84002a1909638cd7f3386931cb0f2551
diff --git a/devel/xulrunner/mozilla-common.mk b/devel/xulrunner/mozilla-common.mk
index 9c7470bdf29..41831ac249a 100644
--- a/devel/xulrunner/mozilla-common.mk
+++ b/devel/xulrunner/mozilla-common.mk
@@ -1,4 +1,4 @@
-# $NetBSD: mozilla-common.mk,v 1.44 2013/03/24 09:11:01 sbd Exp $
+# $NetBSD: mozilla-common.mk,v 1.45 2013/03/30 20:03:08 ryoon Exp $
 #
 # common Makefile fragment for mozilla packages based on gecko 2.0.
 #
@@ -12,6 +12,15 @@ USE_TOOLS+=		pkg-config perl gmake autoconf213 unzip zip
 USE_LANGUAGES+=		c99 c++
 UNLIMIT_RESOURCES+=	datasize
 
+.include "../../mk/bsd.prefs.mk"
+# gcc45-4.5.3 of lang/gcc45 does not generate proper binary,
+# but gcc 4.5.4 of NetBSD 7 generates working binary.
+.if !empty(MACHINE_PLATFORM:MNetBSD-5.*)
+GCC_REQD+=		4.6
+.else
+GCC_REQD+=		4.5
+.endif
+
 CHECK_PORTABILITY_SKIP+=${MOZILLA_DIR}security/nss/tests/libpkix/libpkix.sh
 CHECK_PORTABILITY_SKIP+=${MOZILLA_DIR}security/nss/tests/multinit/multinit.sh
 CHECK_INTERPRETER_SKIP+=lib/xulrunner-sdk/sdk/bin/xpt.py
diff --git a/devel/xulrunner/patches/patch-bf b/devel/xulrunner/patches/patch-bf
index d3dd3648c09..c695fdd170e 100644
--- a/devel/xulrunner/patches/patch-bf
+++ b/devel/xulrunner/patches/patch-bf
@@ -1,6 +1,6 @@
-$NetBSD: patch-bf,v 1.10 2013/02/07 20:32:42 ryoon Exp $
+$NetBSD: patch-bf,v 1.11 2013/03/30 20:03:09 ryoon Exp $
 
---- js/src/jsnativestack.cpp.orig	2013-01-16 16:01:13.000000000 +0000
+--- js/src/jsnativestack.cpp.orig	2013-03-07 10:48:48.000000000 +0000
 +++ js/src/jsnativestack.cpp
 @@ -19,13 +19,10 @@
  #elif defined(XP_MACOSX) || defined(DARWIN) || defined(XP_UNIX)
@@ -22,7 +22,7 @@ $NetBSD: patch-bf,v 1.10 2013/02/07 20:32:42 ryoon Exp $
  #  if defined(__OpenBSD__)
      stack_t ss;
 -#  elif defined(PTHREAD_NP_H) || defined(_PTHREAD_NP_H_) || defined(NETBSD)
-+#  elif defined(PTHREAD_NP_H) || defined(_PTHREAD_NP_H_) || defined(__DragonFly__)
++#  elif defined(PTHREAD_NP_H) || defined(_PTHREAD_NP_H_) || defined(__DragonFly__) || defined(NETBSD) || defined(__NetBSD__) /* XXX tnn not sure why NETBSD isn't defined, it looks like it should be ... */
      /* e.g. on FreeBSD 4.8 or newer, neundorf@kde.org */
      pthread_attr_get_np(thread, &sattr);
  #  else
diff --git a/devel/xulrunner/patches/patch-ipc_chromium_src_base_platform__thread__posix.cc b/devel/xulrunner/patches/patch-ipc_chromium_src_base_platform__thread__posix.cc
new file mode 100644
index 00000000000..926eaa9acc7
--- /dev/null
+++ b/devel/xulrunner/patches/patch-ipc_chromium_src_base_platform__thread__posix.cc
@@ -0,0 +1,14 @@
+$NetBSD: patch-ipc_chromium_src_base_platform__thread__posix.cc,v 1.10 2013/03/30 20:03:09 ryoon Exp $
+
+--- ipc/chromium/src/base/platform_thread_posix.cc.orig	2013-03-07 10:48:46.000000000 +0000
++++ ipc/chromium/src/base/platform_thread_posix.cc
+@@ -10,7 +10,9 @@
+ #if defined(OS_MACOSX)
+ #include <mach/mach.h>
+ #elif defined(OS_NETBSD)
++_Pragma("GCC visibility push(default)")
+ #include <lwp.h>
++_Pragma("GCC visibility pop")
+ #elif defined(OS_LINUX)
+ #include <sys/syscall.h>
+ #include <sys/prctl.h>