 @@ -1,33 +1,33 @@
-$NetBSD: distinfo,v 1.9 2012/12/12 11:12:20 ryoon Exp $
+$NetBSD: distinfo,v 1.10 2012/12/22 02:22:44 joerg 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) = c0db75aa9eb12e407c6ad7a869087fca8172e08e
+SHA1 (patch-aa) = 3724d682a564b0a47b1313c4e5403d5b43b1904a
 SHA1 (patch-ab) = b1efa63d3f9e0dca0247037696839dbce756f88c
-SHA1 (patch-ac) = 4da7049472449bb05590ca434c09a1e08423d2eb
+SHA1 (patch-ac) = 4194776ef3978f261cdade72617c05c08bd33aa6
 SHA1 (patch-ad) = c5589daa0a2ec33bab17e1b6994b43313e3ba8e3
 SHA1 (patch-ae) = ca217066945938eece33a6ee41ca8b8d2ccbf6f0
 SHA1 (patch-af) = 57bb4796db6e039ece84641c07f18b27e372f650
 SHA1 (patch-ag) = 588c45ed234065f86b047e2a794d979d4bad71fb
 SHA1 (patch-ai) = aa72079de6e9baf601858ab55d7300c1ed280156
 SHA1 (patch-aj) = 66c1ef5c3c7d9535852de2c22e792999a6a5f0a7
 SHA1 (patch-ak) = f62c0a24a73c6846ff970509ff3cf78c361bb877
 SHA1 (patch-al) = b6c3ba5a629497792fb44e90194f31d58328ac53
 SHA1 (patch-am) = b9f661c03254d15a4f9b83eb355d3b3b6b92dd65
 SHA1 (patch-an) = 46118ebe923396152ce1ca61d160fbddf1052d2a
 SHA1 (patch-ao) = 0d4a477ab9269cddc4a2247394218e44f12f7d1f
-SHA1 (patch-as) = 8a4354a05fb4c83cbd68dc6f7e2604f0c2716fa4
+SHA1 (patch-as) = c80bc3d7fae15bcc16b9070d699bbed1fcc15fc2
 SHA1 (patch-at) = 4d8d23696420eebb23750c540b716684c5fb0d3e
 SHA1 (patch-au) = cb37d97689feb836f519b6349b2dbda95b8a9836
 SHA1 (patch-av) = 65999b032ec3135c53a3515b220af8af622e11c9
 SHA1 (patch-aw) = 7fcd504c1a62468ec8967df17a7f5273c8a8c0ad
 SHA1 (patch-ax) = 23f02e7143c506c945982fa4188c2f638359a9dc
 SHA1 (patch-ay) = 17ecad1d8318d7b2bf7f5c0ddafd7632342824de
 SHA1 (patch-az) = a67db6a9177608db285543024a038057000236b4
 SHA1 (patch-ba) = 6b89bca6bf1386727c7524a27eb6542a95f0942e
 SHA1 (patch-bd) = 5587f869954c9468924c42200f87910b49c0f153
 SHA1 (patch-bf) = e47c21494521a39f71132cc0badf727e7050bd9c
 SHA1 (patch-bg) = 669ca920b137d5fdd10b621013a7a02f78bfba6b
 SHA1 (patch-bi) = 9e76596ab9a48abdab0bfbcd9f8bb3d067c6f7bd
 SHA1 (patch-build_autoconf_gcc-pr49911.m4) = d994d058116875255af451c4bf411929caf8c1a9

 @@ -1,117 +1,127 @@
-$NetBSD: patch-aa,v 1.2 2012/12/12 11:12:20 ryoon Exp $
+$NetBSD: patch-aa,v 1.3 2012/12/22 02:22:44 joerg Exp $
 --- 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'
      ;;
 -*-freebsd*)
 +*-freebsd* | *-dragonfly*)
      if test `test -x /usr/bin/objformat && /usr/bin/objformat || echo elf` != "elf"; then
  	DLL_SUFFIX=".so.1.0"
  	DSO_LDOPTS="-shared"
 @@ -2336,6 +2336,9 @@ case "$target" in
      if test ! "$GNU_CC"; then
  	DSO_LDOPTS="-Bshareable $DSO_LDOPTS"
      fi
 +    if test "$LIBRUNPATH"; then
 +	DSO_LDOPTS="-Wl,-R$LIBRUNPATH $DSO_LDOPTS"
 +    fi
      ;;
  ia64*-hpux*)
