1 files changed, 23 insertions, 27 deletions
diff --git a/mail/thunderbird/files/patch-mozilla-configure.in b/mail/thunderbird/files/patch-mozilla-configure.in
index 7e61ff7867c7..ce91593e1ed6 100644
--- a/mail/thunderbird/files/patch-mozilla-configure.in
+++ b/mail/thunderbird/files/patch-mozilla-configure.in
@@ -1,32 +1,28 @@
 --- mozilla/configure.in.orig	2012-05-23 20:56:34.000000000 +0200
 +++ mozilla/configure.in	2012-05-27 18:18:25.000000000 +0200
-@@ -1517,7 +1517,7 @@
-     CPU_ARCH=sparc
-     ;;
- 
--x86_64 | ia64)
-+amd64 | x86_64 | ia64)
-     CPU_ARCH="$OS_TEST"
-     ;;
- 
-@@ -1539,7 +1539,7 @@
- dnl ===============================================================
- INTEL_ARCHITECTURE=
- case "$OS_TEST" in
--    x86_64|i?86)
-+    amd64|x86_64|i?86)
-       INTEL_ARCHITECTURE=1
- esac
- 
-@@ -4580,7 +4580,7 @@
+@@ -4230,6 +4233,9 @@
+ if test -z "$LIBEVENT_DIR" -o "$LIBEVENT_DIR" = no; then
+     MOZ_NATIVE_LIBEVENT=
+ else
++PKG_CHECK_MODULES(MOZ_LIBEVENT,	libevent,
++    [MOZ_NATIVE_LIBEVENT=1
++     MOZ_LIBEVENT_INCLUDES="$MOZ_LIBEVENT_CFLAGS"], [
+     if test "${LIBEVENT_DIR}" = "yes"; then
+         LIBEVENT_DIR=/usr
+     fi
+@@ -4242,10 +4248,11 @@ else
+         AC_MSG_ERROR([--with-system-libevent requested but event.h not found]))
+     AC_CHECK_LIB(event, event_init,
+                  [MOZ_NATIVE_LIBEVENT=1
+-                  MOZ_LIBEVENT_INCLUDES="${LIBEVENT_DIR}/include"
++                  MOZ_LIBEVENT_INCLUDES="-I${LIBEVENT_DIR}/include"
+                   MOZ_LIBEVENT_LIBS="-L${LIBEVENT_DIR}/lib -levent"],
+                  [MOZ_NATIVE_LIBEVENT= MOZ_LIBEVENT_INCLUDES= MOZ_LIBEVENT_LIBS=])
+ fi
++])
+ CFLAGS=$_SAVE_CFLAGS
  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
 @@ -5903,6 +5903,14 @@
        VPX_ASFLAGS="-f elf64 -rnasm -pnasm -DPIC"
        VPX_X86_ASM=1
@@ -35,7 +31,7 @@
 +      VPX_ASFLAGS="-f elf32 -rnasm -pnasm"
 +      VPX_X86_ASM=1
 +    ;;
-+    FreeBSD:amd64)
++    FreeBSD:x86_64)
 +      VPX_ASFLAGS="-f elf64 -rnasm -pnasm -DPIC"
 +      VPX_X86_ASM=1
 +    ;;
@@ -50,7 +46,7 @@
 +    LIBJPEG_TURBO_ASFLAGS="-f elf32 -rnasm -pnasm -DPIC -DELF"
 +    LIBJPEG_TURBO_X86_ASM=1
 +  ;;
-+  FreeBSD:amd64)
++  FreeBSD:x86_64)
 +    LIBJPEG_TURBO_ASFLAGS="-f elf64 -rnasm -pnasm -D__x86_64__ -DPIC -DELF"
 +    LIBJPEG_TURBO_X64_ASM=1
 +  ;;