Bump PKGREVISION

Fix PR/47201
Fix _res is not supported for multi-threaded programs. error.

Patch is provided by Martin Husemann
in http://mail-index.netbsd.org/current-users/2012/11/12/msg021470.html .
And tested by Patrick Welche and me.

4 files changed, 25 insertions, 15 deletions

diff --git a/devel/xulrunner/Makefile b/devel/xulrunner/Makefile
index 53de6a1a855..bde30199664 100644
--- a/devel/xulrunner/Makefile
+++ b/devel/xulrunner/Makefile
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.83 2012/10/12 18:27:20 ryoon Exp $
+# $NetBSD: Makefile,v 1.84 2012/11/17 10:57:48 ryoon Exp $
 
 .include "dist.mk"
 PKGNAME=	xulrunner-${MOZ_BRANCH}${MOZ_BRANCH_MINOR}
+PKGREVISION=	1
 CATEGORIES=	devel www
 
 MAINTAINER=	tnn@NetBSD.org
diff --git a/devel/xulrunner/distinfo b/devel/xulrunner/distinfo
index 4eb61bf0fe6..4d3b2fe95ed 100644
--- a/devel/xulrunner/distinfo
+++ b/devel/xulrunner/distinfo
@@ -1,9 +1,9 @@
-$NetBSD: distinfo,v 1.82 2012/11/11 22:26:00 joerg Exp $
+$NetBSD: distinfo,v 1.83 2012/11/17 10:57:48 ryoon Exp $
 
 SHA1 (firefox-16.0.2.source.tar.bz2) = 0ffe96896583e92561b341330ab09ddc50140dd1
 RMD160 (firefox-16.0.2.source.tar.bz2) = 74424c68e594fff842104385bb6c6f2a3a034fd2
 Size (firefox-16.0.2.source.tar.bz2) = 89452077 bytes
-SHA1 (patch-aa) = 2c9a546ae951630e07668c9875d20041a6e5adac
+SHA1 (patch-aa) = 3ed2da1996745e2056fbdb2f9272908cb5d5ff14
 SHA1 (patch-ab) = b0d7975a291c63e07773e13b023f71e88c883128
 SHA1 (patch-ac) = 18640ddf00b7da9276fd67d95bd6f1b191a99d4f
 SHA1 (patch-ad) = cf84430cb1d9c22caf6beaa89288f90577ae6352
diff --git a/devel/xulrunner/patches/patch-aa b/devel/xulrunner/patches/patch-aa
index 64ada0064d9..45308515199 100644
--- a/devel/xulrunner/patches/patch-aa
+++ b/devel/xulrunner/patches/patch-aa
@@ -1,8 +1,6 @@
-$NetBSD: patch-aa,v 1.12 2012/08/28 23:27:10 ryoon Exp $
-
---- configure.in.orig	2012-08-24 22:55:19.000000000 +0000
-+++ configure.in
-@@ -2299,7 +2299,7 @@ case "$target" in
+--- configure.in.orig	2012-10-24 16:32:27.000000000 +0200
++++ configure.in	2012-11-12 11:29:00.000000000 +0100
+@@ -2040,7 +2040,7 @@ case "$target" in
      MOZ_FIX_LINK_PATHS='-Wl,-executable_path,$(LIBXUL_DIST)/bin'
      ;;
  
@@ -11,7 +9,7 @@ $NetBSD: patch-aa,v 1.12 2012/08/28 23:27:10 ryoon Exp $
      if test `test -x /usr/bin/objformat && /usr/bin/objformat || echo elf` != "elf"; then
  	DLL_SUFFIX=".so.1.0"
  	DSO_LDOPTS="-shared"
-@@ -2307,6 +2307,9 @@ case "$target" in
+@@ -2048,6 +2048,9 @@ case "$target" in
      if test ! "$GNU_CC"; then
  	DSO_LDOPTS="-Bshareable $DSO_LDOPTS"
      fi
@@ -21,7 +19,7 @@ $NetBSD: patch-aa,v 1.12 2012/08/28 23:27:10 ryoon Exp $
      ;;
  
  ia64*-hpux*)
-@@ -3309,6 +3312,9 @@ dnl ====================================
+@@ -3027,6 +3030,9 @@ dnl ====================================
  case $target in
  *-hpux11.*)
  	;;
@@ -31,7 +29,17 @@ $NetBSD: patch-aa,v 1.12 2012/08/28 23:27:10 ryoon Exp $
  *)
  	AC_CHECK_LIB(c_r, gethostbyname_r)
  	;;
-@@ -4308,6 +4314,14 @@ if test -n "$YASM"; then
+@@ -3328,6 +3334,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);],
+@@ -3992,6 +4001,14 @@ if test -n "$YASM"; then
    _YASM_BUILD=`        echo ${YASM_VERSION} | $AWK -F\. '{ print $4 }'`
  fi
  
@@ -46,7 +54,7 @@ $NetBSD: patch-aa,v 1.12 2012/08/28 23:27:10 ryoon Exp $
  if test -z "$SKIP_LIBRARY_CHECKS"; then
  dnl system JPEG support
  dnl ========================================================
-@@ -5734,11 +5748,11 @@ if test -n "$MOZ_WEBM" -a -z "$MOZ_NATIV
+@@ -5438,11 +5455,11 @@ if test -n "$MOZ_VP8" -a -z "$MOZ_NATIVE
  
      dnl See if we have assembly on this platform.
      case "$OS_ARCH:$CPU_ARCH" in
@@ -60,7 +68,7 @@ $NetBSD: patch-aa,v 1.12 2012/08/28 23:27:10 ryoon Exp $
        VPX_ASFLAGS="-f elf64 -rnasm -pnasm -DPIC"
        VPX_X86_ASM=1
      ;;
-@@ -6140,7 +6154,7 @@ if test -n "$MOZ_CRASHREPORTER"; then
+@@ -5841,7 +5858,7 @@ if test -n "$MOZ_CRASHREPORTER"; then
      AC_MSG_ERROR([Breakpad tools do not support compiling on $HOST_OS_ARCH while targeting $OS_ARCH.  Use --disable-crashreporter.])
    fi
  
@@ -69,7 +77,7 @@ $NetBSD: patch-aa,v 1.12 2012/08/28 23:27:10 ryoon Exp $
      MOZ_CRASHREPORTER_INJECTOR=1
      AC_DEFINE(MOZ_CRASHREPORTER_INJECTOR)
    fi
-@@ -9248,6 +9262,8 @@ if test -z "$MOZ_NATIVE_NSPR"; then
+@@ -9105,6 +9122,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`
diff --git a/www/firefox/Makefile b/www/firefox/Makefile
index bb51cebb9bd..55a8c6bb62b 100644
--- a/www/firefox/Makefile
+++ b/www/firefox/Makefile
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.114 2012/10/12 18:27:21 ryoon Exp $
+# $NetBSD: Makefile,v 1.115 2012/11/17 10:57:49 ryoon Exp $
 
 .include "../../devel/xulrunner/dist.mk"
 PKGNAME=	firefox-${FIREFOX_VER}
+PKGREVISION=	1
 CATEGORIES=	www
 
 MAINTAINER=	tnn@NetBSD.org