[SVN-Commit] r135 - in branches/experimental: mail/thunderbird-devel/files www/firefox3-devel/files

svn-freebsd-gecko at chruetertee.ch svn-freebsd-gecko at chruetertee.ch
Thu Oct 8 20:40:21 UTC 2009


Author: beat
Date: Thu Oct  8 20:40:12 2009
New Revision: 135

Log:
- Rename patch files to match directory where they applies.

Added:
   branches/experimental/mail/thunderbird-devel/files/patch-mozilla-config-mkdepend-Makefile.in
      - copied unchanged from r134, branches/experimental/mail/thunderbird-devel/files/patch-config_mkdepend_Makefile.in
   branches/experimental/mail/thunderbird-devel/files/patch-mozilla-config-rules.mk
      - copied unchanged from r134, branches/experimental/mail/thunderbird-devel/files/patch-config-rules.mk
   branches/experimental/mail/thunderbird-devel/files/patch-mozilla-config_autoconf.mk.in
      - copied unchanged from r134, branches/experimental/mail/thunderbird-devel/files/patch-config_autoconf.mk.in
   branches/experimental/mail/thunderbird-devel/files/patch-mozilla-content-xslt-public-txDouble.h
      - copied unchanged from r134, branches/experimental/mail/thunderbird-devel/files/patch-content_xslt_public_txDouble.h
   branches/experimental/mail/thunderbird-devel/files/patch-mozilla-db-sqlite3-src-Makefile.in
      - copied unchanged from r134, branches/experimental/mail/thunderbird-devel/files/patch-db_sqlite3_src_Makefile.in
   branches/experimental/mail/thunderbird-devel/files/patch-mozilla-js-src-config-config.mk
      - copied unchanged from r134, branches/experimental/mail/thunderbird-devel/files/patch-js-src-config_config.mk
   branches/experimental/mail/thunderbird-devel/files/patch-mozilla-js-src-config-mkdepend-Makefile.in
      - copied unchanged from r134, branches/experimental/mail/thunderbird-devel/files/patch-js-src-config-mkdepend_Makefile.in
   branches/experimental/mail/thunderbird-devel/files/patch-mozilla-js-src-jsnum.cpp
      - copied unchanged from r134, branches/experimental/mail/thunderbird-devel/files/patch-js_src_jsnum.cpp
   branches/experimental/mail/thunderbird-devel/files/patch-mozilla-layout-generic-Makefile.in
      - copied unchanged from r134, branches/experimental/mail/thunderbird-devel/files/patch-layout_generic_Makefile.in
   branches/experimental/mail/thunderbird-devel/files/patch-mozilla-media-liboggplay-src-liboggplay-std_semaphore.h
      - copied unchanged from r134, branches/experimental/mail/thunderbird-devel/files/patch-media_liboggplay_src_liboggplay_std_semaphore.h
   branches/experimental/mail/thunderbird-devel/files/patch-mozilla-media-liboggz-include-oggz-oggz_off_t_generated.h
      - copied unchanged from r134, branches/experimental/mail/thunderbird-devel/files/patch-media_liboggz_include_oggz_oggz_off_t_generated.h
   branches/experimental/mail/thunderbird-devel/files/patch-mozilla-media-libsydneyaudio-include-sydney_audio.h
      - copied unchanged from r134, branches/experimental/mail/thunderbird-devel/files/patch-media_liboggplay_audio_sydney_audio.h
   branches/experimental/mail/thunderbird-devel/files/patch-mozilla-security-coreconf-FreeBSD.mk
      - copied unchanged from r134, branches/experimental/mail/thunderbird-devel/files/patch-security-coreconf-FreeBSD.mk
   branches/experimental/mail/thunderbird-devel/files/patch-mozilla-security-manager-ssl-src-nsNSSComponent.cpp
      - copied unchanged from r134, branches/experimental/mail/thunderbird-devel/files/patch-security_manager_ssl_src_nsNSSComponent.cpp
   branches/experimental/mail/thunderbird-devel/files/patch-mozilla-storage-build-Makefile.in
      - copied unchanged from r134, branches/experimental/mail/thunderbird-devel/files/patch-storage_build_Makefile.in
   branches/experimental/mail/thunderbird-devel/files/patch-mozilla-toolkit-mozapps-installer-packager.mk
      - copied unchanged from r134, branches/experimental/mail/thunderbird-devel/files/patch-toolkit_mozapps_installer_packager.mk
   branches/experimental/mail/thunderbird-devel/files/patch-mozilla-toolkit-xre-Makefile.in
      - copied unchanged from r134, branches/experimental/mail/thunderbird-devel/files/patch-toolkit_xre_Makefile.in
   branches/experimental/mail/thunderbird-devel/files/patch-mozilla-xpcom-reflect-xptcall-public-xptcstubsdecl.inc
      - copied unchanged from r134, branches/experimental/mail/thunderbird-devel/files/patch-xpcom-reflect-xptcall-public-xptcstubsdecl.inc
   branches/experimental/mail/thunderbird-devel/files/patch-mozilla-xpcom-reflect-xptcall-src-md-unix-Makefile.in
      - copied unchanged from r134, branches/experimental/mail/thunderbird-devel/files/patch-xpcom_reflect_xptcall_src_md_unix_Makefile.in
   branches/experimental/www/firefox3-devel/files/patch-media-libsydneyaudio-include-sydney_audio.h
      - copied unchanged from r134, branches/experimental/www/firefox3-devel/files/patch-media_liboggplay_audio_sydney_audio.h
Deleted:
   branches/experimental/mail/thunderbird-devel/files/patch-config-rules.mk
   branches/experimental/mail/thunderbird-devel/files/patch-config_autoconf.mk.in
   branches/experimental/mail/thunderbird-devel/files/patch-config_mkdepend_Makefile.in
   branches/experimental/mail/thunderbird-devel/files/patch-content_xslt_public_txDouble.h
   branches/experimental/mail/thunderbird-devel/files/patch-db_sqlite3_src_Makefile.in
   branches/experimental/mail/thunderbird-devel/files/patch-js-src-config-mkdepend_Makefile.in
   branches/experimental/mail/thunderbird-devel/files/patch-js-src-config_config.mk
   branches/experimental/mail/thunderbird-devel/files/patch-js_src_jsnum.cpp
   branches/experimental/mail/thunderbird-devel/files/patch-layout_generic_Makefile.in
   branches/experimental/mail/thunderbird-devel/files/patch-media_liboggplay_audio_sydney_audio.h
   branches/experimental/mail/thunderbird-devel/files/patch-media_liboggplay_src_liboggplay_std_semaphore.h
   branches/experimental/mail/thunderbird-devel/files/patch-media_liboggz_include_oggz_oggz_off_t_generated.h
   branches/experimental/mail/thunderbird-devel/files/patch-security-coreconf-FreeBSD.mk
   branches/experimental/mail/thunderbird-devel/files/patch-security_manager_ssl_src_nsNSSComponent.cpp
   branches/experimental/mail/thunderbird-devel/files/patch-storage_build_Makefile.in
   branches/experimental/mail/thunderbird-devel/files/patch-toolkit_mozapps_installer_packager.mk
   branches/experimental/mail/thunderbird-devel/files/patch-toolkit_xre_Makefile.in
   branches/experimental/mail/thunderbird-devel/files/patch-xpcom-reflect-xptcall-public-xptcstubsdecl.inc
   branches/experimental/mail/thunderbird-devel/files/patch-xpcom_reflect_xptcall_src_md_unix_Makefile.in
   branches/experimental/www/firefox3-devel/files/patch-media_liboggplay_audio_sydney_audio.h

Deleted: branches/experimental/mail/thunderbird-devel/files/patch-config-rules.mk
==============================================================================
--- branches/experimental/mail/thunderbird-devel/files/patch-config-rules.mk	Thu Oct  8 20:40:12 2009	(r134)
+++ /dev/null	00:00:00 1970	(deleted)
@@ -1,13 +0,0 @@
---- mozilla/config/rules.mk.orig	Thu Sep 14 14:07:03 2006
-+++ mozilla/config/rules.mk	Wed Oct 18 11:00:09 2006
-@@ -442,9 +442,7 @@
- endif
- 
- ifeq ($(OS_ARCH),FreeBSD)
--ifdef IS_COMPONENT
--EXTRA_DSO_LDOPTS += -Wl,-Bsymbolic
--endif
-+EXTRA_DSO_LDOPTS += -Wl,-Bsymbolic -lc
- endif
- 
- ifeq ($(OS_ARCH),NetBSD)

