Add DragonFly build support, partly based on the patches from

www/firefox.

21 files changed, 555 insertions, 40 deletions

diff --git a/mail/thunderbird/patches/patch-ab b/mail/thunderbird/patches/patch-ab
index a72bccfcbde..7ed0093aebe 100644
--- a/mail/thunderbird/patches/patch-ab
+++ b/mail/thunderbird/patches/patch-ab
@@ -1,8 +1,8 @@
-$NetBSD: patch-ab,v 1.5 2005/07/25 15:46:02 adam Exp $
+$NetBSD: patch-ab,v 1.6 2005/12/30 21:35:58 joerg Exp $
 
 --- configure.in.orig	2004-10-31 07:17:58.000000000 +0000
 +++ configure.in
-@@ -1001,7 +1001,6 @@ case "$target" in
+@@ -1001,14 +1001,13 @@ case "$target" in
      powerpc*)
          _PLATFORM_DEFAULT_TOOLKIT='mac'
          DSO_LDOPTS="$DSO_LDOPTS -arch ppc"
@@ -10,6 +10,14 @@ $NetBSD: patch-ab,v 1.5 2005/07/25 15:46:02 adam Exp $
          # set MACOSX to generate lib/mac/MoreFiles/Makefile
          MACOSX=1
          ;;
+     esac
+     ;;
+ 
+-*-freebsd*)
++*-freebsd* | *-dragonfly*)
+     if test `test -x /usr/bin/objformat && /usr/bin/objformat || echo aout` != "elf"; then
+ 	DLL_SUFFIX=".so.1.0"
+ 	DSO_LDOPTS="-shared"
 @@ -1022,6 +1021,9 @@ case "$target" in
  #	MKSHLIB_FORCE_ALL='-Wl,-Bforcearchive'
  #	MKSHLIB_UNFORCE_ALL=''
@@ -43,6 +51,15 @@ $NetBSD: patch-ab,v 1.5 2005/07/25 15:46:02 adam Exp $
         AR_LIST="$AR t"
         AR_EXTRACT="$AR x"
         AR_DELETE="$AR d"
+@@ -2181,7 +2190,7 @@ then
+     fi
+ 
+ 	case "$target" in
+-	    *-*-freebsd*)
++	    *-*-freebsd* | *-*-dragonfly*)
+ 			AC_DEFINE(_REENTRANT)
+ 			AC_DEFINE(_THREAD_SAFE)
+ 			dnl -pthread links in -lc_r, so don't specify it explicitly.
 @@ -4280,7 +4289,7 @@ dnl = Enable code optimization. OFF by d
  dnl ========================================================
  MOZ_OPTIMIZE=
diff --git a/mail/thunderbird/patches/patch-ac b/mail/thunderbird/patches/patch-ac
index 9450018df2d..a68573bf5d7 100644
--- a/mail/thunderbird/patches/patch-ac
+++ b/mail/thunderbird/patches/patch-ac
@@ -1,8 +1,13 @@
-$NetBSD: patch-ac,v 1.4 2004/12/04 02:16:03 taya Exp $
+$NetBSD: patch-ac,v 1.5 2005/12/30 21:35:58 joerg Exp $
 
---- xpcom/reflect/xptcall/src/md/unix/Makefile.in.orig	2004-04-22 22:50:05.000000000 +0200
+--- xpcom/reflect/xptcall/src/md/unix/Makefile.in.orig	2005-04-28 16:01:33.000000000 +0000
 +++ xpcom/reflect/xptcall/src/md/unix/Makefile.in