-@@ -3377,6 +3380,9 @@ dnl ====================================
+@@ -3178,6 +3181,9 @@ if test "$GNU_CC"; then
    AC_CACHE_CHECK(for visibility(hidden) attribute,
                   ac_cv_visibility_hidden,
                   [cat > conftest.c <<EOF
 +#ifdef __clang__
 +#error Not supported by old Mozilla
 +#endif
                    int foo __attribute__ ((visibility ("hidden"))) = 1;
  EOF
                    ac_cv_visibility_hidden=no
@@ -3377,6 +3383,9 @@ dnl ====================================
  case $target in
  *-hpux11.*)
  	;;
 +*-dragonfly*)
 +	AC_CHECK_LIB(c, gethostbyname_r)
 +	;;
  *)
  	AC_CHECK_LIB(c_r, gethostbyname_r)
  	;;
-@@ -3711,6 +3717,9 @@ AC_CACHE_CHECK(
+@@ -3711,6 +3720,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
+@@ -4330,6 +4342,14 @@ if test -n "$YASM"; then
    _YASM_BUILD=`        echo ${YASM_VERSION} | $AWK -F\. '{ print $4 }'`
  fi
 +if test -n "${LIBXUL_SDK_DIR}"; then
 +    AC_MSG_WARN([pkgsrc: LIBXUL_SDK_DIR is set; assuming we want nss and nspr from xulrunner.])
 +    NSPR_CFLAGS="-I${prefix}/include/xulrunner10/unstable `pkg-config --cflags mozilla-nspr`"
 +    NSPR_LIBS="`pkg-config --libs mozilla-nspr`"
 +    NSS_CFLAGS="`pkg-config --cflags mozilla-nss`"
 +    NSS_LIBS="`pkg-config --libs mozilla-nss`"
 +fi
++
  if test -z "$SKIP_LIBRARY_CHECKS"; then
  dnl system JPEG support
  dnl ========================================================
-@@ -5616,20 +5633,20 @@ if test -n "$MOZ_WEBM"; then
+@@ -5616,20 +5636,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
 -            AC_MSG_CHECKING([for libvpx version >= v0.9.7])
 -            dnl We need at least v0.9.7 to fix several crash bugs (for which we
 -            dnl had local patches prior to v0.9.7).
 +            AC_MSG_CHECKING([for libvpx version >= v1.0.0])
 +            dnl We need at least v1.0.0 to fix several crash bugs (for which we
 +            dnl had local patches prior to v1.0.0).
              dnl
              dnl This is a terrible test for the library version, but we don't
              dnl have a good one. There is no version number in a public header,
              dnl and testing the headers still doesn't guarantee we link against
              dnl the right version. While we could call vpx_codec_version() at
              dnl run-time, that would break cross-compiling. There are no
 -            dnl additional exported symbols between the v0.9.7 release and the
 -            dnl v0.9.6 one to check for.
 +            dnl additional exported decoder symbols between the v1.0.0 release
 +            dnl and the v0.9.7 one to check for.
              AC_TRY_COMPILE([
                  #include <vpx/vpx_decoder.h>
 -                #if !defined(VPX_CODEC_USE_INPUT_PARTITION)
 +                #if !defined(VPX_CODEC_USE_INPUT_FRAGMENTS)
                      #error "test failed."
                  #endif
                  ],
-@@ -5639,7 +5656,7 @@ if test -n "$MOZ_WEBM"; then
+@@ -5639,7 +5659,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])
 -                 AC_MSG_ERROR([--with-system-libvpx requested but it is not v0.9.7 or later])])
 +                 AC_MSG_ERROR([--with-system-libvpx requested but it is not v1.0.0 or later])])
          fi
          CFLAGS=$_SAVE_CFLAGS
          LDFLAGS=$_SAVE_LDFLAGS
-@@ -5673,11 +5690,11 @@ if test -n "$MOZ_WEBM" -a -z "$MOZ_NATIV
+@@ -5673,11 +5693,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
 -    Linux:x86)
 +    Linux:x86|DragonFly:x86|*BSD:i386)
        VPX_ASFLAGS="-f elf32 -rnasm -pnasm"
        VPX_X86_ASM=1
      ;;
 -    Linux:x86_64)
 +    Linux:x86_64|DragonFly:x86_64|*BSD:x86_64)
        VPX_ASFLAGS="-f elf64 -rnasm -pnasm -DPIC"
        VPX_X86_ASM=1
      ;;