Deleted: branches/experimental/mail/thunderbird-devel/files/patch-config_autoconf.mk.in
==============================================================================
--- branches/experimental/mail/thunderbird-devel/files/patch-config_autoconf.mk.in	Thu Oct  8 20:40:12 2009	(r134)
+++ /dev/null	00:00:00 1970	(deleted)
@@ -1,21 +0,0 @@
---- mozilla/config/autoconf.mk.in.orig	2007-08-28 12:02:43.000000000 -0400
-+++ mozilla/config/autoconf.mk.in	2007-09-26 14:21:51.000000000 -0400
-@@ -58,14 +58,14 @@
- prefix		= @prefix@
- exec_prefix	= @exec_prefix@
- bindir		= @bindir@
--includedir	= @includedir@/$(MOZ_APP_NAME)-$(MOZ_APP_VERSION)
-+includedir	= @includedir@/%%MOZILLA%%
- libdir		= @libdir@
- datadir		= @datadir@
- mandir		= @mandir@
--idldir		= $(datadir)/idl/$(MOZ_APP_NAME)-$(MOZ_APP_VERSION)
-+idldir		= $(datadir)/idl/%%MOZILLA%%
- 
--installdir	= $(libdir)/$(MOZ_APP_NAME)-$(MOZ_APP_VERSION)
--sdkdir		= $(libdir)/$(MOZ_APP_NAME)-devel-$(MOZ_APP_VERSION)
-+installdir	= $(libdir)/%%MOZILLA%%
-+sdkdir		= $(libdir)/%%MOZILLA%%
- 
- DIST		= $(DEPTH)/dist
- LIBXUL_SDK      = @LIBXUL_SDK@

Deleted: branches/experimental/mail/thunderbird-devel/files/patch-config_mkdepend_Makefile.in
==============================================================================
--- branches/experimental/mail/thunderbird-devel/files/patch-config_mkdepend_Makefile.in	Thu Oct  8 20:40:12 2009	(r134)
+++ /dev/null	00:00:00 1970	(deleted)
@@ -1,10 +0,0 @@
---- mozilla/config/mkdepend/Makefile.in.orig	Sun Dec 12 07:36:57 2004
-+++ mozilla/config/mkdepend/Makefile.in	Sun Dec 12 07:37:55 2004
-@@ -57,6 +57,7 @@
- include $(topsrcdir)/config/rules.mk
- 
- HOST_CFLAGS	+= -DINCLUDEDIR=\"/usr/include\" -DOBJSUFFIX=\".$(OBJ_SUFFIX)\"
-+HOST_CFLAGS	+= $(XCFLAGS)
- 
- ifdef GNU_CC
- _GCCDIR		= $(shell $(CC) -print-file-name=include)

Deleted: branches/experimental/mail/thunderbird-devel/files/patch-content_xslt_public_txDouble.h
==============================================================================
--- branches/experimental/mail/thunderbird-devel/files/patch-content_xslt_public_txDouble.h	Thu Oct  8 20:40:12 2009	(r134)
+++ /dev/null	00:00:00 1970	(deleted)
@@ -1,20 +0,0 @@
---- mozilla/content/xslt/public/txDouble.h.orig	Fri Oct 13 00:00:29 2006
-+++ mozilla/content/xslt/public/txDouble.h	Fri Oct 13 00:00:53 2006
-@@ -41,7 +41,7 @@
- #define __txdouble_h__
- 
- //A trick to handle IEEE floating point exceptions on FreeBSD - E.D.
--#ifdef __FreeBSD__
-+/* #ifdef __FreeBSD__
- #include <ieeefp.h>
- #ifdef __alpha__
- fp_except_t allmask = FP_X_INV|FP_X_OFL|FP_X_UFL|FP_X_DZ|FP_X_IMP;
-@@ -50,7 +50,7 @@
- #endif
- fp_except_t oldmask = fpsetmask(~allmask);
- #endif
--
-+*/
- /**
-  * Macros to workaround math-bugs bugs in various platforms
-  */

Deleted: branches/experimental/mail/thunderbird-devel/files/patch-db_sqlite3_src_Makefile.in
==============================================================================
--- branches/experimental/mail/thunderbird-devel/files/patch-db_sqlite3_src_Makefile.in	Thu Oct  8 20:40:12 2009	(r134)
+++ /dev/null	00:00:00 1970	(deleted)
@@ -1,11 +0,0 @@
---- mozilla/db/sqlite3/src/Makefile.in.orig	2008-06-19 11:03:17.000000000 -0500
-+++ mozilla/db/sqlite3/src/Makefile.in	2008-06-19 11:04:15.000000000 -0500
-@@ -45,6 +45,8 @@
- 
- include $(DEPTH)/config/autoconf.mk
- 
-+OS_CFLAGS	 = -I../../../dist/include/sqlite3
-+OS_LIBS		 = %%PTHREAD_LIBS%%
- MODULE           = sqlite3
- LIBRARY_NAME     = sqlite3
- FORCE_SHARED_LIB = 1

Deleted: branches/experimental/mail/thunderbird-devel/files/patch-js-src-config-mkdepend_Makefile.in
==============================================================================
--- branches/experimental/mail/thunderbird-devel/files/patch-js-src-config-mkdepend_Makefile.in	Thu Oct  8 20:40:12 2009	(r134)
+++ /dev/null	00:00:00 1970	(deleted)
@@ -1,11 +0,0 @@
---- mozilla/js/src/config/mkdepend/Makefile.in.orig	2009-03-05 22:31:53.000000000 +0100
-+++ mozilla/js/src/config/mkdepend/Makefile.in	2009-04-21 14:10:27.000000000 +0200
-@@ -72,7 +72,7 @@
- 
- include $(topsrcdir)/config/rules.mk
- 
--HOST_CFLAGS	+= -DINCLUDEDIR=\"/usr/include\" -DOBJSUFFIX=\".$(OBJ_SUFFIX)\"
-+HOST_CFLAGS	+= -DINCLUDEDIR=\"%%LOCALBASE%%/include\" -DOBJSUFFIX=\".$(OBJ_SUFFIX)\"
- 
- ifdef GNU_CC
- _GCCDIR		= $(shell $(CC) -print-file-name=include)

Deleted: branches/experimental/mail/thunderbird-devel/files/patch-js-src-config_config.mk
==============================================================================
--- branches/experimental/mail/thunderbird-devel/files/patch-js-src-config_config.mk	Thu Oct  8 20:40:12 2009	(r134)
+++ /dev/null	00:00:00 1970	(deleted)
@@ -1,11 +0,0 @@
---- mozilla/js/src/config/config.mk.orgi	2009-04-21 15:12:51.000000000 +0200
-+++ mozilla/js/src/config/config.mk	2009-04-21 15:15:37.000000000 +0200
-@@ -490,7 +490,7 @@
- INCLUDES	= $(LOCAL_INCLUDES) $(REQ_INCLUDES) $(REQ_INCLUDES_SDK) -I$(PUBLIC) $(OS_INCLUDES)
- 
- ifndef MOZILLA_INTERNAL_API
--INCLUDES	+= -I$(LIBXUL_DIST)/sdk/include
-+INCLUDES	+= -I$(LIBXUL_DIST)/sdk/include -I%%LOCALBASE%%/include
- endif
- 
- include $(topsrcdir)/config/static-checking-config.mk

