Bump PKGREVISION.

Fix PR pkg/47310

Add pkg/47201-like patch to configure.in.

3 files changed, 21 insertions, 10 deletions

diff --git a/devel/xulrunner10/Makefile b/devel/xulrunner10/Makefile
index bc42cbf8fc8..c70dfff4a5b 100644
--- a/devel/xulrunner10/Makefile
+++ b/devel/xulrunner10/Makefile
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.9 2012/10/13 10:16:23 ryoon Exp $
+# $NetBSD: Makefile,v 1.10 2012/12/12 11:12:20 ryoon Exp $
 
 .include "dist.mk"
 PKGNAME=	xulrunner10-${MOZ_BRANCH}${MOZ_BRANCH_MINOR}
+PKGREVISION=	1
 CATEGORIES=	devel www
 
 MAINTAINER=	tnn@NetBSD.org
diff --git a/devel/xulrunner10/distinfo b/devel/xulrunner10/distinfo
index 727caa64e81..2a5af084bc8 100644
--- a/devel/xulrunner10/distinfo
+++ b/devel/xulrunner10/distinfo
@@ -1,9 +1,9 @@
-$NetBSD: distinfo,v 1.8 2012/11/21 13:02:17 is Exp $
+$NetBSD: distinfo,v 1.9 2012/12/12 11:12:20 ryoon Exp $
 
 SHA1 (firefox-10.0.11esr.source.tar.bz2) = 3afbc0cc6edae94aa4e9fb3a8b060e5b2aabc0e7
 RMD160 (firefox-10.0.11esr.source.tar.bz2) = 55dabf58e48bd5628c0d209576a12b231350283a
 Size (firefox-10.0.11esr.source.tar.bz2) = 75444542 bytes
-SHA1 (patch-aa) = 27261c9d6696cd609dd019fa7588f356df7c5ce5
+SHA1 (patch-aa) = c0db75aa9eb12e407c6ad7a869087fca8172e08e
 SHA1 (patch-ab) = b1efa63d3f9e0dca0247037696839dbce756f88c
 SHA1 (patch-ac) = 4da7049472449bb05590ca434c09a1e08423d2eb
 SHA1 (patch-ad) = c5589daa0a2ec33bab17e1b6994b43313e3ba8e3
diff --git a/devel/xulrunner10/patches/patch-aa b/devel/xulrunner10/patches/patch-aa
index a26d9bcb54f..77988d5449e 100644
--- a/devel/xulrunner10/patches/patch-aa
+++ b/devel/xulrunner10/patches/patch-aa
@@ -1,6 +1,6 @@
-$NetBSD: patch-aa,v 1.1.1.1 2012/03/15 08:58:28 ryoon Exp $
+$NetBSD: patch-aa,v 1.2 2012/12/12 11:12:20 ryoon Exp $
 
---- configure.in.orig	2012-03-09 22:20:09.000000000 +0000
+--- configure.in.orig	2012-11-15 18:24:02.000000000 +0000
 +++ configure.in
 @@ -2328,7 +2328,7 @@ case "$target" in
      MOZ_FIX_LINK_PATHS='-Wl,-executable_path,$(LIBXUL_DIST)/bin'
@@ -31,7 +31,17 @@ $NetBSD: patch-aa,v 1.1.1.1 2012/03/15 08:58:28 ryoon Exp $
  *)
  	AC_CHECK_LIB(c_r, gethostbyname_r)
  	;;
-@@ -4330,6 +4336,14 @@ if test -n "$YASM"; then
+@@ -3711,6 +3717,9 @@ AC_CACHE_CHECK(
+         #ifdef linux
+         #define _BSD_SOURCE 1
+         #endif
++	#ifdef __NetBSD__
++	#error use of global _res variable in threaded programs is not portable
++	#endif
+         #include <resolv.h>
+         ],
+         [int foo = res_ninit(&_res);],
+@@ -4330,6 +4339,14 @@ if test -n "$YASM"; then
    _YASM_BUILD=`        echo ${YASM_VERSION} | $AWK -F\. '{ print $4 }'`
  fi
  
@@ -46,7 +56,7 @@ $NetBSD: patch-aa,v 1.1.1.1 2012/03/15 08:58:28 ryoon Exp $
  if test -z "$SKIP_LIBRARY_CHECKS"; then
  dnl system JPEG support
  dnl ========================================================
-@@ -5616,20 +5630,20 @@ if test -n "$MOZ_WEBM"; then
+@@ -5616,20 +5633,20 @@ if test -n "$MOZ_WEBM"; then
                       [MOZ_NATIVE_LIBVPX_DEC_TEST=1],
                       ([--with-system-libvpx requested but symbol vpx_codec_dec_init_ver not found]))
          if test -n "$MOZ_NATIVE_LIBVPX_DEC_TEST" ; then
@@ -73,7 +83,7 @@ $NetBSD: patch-aa,v 1.1.1.1 2012/03/15 08:58:28 ryoon Exp $
                      #error "test failed."
                  #endif
                  ],
-@@ -5639,7 +5653,7 @@ if test -n "$MOZ_WEBM"; then
+@@ -5639,7 +5656,7 @@ if test -n "$MOZ_WEBM"; then
                   MOZ_LIBVPX_INCLUDES="-I${LIBVPX_DIR}/include"
                   MOZ_LIBVPX_LIBS="-L${LIBVPX_DIR}/lib -lvpx"],
                  [AC_MSG_RESULT([no])
@@ -82,7 +92,7 @@ $NetBSD: patch-aa,v 1.1.1.1 2012/03/15 08:58:28 ryoon Exp $
          fi
          CFLAGS=$_SAVE_CFLAGS
          LDFLAGS=$_SAVE_LDFLAGS
-@@ -5673,11 +5687,11 @@ if test -n "$MOZ_WEBM" -a -z "$MOZ_NATIV
+@@ -5673,11 +5690,11 @@ if test -n "$MOZ_WEBM" -a -z "$MOZ_NATIV
  
      dnl See if we have assembly on this platform.
      case "$OS_ARCH:$CPU_ARCH" in
@@ -96,7 +106,7 @@ $NetBSD: patch-aa,v 1.1.1.1 2012/03/15 08:58:28 ryoon Exp $
        VPX_ASFLAGS="-f elf64 -rnasm -pnasm -DPIC"
        VPX_X86_ASM=1
      ;;
-@@ -8915,6 +8929,8 @@ if test -z "$MOZ_NATIVE_NSPR"; then
+@@ -8930,6 +8947,8 @@ if test -z "$MOZ_NATIVE_NSPR"; then
      AC_MSG_WARN([Recreating autoconf.mk with updated nspr-config output])
      if test "$OS_ARCH" != "WINNT"; then
         NSPR_LIBS=`./nsprpub/config/nspr-config --prefix=$LIBXUL_DIST --exec-prefix=$MOZ_BUILD_ROOT/dist --libdir=$LIBXUL_DIST/lib --libs`