sunbird is deprecated by thunderbird w/ lightning extension.

64 files changed, 0 insertions, 2752 deletions

diff --git a/time/sunbird/patches/patch-aa b/time/sunbird/patches/patch-aa
deleted file mode 100644
index fd90ef01a8f..00000000000
--- a/time/sunbird/patches/patch-aa
+++ /dev/null
@@ -1,21 +0,0 @@
-$NetBSD: patch-aa,v 1.1.1.1 2006/02/05 21:56:24 ghen Exp $
-
---- config/autoconf.mk.in.orig	2006-02-02 16:57:57.000000000 +0100
-+++ config/autoconf.mk.in
-@@ -54,13 +54,13 @@ MOZ_APP_VERSION = @MOZ_APP_VERSION@
- prefix		= @prefix@
- exec_prefix	= @exec_prefix@
- bindir		= @bindir@
--includedir	= @includedir@/$(MOZ_APP_NAME)-$(MOZ_APP_VERSION)
-+includedir	= @includedir@/$(MOZILLA_PKG_NAME)
- libdir		= @libdir@
- datadir		= @datadir@
- mandir		= @mandir@
--idldir		= @datadir@/idl/$(MOZ_APP_NAME)-$(MOZ_APP_VERSION)
-+idldir		= @datadir@/idl/$(MOZILLA_PKG_NAME)
- 
--mozappdir	= $(libdir)/$(MOZ_APP_NAME)-$(MOZ_APP_VERSION)
-+mozappdir	= $(libdir)/$(MOZILLA_PKG_NAME)
- mredir		= $(libdir)/mre/mre-$(MOZ_APP_VERSION)
- mrelibdir	= $(mredir)/lib
- 
diff --git a/time/sunbird/patches/patch-ab b/time/sunbird/patches/patch-ab
deleted file mode 100644
index 5c2252d5f8f..00000000000
--- a/time/sunbird/patches/patch-ab
+++ /dev/null
@@ -1,107 +0,0 @@
-$NetBSD: patch-ab,v 1.4 2009/05/02 07:51:03 hasso Exp $
-
---- configure.in.orig	2006-09-28 00:02:07 +0300
-+++ configure.in	2009-05-02 10:04:27 +0300
-@@ -1490,7 +1490,6 @@ case "$target" in
-     DSO_LDOPTS=''
-     STRIP="$STRIP -x -S"
-     _PLATFORM_DEFAULT_TOOLKIT='mac'
--    MOZ_ENABLE_POSTSCRIPT=
-     TARGET_NSPR_MDCPUCFG='\"md/_darwin.cfg\"'
-     # set MACOSX to generate lib/mac/MoreFiles/Makefile
-     MACOSX=1
-@@ -1523,6 +1522,18 @@ case "$target" in
- #	MKSHLIB_FORCE_ALL='-Wl,-Bforcearchive'
- #	MKSHLIB_UNFORCE_ALL=''
- #    fi
-+    if test "$LIBRUNPATH"; then
-+	DSO_LDOPTS="-Wl,-R$LIBRUNPATH $DSO_LDOPTS"
-+    fi
-+    ;; 
-+
-+*-dragonfly*)
-+    if test ! "$GNU_CC"; then
-+	DSO_LDOPTS="-Bshareable $DSO_LDOPTS"
-+    fi
-+    if test "$LIBRUNPATH"; then
-+	DSO_LDOPTS="-Wl,-R$LIBRUNPATH $DSO_LDOPTS"
-+    fi
-     ;; 
- 
- *-hpux*)
-@@ -1708,7 +1719,6 @@ case "$target" in
-     BIN_SUFFIX='.exe'
-     USE_SHORT_LIBNAME=1
-     MOZ_ENABLE_COREXFONTS=
--    MOZ_ENABLE_POSTSCRIPT=
-     MOZ_USER_DIR="Mozilla"
- ;;
- 
-@@ -1955,6 +1965,14 @@ case "$target" in
-     fi
-     MKSHLIB='$(CXX) $(CXXFLAGS) $(DSO_PIC_CFLAGS) $(DSO_LDOPTS) -Wl,-soname,lib$(LIBRARY_NAME)$(DLL_SUFFIX) -o $@'
-     MKCSHLIB='$(CC) $(CFLAGS) $(DSO_PIC_CFLAGS) $(DSO_LDOPTS) -Wl,-soname,lib$(LIBRARY_NAME)$(DLL_SUFFIX) -o $@'
-+
-+    case "${target_cpu}" in
-+    alpha*)
-+       CFLAGS="$CFLAGS -mieee"
-+       CXXFLAGS="$CXXFLAGS -mieee"
-+    ;;
-+    esac
-+
-     ;;
- 
- *-nto*) 
-@@ -1995,6 +2013,13 @@ case "$target" in
-     if test "$LIBRUNPATH"; then
- 	DSO_LDOPTS="-R$LIBRUNPATH $DSO_LDOPTS"
-     fi
-+
-+    case "${target_cpu}" in
-+    alpha*)
-+    	CFLAGS="$CFLAGS -mieee"
-+    	CXXFLAGS="$CXXFLAGS -mieee"
-+    ;;
-+    esac
-     ;;
- 
- *-openvms*) 
-@@ -2691,7 +2716,7 @@ dnl Checks for header files.
- dnl ========================================================
- AC_HEADER_DIRENT
- case "$target_os" in
--freebsd*)
-+freebsd* | dragonfly*)
- # for stuff like -lXshm
-     CPPFLAGS="${CPPFLAGS} ${X_CFLAGS}"
-     ;;
-@@ -2731,6 +2756,9 @@ dnl ====================================
- case $target in
- *-hpux11.*)
- 	;;
-+*-dragonfly*)
-+	AC_CHECK_LIB(c, gethostbyname_r)
-+	;;
- *)
- 	AC_CHECK_LIB(c_r, gethostbyname_r)
- 	;;
-@@ -2951,6 +2979,10 @@ then
- 			fi
- 			;;
- 
-+	    *-*-dragonfly*)
-+			_PTHREAD_LDFLAGS="-pthread"
-+			;;
-+
- 	    *-*-openbsd*|*-*-bsdi*)
- 			AC_DEFINE(_REENTRANT)
- 			AC_DEFINE(_THREAD_SAFE)
-@@ -6041,7 +6073,7 @@ dnl ====================================
- dnl = Enable code optimization. ON by default.
- dnl ========================================================
- if test -z "$MOZ_OPTIMIZE_FLAGS"; then
--	MOZ_OPTIMIZE_FLAGS="-O"
-+	MOZ_OPTIMIZE_FLAGS=""
- fi
- 
- MOZ_ARG_ENABLE_STRING(optimize,
diff --git a/time/sunbird/patches/patch-ac b/time/sunbird/patches/patch-ac
deleted file mode 100644
index defaa9f9503..00000000000
--- a/time/sunbird/patches/patch-ac
+++ /dev/null
@@ -1,64 +0,0 @@
-$NetBSD: patch-ac,v 1.5 2009/05/29 13:22:11 he Exp $
-
---- xpcom/reflect/xptcall/src/md/unix/Makefile.in.orig	2008-02-19 22:11:34.000000000 +0100
-+++ xpcom/reflect/xptcall/src/md/unix/Makefile.in
-@@ -62,7 +62,7 @@ include $(topsrcdir)/config/config.mk
- #
- # Lots of Unixish x86 flavors
- #
--ifneq (,$(filter FreeBSD NetBSD OpenBSD BSD_OS Darwin,$(OS_ARCH)))
-+ifneq (,$(filter DragonFly FreeBSD NetBSD OpenBSD BSD_OS Darwin,$(OS_ARCH)))
- ifeq (86,$(findstring 86,$(OS_TEST)))
- CPPSRCS		:= xptcinvoke_unixish_x86.cpp xptcstubs_unixish_x86.cpp
- endif
-@@ -72,6 +72,10 @@ endif
- #
- ifeq ($(OS_ARCH)$(OS_TEST),OpenBSDamd64)
- CPPSRCS		:= xptcinvoke_openbsd_amd64.cpp xptcstubs_openbsd_amd64.cpp
-+else
-+ifeq (amd64,$(OS_TEST))
-+CPPSRCS		:= xptcinvoke_x86_64_linux.cpp xptcstubs_x86_64_linux.cpp
-+endif
- endif
- #
- # New code for Linux, et. al., with gcc
-@@ -180,7 +184,7 @@ endif
- # NetBSD/ARM
- #
- ifeq ($(OS_ARCH),NetBSD)
--ifneq (,$(filter arm% sa110,$(OS_TEST)))
-+ifneq (,$(filter arm%,$(TARGET_CPU)))
- CPPSRCS		:= xptcinvoke_arm_netbsd.cpp xptcstubs_arm_netbsd.cpp
- endif
- endif
-@@ -224,7 +228,7 @@ endif
- # NetBSD/m68k
- #
- ifeq ($(OS_ARCH),NetBSD)
--ifneq (,$(filter amiga atari hp300 mac68k mvme68k next68k sun3 sun3x x68k,$(OS_TEST)))
-+ifneq (,$(filter m68k,$(TARGET_CPU)))
- CPPSRCS		:= xptcinvoke_netbsd_m68k.cpp xptcstubs_netbsd_m68k.cpp
- endif
- endif
-@@ -307,6 +311,7 @@ endif
- ifneq (,$(filter NetBSDmacppc NetBSDbebox NetBSDofppc NetBSDprep NetBSDamigappc,$(OS_ARCH)$(OS_TEST)))                           
- CPPSRCS		:= xptcinvoke_ppc_netbsd.cpp xptcstubs_ppc_netbsd.cpp
- ASFILES		:= xptcinvoke_asm_ppc_netbsd.s xptcstubs_asm_ppc_netbsd.s
-+AS		:= $(CC) -c -x assembler-with-cpp
- endif
- 
- #
-@@ -363,6 +368,13 @@ ifeq ($(OS_ARCH)$(OS_TEST),NetBSDsparc)
- CPPSRCS		:= xptcinvoke_sparc_netbsd.cpp xptcstubs_sparc_netbsd.cpp
- ASFILES		:= xptcinvoke_asm_sparc_netbsd.s xptcstubs_asm_sparc_netbsd.s
- endif
-+#   
-+# NetBSD/SPARC64
-+#   
-+ifeq ($(OS_ARCH)$(OS_TEST),NetBSDsparc64)
-+CPPSRCS                := xptcinvoke_sparc64_netbsd.cpp xptcstubs_sparc64_netbsd.cpp
-+ASFILES                := xptcinvoke_asm_sparc64_netbsd.s xptcstubs_asm_sparc64_netbsd.s
-+endif
- #
- # Solaris/SPARC
- #
diff --git a/time/sunbird/patches/patch-ad b/time/sunbird/patches/patch-ad
deleted file mode 100644
index 9eb98e0ab1a..00000000000
--- a/time/sunbird/patches/patch-ad
+++ /dev/null
@@ -1,75 +0,0 @@
-$NetBSD: patch-ad,v 1.1.1.1 2006/02/05 21:56:25 ghen Exp $
-
---- xpcom/reflect/xptcall/src/md/unix/xptcinvoke_netbsd_m68k.cpp.orig	2006-02-02 16:57:57.000000000 +0100
-+++ xpcom/reflect/xptcall/src/md/unix/xptcinvoke_netbsd_m68k.cpp
-@@ -132,6 +132,15 @@ extern "C" {
-     }
- }
- 
-+/*
-+ * SYMBOL PREFIX must be "_" for aout symbols and "" for ELF
-+ */
-+#ifndef __ELF__
-+#define	SYMBOLPREFIX	"_"
-+#else
-+#define	SYMBOLPREFIX
-+#endif
-+
- XPTC_PUBLIC_API(nsresult)
- XPTC_InvokeByIndex(nsISupports* that, PRUint32 methodIndex,
-                    PRUint32 paramCount, nsXPTCVariant* params)
-@@ -139,30 +148,30 @@ XPTC_InvokeByIndex(nsISupports* that, PR
-     PRUint32 result;
- 
-  __asm__ __volatile__(
--    "movl  %4, sp@-\n\t"
--    "movl  %3, sp@-\n\t"
--    "jbsr  _invoke_count_words\n\t"     /* count words */
--    "addql #8, sp\n\t"
--    "lsll  #2, d0\n\t"      /* *= 4 */
--    "movl  sp, a2\n\t"	    /* save original sp */
--    "subl  d0, sp\n\t"      /* make room for params */
--    "movl  sp, a0\n\t"
--    "movl  %4, sp@-\n\t"
--    "movl  %3, sp@-\n\t"
--    "movl  a0, sp@-\n\t"
--    "jbsr  _invoke_copy_to_stack\n\t"   /* copy params */
--    "addl  #12, sp\n\t"
--    "movl  %1, a0\n\t"
--    "movl  a0@, a1\n\t"
--    "movl  %2, d0\n\t"      /* function index */
--    "movl  a0, d1\n\t"
--    "movw  a1@(8,d0:l:8), a0\n\t"
--    "addl  a0, d1\n\t"
--    "movl  a1@(12,d0:l:8), a1\n\t"
--    "movl  d1, sp@-\n\t"
--    "jbsr  a1@\n\t"
--    "movl  a2, sp\n\t"	    /* restore original sp */
--    "movl  d0, %0\n\t"
-+    "movl  %4, %%sp@-\n\t"
-+    "movl  %3, %%sp@-\n\t"
-+    "jbsr  "SYMBOLPREFIX"invoke_count_words\n\t"     /* count words */
-+    "addql #8, %%sp\n\t"
-+    "lsll  #2, %%d0\n\t"      /* *= 4 */
-+    "movl  %%sp, %%a2\n\t"         /* save original sp */
-+    "subl  %%d0, %%sp\n\t"      /* make room for params */
-+    "movl  %%sp, %%a0\n\t"
-+    "movl  %4, %%sp@-\n\t"
-+    "movl  %3, %%sp@-\n\t"
-+    "movl  %%a0, %%sp@-\n\t"
-+    "jbsr  "SYMBOLPREFIX"invoke_copy_to_stack\n\t"   /* copy params */
-+    "addl  #12, %%sp\n\t"
-+    "movl  %1, %%a0\n\t"
-+    "movl  %%a0@, %%a1\n\t"
-+    "movl  %2, %%d0\n\t"      /* function index */
-+    "movl  %%a0, %%d1\n\t"
-+    "movw  %%a1@(8,%%d0:l:8), %%a0\n\t"
-+    "addl  %%a0, %%d1\n\t"
-+    "movl  %%a1@(12,%%d0:l:8), %%a1\n\t"
-+    "movl  %%d1, %%sp@-\n\t"
-+    "jbsr  %%a1@\n\t"
-+    "movl  %%a2, %%sp\n\t"         /* restore original sp */
-+    "movl  %%d0, %0\n\t"
-     : "=g" (result)         /* %0 */
-     : "g" (that),           /* %1 */
-       "g" (methodIndex),    /* %2 */
diff --git a/time/sunbird/patches/patch-ae b/time/sunbird/patches/patch-ae
deleted file mode 100644
index 2e09c0a9ff2..00000000000
--- a/time/sunbird/patches/patch-ae
+++ /dev/null
@@ -1,41 +0,0 @@
-$NetBSD: patch-ae,v 1.1.1.1 2006/02/05 21:56:25 ghen Exp $
-
---- xpcom/reflect/xptcall/src/md/unix/xptcstubs_netbsd_m68k.cpp.orig	2006-02-02 16:57:57.000000000 +0100
-+++ xpcom/reflect/xptcall/src/md/unix/xptcstubs_netbsd_m68k.cpp
-@@ -123,17 +123,27 @@ extern "C" {
-     }
- }
- 
-+/*
-+ * Beware: use % instead of %% for register identifiers in a preprocessor macro
-+ * SYMBOL PREFIX must be "_" for aout and "" for ELF 
-+ */
-+#ifndef	__ELF__
-+#define	SYMBOLPREFIX	"_"
-+#else
-+#define	SYMBOLPREFIX
-+#endif
-+
- #define STUB_ENTRY(n)							\
- __asm__(								\
--    ".global	_Stub"#n"__14nsXPTCStubBase\n\t"			\
--"_Stub"#n"__14nsXPTCStubBase:\n\t"					\
--    "link  a6,#0			\n\t"				\
--    "lea   a6@(12), a0			\n\t"	/* pointer to args */	\
--    "movl  a0, sp@-			\n\t"				\
--    "movl  #"#n", sp@-			\n\t"	/* method index */	\
--    "movl  a6@(8), sp@-			\n\t"	/* this */		\
--    "jbsr  _PrepareAndDispatch		\n\t"				\
--    "unlk  a6				\n\t"				\
-+    ".global   "SYMBOLPREFIX"Stub"#n"__14nsXPTCStubBase\n\t"           \
-+SYMBOLPREFIX"Stub"#n"__14nsXPTCStubBase:\n\t"                          \
-+    "link  %a6,#0                      \n\t"                           \
-+    "lea   %a6@(12), %a0               \n\t"   /* pointer to args */   \
-+    "movl  %a0, %sp@-                  \n\t"                           \
-+    "movl  #"#n", %sp@-                        \n\t"   /* method index */      \
-+    "movl  %a6@(8), %sp@-              \n\t"   /* this */              \
-+    "jbsr  "SYMBOLPREFIX"PrepareAndDispatch\n\t"                       \
-+    "unlk  %a6                         \n\t"                           \
-     "rts				\n\t"				\
- );
- 
diff --git a/time/sunbird/patches/patch-af b/time/sunbird/patches/patch-af
deleted file mode 100644
index c549f04cdad..00000000000
--- a/time/sunbird/patches/patch-af
+++ /dev/null
@@ -1,22 +0,0 @@
-$NetBSD: patch-af,v 1.4 2009/05/29 13:22:11 he Exp $
-
---- security/nss/lib/freebl/unix_rand.c.orig	2007-07-26 01:18:55.000000000 +0200
-+++ security/nss/lib/freebl/unix_rand.c
-@@ -35,6 +35,7 @@
-  * ***** END LICENSE BLOCK ***** */
- 
- #include <stdio.h>
-+#include <fcntl.h>
- #include <string.h>
- #include <signal.h>
- #include <unistd.h>
-@@ -185,7 +186,8 @@ static SECStatus RNG_kstat(PRUint32* fed
- #endif
- 
- #if defined(SCO) || defined(UNIXWARE) || defined(BSDI) || defined(FREEBSD) \
--    || defined(NETBSD) || defined(NTO) || defined(DARWIN) || defined(OPENBSD)
-+    || defined(NETBSD) || defined(NTO) || defined(DARWIN) || defined(OPENBSD) \
-+    || defined(DRAGONFLY)
- #include <sys/times.h>
- 
- #define getdtablesize() sysconf(_SC_OPEN_MAX)
diff --git a/time/sunbird/patches/patch-ah b/time/sunbird/patches/patch-ah
deleted file mode 100644
index f0266725c2a..00000000000
--- a/time/sunbird/patches/patch-ah
+++ /dev/null
@@ -1,48 +0,0 @@
-$NetBSD: patch-ah,v 1.1.1.1 2006/02/05 21:56:25 ghen Exp $
-
---- gfx/idl/nsIFreeType2.idl.orig	2006-02-02 16:57:57.000000000 +0100
-+++ gfx/idl/nsIFreeType2.idl
-@@ -76,10 +76,11 @@ native FT_Pointer(FT_Pointer);
- native FT_Sfnt_Tag(FT_Sfnt_Tag);
- native FT_Size(FT_Size);
- 
--[ptr] native FTC_Image_Desc_p(FTC_Image_Desc);
-+[ptr] native FTC_ImageType_p(FTC_ImageType);
- native FTC_Face_Requester(FTC_Face_Requester);
- native FTC_Font(FTC_Font);
--native FTC_Image_Cache(FTC_Image_Cache);
-+native FTC_FaceID(FTC_FaceID);
-+native FTC_ImageCache(FTC_ImageCache);
- native FTC_Manager(FTC_Manager);
- 
- // #ifdef MOZ_SVG
-@@ -99,7 +100,7 @@ interface nsIFreeType2 : nsISupports
- 
-     readonly attribute FT_Library library;
-     readonly attribute FTC_Manager FTCacheManager;
--    readonly attribute FTC_Image_Cache ImageCache;
-+    readonly attribute FTC_ImageCache ImageCache;
- 
-     void    doneFace(in FT_Face face);
-     void    doneFreeType(in FT_Library lib);
-@@ -115,16 +116,16 @@ interface nsIFreeType2 : nsISupports
-     void    outlineDecompose(in FT_Outline_p outline,
-                              in const_FT_Outline_Funcs_p funcs, in voidPtr p);
-     void    setCharmap(in FT_Face face, in FT_CharMap charmap);
--    void    imageCacheLookup(in FTC_Image_Cache cache, in FTC_Image_Desc_p desc,
-+    void    imageCacheLookup(in FTC_ImageCache cache, in FTC_ImageType_p desc,
-                              in FT_UInt gindex, out FT_Glyph glyph);
--    void    managerLookupSize(in FTC_Manager manager, in FTC_Font font,
--                              out FT_Face face, out FT_Size size);
-+    void    managerLookupFace(in FTC_Manager manager, in FTC_FaceID face_id,
-+                              out FT_Face face);
-     void    managerDone(in FTC_Manager manager);
-     void    managerNew(in FT_Library lib, in FT_UInt max_faces,
-                        in FT_UInt max_sizes, in FT_ULong max_bytes,
-                        in FTC_Face_Requester requester, in FT_Pointer req_data,
-                        out FTC_Manager manager);
--    void    imageCacheNew(in FTC_Manager manager, out FTC_Image_Cache cache);
-+    void    imageCacheNew(in FTC_Manager manager, out FTC_ImageCache cache);
- /* #ifdef MOZ_SVG */
-     void glyphTransform(in FT_Glyph glyph, in FT_Matrix_p matrix,
-                         in FT_Vector_p delta);
diff --git a/time/sunbird/patches/patch-ai b/time/sunbird/patches/patch-ai
deleted file mode 100644
index 8be97ea2ef7..00000000000
--- a/time/sunbird/patches/patch-ai
+++ /dev/null
@@ -1,71 +0,0 @@
-$NetBSD: patch-ai,v 1.2 2006/10/19 10:27:06 markd Exp $
-
---- gfx/src/ps/nsFontMetricsPS.cpp.orig	2006-05-07 14:01:25.000000000 +1200
-+++ gfx/src/ps/nsFontMetricsPS.cpp
-@@ -993,7 +993,7 @@ nsFontPSXft::FindFont(PRUnichar aChar, c
- 
-         fontps *fps = new fontps;
-         fps->entry = xftEntry;
--        fps->charset = fc_charset;
-+        fps->charset = FcCharSetCopy (fc_charset);
-         fps->fontps = nsnull;
-         fpi.fontps->AppendElement(fps);
-     }
-@@ -1868,10 +1868,10 @@ nsFontPSFreeType::Init(nsITrueTypeFontCa
-   
-   mPixelSize = NSToIntRound(app2dev * mFont->size);
- 
--  mImageDesc.font.face_id    = (void*)mEntry;
--  mImageDesc.font.pix_width  = mPixelSize;
--  mImageDesc.font.pix_height = mPixelSize;
--  mImageDesc.image_type = 0;
-+  mImageDesc->face_id = (FTC_FaceID)&mEntry;
-+  mImageDesc->width  = mPixelSize;
-+  mImageDesc->height = mPixelSize;
-+  mImageDesc->flags = 0;
- 
-   nsresult rv;
-   mFt2 = do_GetService(NS_FREETYPE2_CONTRACTID, &rv);
-@@ -1905,7 +1905,7 @@ nsFontPSFreeType::GetWidth(const PRUnich
-   if (!face)
-     return 0;
- 
--  FTC_Image_Cache iCache;
-+  FTC_ImageCache iCache;
-   nsresult rv = mFt2->GetImageCache(&iCache);
-   if (NS_FAILED(rv)) {
-     NS_ERROR("Failed to get Image Cache");
-@@ -1943,8 +1943,8 @@ nsFontPSFreeType::getFTFace()
-   
-   FTC_Manager cManager;
-   mFt2->GetFTCacheManager(&cManager);
--  nsresult rv = mFt2->ManagerLookupSize(cManager, &mImageDesc.font,
--                                        &face, nsnull);
-+  nsresult rv = mFt2->ManagerLookupFace(cManager, mImageDesc->face_id,
-+                                        &face);
-   NS_ASSERTION(rv==0, "failed to get face/size");
-   if (rv)
-     return nsnull;
-@@ -2388,16 +2388,16 @@ void nsFT2Type1Generator::GeneratePSFont
-   mEntry->GetFamilyName(fontName);
-   mEntry->GetStyleName(styleName);
-   
--  mImageDesc.font.face_id    = (void*)mEntry;
-+  mImageDesc->face_id = (FTC_FaceID)&mEntry;
-   // TT glyph has no relation to size
--  mImageDesc.font.pix_width  = 16;
--  mImageDesc.font.pix_height = 16;
--  mImageDesc.image_type = 0;
-+  mImageDesc->width  = 16;
-+  mImageDesc->height = 16;
-+  mImageDesc->flags = 0;
-   FT_Face face = nsnull;
-   FTC_Manager cManager;
-   mFt2->GetFTCacheManager(&cManager);
--  nsresult rv = mFt2->ManagerLookupSize(cManager, &mImageDesc.font,
--                                        &face, nsnull);
-+  nsresult rv = mFt2->ManagerLookupFace(cManager, mImageDesc->face_id,
-+                                        &face);
-   if (NS_FAILED(rv))
-     return;
-  
diff --git a/time/sunbird/patches/patch-aj b/time/sunbird/patches/patch-aj
deleted file mode 100644
index ab98ba7551d..00000000000
--- a/time/sunbird/patches/patch-aj
+++ /dev/null
@@ -1,40 +0,0 @@
-$NetBSD: patch-aj,v 1.1.1.1 2006/02/05 21:56:25 ghen Exp $
-
---- gfx/src/freetype/nsFreeType.h.orig	2006-02-02 16:57:57.000000000 +0100
-+++ gfx/src/freetype/nsFreeType.h
-@@ -120,13 +120,13 @@ typedef FT_Error (*FT_Outline_Decompose_
- typedef FT_Error (*FT_New_Face_t)(FT_Library, const char*, FT_Long, FT_Face*);
- typedef FT_Error (*FT_Set_Charmap_t)(FT_Face face, FT_CharMap  charmap);
- typedef FT_Error (*FTC_Image_Cache_Lookup_t)
--                      (FTC_Image_Cache, FTC_Image_Desc*, FT_UInt, FT_Glyph*);
--typedef FT_Error (*FTC_Manager_Lookup_Size_t)
--                      (FTC_Manager, FTC_Font, FT_Face*, FT_Size*);
-+                      (FTC_ImageCache, FTC_ImageType*, FT_UInt, FT_Glyph*);
-+typedef FT_Error (*FTC_Manager_LookupFace_t)
-+                      (FTC_Manager, FTC_FaceID, FT_Face*);
- typedef FT_Error (*FTC_Manager_Done_t)(FTC_Manager);
- typedef FT_Error (*FTC_Manager_New_t)(FT_Library, FT_UInt, FT_UInt, FT_ULong,
-                        FTC_Face_Requester, FT_Pointer, FTC_Manager*);
--typedef FT_Error (*FTC_Image_Cache_New_t)(FTC_Manager, FTC_Image_Cache*);
-+typedef FT_Error (*FTC_Image_Cache_New_t)(FTC_Manager, FTC_ImageCache*);
- // #ifdef MOZ_SVG
- typedef FT_Error (*FT_Glyph_Transform_t)(FT_Glyph, FT_Matrix*, FT_Vector*);
- typedef FT_Error (*FT_Get_Kerning_t)
-@@ -181,7 +181,7 @@ protected:
-   FT_Outline_Decompose_t    nsFT_Outline_Decompose;
-   FT_Set_Charmap_t          nsFT_Set_Charmap;
-   FTC_Image_Cache_Lookup_t  nsFTC_Image_Cache_Lookup;
--  FTC_Manager_Lookup_Size_t nsFTC_Manager_Lookup_Size;
-+  FTC_Manager_LookupFace_t  nsFTC_Manager_LookupFace;
-   FTC_Manager_Done_t        nsFTC_Manager_Done;
-   FTC_Manager_New_t         nsFTC_Manager_New;
-   FTC_Image_Cache_New_t     nsFTC_Image_Cache_New;
-@@ -229,7 +229,7 @@ protected:
-   PRLibrary      *mSharedLib;
-   FT_Library      mFreeTypeLibrary;
-   FTC_Manager     mFTCacheManager;
--  FTC_Image_Cache mImageCache;
-+  FTC_ImageCache  mImageCache;
- 
-   static nsHashtable   *sFontFamilies;
-   static nsHashtable   *sRange1CharSetNames;
diff --git a/time/sunbird/patches/patch-ak b/time/sunbird/patches/patch-ak
deleted file mode 100644
index efc35dbae6f..00000000000
--- a/time/sunbird/patches/patch-ak
+++ /dev/null
@@ -1,61 +0,0 @@
-$NetBSD: patch-ak,v 1.1.1.1 2006/02/05 21:56:25 ghen Exp $
-
---- gfx/src/freetype/nsFreeType.cpp.orig	2006-02-02 16:57:57.000000000 +0100
-+++ gfx/src/freetype/nsFreeType.cpp
-@@ -110,11 +110,11 @@ FtFuncList nsFreeType2::FtFuncs [] = {
-   {"FT_New_Face",             NS_FT2_OFFSET(nsFT_New_Face),             PR_TRUE},
-   {"FT_Outline_Decompose",    NS_FT2_OFFSET(nsFT_Outline_Decompose),    PR_TRUE},
-   {"FT_Set_Charmap",          NS_FT2_OFFSET(nsFT_Set_Charmap),          PR_TRUE},
--  {"FTC_Image_Cache_Lookup",  NS_FT2_OFFSET(nsFTC_Image_Cache_Lookup),  PR_TRUE},
--  {"FTC_Manager_Lookup_Size", NS_FT2_OFFSET(nsFTC_Manager_Lookup_Size), PR_TRUE},
-+  {"FTC_ImageCache_Lookup",  NS_FT2_OFFSET(nsFTC_Image_Cache_Lookup),   PR_TRUE},
-+  {"FTC_Manager_LookupFace", NS_FT2_OFFSET(nsFTC_Manager_LookupFace),   PR_TRUE},
-   {"FTC_Manager_Done",        NS_FT2_OFFSET(nsFTC_Manager_Done),        PR_TRUE},
-   {"FTC_Manager_New",         NS_FT2_OFFSET(nsFTC_Manager_New),         PR_TRUE},
--  {"FTC_Image_Cache_New",     NS_FT2_OFFSET(nsFTC_Image_Cache_New),     PR_TRUE},
-+  {"FTC_ImageCache_New",     NS_FT2_OFFSET(nsFTC_Image_Cache_New),      PR_TRUE},
- // #ifdef MOZ_SVG
-   {"FT_Glyph_Transform",      NS_FT2_OFFSET(nsFT_Glyph_Transform),      PR_TRUE},
-   {"FT_Get_Kerning",          NS_FT2_OFFSET(nsFT_Get_Kerning),          PR_TRUE},
-@@ -288,7 +288,7 @@ nsFreeType2::SetCharmap(FT_Face face, FT
- } 
-  
- NS_IMETHODIMP
--nsFreeType2::ImageCacheLookup(FTC_Image_Cache cache, FTC_Image_Desc *desc,
-+nsFreeType2::ImageCacheLookup(FTC_ImageCache cache, FTC_ImageType *desc,
-                               FT_UInt glyphID, FT_Glyph *glyph)
- { 
-   // call the FreeType2 function via the function pointer
-@@ -297,11 +297,11 @@ nsFreeType2::ImageCacheLookup(FTC_Image_
- } 
-  
- NS_IMETHODIMP
--nsFreeType2::ManagerLookupSize(FTC_Manager manager, FTC_Font font,
--                               FT_Face *face, FT_Size *size)
-+nsFreeType2::ManagerLookupFace(FTC_Manager manager, FTC_FaceID face_id,
-+                               FT_Face *face)
- { 
-   // call the FreeType2 function via the function pointer
--  FT_Error error = nsFTC_Manager_Lookup_Size(manager, font, face, size);
-+  FT_Error error = nsFTC_Manager_LookupFace(manager, face_id, face);
-   return error ? NS_ERROR_FAILURE : NS_OK;
- } 
-  
-@@ -326,7 +326,7 @@ nsFreeType2::ManagerNew(FT_Library libra
- } 
-  
- NS_IMETHODIMP
--nsFreeType2::ImageCacheNew(FTC_Manager manager, FTC_Image_Cache *cache)
-+nsFreeType2::ImageCacheNew(FTC_Manager manager, FTC_ImageCache *cache)
- { 
-   // call the FreeType2 function via the function pointer
-   FT_Error error = nsFTC_Image_Cache_New(manager, cache);
-@@ -395,7 +395,7 @@ nsFreeType2::SupportsExtFunc(PRBool *res
- } 
-  
- NS_IMETHODIMP
--nsFreeType2::GetImageCache(FTC_Image_Cache *aCache)
-+nsFreeType2::GetImageCache(FTC_ImageCache *aCache)
- {
-   *aCache = mImageCache;
-   return NS_OK;
diff --git a/time/sunbird/patches/patch-al b/time/sunbird/patches/patch-al
deleted file mode 100644
index c1f7434f6b9..00000000000
--- a/time/sunbird/patches/patch-al
+++ /dev/null
@@ -1,22 +0,0 @@
-$NetBSD: patch-al,v 1.1.1.1 2006/02/05 21:56:25 ghen Exp $
-
---- gfx/src/ps/nsFontMetricsPS.h.orig	2006-02-02 16:57:57.000000000 +0100
-+++ gfx/src/ps/nsFontMetricsPS.h
-@@ -424,7 +424,7 @@ protected:
-   nsCOMPtr<nsITrueTypeFontCatalogEntry> mFaceID;
-   nsCOMPtr<nsIFreeType2> mFt2;
-   PRUint16        mPixelSize;
--  FTC_Image_Desc  mImageDesc;
-+  FTC_ImageType   mImageDesc;
-   nsCString       mFontNameBase;   // the base name of type 1 (sub) fonts
-   nscoord         mHeight; 
- 
-@@ -493,7 +493,7 @@ public:
- protected:
-   nsCOMPtr<nsITrueTypeFontCatalogEntry> mEntry;
-   nsCOMPtr<nsIFreeType2> mFt2;
--  FTC_Image_Desc  mImageDesc;
-+  FTC_ImageType   mImageDesc;
- };
- #endif   // MOZ_ENABLE_FREETYPE2
- #endif   // MOZ_ENABLE_XFT
diff --git a/time/sunbird/patches/patch-an b/time/sunbird/patches/patch-an
deleted file mode 100644
index e9e00c161c4..00000000000
--- a/time/sunbird/patches/patch-an
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-an,v 1.1.1.1 2006/02/05 21:56:25 ghen Exp $
-
---- gfx/src/x11shared/nsFontFreeType.h.orig	2006-02-02 16:57:57.000000000 +0100
-+++ gfx/src/x11shared/nsFontFreeType.h
-@@ -110,7 +110,7 @@ protected:
-   XImage *GetXImage(PRUint32 width, PRUint32 height);
-   nsITrueTypeFontCatalogEntry *mFaceID;
-   PRUint16        mPixelSize;
--  FTC_Image_Desc  mImageDesc;
-+  FTC_ImageType   mImageDesc;
-   nsCOMPtr<nsIFreeType2> mFt2;
- };
- 
diff --git a/time/sunbird/patches/patch-ao b/time/sunbird/patches/patch-ao
deleted file mode 100644
index bb150035ba0..00000000000
--- a/time/sunbird/patches/patch-ao
+++ /dev/null
@@ -1,75 +0,0 @@
-$NetBSD: patch-ao,v 1.1.1.1 2006/02/05 21:56:25 ghen Exp $
-
---- gfx/src/x11shared/nsFontFreeType.cpp.orig	2006-02-02 17:20:47.000000000 +0100
-+++ gfx/src/x11shared/nsFontFreeType.cpp
-@@ -177,7 +177,7 @@ nsFreeTypeFont::getFTFace()
-   FTC_Manager mgr;
-   nsresult rv;
-   mFt2->GetFTCacheManager(&mgr);
--  rv = mFt2->ManagerLookupSize(mgr, &mImageDesc.font, &face, nsnull);
-+  rv = mFt2->ManagerLookupFace(mgr, mImageDesc->face_id, &face);
-   NS_ASSERTION(NS_SUCCEEDED(rv), "failed to get face/size");
-   if (NS_FAILED(rv))
-     return nsnull;
-@@ -191,22 +191,15 @@ nsFreeTypeFont::nsFreeTypeFont(nsITrueTy
-   PRBool embedded_bimap = PR_FALSE;
-   mFaceID = aFaceID;
-   mPixelSize = aPixelSize;
--  mImageDesc.font.face_id    = (void*)mFaceID;
--  mImageDesc.font.pix_width  = aPixelSize;
--  mImageDesc.font.pix_height = aPixelSize;
--  mImageDesc.image_type = 0;
-+  mImageDesc->face_id = (FTC_FaceID)&mFaceID;
-+  mImageDesc->width  = aPixelSize;
-+  mImageDesc->height = aPixelSize;
-+  mImageDesc->flags = 0;
- 
-   if (aPixelSize < nsFreeType2::gAntiAliasMinimum) {
--    mImageDesc.image_type |= ftc_image_mono;
-     anti_alias = PR_FALSE;
-   }
- 
--  if (nsFreeType2::gFreeType2Autohinted)
--    mImageDesc.image_type |= ftc_image_flag_autohinted;
--
--  if (nsFreeType2::gFreeType2Unhinted)
--    mImageDesc.image_type |= ftc_image_flag_unhinted;
--
-   PRUint32  num_embedded_bitmaps, i;
-   PRInt32*  embedded_bitmapheights;
-   mFaceID->GetEmbeddedBitmapHeights(&num_embedded_bitmaps,
-@@ -218,7 +211,6 @@ nsFreeTypeFont::nsFreeTypeFont(nsITrueTy
-         if (embedded_bitmapheights[i] == aPixelSize) {
-           embedded_bimap = PR_TRUE;
-           // unhinted must be set for embedded bitmaps to be used
--          mImageDesc.image_type |= ftc_image_flag_unhinted;
-           break;
-         }
-       }
-@@ -312,7 +304,7 @@ nsFreeTypeFont::doGetBoundingMetrics(con
-   if (!face)
-     return NS_ERROR_FAILURE;
- 
--  FTC_Image_Cache icache;
-+  FTC_ImageCache icache;
-   mFt2->GetImageCache(&icache);
-   if (!icache)
-     return NS_ERROR_FAILURE;
-@@ -401,7 +393,7 @@ nsFreeTypeFont::GetWidth(const PRUnichar
-   if (!face)
-     return 0;
- 
--  FTC_Image_Cache icache;
-+  FTC_ImageCache icache;
-   mFt2->GetImageCache(&icache);
-   if (!icache)
-     return 0;
-@@ -723,7 +715,7 @@ nsFreeTypeXImage::DrawString(nsRendering
-     if (y%4==0) (*blendPixelFunc)(sub_image, y, ascent-1, black, 255/2);
- #endif
- 
--  FTC_Image_Cache icache;
-+  FTC_ImageCache icache;
-   mFt2->GetImageCache(&icache);
-   if (!icache)
-     return 0;
diff --git a/time/sunbird/patches/patch-ap b/time/sunbird/patches/patch-ap
deleted file mode 100644
index 89e3b16f563..00000000000
--- a/time/sunbird/patches/patch-ap
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-ap,v 1.3 2009/05/29 13:22:11 he Exp $
-
---- security/coreconf/command.mk.orig	2007-05-09 03:38:16.000000000 +0200
-+++ security/coreconf/command.mk
-@@ -45,7 +45,7 @@ ASFLAGS      += $(CFLAGS)
- CCF           = $(CC) $(CFLAGS)
- LINK_DLL      = $(LINK) $(OS_DLLFLAGS) $(DLLFLAGS)
- LINK_EXE      = $(LINK) $(OS_LFLAGS) $(LFLAGS)
--CFLAGS        = $(OPTIMIZER) $(OS_CFLAGS) $(XP_DEFINE) $(DEFINES) $(INCLUDES) \
-+CFLAGS        = $(OS_CFLAGS) $(XP_DEFINE) $(DEFINES) $(INCLUDES) \
- 		$(XCFLAGS)
- PERL          = perl
- RANLIB        = echo
diff --git a/time/sunbird/patches/patch-aq b/time/sunbird/patches/patch-aq
deleted file mode 100644
index 72616470462..00000000000
--- a/time/sunbird/patches/patch-aq
+++ /dev/null
@@ -1,59 +0,0 @@
-$NetBSD: patch-aq,v 1.3 2009/05/29 13:22:11 he Exp $
-
---- directory/c-sdk/configure.in.orig	2007-07-11 22:43:19.000000000 +0200
-+++ directory/c-sdk/configure.in
-@@ -58,7 +58,7 @@ USE_64=
- USE_CPLUS=
- USE_IPV6=
- USE_MDUPDATE=
--_OPTIMIZE_FLAGS=-O
-+_OPTIMIZE_FLAGS=
- _DEBUG_FLAGS=-g
- MOZ_DEBUG=1
- MOZ_OPTIMIZE=
-@@ -1049,6 +1049,24 @@ tools are selected during the Xcode/Deve
-     PR_MD_CSRCS=freebsd.c
-     ;;
- 
-+*-*-dragonfly*)
-+    if test -z "$USE_NSPR_THREADS"; then
-+	USE_PTHREADS=1
-+    fi
-+    AC_DEFINE(XP_UNIX)
-+    AC_DEFINE(DRAGONFLY)
-+    AC_DEFINE(HAVE_BSD_FLOCK)
-+    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
-+    DSO_CFLAGS=-fPIC
-+    DSO_LDOPTS=-Bshareable
-+    ;;
-+
- *-hpux*)
-     AC_DEFINE(XP_UNIX)
-     AC_DEFINE(HPUX)
-@@ -2180,7 +2198,7 @@ if test -n "$USE_PTHREADS"; then
-             _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
-@@ -2238,6 +2256,11 @@ case "$target" in
-         AC_DEFINE(_PR_LOCAL_THREADS_ONLY)
-     fi
-     ;;
-+*-dragonfly*)
-+    if test -n "$USE_NSPR_THREADS"; then
-+        AC_DEFINE(_PR_LOCAL_THREADS_ONLY)
-+    fi
-+    ;;
- *-hpux*)
-     if test -n "$USE_NSPR_THREADS"; then
-         AC_DEFINE(_PR_LOCAL_THREADS_ONLY)
diff --git a/time/sunbird/patches/patch-aw b/time/sunbird/patches/patch-aw
deleted file mode 100644
index 97ee8e63406..00000000000
--- a/time/sunbird/patches/patch-aw
+++ /dev/null
@@ -1,12 +0,0 @@
-$NetBSD: patch-aw,v 1.1.1.1 2006/02/05 21:56:26 ghen Exp $
-
---- widget/src/gtksuperwin/Makefile.in.orig	2006-02-02 16:57:57.000000000 +0100
-+++ widget/src/gtksuperwin/Makefile.in
-@@ -46,6 +46,7 @@ MODULE		= widget
- LIBRARY_NAME	= gtksuperwin
- EXPORT_LIBRARY = 1
- LIBXUL_LIBRARY = 1
-+MKSHLIB		= $(MKCSHLIB)
- 
- PACKAGE_FILE = gtksuperwin.pkg
- 
diff --git a/time/sunbird/patches/patch-ax b/time/sunbird/patches/patch-ax
deleted file mode 100644
index d2dfa04fb2a..00000000000
--- a/time/sunbird/patches/patch-ax
+++ /dev/null
@@ -1,15 +0,0 @@
-$NetBSD: patch-ax,v 1.2 2006/06/07 19:29:59 ghen Exp $
-
---- security/coreconf/SunOS5.mk.orig	2006-06-07 17:51:56.000000000 +0200
-+++ security/coreconf/SunOS5.mk
-@@ -176,6 +176,10 @@ endif
- endif
- DSO_LDOPTS += -z combreloc -z defs -z ignore
- 
-+ifdef LIBRUNPATH
-+DSO_LDOPTS += -R$(LIBRUNPATH)
-+endif
-+
- # -KPIC generates position independent code for use in shared libraries.
- # (Similarly for -fPIC in case of gcc.)
- ifdef NS_USE_GCC
diff --git a/time/sunbird/patches/patch-ba b/time/sunbird/patches/patch-ba
deleted file mode 100644
index 0010aed631a..00000000000
--- a/time/sunbird/patches/patch-ba
+++ /dev/null
@@ -1,125 +0,0 @@
-$NetBSD: patch-ba,v 1.2 2009/05/29 13:22:11 he Exp $
-
---- nsprpub/pr/include/md/_netbsd.cfg.orig	2006-02-02 16:57:57.000000000 +0100
-+++ nsprpub/pr/include/md/_netbsd.cfg
-@@ -48,7 +48,8 @@
- 
- #define PR_AF_INET6 24  /* same as AF_INET6 */
- 
--#if defined(__i386__) || defined(__arm32__) || defined(__MIPSEL__)
-+#if defined(__i386__) || defined(__arm32__) || defined(__ARMEL__) || \
-+	defined(__MIPSEL__)
- 
- #define IS_LITTLE_ENDIAN 1
- #undef  IS_BIG_ENDIAN
-@@ -94,7 +95,53 @@
- #define PR_ALIGN_OF_DOUBLE  4
- #define PR_ALIGN_OF_POINTER 4
- 
--#elif defined(__sparc__) || defined(__MIPSEB__)
-+#elif defined(__sparc_v9)
-+
-+#undef IS_LITTLE_ENDIAN
-+#define  IS_BIG_ENDIAN 1
-+#define HAVE_LONG_LONG
-+#define  HAVE_ALIGNED_DOUBLES
-+#define  HAVE_ALIGNED_LONGLONGS
-+
-+#define PR_BYTES_PER_BYTE   1
-+#define PR_BYTES_PER_SHORT  2
-+#define PR_BYTES_PER_INT    4
-+#define PR_BYTES_PER_INT64  8
-+#define PR_BYTES_PER_LONG   8
-+#define PR_BYTES_PER_FLOAT  4
-+#define PR_BYTES_PER_DOUBLE 8
-+#define PR_BYTES_PER_WORD   8
-+#define PR_BYTES_PER_DWORD  8
-+#define PR_BYTES_PER_WORD_LOG2   3
-+#define PR_BYTES_PER_DWORD_LOG2  3
-+
-+#define PR_BITS_PER_BYTE    8
-+#define PR_BITS_PER_SHORT   16
-+#define PR_BITS_PER_INT     32
-+#define PR_BITS_PER_INT64   64
-+#define PR_BITS_PER_LONG    64
-+#define PR_BITS_PER_FLOAT   32
-+#define PR_BITS_PER_DOUBLE  64
-+#define PR_BITS_PER_WORD    64
-+
-+#define PR_BITS_PER_BYTE_LOG2   3
-+#define PR_BITS_PER_SHORT_LOG2  4
-+#define PR_BITS_PER_INT_LOG2    5
-+#define PR_BITS_PER_INT64_LOG2  6
-+#define PR_BITS_PER_LONG_LOG2   6
-+#define PR_BITS_PER_FLOAT_LOG2  5
-+#define PR_BITS_PER_DOUBLE_LOG2 6
-+#define PR_BITS_PER_WORD_LOG2   6
-+
-+#define PR_ALIGN_OF_SHORT   2
-+#define PR_ALIGN_OF_INT     4
-+#define PR_ALIGN_OF_LONG    8
-+#define PR_ALIGN_OF_INT64   8 
-+#define PR_ALIGN_OF_FLOAT   4 
-+#define PR_ALIGN_OF_DOUBLE  8 
-+#define PR_ALIGN_OF_POINTER 8 
-+
-+#elif defined(__sparc) || defined(__MIPSEB__) || defined(__ARMEB__)
- 
- #undef IS_LITTLE_ENDIAN
- #define  IS_BIG_ENDIAN 1
-@@ -187,6 +234,55 @@
- #define PR_BYTES_PER_WORD_LOG2  3
- #define PR_BYTES_PER_DWORD_LOG2 3
- 
-+#elif defined(__amd64__)
-+#define IS_LITTLE_ENDIAN 1
-+#undef  IS_BIG_ENDIAN
-+#define IS_64
-+
-+#define PR_BYTES_PER_BYTE   1
-+#define PR_BYTES_PER_SHORT  2
-+#define PR_BYTES_PER_INT    4
-+#define PR_BYTES_PER_INT64  8
-+#define PR_BYTES_PER_LONG   8
-+#define PR_BYTES_PER_FLOAT  4
-+#define PR_BYTES_PER_DOUBLE 8
-+#define PR_BYTES_PER_WORD   8
-+#define PR_BYTES_PER_DWORD  8
-+
-+#define PR_BITS_PER_BYTE    8
-+#define PR_BITS_PER_SHORT   16
-+#define PR_BITS_PER_INT     32
-+#define PR_BITS_PER_INT64   64
-+#define PR_BITS_PER_LONG    64
-+#define PR_BITS_PER_FLOAT   32
-+#define PR_BITS_PER_DOUBLE  64
-+#define PR_BITS_PER_WORD    64
-+
-+#define PR_BITS_PER_BYTE_LOG2   3
-+#define PR_BITS_PER_SHORT_LOG2  4
-+#define PR_BITS_PER_INT_LOG2    5
-+#define PR_BITS_PER_INT64_LOG2  6
-+#define PR_BITS_PER_LONG_LOG2   6
-+#define PR_BITS_PER_FLOAT_LOG2  5
-+#define PR_BITS_PER_DOUBLE_LOG2 6
-+#define PR_BITS_PER_WORD_LOG2   6
-+
-+#define PR_ALIGN_OF_SHORT   2
-+#define PR_ALIGN_OF_INT     4
-+#define PR_ALIGN_OF_LONG    8
-+#define PR_ALIGN_OF_INT64   8
-+#define PR_ALIGN_OF_FLOAT   4
-+#define PR_ALIGN_OF_DOUBLE  8
-+#define PR_ALIGN_OF_POINTER 8
-+#define PR_ALIGN_OF_WORD    8
-+
-+#define PR_BYTES_PER_WORD_LOG2  3
-+#define PR_BYTES_PER_DWORD_LOG2 3
-+
-+#define HAVE_LONG_LONG
-+#define HAVE_ALIGNED_DOUBLES
-+#define HAVE_ALIGNED_LONGLONGS
-+
- #elif defined(__powerpc__) || defined(__m68k__)
- 
- #undef  IS_LITTLE_ENDIAN
diff --git a/time/sunbird/patches/patch-bb b/time/sunbird/patches/patch-bb
deleted file mode 100644
index a34891ceb0b..00000000000
--- a/time/sunbird/patches/patch-bb
+++ /dev/null
@@ -1,26 +0,0 @@
-$NetBSD: patch-bb,v 1.1.1.1 2006/02/05 21:56:26 ghen Exp $
-
---- nsprpub/pr/include/md/_netbsd.h.orig	2006-02-02 16:57:57.000000000 +0100
-+++ nsprpub/pr/include/md/_netbsd.h
-@@ -44,6 +44,8 @@
- #define _PR_SI_ARCHITECTURE "x86"
- #elif defined(__alpha__)
- #define _PR_SI_ARCHITECTURE "alpha"
-+#elif defined(__amd64__)
-+#define _PR_SI_ARCHITECTURE "amd64"
- #elif defined(__m68k__)
- #define _PR_SI_ARCHITECTURE "m68k"
- #elif defined(__powerpc__)
-@@ -95,6 +97,12 @@
- #define _PR_HAVE_GETPROTO_R_INT
- #endif
- 
-+#if __NetBSD_Version__ >= 106370000
-+/* NetBSD 1.6ZK */
-+#define _PR_HAVE_GETPROTO_R
-+#define _PR_HAVE_GETPROTO_R_INT
-+#endif
-+
- #define USE_SETJMP
- 
- #ifndef _PR_PTHREADS
diff --git a/time/sunbird/patches/patch-bm b/time/sunbird/patches/patch-bm
deleted file mode 100644
index c0df184b44b..00000000000
--- a/time/sunbird/patches/patch-bm
+++ /dev/null
@@ -1,31 +0,0 @@
-$NetBSD: patch-bm,v 1.1.1.1 2006/02/05 21:56:26 ghen Exp $
-
---- xpcom/reflect/xptcall/src/md/unix/xptcstubs_arm_netbsd.cpp.orig	2006-02-02 16:57:57.000000000 +0100
-+++ xpcom/reflect/xptcall/src/md/unix/xptcstubs_arm_netbsd.cpp
-@@ -118,18 +118,23 @@ PrepareAndDispatch(nsXPTCStubBase* self,
-  * so they are contiguous with values passed on the stack, and then calls
-  * PrepareAndDispatch() to do the dirty work.
-  */
-+#ifndef	__ELF__
-+#define	SYMBOLPREFIX	"_"
-+#else
-+#define	SYMBOLPREFIX
-+#endif
- 
- #define STUB_ENTRY(n)							\
- __asm__(								\
--    ".global	_Stub"#n"__14nsXPTCStubBase\n\t"			\
--"_Stub"#n"__14nsXPTCStubBase:\n\t"					\
-+    ".global	"SYMBOLPREFIX"Stub"#n"__14nsXPTCStubBase\n\t"		\
-+SYMBOLPREFIX"Stub"#n"__14nsXPTCStubBase:\n\t"				\
-     "stmfd	sp!, {r1, r2, r3}	\n\t"				\
-     "mov	ip, sp			\n\t"				\
-     "stmfd	sp!, {fp, ip, lr, pc}	\n\t"				\
-     "sub	fp, ip, #4		\n\t"				\
-     "mov	r1, #"#n"		\n\t"    /* = methodIndex 	*/ \
-     "add	r2, sp, #16		\n\t"				\
--    "bl		_PrepareAndDispatch__FP14nsXPTCStubBaseUiPUi   \n\t"	\
-+    "bl		"SYMBOLPREFIX"PrepareAndDispatch__FP14nsXPTCStubBaseUiPUi   \n\t"	\
-     "ldmea	fp, {fp, sp, lr}	\n\t"				\
-     "add	sp, sp, #12		\n\t"				\
-     "mov	pc, lr			\n\t"				\
diff --git a/time/sunbird/patches/patch-bo b/time/sunbird/patches/patch-bo
deleted file mode 100644
index 2c8a7020ca4..00000000000
--- a/time/sunbird/patches/patch-bo
+++ /dev/null
@@ -1,75 +0,0 @@
-$NetBSD: patch-bo,v 1.2 2006/06/27 11:11:52 joerg Exp $
-
---- nsprpub/configure.in.orig	2006-04-28 00:53:35.000000000 +0000
-+++ nsprpub/configure.in
-@@ -62,7 +62,7 @@ USE_CPLUS=
- USE_IPV6=
- USE_MDUPDATE=
- _MACOSX_DEPLOYMENT_TARGET=
--_OPTIMIZE_FLAGS=-O
-+_OPTIMIZE_FLAGS=
- _DEBUG_FLAGS=-g
- MOZ_DEBUG=1
- MOZ_OPTIMIZE=
-@@ -1133,6 +1133,30 @@ tools are selected during the Xcode/Deve
-     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(DRAGONFLY)
-+    AC_DEFINE(HAVE_BSD_FLOCK)
-+    AC_DEFINE(HAVE_SOCKLEN_T)
-+    CFLAGS="$CFLAGS $(DSO_CFLAGS) -ansi -Wall"
-+    MOZ_OBJFORMAT=elf
-+    DLL_SUFFIX=so
-+    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*)
-@@ -1660,6 +1684,7 @@ mips-nec-sysv*)
-     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
-@@ -2472,6 +2497,10 @@ if test -n "$USE_PTHREADS"; then
- 	        _PTHREAD_LDFLAGS="-lc_r"
- 	    fi
- 	    ;;
-+    *-freebsd*)
-+	    AC_DEFINE(_REENTRANT)
-+    	    _PTHREAD_LDFLAGS="-pthread"
-+	    ;;
-     *-netbsd*)
- 	    if test "$ac_cv_have_dash_pthread" = "yes"; then
- 	        _PTHREAD_LDFLAGS="-pthread"
-@@ -2548,6 +2577,11 @@ case "$target" in
-         AC_DEFINE(_PR_LOCAL_THREADS_ONLY)
-     fi
-     ;;
-+*-dragonfly*)
-+    if test -n "$USE_NSPR_THREADS"; then
-+        AC_DEFINE(_PR_LOCAL_THREADS_ONLY)
-+    fi
-+    ;;
- *-hpux*)
-     if test -n "$USE_NSPR_THREADS"; then
-         AC_DEFINE(_PR_LOCAL_THREADS_ONLY)
diff --git a/time/sunbird/patches/patch-bq b/time/sunbird/patches/patch-bq
deleted file mode 100644
index 87b1db6fb7e..00000000000
--- a/time/sunbird/patches/patch-bq
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-bq,v 1.1.1.1 2006/02/05 21:56:26 ghen Exp $
-
---- xpcom/io/nsLocalFileUnix.h.orig	2006-02-02 16:57:57.000000000 +0100
-+++ xpcom/io/nsLocalFileUnix.h
-@@ -73,7 +73,7 @@
- #endif
- 
- // so we can statfs on freebsd
--#if defined(__FreeBSD__)
-+#if defined(__FreeBSD__) || (defined(__NetBSD__) && !defined(HAVE_STATVFS))
-     #define HAVE_SYS_STATFS_H
-     #define STATFS statfs
-     #include <sys/param.h>
diff --git a/time/sunbird/patches/patch-br b/time/sunbird/patches/patch-br
deleted file mode 100644
index 669dc754875..00000000000
--- a/time/sunbird/patches/patch-br
+++ /dev/null
@@ -1,43 +0,0 @@
-$NetBSD: patch-br,v 1.4 2009/05/29 13:22:11 he Exp $
-
---- nsprpub/pr/src/misc/prnetdb.c.orig	2006-11-14 18:41:59.000000000 +0100
-+++ nsprpub/pr/src/misc/prnetdb.c
-@@ -113,6 +113,11 @@ PRLock *_pr_dnsLock = NULL;
- #define _PR_HAVE_5_ARG_GETPROTO_R
- #endif
- 
-+#if __DragonFly_version >= 200202
-+#define _PR_HAVE_GETPROTO_R
-+#define _PR_HAVE_5_ARG_GETPROTO_R
-+#endif
-+
- #if (defined(LINUX) && defined(__GLIBC__) && __GLIBC__ >= 2)
- #define _PR_HAVE_GETPROTO_R
- #define _PR_HAVE_5_ARG_GETPROTO_R
-@@ -329,7 +334,7 @@ _pr_QueryNetIfs(void)
- }
- 
- #elif (defined(DARWIN) && defined(HAVE_GETIFADDRS)) || defined(FREEBSD) \
--    || defined(NETBSD) || defined(OPENBSD)
-+    || defined(NETBSD) || defined(OPENBSD) || defined(DRAGONFLY)
- 
- /*
-  * Use the BSD getifaddrs function.
-@@ -2115,7 +2120,17 @@ PR_IMPLEMENT(PRAddrInfo *) PR_GetAddrInf
-          */
-         hints.ai_socktype = SOCK_STREAM;
- 
-+/* NetBSD >= 2.99.9 has a thread-safe resolver */
-+#if defined(__NetBSD_Version__) && __NetBSD_Version__ < 299000900
-+	LOCK_DNS();
-+#endif
-+
-         rv = GETADDRINFO(hostname, NULL, &hints, &res);
-+
-+#if defined(__NetBSD_Version__) && __NetBSD_Version__ < 299000900
-+	UNLOCK_DNS();
-+#endif
-+
-         if (rv == 0)
-             return (PRAddrInfo *) res;
- 
diff --git a/time/sunbird/patches/patch-bs b/time/sunbird/patches/patch-bs
deleted file mode 100644
index 1818b740c94..00000000000
--- a/time/sunbird/patches/patch-bs
+++ /dev/null
@@ -1,24 +0,0 @@
-$NetBSD: patch-bs,v 1.2 2006/06/27 11:11:52 joerg Exp $
-
---- config/mkdepend/imakemdep.h.orig	2004-04-20 21:38:14.000000000 +0000
-+++ config/mkdepend/imakemdep.h
-@@ -440,6 +440,9 @@ char *cpp_argv[ARGUMENTS] = {
- # ifdef __i386__
- 	"-D__i386__",
- # endif
-+#if defined(__amd64__) || defined(__x86_64__)
-+	"-D__amd64__ -D__x86_64__",
-+# endif
- # ifdef __GNUC__
- 	"-traditional",
- # endif
-@@ -716,6 +719,9 @@ struct symtab	predefs[] = {
- #ifdef __FreeBSD__
- 	{"__FreeBSD__", "1"},
- #endif
-+#ifdef __DragonFly__
-+	{"__DragonFly__", "1"},
-+#endif
- #ifdef __NetBSD__
- 	{"__NetBSD__", "1"},
- #endif
diff --git a/time/sunbird/patches/patch-bu b/time/sunbird/patches/patch-bu
deleted file mode 100644
index aa3a4b24b42..00000000000
--- a/time/sunbird/patches/patch-bu
+++ /dev/null
@@ -1,179 +0,0 @@
-$NetBSD: patch-bu,v 1.1.1.1 2006/02/05 21:56:26 ghen Exp $
-
---- xpcom/reflect/xptcall/src/md/unix/xptcinvoke_unixish_amd64.cpp.orig	2006-02-02 17:14:03.000000000 +0100
-+++ xpcom/reflect/xptcall/src/md/unix/xptcinvoke_unixish_amd64.cpp
-@@ -0,0 +1,174 @@
-+/* -*- Mode: C; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
-+// Platform specific code to invoke XPCOM methods on native objects
-+
-+#include "xptcprivate.h"
-+
-+// 6 integral parameters are passed in registers
-+const PRUint32 GPR_COUNT = 6;
-+
-+// 8 floating point parameters are passed in SSE registers
-+const PRUint32 FPR_COUNT = 8;
-+
-+// Remember that these 'words' are 64-bit long
-+static inline void
-+invoke_count_words(PRUint32 paramCount, nsXPTCVariant * s,
-+                   PRUint32 & nr_gpr, PRUint32 & nr_fpr, PRUint32 & nr_stack)
-+{
-+    nr_gpr = 1; // skip one GP register for 'that'
-+    nr_fpr = 0;
-+    nr_stack = 0;
-+
-+    /* Compute number of eightbytes of class MEMORY.  */
-+    for (uint32 i = 0; i < paramCount; i++, s++) {
-+        if (!s->IsPtrData()
-+            && (s->type == nsXPTType::T_FLOAT || s->type == nsXPTType::T_DOUBLE)) {
-+            if (nr_fpr < FPR_COUNT)
-+                nr_fpr++;
-+            else
-+                nr_stack++;
-+        }
-+        else {
-+            if (nr_gpr < GPR_COUNT)
-+                nr_gpr++;
-+            else
-+                nr_stack++;
-+        }
-+    }
-+}
-+
-+static void
-+invoke_copy_to_stack(PRUint64 * d, PRUint32 paramCount, nsXPTCVariant * s,
-+                     PRUint64 * gpregs, double * fpregs)
-+{
-+    PRUint32 nr_gpr = 1; // skip one GP register for 'that'
-+    PRUint32 nr_fpr = 0;
-+    PRUint64 value;
-+
-+    for (uint32 i = 0; i < paramCount; i++, s++) {
-+        if (s->IsPtrData())
-+            value = (PRUint64) s->ptr;
-+        else {
-+            switch (s->type) {
-+            case nsXPTType::T_FLOAT:                                break;
-+            case nsXPTType::T_DOUBLE:                               break;
-+            case nsXPTType::T_I8:     value = s->val.i8;            break;
-+            case nsXPTType::T_I16:    value = s->val.i16;           break;
-+            case nsXPTType::T_I32:    value = s->val.i32;           break;
-+            case nsXPTType::T_I64:    value = s->val.i64;           break;
-+            case nsXPTType::T_U8:     value = s->val.u8;            break;
-+            case nsXPTType::T_U16:    value = s->val.u16;           break;
-+            case nsXPTType::T_U32:    value = s->val.u32;           break;
-+            case nsXPTType::T_U64:    value = s->val.u64;           break;
-+            case nsXPTType::T_BOOL:   value = s->val.b;             break;
-+            case nsXPTType::T_CHAR:   value = s->val.c;             break;
-+            case nsXPTType::T_WCHAR:  value = s->val.wc;            break;
-+            default:                  value = (PRUint64) s->val.p;  break;
-+            }
-+        }
-+
-+        if (!s->IsPtrData() && s->type == nsXPTType::T_DOUBLE) {
-+            if (nr_fpr < FPR_COUNT)
-+                fpregs[nr_fpr++] = s->val.d;
-+            else {
-+                *((double *)d) = s->val.d;
-+                d++;
-+            }
-+        }
-+        else if (!s->IsPtrData() && s->type == nsXPTType::T_FLOAT) {
-+            if (nr_fpr < FPR_COUNT)
-+                // The value in %xmm register is already prepared to
-+                // be retrieved as a float. Therefore, we pass the
-+                // value verbatim, as a double without conversion.
-+                fpregs[nr_fpr++] = s->val.d;
-+            else {
-+                *((float *)d) = s->val.f;
-+                d++;
-+            }
-+        }
-+        else {
-+            if (nr_gpr < GPR_COUNT)
-+                gpregs[nr_gpr++] = value;
-+            else
-+                *d++ = value;
-+        }
-+    }
-+}
-+
-+extern "C"
-+XPTC_PUBLIC_API(nsresult)
-+XPTC_InvokeByIndex(nsISupports * that, PRUint32 methodIndex,
-+                   PRUint32 paramCount, nsXPTCVariant * params)
-+{
-+    PRUint32 nr_gpr, nr_fpr, nr_stack;
-+    invoke_count_words(paramCount, params, nr_gpr, nr_fpr, nr_stack);
-+    
-+    // Stack, if used, must be 16-bytes aligned
-+    if (nr_stack)
-+        nr_stack = (nr_stack + 1) & ~1;
-+
-+    // Load parameters to stack, if necessary
-+    PRUint64 *stack = (PRUint64 *) __builtin_alloca(nr_stack * 8);
-+    PRUint64 gpregs[GPR_COUNT];
-+    double fpregs[FPR_COUNT];
-+    invoke_copy_to_stack(stack, paramCount, params, gpregs, fpregs);
-+
-+    // Load FPR registers from fpregs[]
-+    register double d0 asm("xmm0");
-+    register double d1 asm("xmm1");
-+    register double d2 asm("xmm2");
-+    register double d3 asm("xmm3");
-+    register double d4 asm("xmm4");
-+    register double d5 asm("xmm5");
-+    register double d6 asm("xmm6");
-+    register double d7 asm("xmm7");
-+
-+    switch (nr_fpr) {
-+#define ARG_FPR(N) \
-+    case N+1: d##N = fpregs[N];
-+        ARG_FPR(7);
-+        ARG_FPR(6);
-+        ARG_FPR(5);
-+        ARG_FPR(4);
-+        ARG_FPR(3);
-+        ARG_FPR(2);
-+        ARG_FPR(1);
-+        ARG_FPR(0);
-+    case 0:;
-+#undef ARG_FPR
-+    }
-+    
-+    // Load GPR registers from gpregs[]
-+    register PRUint64 a0 asm("rdi");
-+    register PRUint64 a1 asm("rsi");
-+    register PRUint64 a2 asm("rdx");
-+    register PRUint64 a3 asm("rcx");
-+    register PRUint64 a4 asm("r8");
-+    register PRUint64 a5 asm("r9");
-+    
-+    switch (nr_gpr) {
-+#define ARG_GPR(N) \
-+    case N+1: a##N = gpregs[N];
-+        ARG_GPR(5);
-+        ARG_GPR(4);
-+        ARG_GPR(3);
-+        ARG_GPR(2);
-+        ARG_GPR(1);
-+    case 1: a0 = (PRUint64) that;
-+    case 0:;
-+#undef ARG_GPR
-+    }
-+
-+    // Ensure that assignments to SSE registers won't be optimized away
-+    asm("" ::
-+        "x" (d0), "x" (d1), "x" (d2), "x" (d3),
-+        "x" (d4), "x" (d5), "x" (d6), "x" (d7));
-+    
-+    // Get pointer to method
-+    PRUint64 methodAddress = *((PRUint64 *)that);
-+    methodAddress += 8 * methodIndex;
-+    methodAddress = *((PRUint64 *)methodAddress);
-+    
-+    typedef PRUint32 (*Method)(PRUint64, PRUint64, PRUint64, PRUint64, PRUint64, PRUint64);
-+    PRUint32 result = ((Method)methodAddress)(a0, a1, a2, a3, a4, a5);
-+    return result;
-+}
diff --git a/time/sunbird/patches/patch-bv b/time/sunbird/patches/patch-bv
deleted file mode 100644
index 5c96e71efd5..00000000000
--- a/time/sunbird/patches/patch-bv
+++ /dev/null
@@ -1,211 +0,0 @@
-$NetBSD: patch-bv,v 1.1.1.1 2006/02/05 21:56:26 ghen Exp $
-
---- xpcom/reflect/xptcall/src/md/unix/xptcstubs_unixish_amd64.cpp.orig	2006-02-02 17:14:27.000000000 +0100
-+++ xpcom/reflect/xptcall/src/md/unix/xptcstubs_unixish_amd64.cpp
-@@ -0,0 +1,206 @@
-+/* -*- Mode: C; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
-+
-+// Implement shared vtbl methods.
-+
-+#include "xptcprivate.h"
-+
-+// The Linux/x86-64 ABI passes the first 6 integral parameters and the
-+// first 8 floating point parameters in registers (rdi, rsi, rdx, rcx,
-+// r8, r9 and xmm0-xmm7), no stack space is allocated for these by the
-+// caller.  The rest of the parameters are passed in the callers stack
-+// area.
-+
-+const PRUint32 PARAM_BUFFER_COUNT   = 16;
-+const PRUint32 GPR_COUNT            = 6;
-+const PRUint32 FPR_COUNT            = 8;
-+
-+// PrepareAndDispatch() is called by SharedStub() and calls the actual method.
-+//
-+// - 'args[]' contains the arguments passed on stack
-+// - 'gpregs[]' contains the arguments passed in integer registers
-+// - 'fpregs[]' contains the arguments passed in floating point registers
-+// 
-+// The parameters are mapped into an array of type 'nsXPTCMiniVariant'
-+// and then the method gets called.
-+
-+extern "C" nsresult
-+PrepareAndDispatch(nsXPTCStubBase * self, PRUint32 methodIndex,
-+                   PRUint64 * args, PRUint64 * gpregs, double *fpregs)
-+{
-+    nsXPTCMiniVariant paramBuffer[PARAM_BUFFER_COUNT];
-+    nsXPTCMiniVariant* dispatchParams = NULL;
-+    nsIInterfaceInfo* iface_info = NULL;
-+    const nsXPTMethodInfo* info;
-+    PRUint32 paramCount;
-+    PRUint32 i;
-+    nsresult result = NS_ERROR_FAILURE;
-+
-+    NS_ASSERTION(self,"no self");
-+
-+    self->GetInterfaceInfo(&iface_info);
-+    NS_ASSERTION(iface_info,"no interface info");
-+    if (! iface_info)
-+        return NS_ERROR_UNEXPECTED;
-+
-+    iface_info->GetMethodInfo(PRUint16(methodIndex), &info);
-+    NS_ASSERTION(info,"no method info");
-+    if (! info)
-+        return NS_ERROR_UNEXPECTED;
-+
-+    paramCount = info->GetParamCount();
-+
-+    // setup variant array pointer
-+    if(paramCount > PARAM_BUFFER_COUNT)
-+        dispatchParams = new nsXPTCMiniVariant[paramCount];
-+    else
-+        dispatchParams = paramBuffer;
-+
-+    NS_ASSERTION(dispatchParams,"no place for params");
-+    if (! dispatchParams)
-+        return NS_ERROR_OUT_OF_MEMORY;
-+
-+    PRUint64* ap = args;
-+    PRUint32 nr_gpr = 1;    // skip one GPR register for 'that'
-+    PRUint32 nr_fpr = 0;
-+    PRUint64 value;
-+
-+    for(i = 0; i < paramCount; i++) {
-+        const nsXPTParamInfo& param = info->GetParam(i);
-+        const nsXPTType& type = param.GetType();
-+        nsXPTCMiniVariant* dp = &dispatchParams[i];
-+	
-+        if (!param.IsOut() && type == nsXPTType::T_DOUBLE) {
-+            if (nr_fpr < FPR_COUNT)
-+                dp->val.d = fpregs[nr_fpr++];
-+            else
-+                dp->val.d = *(double*) ap++;
-+            continue;
-+        }
-+        else if (!param.IsOut() && type == nsXPTType::T_FLOAT) {
-+            if (nr_fpr < FPR_COUNT)
-+                // The value in %xmm register is already prepared to
-+                // be retrieved as a float. Therefore, we pass the
-+                // value verbatim, as a double without conversion.
-+                dp->val.d = *(double*) ap++;
-+            else
-+                dp->val.f = *(float*) ap++;
-+            continue;
-+        }
-+        else {
-+            if (nr_gpr < GPR_COUNT)
-+                value = gpregs[nr_gpr++];
-+            else
-+                value = *ap++;
-+        }
-+
-+        if (param.IsOut() || !type.IsArithmetic()) {
-+            dp->val.p = (void*) value;
-+            continue;
-+        }
-+
-+        switch (type) {
-+        case nsXPTType::T_I8:      dp->val.i8  = (PRInt8)   value; break;
-+        case nsXPTType::T_I16:     dp->val.i16 = (PRInt16)  value; break;
-+        case nsXPTType::T_I32:     dp->val.i32 = (PRInt32)  value; break;
-+        case nsXPTType::T_I64:     dp->val.i64 = (PRInt64)  value; break;
-+        case nsXPTType::T_U8:      dp->val.u8  = (PRUint8)  value; break;
-+        case nsXPTType::T_U16:     dp->val.u16 = (PRUint16) value; break;
-+        case nsXPTType::T_U32:     dp->val.u32 = (PRUint32) value; break;
-+        case nsXPTType::T_U64:     dp->val.u64 = (PRUint64) value; break;
-+        case nsXPTType::T_BOOL:    dp->val.b   = (PRBool)   value; break;
-+        case nsXPTType::T_CHAR:    dp->val.c   = (char)     value; break;
-+        case nsXPTType::T_WCHAR:   dp->val.wc  = (wchar_t)  value; break;
-+
-+        default:
-+            NS_ASSERTION(0, "bad type");
-+            break;
-+        }
-+    }
-+
-+    result = self->CallMethod((PRUint16) methodIndex, info, dispatchParams);
-+
-+    NS_RELEASE(iface_info);
-+
-+    if (dispatchParams != paramBuffer)
-+        delete [] dispatchParams;
-+
-+    return result;
-+}
-+
-+#if defined(__GXX_ABI_VERSION) && __GXX_ABI_VERSION >= 100 /* G++ V3 ABI */
-+// Linux/x86-64 uses gcc >= 3.1
-+#define STUB_ENTRY(n) \
-+asm(".section	\".text\"\n\t" \
-+    ".align	2\n\t" \
-+    ".if	" #n " < 10\n\t" \
-+    ".globl	_ZN14nsXPTCStubBase5Stub" #n "Ev\n\t" \
-+    ".type	_ZN14nsXPTCStubBase5Stub" #n "Ev,@function\n" \
-+    "_ZN14nsXPTCStubBase5Stub" #n "Ev:\n\t" \
-+    ".elseif	" #n " < 100\n\t" \
-+    ".globl	_ZN14nsXPTCStubBase6Stub" #n "Ev\n\t" \
-+    ".type	_ZN14nsXPTCStubBase6Stub" #n "Ev,@function\n" \
-+    "_ZN14nsXPTCStubBase6Stub" #n "Ev:\n\t" \
-+    ".elseif    " #n " < 1000\n\t" \
-+    ".globl     _ZN14nsXPTCStubBase7Stub" #n "Ev\n\t" \
-+    ".type      _ZN14nsXPTCStubBase7Stub" #n "Ev,@function\n" \
-+    "_ZN14nsXPTCStubBase7Stub" #n "Ev:\n\t" \
-+    ".else\n\t" \
-+    ".err	\"stub number " #n " >= 1000 not yet supported\"\n\t" \
-+    ".endif\n\t" \
-+    "movl	$" #n ", %eax\n\t" \
-+    "jmp	SharedStub\n\t" \
-+    ".if	" #n " < 10\n\t" \
-+    ".size	_ZN14nsXPTCStubBase5Stub" #n "Ev,.-_ZN14nsXPTCStubBase5Stub" #n "Ev\n\t" \
-+    ".elseif	" #n " < 100\n\t" \
-+    ".size	_ZN14nsXPTCStubBase6Stub" #n "Ev,.-_ZN14nsXPTCStubBase6Stub" #n "Ev\n\t" \
-+    ".else\n\t" \
-+    ".size	_ZN14nsXPTCStubBase7Stub" #n "Ev,.-_ZN14nsXPTCStubBase7Stub" #n "Ev\n\t" \
-+    ".endif");
-+
-+// static nsresult SharedStub(PRUint32 methodIndex)
-+asm(".section   \".text\"\n\t"
-+    ".align     2\n\t"
-+    ".type      SharedStub,@function\n\t"
-+    "SharedStub:\n\t"
-+    // make room for gpregs (48), fpregs (64)
-+    "pushq      %rbp\n\t"
-+    "movq       %rsp,%rbp\n\t"
-+    "subq       $112,%rsp\n\t"
-+    // save GP registers
-+    "movq       %rdi,-112(%rbp)\n\t"
-+    "movq       %rsi,-104(%rbp)\n\t"
-+    "movq       %rdx, -96(%rbp)\n\t"
-+    "movq       %rcx, -88(%rbp)\n\t"
-+    "movq       %r8 , -80(%rbp)\n\t"
-+    "movq       %r9 , -72(%rbp)\n\t"
-+    "leaq       -112(%rbp),%rcx\n\t"
-+    // save FP registers
-+    "movsd      %xmm0,-64(%rbp)\n\t"
-+    "movsd      %xmm1,-56(%rbp)\n\t"
-+    "movsd      %xmm2,-48(%rbp)\n\t"
-+    "movsd      %xmm3,-40(%rbp)\n\t"
-+    "movsd      %xmm4,-32(%rbp)\n\t"
-+    "movsd      %xmm5,-24(%rbp)\n\t"
-+    "movsd      %xmm6,-16(%rbp)\n\t"
-+    "movsd      %xmm7, -8(%rbp)\n\t"
-+    "leaq       -64(%rbp),%r8\n\t"
-+    // rdi has the 'self' pointer already
-+    "movl       %eax,%esi\n\t"
-+    "leaq       16(%rbp),%rdx\n\t"
-+    "call       PrepareAndDispatch\n\t"
-+    "leave\n\t"
-+    "ret\n\t"
-+    ".size      SharedStub,.-SharedStub");
-+
-+#define SENTINEL_ENTRY(n) \
-+nsresult nsXPTCStubBase::Sentinel##n() \
-+{ \
-+    NS_ASSERTION(0,"nsXPTCStubBase::Sentinel called"); \
-+    return NS_ERROR_NOT_IMPLEMENTED; \
-+}
-+
-+#include "xptcstubsdef.inc"
-+
-+#else
-+#error "can't find a compiler to use"
-+#endif /* __GNUC__ */
diff --git a/time/sunbird/patches/patch-bw b/time/sunbird/patches/patch-bw
deleted file mode 100644
index 8766d233a08..00000000000
--- a/time/sunbird/patches/patch-bw
+++ /dev/null
@@ -1,63 +0,0 @@
-$NetBSD: patch-bw,v 1.1.1.1 2006/02/05 21:56:26 ghen Exp $
-
---- xpcom/reflect/xptcall/src/md/unix/xptcstubs_linux_alpha.cpp.orig	2006-02-02 16:57:57.000000000 +0100
-+++ xpcom/reflect/xptcall/src/md/unix/xptcstubs_linux_alpha.cpp
-@@ -187,6 +187,50 @@ __asm__(
-  * nsresult nsXPTCStubBase::Stub##n()
-  *  Sets register $1 to "methodIndex" and jumps to SharedStub.
-  */
-+#if defined(__GXX_ABI_VERSION) && __GXX_ABI_VERSION >= 100 /* G++ V3 ABI */
-+#define STUB_ENTRY(n)					\
-+__asm__(						\
-+"#### Stub"#n" ####\n"					\
-+".text\n"						\
-+"	.align 5\n"					\
-+"	.if "#n" < 10 \n"				\
-+"	.globl _ZN14nsXPTCStubBase5Stub"#n"Ev\n"	\
-+"	.ent _ZN14nsXPTCStubBase5Stub"#n"Ev\n"		\
-+"_ZN14nsXPTCStubBase5Stub"#n"Ev:\n"			\
-+"	.frame $30,0,$26,0\n"				\
-+"	ldgp $29,0($27)\n"				\
-+"$_ZN14nsXPTCStubBase5Stub"#n"Ev..ng:\n"		\
-+"	.prologue 1\n"					\
-+"	lda $1,"#n"\n"					\
-+"	br $31,$SharedStub..ng\n"			\
-+"	.end _ZN14nsXPTCStubBase5Stub"#n"Ev\n"		\
-+"	.elseif  "#n" < 100 \n"				\
-+"	.globl _ZN14nsXPTCStubBase6Stub"#n"Ev\n"	\
-+"	.ent _ZN14nsXPTCStubBase6Stub"#n"Ev\n"		\
-+"_ZN14nsXPTCStubBase6Stub"#n"Ev:\n"			\
-+"	.frame $30,0,$26,0\n"				\
-+"	ldgp $29,0($27)\n"				\
-+"$_ZN14nsXPTCStubBase6Stub"#n"Ev..ng:\n"		\
-+"	.prologue 1\n"					\
-+"	lda $1,"#n"\n"					\
-+"	br $31,$SharedStub..ng\n"			\
-+"	.end _ZN14nsXPTCStubBase6Stub"#n"Ev\n"		\
-+"	.elseif "#n" < 1000 \n"				\
-+"	.globl _ZN14nsXPTCStubBase7Stub"#n"Ev\n"	\
-+"	.ent _ZN14nsXPTCStubBase7Stub"#n"Ev\n"		\
-+"_ZN14nsXPTCStubBase7Stub"#n"Ev:\n"			\
-+"	.frame $30,0,$26,0\n"				\
-+"	ldgp $29,0($27)\n"				\
-+"$_ZN14nsXPTCStubBase7Stub"#n"Ev..ng:\n"		\
-+"	.prologue 1\n"					\
-+"	lda $1,"#n"\n"					\
-+"	br $31,$SharedStub..ng\n"			\
-+"	.end _ZN14nsXPTCStubBase7Stub"#n"Ev\n"		\
-+"	.else\n"					\
-+"	.err \"stub number "#n"> 1000 not yet supported\"\n" \
-+"	.endif\n"					\
-+    );
-+#else /* G++2.95 ABI */
- #define STUB_MANGLED_ENTRY(n, symbol) \
-     "#### Stub"#n" ####"      "\n\t" \
-     ".text"                   "\n\t" \
-@@ -216,6 +260,7 @@ __asm__( \
-     ".err \"Stub"#n" >= 1000 not yet supported.\""               "\n\t" \
-     ".endif" \
-     );
-+#endif
- 
- #else /* not G++ V3 ABI */
- 
diff --git a/time/sunbird/patches/patch-bx b/time/sunbird/patches/patch-bx
deleted file mode 100644
index c032f287ea7..00000000000
--- a/time/sunbird/patches/patch-bx
+++ /dev/null
@@ -1,84 +0,0 @@
-$NetBSD: patch-bx,v 1.1.1.1 2006/02/05 21:56:26 ghen Exp $
-
---- xpcom/reflect/xptcall/src/md/unix/xptcstubs_ppc_netbsd.cpp.orig	2006-02-02 16:57:57.000000000 +0100
-+++ xpcom/reflect/xptcall/src/md/unix/xptcstubs_ppc_netbsd.cpp
-@@ -119,8 +119,10 @@ PrepareAndDispatch(nsXPTCStubBase* self,
-                 if ((PRUint32) ap & 4) ap++; // doubles are 8-byte aligned on stack
-                 dp->val.d = *(double*) ap;
-                 ap += 2;
-+#if __GXX_ABI_VERSION < 100
- 		if (gpr < GPR_COUNT)
- 		    gpr += 2;
-+#endif
-             }
-             continue;
-         }
-@@ -130,8 +132,10 @@ PrepareAndDispatch(nsXPTCStubBase* self,
-             else {
-                 dp->val.f = *(float*) ap;
- 		ap += 1;
-+#if __GXX_ABI_VERSION < 100
- 		if (gpr < GPR_COUNT)
- 		    gpr += 1;
-+#endif
-             }
-             continue;
-         }
-@@ -195,7 +199,9 @@ PrepareAndDispatch(nsXPTCStubBase* self,
- // however, it's quick, dirty, and'll break when the ABI changes on
- // us, which is what we want ;-).
- 
--#define STUB_ENTRY(n)                                       \
-+#if __GXX_ABI_VERSION < 100
-+// gcc-2 version
-+# define STUB_ENTRY(n)                                       \
- __asm__ (                                                   \
-         ".section \".text\" \n\t"                           \
-         ".align 2 \n\t"                                     \
-@@ -206,6 +212,46 @@ __asm__ (                               
- 	"li     11,"#n" \n\t"                               \
- 	"b      SharedStub@local \n"                        \
- );
-+#else
-+// gcc-3 version
-+//
-+// As G++3 ABI contains the length of the functionname in the mangled
-+// name, it is difficult to get a generic assembler mechanism like
-+// in the G++ 2.95 case.
-+// Create names would be like:
-+// _ZN14nsXPTCStubBase5Stub1Ev
-+// _ZN14nsXPTCStubBase6Stub12Ev
-+// _ZN14nsXPTCStubBase7Stub123Ev
-+// _ZN14nsXPTCStubBase8Stub1234Ev
-+// etc.
-+// Use assembler directives to get the names right...
-+
-+# define STUB_ENTRY(n)							\
-+__asm__ (								\
-+	".align	2 \n\t"							\
-+	".if	"#n" < 10 \n\t"						\
-+	".globl	_ZN14nsXPTCStubBase5Stub"#n"Ev \n\t"			\
-+	".type	_ZN14nsXPTCStubBase5Stub"#n"Ev,@function \n\n"		\
-+"_ZN14nsXPTCStubBase5Stub"#n"Ev: \n\t"					\
-+									\
-+	".elseif "#n" < 100 \n\t"					\
-+	".globl	_ZN14nsXPTCStubBase6Stub"#n"Ev \n\t"			\
-+	".type	_ZN14nsXPTCStubBase6Stub"#n"Ev,@function \n\n"		\
-+"_ZN14nsXPTCStubBase6Stub"#n"Ev: \n\t"					\
-+									\
-+	".elseif "#n" < 1000 \n\t"					\
-+	".globl	_ZN14nsXPTCStubBase7Stub"#n"Ev \n\t"			\
-+	".type	_ZN14nsXPTCStubBase7Stub"#n"Ev,@function \n\n"		\
-+"_ZN14nsXPTCStubBase7Stub"#n"Ev: \n\t"					\
-+									\
-+	".else \n\t"							\
-+	".err	\"stub number "#n" >= 1000 not yet supported\"\n"	\
-+	".endif \n\t"							\
-+									\
-+	"li	11,"#n" \n\t"						\
-+	"b	SharedStub@local \n"					\
-+);
-+#endif
- 
- #define SENTINEL_ENTRY(n)                            \
- nsresult nsXPTCStubBase::Sentinel##n()               \
diff --git a/time/sunbird/patches/patch-bz b/time/sunbird/patches/patch-bz
deleted file mode 100644
index 14a8729d845..00000000000
--- a/time/sunbird/patches/patch-bz
+++ /dev/null
@@ -1,122 +0,0 @@
-$NetBSD: patch-bz,v 1.1.1.1 2006/02/05 21:56:27 ghen Exp $
-
---- xpcom/reflect/xptcall/src/md/unix/xptcstubs_asm_ppc_netbsd.s.orig	2006-02-02 16:57:57.000000000 +0100
-+++ xpcom/reflect/xptcall/src/md/unix/xptcstubs_asm_ppc_netbsd.s
-@@ -1,27 +1,27 @@
--# -*- Mode: Asm -*-
--#
--# The contents of this file are subject to the Netscape 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/NPL/
--#
--# 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 mozilla.org code.
--#
--# The Initial Developer of the Original Code is Netscape
--# Communications Corporation.  Portions created by Netscape are
--# Copyright (C) 1999 Netscape Communications Corporation. All
--# Rights Reserved.
--#
--# Contributor(s): 
--#   Franz.Sirl-kernel@lauterbach.com (Franz Sirl)
--#   beard@netscape.com (Patrick Beard)
--#   waterson@netscape.com (Chris Waterson)
--#
-+// -*- Mode: Asm -*-
-+//
-+// The contents of this file are subject to the Netscape 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/NPL/
-+//
-+// 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 mozilla.org code.
-+//
-+// The Initial Developer of the Original Code is Netscape
-+// Communications Corporation.  Portions created by Netscape are
-+// Copyright (C) 1999 Netscape Communications Corporation. All
-+// Rights Reserved.
-+//
-+// Contributor(s): 
-+//   Franz.Sirl-kernel@lauterbach.com (Franz Sirl)
-+//   beard@netscape.com (Patrick Beard)
-+//   waterson@netscape.com (Chris Waterson)
-+//
- 
- .set r0,0; .set sp,1; .set RTOC,2; .set r3,3; .set r4,4
- .set r5,5; .set r6,6; .set r7,7; .set r8,8; .set r9,9
-@@ -44,23 +44,23 @@
- 	.type  SharedStub,@function
- 
- SharedStub:
--        stwu	sp,-112(sp)			# room for 
--						# linkage (8),
--						# gprData (32),
--						# fprData (64), 
--						# stack alignment(8)
-+        stwu	sp,-112(sp)			// room for 
-+						// linkage (8),
-+						// gprData (32),
-+						// fprData (64), 
-+						// stack alignment(8)
-         mflr	r0
--	stw	r0,116(sp)			# save LR backchain
-+	stw	r0,116(sp)			// save LR backchain
- 
--	stw	r4,12(sp)			# save GP registers
--	stw	r5,16(sp)			# (n.b. that we don't save r3
--	stw	r6,20(sp)			# because PrepareAndDispatch() is savvy)
-+	stw	r4,12(sp)			// save GP registers
-+	stw	r5,16(sp)			// (n.b. that we don't save r3
-+	stw	r6,20(sp)			// because PrepareAndDispatch() is savvy)
- 	stw	r7,24(sp)
- 	stw	r8,28(sp)
- 	stw	r9,32(sp)
- 	stw	r10,36(sp)
- 
--	stfd	f1,40(sp)			# save FP registers
-+	stfd	f1,40(sp)			// save FP registers
- 	stfd	f2,48(sp)
- 	stfd	f3,56(sp)
- 	stfd	f4,64(sp)
-@@ -69,21 +69,20 @@ SharedStub:
- 	stfd	f7,88(sp)
- 	stfd	f8,96(sp)
- 
--						# r3 has the 'self' pointer already
-+						// r3 has the 'self' pointer already
- 	
--	mr      r4,r11				# r4 <= methodIndex selector, passed
--						# via r11 in the nsXPTCStubBase::StubXX() call
-+	mr      r4,r11				// r4 <= methodIndex selector, passed
-+						// via r11 in the nsXPTCStubBase::StubXX() call
- 	
--	addi	r5,sp,120			# r5 <= pointer to callers args area,
--						# beyond r3-r10/f1-f8 mapped range
-+	addi	r5,sp,120			// r5 <= pointer to callers args area,
-+						// beyond r3-r10/f1-f8 mapped range
- 	
--	addi	r6,sp,8				# r6 <= gprData
--	addi	r7,sp,40			# r7 <= fprData
-+	addi	r6,sp,8				// r6 <= gprData
-+	addi	r7,sp,40			// r7 <= fprData
-       
--	bl	PrepareAndDispatch@local	# Go!
-+	bl	PrepareAndDispatch@local	// Go!
-     
--	lwz	r0,116(sp)			# restore LR
-+	lwz	r0,116(sp)			// restore LR
- 	mtlr	r0
--	la	sp,112(sp)			# clean up the stack
-+	la	sp,112(sp)			// clean up the stack
- 	blr
--
diff --git a/time/sunbird/patches/patch-ca b/time/sunbird/patches/patch-ca
deleted file mode 100644
index 74b6ad29934..00000000000
--- a/time/sunbird/patches/patch-ca
+++ /dev/null
@@ -1,166 +0,0 @@
-$NetBSD: patch-ca,v 1.1.1.1 2006/02/05 21:56:27 ghen Exp $
-
---- xpcom/reflect/xptcall/src/md/unix/xptcinvoke_asm_ppc_netbsd.s.orig	2006-02-02 16:57:57.000000000 +0100
-+++ xpcom/reflect/xptcall/src/md/unix/xptcinvoke_asm_ppc_netbsd.s
-@@ -1,27 +1,28 @@
--# -*- Mode: Asm -*-
--#
--# The contents of this file are subject to the Netscape 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/NPL/
--#
--# 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 mozilla.org code.
--#
--# The Initial Developer of the Original Code is Netscape
--# Communications Corporation.  Portions created by Netscape are
--# Copyright (C) 1999 Netscape Communications Corporation. All
--# Rights Reserved.
--#
--# Contributor(s):
--#   Franz.Sirl-kernel@lauterbach.com (Franz Sirl)
--#   beard@netscape.com (Patrick Beard)
--#   waterson@netscape.com (Chris Waterson)
--#
-+// -*- Mode: Asm -*-
-+//
-+// The contents of this file are subject to the Netscape 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/NPL/
-+//
-+// 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 mozilla.org code.
-+//
-+// The Initial Developer of the Original Code is Netscape
-+// Communications Corporation.  Portions created by Netscape are
-+// Copyright (C) 1999 Netscape Communications Corporation. All
-+// Rights Reserved.
-+//
-+// Contributor(s):
-+//   Franz.Sirl-kernel@lauterbach.com (Franz Sirl)
-+//   beard@netscape.com (Patrick Beard)
-+//   waterson@netscape.com (Chris Waterson)
-+//
-+
- .set r0,0; .set sp,1; .set RTOC,2; .set r3,3; .set r4,4
- .set r5,5; .set r6,6; .set r7,7; .set r8,8; .set r9,9
- .set r10,10; .set r11,11; .set r12,12; .set r13,13; .set r14,14
-@@ -42,38 +43,38 @@
- 	.globl XPTC_InvokeByIndex
- 	.type  XPTC_InvokeByIndex,@function
- 
--#
--# XPTC_InvokeByIndex(nsISupports* that, PRUint32 methodIndex,
--#                    PRUint32 paramCount, nsXPTCVariant* params)
--#
-+//
-+// XPTC_InvokeByIndex(nsISupports* that, PRUint32 methodIndex,
-+//                    PRUint32 paramCount, nsXPTCVariant* params)
-+//
- 
- XPTC_InvokeByIndex:
--	stwu    sp,-32(sp)			# setup standard stack frame
--	mflr    r0				# save LR
--	stw     r3,8(sp)			# r3 <= that
--	stw     r4,12(sp)			# r4 <= methodIndex
-+	stwu    sp,-32(sp)			// setup standard stack frame
-+	mflr    r0				// save LR
-+	stw     r3,8(sp)			// r3 <= that
-+	stw     r4,12(sp)			// r4 <= methodIndex
- 	stw     r30,16(sp)
- 	stw     r31,20(sp)
- 
--	stw     r0,36(sp)			# store LR backchain
-+	stw     r0,36(sp)			// store LR backchain
- 	mr      r31,sp
- 
--	rlwinm  r10,r5,3,0,27			# r10 = (ParamCount * 2 * 4) & ~0x0f
--	addi    r0,r10,96			# reserve stack for GPR and FPR register save area r0 = r10 + 96
--	lwz     r9,0(sp)			# r9 = backchain
-+	rlwinm  r10,r5,3,0,27			// r10 = (ParamCount * 2 * 4) & ~0x0f
-+	addi    r0,r10,96			// reserve stack for GPR and FPR register save area r0 = r10 + 96
-+	lwz     r9,0(sp)			// r9 = backchain
- 	neg     r0,r0
--	stwux   r9,sp,r0			# reserve stack sapce and save SP backchain
--	
--	addi    r3,sp,8				# r3 <= args
--	mr      r4,r5				# r4 <= paramCount
--	mr      r5,r6				# r5 <= params
--	add     r6,r3,r10			# r6 <= gpregs ( == args + r10 )
--	mr      r30,r6				# store in r30 for use later...
--	addi    r7,r6,32			# r7 <= fpregs ( == gpregs + 32 )
-+	stwux   r9,sp,r0			// reserve stack space and save SP backchain
-+
-+	addi    r3,sp,8				// r3 <= args
-+	mr      r4,r5				// r4 <= paramCount
-+	mr      r5,r6				// r5 <= params
-+	add     r6,r3,r10			// r6 <= gpregs ( == args + r10 )
-+	mr      r30,r6				// store in r30 for use later...
-+	addi    r7,r6,32			// r7 <= fpregs ( == gpregs + 32 )
- 
--	bl      invoke_copy_to_stack@local	# (args, paramCount, params, gpregs, fpregs)
-+	bl      invoke_copy_to_stack@local	// (args, paramCount, params, gpregs, fpregs)
- 
--	lfd     f1,32(r30)			# load FP registers with method parameters
-+	lfd     f1,32(r30)			// load FP registers with method parameters
- 	lfd     f2,40(r30)   
- 	lfd     f3,48(r30)  
- 	lfd     f4,56(r30)  
-@@ -82,18 +83,18 @@ XPTC_InvokeByIndex:
- 	lfd     f7,80(r30)  
- 	lfd     f8,88(r30)
- 
--	lwz     r3,8(r31)			# r3 <= that
--	lwz     r4,12(r31)			# r4 <= methodIndex
--	lwz     r5,0(r3)			# r5 <= vtable ( == *that )
--	slwi    r4,r4,3				# convert to offset ( *= 8 )
--	addi	r4,r4,8				# skip first two vtable entries
--	add	r4,r4,r5
--	lhz	r0,0(r4)			# virtual base offset
--	extsh	r0,r0
--	add	r3,r3,r0
--	lwz     r0,4(r4)			# r0 <= methodpointer ( == vtable + offset )
-+	lwz     r3,8(r31)			// r3 <= that
-+	lwz     r4,12(r31)			// r4 <= methodIndex
-+	lwz     r5,0(r3)			// r5 <= vtable ( == *that )
-+#if !((__GNUC__ == 3 && __GNUC_MINOR__ < 2) || __GXX_ABI_VERSION  >= 100) // G++ pre-V3 ABI is like that of AIX under NetBSD
-+	slwi    r4,r4,3				// convert to offset ( *= 8 )
-+	addi	r4,r4,8				// skip garbage before vtable
-+#else
-+	slwi    r4,r4,2				// convert to offset ( *= 4 )
-+#endif
-+	lwzx    r0,r5,r4			// r0 <= methodpointer ( == vtable + offset )
- 
--        lwz     r4,4(r30)			# load GP regs with method parameters
-+        lwz     r4,4(r30)			// load GP regs with method parameters
- 	lwz     r5,8(r30)   
- 	lwz     r6,12(r30)  
- 	lwz     r7,16(r30)  
-@@ -101,13 +102,13 @@ XPTC_InvokeByIndex:
- 	lwz     r9,24(r30)  
- 	lwz     r10,28(r30)
- 
--	mtlr    r0				# copy methodpointer to LR    
--	blrl					# call method
-+	mtlr    r0				// copy methodpointer to LR    
-+	blrl					// call method
- 	
--	lwz     r30,16(r31)			# restore r30 & r31
-+	lwz     r30,16(r31)			// restore r30 & r31
- 	lwz     r31,20(r31)
- 	
--	lwz     r11,0(sp)			# clean up the stack
-+	lwz     r11,0(sp)			// clean up the stack
- 	lwz     r0,4(r11)
- 	mtlr    r0
- 	mr      sp,r11
diff --git a/time/sunbird/patches/patch-cb b/time/sunbird/patches/patch-cb
deleted file mode 100644
index 702326176ac..00000000000
--- a/time/sunbird/patches/patch-cb
+++ /dev/null
@@ -1,26 +0,0 @@
-$NetBSD: patch-cb,v 1.1.1.1 2006/02/05 21:56:27 ghen Exp $
-
---- xpcom/reflect/xptcall/src/md/unix/xptcinvoke_ppc_netbsd.cpp.orig	2006-02-02 16:57:57.000000000 +0100
-+++ xpcom/reflect/xptcall/src/md/unix/xptcinvoke_ppc_netbsd.cpp
-@@ -104,8 +104,10 @@ invoke_copy_to_stack(PRUint32* d,
-                 if ((PRUint32) d & 4) d++; // doubles are 8-byte aligned on stack
-                 *((double*) d) = s->val.d;
-                 d += 2;
-+#if __GXX_ABI_VERSION < 100
- 		if (gpr < GPR_COUNT)
- 		    gpr += 2;
-+#endif
-             }
-         }
-         else if (!s->IsPtrData() && s->type == nsXPTType::T_FLOAT) {
-@@ -114,8 +116,10 @@ invoke_copy_to_stack(PRUint32* d,
-             else {
-                 *((float*) d) = s->val.f;
- 		d += 1;
-+#if __GXX_ABI_VERSION < 100
- 		if (gpr < GPR_COUNT)
- 		    gpr += 1;
-+#endif
- 	    }
-         }
-         else if (!s->IsPtrData() && (s->type == nsXPTType::T_I64
diff --git a/time/sunbird/patches/patch-da b/time/sunbird/patches/patch-da
deleted file mode 100644
index 33f6499a156..00000000000
--- a/time/sunbird/patches/patch-da
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-da,v 1.1 2006/06/27 11:11:52 joerg Exp $
-
---- calendar/libical/src/libical/Makefile.in.orig	2006-06-26 13:32:40.000000000 +0000
-+++ calendar/libical/src/libical/Makefile.in
-@@ -85,7 +85,7 @@ endif
- 
- DEFINES += -DHAVE_CONFIG_H
- 
--ifneq (,$(filter BeOS Darwin OpenVMS NetBSD FreeBSD,$(OS_ARCH)))
-+ifneq (,$(filter BeOS Darwin OpenVMS NetBSD FreeBSD DragonFly,$(OS_ARCH)))
- DEFINES	+= -D__USE_BSD=1
- endif
- 
diff --git a/time/sunbird/patches/patch-db b/time/sunbird/patches/patch-db
deleted file mode 100644
index 5cd10586282..00000000000
--- a/time/sunbird/patches/patch-db
+++ /dev/null
@@ -1,26 +0,0 @@
-$NetBSD: patch-db,v 1.1 2006/06/27 11:11:52 joerg Exp $
-
---- config/rules.mk.orig	2006-06-26 13:35:05.000000000 +0000
-+++ config/rules.mk
-@@ -464,6 +464,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)
-@@ -961,7 +967,7 @@ ifneq (,$(BUILD_STATIC_LIBS)$(FORCE_STAT
- LOBJS	+= $(SHARED_LIBRARY_LIBS)
- endif
- else
--ifneq (,$(filter OSF1 BSD_OS FreeBSD NetBSD OpenBSD SunOS Darwin,$(OS_ARCH)))
-+ifneq (,$(filter OSF1 BSD_OS FreeBSD NetBSD OpenBSD SunOS Darwin DragonFly,$(OS_ARCH)))
- CLEANUP1	:= | egrep -v '(________64ELEL_|__.SYMDEF)'
- CLEANUP2	:= rm -f ________64ELEL_ __.SYMDEF
- else
diff --git a/time/sunbird/patches/patch-dc b/time/sunbird/patches/patch-dc
deleted file mode 100644
index 0811612f295..00000000000
--- a/time/sunbird/patches/patch-dc
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-dc,v 1.1 2006/06/27 11:11:52 joerg Exp $
-
---- config/config.mk.orig	2006-06-26 13:35:47.000000000 +0000
-+++ config/config.mk
-@@ -120,7 +120,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 FreeBSD HP-UX IRIX Linux NetBSD OpenBSD OSF1 SunOS DragonFly,$(OS_ARCH)))
- OS_RELEASE	:= $(basename $(OS_RELEASE))
- 
- # Allow the user to ignore the OS_VERSION, which is usually irrelevant.
diff --git a/time/sunbird/patches/patch-de b/time/sunbird/patches/patch-de
deleted file mode 100644
index d99fbcd3072..00000000000
--- a/time/sunbird/patches/patch-de
+++ /dev/null
@@ -1,85 +0,0 @@
-$NetBSD: patch-de,v 1.1 2006/06/27 11:11:52 joerg Exp $
-
---- /dev/null	2006-06-26 13:41:46.000000000 +0000
-+++ directory/c-sdk/config/DragonFly.mk
-@@ -0,0 +1,80 @@
-+# 
-+# ***** BEGIN LICENSE BLOCK *****
-+# Version: MPL 1.1/GPL 2.0/LGPL 2.1
-+# 
-+# 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 the Initial Developer are Copyright (C) 1998-2000
-+# the Initial Developer. All Rights Reserved.
-+# 
-+# Contributor(s):
-+# 
-+# Alternatively, the contents of this file may be used under the terms of
-+# either of the GNU General Public License Version 2 or later (the "GPL"),
-+# or the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
-+# in which case the provisions of the GPL or the LGPL are applicable instead
-+# of those above. If you wish to allow use of your version of this file only
-+# under the terms of either the GPL or the LGPL, and not to allow others to
-+# use your version of this file under the terms of the MPL, indicate your
-+# decision by deleting the provisions above and replace them with the notice
-+# and other provisions required by the GPL or the LGPL. If you do not delete
-+# the provisions above, a recipient may use your version of this file under
-+# the terms of any one of the MPL, the GPL or the LGPL.
-+# 
-+# ***** END LICENSE BLOCK ***** 
-+
-+#
-+# Config stuff for DragonFly
-+#
-+
-+include $(MOD_DEPTH)/config/UNIX.mk
-+
-+CC			= gcc
-+CCC			= g++
-+RANLIB			= ranlib
-+
-+ifeq ($(OS_TEST),alpha)
-+CPU_ARCH		= alpha
-+else
-+OS_REL_CFLAGS		= -Di386
-+CPU_ARCH		= x86
-+endif
-+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			= dragonfly
-+
-+MOZ_OBJFORMAT          := elf
-+
-+DLL_SUFFIX		= so
-+
-+DSO_CFLAGS		= -fPIC
-+DSO_LDOPTS		= -Bshareable
-+
-+MKSHLIB			= $(LD) $(DSO_LDOPTS)
diff --git a/time/sunbird/patches/patch-df b/time/sunbird/patches/patch-df
deleted file mode 100644
index cb476fc33d6..00000000000
--- a/time/sunbird/patches/patch-df
+++ /dev/null
@@ -1,49 +0,0 @@
-$NetBSD: patch-df,v 1.2 2009/05/29 13:22:11 he Exp $
-
---- directory/c-sdk/ldap/include/portable.h.orig	2006-02-03 15:44:40.000000000 +0100
-+++ directory/c-sdk/ldap/include/portable.h
-@@ -131,7 +131,7 @@
-  * some systems don't have the BSD re_comp and re_exec routines
-  */
- #ifndef NEED_BSDREGEX
--#if ( defined( SYSV ) || defined( NETBSD ) || defined( freebsd ) || defined( linux ) || defined( DARWIN )) && !defined(sgi)
-+#if ( defined( SYSV ) || defined( NETBSD ) || defined( freebsd ) || defined( linux ) || defined( DARWIN )) && !defined(sgi) || defined(dragonfly)
- #define NEED_BSDREGEX
- #endif
- #endif
-@@ -150,7 +150,7 @@
-  * Are sys_errlist and sys_nerr declared in stdio.h?
-  */
- #ifndef SYSERRLIST_IN_STDIO
--#if defined( freebsd ) 
-+#if defined( freebsd ) || defined(dragonfly)
- #define SYSERRLIST_IN_STDIO
- #endif
- #endif
-@@ -202,7 +202,7 @@
-  */
- #if !defined(LDAP_CONNECT_MUST_NOT_BE_INTERRUPTED) && \
- 	( defined(AIX) || defined(IRIX) || defined(HPUX) || defined(SUNOS4) \
--	|| defined(SOLARIS) || defined(OSF1) ||defined(freebsd)) 
-+	|| defined(SOLARIS) || defined(OSF1) ||defined(freebsd) || defined(dragonfly)) 
- #define LDAP_CONNECT_MUST_NOT_BE_INTERRUPTED
- #endif
- 
-@@ -293,7 +293,7 @@ int strncasecmp(const char *, const char
-     ( defined(HPUX10) && !defined(_REENTRANT)) || defined(HPUX11) || \
-     defined(UnixWare) || defined(LINUX) || defined(NETBSD) || \
-     defined(FREEBSD) || defined(OPENBSD) || \
--    (defined(AIX) && !defined(USE_REENTRANT_LIBC))
-+    (defined(AIX) && !defined(USE_REENTRANT_LIBC) || defined(dragonfly))
- #define GETHOSTBYNAME( n, r, b, l, e )  gethostbyname( n )
- #elif defined(AIX)
- /* Maybe this is for another version of AIX?
-@@ -326,7 +326,7 @@ typedef char GETHOSTBYNAME_buf_t [BUFSIZ
- 	|| defined(OSF1V4) || defined(AIX) || defined(UnixWare) \
-         || defined(hpux) || defined(HPUX11) || defined(NETBSD) \
-         || defined(IRIX6) || defined(FREEBSD) || defined(VMS) \
--        || defined(NTO) || defined(OPENBSD)
-+        || defined(NTO) || defined(OPENBSD) || defined(DRAGONFLY)
- #define NSLDAPI_CTIME( c, b, l )        ctime_r( c, b )
- #elif defined( OSF1V3 )
- #define NSLDAPI_CTIME( c, b, l )	(ctime_r( c, b, l ) ? NULL : b)
diff --git a/time/sunbird/patches/patch-dg b/time/sunbird/patches/patch-dg
deleted file mode 100644
index c951f8c0824..00000000000
--- a/time/sunbird/patches/patch-dg
+++ /dev/null
@@ -1,14 +0,0 @@
-$NetBSD: patch-dg,v 1.1 2006/06/27 11:11:52 joerg Exp $
-
---- directory/c-sdk/ldap/libraries/liblber/lber-int.h.orig	2006-06-26 13:43:49.000000000 +0000
-+++ directory/c-sdk/ldap/libraries/liblber/lber-int.h
-@@ -63,9 +63,6 @@ extern "C" {
- #ifdef macintosh
- # include "ldap-macos.h"
- #else /* macintosh */
--#if !defined(BSDI) && !defined(DARWIN) && !defined(FREEBSD)
--# include <malloc.h>
--#endif
- # include <errno.h>
- # include <sys/types.h>
- #if defined(SUNOS4) || defined(SCOOS)
diff --git a/time/sunbird/patches/patch-dh b/time/sunbird/patches/patch-dh
deleted file mode 100644
index 9f7dfa8ee9f..00000000000
--- a/time/sunbird/patches/patch-dh
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-dh,v 1.1 2006/06/27 11:11:52 joerg Exp $
-
---- directory/c-sdk/ldap/libraries/libprldap/ldappr-error.c.orig	2006-06-26 13:46:03.000000000 +0000
-+++ directory/c-sdk/ldap/libraries/libprldap/ldappr-error.c
-@@ -233,7 +233,7 @@ struct prldap_errormap_entry {
- 
- #if defined(__hpux) || defined(_AIX) || defined(OSF1) || defined(DARWIN) || \
-   defined(BEOS) || defined(FREEBSD) || defined(BSDI) || defined(VMS) || \
--  defined(OPENBSD) || defined(NETBSD)
-+  defined(OPENBSD) || defined(NETBSD) || defined(DRAGONFLY)
- #define EDEADLOCK       -1
- #endif
- 
diff --git a/time/sunbird/patches/patch-di b/time/sunbird/patches/patch-di
deleted file mode 100644
index c6cc0ef2c05..00000000000
--- a/time/sunbird/patches/patch-di
+++ /dev/null
@@ -1,14 +0,0 @@
-$NetBSD: patch-di,v 1.1 2006/06/27 11:11:52 joerg Exp $
-
---- xpcom/reflect/xptcall/src/md/unix/xptc_platforms_unixish_x86.h.orig	2006-06-26 15:25:37.000000000 +0000
-+++ xpcom/reflect/xptcall/src/md/unix/xptc_platforms_unixish_x86.h
-@@ -103,6 +103,9 @@
- #define THUNK_BASED_THIS_ADJUST
- #endif
- 
-+#elif defined(__DragonFly__) 
-+#define THUNK_BASED_THIS_ADJUST
-+
- #elif defined(__NetBSD__) 
- #define THUNK_BASED_THIS_ADJUST
- 
diff --git a/time/sunbird/patches/patch-dn b/time/sunbird/patches/patch-dn
deleted file mode 100644
index 04347687c89..00000000000
--- a/time/sunbird/patches/patch-dn
+++ /dev/null
@@ -1,72 +0,0 @@
-$NetBSD: patch-dn,v 1.1 2006/06/27 11:11:52 joerg Exp $
-
---- /dev/null	2006-06-26 14:04:45.000000000 +0000
-+++ ef/config/DragonFly.mk
-@@ -0,0 +1,67 @@
-+#
-+# The contents of this file are subject to the Netscape 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/NPL/
-+#
-+# 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 mozilla.org code.
-+#
-+# The Initial Developer of the Original Code is Netscape
-+# Communications Corporation.  Portions created by Netscape are
-+# Copyright (C) 1998 Netscape Communications Corporation. All
-+# Rights Reserved.
-+#
-+# Contributor(s): 
-+
-+#
-+# Config stuff for DragonFly
-+#
-+
-+include $(DEPTH)/config/UNIX.mk
-+
-+ifeq (86,$(findstring 86,$(OS_TEST)))
-+CPU_ARCH		:= x86
-+else
-+CPU_ARCH		:= $(OS_TEST)
-+endif
-+
-+IMPL_STRATEGY		= _EMU
-+DEFAULT_COMPILER		= gcc
-+CC				= gcc
-+CXX				= g++
-+AS				= gcc -c
-+RANLIB			= ranlib
-+MKSHLIB			= $(CC) $(DSO_LDOPTS)
-+MKMODULE		= ld -Ur -o $@
-+
-+WARNING_CFLAG	= -Wall
-+
-+# used by mkdepend
-+X11INCLUDES		=   -I/usr/X11R6/include
-+SYS_INCLUDES		=   -I$(subst libgcc.a,include, \
-+                                      $(shell $(CC) -print-libgcc-file-name))
-+SYS_INCLUDES		+=  -I$(subst libgcc.a,include, \
-+                                      $(shell $(CCC) -print-libgcc-file-name))
-+
-+ifeq ($(CPU_ARCH),x86)
-+DEPENDFLAGS		+= -D__i386__
-+endif
-+
-+OS_REL_CFLAGS           = -mno-486 -Di386
-+
-+OS_CFLAGS		= $(DSO_CFLAGS) $(OS_REL_CFLAGS) -DFREEBSD -ansi -Wall -pipe -DHAVE_STRERROR -DHAVE_BSD_FLOCK
-+OS_CXXFLAGS		= $(OS_CFLAGS)
-+OS_ASFLAGS		= -DDRAGONFLY
-+OS_LDFLAGS		=
-+OS_LIBS			= -lm
-+
-+DSO_CFLAGS		= -fPIC
-+DSO_LDFLAGS		= -Wl,export-dynamic
-+DSO_LDOPTS		= -shared -Xlinker -E
-+
-+PERL			= perl
diff --git a/time/sunbird/patches/patch-do b/time/sunbird/patches/patch-do
deleted file mode 100644
index 332079a91cc..00000000000
--- a/time/sunbird/patches/patch-do
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-do,v 1.1 2006/06/27 11:11:52 joerg Exp $
-
---- embedding/browser/qt/src/config/qtconfig.mk.orig	2006-06-26 14:06:26.000000000 +0000
-+++ embedding/browser/qt/src/config/qtconfig.mk
-@@ -4,7 +4,7 @@
- FULLDIST = `(cd $(DIST); pwd)`
- DIST_QTDESIGNERPLUGINS = $(FULLDIST)/lib/designer
- 
--ifneq (,$(filter Linux FreeBSD SunOS,$(OS_ARCH)))
-+ifneq (,$(filter Linux DragonFly FreeBSD SunOS,$(OS_ARCH)))
- UIC = $(QTDIR)/bin/uic -L $(DIST_QTDESIGNERPLUGINS)
- endif
- ifeq ($(OS_ARCH), WINNT)
diff --git a/time/sunbird/patches/patch-dr b/time/sunbird/patches/patch-dr
deleted file mode 100644
index ca7d0c130d7..00000000000
--- a/time/sunbird/patches/patch-dr
+++ /dev/null
@@ -1,40 +0,0 @@
-$NetBSD: patch-dr,v 1.1 2006/06/27 11:11:52 joerg Exp $
-
---- nsprpub/pr/include/md/_freebsd.h.orig	2006-06-26 14:27:03.000000000 +0000
-+++ nsprpub/pr/include/md/_freebsd.h
-@@ -40,7 +40,7 @@
- 
- #include "prthread.h"
- 
--#if __FreeBSD__ >= 2
-+#if defined(__FreeBSD__) && __FreeBSD__ >= 2
- #include <osreldate.h>  /* for __FreeBSD_version */
- #endif
- #include <sys/syscall.h>
-@@ -79,7 +79,7 @@
- #define _PR_NO_LARGE_FILES
- 
- #if defined(_PR_PTHREADS)
--#if __FreeBSD_version >= 400008
-+#if defined(__DragonFly__) || defined(__FreeBSD__) &&__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/time/sunbird/patches/patch-ds b/time/sunbird/patches/patch-ds
deleted file mode 100644
index 347bd199d6c..00000000000
--- a/time/sunbird/patches/patch-ds
+++ /dev/null
@@ -1,49 +0,0 @@
-$NetBSD: patch-ds,v 1.2 2009/05/29 13:22:11 he Exp $
-
---- nsprpub/pr/include/md/_pth.h.orig	2007-10-31 18:36:57.000000000 +0100
-+++ nsprpub/pr/include/md/_pth.h
-@@ -93,7 +93,7 @@
- #define _PT_PTHREAD_MUTEXATTR_INIT        pthread_mutexattr_init
- #define _PT_PTHREAD_MUTEXATTR_DESTROY     pthread_mutexattr_destroy
- #define _PT_PTHREAD_MUTEX_INIT(m, a)      pthread_mutex_init(&(m), &(a))
--#if defined(FREEBSD)
-+#if defined(FREEBSD) || defined(DRAGONFLY)
- #define _PT_PTHREAD_MUTEX_IS_LOCKED(m)    pt_pthread_mutex_is_locked(&(m))
- #else
- #define _PT_PTHREAD_MUTEX_IS_LOCKED(m)    (EBUSY == pthread_mutex_trylock(&(m)))
-@@ -145,7 +145,7 @@
- #elif defined(IRIX) || defined(OSF1) || defined(AIX) || defined(SOLARIS) \
- 	|| defined(HPUX) || defined(LINUX) || defined(FREEBSD) \
- 	|| defined(NETBSD) || defined(OPENBSD) || defined(BSDI) \
--	|| defined(VMS) || defined(NTO) || defined(DARWIN) \
-+	|| defined(VMS) || defined(NTO) || defined(DARWIN) || defined(DRAGONFLY)\
- 	|| defined(UNIXWARE) || defined(RISCOS)
- #define _PT_PTHREAD_INVALIDATE_THR_HANDLE(t)  (t) = 0
- #define _PT_PTHREAD_THR_HANDLE_IS_INVALID(t)  (t) == 0
-@@ -198,7 +198,7 @@
- #if (defined(AIX) && !defined(AIX4_3_PLUS)) || defined(LINUX) \
- 	|| defined(FREEBSD) || defined(NETBSD) || defined(OPENBSD) \
- 	|| defined(BSDI) || defined(VMS) || defined(UNIXWARE) \
--	|| defined(DARWIN)
-+	|| defined(DARWIN) || defined(DRAGONFLY)
- #define PT_NO_SIGTIMEDWAIT
- #endif
- 
-@@ -228,7 +228,7 @@
- #define PT_PRIO_MAX            sched_get_priority_max(SCHED_OTHER)
- #endif /* defined(_PR_DCETHREADS) */
- 
--#elif defined(LINUX) || defined(FREEBSD)
-+#elif defined(LINUX) || defined(FREEBSD) || defined(DRAGONFLY)
- #define PT_PRIO_MIN            sched_get_priority_min(SCHED_OTHER)
- #define PT_PRIO_MAX            sched_get_priority_max(SCHED_OTHER)
- #elif defined(NTO)
-@@ -287,7 +287,7 @@ extern int (*_PT_aix_yield_fcn)();
- #elif defined(HPUX) || defined(LINUX) || defined(SOLARIS) \
- 	|| defined(FREEBSD) || defined(NETBSD) || defined(OPENBSD) \
- 	|| defined(BSDI) || defined(NTO) || defined(DARWIN) \
--	|| defined(UNIXWARE) || defined(RISCOS)
-+	|| defined(UNIXWARE) || defined(RISCOS) || defined(DRAGONFLY)
- #define _PT_PTHREAD_YIELD()            	sched_yield()
- #else
- #error "Need to define _PT_PTHREAD_YIELD for this platform"
diff --git a/time/sunbird/patches/patch-dt b/time/sunbird/patches/patch-dt
deleted file mode 100644
index a84c08f9f84..00000000000
--- a/time/sunbird/patches/patch-dt
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-dt,v 1.1 2006/06/27 11:11:52 joerg Exp $
-
---- nsprpub/pr/include/md/prosdep.h.orig	2006-06-26 14:36:19.000000000 +0000
-+++ nsprpub/pr/include/md/prosdep.h
-@@ -72,7 +72,7 @@ PR_BEGIN_EXTERN_C
- #if defined(AIX)
- #include "md/_aix.h"
- 
--#elif defined(FREEBSD)
-+#elif defined(FREEBSD) || defined(DRAGONFLY)
- #include "md/_freebsd.h"
- 
- #elif defined(NETBSD)
diff --git a/time/sunbird/patches/patch-du b/time/sunbird/patches/patch-du
deleted file mode 100644
index 54f14c127ba..00000000000
--- a/time/sunbird/patches/patch-du
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-du,v 1.2 2009/05/29 13:22:11 he Exp $
-
---- nsprpub/pr/src/linking/prlink.c.orig	2006-10-07 01:36:22.000000000 +0200
-+++ nsprpub/pr/src/linking/prlink.c
-@@ -1606,7 +1606,7 @@ PR_LoadStaticLibrary(const char *name, c
- PR_IMPLEMENT(char *)
- PR_GetLibraryFilePathname(const char *name, PRFuncPtr addr)
- {
--#if defined(SOLARIS) || defined(LINUX) || defined(FREEBSD)
-+#if defined(SOLARIS) || defined(LINUX) || defined(FREEBSD) || defined(DRAGONFLY)
-     Dl_info dli;
-     char *result;
- 
diff --git a/time/sunbird/patches/patch-dv b/time/sunbird/patches/patch-dv
deleted file mode 100644
index d1b94491f89..00000000000
--- a/time/sunbird/patches/patch-dv
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-dv,v 1.2 2009/05/29 13:22:11 he Exp $
-
---- nsprpub/pr/src/md/prosdep.c.orig	2004-04-25 17:00:58.000000000 +0200
-+++ nsprpub/pr/src/md/prosdep.c
-@@ -65,7 +65,7 @@ static void GetPageSize(void)
- #ifdef XP_UNIX
- #if defined SUNOS4 || defined LINUX || defined BSDI || defined AIX \
-         || defined FREEBSD || defined NETBSD || defined OPENBSD \
--        || defined DARWIN || defined NEXTSTEP
-+        || defined DARWIN || defined NEXTSTEP || defined DRAGONFLY
-     _pr_pageSize = getpagesize();
- #elif defined(HPUX)
-     /* I have no idea. Don't get me started. --Rob */
diff --git a/time/sunbird/patches/patch-dw b/time/sunbird/patches/patch-dw
deleted file mode 100644
index 999afe0bf56..00000000000
--- a/time/sunbird/patches/patch-dw
+++ /dev/null
@@ -1,14 +0,0 @@
-$NetBSD: patch-dw,v 1.1 2006/06/27 11:11:52 joerg Exp $
-
---- nsprpub/pr/src/md/unix/unix.c.orig	2006-06-26 14:37:27.000000000 +0000
-+++ nsprpub/pr/src/md/unix/unix.c
-@@ -78,7 +78,8 @@
- #define _PRSockLen_t int
- #elif (defined(AIX) && !defined(AIX4_1)) || defined(FREEBSD) \
-     || defined(NETBSD) || defined(OPENBSD) || defined(UNIXWARE) \
--    || defined(DGUX) || defined(VMS) || defined(NTO) || defined(RISCOS)
-+    || defined(DGUX) || defined(VMS) || defined(NTO) || defined(RISCOS) \
-+    || defined(DRAGONFLY)
- #define _PRSockLen_t size_t
- #else
- #error "Cannot determine architecture"
diff --git a/time/sunbird/patches/patch-dx b/time/sunbird/patches/patch-dx
deleted file mode 100644
index 4746eb85ac7..00000000000
--- a/time/sunbird/patches/patch-dx
+++ /dev/null
@@ -1,14 +0,0 @@
-$NetBSD: patch-dx,v 1.2 2009/05/29 13:22:11 he Exp $
-
---- nsprpub/pr/src/md/unix/uxrng.c.orig	2005-07-02 00:26:36.000000000 +0200
-+++ nsprpub/pr/src/md/unix/uxrng.c
-@@ -138,7 +138,8 @@ GetHighResClock(void *buf, size_t maxbyt
-     return 0;
- }
- 
--#elif (defined(LINUX) || defined(FREEBSD) || defined(NETBSD) || defined(OPENBSD))
-+#elif (defined(LINUX) || defined(FREEBSD) || defined(NETBSD) || \
-+	defined(OPENBSD) || defined(DRAGONFLY))
- #include <sys/types.h>
- #include <sys/stat.h>
- #include <fcntl.h>
diff --git a/time/sunbird/patches/patch-dy b/time/sunbird/patches/patch-dy
deleted file mode 100644
index 83ca8465737..00000000000
--- a/time/sunbird/patches/patch-dy
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-dy,v 1.1 2006/06/27 11:11:52 joerg Exp $
-
---- nsprpub/pr/src/md/unix/uxwrap.c.orig	2006-06-26 14:38:09.000000000 +0000
-+++ nsprpub/pr/src/md/unix/uxwrap.c
-@@ -346,7 +346,7 @@ int poll(struct pollfd filedes[], int nf
- int poll(struct pollfd *filedes, nfds_t nfds, int timeout)
- #elif defined(OPENBSD)
- int poll(struct pollfd filedes[], nfds_t nfds, int timeout)
--#elif defined(FREEBSD)
-+#elif defined(FREEBSD) || defined(DRAGONLFY)
- int poll(struct pollfd *filedes, unsigned nfds, int timeout)
- #else
- int poll(struct pollfd *filedes, unsigned long nfds, int timeout)
diff --git a/time/sunbird/patches/patch-dz b/time/sunbird/patches/patch-dz
deleted file mode 100644
index 0bb70ee83f9..00000000000
--- a/time/sunbird/patches/patch-dz
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-dz,v 1.1 2006/06/27 11:11:52 joerg Exp $
-
---- nsprpub/pr/src/misc/prsystem.c.orig	2006-06-26 14:38:54.000000000 +0000
-+++ nsprpub/pr/src/misc/prsystem.c
-@@ -56,7 +56,7 @@
- 
- /* BSD-derived systems use sysctl() to get the number of processors */
- #if defined(BSDI) || defined(FREEBSD) || defined(NETBSD) \
--    || defined(OPENBSD) || defined(DARWIN)
-+    || defined(OPENBSD) || defined(DARWIN) || defined(DRAGONFLY)
- #define _PR_HAVE_SYSCTL
- #include <sys/param.h>
- #include <sys/sysctl.h>
diff --git a/time/sunbird/patches/patch-ea b/time/sunbird/patches/patch-ea
deleted file mode 100644
index 9a755e13542..00000000000
--- a/time/sunbird/patches/patch-ea
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-ea,v 1.1 2006/06/27 11:11:52 joerg Exp $
-
---- nsprpub/pr/src/misc/prtime.c.orig	2006-06-26 14:39:12.000000000 +0000
-+++ nsprpub/pr/src/misc/prtime.c
-@@ -1656,7 +1656,7 @@ PR_FormatTime(char *buf, int buflen, con
- 
- #if defined(SUNOS4) || (__GLIBC__ >= 2) || defined(XP_BEOS) \
-         || defined(NETBSD) || defined(OPENBSD) || defined(FREEBSD) \
--        || defined(DARWIN)
-+        || defined(DARWIN) || defined(DRAGONFLY)
-     a.tm_zone = NULL;
-     a.tm_gmtoff = tm->tm_params.tp_gmt_offset + tm->tm_params.tp_dst_offset;
- #endif
diff --git a/time/sunbird/patches/patch-eb b/time/sunbird/patches/patch-eb
deleted file mode 100644
index 226b35f5a29..00000000000
--- a/time/sunbird/patches/patch-eb
+++ /dev/null
@@ -1,22 +0,0 @@
-$NetBSD: patch-eb,v 1.2 2009/05/29 13:22:11 he Exp $
-
---- nsprpub/pr/src/pthreads/ptio.c.orig	2007-08-29 03:29:59.000000000 +0200
-+++ nsprpub/pr/src/pthreads/ptio.c
-@@ -208,7 +208,7 @@ static PRBool _pr_ipv6_v6only_on_by_defa
-     || defined(HPUX10_30) || defined(HPUX11) || defined(LINUX) \
-     || defined(FREEBSD) || defined(NETBSD) || defined(OPENBSD) \
-     || defined(BSDI) || defined(VMS) || defined(NTO) || defined(DARWIN) \
--    || defined(UNIXWARE) || defined(RISCOS)
-+    || defined(UNIXWARE) || defined(RISCOS) || defined(DRAGONFLY)
- #define _PRSelectFdSetArg_t fd_set *
- #else
- #error "Cannot determine architecture"
-@@ -3249,7 +3249,7 @@ static PRIOMethods _pr_socketpollfd_meth
- #if defined(HPUX) || defined(OSF1) || defined(SOLARIS) || defined (IRIX) \
-     || defined(AIX) || defined(LINUX) || defined(FREEBSD) || defined(NETBSD) \
-     || defined(OPENBSD) || defined(BSDI) || defined(VMS) || defined(NTO) \
--    || defined(DARWIN) || defined(UNIXWARE) || defined(RISCOS)
-+    || defined(DARWIN) || defined(UNIXWARE) || defined(RISCOS) || defined(DRAGONFLY)
- #define _PR_FCNTL_FLAGS O_NONBLOCK
- #else
- #error "Can't determine architecture"
diff --git a/time/sunbird/patches/patch-ec b/time/sunbird/patches/patch-ec
deleted file mode 100644
index 9512c219e42..00000000000
--- a/time/sunbird/patches/patch-ec
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-ec,v 1.1 2006/06/27 11:11:52 joerg Exp $
-
---- nsprpub/pr/src/pthreads/ptsynch.c.orig	2006-06-26 14:39:56.000000000 +0000
-+++ nsprpub/pr/src/pthreads/ptsynch.c
-@@ -811,7 +811,7 @@ PR_IMPLEMENT(PRStatus) PR_DeleteSemaphor
-  * From the semctl(2) man page in glibc 2.0
-  */
- #if (defined(__GNU_LIBRARY__) && !defined(_SEM_SEMUN_UNDEFINED)) \
--    || defined(FREEBSD) || defined(OPENBSD) || defined(BSDI)
-+    || defined(FREEBSD) || defined(OPENBSD) || defined(BSDI) || defined(DRAGONFLY)
- /* union semun is defined by including <sys/sem.h> */
- #else
- /* according to X/OPEN we have to define it ourselves */
diff --git a/time/sunbird/patches/patch-ed b/time/sunbird/patches/patch-ed
deleted file mode 100644
index d933c9b06a6..00000000000
--- a/time/sunbird/patches/patch-ed
+++ /dev/null
@@ -1,22 +0,0 @@
-$NetBSD: patch-ed,v 1.1 2006/06/27 11:11:52 joerg Exp $
-
---- nsprpub/pr/src/pthreads/ptthread.c.orig	2006-06-26 14:40:42.000000000 +0000
-+++ nsprpub/pr/src/pthreads/ptthread.c
-@@ -847,7 +847,7 @@ void _PR_InitThreads(
- #endif
- 
- #if defined(_PR_DCETHREADS) || defined(_POSIX_THREAD_PRIORITY_SCHEDULING)
--#if defined(FREEBSD)
-+#if defined(FREEBSD) || defined(DRAGONFLY)
-     {
-     pthread_attr_t attr;
-     int policy;
-@@ -1234,7 +1234,7 @@ static void suspend_signal_handler(PRInt
- 	{
- #if !defined(FREEBSD) && !defined(NETBSD) && !defined(OPENBSD) \
-     && !defined(BSDI) && !defined(VMS) && !defined(UNIXWARE) \
--    && !defined(DARWIN) && !defined(RISCOS) /*XXX*/
-+    && !defined(DARWIN) && !defined(RISCOS) && !defined(DRAGONFLY) /*XXX*/
-         PRIntn rv;
- 	    sigwait(&sigwait_set, &rv);
- #endif
diff --git a/time/sunbird/patches/patch-ee b/time/sunbird/patches/patch-ee
deleted file mode 100644
index b56899b130c..00000000000
--- a/time/sunbird/patches/patch-ee
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-ee,v 1.1 2006/06/27 11:11:52 joerg Exp $
-
---- xpcom/build/malloc.c.orig	2006-06-26 14:41:22.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/time/sunbird/patches/patch-ef b/time/sunbird/patches/patch-ef
deleted file mode 100644
index f444b3482d5..00000000000
--- a/time/sunbird/patches/patch-ef
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-ef,v 1.2 2009/05/29 13:22:11 he Exp $
-
---- security/nss/lib/freebl/Makefile.orig	2007-11-14 23:47:33.000000000 +0100
-+++ security/nss/lib/freebl/Makefile
-@@ -194,7 +194,7 @@ endif
- # to bind the blapi function references in FREEBLVector vector
- # (ldvector.c) to the blapi functions defined in the freebl
- # shared libraries.
--ifeq (,$(filter-out BSD_OS FreeBSD Linux NetBSD OpenBSD, $(OS_TARGET)))
-+ifeq (,$(filter-out BSD_OS DragonFly FreeBSD Linux NetBSD OpenBSD, $(OS_TARGET)))
-     MKSHLIB += -Wl,-Bsymbolic
- endif
- 
diff --git a/time/sunbird/patches/patch-eg b/time/sunbird/patches/patch-eg
deleted file mode 100644
index e291bfc77ea..00000000000
--- a/time/sunbird/patches/patch-eg
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-eg,v 1.1 2006/06/27 11:11:52 joerg Exp $
-
---- security/nss/cmd/platlibs.mk.orig	2006-06-26 17:51:46.000000000 +0000
-+++ security/nss/cmd/platlibs.mk
-@@ -172,7 +172,7 @@ endif
- # 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)))
-+ifeq (,$(filter-out BSD_OS DragonFly FreeBSD Linux NetBSD, $(OS_ARCH)))
- EXTRA_SHARED_LIBS += -Wl,-rpath-link,$(DIST)/lib
- endif
- 
diff --git a/time/sunbird/patches/patch-eh b/time/sunbird/patches/patch-eh
deleted file mode 100644
index 0eda29e3039..00000000000
--- a/time/sunbird/patches/patch-eh
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-eh,v 1.1 2006/06/27 11:11:52 joerg Exp $
-
---- security/coreconf/nsinstall/pathsub.c.orig	2006-06-26 17:52:04.000000000 +0000
-+++ security/coreconf/nsinstall/pathsub.c
-@@ -38,7 +38,7 @@
- ** Pathname subroutines.
- */
- #include <assert.h>
--#if defined(FREEBSD) || defined(BSDI) || defined(DARWIN)
-+#if defined(FREEBSD) || defined(BSDI) || defined(DARWIN) || defined(DRAGONFLY)
- #include <sys/types.h>
- #endif /* FREEBSD */
- #include <dirent.h>
diff --git a/time/sunbird/patches/patch-ei b/time/sunbird/patches/patch-ei
deleted file mode 100644
index 7c46e054b27..00000000000
--- a/time/sunbird/patches/patch-ei
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-ei,v 1.1 2006/06/27 11:11:52 joerg Exp $
-
---- security/coreconf/config.mk.orig	2006-06-26 17:52:20.000000000 +0000
-+++ security/coreconf/config.mk
-@@ -63,7 +63,7 @@ endif
- #######################################################################
- 
- 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/time/sunbird/patches/patch-ej b/time/sunbird/patches/patch-ej
deleted file mode 100644
index c6a98234bdd..00000000000
--- a/time/sunbird/patches/patch-ej
+++ /dev/null
@@ -1,86 +0,0 @@
-$NetBSD: patch-ej,v 1.1 2006/06/27 11:11:52 joerg Exp $
-
---- /dev/null	2006-06-26 17:53:40.000000000 +0000
-+++ security/coreconf/DragonFly.mk
-@@ -0,0 +1,81 @@
-+#
-+# ***** BEGIN LICENSE BLOCK *****
-+# Version: MPL 1.1/GPL 2.0/LGPL 2.1
-+#
-+# 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 the Initial Developer are Copyright (C) 1994-2000
-+# the Initial Developer. All Rights Reserved.
-+#
-+# Contributor(s):
-+#
-+# Alternatively, the contents of this file may be used under the terms of
-+# either the GNU General Public License Version 2 or later (the "GPL"), or
-+# the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
-+# in which case the provisions of the GPL or the LGPL are applicable instead
-+# of those above. If you wish to allow use of your version of this file only
-+# under the terms of either the GPL or the LGPL, and not to allow others to
-+# use your version of this file under the terms of the MPL, indicate your
-+# decision by deleting the provisions above and replace them with the notice
-+# and other provisions required by the GPL or the LGPL. If you do not delete
-+# the provisions above, a recipient may use your version of this file under
-+# the terms of any one of the MPL, the GPL or the LGPL.
-+#
-+# ***** END LICENSE BLOCK *****
-+
-+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 -DDRAGONFLY -DHAVE_STRERROR -DHAVE_BSD_FLOCK
-+
-+DSO_CFLAGS		= -fPIC
-+DSO_LDOPTS		= -shared -Wl,-soname -Wl,$(notdir $@)
-+
-+#
-+# The default implementation strategy for DragonFly is pthreads.
-+#
-+ifndef CLASSIC_NSPR
-+USE_PTHREADS		= 1
-+DEFINES			+= -D_THREAD_SAFE -D_REENTRANT
-+OS_LIBS			+= -pthread
-+DSO_LDOPTS		+= -pthread
-+endif
-+
-+ARCH			= dragonfly
-+
-+MOZ_OBJFORMAT		:= elf
-+
-+DLL_SUFFIX		= so
-+
-+MKSHLIB			= $(CC) $(DSO_LDOPTS)
-+ifdef MAPFILE
-+	MKSHLIB += -Wl,--version-script,$(MAPFILE)
-+endif
-+PROCESS_MAP_FILE = grep -v ';-' $< | \
-+        sed -e 's,;+,,' -e 's; DATA ;;' -e 's,;;,,' -e 's,;.*,;,' > $@
-+
-+G++INCLUDES		= -I/usr/include/g++
-+
-+INCLUDES		+= -I/usr/X11R6/include
diff --git a/time/sunbird/patches/patch-ek b/time/sunbird/patches/patch-ek
deleted file mode 100644
index 4ffd0be09b4..00000000000
--- a/time/sunbird/patches/patch-ek
+++ /dev/null
@@ -1,14 +0,0 @@
-$NetBSD: patch-ek,v 1.1 2006/06/27 11:11:52 joerg Exp $
-
---- dbm/src/mktemp.c.orig	2006-06-26 18:13:20.000000000 +0000
-+++ dbm/src/mktemp.c
-@@ -96,9 +96,6 @@ mktemp(char *path)
- static int 
- _gettemp(char *path, register int *doopen, int extraFlags)
- {    
--#if !defined(_WINDOWS) || defined(_WIN32)
--	extern int errno;                    
--#endif
- 	register char *start, *trv;
- 	struct stat sbuf;
- 	unsigned int pid;
diff --git a/time/sunbird/patches/patch-el b/time/sunbird/patches/patch-el
deleted file mode 100644
index 46860ee1959..00000000000
--- a/time/sunbird/patches/patch-el
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-el,v 1.1 2006/10/17 20:20:26 rillig Exp $
-
---- build/autoconf/mozconfig2configure.orig	2006-02-23 10:36:14.000000000 +0100
-+++ build/autoconf/mozconfig2configure	2006-10-17 22:00:31.000000000 +0200
-@@ -79,7 +79,7 @@ ac_add_options() {
- ac_add_app_options() {
-   APP=$1
-   shift;
--  if [ "$APP" == "$MOZ_BUILD_APP" ]; then
-+  if [ "$APP" = "$MOZ_BUILD_APP" ]; then
-       ac_add_options "$*";
-   fi
- }
diff --git a/time/sunbird/patches/patch-em b/time/sunbird/patches/patch-em
deleted file mode 100644
index ba1fa161ee8..00000000000
--- a/time/sunbird/patches/patch-em
+++ /dev/null
@@ -1,16 +0,0 @@
-$NetBSD: patch-em,v 1.1 2009/06/04 13:51:00 hasso Exp $
-
---- layout/build/Makefile.in.orig	2009-06-04 15:19:02 +0300
-+++ layout/build/Makefile.in	2009-06-04 15:20:14 +0300
-@@ -240,6 +240,11 @@ EXTRA_DSO_LDOPTS += \
- 	$(NULL)
- endif
- 
-+ifdef MOZ_ENABLE_XFT
-+EXTRA_DSO_LDOPTS += $(MOZ_XFT_LIBS) \
-+		    $(NULL)
-+endif
-+
- include $(topsrcdir)/config/rules.mk
- 
- LOCAL_INCLUDES	+= -I$(srcdir)/../base \
diff --git a/time/sunbird/patches/patch-en b/time/sunbird/patches/patch-en
deleted file mode 100644
index 40db68e2a12..00000000000
--- a/time/sunbird/patches/patch-en
+++ /dev/null
@@ -1,47 +0,0 @@
-$NetBSD: patch-en,v 1.1 2009/06/19 11:25:15 he Exp $
-
-For the benefit of 64-bit strict alignment archs using gcc, such
-as NetBSD/sparc64, ensure that the specially crafted double values
-are properly aligned.
-
---- extensions/transformiix/source/base/Double.cpp.orig	2006-06-22 21:13:00.000000000 +0200
-+++ extensions/transformiix/source/base/Double.cpp
-@@ -95,8 +95,12 @@ typedef union txdpun {
- #define TX_DOUBLE_HI32(x) (__extension__ ({ txdpun u; u.d = (x); u.s.hi; }))
- #define TX_DOUBLE_LO32(x) (__extension__ ({ txdpun u; u.d = (x); u.s.lo; }))
- 
-+#define __d_align	__attribute__ ((aligned (__alignof__(double))))
-+
- #else // __GNUC__
- 
-+#define __d_align	/* Empty */
-+
- /* We don't know of any non-gcc compilers that perform alias optimization,
-  * so this code should work.
-  */
-@@ -117,17 +121,19 @@ typedef union txdpun {
- 
- //-- Initialize Double related constants
- #ifdef IS_BIG_ENDIAN
--const PRUint32 nanMask[2] =    {TX_DOUBLE_HI32_EXPMASK | TX_DOUBLE_HI32_MANTMASK,
-+const PRUint32 nanMask[2] __d_align =    {TX_DOUBLE_HI32_EXPMASK | TX_DOUBLE_HI32_MANTMASK,
-                                 0xffffffff};
--const PRUint32 infMask[2] =    {TX_DOUBLE_HI32_EXPMASK, 0};
--const PRUint32 negInfMask[2] = {TX_DOUBLE_HI32_EXPMASK | TX_DOUBLE_HI32_SIGNBIT, 0};
-+const PRUint32 infMask[2] __d_align =    {TX_DOUBLE_HI32_EXPMASK, 0};
-+const PRUint32 negInfMask[2] __d_align = {TX_DOUBLE_HI32_EXPMASK | TX_DOUBLE_HI32_SIGNBIT, 0};
- #else
--const PRUint32 nanMask[2] =    {0xffffffff,
-+const PRUint32 nanMask[2] __d_align =    {0xffffffff,
-                                 TX_DOUBLE_HI32_EXPMASK | TX_DOUBLE_HI32_MANTMASK};
--const PRUint32 infMask[2] =    {0, TX_DOUBLE_HI32_EXPMASK};
--const PRUint32 negInfMask[2] = {0, TX_DOUBLE_HI32_EXPMASK | TX_DOUBLE_HI32_SIGNBIT};
-+const PRUint32 infMask[2] __d_align =    {0, TX_DOUBLE_HI32_EXPMASK};
-+const PRUint32 negInfMask[2] __d_align = {0, TX_DOUBLE_HI32_EXPMASK | TX_DOUBLE_HI32_SIGNBIT};
- #endif
- 
-+#undef __d_align
-+
- const double Double::NaN = *((double*)nanMask);
- const double Double::POSITIVE_INFINITY = *((double*)infMask);
- const double Double::NEGATIVE_INFINITY = *((double*)negInfMask);