Deleted: branches/experimental/mail/thunderbird-devel/files/patch-js_src_jsnum.cpp
==============================================================================
--- branches/experimental/mail/thunderbird-devel/files/patch-js_src_jsnum.cpp	Thu Oct  8 20:40:12 2009	(r134)
+++ /dev/null	00:00:00 1970	(deleted)
@@ -1,28 +0,0 @@
---- mozilla/js/src/jsnum.cpp.orig	Sun Nov  5 18:37:07 2006
-+++ mozilla/js/src/jsnum.cpp	Sun Nov  5 18:42:31 2006
-@@ -45,6 +45,9 @@
- #if defined(XP_WIN) || defined(XP_OS2)
- #include <float.h>
- #endif
-+#if defined(__FreeBSD__)
-+#include <sys/param.h>
-+#endif
- #include <locale.h>
- #include <limits.h>
- #include <math.h>
-@@ -532,7 +535,15 @@ static jsdouble NaN;
- 
- #else
- 
-+#if defined(__FreeBSD__) && __FreeBSD_version >= 601000
-+#include <fenv.h>
-+#define FIX_FPU() (fedisableexcept(FE_ALL_EXCEPT))
-+
-+#else
-+
- #define FIX_FPU() ((void)0)
-+
-+#endif /* defined(__FreeBSD__) && __FreeBSD_version >= 503000 */
- 
- #endif
- 

Deleted: branches/experimental/mail/thunderbird-devel/files/patch-layout_generic_Makefile.in
==============================================================================
--- branches/experimental/mail/thunderbird-devel/files/patch-layout_generic_Makefile.in	Thu Oct  8 20:40:12 2009	(r134)
+++ /dev/null	00:00:00 1970	(deleted)
@@ -1,14 +0,0 @@
---- mozilla/layout/generic/Makefile.in.orig	2008-06-19 12:29:06.000000000 -0500
-+++ mozilla/layout/generic/Makefile.in	2008-06-19 12:30:04.000000000 -0500
-@@ -188,9 +188,10 @@
- 		-I$(srcdir)/../../content/base/src \
- 		-I$(srcdir)/../../content/html/content/src \
- 		-I$(srcdir)/../../dom/src/base \
--		$(MOZ_CAIRO_CFLAGS) \
- 		$(NULL)
- 
-+CXXFLAGS += $(MOZ_CAIRO_CFLAGS)
-+
- ifdef MOZ_ENABLE_GTK2
- CXXFLAGS += $(MOZ_GTK2_CFLAGS)
- endif

Deleted: branches/experimental/mail/thunderbird-devel/files/patch-media_liboggplay_audio_sydney_audio.h
==============================================================================
--- branches/experimental/mail/thunderbird-devel/files/patch-media_liboggplay_audio_sydney_audio.h	Thu Oct  8 20:40:12 2009	(r134)
+++ /dev/null	00:00:00 1970	(deleted)
@@ -1,11 +0,0 @@
---- mozilla/media/libsydneyaudio/include/sydney_audio.h.orgi	2009-04-10 12:24:01.000000000 +0200
-+++ mozilla/media/libsydneyaudio/include/sydney_audio.h	2009-04-10 12:24:30.000000000 +0200
-@@ -73,7 +73,7 @@
- #   endif
- #elif defined(WIN32)
- #   define SA_LITTLE_ENDIAN 1
--#elif defined(__APPLE__)
-+#elif defined(__APPLE__) || defined(__FreeBSD__)
- #   if defined(__BIG_ENDIAN__)
- #       define SA_BIG_ENDIAN 1
- #   else

Deleted: branches/experimental/mail/thunderbird-devel/files/patch-media_liboggplay_src_liboggplay_std_semaphore.h
==============================================================================
--- branches/experimental/mail/thunderbird-devel/files/patch-media_liboggplay_src_liboggplay_std_semaphore.h	Thu Oct  8 20:40:12 2009	(r134)
+++ /dev/null	00:00:00 1970	(deleted)
@@ -1,11 +0,0 @@
---- mozilla/media/liboggplay/src/liboggplay/std_semaphore.h.orig	2009-08-13 11:30:03.000000000 +0200
-+++ mozilla/media/liboggplay/src/liboggplay/std_semaphore.h	2009-08-13 11:30:17.000000000 +0200
-@@ -74,7 +74,7 @@
-  * @retval non-zero on error 
-  */
- 
--#if defined(linux) || defined(SOLARIS)
-+#if defined(linux) || defined(SOLARIS) || defined(__FreeBSD__)
- #include <semaphore.h>
- #define SEM_CREATE(p,s) sem_init(&(p), 1, s)
- #define SEM_SIGNAL(p)   sem_post(&(p))

Deleted: branches/experimental/mail/thunderbird-devel/files/patch-media_liboggz_include_oggz_oggz_off_t_generated.h
==============================================================================
--- branches/experimental/mail/thunderbird-devel/files/patch-media_liboggz_include_oggz_oggz_off_t_generated.h	Thu Oct  8 20:40:12 2009	(r134)
+++ /dev/null	00:00:00 1970	(deleted)
@@ -1,11 +0,0 @@
---- mozilla/media/liboggz/include/oggz/oggz_off_t_generated.h.orig	2009-09-16 02:56:44.000000000 +0200
-+++ mozilla/media/liboggz/include/oggz/oggz_off_t_generated.h	2009-09-24 13:04:49.000000000 +0200
-@@ -59,7 +59,7 @@
- 
- #include <sys/types.h>
- 
--#if defined(__APPLE__) || defined(SOLARIS) || defined(OS2)
-+#if defined(__APPLE__) || defined(SOLARIS) || defined(OS2) || defined (__FreeBSD__)
- typedef off_t oggz_off_t;
- #else
- typedef loff_t oggz_off_t;

Copied: branches/experimental/mail/thunderbird-devel/files/patch-mozilla-config-mkdepend-Makefile.in (from r134, branches/experimental/mail/thunderbird-devel/files/patch-config_mkdepend_Makefile.in)
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ branches/experimental/mail/thunderbird-devel/files/patch-mozilla-config-mkdepend-Makefile.in	Thu Oct  8 20:40:12 2009	(r135, copy of r134, branches/experimental/mail/thunderbird-devel/files/patch-config_mkdepend_Makefile.in)
@@ -0,0 +1,10 @@
+--- mozilla/config/mkdepend/Makefile.in.orig	Sun Dec 12 07:36:57 2004
++++ mozilla/config/mkdepend/Makefile.in	Sun Dec 12 07:37:55 2004
+@@ -57,6 +57,7 @@
+ include $(topsrcdir)/config/rules.mk
+ 
+ HOST_CFLAGS	+= -DINCLUDEDIR=\"/usr/include\" -DOBJSUFFIX=\".$(OBJ_SUFFIX)\"
++HOST_CFLAGS	+= $(XCFLAGS)
+ 
+ ifdef GNU_CC
+ _GCCDIR		= $(shell $(CC) -print-file-name=include)

Copied: branches/experimental/mail/thunderbird-devel/files/patch-mozilla-config-rules.mk (from r134, branches/experimental/mail/thunderbird-devel/files/patch-config-rules.mk)
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ branches/experimental/mail/thunderbird-devel/files/patch-mozilla-config-rules.mk	Thu Oct  8 20:40:12 2009	(r135, copy of r134, branches/experimental/mail/thunderbird-devel/files/patch-config-rules.mk)
@@ -0,0 +1,13 @@
+--- mozilla/config/rules.mk.orig	Thu Sep 14 14:07:03 2006
++++ mozilla/config/rules.mk	Wed Oct 18 11:00:09 2006
+@@ -442,9 +442,7 @@
+ endif
+ 
+ ifeq ($(OS_ARCH),FreeBSD)
+-ifdef IS_COMPONENT
+-EXTRA_DSO_LDOPTS += -Wl,-Bsymbolic
+-endif
++EXTRA_DSO_LDOPTS += -Wl,-Bsymbolic -lc
+ endif
+ 
+ ifeq ($(OS_ARCH),NetBSD)

