 @@ -1,37 +1,37 @@
-$NetBSD: distinfo,v 1.10 2012/11/22 08:14:15 is Exp $
+$NetBSD: distinfo,v 1.11 2012/12/24 21:14:19 joerg Exp $
 SHA1 (enigmail-1.4.tar.gz) = 1ee4bcd8d38685af44c1aeeea4fbba7bf30513e4
 RMD160 (enigmail-1.4.tar.gz) = b3c717e150c826faae1daa09806e07dd16619c51
 Size (enigmail-1.4.tar.gz) = 1323467 bytes
 SHA1 (thunderbird-10.0.11esr.source.tar.bz2) = c7b2dd2fbead11d61da9508926e4c3e82bc2d099
 RMD160 (thunderbird-10.0.11esr.source.tar.bz2) = 29a600de7cf87adfcad58b1d097583b28a38a746
 Size (thunderbird-10.0.11esr.source.tar.bz2) = 97793584 bytes
-SHA1 (patch-aa) = a6787e51004112a2056fd695c44c8610ffcc0d60
+SHA1 (patch-aa) = e526125da549e9924135379cffae4754db94154f
 SHA1 (patch-aa-toplevel) = dfff316c77e468a3720f3d18e9edfc67059fc0e1
 SHA1 (patch-ab) = 6e243fcf826226330d6b62548838393bb1cbafb5
-SHA1 (patch-ac) = ade505e90d9e7dd90dedb711011be22a2a5c67f4
+SHA1 (patch-ac) = 805455591b4a9fc8e51ba65ac8ff41016b4edc7f
 SHA1 (patch-ad) = d6bad741c4bdfdd0ee0ca8062c2121ce82eb7fb0
 SHA1 (patch-ae) = 2627a9f9dfcbb03474c5e003cab9c8c6cc5dafa1
 SHA1 (patch-af) = 5a7112ce46f9a3843a78ae0a234527080c04f529
 SHA1 (patch-ag) = 40e9b2f82d7267ab0822a5f3b5120a0ef6e977cf
 SHA1 (patch-ai) = f03ec2d47f1a4772ec567cd38a79b841a4c0022e
 SHA1 (patch-aj) = 2a06c22133a05c51f56c4cf6650dcb6ae031ab06
 SHA1 (patch-ak) = 1b9038728e0e4d3cc23fd6a74d3d48759d77cbdd
 SHA1 (patch-al) = f12eb736f87a779becdd10631314ee5f8f88f080
 SHA1 (patch-am) = 108252ed517d9388f2a6c70ffa15782045ae23d5
 SHA1 (patch-an) = 7fe9f52b2825bb2db6835a431dc4a140d4984fc7
 SHA1 (patch-ao) = 644c4fcb52b3552fab5d7c5960205bf7a78a90c2
-SHA1 (patch-as) = a3dae1a6687d0e23193807783948b7aa146e1587
+SHA1 (patch-as) = d200d5b59f8a0d406f4fd8bde0fe150d0c2fbcd3
 SHA1 (patch-at) = 519a2d835e0cc9183bf7a899aee382fae72c3d5e
 SHA1 (patch-au) = 23a04bb48df4e54c058f09ab9036d4766d1f9e3e
 SHA1 (patch-av) = 1ef659c3fe6ecdaabc247b04d8f002f2d860602d
 SHA1 (patch-aw) = 480343cbefae9249f57948047d94f28312db94d4
 SHA1 (patch-ax) = 4fb8419d749ef5371bc3b227849bcfb42ab61453
 SHA1 (patch-ay) = f1d70709ac86475131f6b9cfd5b942bbda37cea4
 SHA1 (patch-az) = 67cbe6fd7e09692f095ce2bfd76f0f554eec240d
 SHA1 (patch-ba) = b015d5d067e21d134517410f68be43f414ffe669
 SHA1 (patch-bd) = 7d23bbf11b84aaad5f2c39bb68b95ecfc7def6b5
 SHA1 (patch-bf) = bfee07121770f85a1a5f85ee6b9ac4c97066d109
 SHA1 (patch-bg) = 9fcb2b715d5d2fdec3dceef63aa1dbbd5d40a377
 SHA1 (patch-bi) = 40fe7fb45d2bce5c783cb3277a2b45e86ac84777
 SHA1 (patch-directory_c-sdk_ldap_include_portable.h) = 1267429d7c38dd8d18132bd2afe6d0ffb1ea5062

 @@ -1,107 +1,117 @@
-$NetBSD: patch-aa,v 1.1.1.1 2012/03/15 09:45:29 ryoon Exp $
+$NetBSD: patch-aa,v 1.2 2012/12/24 21:14:19 joerg Exp $
---- mozilla/configure.in.orig	2012-02-16 10:24:47.000000000 +0000
+--- mozilla/configure.in.orig	2012-11-15 21:59:12.000000000 +0000
 +++ mozilla/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)
  	;;
-@@ -4330,6 +4336,14 @@ if test -n "$YASM"; then
+@@ -4330,6 +4339,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/xulrunner/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 +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
 -            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 +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])
 -                 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 +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
 -    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
      ;;
-@@ -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`
 +       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 09:45:29 ryoon Exp $
+$NetBSD: patch-ac,v 1.2 2012/12/24 21:14:19 joerg Exp $
---- mozilla/nsprpub/configure.in.orig	2012-02-16 10:25:22.000000000 +0000
+--- mozilla/nsprpub/configure.in.orig	2012-11-15 21:59:50.000000000 +0000
 +++ mozilla/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=
-@@ -1527,6 +1527,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*)
-@@ -2114,6 +2141,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
-@@ -2919,7 +2947,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
              ;;
  	    *)
-@@ -2957,7 +2985,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.
-@@ -3038,7 +3066,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 09:45:29 ryoon Exp $
+$NetBSD: patch-as,v 1.2 2012/12/24 21:14:19 joerg Exp $
 Treat DragonFly like FreeBSD.
---- mozilla/js/src/configure.in.orig	2012-02-16 10:25:02.000000000 +0000
+--- mozilla/js/src/configure.in.orig	2012-11-15 21:59:30.000000000 +0000
 +++ mozilla/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*)