-@@ -49,6 +49,9 @@ ifneq (,$(filter FreeBSD NetBSD OpenBSD 
+@@ -45,10 +45,13 @@ include $(topsrcdir)/config/config.mk
+ #
+ # Lots of Unixish x86 flavors
+ #
+-ifneq (,$(filter FreeBSD NetBSD OpenBSD BSD_OS Darwin,$(OS_ARCH)))
++ifneq (,$(filter FreeBSD NetBSD OpenBSD BSD_OS Darwin DragonFly,$(OS_ARCH)))
  ifeq (86,$(findstring 86,$(OS_TEST)))
  CPPSRCS		:= xptcinvoke_unixish_x86.cpp xptcstubs_unixish_x86.cpp
  endif
diff --git a/mail/thunderbird/patches/patch-aq b/mail/thunderbird/patches/patch-aq
index 442736c3289..bd0b5160ccb 100644
--- a/mail/thunderbird/patches/patch-aq
+++ b/mail/thunderbird/patches/patch-aq
@@ -1,8 +1,9 @@
-$NetBSD: patch-aq,v 1.1 2005/07/25 15:46:02 adam Exp $
+$NetBSD: patch-aq,v 1.2 2005/12/30 21:35:58 joerg Exp $
 
---- directory/c-sdk/configure.in.orig	2005-07-23 11:36:39.000000000 +0000
-+++ directory/c-sdk/configure.in
-@@ -52,7 +52,7 @@ USE_64=
+diff -ruN ../Orig/mozilla/directory/c-sdk/configure.in ./directory/c-sdk/configure.in
+--- ../Orig/mozilla/directory/c-sdk/configure.in	2005-06-15 06:27:33.000000000 +0900
++++ ./directory/c-sdk/configure.in	2005-12-04 19:07:54.000000000 +0900
+@@ -54,7 +54,7 @@
  USE_CPLUS=
  USE_IPV6=
  USE_MDUPDATE=
@@ -11,3 +12,30 @@ $NetBSD: patch-aq,v 1.1 2005/07/25 15:46:02 adam Exp $
  _DEBUG_FLAGS=-g
  MOZ_DEBUG=1
  MOZ_OPTIMIZE=
+@@ -907,7 +907,7 @@
+     PR_MD_CSRCS=dgux.c
+     ;;
+ 
+-*-freebsd*)
++*-freebsd*|*-dragonfly*)
+     if test -z "$USE_NSPR_THREADS"; then
+         USE_PTHREADS=1
+     fi
+@@ -2061,7 +2061,7 @@
+             _PTHREAD_LDFLAGS=
+         fi
+ 	    ;;
+-    *-freebsd*|*-openbsd*|*-bsdi*|*-netbsd*)
++    *-freebsd*|*-openbsd*|*-bsdi*|*-netbsd*|*-dragonfly*)
+ 	    AC_DEFINE(_THREAD_SAFE)
+ 	    dnl -pthread links in -lc_r, so don't specify it explicitly.
+ 	    if test "$ac_cv_have_dash_pthread" = "yes"; then
+@@ -2114,7 +2114,7 @@
+         AC_DEFINE(_PR_NEED_PTHREAD_INIT)
+     fi
+     ;;
+-*-freebsd*)
++*-freebsd*|*-dragonfly*)
+     if test -n "$USE_NSPR_THREADS"; then
+         AC_DEFINE(_PR_LOCAL_THREADS_ONLY)
+     fi
diff --git a/mail/thunderbird/patches/patch-ar b/mail/thunderbird/patches/patch-ar
new file mode 100644
index 00000000000..26f29ddc330
--- /dev/null
+++ b/mail/thunderbird/patches/patch-ar
@@ -0,0 +1,15 @@
+$NetBSD: patch-ar,v 1.1 2005/12/30 21:35:58 joerg Exp $
+
+--- mailnews/movemail/src/movemail.c.orig	2005-12-29 17:00:05.000000000 +0000
++++ mailnews/movemail/src/movemail.c
+@@ -51,8 +51,8 @@ typedef int XP_Bool;
+ 
+ #define LINUX_GLIBC_2
+ 
+-#include <sys/errno.h>
+-#if !defined(__FreeBSD__) && !defined(MACLINUX) && !defined(LINUX_GLIBC_2)
++#include <errno.h>
++#if !defined(__FreeBSD__) && !defined(MACLINUX) && !defined(LINUX_GLIBC_2) && !defined(__DragonFly__)
+ extern char *sys_errlist[];
+ extern int sys_nerr;
+ #endif
diff --git a/mail/thunderbird/patches/patch-ba b/mail/thunderbird/patches/patch-ba
index 51d25757ea7..4b9735a0416 100644
--- a/mail/thunderbird/patches/patch-ba
+++ b/mail/thunderbird/patches/patch-ba
@@ -1,9 +1,9 @@
-$NetBSD: patch-ba,v 1.3 2004/06/24 23:09:56 taya Exp $
+$NetBSD: patch-ba,v 1.4 2005/12/30 21:35:58 joerg Exp $
 
-diff -ru ../Orig/mozilla/nsprpub/pr/include/md/_netbsd.cfg ./nsprpub/pr/include/md/_netbsd.cfg
---- ../Orig/mozilla/nsprpub/pr/include/md/_netbsd.cfg	2000-12-02 06:29:17.000000000 +0900
-+++ ./nsprpub/pr/include/md/_netbsd.cfg	2004-06-15 23:56:25.000000000 +0900
-@@ -45,7 +45,8 @@
+diff -ruN ../Orig/mozilla/nsprpub/pr/include/md/_netbsd.cfg ./nsprpub/pr/include/md/_netbsd.cfg
+--- ../Orig/mozilla/nsprpub/pr/include/md/_netbsd.cfg	2004-04-28 09:33:44.000000000 +0900
++++ ./nsprpub/pr/include/md/_netbsd.cfg	2005-12-04 19:09:16.000000000 +0900
+@@ -48,7 +48,8 @@
  
  #define PR_AF_INET6 24  /* same as AF_INET6 */
  
@@ -13,7 +13,7 @@ diff -ru ../Orig/mozilla/nsprpub/pr/include/md/_netbsd.cfg ./nsprpub/pr/include/
  
  #define IS_LITTLE_ENDIAN 1
  #undef  IS_BIG_ENDIAN
-@@ -91,7 +92,53 @@
+@@ -94,7 +95,53 @@
  #define PR_ALIGN_OF_DOUBLE  4
  #define PR_ALIGN_OF_POINTER 4
  