Copied: branches/experimental/mail/thunderbird-devel/files/patch-mozilla-config_autoconf.mk.in (from r134, branches/experimental/mail/thunderbird-devel/files/patch-config_autoconf.mk.in)
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ branches/experimental/mail/thunderbird-devel/files/patch-mozilla-config_autoconf.mk.in	Thu Oct  8 20:40:12 2009	(r135, copy of r134, branches/experimental/mail/thunderbird-devel/files/patch-config_autoconf.mk.in)
@@ -0,0 +1,21 @@
+--- mozilla/config/autoconf.mk.in.orig	2007-08-28 12:02:43.000000000 -0400
++++ mozilla/config/autoconf.mk.in	2007-09-26 14:21:51.000000000 -0400
+@@ -58,14 +58,14 @@
+ prefix		= @prefix@
+ exec_prefix	= @exec_prefix@
+ bindir		= @bindir@
+-includedir	= @includedir@/$(MOZ_APP_NAME)-$(MOZ_APP_VERSION)
++includedir	= @includedir@/%%MOZILLA%%
+ libdir		= @libdir@
+ datadir		= @datadir@
+ mandir		= @mandir@
+-idldir		= $(datadir)/idl/$(MOZ_APP_NAME)-$(MOZ_APP_VERSION)
++idldir		= $(datadir)/idl/%%MOZILLA%%
+ 
+-installdir	= $(libdir)/$(MOZ_APP_NAME)-$(MOZ_APP_VERSION)
+-sdkdir		= $(libdir)/$(MOZ_APP_NAME)-devel-$(MOZ_APP_VERSION)
++installdir	= $(libdir)/%%MOZILLA%%
++sdkdir		= $(libdir)/%%MOZILLA%%
+ 
+ DIST		= $(DEPTH)/dist
+ LIBXUL_SDK      = @LIBXUL_SDK@

Copied: branches/experimental/mail/thunderbird-devel/files/patch-mozilla-content-xslt-public-txDouble.h (from r134, branches/experimental/mail/thunderbird-devel/files/patch-content_xslt_public_txDouble.h)
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ branches/experimental/mail/thunderbird-devel/files/patch-mozilla-content-xslt-public-txDouble.h	Thu Oct  8 20:40:12 2009	(r135, copy of r134, branches/experimental/mail/thunderbird-devel/files/patch-content_xslt_public_txDouble.h)
@@ -0,0 +1,20 @@
+--- mozilla/content/xslt/public/txDouble.h.orig	Fri Oct 13 00:00:29 2006
++++ mozilla/content/xslt/public/txDouble.h	Fri Oct 13 00:00:53 2006
+@@ -41,7 +41,7 @@
+ #define __txdouble_h__
+ 
+ //A trick to handle IEEE floating point exceptions on FreeBSD - E.D.
+-#ifdef __FreeBSD__
++/* #ifdef __FreeBSD__
+ #include <ieeefp.h>
+ #ifdef __alpha__
+ fp_except_t allmask = FP_X_INV|FP_X_OFL|FP_X_UFL|FP_X_DZ|FP_X_IMP;
+@@ -50,7 +50,7 @@
+ #endif
+ fp_except_t oldmask = fpsetmask(~allmask);
+ #endif
+-
++*/
+ /**
+  * Macros to workaround math-bugs bugs in various platforms
+  */

Copied: branches/experimental/mail/thunderbird-devel/files/patch-mozilla-db-sqlite3-src-Makefile.in (from r134, branches/experimental/mail/thunderbird-devel/files/patch-db_sqlite3_src_Makefile.in)
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ branches/experimental/mail/thunderbird-devel/files/patch-mozilla-db-sqlite3-src-Makefile.in	Thu Oct  8 20:40:12 2009	(r135, copy of r134, branches/experimental/mail/thunderbird-devel/files/patch-db_sqlite3_src_Makefile.in)
@@ -0,0 +1,11 @@
+--- mozilla/db/sqlite3/src/Makefile.in.orig	2008-06-19 11:03:17.000000000 -0500
++++ mozilla/db/sqlite3/src/Makefile.in	2008-06-19 11:04:15.000000000 -0500
+@@ -45,6 +45,8 @@
+ 
+ include $(DEPTH)/config/autoconf.mk
+ 
++OS_CFLAGS	 = -I../../../dist/include/sqlite3
++OS_LIBS		 = %%PTHREAD_LIBS%%
+ MODULE           = sqlite3
+ LIBRARY_NAME     = sqlite3
+ FORCE_SHARED_LIB = 1

Copied: branches/experimental/mail/thunderbird-devel/files/patch-mozilla-js-src-config-config.mk (from r134, branches/experimental/mail/thunderbird-devel/files/patch-js-src-config_config.mk)
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ branches/experimental/mail/thunderbird-devel/files/patch-mozilla-js-src-config-config.mk	Thu Oct  8 20:40:12 2009	(r135, copy of r134, branches/experimental/mail/thunderbird-devel/files/patch-js-src-config_config.mk)
@@ -0,0 +1,11 @@
+--- mozilla/js/src/config/config.mk.orgi	2009-04-21 15:12:51.000000000 +0200
++++ mozilla/js/src/config/config.mk	2009-04-21 15:15:37.000000000 +0200
+@@ -490,7 +490,7 @@
+ INCLUDES	= $(LOCAL_INCLUDES) $(REQ_INCLUDES) $(REQ_INCLUDES_SDK) -I$(PUBLIC) $(OS_INCLUDES)
+ 
+ ifndef MOZILLA_INTERNAL_API
+-INCLUDES	+= -I$(LIBXUL_DIST)/sdk/include
++INCLUDES	+= -I$(LIBXUL_DIST)/sdk/include -I%%LOCALBASE%%/include
+ endif
+ 
+ include $(topsrcdir)/config/static-checking-config.mk

Copied: branches/experimental/mail/thunderbird-devel/files/patch-mozilla-js-src-config-mkdepend-Makefile.in (from r134, branches/experimental/mail/thunderbird-devel/files/patch-js-src-config-mkdepend_Makefile.in)
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ branches/experimental/mail/thunderbird-devel/files/patch-mozilla-js-src-config-mkdepend-Makefile.in	Thu Oct  8 20:40:12 2009	(r135, copy of r134, branches/experimental/mail/thunderbird-devel/files/patch-js-src-config-mkdepend_Makefile.in)
@@ -0,0 +1,11 @@
+--- mozilla/js/src/config/mkdepend/Makefile.in.orig	2009-03-05 22:31:53.000000000 +0100
++++ mozilla/js/src/config/mkdepend/Makefile.in	2009-04-21 14:10:27.000000000 +0200
+@@ -72,7 +72,7 @@
+ 
+ include $(topsrcdir)/config/rules.mk
+ 
+-HOST_CFLAGS	+= -DINCLUDEDIR=\"/usr/include\" -DOBJSUFFIX=\".$(OBJ_SUFFIX)\"
++HOST_CFLAGS	+= -DINCLUDEDIR=\"%%LOCALBASE%%/include\" -DOBJSUFFIX=\".$(OBJ_SUFFIX)\"
+ 
+ ifdef GNU_CC
+ _GCCDIR		= $(shell $(CC) -print-file-name=include)

Copied: branches/experimental/mail/thunderbird-devel/files/patch-mozilla-js-src-jsnum.cpp (from r134, branches/experimental/mail/thunderbird-devel/files/patch-js_src_jsnum.cpp)
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ branches/experimental/mail/thunderbird-devel/files/patch-mozilla-js-src-jsnum.cpp	Thu Oct  8 20:40:12 2009	(r135, copy of r134, branches/experimental/mail/thunderbird-devel/files/patch-js_src_jsnum.cpp)
@@ -0,0 +1,28 @@
+--- mozilla/js/src/jsnum.cpp.orig	Sun Nov  5 18:37:07 2006
++++ mozilla/js/src/jsnum.cpp	Sun Nov  5 18:42:31 2006
+@@ -45,6 +45,9 @@
+ #if defined(XP_WIN) || defined(XP_OS2)
+ #include <float.h>
+ #endif
++#if defined(__FreeBSD__)
++#include <sys/param.h>
++#endif
+ #include <locale.h>
+ #include <limits.h>
+ #include <math.h>
+@@ -532,7 +535,15 @@ static jsdouble NaN;
+ 
+ #else
+ 
++#if defined(__FreeBSD__) && __FreeBSD_version >= 601000
++#include <fenv.h>
++#define FIX_FPU() (fedisableexcept(FE_ALL_EXCEPT))
++
++#else
++
+ #define FIX_FPU() ((void)0)
++
++#endif /* defined(__FreeBSD__) && __FreeBSD_version >= 503000 */
+ 
+ #endif
+ 

