summaryrefslogtreecommitdiff
path: root/www/firefox
diff options
context:
space:
mode:
authorjoerg <joerg@pkgsrc.org>2005-10-12 16:39:24 +0000
committerjoerg <joerg@pkgsrc.org>2005-10-12 16:39:24 +0000
commit267b973fcf60a366004f87da077951d7ce4f4bb2 (patch)
tree023fa16525b21d2519e8dc90a7e4657d099b69c8 /www/firefox
parent998ce5f4425c559fdfaf00383cc00e8ce41642cb (diff)
downloadpkgsrc-267b973fcf60a366004f87da077951d7ce4f4bb2.tar.gz
Add DragonFly support for Firefox 1.0.7.
Diffstat (limited to 'www/firefox')
-rw-r--r--www/firefox/distinfo32
-rw-r--r--www/firefox/patches/patch-ab22
-rw-r--r--www/firefox/patches/patch-ac17
-rw-r--r--www/firefox/patches/patch-aq29
-rw-r--r--www/firefox/patches/patch-bo60
-rw-r--r--www/firefox/patches/patch-bq4
-rw-r--r--www/firefox/patches/patch-bs34
-rw-r--r--www/firefox/patches/patch-cg9
-rw-r--r--www/firefox/patches/patch-db13
-rw-r--r--www/firefox/patches/patch-dc22
-rw-r--r--www/firefox/patches/patch-dd13
-rw-r--r--www/firefox/patches/patch-df31
-rw-r--r--www/firefox/patches/patch-dh18
-rw-r--r--www/firefox/patches/patch-dj13
-rw-r--r--www/firefox/patches/patch-dk13
-rw-r--r--www/firefox/patches/patch-dl88
-rw-r--r--www/firefox/patches/patch-dm15
-rw-r--r--www/firefox/patches/patch-do87
-rw-r--r--www/firefox/patches/patch-dp13
-rw-r--r--www/firefox/patches/patch-dr13
-rw-r--r--www/firefox/patches/patch-ds13
-rw-r--r--www/firefox/patches/patch-dt13
-rw-r--r--www/firefox/patches/patch-du17
-rw-r--r--www/firefox/patches/patch-dv14
24 files changed, 568 insertions, 35 deletions
diff --git a/www/firefox/distinfo b/www/firefox/distinfo
index 3a1f8daab66..7b013cbd24c 100644
--- a/www/firefox/distinfo
+++ b/www/firefox/distinfo
@@ -1,11 +1,11 @@
-$NetBSD: distinfo,v 1.38 2005/09/22 14:14:04 jlam Exp $
+$NetBSD: distinfo,v 1.39 2005/10/12 16:39:24 joerg Exp $
SHA1 (firefox-1.0.7/firefox-1.0.7-source.tar.bz2) = ac7549f609db8dbea6db33b2ffb3ae546eea64df
RMD160 (firefox-1.0.7/firefox-1.0.7-source.tar.bz2) = 8afafa2d772cabeacde5bad6dc053f9a0ee9a588
Size (firefox-1.0.7/firefox-1.0.7-source.tar.bz2) = 32793876 bytes
SHA1 (patch-aa) = 3684fbb59a56c03536686ca51876a01759b6f4b5
-SHA1 (patch-ab) = cbc4efd470f4678aee40628b8b95d919d0d15d1f
-SHA1 (patch-ac) = cdf3a52f3c5ecd7285c8235a00832bc8b479285a
+SHA1 (patch-ab) = 00b9e799b390d3d7ca68c51d08816f8dcc674448
+SHA1 (patch-ac) = 242f2aa82d9518fc943879e3a0e73c32176ef69d
SHA1 (patch-ad) = 213a9918f5a90e907b4b788c64cc01bfd8e55d3f
SHA1 (patch-ae) = 6d26873efe3e6b2614ce71f784c27a6ce288f2b4
SHA1 (patch-af) = a2dd473773b2960b3bd38943838139674725849d
@@ -18,16 +18,16 @@ SHA1 (patch-al) = 9bbbb2e3627a26f7a942d16ce927487bf0c81250
SHA1 (patch-an) = 0ea10d371226ee8e7c2cbbbf291623ebbb31f1c3
SHA1 (patch-ao) = 6f4bc48ed8eb507c43005ded5f000df05c21b5c9
SHA1 (patch-ap) = 2fce6e5036d4e3d84c2767f8aaaaa0c75d5c6927
-SHA1 (patch-aq) = 46481b0974bdf9dc5f797a6f30a019437cc7847f
+SHA1 (patch-aq) = 9131a1a5d3614de98ca23c717b35ce86312bbd80
SHA1 (patch-aw) = cb450d92a994267dc17dc1bc3161b3f8b4bfa9ee
SHA1 (patch-ax) = 901af81169ce26f190594a3ae65ea16e53dcb48e
SHA1 (patch-ba) = 241a37462541c824789c3d7cb732f88c0d2e888a
SHA1 (patch-bb) = 9ff5bc4e799f29eec237d24ea6f8be2e63cbbf5b
SHA1 (patch-bm) = fa85228b45f72e6f04cbf32635de9211dff7c1b9
-SHA1 (patch-bo) = 989520d608b6a60169c70bb6f5da3608aa36cf8d
-SHA1 (patch-bq) = 9a62891af626f753f88edb9d0a8dcbd2059de4ce
+SHA1 (patch-bo) = d84fd3d978cb229948681ceee5ab3ffdb951e6f3
+SHA1 (patch-bq) = ca71c984b8c4099fa1af21542da6fd180fb62e10
SHA1 (patch-br) = f3e5b80f1aa6ac3feac1888204421a69a87cec55
-SHA1 (patch-bs) = 764be3a1dbe92711e3c1448cdf31df15a2056663
+SHA1 (patch-bs) = ac910aaf7eaaacc453c36ac099f3cca7496c9133
SHA1 (patch-bt) = 7663b270c2b4eeb93a42e4a9b4b7691a7d384943
SHA1 (patch-bu) = e90013f1dd881b26d96db858ec812ae71b867153
SHA1 (patch-bv) = 70143d3ed461f1069ad7ff1ac95ff32c7eab66ef
@@ -41,10 +41,26 @@ SHA1 (patch-cc) = ff5363411fce78bab406d86f13fc30e8397e668a
SHA1 (patch-cd) = 42c857b9e4567f25bf6bea4abe958c83525ebbd9
SHA1 (patch-ce) = 95d6f4adec6a5b9f9aa05635e68ccd3d4ec71f53
SHA1 (patch-cf) = 380d628e368c9ca0da6f3e41ddaeff9e04f01d62
-SHA1 (patch-cg) = 25c6adff07b120b718d38f7cd6d909688919953b
+SHA1 (patch-cg) = 3dd4c9ba21276436e416085d4551a6b6d9f12fe5
SHA1 (patch-ch) = bd1c186d2b538ffe1e335e9f6a394fe926925f80
SHA1 (patch-ci) = 843c875b37707249cba51328f81f5343b7a8769b
SHA1 (patch-cj) = 9f90d4416640ad4a542a63ccdb68bda463b27ad8
SHA1 (patch-ck) = 14eaaf75d3330d3efda0a1d746d345dca9ad84f6
SHA1 (patch-cl) = c1c1c9e5c27b3c31ccbd12baa539e30139870b34
SHA1 (patch-cm) = e8b3571a532e898f1eadfa0f2f1b116b1a590afd
+SHA1 (patch-db) = 2188ac37d5af04ab0022512b5a6486d18361d1d9
+SHA1 (patch-dc) = 3b1cf94da773f58194e75397ed8bd2ba8f636bc0
+SHA1 (patch-dd) = 3048d44c50cf85bf3dd3820213d7095bf2c7149f
+SHA1 (patch-df) = f9cb461b1f18f261af7115dc3b18fcbc1fef0a56
+SHA1 (patch-dh) = 500f8836d20ccab30f96215b18118f79a4f9ba2e
+SHA1 (patch-dj) = 73946a35ba6ac949c4717bb043fc63e4bcf60d4d
+SHA1 (patch-dk) = 2974c32601b0a793935d21e4f55a2eb3b20da915
+SHA1 (patch-dl) = 68287c1fe478eb221af4a43a3dea585b46ebe421
+SHA1 (patch-dm) = cfe45c664bafb035a00f4b346efb866d2079f5cb
+SHA1 (patch-do) = e12ba005ecbaf066275e5410ca97244cb8f729e7
+SHA1 (patch-dp) = b1087dc8f85ed18e54d371ddb2dc47b4b199da36
+SHA1 (patch-dr) = c35f305f63bcd5ddc3e55725ddcb9f03c0ea29c0
+SHA1 (patch-ds) = 2d101e4ceeba746f92896c1134eb303cb682cb4a
+SHA1 (patch-dt) = 8e70ff6babd4b236d51bcf6d47f2b26c4c643369
+SHA1 (patch-du) = 7a499969651573d923b6e40d06d9c3ae467ad6ce
+SHA1 (patch-dv) = 5baa26fcf9295b776a0ac08386d10dcb005ab0f7
diff --git a/www/firefox/patches/patch-ab b/www/firefox/patches/patch-ab
index c0ded09dc7a..45fa51a7844 100644
--- a/www/firefox/patches/patch-ab
+++ b/www/firefox/patches/patch-ab
@@ -1,8 +1,18 @@
-$NetBSD: patch-ab,v 1.3 2005/07/25 15:46:51 adam Exp $
+$NetBSD: patch-ab,v 1.4 2005/10/12 16:39:24 joerg Exp $
---- configure.in.orig 2004-10-31 07:17:58.000000000 +0000
-+++ configure.in
-@@ -1022,6 +1022,9 @@ case "$target" in
+diff -ru ../Orig/mozilla/configure.in ./configure.in
+--- ../Orig/mozilla/configure.in 2004-05-14 06:57:46.000000000 +0900
++++ ./configure.in 2004-06-15 23:55:39.000000000 +0900
+@@ -1008,7 +1008,7 @@
+ esac
+ ;;
+
+-*-freebsd*)
++*-freebsd* | *-dragonfly*)
+ if test `test -x /usr/bin/objformat && /usr/bin/objformat || echo aout` != "elf"; then
+ DLL_SUFFIX=".so.1.0"
+ DSO_LDOPTS="-shared"
+@@ -1017,6 +1017,9 @@
# MKSHLIB_FORCE_ALL='-Wl,-Bforcearchive'
# MKSHLIB_UNFORCE_ALL=''
# fi
@@ -12,7 +22,7 @@ $NetBSD: patch-ab,v 1.3 2005/07/25 15:46:51 adam Exp $
;;
*-hpux*)
-@@ -1316,6 +1319,13 @@ case "$target" in
+@@ -1308,6 +1311,13 @@
if test "$LIBRUNPATH"; then
DSO_LDOPTS="-Wl,-R$LIBRUNPATH $DSO_LDOPTS"
fi
@@ -26,7 +36,7 @@ $NetBSD: patch-ab,v 1.3 2005/07/25 15:46:51 adam Exp $
;;
*-nto*)
-@@ -1539,7 +1549,7 @@ dnl the qsort routine under solaris is f
+@@ -1531,7 +1541,7 @@
MKCSHLIB='$(CC) $(CFLAGS) $(DSO_PIC_FLAGS) -G -Wl,-z -Wl,muldefs -o $@'
MKSHLIB_FORCE_ALL='-Qoption ld -z,allextract'
MKSHLIB_UNFORCE_ALL=''
diff --git a/www/firefox/patches/patch-ac b/www/firefox/patches/patch-ac
index cb5c197094c..0f0e2c83f2c 100644
--- a/www/firefox/patches/patch-ac
+++ b/www/firefox/patches/patch-ac
@@ -1,8 +1,13 @@
-$NetBSD: patch-ac,v 1.5 2005/09/22 14:14:04 jlam Exp $
+$NetBSD: patch-ac,v 1.6 2005/10/12 16:39:24 joerg Exp $
--- xpcom/reflect/xptcall/src/md/unix/Makefile.in.orig 2005-04-28 16:01:33.000000000 +0000
+++ xpcom/reflect/xptcall/src/md/unix/Makefile.in
-@@ -49,6 +49,9 @@ ifneq (,$(filter FreeBSD NetBSD OpenBSD
+@@ -45,10 +45,13 @@
+ #
+ # 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
@@ -12,7 +17,7 @@ $NetBSD: patch-ac,v 1.5 2005/09/22 14:14:04 jlam Exp $
endif
#
# New code for Linux, et. al., with gcc
-@@ -140,7 +143,7 @@ endif
+@@ -140,7 +143,7 @@
# NetBSD/ARM
#
ifeq ($(OS_ARCH),NetBSD)
@@ -21,7 +26,7 @@ $NetBSD: patch-ac,v 1.5 2005/09/22 14:14:04 jlam Exp $
CPPSRCS := xptcinvoke_arm_netbsd.cpp xptcstubs_arm_netbsd.cpp
endif
endif
-@@ -174,7 +177,7 @@ endif
+@@ -174,7 +177,7 @@
# NetBSD/m68k
#
ifeq ($(OS_ARCH),NetBSD)
@@ -30,7 +35,7 @@ $NetBSD: patch-ac,v 1.5 2005/09/22 14:14:04 jlam Exp $
CPPSRCS := xptcinvoke_netbsd_m68k.cpp xptcstubs_netbsd_m68k.cpp
endif
endif
-@@ -257,6 +260,7 @@ endif
+@@ -257,6 +260,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
@@ -38,7 +43,7 @@ $NetBSD: patch-ac,v 1.5 2005/09/22 14:14:04 jlam Exp $
endif
#
-@@ -305,6 +309,13 @@ ifeq ($(OS_ARCH)$(OS_TEST),NetBSDsparc)
+@@ -305,6 +309,13 @@
CPPSRCS := xptcinvoke_sparc_netbsd.cpp xptcstubs_sparc_netbsd.cpp
ASFILES := xptcinvoke_asm_sparc_netbsd.s xptcstubs_asm_sparc_netbsd.s
endif
diff --git a/www/firefox/patches/patch-aq b/www/firefox/patches/patch-aq
index 2dc484cf178..e3c12669934 100644
--- a/www/firefox/patches/patch-aq
+++ b/www/firefox/patches/patch-aq
@@ -1,4 +1,4 @@
-$NetBSD: patch-aq,v 1.2 2005/09/22 14:14:04 jlam Exp $
+$NetBSD: patch-aq,v 1.3 2005/10/12 16:39:24 joerg Exp $
--- directory/c-sdk/configure.in.orig 2004-09-14 20:59:40.000000000 +0000
+++ directory/c-sdk/configure.in
@@ -11,3 +11,30 @@ $NetBSD: patch-aq,v 1.2 2005/09/22 14:14:04 jlam Exp $
_DEBUG_FLAGS=-g
MOZ_DEBUG=1
MOZ_OPTIMIZE=
+@@ -888,7 +888,7 @@ case "$target" in
+ PR_MD_CSRCS=dgux.c
+ ;;
+
+-*-freebsd*)
++*-freebsd*|*-dragonfly*)
+ if test -z "$USE_NSPR_THREADS"; then
+ USE_PTHREADS=1
+ fi
+@@ -2046,7 +2046,7 @@ if test -n "$USE_PTHREADS"; then
+ _PTHREAD_LDFLAGS=
+ fi
+ ;;
+- *-freebsd*|*-openbsd*|*-bsdi*|*-netbsd*)
++ *-freebsd*|*-openbsd*|*-bsdi*|*-netbsd*|*-dragonfly*)
+ AC_DEFINE(_THREAD_SAFE)
+ dnl -pthread links in -lc_r, so don't specify it explicitly.
+ if test "$ac_cv_have_dash_pthread" = "yes"; then
+@@ -2099,7 +2099,7 @@ case "$target" in
+ 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/firefox/patches/patch-bo b/www/firefox/patches/patch-bo
index 4bdcac92de2..3a939415f52 100644
--- a/www/firefox/patches/patch-bo
+++ b/www/firefox/patches/patch-bo
@@ -1,6 +1,6 @@
-$NetBSD: patch-bo,v 1.4 2005/07/25 15:46:51 adam Exp $
+$NetBSD: patch-bo,v 1.5 2005/10/12 16:39:24 joerg Exp $
---- nsprpub/configure.in.orig 2004-09-14 20:59:41.000000000 +0000
+--- nsprpub/configure.in.orig 2004-09-14 22:59:41.000000000 +0200
+++ nsprpub/configure.in
@@ -56,7 +56,7 @@ USE_CPLUS=
USE_IPV6=
@@ -11,17 +11,42 @@ $NetBSD: patch-bo,v 1.4 2005/07/25 15:46:51 adam Exp $
_DEBUG_FLAGS=-g
MOZ_DEBUG=1
MOZ_OPTIMIZE=
-@@ -933,6 +933,9 @@ case "$target" in
+@@ -933,6 +933,34 @@ case "$target" in
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*)
-@@ -1417,6 +1420,7 @@ mips-nec-sysv*)
+@@ -1417,6 +1445,7 @@ mips-nec-sysv*)
AC_DEFINE(XP_UNIX)
AC_DEFINE(NETBSD)
AC_DEFINE(HAVE_BSD_FLOCK)
@@ -29,3 +54,30 @@ $NetBSD: patch-bo,v 1.4 2005/07/25 15:46:51 adam Exp $
USE_NSPR_THREADS=1
MDCPUCFG_H=_netbsd.cfg
PR_MD_CSRCS=netbsd.c
+@@ -2149,7 +2178,7 @@ if test -n "$USE_PTHREADS"; then
+ 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
+ ;;
+ *)
+@@ -2187,7 +2216,7 @@ if test -n "$USE_PTHREADS"; then
+ _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.
+@@ -2269,7 +2298,7 @@ case "$target" in
+ 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/firefox/patches/patch-bq b/www/firefox/patches/patch-bq
index 9233d11f744..bcaae295c68 100644
--- a/www/firefox/patches/patch-bq
+++ b/www/firefox/patches/patch-bq
@@ -1,4 +1,4 @@
-$NetBSD: patch-bq,v 1.4 2005/09/22 14:14:04 jlam Exp $
+$NetBSD: patch-bq,v 1.5 2005/10/12 16:39:24 joerg Exp $
--- xpcom/io/nsLocalFileUnix.h.orig 2004-01-15 06:14:13.000000000 +0000
+++ xpcom/io/nsLocalFileUnix.h
@@ -7,7 +7,7 @@ $NetBSD: patch-bq,v 1.4 2005/09/22 14:14:04 jlam Exp $
// so we can statfs on freebsd
-#if defined(__FreeBSD__)
-+#if defined(__FreeBSD__) || (defined(__NetBSD__) && !defined(HAVE_STATVFS))
++#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/firefox/patches/patch-bs b/www/firefox/patches/patch-bs
index 1f4c0417091..021111ebd35 100644
--- a/www/firefox/patches/patch-bs
+++ b/www/firefox/patches/patch-bs
@@ -1,14 +1,38 @@
-$NetBSD: patch-bs,v 1.3 2005/09/22 14:14:04 jlam Exp $
+$NetBSD: patch-bs,v 1.4 2005/10/12 16:39:25 joerg Exp $
---- config/mkdepend/imakemdep.h.orig 1998-09-05 04:22:25.000000000 +0000
-+++ config/mkdepend/imakemdep.h
-@@ -277,6 +277,9 @@ char *cpp_argv[ARGUMENTS] = {
+--- config/mkdepend/imakemdep.h.orig 1998-09-05 06:22:25.000000000 +0200
++++ config/mkdepend/imakemdep.h 2004-11-17 10:33:27.000000000 +0100
+@@ -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,10 +273,13 @@
+ #ifdef unix
+ "-Uunix", /* remove unix symbol so that filename unix.c okay */
+ #endif
+-#if defined(__386BSD__) || defined(__NetBSD__) || defined(__FreeBSD__) || defined(__OpenBSD__) || defined(MACH)
++#if defined(__386BSD__) || defined(__NetBSD__) || defined(__FreeBSD__) || defined(__OpenBSD__) || defined(MACH) || defined(__DragonFly__)
# ifdef __i386__
"-D__i386__",
# endif
-+#if defined(__amd64__) || defined(__x86_64__)
++# if defined(__amd64__) || defined(__x86_64__)
+ "-D__amd64__ -D__x86_64__",
+# endif
# ifdef __GNUC__
"-traditional",
# endif
+@@ -710,6 +713,9 @@
+ #ifdef __sgi
+ {"__sgi", "1"},
+ #endif
++#ifdef __DragonFly__
++ {"__DragonFly__", "1"},
++#endif
+ #ifdef __FreeBSD__
+ {"__FreeBSD__", "1"},
+ #endif
diff --git a/www/firefox/patches/patch-cg b/www/firefox/patches/patch-cg
index 0ea70534cf9..65949f22a66 100644
--- a/www/firefox/patches/patch-cg
+++ b/www/firefox/patches/patch-cg
@@ -1,8 +1,8 @@
-$NetBSD: patch-cg,v 1.5 2005/09/22 14:14:04 jlam Exp $
+$NetBSD: patch-cg,v 1.6 2005/10/12 16:39:25 joerg Exp $
--- extensions/transformiix/source/base/Double.cpp.orig 2004-01-15 21:23:18.000000000 +0000
+++ extensions/transformiix/source/base/Double.cpp
-@@ -48,6 +48,38 @@
+@@ -48,8 +48,40 @@
* Utility class for doubles
*/
@@ -39,8 +39,11 @@ $NetBSD: patch-cg,v 1.5 2005/09/22 14:14:04 jlam Exp $
+#else /* pre INFINITY C environment */
+
//A trick to handle IEEE floating point exceptions on FreeBSD - E.D.
- #ifdef __FreeBSD__
+-#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;
@@ -127,9 +159,20 @@ const PRUint32 infMask[2] = {0, TX_DO
const PRUint32 negInfMask[2] = {0, TX_DOUBLE_HI32_EXPMASK | TX_DOUBLE_HI32_SIGNBIT};
#endif
diff --git a/www/firefox/patches/patch-db b/www/firefox/patches/patch-db
new file mode 100644
index 00000000000..1dae0b3acef
--- /dev/null
+++ b/www/firefox/patches/patch-db
@@ -0,0 +1,13 @@
+$NetBSD: patch-db,v 1.1 2005/10/12 16:39:25 joerg Exp $
+
+--- gc/boehm/gcconfig.h.orig 2004-11-17 10:31:05.000000000 +0100
++++ gc/boehm/gcconfig.h 2004-11-17 10:31:15.000000000 +0100
+@@ -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/firefox/patches/patch-dc b/www/firefox/patches/patch-dc
new file mode 100644
index 00000000000..eaa2dbae6e4
--- /dev/null
+++ b/www/firefox/patches/patch-dc
@@ -0,0 +1,22 @@
+$NetBSD: patch-dc,v 1.1 2005/10/12 16:39:25 joerg Exp $
+
+--- gc/boehm/mach_dep.c.orig 2004-11-17 10:30:03.000000000 +0100
++++ gc/boehm/mach_dep.c 2004-11-17 10:30:50.000000000 +0100
+@@ -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/firefox/patches/patch-dd b/www/firefox/patches/patch-dd
new file mode 100644
index 00000000000..e4ba7358cd7
--- /dev/null
+++ b/www/firefox/patches/patch-dd
@@ -0,0 +1,13 @@
+$NetBSD: patch-dd,v 1.1 2005/10/12 16:39:25 joerg Exp $
+
+--- mailnews/movemail/src/movemail.c.orig 2004-11-17 10:29:29.000000000 +0100
++++ mailnews/movemail/src/movemail.c 2004-11-17 10:29:43.000000000 +0100
+@@ -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/firefox/patches/patch-df b/www/firefox/patches/patch-df
new file mode 100644
index 00000000000..ec1378115d7
--- /dev/null
+++ b/www/firefox/patches/patch-df
@@ -0,0 +1,31 @@
+$NetBSD: patch-df,v 1.1 2005/10/12 16:39:25 joerg Exp $
+
+--- nsprpub/pr/include/md/_freebsd.h.orig 2003-11-16 00:36:13.000000000 +0100
++++ nsprpub/pr/include/md/_freebsd.h 2004-11-17 10:19:00.000000000 +0100
+@@ -72,7 +76,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
+@@ -81,7 +85,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
+@@ -90,7 +94,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/firefox/patches/patch-dh b/www/firefox/patches/patch-dh
new file mode 100644
index 00000000000..60774902429
--- /dev/null
+++ b/www/firefox/patches/patch-dh
@@ -0,0 +1,18 @@
+$NetBSD: patch-dh,v 1.1 2005/10/12 16:39:25 joerg Exp $
+
+--- xpcom/reflect/xptcall/src/md/unix/xptc_platforms_unixish_x86.h.orig 2004-11-17 11:30:31.000000000 +0100
++++ xpcom/reflect/xptcall/src/md/unix/xptc_platforms_unixish_x86.h 2004-11-17 11:30:50.000000000 +0100
+@@ -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/firefox/patches/patch-dj b/www/firefox/patches/patch-dj
new file mode 100644
index 00000000000..45358bbc705
--- /dev/null
+++ b/www/firefox/patches/patch-dj
@@ -0,0 +1,13 @@
+$NetBSD: patch-dj,v 1.1 2005/10/12 16:39:25 joerg Exp $
+
+--- dbm/src/mktemp.c.orig 2005-05-23 21:26:42.000000000 +0200
++++ dbm/src/mktemp.c 2005-05-23 21:27:08.000000000 +0200
+@@ -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/firefox/patches/patch-dk b/www/firefox/patches/patch-dk
new file mode 100644
index 00000000000..3a5be31ec05
--- /dev/null
+++ b/www/firefox/patches/patch-dk
@@ -0,0 +1,13 @@
+$NetBSD: patch-dk,v 1.1 2005/10/12 16:39:25 joerg Exp $
+
+--- security/coreconf/config.mk.orig 2005-05-24 01:20:38.000000000 +0200
++++ security/coreconf/config.mk 2005-05-24 01:20:09.000000000 +0200
+@@ -59,7 +59,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/firefox/patches/patch-dl b/www/firefox/patches/patch-dl
new file mode 100644
index 00000000000..5bc7ff098f8
--- /dev/null
+++ b/www/firefox/patches/patch-dl
@@ -0,0 +1,88 @@
+$NetBSD: patch-dl,v 1.1 2005/10/12 16:39:25 joerg Exp $
+
+--- /dev/null 2005-05-24 01:23:34.000000000 +0200
++++ security/coreconf/DragonFly.mk 2005-05-24 01:23:34.000000000 +0200
+@@ -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/firefox/patches/patch-dm b/www/firefox/patches/patch-dm
new file mode 100644
index 00000000000..8c3444430da
--- /dev/null
+++ b/www/firefox/patches/patch-dm
@@ -0,0 +1,15 @@
+$NetBSD: patch-dm,v 1.1 2005/10/12 16:39:25 joerg Exp $
+
+--- security/nss/cmd/platlibs.mk.orig 2005-05-24 14:48:31.000000000 +0200
++++ security/nss/cmd/platlibs.mk 2005-05-24 14:48:38.000000000 +0200
+@@ -182,8 +182,8 @@ endif
+ # If GNU ld is used, we must use the -rpath-link option to tell
+ # the linker where to find libsoftokn3.so, an implicit dependency
+ # of libnss3.so.
+-ifeq (,$(filter-out BSD_OS FreeBSD Linux NetBSD, $(OS_ARCH)))
+-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/firefox/patches/patch-do b/www/firefox/patches/patch-do
new file mode 100644
index 00000000000..ce52f010d38
--- /dev/null
+++ b/www/firefox/patches/patch-do
@@ -0,0 +1,87 @@
+$NetBSD: patch-do,v 1.1 2005/10/12 16:39:25 joerg Exp $
+
+--- /dev/null 2005-05-24 23:07:26.000000000 +0200
++++ directory/c-sdk/config/DragonFly.mk 2005-05-25 00:01:24.000000000 +0200
+@@ -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/firefox/patches/patch-dp b/www/firefox/patches/patch-dp
new file mode 100644
index 00000000000..516468d98f9
--- /dev/null
+++ b/www/firefox/patches/patch-dp
@@ -0,0 +1,13 @@
+$NetBSD: patch-dp,v 1.1 2005/10/12 16:39:25 joerg Exp $
+
+--- other-licenses/libical/src/libical/Makefile.in.orig 2005-05-25 00:03:42.000000000 +0200
++++ other-licenses/libical/src/libical/Makefile.in 2005-05-25 00:03:51.000000000 +0200
+@@ -179,7 +179,7 @@
+ $(PERL) $(ICALSCRIPTS)/mkrestrictiontable.pl -i $(srcdir)/icalrestriction.c.in \
+ $(DESIGNDATA)/restrictions.csv > icalrestriction.c
+
+-ifneq (,$(filter BeOS Darwin OpenVMS NetBSD FreeBSD,$(OS_ARCH)))
++ifneq (,$(filter BeOS Darwin OpenVMS NetBSD FreeBSD DragonFly,$(OS_ARCH)))
+ DEFINES += -D__USE_BSD=1
+ endif
+
diff --git a/www/firefox/patches/patch-dr b/www/firefox/patches/patch-dr
new file mode 100644
index 00000000000..851184af5e0
--- /dev/null
+++ b/www/firefox/patches/patch-dr
@@ -0,0 +1,13 @@
+$NetBSD: patch-dr,v 1.1 2005/10/12 16:39:25 joerg Exp $
+
+--- config/config.mk.orig 2005-05-25 00:07:14.000000000 +0200
++++ config/config.mk 2005-05-25 00:07:26.000000000 +0200
+@@ -146,7 +146,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/firefox/patches/patch-ds b/www/firefox/patches/patch-ds
new file mode 100644
index 00000000000..d4a469b5e0d
--- /dev/null
+++ b/www/firefox/patches/patch-ds
@@ -0,0 +1,13 @@
+$NetBSD: patch-ds,v 1.1 2005/10/12 16:39:25 joerg Exp $
+
+--- security/coreconf/arch.mk.orig 2005-06-03 20:57:46.000000000 +0200
++++ security/coreconf/arch.mk
+@@ -141,7 +141,7 @@ endif
+ # 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/firefox/patches/patch-dt b/www/firefox/patches/patch-dt
new file mode 100644
index 00000000000..e08e1fe2fdf
--- /dev/null
+++ b/www/firefox/patches/patch-dt
@@ -0,0 +1,13 @@
+$NetBSD: patch-dt,v 1.1 2005/10/12 16:39:25 joerg Exp $
+
+--- directory/c-sdk/config/arch.mk.orig 2005-06-03 20:59:03.000000000 +0200
++++ directory/c-sdk/config/arch.mk
+@@ -138,7 +138,7 @@ endif
+ # 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/firefox/patches/patch-du b/www/firefox/patches/patch-du
new file mode 100644
index 00000000000..c5e3b876383
--- /dev/null
+++ b/www/firefox/patches/patch-du
@@ -0,0 +1,17 @@
+$NetBSD: patch-du,v 1.1 2005/10/12 16:39:25 joerg Exp $
+
+--- config/rules.mk.orig 2005-06-03 21:08:53.000000000 +0200
++++ config/rules.mk
+@@ -444,6 +444,12 @@ EXTRA_DSO_LDOPTS += -Wl,-Bsymbolic
+ endif
+ endif
+
++ifeq ($(OS_ARCH),DragonFly)
++ifdef IS_COMPONENT
++EXTRA_DSO_LDOPTS += -Wl,-Bsymbolic
++endif
++endif
++
+ ifeq ($(OS_ARCH),NetBSD)
+ ifneq (,$(filter arc cobalt hpcmips mipsco newsmips pmax sgimips,$(OS_TEST)))
+ ifeq ($(MODULE),layout)
diff --git a/www/firefox/patches/patch-dv b/www/firefox/patches/patch-dv
new file mode 100644
index 00000000000..f8d8fee4bec
--- /dev/null
+++ b/www/firefox/patches/patch-dv
@@ -0,0 +1,14 @@
+$NetBSD: patch-dv,v 1.1 2005/10/12 16:39:25 joerg Exp $
+
+--- js/src/Makefile.in.orig 2005-06-03 21:11:22.000000000 +0200
++++ js/src/Makefile.in
+@@ -250,6 +250,9 @@ endif # WINNT
+ ifeq ($(OS_ARCH),FreeBSD)
+ LDFLAGS += -pthread
+ endif
++ifeq ($(OS_ARCH),DragonFly)
++LDFLAGS += -pthread
++endif
+ ifeq ($(OS_ARCH),IRIX)
+ ifdef USE_N32
+ DASH_R += -n32