@@ -68,7 +68,7 @@ diff -ru ../Orig/mozilla/nsprpub/pr/include/md/_netbsd.cfg ./nsprpub/pr/include/
  
  #undef IS_LITTLE_ENDIAN
  #define  IS_BIG_ENDIAN 1
-@@ -184,6 +231,55 @@
+@@ -187,6 +234,55 @@
  #define PR_BYTES_PER_WORD_LOG2  3
  #define PR_BYTES_PER_DWORD_LOG2 3
  
diff --git a/mail/thunderbird/patches/patch-bo b/mail/thunderbird/patches/patch-bo
index 685cabed943..031978f2ab2 100644
--- a/mail/thunderbird/patches/patch-bo
+++ b/mail/thunderbird/patches/patch-bo
@@ -1,23 +1,75 @@
-$NetBSD: patch-bo,v 1.4 2005/07/25 15:46:02 adam Exp $
+$NetBSD: patch-bo,v 1.5 2005/12/30 21:35:58 joerg Exp $
 
---- nsprpub/configure.in.orig	2004-09-14 20:59:41.000000000 +0000
-+++ nsprpub/configure.in
-@@ -56,7 +56,7 @@ USE_CPLUS=
- USE_IPV6=
- USE_MDUPDATE=
- MACOS_DEPLOYMENT_TARGET=
--_OPTIMIZE_FLAGS=-O
-+_OPTIMIZE_FLAGS=
- _DEBUG_FLAGS=-g
- MOZ_DEBUG=1
- MOZ_OPTIMIZE=
-@@ -933,6 +933,9 @@ case "$target" in
+diff -ruN ../Orig/mozilla/nsprpub/configure.in ./nsprpub/configure.in
+--- ../Orig/mozilla/nsprpub/configure.in	2005-09-16 07:37:52.000000000 +0900
++++ ./nsprpub/configure.in	2005-12-04 19:17:56.000000000 +0900
+@@ -1045,6 +1045,34 @@
      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)
++    AC_DEFINE(FREEBSD)
++    AC_DEFINE(HAVE_BSD_FLOCK)
++    AC_DEFINE(HAVE_SOCKLEN_T)
++    CFLAGS="$CFLAGS $(DSO_CFLAGS) -ansi -Wall"
++    MOZ_OBJFORMAT=`test -x /usr/bin/objformat && /usr/bin/objformat || echo aout`
++    if test "$MOZ_OBJFORMAT" = "elf"; then
++        DLL_SUFFIX=so
++    else
++        DLL_SUFFIX=so.1.0
++    fi
++    MKSHLIB='$(CC) $(DSO_LDOPTS) -o $@'
++    DSO_CFLAGS=-fPIC
++    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
      ;;
  
  *-hpux*)
+@@ -1544,6 +1572,7 @@
+     AC_DEFINE(XP_UNIX)
+     AC_DEFINE(NETBSD)
+     AC_DEFINE(HAVE_BSD_FLOCK)
++    AC_DEFINE(HAVE_SOCKLEN_T)
+     USE_NSPR_THREADS=1
+     MDCPUCFG_H=_netbsd.cfg
+     PR_MD_CSRCS=netbsd.c
+@@ -2307,7 +2336,7 @@
+ 	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
+             ;;
+ 	    *)
+@@ -2345,7 +2374,7 @@
+             _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.
+@@ -2426,7 +2455,7 @@
+         AC_DEFINE(_PR_NEED_PTHREAD_INIT)
+     fi
+     ;;
+-*-freebsd*)
++*-freebsd* | *-dragonfly*)
+     if test -n "$USE_NSPR_THREADS"; then
+         AC_DEFINE(_PR_LOCAL_THREADS_ONLY)
+     fi
diff --git a/mail/thunderbird/patches/patch-bs b/mail/thunderbird/patches/patch-bs
index c350bebaa05..793120f8f09 100644
--- a/mail/thunderbird/patches/patch-bs
+++ b/mail/thunderbird/patches/patch-bs
@@ -1,15 +1,33 @@
-$NetBSD: patch-bs,v 1.3 2004/06/24 23:09:56 taya Exp $
+$NetBSD: patch-bs,v 1.4 2005/12/30 21:35:58 joerg Exp $
 