Copied: branches/experimental/mail/thunderbird-devel/files/patch-mozilla-layout-generic-Makefile.in (from r134, branches/experimental/mail/thunderbird-devel/files/patch-layout_generic_Makefile.in)
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ branches/experimental/mail/thunderbird-devel/files/patch-mozilla-layout-generic-Makefile.in	Thu Oct  8 20:40:12 2009	(r135, copy of r134, branches/experimental/mail/thunderbird-devel/files/patch-layout_generic_Makefile.in)
@@ -0,0 +1,14 @@
+--- mozilla/layout/generic/Makefile.in.orig	2008-06-19 12:29:06.000000000 -0500
++++ mozilla/layout/generic/Makefile.in	2008-06-19 12:30:04.000000000 -0500
+@@ -188,9 +188,10 @@
+ 		-I$(srcdir)/../../content/base/src \
+ 		-I$(srcdir)/../../content/html/content/src \
+ 		-I$(srcdir)/../../dom/src/base \
+-		$(MOZ_CAIRO_CFLAGS) \
+ 		$(NULL)
+ 
++CXXFLAGS += $(MOZ_CAIRO_CFLAGS)
++
+ ifdef MOZ_ENABLE_GTK2
+ CXXFLAGS += $(MOZ_GTK2_CFLAGS)
+ endif

Copied: branches/experimental/mail/thunderbird-devel/files/patch-mozilla-media-liboggplay-src-liboggplay-std_semaphore.h (from r134, branches/experimental/mail/thunderbird-devel/files/patch-media_liboggplay_src_liboggplay_std_semaphore.h)
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ branches/experimental/mail/thunderbird-devel/files/patch-mozilla-media-liboggplay-src-liboggplay-std_semaphore.h	Thu Oct  8 20:40:12 2009	(r135, copy of r134, branches/experimental/mail/thunderbird-devel/files/patch-media_liboggplay_src_liboggplay_std_semaphore.h)
@@ -0,0 +1,11 @@
+--- mozilla/media/liboggplay/src/liboggplay/std_semaphore.h.orig	2009-08-13 11:30:03.000000000 +0200
++++ mozilla/media/liboggplay/src/liboggplay/std_semaphore.h	2009-08-13 11:30:17.000000000 +0200
+@@ -74,7 +74,7 @@
+  * @retval non-zero on error 
+  */
+ 
+-#if defined(linux) || defined(SOLARIS)
++#if defined(linux) || defined(SOLARIS) || defined(__FreeBSD__)
+ #include <semaphore.h>
+ #define SEM_CREATE(p,s) sem_init(&(p), 1, s)
+ #define SEM_SIGNAL(p)   sem_post(&(p))

Copied: branches/experimental/mail/thunderbird-devel/files/patch-mozilla-media-liboggz-include-oggz-oggz_off_t_generated.h (from r134, branches/experimental/mail/thunderbird-devel/files/patch-media_liboggz_include_oggz_oggz_off_t_generated.h)
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ branches/experimental/mail/thunderbird-devel/files/patch-mozilla-media-liboggz-include-oggz-oggz_off_t_generated.h	Thu Oct  8 20:40:12 2009	(r135, copy of r134, branches/experimental/mail/thunderbird-devel/files/patch-media_liboggz_include_oggz_oggz_off_t_generated.h)
@@ -0,0 +1,11 @@
+--- mozilla/media/liboggz/include/oggz/oggz_off_t_generated.h.orig	2009-09-16 02:56:44.000000000 +0200
++++ mozilla/media/liboggz/include/oggz/oggz_off_t_generated.h	2009-09-24 13:04:49.000000000 +0200
+@@ -59,7 +59,7 @@
+ 
+ #include <sys/types.h>
+ 
+-#if defined(__APPLE__) || defined(SOLARIS) || defined(OS2)
++#if defined(__APPLE__) || defined(SOLARIS) || defined(OS2) || defined (__FreeBSD__)
+ typedef off_t oggz_off_t;
+ #else
+ typedef loff_t oggz_off_t;

Copied: branches/experimental/mail/thunderbird-devel/files/patch-mozilla-media-libsydneyaudio-include-sydney_audio.h (from r134, branches/experimental/mail/thunderbird-devel/files/patch-media_liboggplay_audio_sydney_audio.h)
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ branches/experimental/mail/thunderbird-devel/files/patch-mozilla-media-libsydneyaudio-include-sydney_audio.h	Thu Oct  8 20:40:12 2009	(r135, copy of r134, branches/experimental/mail/thunderbird-devel/files/patch-media_liboggplay_audio_sydney_audio.h)
@@ -0,0 +1,11 @@
+--- mozilla/media/libsydneyaudio/include/sydney_audio.h.orgi	2009-04-10 12:24:01.000000000 +0200
++++ mozilla/media/libsydneyaudio/include/sydney_audio.h	2009-04-10 12:24:30.000000000 +0200
+@@ -73,7 +73,7 @@
+ #   endif
+ #elif defined(WIN32)
+ #   define SA_LITTLE_ENDIAN 1
+-#elif defined(__APPLE__)
++#elif defined(__APPLE__) || defined(__FreeBSD__)
+ #   if defined(__BIG_ENDIAN__)
+ #       define SA_BIG_ENDIAN 1
+ #   else

Copied: branches/experimental/mail/thunderbird-devel/files/patch-mozilla-security-coreconf-FreeBSD.mk (from r134, branches/experimental/mail/thunderbird-devel/files/patch-security-coreconf-FreeBSD.mk)
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ branches/experimental/mail/thunderbird-devel/files/patch-mozilla-security-coreconf-FreeBSD.mk	Thu Oct  8 20:40:12 2009	(r135, copy of r134, branches/experimental/mail/thunderbird-devel/files/patch-security-coreconf-FreeBSD.mk)
@@ -0,0 +1,38 @@
+--- mozilla/security/coreconf/FreeBSD.mk.orig	2009-09-16 02:57:02.000000000 +0200
++++ mozilla/security/coreconf/FreeBSD.mk	2009-09-30 16:44:43.000000000 +0200
+@@ -45,8 +45,20 @@
+ ifeq ($(OS_TEST),alpha)
+ CPU_ARCH		= alpha
+ else
++ifeq ($(OS_TEST),amd64)
++CPU_ARCH		= amd64
++else
++ifeq ($(OS_TEST),powerpc)
++CPU_ARCH		= powerpc
++else
++ifeq ($(OS_TEST),sparc64)
++CPU_ARCH		= sparc64
++else
+ CPU_ARCH		= x86
+ endif
++endif
++endif
++endif
+ 
+ OS_CFLAGS		= $(DSO_CFLAGS) -ansi -Wall -Wno-switch -DFREEBSD -DHAVE_STRERROR -DHAVE_BSD_FLOCK
+ 
+@@ -73,7 +85,7 @@
+ DLL_SUFFIX		= so.1.0
+ endif
+ 
+-MKSHLIB			= $(CC) $(DSO_LDOPTS)
++MKSHLIB			= $(CC) -Wl,-Bsymbolic -lc $(DSO_LDOPTS) -o $@
+ ifdef MAPFILE
+ 	MKSHLIB += -Wl,--version-script,$(MAPFILE)
+ endif
+@@ -82,4 +94,4 @@
+ 
+ G++INCLUDES		= -I/usr/include/g++
+ 
+-INCLUDES		+= -I/usr/X11R6/include
++#INCLUDES		+= -I/usr/local/include

Copied: branches/experimental/mail/thunderbird-devel/files/patch-mozilla-security-manager-ssl-src-nsNSSComponent.cpp (from r134, branches/experimental/mail/thunderbird-devel/files/patch-security_manager_ssl_src_nsNSSComponent.cpp)
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ branches/experimental/mail/thunderbird-devel/files/patch-mozilla-security-manager-ssl-src-nsNSSComponent.cpp	Thu Oct  8 20:40:12 2009	(r135, copy of r134, branches/experimental/mail/thunderbird-devel/files/patch-security_manager_ssl_src_nsNSSComponent.cpp)
@@ -0,0 +1,10 @@
+--- mozilla/security/manager/ssl/src/nsNSSComponent.cpp.orig	Mon May 29 23:10:54 2006
++++ mozilla/security/manager/ssl/src/nsNSSComponent.cpp	Mon May 29 23:12:22 2006
+@@ -110,6 +110,7 @@
+ #include "nss.h"
+ #include "pk11func.h"
+ #include "ssl.h"
++#define NSS_ENABLE_ECC 1
+ #include "sslproto.h"
+ #include "secmod.h"
+ #include "sechash.h"

