diff options
Diffstat (limited to 'www/firefox2/patches')
63 files changed, 0 insertions, 2741 deletions
diff --git a/www/firefox2/patches/patch-aa b/www/firefox2/patches/patch-aa deleted file mode 100644 index 37b44f37aae..00000000000 --- a/www/firefox2/patches/patch-aa +++ /dev/null @@ -1,22 +0,0 @@ -$NetBSD: patch-aa,v 1.1.1.1 2006/10/24 22:20:11 ghen Exp $ - -diff -ruN ../Orig/mozilla/config/autoconf.mk.in ./config/autoconf.mk.in ---- ../Orig/mozilla/config/autoconf.mk.in 2005-08-18 02:17:17.000000000 +0900 -+++ ./config/autoconf.mk.in 2005-12-04 19:02:42.000000000 +0900 -@@ -54,13 +54,13 @@ - 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/www/firefox2/patches/patch-ab b/www/firefox2/patches/patch-ab deleted file mode 100644 index daec94f8e5a..00000000000 --- a/www/firefox2/patches/patch-ab +++ /dev/null @@ -1,55 +0,0 @@ -$NetBSD: patch-ab,v 1.2 2007/04/15 23:12:05 rillig Exp $ - ---- configure.in.orig 2006-03-29 22:26:28.000000000 +0200 -+++ configure.in -@@ -1418,7 +1418,7 @@ case "$target" in - LDFLAGS=$_SAVE_LDFLAGS - ;; - --*-freebsd*) -+*-freebsd* | *-dragonfly*) - if test `test -x /usr/bin/objformat && /usr/bin/objformat || echo aout` != "elf"; then - DLL_SUFFIX=".so.1.0" - DSO_LDOPTS="-shared" -@@ -1432,6 +1432,9 @@ case "$target" in - # MKSHLIB_FORCE_ALL='-Wl,-Bforcearchive' - # MKSHLIB_UNFORCE_ALL='' - # fi -+ if test "$LIBRUNPATH"; then -+ DSO_LDOPTS="-Wl,-R$LIBRUNPATH $DSO_LDOPTS" -+ fi - ;; - - *-hpux*) -@@ -1903,6 +1906,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*) -@@ -2100,7 +2110,7 @@ dnl the qsort routine under solaris is f - MKCSHLIB='$(CC) $(CFLAGS) $(DSO_PIC_FLAGS) -G -Wl,-z -Wl,muldefs -h $@ -o $@' - MKSHLIB_FORCE_ALL='-Qoption ld -z,allextract' - MKSHLIB_UNFORCE_ALL='' -- DSO_LDOPTS='-G -Qoption ld -z,muldefs' -+ DSO_LDOPTS='-G -z muldefs' - AR_LIST="$AR t" - AR_EXTRACT="$AR x" - AR_DELETE="$AR d" -@@ -5451,7 +5461,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/www/firefox2/patches/patch-ac b/www/firefox2/patches/patch-ac deleted file mode 100644 index 727b216acf7..00000000000 --- a/www/firefox2/patches/patch-ac +++ /dev/null @@ -1,60 +0,0 @@ -$NetBSD: patch-ac,v 1.2 2006/12/06 07:55:04 ghen Exp $ - -diff -ruN ../Orig/mozilla/xpcom/reflect/xptcall/src/md/unix/Makefile.in ./xpcom/reflect/xptcall/src/md/unix/Makefile.in ---- ../Orig/mozilla/xpcom/reflect/xptcall/src/md/unix/Makefile.in 2005-06-15 17:32:21.000000000 +0900 -+++ ./xpcom/reflect/xptcall/src/md/unix/Makefile.in 2005-12-04 19:03:04.000000000 +0900 -@@ -61,10 +61,13 @@ - # - # 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 -+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 -@@ -157,7 +160,7 @@ - # 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 -@@ -191,7 +194,7 @@ - # 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 -@@ -274,6 +277,7 @@ - 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 - - # -@@ -322,6 +326,13 @@ - 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/www/firefox2/patches/patch-ad b/www/firefox2/patches/patch-ad deleted file mode 100644 index 6a04f4a4d18..00000000000 --- a/www/firefox2/patches/patch-ad +++ /dev/null @@ -1,76 +0,0 @@ -$NetBSD: patch-ad,v 1.1.1.1 2006/10/24 22:20:11 ghen Exp $ - -diff -ruN ../Orig/mozilla/xpcom/reflect/xptcall/src/md/unix/xptcinvoke_netbsd_m68k.cpp ./xpcom/reflect/xptcall/src/md/unix/xptcinvoke_netbsd_m68k.cpp ---- ../Orig/mozilla/xpcom/reflect/xptcall/src/md/unix/xptcinvoke_netbsd_m68k.cpp 2004-04-18 23:18:18.000000000 +0900 -+++ ./xpcom/reflect/xptcall/src/md/unix/xptcinvoke_netbsd_m68k.cpp 2005-12-04 19:03:09.000000000 +0900 -@@ -132,6 +132,15 @@ - } - } - -+/* -+ * 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 @@ - 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/www/firefox2/patches/patch-ae b/www/firefox2/patches/patch-ae deleted file mode 100644 index dc9a7756e3f..00000000000 --- a/www/firefox2/patches/patch-ae +++ /dev/null @@ -1,42 +0,0 @@ -$NetBSD: patch-ae,v 1.1.1.1 2006/10/24 22:20:11 ghen Exp $ - -diff -ruN ../Orig/mozilla/xpcom/reflect/xptcall/src/md/unix/xptcstubs_netbsd_m68k.cpp ./xpcom/reflect/xptcall/src/md/unix/xptcstubs_netbsd_m68k.cpp ---- ../Orig/mozilla/xpcom/reflect/xptcall/src/md/unix/xptcstubs_netbsd_m68k.cpp 2004-04-18 23:18:18.000000000 +0900 -+++ ./xpcom/reflect/xptcall/src/md/unix/xptcstubs_netbsd_m68k.cpp 2005-12-04 19:03:11.000000000 +0900 -@@ -123,17 +123,27 @@ - } - } - -+/* -+ * 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/www/firefox2/patches/patch-af b/www/firefox2/patches/patch-af deleted file mode 100644 index 0c83be62c5a..00000000000 --- a/www/firefox2/patches/patch-af +++ /dev/null @@ -1,26 +0,0 @@ -$NetBSD: patch-af,v 1.1.1.1 2006/10/24 22:20:11 ghen Exp $ - -diff -ruN ../Orig/mozilla/security/nss/lib/freebl/unix_rand.c ./security/nss/lib/freebl/unix_rand.c ---- ../Orig/mozilla/security/nss/lib/freebl/unix_rand.c 2005-10-11 08:22:50.000000000 +0900 -+++ ./security/nss/lib/freebl/unix_rand.c 2005-12-04 19:04:32.000000000 +0900 -@@ -35,6 +35,7 @@ - * ***** END LICENSE BLOCK ***** */ - - #include <stdio.h> -+#include <fcntl.h> - #include <string.h> - #include <signal.h> - #include <unistd.h> -@@ -694,7 +695,11 @@ - /* dup write-side of pipe to stderr and stdout */ - if (p[1] != 1) dup2(p[1], 1); - if (p[1] != 2) dup2(p[1], 2); -- close(0); -+ fd = open("/dev/null", O_RDONLY); -+ if (fd != 0) { -+ dup2(fd, 0); -+ close(fd); -+ } - { - int ndesc = getdtablesize(); - for (fd = PR_MIN(65536, ndesc); --fd > 2; close(fd)); diff --git a/www/firefox2/patches/patch-ag b/www/firefox2/patches/patch-ag deleted file mode 100644 index fe8af2a8119..00000000000 --- a/www/firefox2/patches/patch-ag +++ /dev/null @@ -1,15 +0,0 @@ -$NetBSD: patch-ag,v 1.1.1.1 2006/10/24 22:20:11 ghen Exp $ - -diff -ruN ../Orig/mozilla/extensions/transformiix/source/base/ErrorObserver.h ./extensions/transformiix/source/base/ErrorObserver.h ---- ../Orig/mozilla/extensions/transformiix/source/base/ErrorObserver.h 2004-05-21 19:41:22.000000000 +0900 -+++ ./extensions/transformiix/source/base/ErrorObserver.h 2005-12-04 19:05:55.000000000 +0900 -@@ -41,7 +41,8 @@ - - #include "txCore.h" - #ifdef TX_EXE --#include <iostream.h> -+#include <iostream> -+using namespace std; - #endif - - /** diff --git a/www/firefox2/patches/patch-ah b/www/firefox2/patches/patch-ah deleted file mode 100644 index 8f316c5c69a..00000000000 --- a/www/firefox2/patches/patch-ah +++ /dev/null @@ -1,49 +0,0 @@ -$NetBSD: patch-ah,v 1.1.1.1 2006/10/24 22:20:11 ghen Exp $ - -diff -ruN ../Orig/mozilla/gfx/idl/nsIFreeType2.idl ./gfx/idl/nsIFreeType2.idl ---- ../Orig/mozilla/gfx/idl/nsIFreeType2.idl 2004-04-16 08:30:02.000000000 +0900 -+++ ./gfx/idl/nsIFreeType2.idl 2005-12-04 19:06:04.000000000 +0900 -@@ -76,10 +76,11 @@ - 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 @@ - - 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 @@ - 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/www/firefox2/patches/patch-ai b/www/firefox2/patches/patch-ai deleted file mode 100644 index 7c582c236ac..00000000000 --- a/www/firefox2/patches/patch-ai +++ /dev/null @@ -1,63 +0,0 @@ -$NetBSD: patch-ai,v 1.1.1.1 2006/10/24 22:20:11 ghen Exp $ - -diff -ruN ../Orig/mozilla/gfx/src/ps/nsFontMetricsPS.cpp ./gfx/src/ps/nsFontMetricsPS.cpp ---- ../Orig/mozilla/gfx/src/ps/nsFontMetricsPS.cpp 2005-04-28 17:04:00.000000000 +0900 -+++ ./gfx/src/ps/nsFontMetricsPS.cpp 2005-12-04 19:06:07.000000000 +0900 -@@ -1859,10 +1859,10 @@ - - 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); -@@ -1896,7 +1896,7 @@ - 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"); -@@ -1934,8 +1934,8 @@ - - 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; -@@ -2379,16 +2379,16 @@ - 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/www/firefox2/patches/patch-aj b/www/firefox2/patches/patch-aj deleted file mode 100644 index 127320dc1fc..00000000000 --- a/www/firefox2/patches/patch-aj +++ /dev/null @@ -1,41 +0,0 @@ -$NetBSD: patch-aj,v 1.1.1.1 2006/10/24 22:20:11 ghen Exp $ - -diff -ruN ../Orig/mozilla/gfx/src/freetype/nsFreeType.h ./gfx/src/freetype/nsFreeType.h ---- ../Orig/mozilla/gfx/src/freetype/nsFreeType.h 2005-05-02 02:36:19.000000000 +0900 -+++ ./gfx/src/freetype/nsFreeType.h 2005-12-04 19:06:10.000000000 +0900 -@@ -120,13 +120,13 @@ - 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 @@ - 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 @@ - PRLibrary *mSharedLib; - FT_Library mFreeTypeLibrary; - FTC_Manager mFTCacheManager; -- FTC_Image_Cache mImageCache; -+ FTC_ImageCache mImageCache; - - static nsHashtable *sFontFamilies; - static nsHashtable *sRange1CharSetNames; diff --git a/www/firefox2/patches/patch-ak b/www/firefox2/patches/patch-ak deleted file mode 100644 index a6729fadf71..00000000000 --- a/www/firefox2/patches/patch-ak +++ /dev/null @@ -1,62 +0,0 @@ -$NetBSD: patch-ak,v 1.1.1.1 2006/10/24 22:20:11 ghen Exp $ - -diff -ruN ../Orig/mozilla/gfx/src/freetype/nsFreeType.cpp ./gfx/src/freetype/nsFreeType.cpp ---- ../Orig/mozilla/gfx/src/freetype/nsFreeType.cpp 2005-07-14 03:21:10.000000000 +0900 -+++ ./gfx/src/freetype/nsFreeType.cpp 2005-12-04 19:06:15.000000000 +0900 -@@ -110,11 +110,11 @@ - {"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 @@ - } - - 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 @@ - } - - 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 @@ - } - - 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 @@ - } - - NS_IMETHODIMP --nsFreeType2::GetImageCache(FTC_Image_Cache *aCache) -+nsFreeType2::GetImageCache(FTC_ImageCache *aCache) - { - *aCache = mImageCache; - return NS_OK; diff --git a/www/firefox2/patches/patch-al b/www/firefox2/patches/patch-al deleted file mode 100644 index 0b6469eee85..00000000000 --- a/www/firefox2/patches/patch-al +++ /dev/null @@ -1,24 +0,0 @@ -$NetBSD: patch-al,v 1.1.1.1 2006/10/24 22:20:11 ghen Exp $ - -diff -ruN ../Orig/mozilla/gfx/src/ps/nsFontMetricsPS.h ./gfx/src/ps/nsFontMetricsPS.h ---- ../Orig/mozilla/gfx/src/ps/nsFontMetricsPS.h 2005-06-29 03:29:10.000000000 +0900 -+++ ./gfx/src/ps/nsFontMetricsPS.h 2005-12-04 19:07:24.000000000 +0900 -@@ -424,7 +424,8 @@ - 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 +494,7 @@ - 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/www/firefox2/patches/patch-an b/www/firefox2/patches/patch-an deleted file mode 100644 index fa10fc3b4b7..00000000000 --- a/www/firefox2/patches/patch-an +++ /dev/null @@ -1,14 +0,0 @@ -$NetBSD: patch-an,v 1.1.1.1 2006/10/24 22:20:11 ghen Exp $ - -diff -ruN ../Orig/mozilla/gfx/src/x11shared/nsFontFreeType.h ./gfx/src/x11shared/nsFontFreeType.h ---- ../Orig/mozilla/gfx/src/x11shared/nsFontFreeType.h 2004-04-18 06:52:34.000000000 +0900 -+++ ./gfx/src/x11shared/nsFontFreeType.h 2005-12-04 19:07:46.000000000 +0900 -@@ -110,7 +110,7 @@ - XImage *GetXImage(PRUint32 width, PRUint32 height); - nsITrueTypeFontCatalogEntry *mFaceID; - PRUint16 mPixelSize; -- FTC_Image_Desc mImageDesc; -+ FTC_ImageType mImageDesc; - nsCOMPtr<nsIFreeType2> mFt2; - }; - diff --git a/www/firefox2/patches/patch-ao b/www/firefox2/patches/patch-ao deleted file mode 100644 index 2e08afec5e7..00000000000 --- a/www/firefox2/patches/patch-ao +++ /dev/null @@ -1,76 +0,0 @@ -$NetBSD: patch-ao,v 1.1.1.1 2006/10/24 22:20:11 ghen Exp $ - -diff -ruN ../Orig/mozilla/gfx/src/x11shared/nsFontFreeType.cpp ./gfx/src/x11shared/nsFontFreeType.cpp ---- ../Orig/mozilla/gfx/src/x11shared/nsFontFreeType.cpp 2004-04-18 06:52:34.000000000 +0900 -+++ ./gfx/src/x11shared/nsFontFreeType.cpp 2005-12-04 19:07:49.000000000 +0900 -@@ -177,7 +177,7 @@ - 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 @@ - 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 @@ - 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 @@ - 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 @@ - if (!face) - return 0; - -- FTC_Image_Cache icache; -+ FTC_ImageCache icache; - mFt2->GetImageCache(&icache); - if (!icache) - return 0; -@@ -723,7 +715,7 @@ - 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/www/firefox2/patches/patch-ap b/www/firefox2/patches/patch-ap deleted file mode 100644 index cd98a71d4e3..00000000000 --- a/www/firefox2/patches/patch-ap +++ /dev/null @@ -1,13 +0,0 @@ -$NetBSD: patch-ap,v 1.2 2007/02/04 18:18:04 dmcmahill Exp $ - ---- security/coreconf/command.mk.orig 2006-03-29 22:26:44.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) - RANLIB = echo - TAR = /bin/tar diff --git a/www/firefox2/patches/patch-aq b/www/firefox2/patches/patch-aq deleted file mode 100644 index 687d0d6c8ff..00000000000 --- a/www/firefox2/patches/patch-aq +++ /dev/null @@ -1,41 +0,0 @@ -$NetBSD: patch-aq,v 1.1.1.1 2006/10/24 22:20:11 ghen Exp $ - -diff -ruN ../Orig/mozilla/directory/c-sdk/configure.in ./directory/c-sdk/configure.in ---- ../Orig/mozilla/directory/c-sdk/configure.in 2005-06-15 06:27:33.000000000 +0900 -+++ ./directory/c-sdk/configure.in 2005-12-04 19:07:54.000000000 +0900 -@@ -54,7 +54,7 @@ - USE_CPLUS= - USE_IPV6= - USE_MDUPDATE= --_OPTIMIZE_FLAGS=-O -+_OPTIMIZE_FLAGS= - _DEBUG_FLAGS=-g - MOZ_DEBUG=1 - MOZ_OPTIMIZE= -@@ -907,7 +907,7 @@ - PR_MD_CSRCS=dgux.c - ;; - --*-freebsd*) -+*-freebsd*|*-dragonfly*) - if test -z "$USE_NSPR_THREADS"; then - USE_PTHREADS=1 - fi -@@ -2061,7 +2061,7 @@ - _PTHREAD_LDFLAGS= - fi - ;; -- *-freebsd*|*-openbsd*|*-bsdi*|*-netbsd*) -+ *-freebsd*|*-openbsd*|*-bsdi*|*-netbsd*|*-dragonfly*) - AC_DEFINE(_THREAD_SAFE) - dnl -pthread links in -lc_r, so don't specify it explicitly. - if test "$ac_cv_have_dash_pthread" = "yes"; then -@@ -2114,7 +2114,7 @@ - AC_DEFINE(_PR_NEED_PTHREAD_INIT) - fi - ;; --*-freebsd*) -+*-freebsd*|*-dragonfly*) - if test -n "$USE_NSPR_THREADS"; then - AC_DEFINE(_PR_LOCAL_THREADS_ONLY) - fi diff --git a/www/firefox2/patches/patch-aw b/www/firefox2/patches/patch-aw deleted file mode 100644 index de78863da4f..00000000000 --- a/www/firefox2/patches/patch-aw +++ /dev/null @@ -1,13 +0,0 @@ -$NetBSD: patch-aw,v 1.1.1.1 2006/10/24 22:20:11 ghen Exp $ - -diff -ruN ../Orig/mozilla/widget/src/gtksuperwin/Makefile.in ./widget/src/gtksuperwin/Makefile.in ---- ../Orig/mozilla/widget/src/gtksuperwin/Makefile.in 2004-12-15 14:52:41.000000000 +0900 -+++ ./widget/src/gtksuperwin/Makefile.in 2005-12-04 19:08:57.000000000 +0900 -@@ -46,6 +46,7 @@ - LIBRARY_NAME = gtksuperwin - EXPORT_LIBRARY = 1 - LIBXUL_LIBRARY = 1 -+MKSHLIB = $(MKCSHLIB) - - PACKAGE_FILE = gtksuperwin.pkg - diff --git a/www/firefox2/patches/patch-ax b/www/firefox2/patches/patch-ax deleted file mode 100644 index 4e6247b918c..00000000000 --- a/www/firefox2/patches/patch-ax +++ /dev/null @@ -1,15 +0,0 @@ -$NetBSD: patch-ax,v 1.1.1.1 2006/10/24 22:20:11 ghen Exp $ - ---- security/coreconf/SunOS5.mk.orig 2006-03-29 22:26:44.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/www/firefox2/patches/patch-ba b/www/firefox2/patches/patch-ba deleted file mode 100644 index ed51f3a6d10..00000000000 --- a/www/firefox2/patches/patch-ba +++ /dev/null @@ -1,126 +0,0 @@ -$NetBSD: patch-ba,v 1.1.1.1 2006/10/24 22:20:12 ghen Exp $ - -diff -ruN ../Orig/mozilla/nsprpub/pr/include/md/_netbsd.cfg ./nsprpub/pr/include/md/_netbsd.cfg ---- ../Orig/mozilla/nsprpub/pr/include/md/_netbsd.cfg 2004-04-28 09:33:44.000000000 +0900 -+++ ./nsprpub/pr/include/md/_netbsd.cfg 2005-12-04 19:09:16.000000000 +0900 -@@ -48,7 +48,8 @@ - - #define PR_AF_INET6 24 /* same as AF_INET6 */ - --#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/www/firefox2/patches/patch-bb b/www/firefox2/patches/patch-bb deleted file mode 100644 index 2d910bf4c86..00000000000 --- a/www/firefox2/patches/patch-bb +++ /dev/null @@ -1,27 +0,0 @@ -$NetBSD: patch-bb,v 1.1.1.1 2006/10/24 22:20:12 ghen Exp $ - -diff -ruN ../Orig/mozilla/nsprpub/pr/include/md/_netbsd.h ./nsprpub/pr/include/md/_netbsd.h ---- ../Orig/mozilla/nsprpub/pr/include/md/_netbsd.h 2004-05-20 00:37:10.000000000 +0900 -+++ ./nsprpub/pr/include/md/_netbsd.h 2005-12-04 19:14:22.000000000 +0900 -@@ -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/www/firefox2/patches/patch-bm b/www/firefox2/patches/patch-bm deleted file mode 100644 index aa0b3f9f223..00000000000 --- a/www/firefox2/patches/patch-bm +++ /dev/null @@ -1,32 +0,0 @@ -$NetBSD: patch-bm,v 1.1.1.1 2006/10/24 22:20:12 ghen Exp $ - -diff -ruN ../Orig/mozilla/xpcom/reflect/xptcall/src/md/unix/xptcstubs_arm_netbsd.cpp ./xpcom/reflect/xptcall/src/md/unix/xptcstubs_arm_netbsd.cpp ---- ../Orig/mozilla/xpcom/reflect/xptcall/src/md/unix/xptcstubs_arm_netbsd.cpp 2004-04-18 23:18:18.000000000 +0900 -+++ ./xpcom/reflect/xptcall/src/md/unix/xptcstubs_arm_netbsd.cpp 2005-12-04 19:17:13.000000000 +0900 -@@ -118,18 +118,23 @@ - * 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/www/firefox2/patches/patch-bo b/www/firefox2/patches/patch-bo deleted file mode 100644 index 8ed25f98790..00000000000 --- a/www/firefox2/patches/patch-bo +++ /dev/null @@ -1,84 +0,0 @@ -$NetBSD: patch-bo,v 1.1.1.1 2006/10/24 22:20:12 ghen Exp $ - -diff -ruN ../Orig/mozilla/nsprpub/configure.in ./nsprpub/configure.in ---- ../Orig/mozilla/nsprpub/configure.in 2005-09-16 07:37:52.000000000 +0900 -+++ ./nsprpub/configure.in 2005-12-04 19:17:56.000000000 +0900 -@@ -57,7 +57,7 @@ - USE_IPV6= - USE_MDUPDATE= - _MACOSX_DEPLOYMENT_TARGET= --_OPTIMIZE_FLAGS=-O -+_OPTIMIZE_FLAGS= - _DEBUG_FLAGS=-g - MOZ_DEBUG=1 - MOZ_OPTIMIZE= -@@ -1045,6 +1045,34 @@ - DSO_LDOPTS='-shared -Wl,-soname -Wl,$(notdir $@)' - MDCPUCFG_H=_freebsd.cfg - PR_MD_CSRCS=freebsd.c -+ if test "$LIBRUNPATH"; then -+ DSO_LDOPTS="$DSO_LDOPTS -Wl,-R$LIBRUNPATH" -+ fi -+ ;; -+ -+*-dragonfly*) -+ if test -z "$USE_NSPR_THREADS"; then -+ USE_PTHREADS=1 -+ fi -+ AC_DEFINE(XP_UNIX) -+ AC_DEFINE(FREEBSD) -+ AC_DEFINE(HAVE_BSD_FLOCK) -+ AC_DEFINE(HAVE_SOCKLEN_T) -+ CFLAGS="$CFLAGS $(DSO_CFLAGS) -ansi -Wall" -+ MOZ_OBJFORMAT=`test -x /usr/bin/objformat && /usr/bin/objformat || echo aout` -+ if test "$MOZ_OBJFORMAT" = "elf"; then -+ DLL_SUFFIX=so -+ else -+ DLL_SUFFIX=so.1.0 -+ fi -+ MKSHLIB='$(CC) $(DSO_LDOPTS) -o $@' -+ DSO_CFLAGS=-fPIC -+ DSO_LDOPTS='-shared -Wl,-soname -Wl,$(notdir $@)' -+ MDCPUCFG_H=_freebsd.cfg -+ PR_MD_CSRCS=freebsd.c -+ if test "$LIBRUNPATH"; then -+ DSO_LDOPTS="$DSO_LDOPTS -Wl,-R$LIBRUNPATH" -+ fi - ;; - - *-hpux*) -@@ -1544,6 +1572,7 @@ - AC_DEFINE(XP_UNIX) - AC_DEFINE(NETBSD) - AC_DEFINE(HAVE_BSD_FLOCK) -+ AC_DEFINE(HAVE_SOCKLEN_T) - USE_NSPR_THREADS=1 - MDCPUCFG_H=_netbsd.cfg - PR_MD_CSRCS=netbsd.c -@@ -2307,7 +2336,7 @@ - if test -z "`egrep -i '(unrecognize|unknown)' conftest.out | grep pthread`" && test -z "`egrep -i '(error|incorrect)' conftest.out`" ; then - ac_cv_have_dash_pthread=yes - case "$target_os" in -- freebsd*) -+ freebsd* | dragonfly*) - # Freebsd doesn't use -pthread for compiles, it uses them for linking - ;; - *) -@@ -2345,7 +2374,7 @@ - _PTHREAD_LDFLAGS= - fi - ;; -- *-freebsd*) -+ *-freebsd* | *-dragonfly*) - AC_DEFINE(_REENTRANT) - AC_DEFINE(_THREAD_SAFE) - dnl -pthread links in -lc_r, so don't specify it explicitly. -@@ -2426,7 +2455,7 @@ - AC_DEFINE(_PR_NEED_PTHREAD_INIT) - fi - ;; --*-freebsd*) -+*-freebsd* | *-dragonfly*) - if test -n "$USE_NSPR_THREADS"; then - AC_DEFINE(_PR_LOCAL_THREADS_ONLY) - fi diff --git a/www/firefox2/patches/patch-bq b/www/firefox2/patches/patch-bq deleted file mode 100644 index 462488a5bb2..00000000000 --- a/www/firefox2/patches/patch-bq +++ /dev/null @@ -1,14 +0,0 @@ -$NetBSD: patch-bq,v 1.1.1.1 2006/10/24 22:20:12 ghen Exp $ - -diff -ruN ../Orig/mozilla/xpcom/io/nsLocalFileUnix.h ./xpcom/io/nsLocalFileUnix.h ---- ../Orig/mozilla/xpcom/io/nsLocalFileUnix.h 2004-04-18 23:18:14.000000000 +0900 -+++ ./xpcom/io/nsLocalFileUnix.h 2005-12-04 19:18:04.000000000 +0900 -@@ -73,7 +73,7 @@ - #endif - - // so we can statfs on freebsd --#if defined(__FreeBSD__) -+#if defined(__FreeBSD__) || ((defined(__DragonFly__) || defined(__NetBSD__)) && !defined(HAVE_STATVFS)) - #define HAVE_SYS_STATFS_H - #define STATFS statfs - #include <sys/param.h> diff --git a/www/firefox2/patches/patch-br b/www/firefox2/patches/patch-br deleted file mode 100644 index b1b7123354b..00000000000 --- a/www/firefox2/patches/patch-br +++ /dev/null @@ -1,23 +0,0 @@ -$NetBSD: patch-br,v 1.1.1.1 2006/10/24 22:20:12 ghen Exp $ - -diff -ruN ../Orig/mozilla/nsprpub/pr/src/misc/prnetdb.c ./nsprpub/pr/src/misc/prnetdb.c ---- ../Orig/mozilla/nsprpub/pr/src/misc/prnetdb.c 2005-08-19 02:24:38.000000000 +0900 -+++ ./nsprpub/pr/src/misc/prnetdb.c 2005-12-04 19:18:10.000000000 +0900 -@@ -2110,7 +2110,17 @@ - */ - 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/www/firefox2/patches/patch-bs b/www/firefox2/patches/patch-bs deleted file mode 100644 index 6d539daaed5..00000000000 --- a/www/firefox2/patches/patch-bs +++ /dev/null @@ -1,33 +0,0 @@ -$NetBSD: patch-bs,v 1.1.1.1 2006/10/24 22:20:12 ghen Exp $ - -diff -ruN ../Orig/mozilla/config/mkdepend/imakemdep.h ./config/mkdepend/imakemdep.h ---- ../Orig/mozilla/config/mkdepend/imakemdep.h 2004-04-21 06:38:14.000000000 +0900 -+++ ./config/mkdepend/imakemdep.h 2005-12-04 19:21:01.000000000 +0900 -@@ -235,7 +235,7 @@ - #ifdef _CRAY - #define DEFAULT_CPP "/lib/pcpp" - #endif --#if defined(__386BSD__) || defined(__NetBSD__) || defined(__FreeBSD__) || defined(__OpenBSD__) -+#if defined(__386BSD__) || defined(__NetBSD__) || defined(__FreeBSD__) || defined(__OpenBSD__) || defined(__DragonFly__) - #define DEFAULT_CPP "/usr/libexec/cpp" - #endif - #ifdef MACH -@@ -273,7 +273,7 @@ - #ifdef unix - "-Uunix", /* remove unix symbol so that filename unix.c okay */ - #endif --#if defined(__386BSD__) || defined(__NetBSD__) || defined(__FreeBSD__) || defined(__OpenBSD__) || defined(MACH) -+#if defined(__386BSD__) || defined(__NetBSD__) || defined(__FreeBSD__) || defined(__OpenBSD__) || defined(MACH) || defined(__DragonFly__) - # ifdef __i386__ - "-D__i386__", - # endif -@@ -713,6 +713,9 @@ - #ifdef __sgi - {"__sgi", "1"}, - #endif -+#ifdef __DragonFly__ -+ {"__DragonFly__", "1"}, -+#endif - #ifdef __FreeBSD__ - {"__FreeBSD__", "1"}, - #endif diff --git a/www/firefox2/patches/patch-bu b/www/firefox2/patches/patch-bu deleted file mode 100644 index 70f47d1c3bf..00000000000 --- a/www/firefox2/patches/patch-bu +++ /dev/null @@ -1,180 +0,0 @@ -$NetBSD: patch-bu,v 1.1.1.1 2006/10/24 22:20:12 ghen Exp $ - -diff -ruN ../Orig/mozilla/xpcom/reflect/xptcall/src/md/unix/xptcinvoke_unixish_amd64.cpp ./xpcom/reflect/xptcall/src/md/unix/xptcinvoke_unixish_amd64.cpp ---- ../Orig/mozilla/xpcom/reflect/xptcall/src/md/unix/xptcinvoke_unixish_amd64.cpp 1970-01-01 09:00:00.000000000 +0900 -+++ ./xpcom/reflect/xptcall/src/md/unix/xptcinvoke_unixish_amd64.cpp 2005-12-07 00:07:35.000000000 +0900 -@@ -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/www/firefox2/patches/patch-bv b/www/firefox2/patches/patch-bv deleted file mode 100644 index 1c9ab1e2f92..00000000000 --- a/www/firefox2/patches/patch-bv +++ /dev/null @@ -1,212 +0,0 @@ -$NetBSD: patch-bv,v 1.1.1.1 2006/10/24 22:20:12 ghen Exp $ - -diff -ruN ../Orig/mozilla/xpcom/reflect/xptcall/src/md/unix/xptcstubs_unixish_amd64.cpp ./xpcom/reflect/xptcall/src/md/unix/xptcstubs_unixish_amd64.cpp ---- ../Orig/mozilla/xpcom/reflect/xptcall/src/md/unix/xptcstubs_unixish_amd64.cpp 1970-01-01 09:00:00.000000000 +0900 -+++ ./xpcom/reflect/xptcall/src/md/unix/xptcstubs_unixish_amd64.cpp 2005-12-04 19:32:22.000000000 +0900 -@@ -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/www/firefox2/patches/patch-bx b/www/firefox2/patches/patch-bx deleted file mode 100644 index c14e2653a1f..00000000000 --- a/www/firefox2/patches/patch-bx +++ /dev/null @@ -1,85 +0,0 @@ -$NetBSD: patch-bx,v 1.1.1.1 2006/10/24 22:20:11 ghen Exp $ - -diff -ruN ../Orig/mozilla/xpcom/reflect/xptcall/src/md/unix/xptcstubs_ppc_netbsd.cpp ./xpcom/reflect/xptcall/src/md/unix/xptcstubs_ppc_netbsd.cpp ---- ../Orig/mozilla/xpcom/reflect/xptcall/src/md/unix/xptcstubs_ppc_netbsd.cpp 2004-04-18 23:18:18.000000000 +0900 -+++ ./xpcom/reflect/xptcall/src/md/unix/xptcstubs_ppc_netbsd.cpp 2005-12-04 19:34:41.000000000 +0900 -@@ -119,8 +119,10 @@ - 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 @@ - 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 @@ - // 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 @@ - "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/www/firefox2/patches/patch-by b/www/firefox2/patches/patch-by deleted file mode 100644 index a63b6ed5e80..00000000000 --- a/www/firefox2/patches/patch-by +++ /dev/null @@ -1,50 +0,0 @@ -$NetBSD: patch-by,v 1.1.1.1 2006/10/24 22:20:11 ghen Exp $ - -diff -ruN ../Orig/mozilla/layout/svg/renderer/src/libart/nsSVGLibartGlyphMetricsFT.cpp ./layout/svg/renderer/src/libart/nsSVGLibartGlyphMetricsFT.cpp ---- ../Orig/mozilla/layout/svg/renderer/src/libart/nsSVGLibartGlyphMetricsFT.cpp 2004-11-24 03:01:01.000000000 +0900 -+++ ./layout/svg/renderer/src/libart/nsSVGLibartGlyphMetricsFT.cpp 2005-12-04 19:34:45.000000000 +0900 -@@ -155,15 +155,15 @@ - - static NS_NAMED_LITERAL_STRING(arial, "arial"); - nsSVGLibartGlyphMetricsFT::sFontAliases.Put(NS_LITERAL_STRING("helvetica"), -- &arial); -+ (nsDependentString *)&arial); - - static NS_NAMED_LITERAL_STRING(courier, "courier new"); - nsSVGLibartGlyphMetricsFT::sFontAliases.Put(NS_LITERAL_STRING("courier"), -- &courier); -+ (nsDependentString *)&courier); - - static NS_NAMED_LITERAL_STRING(times, "times new roman"); - nsSVGLibartGlyphMetricsFT::sFontAliases.Put(NS_LITERAL_STRING("times"), -- ×); -+ (nsDependentString *)×); - } - - void NS_FreeSVGLibartGlyphMetricsFTGlobals() -@@ -440,19 +440,19 @@ - return; - } - -- FTC_Image_Desc imageDesc; -- imageDesc.font.face_id=(void*)font_data.font_entry.get(); // XXX do we need to addref? -+ FTC_ImageType imageDesc; -+ imageDesc->face_id = (FTC_FaceID)font_data.font_entry.get(); // XXX do we need to addref? - float twipstopixel = GetTwipsToPixels(); - float scale = GetPixelScale(); -- imageDesc.font.pix_width = (int)((float)(font_data.font.size)*twipstopixel/scale); -- imageDesc.font.pix_height = (int)((float)(font_data.font.size)*twipstopixel/scale); -- imageDesc.image_type |= ftc_image_grays; -+ imageDesc->width = (int)((float)(font_data.font.size)*twipstopixel/scale); -+ imageDesc->height = (int)((float)(font_data.font.size)*twipstopixel/scale); -+ imageDesc->flags = 0; - - // get the face - nsresult rv; - FTC_Manager mgr; - nsSVGLibartFreetype::ft2->GetFTCacheManager(&mgr); -- rv = nsSVGLibartFreetype::ft2->ManagerLookupSize(mgr, &imageDesc.font, &mFace, nsnull); -+ rv = nsSVGLibartFreetype::ft2->ManagerLookupFace(mgr, imageDesc->face_id, &mFace); - NS_ASSERTION(mFace, "failed to get face/size"); - } - diff --git a/www/firefox2/patches/patch-bz b/www/firefox2/patches/patch-bz deleted file mode 100644 index 8e4b6957165..00000000000 --- a/www/firefox2/patches/patch-bz +++ /dev/null @@ -1,123 +0,0 @@ -$NetBSD: patch-bz,v 1.1.1.1 2006/10/24 22:20:11 ghen Exp $ - -diff -ruN ../Orig/mozilla/xpcom/reflect/xptcall/src/md/unix/xptcstubs_asm_ppc_netbsd.s ./xpcom/reflect/xptcall/src/md/unix/xptcstubs_asm_ppc_netbsd.s ---- ../Orig/mozilla/xpcom/reflect/xptcall/src/md/unix/xptcstubs_asm_ppc_netbsd.s 2001-03-12 02:22:22.000000000 +0900 -+++ ./xpcom/reflect/xptcall/src/md/unix/xptcstubs_asm_ppc_netbsd.s 2005-12-04 19:34:51.000000000 +0900 -@@ -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 @@ - 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/www/firefox2/patches/patch-ca b/www/firefox2/patches/patch-ca deleted file mode 100644 index ab51793ec82..00000000000 --- a/www/firefox2/patches/patch-ca +++ /dev/null @@ -1,167 +0,0 @@ -$NetBSD: patch-ca,v 1.1.1.1 2006/10/24 22:20:11 ghen Exp $ - -diff -ruN ../Orig/mozilla/xpcom/reflect/xptcall/src/md/unix/xptcinvoke_asm_ppc_netbsd.s ./xpcom/reflect/xptcall/src/md/unix/xptcinvoke_asm_ppc_netbsd.s ---- ../Orig/mozilla/xpcom/reflect/xptcall/src/md/unix/xptcinvoke_asm_ppc_netbsd.s 2001-03-12 02:22:17.000000000 +0900 -+++ ./xpcom/reflect/xptcall/src/md/unix/xptcinvoke_asm_ppc_netbsd.s 2005-12-04 19:34:59.000000000 +0900 -@@ -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 @@ - 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 @@ - 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/www/firefox2/patches/patch-cb b/www/firefox2/patches/patch-cb deleted file mode 100644 index 0159cec7b8e..00000000000 --- a/www/firefox2/patches/patch-cb +++ /dev/null @@ -1,27 +0,0 @@ -$NetBSD: patch-cb,v 1.1.1.1 2006/10/24 22:20:11 ghen Exp $ - -diff -ruN ../Orig/mozilla/xpcom/reflect/xptcall/src/md/unix/xptcinvoke_ppc_netbsd.cpp ./xpcom/reflect/xptcall/src/md/unix/xptcinvoke_ppc_netbsd.cpp ---- ../Orig/mozilla/xpcom/reflect/xptcall/src/md/unix/xptcinvoke_ppc_netbsd.cpp 2004-04-18 23:18:18.000000000 +0900 -+++ ./xpcom/reflect/xptcall/src/md/unix/xptcinvoke_ppc_netbsd.cpp 2005-12-04 19:35:01.000000000 +0900 -@@ -104,8 +104,10 @@ - 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 @@ - 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/www/firefox2/patches/patch-cd b/www/firefox2/patches/patch-cd deleted file mode 100644 index 861656304e6..00000000000 --- a/www/firefox2/patches/patch-cd +++ /dev/null @@ -1,19 +0,0 @@ -$NetBSD: patch-cd,v 1.1.1.1 2006/10/24 22:20:11 ghen Exp $ - -diff -ruN ../Orig/mozilla/modules/plugin/base/public/nptypes.h ./modules/plugin/base/public/nptypes.h ---- ../Orig/mozilla/modules/plugin/base/public/nptypes.h 2005-05-20 06:49:42.000000000 +0900 -+++ ./modules/plugin/base/public/nptypes.h 2005-12-04 19:35:14.000000000 +0900 -@@ -93,6 +93,7 @@ - */ - #include <stdint.h> - -+ #if !defined(__cplusplus) - #if !defined(__GNUC__) || (__GNUC__ > 2 || __GNUC_MINOR__ > 95) - #include <stdbool.h> - #else -@@ -102,4 +103,5 @@ - */ - #define bool int - #endif -+ #endif - #endif diff --git a/www/firefox2/patches/patch-cg b/www/firefox2/patches/patch-cg deleted file mode 100644 index fe618218702..00000000000 --- a/www/firefox2/patches/patch-cg +++ /dev/null @@ -1,88 +0,0 @@ -$NetBSD: patch-cg,v 1.1.1.1 2006/10/24 22:20:11 ghen Exp $ - -diff -ruN ../Orig/mozilla/extensions/transformiix/source/base/Double.cpp ./extensions/transformiix/source/base/Double.cpp ---- ../Orig/mozilla/extensions/transformiix/source/base/Double.cpp 2004-06-17 09:12:42.000000000 +0900 -+++ ./extensions/transformiix/source/base/Double.cpp 2005-12-04 19:39:05.000000000 +0900 -@@ -49,8 +49,40 @@ - * Utility class for doubles - */ - -+#if defined(INFINITY) && defined(NAN) -+double Double::NaN() -+{ -+ return NAN; -+} -+ -+double Double::PositiveInfinity() -+{ -+ return INFINITY; -+} -+ -+double Double::NegativeInfinity() -+{ -+ return -INFINITY; -+} -+ -+MBool Double::isInfinite(double aDbl) -+{ -+ return isinf(aDbl); -+} -+ -+MBool Double::isNaN(double aDbl) -+{ -+ return isnan(aDbl); -+} -+ -+MBool Double::isNeg(double aDbl) -+{ -+ return aDbl<0.0; -+} -+#else /* pre INFINITY C environment */ -+ - //A trick to handle IEEE floating point exceptions on FreeBSD - E.D. --#ifdef __FreeBSD__ -+#if defined(__FreeBSD__) || defined(__DragonFly__) - #include <ieeefp.h> - #ifdef __alpha__ - fp_except_t allmask = FP_X_INV|FP_X_OFL|FP_X_UFL|FP_X_DZ|FP_X_IMP; -@@ -128,9 +160,20 @@ - const PRUint32 negInfMask[2] = {0, TX_DOUBLE_HI32_EXPMASK | TX_DOUBLE_HI32_SIGNBIT}; - #endif - --const double Double::NaN = *((double*)nanMask); --const double Double::POSITIVE_INFINITY = *((double*)infMask); --const double Double::NEGATIVE_INFINITY = *((double*)negInfMask); -+double Double::NaN() -+{ -+ return *((double*)nanMask); -+} -+ -+double Double::PositiveInfinity() -+{ -+ return *((double*)infMask); -+} -+ -+double Double::NegativeInfinity() -+{ -+ return *((double*)negInfMask); -+} - - /* - * Determines whether the given double represents positive or negative -@@ -158,6 +201,7 @@ - { - return (TX_DOUBLE_HI32(aDbl) & TX_DOUBLE_HI32_SIGNBIT) != 0; - } -+#endif /* C environment has INFINITY and NAN */ - - /* - * Converts the given String to a double, if the String value does not -@@ -245,7 +289,7 @@ - { - if (mState == eIllegal || mBuffer.IsEmpty() || - (mBuffer.Length() == 1 && mBuffer[0] == '.')) { -- return Double::NaN; -+ return Double::NaN(); - } - return mSign*PR_strtod(mBuffer.get(), 0); - } diff --git a/www/firefox2/patches/patch-ch b/www/firefox2/patches/patch-ch deleted file mode 100644 index 6c970ab067e..00000000000 --- a/www/firefox2/patches/patch-ch +++ /dev/null @@ -1,18 +0,0 @@ -$NetBSD: patch-ch,v 1.1.1.1 2006/10/24 22:20:11 ghen Exp $ - -diff -ruN ../Orig/mozilla/extensions/transformiix/source/base/txCore.h ./extensions/transformiix/source/base/txCore.h ---- ../Orig/mozilla/extensions/transformiix/source/base/txCore.h 2004-05-26 20:54:37.000000000 +0900 -+++ ./extensions/transformiix/source/base/txCore.h 2005-12-04 19:42:43.000000000 +0900 -@@ -65,9 +65,9 @@ - /** - * Useful constants - */ -- static const double NaN; -- static const double POSITIVE_INFINITY; -- static const double NEGATIVE_INFINITY; -+ static double NaN(); -+ static double PositiveInfinity(); -+ static double NegativeInfinity(); - - /** - * Determines whether the given double represents positive or negative diff --git a/www/firefox2/patches/patch-ci b/www/firefox2/patches/patch-ci deleted file mode 100644 index b23547353fe..00000000000 --- a/www/firefox2/patches/patch-ci +++ /dev/null @@ -1,14 +0,0 @@ -$NetBSD: patch-ci,v 1.1.1.1 2006/10/24 22:20:11 ghen Exp $ - -diff -ruN ../Orig/mozilla/extensions/transformiix/source/xpath/FunctionCall.cpp ./extensions/transformiix/source/xpath/FunctionCall.cpp ---- ../Orig/mozilla/extensions/transformiix/source/xpath/FunctionCall.cpp 2005-01-29 20:07:14.000000000 +0900 -+++ ./extensions/transformiix/source/xpath/FunctionCall.cpp 2005-12-04 19:43:01.000000000 +0900 -@@ -105,7 +105,7 @@ - nsRefPtr<txAExprResult> exprResult; - nsresult rv = aExpr->evaluate(aContext, getter_AddRefs(exprResult)); - if (NS_FAILED(rv)) -- return Double::NaN; -+ return Double::NaN(); - - return exprResult->numberValue(); - } diff --git a/www/firefox2/patches/patch-cj b/www/firefox2/patches/patch-cj deleted file mode 100644 index 01e88254b68..00000000000 --- a/www/firefox2/patches/patch-cj +++ /dev/null @@ -1,33 +0,0 @@ -$NetBSD: patch-cj,v 1.1.1.1 2006/10/24 22:20:11 ghen Exp $ - -diff -ruN ../Orig/mozilla/extensions/transformiix/source/xpath/MultiplicativeExpr.cpp ./extensions/transformiix/source/xpath/MultiplicativeExpr.cpp ---- ../Orig/mozilla/extensions/transformiix/source/xpath/MultiplicativeExpr.cpp 2004-06-17 09:12:43.000000000 +0900 -+++ ./extensions/transformiix/source/xpath/MultiplicativeExpr.cpp 2005-12-04 19:43:04.000000000 +0900 -@@ -79,22 +79,22 @@ - #if defined(XP_WIN) - /* XXX MSVC miscompiles such that (NaN == 0) */ - if (Double::isNaN(rightDbl)) -- result = Double::NaN; -+ result = Double::NaN(); - else - #endif - if (leftDbl == 0 || Double::isNaN(leftDbl)) -- result = Double::NaN; -+ result = Double::NaN(); - else if (Double::isNeg(leftDbl) ^ Double::isNeg(rightDbl)) -- result = Double::NEGATIVE_INFINITY; -+ result = Double::NegativeInfinity(); - else -- result = Double::POSITIVE_INFINITY; -+ result = Double::PositiveInfinity(); - } - else - result = leftDbl / rightDbl; - break; - case MODULUS: - if (rightDbl == 0) { -- result = Double::NaN; -+ result = Double::NaN(); - } - else { - #if defined(XP_WIN) diff --git a/www/firefox2/patches/patch-ck b/www/firefox2/patches/patch-ck deleted file mode 100644 index aaaa9969f08..00000000000 --- a/www/firefox2/patches/patch-ck +++ /dev/null @@ -1,20 +0,0 @@ -$NetBSD: patch-ck,v 1.1.1.1 2006/10/24 22:20:12 ghen Exp $ - -diff -ruN ../Orig/mozilla/extensions/transformiix/source/xslt/functions/txFormatNumberFunctionCall.cpp ./extensions/transformiix/source/xslt/functions/txFormatNumberFunctionCall.cpp ---- ../Orig/mozilla/extensions/transformiix/source/xslt/functions/txFormatNumberFunctionCall.cpp 2004-06-17 09:12:44.000000000 +0900 -+++ ./extensions/transformiix/source/xslt/functions/txFormatNumberFunctionCall.cpp 2005-12-04 19:43:07.000000000 +0900 -@@ -114,12 +114,12 @@ - return aContext->recycler()->getStringResult(format->mNaN, aResult); - } - -- if (value == Double::POSITIVE_INFINITY) { -+ if (value == Double::PositiveInfinity()) { - return aContext->recycler()->getStringResult(format->mInfinity, - aResult); - } - -- if (value == Double::NEGATIVE_INFINITY) { -+ if (value == Double::NegativeInfinity()) { - nsAutoString res; - res.Append(format->mMinusSign); - res.Append(format->mInfinity); diff --git a/www/firefox2/patches/patch-cl b/www/firefox2/patches/patch-cl deleted file mode 100644 index 19e527b1da9..00000000000 --- a/www/firefox2/patches/patch-cl +++ /dev/null @@ -1,32 +0,0 @@ -$NetBSD: patch-cl,v 1.1.1.1 2006/10/24 22:20:12 ghen Exp $ - -diff -ruN ../Orig/mozilla/extensions/transformiix/source/xslt/txStylesheetCompileHandlers.cpp ./extensions/transformiix/source/xslt/txStylesheetCompileHandlers.cpp ---- ../Orig/mozilla/extensions/transformiix/source/xslt/txStylesheetCompileHandlers.cpp 2005-01-24 19:50:39.000000000 +0900 -+++ ./extensions/transformiix/source/xslt/txStylesheetCompileHandlers.cpp 2005-12-04 19:44:00.000000000 +0900 -@@ -279,7 +279,7 @@ - txStylesheetCompilerState& aState, - double& aNumber) - { -- aNumber = Double::NaN; -+ aNumber = Double::NaN(); - txStylesheetAttr* attr = nsnull; - nsresult rv = getStyleAttr(aAttributes, aAttrCount, kNameSpaceID_None, - aName, aRequired, &attr); -@@ -500,7 +500,7 @@ - NS_ENSURE_SUCCESS(rv, rv); - - txExpandedName nullExpr; -- double prio = Double::NaN; -+ double prio = Double::NaN(); - - nsAutoPtr<txPattern> match(new txRootPattern()); - NS_ENSURE_TRUE(match, NS_ERROR_OUT_OF_MEMORY); -@@ -1060,7 +1060,7 @@ - aState, mode); - NS_ENSURE_SUCCESS(rv, rv); - -- double prio = Double::NaN; -+ double prio = Double::NaN(); - rv = getNumberAttr(aAttributes, aAttrCount, txXSLTAtoms::priority, - PR_FALSE, aState, prio); - NS_ENSURE_SUCCESS(rv, rv); diff --git a/www/firefox2/patches/patch-cm b/www/firefox2/patches/patch-cm deleted file mode 100644 index fee00a1c5db..00000000000 --- a/www/firefox2/patches/patch-cm +++ /dev/null @@ -1,14 +0,0 @@ -$NetBSD: patch-cm,v 1.1.1.1 2006/10/24 22:20:12 ghen Exp $ - -diff -ruN ../Orig/mozilla/extensions/transformiix/source/xslt/txXSLTPatterns.cpp ./extensions/transformiix/source/xslt/txXSLTPatterns.cpp ---- ../Orig/mozilla/extensions/transformiix/source/xslt/txXSLTPatterns.cpp 2005-01-16 06:30:39.000000000 +0900 -+++ ./extensions/transformiix/source/xslt/txXSLTPatterns.cpp 2005-12-04 19:44:15.000000000 +0900 -@@ -98,7 +98,7 @@ - double txUnionPattern::getDefaultPriority() - { - NS_ASSERTION(0, "Don't call getDefaultPriority on txUnionPattern"); -- return Double::NaN; -+ return Double::NaN(); - } - - /* diff --git a/www/firefox2/patches/patch-cn b/www/firefox2/patches/patch-cn deleted file mode 100644 index 5e704ab6708..00000000000 --- a/www/firefox2/patches/patch-cn +++ /dev/null @@ -1,94 +0,0 @@ -$NetBSD: patch-cn,v 1.1.1.1 2006/10/24 22:20:12 ghen Exp $ - ---- extensions/transformiix/source/xpath/XFormsFunctionCall.cpp.orig 2006-06-20 20:54:45.000000000 +0200 -+++ extensions/transformiix/source/xpath/XFormsFunctionCall.cpp -@@ -104,7 +104,7 @@ XFormsFunctionCall::evaluate(txIEvalCont - res = (res/i); - } - else { -- res = Double::NaN; -+ res = Double::NaN(); - } - return aContext->recycler()->getNumberResult(res, aResult); - } -@@ -159,7 +159,7 @@ XFormsFunctionCall::evaluate(txIEvalCont - NS_ENSURE_SUCCESS(rv, rv); - - PRInt32 result = 0; -- double res = Double::NaN; -+ double res = Double::NaN(); - nsresult rv = xformsService->GetDaysFromDateTime(date, &result); - if (NS_SUCCEEDED(rv)) { - res = result; -@@ -222,7 +222,7 @@ XFormsFunctionCall::evaluate(txIEvalCont - NS_ENSURE_SUCCESS(rv, rv); - - PRInt32 index = 0; -- double res = Double::NaN; -+ double res = Double::NaN(); - rv = xformsService->GetRepeatIndex(repeatEle, &index); - NS_ENSURE_SUCCESS(rv, rv); - -@@ -355,7 +355,7 @@ XFormsFunctionCall::evaluate(txIEvalCont - getter_AddRefs(nodes)); - NS_ENSURE_SUCCESS(rv, rv); - -- double res = Double::NaN; -+ double res = Double::NaN(); - PRInt32 i; - for (i = 0; i < nodes->size(); ++i) { - double test; -@@ -363,7 +363,7 @@ XFormsFunctionCall::evaluate(txIEvalCont - txXPathNodeUtils::appendNodeValue(nodes->get(i), resultStr); - test = Double::toDouble(resultStr); - if (Double::isNaN(test)) { -- res = Double::NaN; -+ res = Double::NaN(); - break; - } - if (test > res || i == 0) { -@@ -383,7 +383,7 @@ XFormsFunctionCall::evaluate(txIEvalCont - getter_AddRefs(nodes)); - NS_ENSURE_SUCCESS(rv, rv); - -- double res = Double::NaN; -+ double res = Double::NaN(); - PRInt32 i; - for (i = 0; i < nodes->size(); ++i) { - double test; -@@ -391,7 +391,7 @@ XFormsFunctionCall::evaluate(txIEvalCont - txXPathNodeUtils::appendNodeValue(nodes->get(i), resultStr); - test = Double::toDouble(resultStr); - if (Double::isNaN(test)) { -- res = Double::NaN; -+ res = Double::NaN(); - break; - } - if ((test < res) || (i==0)) { -@@ -414,7 +414,7 @@ XFormsFunctionCall::evaluate(txIEvalCont - NS_ENSURE_SUCCESS(rv, rv); - - PRInt32 result = 0; -- double res = Double::NaN; -+ double res = Double::NaN(); - nsresult rv = xformsService->GetMonths(duration, &result); - if (NS_SUCCEEDED(rv)) { - res = result; -@@ -490,7 +490,7 @@ XFormsFunctionCall::evaluate(txIEvalCont - // up the chain - return rv; - } -- res = Double::NaN; -+ res = Double::NaN(); - } - - return aContext->recycler()->getNumberResult(res, aResult); -@@ -515,7 +515,7 @@ XFormsFunctionCall::evaluate(txIEvalCont - // up the chain - return rv; - } -- res = Double::NaN; -+ res = Double::NaN(); - } - - return aContext->recycler()->getNumberResult(res, aResult); diff --git a/www/firefox2/patches/patch-da b/www/firefox2/patches/patch-da deleted file mode 100644 index 6e241dfb3b5..00000000000 --- a/www/firefox2/patches/patch-da +++ /dev/null @@ -1,12 +0,0 @@ -$NetBSD: patch-da,v 1.1 2006/12/06 20:37:00 joerg Exp $ - ---- layout/build/Makefile.in.orig 2006-12-06 17:28:45.000000000 +0000 -+++ layout/build/Makefile.in -@@ -282,6 +282,7 @@ LDFLAGS += -Wl,-LD_LAYOUT:lgot_buffer=50 - endif - endif - -+LDFLAGS+= -lX11 -lXrender - - export:: $(BUILD_DATE) - diff --git a/www/firefox2/patches/patch-db b/www/firefox2/patches/patch-db deleted file mode 100644 index ec49fd7d7a4..00000000000 --- a/www/firefox2/patches/patch-db +++ /dev/null @@ -1,14 +0,0 @@ -$NetBSD: patch-db,v 1.1.1.1 2006/10/24 22:20:12 ghen Exp $ - -diff -ruN ../Orig/mozilla/gc/boehm/gcconfig.h ./gc/boehm/gcconfig.h ---- ../Orig/mozilla/gc/boehm/gcconfig.h 2000-08-11 09:13:36.000000000 +0900 -+++ ./gc/boehm/gcconfig.h 2005-12-04 19:44:25.000000000 +0900 -@@ -183,7 +183,7 @@ - # define OPENBSD - # define mach_type_known - # endif --# if defined(__FreeBSD__) && defined(i386) -+# if (defined(__FreeBSD__) || defined(__DragonFly__)) && defined(i386) - # define I386 - # define FREEBSD - # define mach_type_known diff --git a/www/firefox2/patches/patch-dc b/www/firefox2/patches/patch-dc deleted file mode 100644 index 701518c8c72..00000000000 --- a/www/firefox2/patches/patch-dc +++ /dev/null @@ -1,23 +0,0 @@ -$NetBSD: patch-dc,v 1.1.1.1 2006/10/24 22:20:12 ghen Exp $ - -diff -ruN ../Orig/mozilla/gc/boehm/mach_dep.c ./gc/boehm/mach_dep.c ---- ../Orig/mozilla/gc/boehm/mach_dep.c 1999-09-30 11:25:45.000000000 +0900 -+++ ./gc/boehm/mach_dep.c 2005-12-04 19:44:28.000000000 +0900 -@@ -206,7 +206,7 @@ - && !defined(SCO) && !defined(SCO_ELF) \ - && !(defined(LINUX) && defined(__ELF__)) \ - && !(defined(__FreeBSD__) && defined(__ELF__)) \ -- && !defined(DOS4GW) -+ && !defined(DOS4GW) && !(defined(__DragonFly__) && defined(__ELF__)) - /* I386 code, generic code does not appear to work */ - /* It does appear to work under OS2, and asms dont */ - /* This is used for some 38g UNIX variants and for CYGWIN32 */ -@@ -220,7 +220,7 @@ - # endif - - # if ( defined(I386) && defined(LINUX) && defined(__ELF__) ) \ -- || ( defined(I386) && defined(__FreeBSD__) && defined(__ELF__) ) -+ || ( defined(I386) && (defined(__FreeBSD__) || defined(__DragonFly__)) && defined(__ELF__) ) - - /* This is modified for Linux with ELF (Note: _ELF_ only) */ - /* This section handles FreeBSD with ELF. */ diff --git a/www/firefox2/patches/patch-dd b/www/firefox2/patches/patch-dd deleted file mode 100644 index 48e4f98c9d5..00000000000 --- a/www/firefox2/patches/patch-dd +++ /dev/null @@ -1,14 +0,0 @@ -$NetBSD: patch-dd,v 1.1.1.1 2006/10/24 22:20:12 ghen Exp $ - -diff -ruN ../Orig/mozilla/mailnews/movemail/src/movemail.c ./mailnews/movemail/src/movemail.c ---- ../Orig/mozilla/mailnews/movemail/src/movemail.c 2004-04-18 03:33:14.000000000 +0900 -+++ ./mailnews/movemail/src/movemail.c 2005-12-04 19:44:32.000000000 +0900 -@@ -52,7 +52,7 @@ - #define LINUX_GLIBC_2 - - #include <sys/errno.h> --#if !defined(__FreeBSD__) && !defined(MACLINUX) && !defined(LINUX_GLIBC_2) -+#if !defined(__FreeBSD__) && !defined(MACLINUX) && !defined(LINUX_GLIBC_2) && !defined(__DragonFly__) - extern char *sys_errlist[]; - extern int sys_nerr; - #endif diff --git a/www/firefox2/patches/patch-de b/www/firefox2/patches/patch-de deleted file mode 100644 index b6fd6d0d3cd..00000000000 --- a/www/firefox2/patches/patch-de +++ /dev/null @@ -1,13 +0,0 @@ -$NetBSD: patch-de,v 1.1 2006/12/06 20:37:00 joerg Exp $ - ---- security/nss/lib/freebl/Makefile.orig 2006-12-06 18:01:13.000000000 +0000 -+++ security/nss/lib/freebl/Makefile -@@ -192,7 +192,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, $(OS_TARGET))) -+ifeq (,$(filter-out BSD_OS DragonFly FreeBSD Linux NetBSD, $(OS_TARGET))) - MKSHLIB += -Wl,-Bsymbolic - endif - diff --git a/www/firefox2/patches/patch-df b/www/firefox2/patches/patch-df deleted file mode 100644 index 33798fa6e8f..00000000000 --- a/www/firefox2/patches/patch-df +++ /dev/null @@ -1,32 +0,0 @@ -$NetBSD: patch-df,v 1.1.1.1 2006/10/24 22:20:12 ghen Exp $ - -diff -ruN ../Orig/mozilla/nsprpub/pr/include/md/_freebsd.h ./nsprpub/pr/include/md/_freebsd.h ---- ../Orig/mozilla/nsprpub/pr/include/md/_freebsd.h 2004-11-24 06:22:35.000000000 +0900 -+++ ./nsprpub/pr/include/md/_freebsd.h 2005-12-04 19:44:37.000000000 +0900 -@@ -79,7 +79,7 @@ - #define _PR_NO_LARGE_FILES - - #if defined(_PR_PTHREADS) --#if __FreeBSD_version >= 400008 -+#if defined(__DragonFly__) || __FreeBSD_version >= 400008 - /* - * libc_r before this version of FreeBSD doesn't have poll(). - * Although libc has poll(), it is not thread-safe so we can't -@@ -88,7 +88,7 @@ - #define _PR_POLL_AVAILABLE - #endif - #else --#if __FreeBSD_version >= 300000 -+#if defined(__DragonFly__) || __FreeBSD_version >= 300000 - #define _PR_POLL_AVAILABLE - #define _PR_USE_POLL - #endif -@@ -97,7 +97,7 @@ - #define _PR_HAVE_SYSV_SEMAPHORES - #define PR_HAVE_SYSV_NAMED_SHARED_MEMORY - --#if __FreeBSD_version >= 400014 -+#if defined(__DragonFly__) || __FreeBSD_version >= 400014 - #define _PR_INET6 - #define _PR_HAVE_INET_NTOP - #define _PR_HAVE_GETHOSTBYNAME2 diff --git a/www/firefox2/patches/patch-dh b/www/firefox2/patches/patch-dh deleted file mode 100644 index 4aecbdff9ab..00000000000 --- a/www/firefox2/patches/patch-dh +++ /dev/null @@ -1,19 +0,0 @@ -$NetBSD: patch-dh,v 1.1.1.1 2006/10/24 22:20:12 ghen Exp $ - -diff -ruN ../Orig/mozilla/xpcom/reflect/xptcall/src/md/unix/xptc_platforms_unixish_x86.h ./xpcom/reflect/xptcall/src/md/unix/xptc_platforms_unixish_x86.h ---- ../Orig/mozilla/xpcom/reflect/xptcall/src/md/unix/xptc_platforms_unixish_x86.h 2004-04-18 23:18:18.000000000 +0900 -+++ ./xpcom/reflect/xptcall/src/md/unix/xptc_platforms_unixish_x86.h 2005-12-04 19:44:41.000000000 +0900 -@@ -77,6 +77,13 @@ - #define THUNK_BASED_THIS_ADJUST - #endif - -+#elif defined(__DragonFly__) -+# if defined(__FreeBSD_cc_version) -+# define CFRONT_STYLE_THIS_ADJUST -+# else -+# define THUNK_BASED_THIS_ADJUST -+# endif -+ - #elif defined(__FreeBSD__) - /* System versions of gcc on FreeBSD don't use thunks. On 3.x, the system - * compiler is gcc 2.7.2.3, which doesn't use thunks by default. On 4.x and diff --git a/www/firefox2/patches/patch-dj b/www/firefox2/patches/patch-dj deleted file mode 100644 index f93eaea7f94..00000000000 --- a/www/firefox2/patches/patch-dj +++ /dev/null @@ -1,14 +0,0 @@ -$NetBSD: patch-dj,v 1.1.1.1 2006/10/24 22:20:12 ghen Exp $ - -diff -ruN ../Orig/mozilla/dbm/src/mktemp.c ./dbm/src/mktemp.c ---- ../Orig/mozilla/dbm/src/mktemp.c 2003-01-21 08:13:37.000000000 +0900 -+++ ./dbm/src/mktemp.c 2005-12-04 19:44:43.000000000 +0900 -@@ -98,7 +98,7 @@ - static int - _gettemp(char *path, register int *doopen, int extraFlags) - { --#if !defined(_WINDOWS) || defined(_WIN32) -+#if (!defined(_WINDOWS) || defined(_WIN32)) && !defined(errno) - extern int errno; - #endif - register char *start, *trv; diff --git a/www/firefox2/patches/patch-dk b/www/firefox2/patches/patch-dk deleted file mode 100644 index d57524f0ec8..00000000000 --- a/www/firefox2/patches/patch-dk +++ /dev/null @@ -1,14 +0,0 @@ -$NetBSD: patch-dk,v 1.1.1.1 2006/10/24 22:20:12 ghen Exp $ - -diff -ruN ../Orig/mozilla/security/coreconf/config.mk ./security/coreconf/config.mk ---- ../Orig/mozilla/security/coreconf/config.mk 2004-04-26 00:02:17.000000000 +0900 -+++ ./security/coreconf/config.mk 2005-12-04 19:44:47.000000000 +0900 -@@ -63,7 +63,7 @@ - ####################################################################### - - TARGET_OSES = FreeBSD BSD_OS NetBSD OpenUNIX OS2 QNX Darwin BeOS OpenBSD \ -- OpenVMS AIX -+ OpenVMS AIX DragonFly - - ifeq (,$(filter-out $(TARGET_OSES),$(OS_TARGET))) - include $(CORE_DEPTH)/coreconf/$(OS_TARGET).mk diff --git a/www/firefox2/patches/patch-dl b/www/firefox2/patches/patch-dl deleted file mode 100644 index 4d0ae6a8a1f..00000000000 --- a/www/firefox2/patches/patch-dl +++ /dev/null @@ -1,89 +0,0 @@ -$NetBSD: patch-dl,v 1.1.1.1 2006/10/24 22:20:12 ghen Exp $ - -diff -ruN ../Orig/mozilla/security/coreconf/DragonFly.mk ./security/coreconf/DragonFly.mk ---- ../Orig/mozilla/security/coreconf/DragonFly.mk 1970-01-01 09:00:00.000000000 +0900 -+++ ./security/coreconf/DragonFly.mk 2005-12-04 19:44:48.000000000 +0900 -@@ -0,0 +1,83 @@ -+# -+# The contents of this file are subject to the Mozilla Public -+# License Version 1.1 (the "License"); you may not use this file -+# except in compliance with the License. You may obtain a copy of -+# the License at http://www.mozilla.org/MPL/ -+# -+# Software distributed under the License is distributed on an "AS -+# IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or -+# implied. See the License for the specific language governing -+# rights and limitations under the License. -+# -+# The Original Code is the Netscape security libraries. -+# -+# The Initial Developer of the Original Code is Netscape -+# Communications Corporation. Portions created by Netscape are -+# Copyright (C) 1994-2000 Netscape Communications Corporation. All -+# Rights Reserved. -+# -+# Contributor(s): -+# -+# Alternatively, the contents of this file may be used under the -+# terms of the GNU General Public License Version 2 or later (the -+# "GPL"), in which case the provisions of the GPL are applicable -+# instead of those above. If you wish to allow use of your -+# version of this file only under the terms of the GPL and not to -+# allow others to use your version of this file under the MPL, -+# indicate your decision by deleting the provisions above and -+# replace them with the notice and other provisions required by -+# the GPL. If you do not delete the provisions above, a recipient -+# may use your version of this file under either the MPL or the -+# GPL. -+# -+# Config stuff for DragonFly -+# -+ -+include $(CORE_DEPTH)/coreconf/UNIX.mk -+ -+DEFAULT_COMPILER = gcc -+CC = gcc -+CCC = g++ -+RANLIB = ranlib -+ -+ifeq ($(OS_TEST),alpha) -+CPU_ARCH = alpha -+else -+CPU_ARCH = x86 -+endif -+ -+OS_CFLAGS = $(DSO_CFLAGS) -ansi -Wall -DFREEBSD -DHAVE_STRERROR -DHAVE_BSD_FLOCK -+ -+DSO_CFLAGS = -fPIC -+DSO_LDOPTS = -shared -Wl,-soname -Wl,$(notdir $@) -+ -+# -+# The default implementation strategy for FreeBSD is pthreads. -+# -+ifndef CLASSIC_NSPR -+USE_PTHREADS = 1 -+DEFINES += -D_THREAD_SAFE -D_REENTRANT -+OS_LIBS += -pthread -+DSO_LDOPTS += -pthread -+endif -+ -+ARCH = freebsd -+ -+MOZ_OBJFORMAT := $(shell test -x /usr/bin/objformat && /usr/bin/objformat || echo aout) -+ -+DLL_SUFFIX = so -+ -+ifdef LIBRUNPATH -+DSO_LDOPTS += -Wl,-R$(LIBRUNPATH) -+endif -+ -+MKSHLIB = $(CC) $(DSO_LDOPTS) -+ifdef MAPFILE -+# Add LD options to restrict exported symbols to those in the map file -+endif -+# Change PROCESS to put the mapfile in the correct format for this platform -+PROCESS_MAP_FILE = cp $(LIBRARY_NAME).def $@ -+ -+G++INCLUDES = -I/usr/include/g++ -+ -+INCLUDES += -I/usr/X11R6/include diff --git a/www/firefox2/patches/patch-dm b/www/firefox2/patches/patch-dm deleted file mode 100644 index de8d1e768fd..00000000000 --- a/www/firefox2/patches/patch-dm +++ /dev/null @@ -1,16 +0,0 @@ -$NetBSD: patch-dm,v 1.1.1.1 2006/10/24 22:20:12 ghen Exp $ - -diff -ruN ../Orig/mozilla/security/nss/cmd/platlibs.mk ./security/nss/cmd/platlibs.mk ---- ../Orig/mozilla/security/nss/cmd/platlibs.mk 2005-04-07 06:35:41.000000000 +0900 -+++ ./security/nss/cmd/platlibs.mk 2005-12-04 19:44:52.000000000 +0900 -@@ -186,8 +186,8 @@ - # If GNU ld is used, we must use the -rpath-link option to tell - # the linker where to find libsoftokn3.so, an implicit dependency - # of libnss3.so. --ifeq (,$(filter-out BSD_OS FreeBSD Linux NetBSD, $(OS_ARCH))) --EXTRA_SHARED_LIBS += -Wl,-rpath-link,$(DIST)/lib -+ifeq (,$(filter-out BSD_OS FreeBSD Linux NetBSD DragonFly, $(OS_ARCH))) -+EXTRA_SHARED_LIBS += -Wl,-rpath-link,$(DIST)/lib -R/usr/pkg/lib/firefox - endif - - ifeq ($(OS_ARCH), SunOS) diff --git a/www/firefox2/patches/patch-do b/www/firefox2/patches/patch-do deleted file mode 100644 index b7c4677c306..00000000000 --- a/www/firefox2/patches/patch-do +++ /dev/null @@ -1,88 +0,0 @@ -$NetBSD: patch-do,v 1.1.1.1 2006/10/24 22:20:12 ghen Exp $ - -diff -ruN ../Orig/mozilla/directory/c-sdk/config/DragonFly.mk ./directory/c-sdk/config/DragonFly.mk ---- ../Orig/mozilla/directory/c-sdk/config/DragonFly.mk 1970-01-01 09:00:00.000000000 +0900 -+++ ./directory/c-sdk/config/DragonFly.mk 2005-12-04 19:44:55.000000000 +0900 -@@ -0,0 +1,82 @@ -+# -+# The contents of this file are subject to the Mozilla Public -+# License Version 1.1 (the "License"); you may not use this file -+# except in compliance with the License. You may obtain a copy of -+# the License at http://www.mozilla.org/MPL/ -+# -+# Software distributed under the License is distributed on an "AS -+# IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or -+# implied. See the License for the specific language governing -+# rights and limitations under the License. -+# -+# The Original Code is the Netscape Portable Runtime (NSPR). -+# -+# The Initial Developer of the Original Code is Netscape -+# Communications Corporation. Portions created by Netscape are -+# Copyright (C) 1998-2000 Netscape Communications Corporation. All -+# Rights Reserved. -+# -+# Contributor(s): -+# -+# Alternatively, the contents of this file may be used under the -+# terms of the GNU General Public License Version 2 or later (the -+# "GPL"), in which case the provisions of the GPL are applicable -+# instead of those above. If you wish to allow use of your -+# version of this file only under the terms of the GPL and not to -+# allow others to use your version of this file under the MPL, -+# indicate your decision by deleting the provisions above and -+# replace them with the notice and other provisions required by -+# the GPL. If you do not delete the provisions above, a recipient -+# may use your version of this file under either the MPL or the -+# GPL. -+# -+ -+# -+# Config stuff for DragonFly -+# -+ -+include $(MOD_DEPTH)/config/UNIX.mk -+ -+CC = gcc -+CCC = g++ -+RANLIB = ranlib -+ -+OS_REL_CFLAGS = -Di386 -+CPU_ARCH = x86 -+CPU_ARCH_TAG = _$(CPU_ARCH) -+ -+OS_CFLAGS = $(DSO_CFLAGS) $(OS_REL_CFLAGS) -ansi -Wall -pipe $(THREAD_FLAG) -DFREEBSD -DHAVE_STRERROR -DHAVE_BSD_FLOCK -+ -+# -+# The default implementation strategy for FreeBSD is pthreads. -+# -+ifeq ($(CLASSIC_NSPR),1) -+IMPL_STRATEGY = _EMU -+DEFINES += -D_PR_LOCAL_THREADS_ONLY -+else -+USE_PTHREADS = 1 -+IMPL_STRATEGY = _PTH -+DEFINES += -D_THREAD_SAFE -+THREAD_FLAG += -pthread -+endif -+ -+ARCH = freebsd -+ -+MOZ_OBJFORMAT := $(shell test -x /usr/bin/objformat && /usr/bin/objformat || echo aout) -+ -+ifeq ($(MOZ_OBJFORMAT),elf) -+DLL_SUFFIX = so -+else -+DLL_SUFFIX = so.1.0 -+endif -+ -+DSO_CFLAGS = -fPIC -+DSO_LDOPTS = -Bshareable -+ -+ifdef LIBRUNPATH -+DSO_LDOPTS += -Wl,-R$(LIBRUNPATH) -+endif -+ -+MKSHLIB = $(LD) $(DSO_LDOPTS) -+ -+G++INCLUDES = -I/usr/include/g++ diff --git a/www/firefox2/patches/patch-dr b/www/firefox2/patches/patch-dr deleted file mode 100644 index 9f497cc0a5a..00000000000 --- a/www/firefox2/patches/patch-dr +++ /dev/null @@ -1,14 +0,0 @@ -$NetBSD: patch-dr,v 1.1.1.1 2006/10/24 22:20:12 ghen Exp $ - -diff -ruN ../Orig/mozilla/config/config.mk ./config/config.mk ---- ../Orig/mozilla/config/config.mk 2005-07-29 04:48:11.000000000 +0900 -+++ ./config/config.mk 2005-12-04 19:45:20.000000000 +0900 -@@ -121,7 +121,7 @@ - # but save the version to allow multiple versions of the same base - # platform to be built in the same tree. - # --ifneq (,$(filter FreeBSD HP-UX IRIX Linux NetBSD OpenBSD OSF1 SunOS,$(OS_ARCH))) -+ifneq (,$(filter DragonFly FreeBSD HP-UX IRIX Linux NetBSD OpenBSD OSF1 SunOS,$(OS_ARCH))) - OS_RELEASE := $(basename $(OS_RELEASE)) - - # Allow the user to ignore the OS_VERSION, which is usually irrelevant. diff --git a/www/firefox2/patches/patch-ds b/www/firefox2/patches/patch-ds deleted file mode 100644 index 7c70026f4f8..00000000000 --- a/www/firefox2/patches/patch-ds +++ /dev/null @@ -1,14 +0,0 @@ -$NetBSD: patch-ds,v 1.1.1.1 2006/10/24 22:20:12 ghen Exp $ - -diff -ruN ../Orig/mozilla/security/coreconf/arch.mk ./security/coreconf/arch.mk ---- ../Orig/mozilla/security/coreconf/arch.mk 2005-10-11 08:30:12.000000000 +0900 -+++ ./security/coreconf/arch.mk 2005-12-04 19:45:28.000000000 +0900 -@@ -145,7 +145,7 @@ - # IRIX 6.5-ALPHA-1289139620. - # - --ifeq (,$(filter-out Linux FreeBSD IRIX,$(OS_ARCH))) -+ifeq (,$(filter-out Linux DragonFly FreeBSD IRIX,$(OS_ARCH))) - OS_RELEASE := $(shell echo $(OS_RELEASE) | sed 's/-.*//') - endif - diff --git a/www/firefox2/patches/patch-dt b/www/firefox2/patches/patch-dt deleted file mode 100644 index 18209f6843f..00000000000 --- a/www/firefox2/patches/patch-dt +++ /dev/null @@ -1,14 +0,0 @@ -$NetBSD: patch-dt,v 1.1.1.1 2006/10/24 22:20:12 ghen Exp $ - -diff -ruN ../Orig/mozilla/directory/c-sdk/config/arch.mk ./directory/c-sdk/config/arch.mk ---- ../Orig/mozilla/directory/c-sdk/config/arch.mk 2002-03-27 06:51:57.000000000 +0900 -+++ ./directory/c-sdk/config/arch.mk 2005-12-04 19:45:29.000000000 +0900 -@@ -138,7 +138,7 @@ - # Handle FreeBSD 2.2-STABLE and Linux 2.0.30-osfmach3 - # - --ifeq (,$(filter-out Linux FreeBSD,$(OS_ARCH))) -+ifeq (,$(filter-out Linux DragonFly FreeBSD,$(OS_ARCH))) - OS_RELEASE := $(shell echo "$(OS_RELEASE)" | sed 's/-.*//') - endif - diff --git a/www/firefox2/patches/patch-du b/www/firefox2/patches/patch-du deleted file mode 100644 index 8922da1fe00..00000000000 --- a/www/firefox2/patches/patch-du +++ /dev/null @@ -1,18 +0,0 @@ -$NetBSD: patch-du,v 1.1.1.1 2006/10/24 22:20:12 ghen Exp $ - -diff -ruN ../Orig/mozilla/config/rules.mk ./config/rules.mk ---- ../Orig/mozilla/config/rules.mk 2005-10-11 08:16:39.000000000 +0900 -+++ ./config/rules.mk 2005-12-04 19:45:31.000000000 +0900 -@@ -447,6 +447,12 @@ - endif - endif - -+ifeq ($(OS_ARCH),DragonFly) -+ifdef IS_COMPONENT -+EXTRA_DSO_LDOPTS += -Wl,-Bsymbolic -+endif -+endif -+ - ifeq ($(OS_ARCH),NetBSD) - ifneq (,$(filter arc cobalt hpcmips mipsco newsmips pmax sgimips,$(OS_TEST))) - ifeq ($(MODULE),layout) diff --git a/www/firefox2/patches/patch-dv b/www/firefox2/patches/patch-dv deleted file mode 100644 index 4f37751e8ce..00000000000 --- a/www/firefox2/patches/patch-dv +++ /dev/null @@ -1,15 +0,0 @@ -$NetBSD: patch-dv,v 1.1.1.1 2006/10/24 22:20:12 ghen Exp $ - -diff -ruN ../Orig/mozilla/js/src/Makefile.in ./js/src/Makefile.in ---- ../Orig/mozilla/js/src/Makefile.in 2005-06-01 23:26:26.000000000 +0900 -+++ ./js/src/Makefile.in 2005-12-04 19:45:33.000000000 +0900 -@@ -256,6 +256,9 @@ - ifeq ($(OS_ARCH),FreeBSD) - LDFLAGS += -pthread - endif -+ifeq ($(OS_ARCH),DragonFly) -+LDFLAGS += -pthread -+endif - ifeq ($(OS_ARCH),IRIX) - ifdef USE_N32 - DASH_R += -n32 diff --git a/www/firefox2/patches/patch-dw b/www/firefox2/patches/patch-dw deleted file mode 100644 index d9e3d4edeb5..00000000000 --- a/www/firefox2/patches/patch-dw +++ /dev/null @@ -1,32 +0,0 @@ -$NetBSD: patch-dw,v 1.1 2006/12/06 20:37:00 joerg Exp $ - ---- db/sqlite3/src/os_unix.c.orig 2006-05-22 19:12:32.000000000 +0000 -+++ db/sqlite3/src/os_unix.c -@@ -443,6 +443,7 @@ static int lockTrace(int fd, int op, str - #define fcntl lockTrace - #endif /* SQLITE_LOCK_TRACE */ - -+#if SQLITE_THREAD_OVERRIDE_LOCK == -1 - /* - ** The testThreadLockingBehavior() routine launches two separate - ** threads on this routine. This routine attempts to lock a file -@@ -483,6 +484,7 @@ static void testThreadLockingBehavior(in - close(fd); - threadsOverrideEachOthersLocks = d[0].result==0 && d[1].result==0; - } -+#endif - #endif /* SQLITE_UNIX_THREADS */ - - /* -@@ -536,9 +538,11 @@ static int findLockInfo( - key1.dev = statbuf.st_dev; - key1.ino = statbuf.st_ino; - #ifdef SQLITE_UNIX_THREADS -+#if SQLITE_THREAD_OVERRIDE_LOCK == -1 - if( threadsOverrideEachOthersLocks<0 ){ - testThreadLockingBehavior(fd); - } -+#endif - key1.tid = threadsOverrideEachOthersLocks ? 0 : pthread_self(); - #endif - memset(&key2, 0, sizeof(key2)); diff --git a/www/firefox2/patches/patch-ea b/www/firefox2/patches/patch-ea deleted file mode 100644 index cb523eaf7a6..00000000000 --- a/www/firefox2/patches/patch-ea +++ /dev/null @@ -1,14 +0,0 @@ -$NetBSD: patch-ea,v 1.1.1.1 2006/10/24 22:20:12 ghen Exp $ - ---- toolkit/components/history/src/nsGlobalHistory.cpp.orig 2006-02-02 20:55:17.000000000 +0100 -+++ toolkit/components/history/src/nsGlobalHistory.cpp -@@ -1132,6 +1132,9 @@ nsGlobalHistory::SetPageTitle(nsIURI *aU - rv = aURI->GetSpec(URISpec); - NS_ENSURE_SUCCESS(rv, rv); - -+ if (URISpec.Length() > HISTORY_URI_LENGTH_MAX) -+ URISpec.Left(URISpec, HISTORY_URI_LENGTH_MAX); -+ - nsCOMPtr<nsIMdbRow> row; - rv = FindRow(kToken_URLColumn, URISpec.get(), getter_AddRefs(row)); - diff --git a/www/firefox2/patches/patch-eb b/www/firefox2/patches/patch-eb deleted file mode 100644 index 8d29599962e..00000000000 --- a/www/firefox2/patches/patch-eb +++ /dev/null @@ -1,14 +0,0 @@ -$NetBSD: patch-eb,v 1.1.1.1 2006/10/24 22:20:12 ghen Exp $ - ---- xpfe/components/history/src/nsGlobalHistory.cpp.orig 2006-02-02 20:55:17.000000000 +0100 -+++ xpfe/components/history/src/nsGlobalHistory.cpp -@@ -1055,6 +1055,9 @@ nsGlobalHistory::SetPageTitle(nsIURI *aU - rv = aURI->GetSpec(URISpec); - NS_ENSURE_SUCCESS(rv, rv); - -+ if (URISpec.Length() > HISTORY_URI_LENGTH_MAX) -+ URISpec.Left(URISpec, HISTORY_URI_LENGTH_MAX); -+ - nsCOMPtr<nsIMdbRow> row; - rv = FindRow(kToken_URLColumn, URISpec.get(), getter_AddRefs(row)); - diff --git a/www/firefox2/patches/patch-ec b/www/firefox2/patches/patch-ec deleted file mode 100644 index 1fc009ccbd8..00000000000 --- a/www/firefox2/patches/patch-ec +++ /dev/null @@ -1,16 +0,0 @@ -$NetBSD: patch-ec,v 1.1.1.1 2006/10/24 22:20:11 ghen Exp $ - -ERROR: [check-portability.sh] => Found test ... == ...: -ERROR: [check-portability.sh] build/autoconf/mozconfig2configure: if [ "$APP" == "$MOZ_BUILD_APP" ]; then - ---- build/autoconf/mozconfig2configure.orig 2006-02-22 17:19:52.000000000 +0100 -+++ build/autoconf/mozconfig2configure -@@ -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/www/firefox2/patches/patch-ed b/www/firefox2/patches/patch-ed deleted file mode 100644 index 9ad7fb2e6c8..00000000000 --- a/www/firefox2/patches/patch-ed +++ /dev/null @@ -1,20 +0,0 @@ -$NetBSD: patch-ed,v 1.1 2006/11/17 08:12:14 martin Exp $ - ---- profile/dirserviceprovider/src/nsProfileLock.cpp.orig 2005-11-01 02:20:38.000000000 +0100 -+++ profile/dirserviceprovider/src/nsProfileLock.cpp 2006-11-16 09:50:12.000000000 +0100 -@@ -384,6 +384,7 @@ nsresult nsProfileLock::LockWithSymlink( - act.sa_flags = 0; - sigfillset(&act.sa_mask); - -+#ifndef DEBUG - #define CATCH_SIGNAL(signame) \ - PR_BEGIN_MACRO \ - if (sigaction(signame, NULL, &oldact) == 0 && \ -@@ -402,6 +403,7 @@ PR_BEGIN_MACRO - CATCH_SIGNAL(SIGTERM); - - #undef CATCH_SIGNAL -+#endif - } - } - } |