apply band-aid for nbsed bug.

3 files changed, 21 insertions, 7 deletions

diff --git a/devel/xulrunner/Makefile b/devel/xulrunner/Makefile
index 30d936a4b23..19d2e48256d 100644
--- a/devel/xulrunner/Makefile
+++ b/devel/xulrunner/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.26 2009/11/03 22:31:58 tnn Exp $
+# $NetBSD: Makefile,v 1.27 2009/11/04 09:13:05 tnn Exp $
 #
 
 DISTNAME=	firefox-${FIREFOX_VER}.source
@@ -50,6 +50,10 @@ INCLUDE_SUBDIRS=\
 	webbrwsr webshell widget windowwatcher xpcom xpconnect xulapp	\
 	plugin liveconnect
 
+# xxxtnn seamonkey stuff. Don't commit
+# txmgr appcomps appshell alerts rdfutil	\
+#	unicharutil lwbrk editor zipwriter mork
+
 post-install:
 	# XXX fix the pkg-config files instead
 	rm -f ${DESTDIR}${PREFIX}/lib/xulrunner/libxpcomglue.a
diff --git a/devel/xulrunner/distinfo b/devel/xulrunner/distinfo
index 03884871dcb..8a68de78dd6 100644
--- a/devel/xulrunner/distinfo
+++ b/devel/xulrunner/distinfo
@@ -1,9 +1,9 @@
-$NetBSD: distinfo,v 1.14 2009/10/28 11:36:36 tnn Exp $
+$NetBSD: distinfo,v 1.15 2009/11/04 09:13:05 tnn Exp $
 
 SHA1 (firefox-3.5.4.source.tar.bz2) = ce250208371326d03e72a02d223bc136cd376e5d
 RMD160 (firefox-3.5.4.source.tar.bz2) = e89ff54fef6d036538c9779176f5086a8eaa721e
 Size (firefox-3.5.4.source.tar.bz2) = 46905557 bytes
-SHA1 (patch-aa) = 1a103647b3ce602e1bf2d22f6486a6649a68878b
+SHA1 (patch-aa) = 9a98321786ffb21765c0b313b22157b830905a61
 SHA1 (patch-ab) = 5331bae45501013d3ca13d161226e311bc10aafe
 SHA1 (patch-ac) = e50356963fd235ea11fa45baae356fcf21c6669d
 SHA1 (patch-ad) = 7afb960af4e4a311481e7a7b25008ca9b9f7fba1
diff --git a/devel/xulrunner/patches/patch-aa b/devel/xulrunner/patches/patch-aa
index 0429df19326..614ce6d67d0 100644
--- a/devel/xulrunner/patches/patch-aa
+++ b/devel/xulrunner/patches/patch-aa
@@ -1,6 +1,6 @@
-$NetBSD: patch-aa,v 1.2 2009/10/11 10:49:56 tnn Exp $
+$NetBSD: patch-aa,v 1.3 2009/11/04 09:13:06 tnn Exp $
 
---- configure.in.orig	2009-08-24 17:52:36.000000000 +0200
+--- configure.in.orig	2009-10-16 17:13:35.000000000 +0200
 +++ configure.in
 @@ -1799,7 +1799,7 @@ case "$target" in
      fi
@@ -47,7 +47,7 @@ $NetBSD: patch-aa,v 1.2 2009/10/11 10:49:56 tnn Exp $
  *)
  	AC_CHECK_LIB(c_r, gethostbyname_r)
  	;;
-@@ -4160,6 +4173,14 @@ else
+@@ -4158,6 +4171,14 @@ else
     fi
  fi
  
@@ -62,7 +62,17 @@ $NetBSD: patch-aa,v 1.2 2009/10/11 10:49:56 tnn Exp $
  if test -z "$SKIP_LIBRARY_CHECKS"; then
  dnl system JPEG support
  dnl ========================================================
-@@ -8468,6 +8489,8 @@ if test -z "$MOZ_NATIVE_NSPR"; then
+@@ -8375,7 +8396,8 @@ rm -f confdefs.h.save
+ mv confdefs.h confdefs.h.save
+ egrep -v "$_EGREP_PATTERN" confdefs.h.save > confdefs.h
+ AC_OUTPUT_MAKE_DEFS()
+-MOZ_DEFINES=$DEFS
++# nbsed broken. PR bin/42261
++MOZ_DEFINES="$DEFS`awk 'BEGIN {while(x<1000){printf " ";x++}}'`"
+ AC_SUBST(MOZ_DEFINES)
+ rm -f confdefs.h
+ mv confdefs.h.save confdefs.h
+@@ -8466,6 +8488,8 @@ if test -z "$MOZ_NATIVE_NSPR"; then
      AC_MSG_WARN([Recreating autoconf.mk with updated nspr-config output])
      if test "$OS_ARCH" != "WINNT" && test "$OS_ARCH" != "WINCE"; then
         NSPR_LIBS=`./nsprpub/config/nspr-config --prefix=$LIBXUL_DIST --exec-prefix=$MOZ_BUILD_ROOT/dist --libdir=$LIBXUL_DIST/lib --libs`