-diff -ru ../Orig/mozilla/config/mkdepend/imakemdep.h ./config/mkdepend/imakemdep.h
---- ../Orig/mozilla/config/mkdepend/imakemdep.h	1998-09-05 13:22:25.000000000 +0900
-+++ ./config/mkdepend/imakemdep.h	2004-06-15 23:56:48.000000000 +0900
-@@ -277,6 +277,9 @@
+diff -ruN ../Orig/mozilla/config/mkdepend/imakemdep.h ./config/mkdepend/imakemdep.h
+--- ../Orig/mozilla/config/mkdepend/imakemdep.h	2004-04-21 06:38:14.000000000 +0900
++++ ./config/mkdepend/imakemdep.h	2005-12-04 19:21:01.000000000 +0900
+@@ -235,7 +235,7 @@
+ #ifdef _CRAY
+ #define DEFAULT_CPP "/lib/pcpp"
+ #endif
+-#if defined(__386BSD__) || defined(__NetBSD__) || defined(__FreeBSD__) || defined(__OpenBSD__)
++#if defined(__386BSD__) || defined(__NetBSD__) || defined(__FreeBSD__) || defined(__OpenBSD__) || defined(__DragonFly__)
+ #define DEFAULT_CPP "/usr/libexec/cpp"
+ #endif
+ #ifdef	MACH
+@@ -273,7 +273,7 @@
+ #ifdef unix
+ 	"-Uunix",	/* remove unix symbol so that filename unix.c okay */
+ #endif
+-#if defined(__386BSD__) || defined(__NetBSD__) || defined(__FreeBSD__) || defined(__OpenBSD__) || defined(MACH)
++#if defined(__386BSD__) || defined(__NetBSD__) || defined(__FreeBSD__) || defined(__OpenBSD__) || defined(MACH) || defined(__DragonFly__)
  # ifdef __i386__
  	"-D__i386__",
  # endif