Copied: branches/experimental/mail/thunderbird-devel/files/patch-mozilla-storage-build-Makefile.in (from r134, branches/experimental/mail/thunderbird-devel/files/patch-storage_build_Makefile.in)
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ branches/experimental/mail/thunderbird-devel/files/patch-mozilla-storage-build-Makefile.in	Thu Oct  8 20:40:12 2009	(r135, copy of r134, branches/experimental/mail/thunderbird-devel/files/patch-storage_build_Makefile.in)
@@ -0,0 +1,10 @@
+--- mozilla/storage/build/Makefile.in.orig	Tue Feb 21 11:18:56 2006
++++ mozilla/storage/build/Makefile.in	Sun Nov  5 16:16:06 2006
+@@ -77,6 +77,7 @@
+ 	$(EXTRA_DSO_LIBS) \
+ 	$(MOZ_COMPONENT_LIBS) \
+ 	$(MOZ_JS_LIBS) \
++	%%PTHREAD_LIBS%% \
+ 	$(NULL)
+ 
+ include $(topsrcdir)/config/rules.mk

Copied: branches/experimental/mail/thunderbird-devel/files/patch-mozilla-toolkit-mozapps-installer-packager.mk (from r134, branches/experimental/mail/thunderbird-devel/files/patch-toolkit_mozapps_installer_packager.mk)
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ branches/experimental/mail/thunderbird-devel/files/patch-mozilla-toolkit-mozapps-installer-packager.mk	Thu Oct  8 20:40:12 2009	(r135, copy of r134, branches/experimental/mail/thunderbird-devel/files/patch-toolkit_mozapps_installer_packager.mk)
@@ -0,0 +1,11 @@
+--- mozilla/toolkit/mozapps/installer/packager.mk.orig	2007-09-26 13:45:01.000000000 -0400
++++ mozilla/toolkit/mozapps/installer/packager.mk	2007-09-26 13:47:29.000000000 -0400
+@@ -409,7 +409,7 @@
+ 	(cd $(DIST)/sdk/include && tar $(TAR_CREATE_FLAGS) - .) | \
+ 	  (cd $(DESTDIR)$(includedir)/stable && tar -xf -)
+ # The dist/include has module subdirectories that we need to flatten
+-	find $(DIST)/include -xtype f -exec $(SYSINSTALL) $(IFLAGS1) {} $(DESTDIR)$(includedir)/unstable \;
++	find $(DIST)/include -type f -o -type l -exec $(SYSINSTALL) $(IFLAGS1) {} $(DESTDIR)$(includedir)/unstable \;
+ # IDL directory is stable (dist/sdk/idl) and unstable (dist/idl)
+ 	$(NSINSTALL) -D $(DESTDIR)$(idldir)/stable 
+ 	$(NSINSTALL) -D $(DESTDIR)$(idldir)/unstable

Copied: branches/experimental/mail/thunderbird-devel/files/patch-mozilla-toolkit-xre-Makefile.in (from r134, branches/experimental/mail/thunderbird-devel/files/patch-toolkit_xre_Makefile.in)
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ branches/experimental/mail/thunderbird-devel/files/patch-mozilla-toolkit-xre-Makefile.in	Thu Oct  8 20:40:12 2009	(r135, copy of r134, branches/experimental/mail/thunderbird-devel/files/patch-toolkit_xre_Makefile.in)
@@ -0,0 +1,8 @@
+--- mozilla/toolkit/xre/Makefile.in.orig	2007-09-10 10:31:53.000000000 -0400
++++ mozilla/toolkit/xre/Makefile.in	2007-09-10 10:35:00.000000000 -0400
+@@ -263,5 +263,3 @@
+ libs:: platform.ini
+ 	$(INSTALL) $^ $(DIST)/bin
+ 
+-install::
+-	$(INSTALL) $(IFLAGS1) $^ $(DESTDIR)$(mozappdir)

Copied: branches/experimental/mail/thunderbird-devel/files/patch-mozilla-xpcom-reflect-xptcall-public-xptcstubsdecl.inc (from r134, branches/experimental/mail/thunderbird-devel/files/patch-xpcom-reflect-xptcall-public-xptcstubsdecl.inc)
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ branches/experimental/mail/thunderbird-devel/files/patch-mozilla-xpcom-reflect-xptcall-public-xptcstubsdecl.inc	Thu Oct  8 20:40:12 2009	(r135, copy of r134, branches/experimental/mail/thunderbird-devel/files/patch-xpcom-reflect-xptcall-public-xptcstubsdecl.inc)
@@ -0,0 +1,11 @@
+--- mozilla/xpcom/reflect/xptcall/public/xptcstubsdecl.inc.orig	Tue Mar 16 03:07:25 2004
++++ mozilla/xpcom/reflect/xptcall/public/xptcstubsdecl.inc	Tue Jun 15 12:52:36 2004
+@@ -8,7 +8,7 @@
+ *  1 is AddRef
+ *  2 is Release
+ */
+-#if !defined(__ia64) || (!defined(__hpux) && !defined(__linux__))
++#if !defined(__ia64)
+ NS_IMETHOD Stub3();
+ NS_IMETHOD Stub4();
+ NS_IMETHOD Stub5();

Copied: branches/experimental/mail/thunderbird-devel/files/patch-mozilla-xpcom-reflect-xptcall-src-md-unix-Makefile.in (from r134, branches/experimental/mail/thunderbird-devel/files/patch-xpcom_reflect_xptcall_src_md_unix_Makefile.in)
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ branches/experimental/mail/thunderbird-devel/files/patch-mozilla-xpcom-reflect-xptcall-src-md-unix-Makefile.in	Thu Oct  8 20:40:12 2009	(r135, copy of r134, branches/experimental/mail/thunderbird-devel/files/patch-xpcom_reflect_xptcall_src_md_unix_Makefile.in)
@@ -0,0 +1,76 @@
+--- mozilla/xpcom/reflect/xptcall/src/md/unix/Makefile.in.orig	2009-03-05 22:32:55.000000000 +0100
++++ mozilla/xpcom/reflect/xptcall/src/md/unix/Makefile.in	2009-04-21 14:15:46.135700268 +0200
+@@ -70,6 +70,9 @@
+ ifeq (Darwin,$(OS_ARCH))
+ DEFINES		+= -DKEEP_STACK_16_BYTE_ALIGNED
+ endif
++ifeq (x86_64,$(OS_TEST))
++CPPSRCS		:= xptcinvoke_x86_64_linux.cpp xptcstubs_x86_64_linux.cpp
++endif
+ endif
+ endif
+ #
+@@ -87,7 +90,7 @@
+ endif
+ endif
+ # IA64 Linux
+-ifneq (,$(filter Linux,$(OS_ARCH)))
++ifneq (,$(filter Linux FreeBSD,$(OS_ARCH)))
+ ifneq (,$(findstring ia64,$(OS_TEST)))
+ CPPSRCS		:= xptcinvoke_ipf64.cpp xptcstubs_ipf64.cpp
+ ASFILES		:= xptcstubs_asm_ipf64.s xptcinvoke_asm_ipf64.s
+@@ -100,6 +103,12 @@
+ CPPSRCS		:= xptcinvoke_amd64_openbsd.cpp xptcstubs_amd64_openbsd.cpp
+ endif
+ #
++# FreeBSD/amd64
++#
++ifeq ($(OS_ARCH)$(OS_TEST),FreeBSDamd64)
++CPPSRCS         := xptcinvoke_amd64_openbsd.cpp xptcstubs_amd64_openbsd.cpp
++endif
++#
+ # BeOS/Intel (uses the same unixish_x86 code)
+ #
+ ifeq ($(OS_ARCH)$(OS_TEST),BeOSBePC)
+@@ -150,9 +159,15 @@
+ ASFILES		:= xptcinvoke_asm_osf1_alpha.s xptcstubs_asm_osf1_alpha.s
+ endif
+ #
++# FreeBSD/Alpha
++#
++ifeq ($(OS_ARCH)$(OS_TEST),FreeBSDalpha)
++CPPSRCS		:= xptcinvoke_freebsd_alpha.cpp xptcstubs_freebsd_alpha.cpp
++endif
++#
+ # Linux/Alpha
+ #
+-ifneq (,$(filter Linuxalpha FreeBSDalpha NetBSDalpha,$(OS_ARCH)$(OS_TEST)))                           
++ifneq (,$(filter Linuxalpha NetBSDalpha,$(OS_ARCH)$(OS_TEST)))                           
+ CPPSRCS		:= xptcinvoke_linux_alpha.cpp xptcstubs_linux_alpha.cpp
+ endif
+ #
+@@ -307,7 +322,7 @@
+ #
+ # Linux/PPC
+ #
+-ifeq ($(OS_ARCH)$(OS_TEST),Linuxpowerpc)
++ifneq (,$(filter Linuxpowerpc FreeBSDpowerpc,$(OS_ARCH)$(OS_TEST)))
+ CPPSRCS		:= xptcinvoke_ppc_linux.cpp xptcstubs_ppc_linux.cpp
+ ASFILES		:= xptcinvoke_asm_ppc_linux.s xptcstubs_asm_ppc_linux.s
+ AS		:= $(CC) -c -x assembler-with-cpp
+@@ -385,6 +400,15 @@
+ ASFILES		:= xptcinvoke_asm_sparc_netbsd.s xptcstubs_asm_sparc_netbsd.s
+ endif
+ #
++# FreeBSD/SPARC64
++#
++ifeq ($(OS_ARCH),FreeBSD)
++ifneq (,$(findstring sparc,$(OS_TEST)))
++CPPSRCS		:= xptcinvoke_sparc64_openbsd.cpp xptcstubs_sparc64_openbsd.cpp
++ASFILES		:= xptcinvoke_asm_sparc64_openbsd.s xptcstubs_asm_sparc64_openbsd.s
++endif
++endif
++#
+ # OpenBSD/SPARC
+ #
+ ifeq ($(OS_ARCH)$(OS_TEST),OpenBSDsparc)

