Get this package closer to build under Solaris 10:

1.) Fix broken "yasm" version check which only accepts version numbers
    like "a.b.c.d" but not like "a.b.c" and therefore fails with
    Yasm 1.2.0. This probably affects other platforms (e.g. Linux
    as well).
2.) Use "-R" instead of non-portable "-rpath" linker option.

The build under Solaris 10 fails now during the build phase and not
already in the configuration phase.

3 files changed, 22 insertions, 16 deletions

diff --git a/mail/thunderbird/distinfo b/mail/thunderbird/distinfo
index ec80b460de7..82aac206e76 100644
--- a/mail/thunderbird/distinfo
+++ b/mail/thunderbird/distinfo
@@ -1,15 +1,12 @@
-$NetBSD: distinfo,v 1.115 2013/03/10 13:06:28 ryoon Exp $
+$NetBSD: distinfo,v 1.116 2013/03/30 23:31:35 tron Exp $
 
-SHA1 (enigmail-1.4.5.tar.gz) = 16d0450a9f5fb4de0e9cc5b9f8091dce4b070aaf
-RMD160 (enigmail-1.4.5.tar.gz) = 860a1ca813fd2ccae69ac0afe07affd39611e56a
-Size (enigmail-1.4.5.tar.gz) = 1269207 bytes
 SHA1 (lightning-1.9.source.tar.bz2) = 3cc625649debed6f7403c862f166b771b80b92ce
 RMD160 (lightning-1.9.source.tar.bz2) = 3396533847c05ed37537b9a78d771e55f767bea6
 Size (lightning-1.9.source.tar.bz2) = 113944316 bytes
 SHA1 (thunderbird-17.0.4esr.source.tar.bz2) = 6c90382a97ee671fbf5f9f83f086de282bde7958
 RMD160 (thunderbird-17.0.4esr.source.tar.bz2) = 488a413655a41f2ec5e3259ad3a6fa236980f127
 Size (thunderbird-17.0.4esr.source.tar.bz2) = 113367797 bytes
-SHA1 (patch-aa) = 5217684e8e6d587b1cfa65066bd9440b9a313cf3
+SHA1 (patch-aa) = e381d55c1514b77f6d0fe769363f49abfa50f05a
 SHA1 (patch-aa-toplevel) = b18a348a10efbf0caad1e3e58de2ecb1120ddaf3
 SHA1 (patch-ab) = 7432f73e9771260849d99e14008164bd3d564bf8
 SHA1 (patch-ac) = 3d54eef3657bf39b73e2851a33b8ee1aa9408131
diff --git a/mail/thunderbird/hacks.mk b/mail/thunderbird/hacks.mk
index 1de4426d2a0..a5f1da98a0c 100644
--- a/mail/thunderbird/hacks.mk
+++ b/mail/thunderbird/hacks.mk
@@ -1,6 +1,6 @@
-# $NetBSD: hacks.mk,v 1.2 2012/06/12 19:37:49 ryoon Exp $
+# $NetBSD: hacks.mk,v 1.3 2013/03/30 23:31:36 tron Exp $
 
 # workround for link of thunderbird-bin etc.
-LDFLAGS+=	-Wl,-rpath,${PREFIX}/lib/thunderbird
+LDFLAGS+=	-Wl,-R${PREFIX}/lib/thunderbird
 
 .include "../../devel/xulrunner/hacks.mk"
diff --git a/mail/thunderbird/patches/patch-aa b/mail/thunderbird/patches/patch-aa
index 3ee802c9845..08aaa5bbbcd 100644
--- a/mail/thunderbird/patches/patch-aa
+++ b/mail/thunderbird/patches/patch-aa
@@ -1,8 +1,8 @@
-$NetBSD: patch-aa,v 1.13 2012/11/23 07:17:54 ryoon Exp $
+$NetBSD: patch-aa,v 1.14 2013/03/30 23:31:36 tron Exp $
 
---- mozilla/configure.in.orig	2012-11-19 22:42:12.000000000 +0000
-+++ mozilla/configure.in
-@@ -2080,6 +2080,9 @@ ia64*-hpux*)
+--- mozilla/configure.in.orig	Fri Mar  8 07:13:08 2013
++++ mozilla/configure.in	Sat Mar 30 22:29:06 2013
+@@ -2080,6 +2080,9 @@
      if test -z "$MC"; then
          MC=mc.exe
      fi
@@ -12,7 +12,7 @@ $NetBSD: patch-aa,v 1.13 2012/11/23 07:17:54 ryoon Exp $
      ;;
  *-mingw*)
      DSO_CFLAGS=
-@@ -2979,6 +2982,9 @@ dnl ====================================
+@@ -2979,6 +2982,9 @@
  case $target in
  *-hpux11.*)
  	;;
@@ -22,7 +22,7 @@ $NetBSD: patch-aa,v 1.13 2012/11/23 07:17:54 ryoon Exp $
  *)
  	AC_CHECK_LIB(c_r, gethostbyname_r)
  	;;
-@@ -3279,6 +3285,9 @@ AC_CACHE_CHECK(
+@@ -3279,6 +3285,9 @@
          #ifdef linux
          #define _BSD_SOURCE 1
          #endif
@@ -32,7 +32,16 @@ $NetBSD: patch-aa,v 1.13 2012/11/23 07:17:54 ryoon Exp $
          #include <resolv.h>
          ],
          [int foo = res_ninit(&_res);],
-@@ -3947,6 +3956,14 @@ if test -n "$YASM"; then
+@@ -3937,7 +3946,7 @@
+ if test -n "$YASM"; then
+   dnl Pull out yasm's version string
+   changequote(,)
+-  _YASM_VER_FILTER='s|.* \([0-9]\{1,\}\.[0-9]\{1,\}\.[0-9]\{1,\}\.[0-9]\{1,\}\).*|\1|p'
++  _YASM_VER_FILTER='s|.* \([0-9]\{1,\}\.[0-9]\{1,\}\.[0-9]\{1,\}\).*|\1|p'
+   changequote([,])
+ 
+   YASM_VERSION=`yasm --version | sed -ne "$_YASM_VER_FILTER"`
+@@ -3947,6 +3956,14 @@
    _YASM_BUILD=`        echo ${YASM_VERSION} | $AWK -F\. '{ print $4 }'`
  fi
  
@@ -47,7 +56,7 @@ $NetBSD: patch-aa,v 1.13 2012/11/23 07:17:54 ryoon Exp $
  if test -z "$SKIP_LIBRARY_CHECKS"; then
  dnl system JPEG support
  dnl ========================================================
-@@ -5158,8 +5175,8 @@ fi
+@@ -5158,8 +5175,8 @@
  
  AC_SUBST(MOZ_WEBRTC)
  
@@ -58,7 +67,7 @@ $NetBSD: patch-aa,v 1.13 2012/11/23 07:17:54 ryoon Exp $
      MOZ_SAMPLE_TYPE_S16LE=1
      AC_DEFINE(MOZ_SAMPLE_TYPE_S16LE)
      AC_SUBST(MOZ_SAMPLE_TYPE_S16LE)
-@@ -5356,11 +5373,11 @@ if test -n "$MOZ_VP8" -a -z "$MOZ_NATIVE
+@@ -5356,11 +5373,11 @@
  
      dnl See if we have assembly on this platform.
      case "$OS_ARCH:$CPU_ARCH" in