-+#if defined(__amd64__) || defined(__x86_64__)
-+	"-D__amd64__ -D__x86_64__",
-+# endif
- # ifdef __GNUC__
- 	"-traditional",
- # endif
+@@ -713,6 +713,9 @@
+ #ifdef __sgi
+ 	{"__sgi", "1"},
+ #endif
++#ifdef __DragonFly__
++	{"__DragonFly__", "1"},
++#endif
+ #ifdef __FreeBSD__
+ 	{"__FreeBSD__", "1"},
+ #endif
diff --git a/mail/thunderbird/patches/patch-da b/mail/thunderbird/patches/patch-da
new file mode 100644
index 00000000000..cbb854f8809
--- /dev/null
+++ b/mail/thunderbird/patches/patch-da
@@ -0,0 +1,13 @@
+$NetBSD: patch-da,v 1.1 2005/12/30 21:35:58 joerg Exp $
+
+--- xpcom/build/malloc.c.orig	2005-12-29 17:03:39.000000000 +0000
++++ xpcom/build/malloc.c
+@@ -918,7 +918,7 @@ struct mallinfo {
+ 
+ 
+ #ifdef LACKS_UNISTD_H
+-#if !defined(__FreeBSD__) && !defined(__OpenBSD__) && !defined(__NetBSD__)
++#if !defined(__FreeBSD__) && !defined(__OpenBSD__) && !defined(__NetBSD__) && !defined(__DragonFly__)
+ #if __STD_C
+ extern Void_t*     sbrk(ptrdiff_t);
+ #else
diff --git a/mail/thunderbird/patches/patch-db b/mail/thunderbird/patches/patch-db
new file mode 100644
index 00000000000..c99cc8a84e6
--- /dev/null
+++ b/mail/thunderbird/patches/patch-db
@@ -0,0 +1,14 @@
+$NetBSD: patch-db,v 1.1 2005/12/30 21:35:58 joerg Exp $
+
+--- js/src/Makefile.in.orig	2005-12-29 17:04:08.000000000 +0000
++++ js/src/Makefile.in
+@@ -250,6 +250,9 @@ endif # WINNT
+ ifeq ($(OS_ARCH),FreeBSD)
+ LDFLAGS		+= -pthread
+ endif
++ifeq ($(OS_ARCH),DragonFly)
++LDFLAGS		+= -pthread
++endif
+ ifeq ($(OS_ARCH),IRIX)
+ ifdef USE_N32
+ DASH_R		+= -n32
diff --git a/mail/thunderbird/patches/patch-dc b/mail/thunderbird/patches/patch-dc
new file mode 100644
index 00000000000..a4e363ac4af
--- /dev/null
+++ b/mail/thunderbird/patches/patch-dc
@@ -0,0 +1,23 @@
+$NetBSD: patch-dc,v 1.1 2005/12/30 21:35:58 joerg Exp $
+
+diff -ruN ../Orig/mozilla/gc/boehm/mach_dep.c ./gc/boehm/mach_dep.c
+--- ../Orig/mozilla/gc/boehm/mach_dep.c	1999-09-30 11:25:45.000000000 +0900
++++ ./gc/boehm/mach_dep.c	2005-12-04 19:44:28.000000000 +0900
+@@ -206,7 +206,7 @@
+ 	&& !defined(SCO) && !defined(SCO_ELF) \
+  	&& !(defined(LINUX)       && defined(__ELF__)) \
+ 	&& !(defined(__FreeBSD__) && defined(__ELF__)) \
+-	&& !defined(DOS4GW)
++	&& !defined(DOS4GW) && !(defined(__DragonFly__) && defined(__ELF__))
+ 	/* I386 code, generic code does not appear to work */
+ 	/* It does appear to work under OS2, and asms dont */
+ 	/* This is used for some 38g UNIX variants and for CYGWIN32 */
+@@ -220,7 +220,7 @@
+ #       endif
+ 
+ #	if ( defined(I386) && defined(LINUX) && defined(__ELF__) ) \
+-	|| ( defined(I386) && defined(__FreeBSD__) && defined(__ELF__) )
++	|| ( defined(I386) && (defined(__FreeBSD__) || defined(__DragonFly__)) && defined(__ELF__) )
+ 
+ 	/* This is modified for Linux with ELF (Note: _ELF_ only) */
+ 	/* This section handles FreeBSD with ELF. */
diff --git a/mail/thunderbird/patches/patch-de b/mail/thunderbird/patches/patch-de
new file mode 100644
index 00000000000..f92b8ec5f48
--- /dev/null
+++ b/mail/thunderbird/patches/patch-de
@@ -0,0 +1,17 @@
+$NetBSD: patch-de,v 1.1 2005/12/30 21:35:58 joerg Exp $
+
+--- config/rules.mk.orig	2005-12-29 17:05:40.000000000 +0000
++++ config/rules.mk
+@@ -444,6 +444,12 @@ EXTRA_DSO_LDOPTS += -Wl,-Bsymbolic
+ endif
+ endif
+ 
++ifeq ($(OS_ARCH),DragonFly)
++ifdef IS_COMPONENT
++EXTRA_DSO_LDOPTS += -Wl,-Bsymbolic
++endif
++endif
++
+ ifeq ($(OS_ARCH),NetBSD)
+ ifneq (,$(filter arc cobalt hpcmips mipsco newsmips pmax sgimips,$(OS_TEST)))
+ ifeq ($(MODULE),layout)
diff --git a/mail/thunderbird/patches/patch-df b/mail/thunderbird/patches/patch-df
new file mode 100644
index 00000000000..9fe33931a5e
--- /dev/null
+++ b/mail/thunderbird/patches/patch-df
@@ -0,0 +1,13 @@
+$NetBSD: patch-df,v 1.1 2005/12/30 21:35:58 joerg Exp $
+
+--- config/config.mk.orig	2005-12-29 17:06:04.000000000 +0000
++++ config/config.mk
+@@ -146,7 +146,7 @@ endif
+ # but save the version to allow multiple versions of the same base
+ # platform to be built in the same tree.
+ #
+-ifneq (,$(filter FreeBSD HP-UX IRIX Linux NetBSD OpenBSD OSF1 SunOS,$(OS_ARCH)))
++ifneq (,$(filter DragonFly FreeBSD HP-UX IRIX Linux NetBSD OpenBSD OSF1 SunOS,$(OS_ARCH)))
+ OS_RELEASE	:= $(basename $(OS_RELEASE))
+ 
+ # Allow the user to ignore the OS_VERSION, which is usually irrelevant.
diff --git a/mail/thunderbird/patches/patch-dg b/mail/thunderbird/patches/patch-dg
new file mode 100644
index 00000000000..dbeb21542c9
--- /dev/null
+++ b/mail/thunderbird/patches/patch-dg
@@ -0,0 +1,32 @@
+$NetBSD: patch-dg,v 1.1 2005/12/30 21:35:58 joerg Exp $
+
+diff -ruN ../Orig/mozilla/nsprpub/pr/include/md/_freebsd.h ./nsprpub/pr/include/md/_freebsd.h
+--- ../Orig/mozilla/nsprpub/pr/include/md/_freebsd.h	2004-11-24 06:22:35.000000000 +0900
++++ ./nsprpub/pr/include/md/_freebsd.h	2005-12-04 19:44:37.000000000 +0900
+@@ -79,7 +79,7 @@
+ #define _PR_NO_LARGE_FILES
+ 
+ #if defined(_PR_PTHREADS)
+-#if __FreeBSD_version >= 400008
++#if defined(__DragonFly__) || __FreeBSD_version >= 400008
+ /*
+  * libc_r before this version of FreeBSD doesn't have poll().
+  * Although libc has poll(), it is not thread-safe so we can't
+@@ -88,7 +88,7 @@
+ #define _PR_POLL_AVAILABLE
+ #endif
+ #else
+-#if __FreeBSD_version >= 300000
++#if defined(__DragonFly__) || __FreeBSD_version >= 300000
+ #define _PR_POLL_AVAILABLE
+ #define _PR_USE_POLL
+ #endif
+@@ -97,7 +97,7 @@
+ #define _PR_HAVE_SYSV_SEMAPHORES
+ #define PR_HAVE_SYSV_NAMED_SHARED_MEMORY
+ 
+-#if __FreeBSD_version >= 400014
++#if defined(__DragonFly__) || __FreeBSD_version >= 400014
+ #define _PR_INET6
+ #define _PR_HAVE_INET_NTOP
+ #define _PR_HAVE_GETHOSTBYNAME2
diff --git a/mail/thunderbird/patches/patch-dh b/mail/thunderbird/patches/patch-dh
new file mode 100644
index 00000000000..2b48aec5cd2
--- /dev/null
+++ b/mail/thunderbird/patches/patch-dh
@@ -0,0 +1,19 @@
+$NetBSD: patch-dh,v 1.1 2005/12/30 21:35:58 joerg Exp $
+
+diff -ruN ../Orig/mozilla/xpcom/reflect/xptcall/src/md/unix/xptc_platforms_unixish_x86.h ./xpcom/reflect/xptcall/src/md/unix/xptc_platforms_unixish_x86.h
+--- ../Orig/mozilla/xpcom/reflect/xptcall/src/md/unix/xptc_platforms_unixish_x86.h	2004-04-18 23:18:18.000000000 +0900
++++ ./xpcom/reflect/xptcall/src/md/unix/xptc_platforms_unixish_x86.h	2005-12-04 19:44:41.000000000 +0900
+@@ -77,6 +77,13 @@
+ #define THUNK_BASED_THIS_ADJUST
+ #endif
+ 
++#elif defined(__DragonFly__)
++#  if defined(__FreeBSD_cc_version)
++#    define CFRONT_STYLE_THIS_ADJUST
++#  else
++#    define THUNK_BASED_THIS_ADJUST
++#  endif
++
+ #elif defined(__FreeBSD__) 
+ /* System versions of gcc on FreeBSD don't use thunks.  On 3.x, the system
+  * compiler is gcc 2.7.2.3, which doesn't use thunks by default.  On 4.x and
diff --git a/mail/thunderbird/patches/patch-dj b/mail/thunderbird/patches/patch-dj
new file mode 100644
index 00000000000..af9a8a8a2ad
--- /dev/null
+++ b/mail/thunderbird/patches/patch-dj
@@ -0,0 +1,14 @@
+$NetBSD: patch-dj,v 1.1 2005/12/30 21:35:58 joerg Exp $
+
+diff -ruN ../Orig/mozilla/dbm/src/mktemp.c ./dbm/src/mktemp.c
+--- ../Orig/mozilla/dbm/src/mktemp.c	2003-01-21 08:13:37.000000000 +0900
++++ ./dbm/src/mktemp.c	2005-12-04 19:44:43.000000000 +0900
+@@ -98,7 +98,7 @@
+ static int 
+ _gettemp(char *path, register int *doopen, int extraFlags)
+ {    
+-#if !defined(_WINDOWS) || defined(_WIN32)
++#if (!defined(_WINDOWS) || defined(_WIN32)) && !defined(errno)
+ 	extern int errno;                    
+ #endif
+ 	register char *start, *trv;
diff --git a/mail/thunderbird/patches/patch-dk b/mail/thunderbird/patches/patch-dk
new file mode 100644
index 00000000000..bed031c0e1a
--- /dev/null
+++ b/mail/thunderbird/patches/patch-dk
@@ -0,0 +1,14 @@
+$NetBSD: patch-dk,v 1.1 2005/12/30 21:35:58 joerg Exp $
+
+diff -ruN ../Orig/mozilla/security/coreconf/config.mk ./security/coreconf/config.mk
+--- ../Orig/mozilla/security/coreconf/config.mk	2004-04-26 00:02:17.000000000 +0900
++++ ./security/coreconf/config.mk	2005-12-04 19:44:47.000000000 +0900
+@@ -63,7 +63,7 @@
+ #######################################################################
+ 
+ TARGET_OSES = FreeBSD BSD_OS NetBSD OpenUNIX OS2 QNX Darwin BeOS OpenBSD \
+-              OpenVMS AIX
++              OpenVMS AIX DragonFly
+ 
+ ifeq (,$(filter-out $(TARGET_OSES),$(OS_TARGET)))
+ include $(CORE_DEPTH)/coreconf/$(OS_TARGET).mk
diff --git a/mail/thunderbird/patches/patch-dl b/mail/thunderbird/patches/patch-dl
new file mode 100644
index 00000000000..38f85082cf7
--- /dev/null
+++ b/mail/thunderbird/patches/patch-dl
@@ -0,0 +1,89 @@
+$NetBSD: patch-dl,v 1.1 2005/12/30 21:35:58 joerg Exp $
+
+diff -ruN ../Orig/mozilla/security/coreconf/DragonFly.mk ./security/coreconf/DragonFly.mk
+--- ../Orig/mozilla/security/coreconf/DragonFly.mk	1970-01-01 09:00:00.000000000 +0900
++++ ./security/coreconf/DragonFly.mk	2005-12-04 19:44:48.000000000 +0900
+@@ -0,0 +1,83 @@
++#
++# The contents of this file are subject to the Mozilla Public
++# License Version 1.1 (the "License"); you may not use this file
++# except in compliance with the License. You may obtain a copy of
++# the License at http://www.mozilla.org/MPL/
++# 
++# Software distributed under the License is distributed on an "AS
++# IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or
++# implied. See the License for the specific language governing
++# rights and limitations under the License.
++# 
++# The Original Code is the Netscape security libraries.
++# 
++# The Initial Developer of the Original Code is Netscape
++# Communications Corporation.  Portions created by Netscape are 
++# Copyright (C) 1994-2000 Netscape Communications Corporation.  All
++# Rights Reserved.
++# 
++# Contributor(s):
++# 
++# Alternatively, the contents of this file may be used under the
++# terms of the GNU General Public License Version 2 or later (the
++# "GPL"), in which case the provisions of the GPL are applicable 
++# instead of those above.  If you wish to allow use of your 
++# version of this file only under the terms of the GPL and not to
++# allow others to use your version of this file under the MPL,
++# indicate your decision by deleting the provisions above and
++# replace them with the notice and other provisions required by
++# the GPL.  If you do not delete the provisions above, a recipient
++# may use your version of this file under either the MPL or the
++# GPL.
++#
++# Config stuff for DragonFly
++#
++
++include $(CORE_DEPTH)/coreconf/UNIX.mk
++
++DEFAULT_COMPILER	= gcc
++CC			= gcc
++CCC			= g++
++RANLIB			= ranlib
++
++ifeq ($(OS_TEST),alpha)
++CPU_ARCH		= alpha
++else
++CPU_ARCH		= x86
++endif
++
++OS_CFLAGS		= $(DSO_CFLAGS) -ansi -Wall -DFREEBSD -DHAVE_STRERROR -DHAVE_BSD_FLOCK
++
++DSO_CFLAGS		= -fPIC
++DSO_LDOPTS		= -shared -Wl,-soname -Wl,$(notdir $@)
++
++#
++# The default implementation strategy for FreeBSD is pthreads.
++#
++ifndef CLASSIC_NSPR
++USE_PTHREADS		= 1
++DEFINES			+= -D_THREAD_SAFE -D_REENTRANT
++OS_LIBS			+= -pthread
++DSO_LDOPTS		+= -pthread
++endif
++
++ARCH			= freebsd
++
++MOZ_OBJFORMAT		:= $(shell test -x /usr/bin/objformat && /usr/bin/objformat || echo aout)
++
++DLL_SUFFIX		= so
++
++ifdef LIBRUNPATH
++DSO_LDOPTS		+= -Wl,-R$(LIBRUNPATH)
++endif
++
++MKSHLIB			= $(CC) $(DSO_LDOPTS)
++ifdef MAPFILE
++# Add LD options to restrict exported symbols to those in the map file
++endif
++# Change PROCESS to put the mapfile in the correct format for this platform
++PROCESS_MAP_FILE = cp $(LIBRARY_NAME).def $@
++
++G++INCLUDES		= -I/usr/include/g++
++
++INCLUDES		+= -I/usr/X11R6/include
diff --git a/mail/thunderbird/patches/patch-dm b/mail/thunderbird/patches/patch-dm
new file mode 100644
index 00000000000..1bf57a9fcf4
--- /dev/null
+++ b/mail/thunderbird/patches/patch-dm
@@ -0,0 +1,16 @@
+$NetBSD: patch-dm,v 1.1 2005/12/30 21:35:58 joerg Exp $
+
+diff -ruN ../Orig/mozilla/security/nss/cmd/platlibs.mk ./security/nss/cmd/platlibs.mk
+--- ../Orig/mozilla/security/nss/cmd/platlibs.mk	2005-04-07 06:35:41.000000000 +0900
++++ ./security/nss/cmd/platlibs.mk	2005-12-04 19:44:52.000000000 +0900
+@@ -186,8 +186,8 @@
+ # If GNU ld is used, we must use the -rpath-link option to tell
+ # the linker where to find libsoftokn3.so, an implicit dependency
+ # of libnss3.so.
+-ifeq (,$(filter-out BSD_OS FreeBSD Linux NetBSD, $(OS_ARCH)))
+-EXTRA_SHARED_LIBS += -Wl,-rpath-link,$(DIST)/lib
++ifeq (,$(filter-out BSD_OS FreeBSD Linux NetBSD DragonFly, $(OS_ARCH)))
++EXTRA_SHARED_LIBS += -Wl,-rpath-link,$(DIST)/lib -R/usr/pkg/lib/firefox
+ endif
+ 
+ ifeq ($(OS_ARCH), SunOS)
diff --git a/mail/thunderbird/patches/patch-do b/mail/thunderbird/patches/patch-do
new file mode 100644
index 00000000000..7f65bf3ba70
--- /dev/null
+++ b/mail/thunderbird/patches/patch-do
@@ -0,0 +1,88 @@
+$NetBSD: patch-do,v 1.1 2005/12/30 21:35:58 joerg Exp $
+
+diff -ruN ../Orig/mozilla/directory/c-sdk/config/DragonFly.mk ./directory/c-sdk/config/DragonFly.mk
+--- ../Orig/mozilla/directory/c-sdk/config/DragonFly.mk	1970-01-01 09:00:00.000000000 +0900
++++ ./directory/c-sdk/config/DragonFly.mk	2005-12-04 19:44:55.000000000 +0900
+@@ -0,0 +1,82 @@
++# 
++# The contents of this file are subject to the Mozilla Public
++# License Version 1.1 (the "License"); you may not use this file
++# except in compliance with the License. You may obtain a copy of
++# the License at http://www.mozilla.org/MPL/
++# 
++# Software distributed under the License is distributed on an "AS
++# IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or
++# implied. See the License for the specific language governing
++# rights and limitations under the License.
++# 
++# The Original Code is the Netscape Portable Runtime (NSPR).
++# 
++# The Initial Developer of the Original Code is Netscape
++# Communications Corporation.  Portions created by Netscape are 
++# Copyright (C) 1998-2000 Netscape Communications Corporation.  All
++# Rights Reserved.
++# 
++# Contributor(s):
++# 
++# Alternatively, the contents of this file may be used under the
++# terms of the GNU General Public License Version 2 or later (the
++# "GPL"), in which case the provisions of the GPL are applicable 
++# instead of those above.  If you wish to allow use of your 
++# version of this file only under the terms of the GPL and not to
++# allow others to use your version of this file under the MPL,
++# indicate your decision by deleting the provisions above and
++# replace them with the notice and other provisions required by
++# the GPL.  If you do not delete the provisions above, a recipient
++# may use your version of this file under either the MPL or the
++# GPL.
++# 
++
++#
++# Config stuff for DragonFly
++#
++
++include $(MOD_DEPTH)/config/UNIX.mk
++
++CC			= gcc
++CCC			= g++
++RANLIB			= ranlib
++
++OS_REL_CFLAGS		= -Di386
++CPU_ARCH		= x86
++CPU_ARCH_TAG		= _$(CPU_ARCH)
++
++OS_CFLAGS		= $(DSO_CFLAGS) $(OS_REL_CFLAGS) -ansi -Wall -pipe $(THREAD_FLAG) -DFREEBSD -DHAVE_STRERROR -DHAVE_BSD_FLOCK
++
++#
++# The default implementation strategy for FreeBSD is pthreads.
++#
++ifeq ($(CLASSIC_NSPR),1)
++IMPL_STRATEGY		= _EMU
++DEFINES			+= -D_PR_LOCAL_THREADS_ONLY
++else
++USE_PTHREADS		= 1
++IMPL_STRATEGY		= _PTH
++DEFINES			+= -D_THREAD_SAFE
++THREAD_FLAG		+= -pthread
++endif
++
++ARCH			= freebsd
++
++MOZ_OBJFORMAT          := $(shell test -x /usr/bin/objformat && /usr/bin/objformat || echo aout)
++
++ifeq ($(MOZ_OBJFORMAT),elf)
++DLL_SUFFIX		= so
++else
++DLL_SUFFIX		= so.1.0
++endif
++
++DSO_CFLAGS		= -fPIC
++DSO_LDOPTS		= -Bshareable
++
++ifdef LIBRUNPATH
++DSO_LDOPTS		+= -Wl,-R$(LIBRUNPATH)
++endif
++
++MKSHLIB			= $(LD) $(DSO_LDOPTS)
++
++G++INCLUDES		= -I/usr/include/g++
diff --git a/mail/thunderbird/patches/patch-ds b/mail/thunderbird/patches/patch-ds
new file mode 100644
index 00000000000..2aeae0ac402
--- /dev/null
+++ b/mail/thunderbird/patches/patch-ds
@@ -0,0 +1,14 @@
+$NetBSD: patch-ds,v 1.1 2005/12/30 21:35:58 joerg Exp $
+
+diff -ruN ../Orig/mozilla/security/coreconf/arch.mk ./security/coreconf/arch.mk
+--- ../Orig/mozilla/security/coreconf/arch.mk	2005-10-11 08:30:12.000000000 +0900
++++ ./security/coreconf/arch.mk	2005-12-04 19:45:28.000000000 +0900
+@@ -145,7 +145,7 @@
+ # IRIX 6.5-ALPHA-1289139620.
+ #
+ 
+-ifeq (,$(filter-out Linux FreeBSD IRIX,$(OS_ARCH)))
++ifeq (,$(filter-out Linux DragonFly FreeBSD IRIX,$(OS_ARCH)))
+     OS_RELEASE := $(shell echo $(OS_RELEASE) | sed 's/-.*//')
+ endif
+ 
diff --git a/mail/thunderbird/patches/patch-dt b/mail/thunderbird/patches/patch-dt
new file mode 100644
index 00000000000..53d9a24a1c8
--- /dev/null
+++ b/mail/thunderbird/patches/patch-dt
@@ -0,0 +1,14 @@
+$NetBSD: patch-dt,v 1.1 2005/12/30 21:35:58 joerg Exp $
+
+diff -ruN ../Orig/mozilla/directory/c-sdk/config/arch.mk ./directory/c-sdk/config/arch.mk
+--- ../Orig/mozilla/directory/c-sdk/config/arch.mk	2002-03-27 06:51:57.000000000 +0900
++++ ./directory/c-sdk/config/arch.mk	2005-12-04 19:45:29.000000000 +0900
+@@ -138,7 +138,7 @@
+ # Handle FreeBSD 2.2-STABLE and Linux 2.0.30-osfmach3
+ #
+ 
+-ifeq (,$(filter-out Linux FreeBSD,$(OS_ARCH)))
++ifeq (,$(filter-out Linux DragonFly FreeBSD,$(OS_ARCH)))
+ OS_RELEASE	:= $(shell echo "$(OS_RELEASE)" | sed 's/-.*//')
+ endif
+