From 30c1a0a7927d6992cbf7baf9e8e1f637b2e4f6d4 Mon Sep 17 00:00:00 2001
From: Florian Smeets <flo@FreeBSD.org>
Date: Thu, 26 Jul 2012 21:49:58 +0000
Subject: - update firefox/thunderbird ESR versions to 10.0.6 - update firefox
 14.0.1 - update thunderbird to 14.0 - update seamonkey to 2.11 - switch to
 new options framework - add experimental rendering via cairo-qt (QT4 option)
 - add audio backend options (ALSA and PulseAudio) - rename SMB option to
 GNOMEVFS2 - turn on LOGGING by default (like upstream linux builds) - improve
 about:memory output - unbreak PGO - use system libs [1] - switch to libevent2
 [2] - fix conflict with devel/libunwind and base gcc [3] - unbreak
 clang/libc++ build [4] - unbreak build with base gcc on >= 9.x [5] - use
 common IPC code with other BSDs[6] - and *miscellaneous improvements*

PR:		ports/146231 [1], ports/161421 [2]
		ports/150631, ports/168369, ports/168637, ports/168793, ports/168978 [3]
		ports/163454, ports/164905, ports/169231 [4]
       		ports/169389, ports/169479 [5]
Obtained from:	pkgsrc via bugzilla #753046 [6]
In collaboration with:	Jan Beich (who did the major part of this work and
			deserves a special thank you!)
---
 mail/thunderbird/files/patch-configure.in | 112 ------------------------------
 1 file changed, 112 deletions(-)
 delete mode 100644 mail/thunderbird/files/patch-configure.in

(limited to 'mail/thunderbird/files/patch-configure.in')

diff --git a/mail/thunderbird/files/patch-configure.in b/mail/thunderbird/files/patch-configure.in
deleted file mode 100644
index 4e91d33a273a..000000000000
--- a/mail/thunderbird/files/patch-configure.in
+++ /dev/null
@@ -1,112 +0,0 @@
---- configure.in.orig	2011-12-19 14:48:06.000000000 +0100
-+++ configure.in	2011-12-19 15:51:19.000000000 +0100
-@@ -1410,7 +1410,7 @@
-     CPU_ARCH=sparc
-     ;;
- 
--x86_64 | ia64)
-+amd64 | x86_64 | ia64)
-     CPU_ARCH="$OS_TEST"
-     ;;
- 
-@@ -1430,7 +1430,7 @@
- dnl ===============================================================
- INTEL_ARCHITECTURE=
- case "$OS_TEST" in
--    x86_64|i?86)
-+    amd64|x86_64|i?86)
-       INTEL_ARCHITECTURE=1
- esac
- 
-@@ -1753,7 +1753,7 @@
-     esac
- 
-     case "${host_cpu}" in
--    x86_64)
-+    amd64 | x86_64)
-         HOST_CFLAGS="$HOST_CFLAGS -D_AMD64_"
-         ;;
-     esac
-@@ -2415,6 +2415,9 @@
-     x86_64-*)
-     	AC_DEFINE(_AMD64_)
- 	;;
-+    amd64*)
-+    	AC_DEFINE(_AMD64_)
-+	;;
-     *)
-     	AC_DEFINE(_CPU_ARCH_NOT_DEFINED)
- 	;;
-@@ -2486,7 +2489,7 @@
-     else
-         DLL_SUFFIX=".so.1.0"
-     fi
--    MOZ_FIX_LINK_PATHS='-Wl,-rpath-link,$(LIBXUL_DIST)/bin -Wl,-rpath-link,$(prefix)/lib -Wl,-rpath-link,$(if $(X11BASE),$(X11BASE),/usr/X11R6)/lib'
-+    MOZ_FIX_LINK_PATHS='-Wl,-rpath-link,$(LIBXUL_DIST)/bin -Wl,-rpath-link,$(prefix)/lib -Wl,-rpath-link,$(if $(X11BASE),$(X11BASE),/usr/local)/lib'
-     DSO_CFLAGS=''
-     DSO_PIC_CFLAGS='-fPIC'
-     DSO_LDOPTS='-shared -fPIC'
-@@ -3304,11 +3307,11 @@
-     ;;
- *)
-     MOZ_CHECK_PTHREADS(pthreads,
--        USE_PTHREADS=1 _PTHREAD_LDFLAGS="-lpthreads",
-+        USE_PTHREADS=1 _PTHREAD_LDFLAGS="-pthreads",
-         MOZ_CHECK_PTHREADS(pthread,
--            USE_PTHREADS=1 _PTHREAD_LDFLAGS="-lpthread",
-+            USE_PTHREADS=1 _PTHREAD_LDFLAGS="-pthread",
-             MOZ_CHECK_PTHREADS(c_r,
--                USE_PTHREADS=1 _PTHREAD_LDFLAGS="-lc_r",
-+                USE_PTHREADS=1 _PTHREAD_LDFLAGS="-pthread",
-                 MOZ_CHECK_PTHREADS(c,
-                     USE_PTHREADS=1
-                 )
-@@ -3383,18 +3386,18 @@
- 	    *-*-freebsd*)
- 			AC_DEFINE(_REENTRANT)
- 			AC_DEFINE(_THREAD_SAFE)
--			dnl -pthread links in -lc_r, so don't specify it explicitly.
-+			dnl -pthread links in -pthread, so don't specify it explicitly.
- 			if test "$ac_cv_have_dash_pthread" = "yes"; then
- 				_PTHREAD_LDFLAGS="-pthread"
- 			else
--				_PTHREAD_LDFLAGS="-lc_r"
-+				_PTHREAD_LDFLAGS="-pthread"
- 			fi
- 			;;
- 
- 	    *-*-openbsd*|*-*-bsdi*)
- 			AC_DEFINE(_REENTRANT)
- 			AC_DEFINE(_THREAD_SAFE)
--			dnl -pthread links in -lc_r, so don't specify it explicitly.
-+			dnl -pthread links in -pthread, so don't specify it explicitly.
- 			if test "$ac_cv_have_dash_pthread" = "yes"; then
-                 _PTHREAD_LDFLAGS="-pthread"
- 			fi
-@@ -3569,7 +3572,7 @@
-     ac_cv_func_iconv,
-     [AC_TRY_LINK([
-         #include <stdlib.h>
--        #include <iconv.h>
-+        #include "/usr/local/include/iconv.h"
-         ],
-         [
-             iconv_t h = iconv_open("", "");
-@@ -3590,7 +3593,7 @@
-         ac_cv_func_const_iconv,
-         [AC_TRY_COMPILE([
-             #include <stdlib.h>
--            #include <iconv.h>
-+            #include "/usr/local/include/iconv.h"
-             ],
-             [
-                 const char *input = "testing";
-@@ -4383,7 +4386,7 @@
- LDFLAGS=$_SAVE_LDFLAGS
- LIBS=$_SAVE_LIBS
- 
--if test "${ZLIB_DIR}" -a -d "${ZLIB_DIR}" -a "$SYSTEM_ZLIB" = 1; then
-+if test "${ZLIB_DIR}" -a "${ZLIB_DIR}" != "/usr" -a -d "${ZLIB_DIR}" -a "$SYSTEM_ZLIB" = 1; then
-     ZLIB_CFLAGS="-I${ZLIB_DIR}/include"
-     ZLIB_LIBS="-L${ZLIB_DIR}/lib ${ZLIB_LIBS}"
- fi
-- 
cgit v1.2.3