Deleted: branches/experimental/mail/thunderbird-devel/files/patch-security-coreconf-FreeBSD.mk
==============================================================================
--- branches/experimental/mail/thunderbird-devel/files/patch-security-coreconf-FreeBSD.mk	Thu Oct  8 20:40:12 2009	(r134)
+++ /dev/null	00:00:00 1970	(deleted)
@@ -1,38 +0,0 @@
---- mozilla/security/coreconf/FreeBSD.mk.orig	2009-09-16 02:57:02.000000000 +0200
-+++ mozilla/security/coreconf/FreeBSD.mk	2009-09-30 16:44:43.000000000 +0200
-@@ -45,8 +45,20 @@
- ifeq ($(OS_TEST),alpha)
- CPU_ARCH		= alpha
- else
-+ifeq ($(OS_TEST),amd64)
-+CPU_ARCH		= amd64
-+else
-+ifeq ($(OS_TEST),powerpc)
-+CPU_ARCH		= powerpc
-+else
-+ifeq ($(OS_TEST),sparc64)
-+CPU_ARCH		= sparc64
-+else
- CPU_ARCH		= x86
- endif
-+endif
-+endif
-+endif
- 
- OS_CFLAGS		= $(DSO_CFLAGS) -ansi -Wall -Wno-switch -DFREEBSD -DHAVE_STRERROR -DHAVE_BSD_FLOCK
- 
-@@ -73,7 +85,7 @@
- DLL_SUFFIX		= so.1.0
- endif
- 
--MKSHLIB			= $(CC) $(DSO_LDOPTS)
-+MKSHLIB			= $(CC) -Wl,-Bsymbolic -lc $(DSO_LDOPTS) -o $@
- ifdef MAPFILE
- 	MKSHLIB += -Wl,--version-script,$(MAPFILE)
- endif
-@@ -82,4 +94,4 @@
- 
- G++INCLUDES		= -I/usr/include/g++
- 
--INCLUDES		+= -I/usr/X11R6/include
-+#INCLUDES		+= -I/usr/local/include

Deleted: branches/experimental/mail/thunderbird-devel/files/patch-security_manager_ssl_src_nsNSSComponent.cpp
==============================================================================
--- branches/experimental/mail/thunderbird-devel/files/patch-security_manager_ssl_src_nsNSSComponent.cpp	Thu Oct  8 20:40:12 2009	(r134)
+++ /dev/null	00:00:00 1970	(deleted)
@@ -1,10 +0,0 @@
---- mozilla/security/manager/ssl/src/nsNSSComponent.cpp.orig	Mon May 29 23:10:54 2006
-+++ mozilla/security/manager/ssl/src/nsNSSComponent.cpp	Mon May 29 23:12:22 2006
-@@ -110,6 +110,7 @@
- #include "nss.h"
- #include "pk11func.h"
- #include "ssl.h"
-+#define NSS_ENABLE_ECC 1
- #include "sslproto.h"
- #include "secmod.h"
- #include "sechash.h"

Deleted: branches/experimental/mail/thunderbird-devel/files/patch-storage_build_Makefile.in
==============================================================================
--- branches/experimental/mail/thunderbird-devel/files/patch-storage_build_Makefile.in	Thu Oct  8 20:40:12 2009	(r134)
+++ /dev/null	00:00:00 1970	(deleted)
@@ -1,10 +0,0 @@
---- mozilla/storage/build/Makefile.in.orig	Tue Feb 21 11:18:56 2006
-+++ mozilla/storage/build/Makefile.in	Sun Nov  5 16:16:06 2006
-@@ -77,6 +77,7 @@
- 	$(EXTRA_DSO_LIBS) \
- 	$(MOZ_COMPONENT_LIBS) \
- 	$(MOZ_JS_LIBS) \
-+	%%PTHREAD_LIBS%% \
- 	$(NULL)
- 
- include $(topsrcdir)/config/rules.mk

Deleted: branches/experimental/mail/thunderbird-devel/files/patch-toolkit_mozapps_installer_packager.mk
==============================================================================
--- branches/experimental/mail/thunderbird-devel/files/patch-toolkit_mozapps_installer_packager.mk	Thu Oct  8 20:40:12 2009	(r134)
+++ /dev/null	00:00:00 1970	(deleted)
@@ -1,11 +0,0 @@
---- mozilla/toolkit/mozapps/installer/packager.mk.orig	2007-09-26 13:45:01.000000000 -0400
-+++ mozilla/toolkit/mozapps/installer/packager.mk	2007-09-26 13:47:29.000000000 -0400
-@@ -409,7 +409,7 @@
- 	(cd $(DIST)/sdk/include && tar $(TAR_CREATE_FLAGS) - .) | \
- 	  (cd $(DESTDIR)$(includedir)/stable && tar -xf -)
- # The dist/include has module subdirectories that we need to flatten
--	find $(DIST)/include -xtype f -exec $(SYSINSTALL) $(IFLAGS1) {} $(DESTDIR)$(includedir)/unstable \;
-+	find $(DIST)/include -type f -o -type l -exec $(SYSINSTALL) $(IFLAGS1) {} $(DESTDIR)$(includedir)/unstable \;
- # IDL directory is stable (dist/sdk/idl) and unstable (dist/idl)
- 	$(NSINSTALL) -D $(DESTDIR)$(idldir)/stable 
- 	$(NSINSTALL) -D $(DESTDIR)$(idldir)/unstable

Deleted: branches/experimental/mail/thunderbird-devel/files/patch-toolkit_xre_Makefile.in
==============================================================================
--- branches/experimental/mail/thunderbird-devel/files/patch-toolkit_xre_Makefile.in	Thu Oct  8 20:40:12 2009	(r134)
+++ /dev/null	00:00:00 1970	(deleted)
@@ -1,8 +0,0 @@
---- mozilla/toolkit/xre/Makefile.in.orig	2007-09-10 10:31:53.000000000 -0400
-+++ mozilla/toolkit/xre/Makefile.in	2007-09-10 10:35:00.000000000 -0400
-@@ -263,5 +263,3 @@
- libs:: platform.ini
- 	$(INSTALL) $^ $(DIST)/bin
- 
--install::
--	$(INSTALL) $(IFLAGS1) $^ $(DESTDIR)$(mozappdir)