-@@ -8930,6 +8947,8 @@ if test -z "$MOZ_NATIVE_NSPR"; then
+@@ -8930,6 +8950,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`
 +       AC_MSG_WARN([pkgsrc: adding run path to NSPR_LIBS for bundled NSPR.])
 +       NSPR_LIBS="-Wl,-R${prefix}/lib/\${MOZILLA_PKG_NAME} ${NSPR_LIBS}"
         $PERL -pi.bak -e "s '^NSPR_LIBS\\s*=.*'NSPR_LIBS = $NSPR_LIBS'" config/autoconf.mk
         NSPR_CFLAGS=`./nsprpub/config/nspr-config --prefix=$LIBXUL_DIST --exec-prefix=$MOZ_BUILD_ROOT/dist --includedir=$LIBXUL_DIST/include/nspr --cflags`
         $PERL -pi.bak -e "s '^NSPR_CFLAGS\\s*=.*'NSPR_CFLAGS = $NSPR_CFLAGS'" config/autoconf.mk

 @@ -1,27 +1,37 @@
-$NetBSD: patch-ac,v 1.1.1.1 2012/03/15 08:58:28 ryoon Exp $
+$NetBSD: patch-ac,v 1.2 2012/12/22 02:22:44 joerg Exp $
---- nsprpub/configure.in.orig	2012-03-09 22:20:31.000000000 +0000
+--- nsprpub/configure.in.orig	2012-11-15 18:24:51.000000000 +0000
 +++ nsprpub/configure.in
 @@ -71,7 +71,7 @@ OBJDIR_NAME=.
  OBJDIR_SUFFIX=OBJ
  NSINSTALL='$(MOD_DEPTH)/config/$(OBJDIR_NAME)/nsinstall'
  NOSUCHFILE=/no-such-file
 -LIBNSPR='-L$(dist_libdir) -lnspr$(MOD_MAJOR_VERSION)'
 +LIBNSPR='-Wl,-R${prefix}/lib/${MOZILLA_PKG_NAME} -L$(dist_libdir) -lnspr$(MOD_MAJOR_VERSION)'
  LIBPLC='-L$(dist_libdir) -lplc$(MOD_MAJOR_VERSION)'
  CYGWIN_WRAPPER=
  MACOS_SDK_DIR=
-@@ -1567,6 +1567,33 @@ tools are selected during the Xcode/Deve
+@@ -769,6 +769,9 @@ if test "$GNU_CC"; then
      AC_CACHE_CHECK(for visibility(hidden) attribute,
          ac_cv_visibility_hidden,
          [cat > conftest.c <<EOF
 +#ifdef __clang__
 +#error Not supported by old Mozilla
 +#endif
          int foo __attribute__ ((visibility ("hidden"))) = 1;
  EOF
          ac_cv_visibility_hidden=no
@@ -1567,6 +1570,33 @@ tools are selected during the Xcode/Deve
      DSO_LDOPTS='-shared -Wl,-soname -Wl,$(notdir $@)'
      MDCPUCFG_H=_freebsd.cfg
      PR_MD_CSRCS=freebsd.c
 +    if test "$LIBRUNPATH"; then
 +        DSO_LDOPTS="$DSO_LDOPTS -Wl,-R$LIBRUNPATH"
 +    fi
 +    ;;
++
 +*-dragonfly*)
 +    if test -z "$USE_NSPR_THREADS"; then
 +        USE_PTHREADS=1
 +    fi
 +    AC_DEFINE(XP_UNIX)
 @@ -35,48 +45,48 @@ $NetBSD: patch-ac,v 1.1.1.1 2012/03/15 0
 +        DLL_SUFFIX=so.1.0
 +    fi
 +    MKSHLIB='$(CC) $(DSO_LDOPTS) -o $@'
 +    DSO_CFLAGS=-fPIC
 +    DSO_LDOPTS='-shared -Wl,-soname -Wl,$(notdir $@)'
 +    MDCPUCFG_H=_dragonfly.cfg
 +    PR_MD_CSRCS=freebsd.c
 +    if test "$LIBRUNPATH"; then
 +        DSO_LDOPTS="$DSO_LDOPTS -Wl,-R$LIBRUNPATH"
 +    fi
      ;;
  *-hpux*)
-@@ -2154,6 +2181,7 @@ mips-nec-sysv*)
+@@ -2154,6 +2184,7 @@ mips-nec-sysv*)
      AC_DEFINE(XP_UNIX)
      AC_DEFINE(NETBSD)
      AC_DEFINE(HAVE_BSD_FLOCK)
 +    AC_DEFINE(HAVE_SOCKLEN_T)
      if test -z "$USE_NSPR_THREADS"; then
          USE_PTHREADS=1
      fi
-@@ -2962,7 +2990,7 @@ if test -n "$USE_PTHREADS"; then
+@@ -2962,7 +2993,7 @@ if test -n "$USE_PTHREADS"; then
  	if test -z "`egrep -i '(unrecognize|unknown)' conftest.out | grep pthread`" && test -z "`egrep -i '(error|incorrect)' conftest.out`" ; then
  	    ac_cv_have_dash_pthread=yes
  		case "$target_os" in
 -	    freebsd*)
 +	    freebsd* | dragonfly*)
  # Freebsd doesn't use -pthread for compiles, it uses them for linking
              ;;
  	    *)
-@@ -3000,7 +3028,7 @@ if test -n "$USE_PTHREADS"; then
+@@ -3000,7 +3031,7 @@ if test -n "$USE_PTHREADS"; then
              _PTHREAD_LDFLAGS=
          fi
  	    ;;
 -    *-freebsd*)
 +    *-freebsd* | *-dragonfly*)
  	    AC_DEFINE(_REENTRANT)
  	    AC_DEFINE(_THREAD_SAFE)
  	    dnl -pthread links in -lc_r, so don't specify it explicitly.
-@@ -3081,7 +3109,7 @@ case "$target" in
+@@ -3081,7 +3112,7 @@ case "$target" in
          AC_DEFINE(_PR_NEED_PTHREAD_INIT)
      fi
      ;;
 -*-freebsd*)
 +*-freebsd* | *-dragonfly*)
      if test -n "$USE_NSPR_THREADS"; then
          AC_DEFINE(_PR_LOCAL_THREADS_ONLY)
      fi

 @@ -1,18 +1,18 @@
-$NetBSD: patch-as,v 1.1.1.1 2012/03/15 08:58:28 ryoon Exp $
+$NetBSD: patch-as,v 1.2 2012/12/22 02:22:44 joerg Exp $
 Treat DragonFly like FreeBSD.
---- js/src/configure.in.orig	2012-03-09 22:20:17.000000000 +0000
+--- js/src/configure.in.orig	2012-11-15 18:24:19.000000000 +0000
 +++ js/src/configure.in
 @@ -799,7 +799,7 @@ EOF
                  AC_LANG_RESTORE
              ])
 -        if test "$ac_cv_have_std__Throw" == "yes"; then
 +        if test "$ac_cv_have_std__Throw" = "yes"; then
              AC_CACHE_CHECK(for |class __declspec(dllimport) exception| bug,
                             ac_cv_have_dllimport_exception_bug,
+                 [
 @@ -2157,7 +2157,7 @@ case "$target" in
      MOZ_FIX_LINK_PATHS='-Wl,-executable_path,$(LIBXUL_DIST)/bin'
      ;;
 @@ -21,22 +21,32 @@ Treat DragonFly like FreeBSD.
 +*-freebsd*|*-dragonfly*)
      if test `test -x /usr/bin/objformat && /usr/bin/objformat || echo elf` != "elf"; then
  	DLL_SUFFIX=".so.1.0"
  	DSO_LDOPTS="-shared"
 @@ -2818,7 +2818,7 @@ case "$target" in
  *-solaris*)
      AC_DEFINE(AVMPLUS_UNIX)
      ;;
 -*-freebsd*|*-kfreebsd*)
 +*-freebsd*|*-kfreebsd*|*-netbsd*|*-dragonfly*)
      AC_DEFINE(AVMPLUS_UNIX)
      ;;
  *-openbsd*)
-@@ -4344,7 +4344,7 @@ if test "$MOZ_MEMORY"; then
+@@ -3077,6 +3077,9 @@ if test "$GNU_CC"; then
    AC_CACHE_CHECK(for visibility(hidden) attribute,
                   ac_cv_visibility_hidden,
                   [cat > conftest.c <<EOF
 +#ifdef __clang__
 +#error Not supported by old Mozilla
 +#endif
                    int foo __attribute__ ((visibility ("hidden"))) = 1;
  EOF
                    ac_cv_visibility_hidden=no
@@ -4344,7 +4347,7 @@ if test "$MOZ_MEMORY"; then
    *-darwin*)
      AC_DEFINE(MOZ_MEMORY_DARWIN)
      ;;
 -  *-*freebsd*)
 +  *-*freebsd*|*-*dragonfly*)
      AC_DEFINE(MOZ_MEMORY_BSD)
      ;;
    *-android*|*-linuxandroid*)