Deleted: branches/experimental/mail/thunderbird-devel/files/patch-xpcom-reflect-xptcall-public-xptcstubsdecl.inc
==============================================================================
--- branches/experimental/mail/thunderbird-devel/files/patch-xpcom-reflect-xptcall-public-xptcstubsdecl.inc	Thu Oct  8 20:40:12 2009	(r134)
+++ /dev/null	00:00:00 1970	(deleted)
@@ -1,11 +0,0 @@
---- mozilla/xpcom/reflect/xptcall/public/xptcstubsdecl.inc.orig	Tue Mar 16 03:07:25 2004
-+++ mozilla/xpcom/reflect/xptcall/public/xptcstubsdecl.inc	Tue Jun 15 12:52:36 2004
-@@ -8,7 +8,7 @@
- *  1 is AddRef
- *  2 is Release
- */
--#if !defined(__ia64) || (!defined(__hpux) && !defined(__linux__))
-+#if !defined(__ia64)
- NS_IMETHOD Stub3();
- NS_IMETHOD Stub4();
- NS_IMETHOD Stub5();

Deleted: branches/experimental/mail/thunderbird-devel/files/patch-xpcom_reflect_xptcall_src_md_unix_Makefile.in
==============================================================================
--- branches/experimental/mail/thunderbird-devel/files/patch-xpcom_reflect_xptcall_src_md_unix_Makefile.in	Thu Oct  8 20:40:12 2009	(r134)
+++ /dev/null	00:00:00 1970	(deleted)
@@ -1,76 +0,0 @@
---- mozilla/xpcom/reflect/xptcall/src/md/unix/Makefile.in.orig	2009-03-05 22:32:55.000000000 +0100
-+++ mozilla/xpcom/reflect/xptcall/src/md/unix/Makefile.in	2009-04-21 14:15:46.135700268 +0200
-@@ -70,6 +70,9 @@
- ifeq (Darwin,$(OS_ARCH))
- DEFINES		+= -DKEEP_STACK_16_BYTE_ALIGNED
- endif
-+ifeq (x86_64,$(OS_TEST))
-+CPPSRCS		:= xptcinvoke_x86_64_linux.cpp xptcstubs_x86_64_linux.cpp
-+endif
- endif
- endif
- #
-@@ -87,7 +90,7 @@
- endif
- endif
- # IA64 Linux
--ifneq (,$(filter Linux,$(OS_ARCH)))
-+ifneq (,$(filter Linux FreeBSD,$(OS_ARCH)))
- ifneq (,$(findstring ia64,$(OS_TEST)))
- CPPSRCS		:= xptcinvoke_ipf64.cpp xptcstubs_ipf64.cpp
- ASFILES		:= xptcstubs_asm_ipf64.s xptcinvoke_asm_ipf64.s
-@@ -100,6 +103,12 @@
- CPPSRCS		:= xptcinvoke_amd64_openbsd.cpp xptcstubs_amd64_openbsd.cpp
- endif
- #
-+# FreeBSD/amd64
-+#
-+ifeq ($(OS_ARCH)$(OS_TEST),FreeBSDamd64)
-+CPPSRCS         := xptcinvoke_amd64_openbsd.cpp xptcstubs_amd64_openbsd.cpp
-+endif
-+#
- # BeOS/Intel (uses the same unixish_x86 code)
- #
- ifeq ($(OS_ARCH)$(OS_TEST),BeOSBePC)
-@@ -150,9 +159,15 @@
- ASFILES		:= xptcinvoke_asm_osf1_alpha.s xptcstubs_asm_osf1_alpha.s
- endif
- #
-+# FreeBSD/Alpha
-+#
-+ifeq ($(OS_ARCH)$(OS_TEST),FreeBSDalpha)
-+CPPSRCS		:= xptcinvoke_freebsd_alpha.cpp xptcstubs_freebsd_alpha.cpp
-+endif
-+#
- # Linux/Alpha
- #
--ifneq (,$(filter Linuxalpha FreeBSDalpha NetBSDalpha,$(OS_ARCH)$(OS_TEST)))                           
-+ifneq (,$(filter Linuxalpha NetBSDalpha,$(OS_ARCH)$(OS_TEST)))                           
- CPPSRCS		:= xptcinvoke_linux_alpha.cpp xptcstubs_linux_alpha.cpp
- endif
- #
-@@ -307,7 +322,7 @@
- #
- # Linux/PPC
- #
--ifeq ($(OS_ARCH)$(OS_TEST),Linuxpowerpc)
-+ifneq (,$(filter Linuxpowerpc FreeBSDpowerpc,$(OS_ARCH)$(OS_TEST)))
- CPPSRCS		:= xptcinvoke_ppc_linux.cpp xptcstubs_ppc_linux.cpp
- ASFILES		:= xptcinvoke_asm_ppc_linux.s xptcstubs_asm_ppc_linux.s
- AS		:= $(CC) -c -x assembler-with-cpp
-@@ -385,6 +400,15 @@
- ASFILES		:= xptcinvoke_asm_sparc_netbsd.s xptcstubs_asm_sparc_netbsd.s
- endif
- #
-+# FreeBSD/SPARC64
-+#
-+ifeq ($(OS_ARCH),FreeBSD)
-+ifneq (,$(findstring sparc,$(OS_TEST)))
-+CPPSRCS		:= xptcinvoke_sparc64_openbsd.cpp xptcstubs_sparc64_openbsd.cpp
-+ASFILES		:= xptcinvoke_asm_sparc64_openbsd.s xptcstubs_asm_sparc64_openbsd.s
-+endif
-+endif
-+#
- # OpenBSD/SPARC
- #
- ifeq ($(OS_ARCH)$(OS_TEST),OpenBSDsparc)

Copied: branches/experimental/www/firefox3-devel/files/patch-media-libsydneyaudio-include-sydney_audio.h (from r134, branches/experimental/www/firefox3-devel/files/patch-media_liboggplay_audio_sydney_audio.h)
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ branches/experimental/www/firefox3-devel/files/patch-media-libsydneyaudio-include-sydney_audio.h	Thu Oct  8 20:40:12 2009	(r135, copy of r134, branches/experimental/www/firefox3-devel/files/patch-media_liboggplay_audio_sydney_audio.h)
@@ -0,0 +1,11 @@
+--- media/libsydneyaudio/include/sydney_audio.h.orgi	2009-04-10 12:24:01.000000000 +0200
++++ media/libsydneyaudio/include/sydney_audio.h	2009-04-10 12:24:30.000000000 +0200
+@@ -73,7 +73,7 @@
+ #   endif
+ #elif defined(WIN32)
+ #   define SA_LITTLE_ENDIAN 1
+-#elif defined(__APPLE__)
++#elif defined(__APPLE__) || defined(__FreeBSD__)
+ #   if defined(__BIG_ENDIAN__)
+ #       define SA_BIG_ENDIAN 1
+ #   else

Deleted: branches/experimental/www/firefox3-devel/files/patch-media_liboggplay_audio_sydney_audio.h
==============================================================================
--- branches/experimental/www/firefox3-devel/files/patch-media_liboggplay_audio_sydney_audio.h	Thu Oct  8 20:40:12 2009	(r134)
+++ /dev/null	00:00:00 1970	(deleted)
@@ -1,11 +0,0 @@
---- media/libsydneyaudio/include/sydney_audio.h.orgi	2009-04-10 12:24:01.000000000 +0200
-+++ media/libsydneyaudio/include/sydney_audio.h	2009-04-10 12:24:30.000000000 +0200
-@@ -73,7 +73,7 @@
- #   endif
- #elif defined(WIN32)
- #   define SA_LITTLE_ENDIAN 1
--#elif defined(__APPLE__)
-+#elif defined(__APPLE__) || defined(__FreeBSD__)
- #   if defined(__BIG_ENDIAN__)
- #       define SA_BIG_ENDIAN 1
- #   else


More information about the freebsd-gecko mailing list