From 2b58a261c8d786662e8f4247c470e492bd123744 Mon Sep 17 00:00:00 2001 From: joerg Date: Wed, 28 Jun 2006 21:23:29 +0000 Subject: Disable visiblity support. Add DragonFly support. Derived from Firefox patches. --- www/seamonkey/Makefile.common | 3 +- www/seamonkey/distinfo | 29 ++++++++++---- www/seamonkey/patches/patch-ab | 11 +++++- www/seamonkey/patches/patch-ac | 11 ++++-- www/seamonkey/patches/patch-aq | 29 +++++++++++++- www/seamonkey/patches/patch-bo | 65 +++++++++++++++++++++++++++--- www/seamonkey/patches/patch-bq | 9 +++-- www/seamonkey/patches/patch-cg | 20 ++++++---- www/seamonkey/patches/patch-db | 14 +++++++ www/seamonkey/patches/patch-dc | 23 +++++++++++ www/seamonkey/patches/patch-dd | 14 +++++++ www/seamonkey/patches/patch-df | 32 +++++++++++++++ www/seamonkey/patches/patch-dh | 19 +++++++++ www/seamonkey/patches/patch-dj | 14 +++++++ www/seamonkey/patches/patch-dk | 14 +++++++ www/seamonkey/patches/patch-dl | 89 ++++++++++++++++++++++++++++++++++++++++++ www/seamonkey/patches/patch-dm | 16 ++++++++ www/seamonkey/patches/patch-do | 88 +++++++++++++++++++++++++++++++++++++++++ www/seamonkey/patches/patch-dr | 14 +++++++ www/seamonkey/patches/patch-ds | 14 +++++++ www/seamonkey/patches/patch-dt | 14 +++++++ www/seamonkey/patches/patch-du | 18 +++++++++ www/seamonkey/patches/patch-dv | 15 +++++++ 23 files changed, 544 insertions(+), 31 deletions(-) create mode 100644 www/seamonkey/patches/patch-db create mode 100644 www/seamonkey/patches/patch-dc create mode 100644 www/seamonkey/patches/patch-dd create mode 100644 www/seamonkey/patches/patch-df create mode 100644 www/seamonkey/patches/patch-dh create mode 100644 www/seamonkey/patches/patch-dj create mode 100644 www/seamonkey/patches/patch-dk create mode 100644 www/seamonkey/patches/patch-dl create mode 100644 www/seamonkey/patches/patch-dm create mode 100644 www/seamonkey/patches/patch-do create mode 100644 www/seamonkey/patches/patch-dr create mode 100644 www/seamonkey/patches/patch-ds create mode 100644 www/seamonkey/patches/patch-dt create mode 100644 www/seamonkey/patches/patch-du create mode 100644 www/seamonkey/patches/patch-dv (limited to 'www/seamonkey') diff --git a/www/seamonkey/Makefile.common b/www/seamonkey/Makefile.common index a3a43b165f5..c22525f82c2 100644 --- a/www/seamonkey/Makefile.common +++ b/www/seamonkey/Makefile.common @@ -1,4 +1,4 @@ -# $NetBSD: Makefile.common,v 1.6 2006/06/15 22:13:59 jlam Exp $ +# $NetBSD: Makefile.common,v 1.7 2006/06/28 21:23:29 joerg Exp $ MOZ_DIST_VER?= ${MOZ_VER} DISTNAME?= seamonkey-${MOZ_DIST_VER}.source @@ -49,6 +49,7 @@ CONFIGURE_ARGS+= --disable-pedantic CONFIGURE_ARGS+= --with-system-jpeg=${BUILDLINK_PREFIX.jpeg:Q} CONFIGURE_ARGS+= --with-system-png=${BUILDLINK_PREFIX.png:Q} CONFIGURE_ARGS+= --enable-crypto +CONFIGURE_ENV+= ac_cv_visibility_pragma=no ac_cv_visibility_hidden=no SHAREMODE?= 644 BUILD_TARGET= # empty diff --git a/www/seamonkey/distinfo b/www/seamonkey/distinfo index bff583f2bb4..29ca42fd60c 100644 --- a/www/seamonkey/distinfo +++ b/www/seamonkey/distinfo @@ -1,11 +1,11 @@ -$NetBSD: distinfo,v 1.5 2006/06/10 12:37:53 ghen Exp $ +$NetBSD: distinfo,v 1.6 2006/06/28 21:23:29 joerg Exp $ SHA1 (seamonkey-1.0.2.source.tar.bz2) = 966e9a57269cd54f40312e5fdaa42e9f2c3fbcea RMD160 (seamonkey-1.0.2.source.tar.bz2) = b6ff9bcb1289ae9190a1934dcc3f6eea3f6d716c Size (seamonkey-1.0.2.source.tar.bz2) = 35473635 bytes SHA1 (patch-aa) = 2d117311991c4c71803f3c446334d7b6f1e1067a -SHA1 (patch-ab) = 1d5d19a6f87c7d76de6f787b5492d347668245b7 -SHA1 (patch-ac) = 730ee80ffc051708015cd89a52f9a2c12109e6c3 +SHA1 (patch-ab) = 4bcabb447ca151c5e87e8799398ee239e69f3f90 +SHA1 (patch-ac) = b05971f672c83c80a29edc69c2055fd6ca855fa1 SHA1 (patch-ad) = 2210b695a2eedefb82c16698a51f4f0f6b2e53e4 SHA1 (patch-ae) = f3c8ffcdfc8c0d5cc75413602c97c731721d751e SHA1 (patch-af) = 4844013ad49c77b87be7c30931ca786f246b40f3 @@ -18,14 +18,14 @@ SHA1 (patch-al) = d916f38de2fa0ca1993ec75c457fccc60ee6d612 SHA1 (patch-an) = 99ac2da44322db96f8d65fbfdb380727b9da96fe SHA1 (patch-ao) = 617d232bd335bc988388f2004ca919c829e371da SHA1 (patch-ap) = 856f74f774b4db7df9b4453aea4d849893ee6bf1 -SHA1 (patch-aq) = 02913aeb1f32eac4ffa64cdafd89fba53a390138 +SHA1 (patch-aq) = 29183e61d6b1a38853151426c2d4ffe45efd9c43 SHA1 (patch-aw) = db73e21e67dc4200312285973faaaed308ea436e SHA1 (patch-ax) = b32483c5259cbe95202944683889bf20a7c1650e SHA1 (patch-ba) = add9ecd6cff002525b2bc63aad7eb142e610b190 SHA1 (patch-bb) = 02739e33cc1f35294257125c39a1223e0e1b07a6 SHA1 (patch-bm) = 3e297a2dece8dcad7bde86f79f944a98d09174a7 -SHA1 (patch-bo) = b1960ca29c6275c2547c5e61348e51b036dabb9b -SHA1 (patch-bq) = 9df1f0cf423ca2935df79c9f2b4b32ffedd2af58 +SHA1 (patch-bo) = 6e06648e1ea9320349f3b2a524055b513ca74358 +SHA1 (patch-bq) = 2b29436d138fea4e1941d537be1a636969db9a77 SHA1 (patch-br) = 17c64ca592a5482a780ad3bc6d5f835ed2c91588 SHA1 (patch-bs) = 3263560fed55d5c7075f28d405d9d705608bfb67 SHA1 (patch-bu) = db33b8651e3cb1fbf9a18dbe78e1e8288cfda0ee @@ -36,7 +36,7 @@ SHA1 (patch-by) = 643185af7a0df7030b2b96447ee4031dc9c82f88 SHA1 (patch-bz) = 6f854d74a9d1d1174ce8eff7d65f8024a7da4711 SHA1 (patch-ca) = 479ef14631ae019ae5ca1c08a2f786294f3e972b SHA1 (patch-cb) = fd0f033d63be066ce5c47057d72c48a085718908 -SHA1 (patch-cg) = bea25d1ca341407fe6100f16c88f2c19b4fddc24 +SHA1 (patch-cg) = 867f8642eacc0b46999eefc4c3566e340939fd68 SHA1 (patch-ch) = 313308df929c4b40b9d453ce8815af081312eab0 SHA1 (patch-ci) = 225043e92bca992737ac1065dd806e1463ac2cd3 SHA1 (patch-cj) = 8716afb433a9cab1202cd39db1611ec784859c43 @@ -44,3 +44,18 @@ SHA1 (patch-ck) = 157fad436bb71795e5ff4b6b8efb26f7f6a84e90 SHA1 (patch-cl) = 0c6d7f86739ec8cb805d8ddc0034a421488274bc SHA1 (patch-cm) = f3de952dd8eedfb5e4a11a2b05500d37890b13f5 SHA1 (patch-cn) = 67b5ed52ffe09eb083ee30d9916c231666e0507c +SHA1 (patch-db) = f10187cf9de4466e49a967b79875eb01c5afd69f +SHA1 (patch-dc) = ba7b06f04460d4966e115a9ffdeafc1ebf555972 +SHA1 (patch-dd) = de9d705fdc3cb9879a19d58dfd170d104ca379f7 +SHA1 (patch-df) = 17912d183f754ab6661d2be8092e6a07d142632b +SHA1 (patch-dh) = 7592a6238acd5ef6e802d32103c897acb576825a +SHA1 (patch-dj) = 70360dffb20dd1029866d2e81899d003c9e17473 +SHA1 (patch-dk) = 183fa0d6a9040f53d9988fcc8868bdf83229803b +SHA1 (patch-dl) = cba07cba5717a75c89f007aba36295dccc1c25ab +SHA1 (patch-dm) = eb86aee54fd213eb64a89e5bc2754971db9648f4 +SHA1 (patch-do) = bdb018e157dcb5ef706b69184d8b739cfd32d8c3 +SHA1 (patch-dr) = 377b1d83079ada4d819b6702c1010cdd900575fc +SHA1 (patch-ds) = 1e2e371b9ff7ab9049a947d8e0a63483a1fd244e +SHA1 (patch-dt) = 9eef43663de12721ecc38124d5bd4a90a825eefc +SHA1 (patch-du) = c6e66bb420ce9ea988f89b57d1c20a247704cfcf +SHA1 (patch-dv) = a380d261d4c2771a672d2b0f4f1f23821e3e5266 diff --git a/www/seamonkey/patches/patch-ab b/www/seamonkey/patches/patch-ab index 745aee41ae4..7fa720dddd9 100644 --- a/www/seamonkey/patches/patch-ab +++ b/www/seamonkey/patches/patch-ab @@ -1,4 +1,4 @@ -$NetBSD: patch-ab,v 1.2 2006/04/15 08:36:04 ghen Exp $ +$NetBSD: patch-ab,v 1.3 2006/06/28 21:23:29 joerg Exp $ --- configure.in.orig 2006-04-14 22:00:40.000000000 +0200 +++ configure.in @@ -10,6 +10,15 @@ $NetBSD: patch-ab,v 1.2 2006/04/15 08:36:04 ghen Exp $ TARGET_NSPR_MDCPUCFG='\"md/_darwin.cfg\"' # set MACOSX to generate lib/mac/MoreFiles/Makefile MACOSX=1 +@@ -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 +1431,9 @@ case "$target" in # MKSHLIB_FORCE_ALL='-Wl,-Bforcearchive' # MKSHLIB_UNFORCE_ALL='' diff --git a/www/seamonkey/patches/patch-ac b/www/seamonkey/patches/patch-ac index fb22586c2e9..4e0b535ebf3 100644 --- a/www/seamonkey/patches/patch-ac +++ b/www/seamonkey/patches/patch-ac @@ -1,13 +1,18 @@ -$NetBSD: patch-ac,v 1.2 2006/06/10 12:37:53 ghen Exp $ +$NetBSD: patch-ac,v 1.3 2006/06/28 21:23:29 joerg Exp $ --- xpcom/reflect/xptcall/src/md/unix/Makefile.in.orig 2005-06-15 10:32:21.000000000 +0200 +++ xpcom/reflect/xptcall/src/md/unix/Makefile.in -@@ -65,6 +65,9 @@ ifneq (,$(filter FreeBSD NetBSD OpenBSD +@@ -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 ++CPPSRCS := xptcinvoke_x86_64_linux.cpp xptcstubs_x86_64_linux.cpp +endif endif # diff --git a/www/seamonkey/patches/patch-aq b/www/seamonkey/patches/patch-aq index 4cb5bfa4d5a..da189e2d1e5 100644 --- a/www/seamonkey/patches/patch-aq +++ b/www/seamonkey/patches/patch-aq @@ -1,4 +1,4 @@ -$NetBSD: patch-aq,v 1.1.1.1 2006/03/30 19:15:48 ghen Exp $ +$NetBSD: patch-aq,v 1.2 2006/06/28 21:23:29 joerg Exp $ --- directory/c-sdk/configure.in.orig 2005-06-14 23:27:33.000000000 +0200 +++ directory/c-sdk/configure.in @@ -11,3 +11,30 @@ $NetBSD: patch-aq,v 1.1.1.1 2006/03/30 19:15:48 ghen Exp $ _DEBUG_FLAGS=-g MOZ_DEBUG=1 MOZ_OPTIMIZE= +@@ -907,7 +907,7 @@ + PR_MD_CSRCS=dgux.c + ;; + +-*-freebsd*) ++*-freebsd*|*-dragonfly*) + if test -z "$USE_NSPR_THREADS"; then + USE_PTHREADS=1 + fi +@@ -2061,7 +2061,7 @@ + _PTHREAD_LDFLAGS= + fi + ;; +- *-freebsd*|*-openbsd*|*-bsdi*|*-netbsd*) ++ *-freebsd*|*-openbsd*|*-bsdi*|*-netbsd*|*-dragonfly*) + AC_DEFINE(_THREAD_SAFE) + dnl -pthread links in -lc_r, so don't specify it explicitly. + if test "$ac_cv_have_dash_pthread" = "yes"; then +@@ -2114,7 +2114,7 @@ + AC_DEFINE(_PR_NEED_PTHREAD_INIT) + fi + ;; +-*-freebsd*) ++*-freebsd*|*-dragonfly*) + if test -n "$USE_NSPR_THREADS"; then + AC_DEFINE(_PR_LOCAL_THREADS_ONLY) + fi diff --git a/www/seamonkey/patches/patch-bo b/www/seamonkey/patches/patch-bo index 0823a8cfdba..3bf993bb3fd 100644 --- a/www/seamonkey/patches/patch-bo +++ b/www/seamonkey/patches/patch-bo @@ -1,8 +1,9 @@ -$NetBSD: patch-bo,v 1.1.1.1 2006/03/30 19:15:49 ghen Exp $ +$NetBSD: patch-bo,v 1.2 2006/06/28 21:23:29 joerg Exp $ ---- nsprpub/configure.in.orig 2006-01-11 00:16:46.000000000 +0100 -+++ nsprpub/configure.in -@@ -58,7 +58,7 @@ USE_CPLUS= +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= @@ -11,17 +12,42 @@ $NetBSD: patch-bo,v 1.1.1.1 2006/03/30 19:15:49 ghen Exp $ _DEBUG_FLAGS=-g MOZ_DEBUG=1 MOZ_OPTIMIZE= -@@ -1086,6 +1086,9 @@ tools are selected during the Xcode/Deve +@@ -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*) -@@ -1585,6 +1588,7 @@ mips-nec-sysv*) +@@ -1544,6 +1572,7 @@ AC_DEFINE(XP_UNIX) AC_DEFINE(NETBSD) AC_DEFINE(HAVE_BSD_FLOCK) @@ -29,3 +55,30 @@ $NetBSD: patch-bo,v 1.1.1.1 2006/03/30 19:15:49 ghen Exp $ 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/seamonkey/patches/patch-bq b/www/seamonkey/patches/patch-bq index 5c74df83a0e..13eb3f43cc3 100644 --- a/www/seamonkey/patches/patch-bq +++ b/www/seamonkey/patches/patch-bq @@ -1,13 +1,14 @@ -$NetBSD: patch-bq,v 1.1.1.1 2006/03/30 19:15:49 ghen Exp $ +$NetBSD: patch-bq,v 1.2 2006/06/28 21:23:29 joerg Exp $ ---- xpcom/io/nsLocalFileUnix.h.orig 2004-04-18 16:18:14.000000000 +0200 -+++ xpcom/io/nsLocalFileUnix.h +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(__NetBSD__) && !defined(HAVE_STATVFS)) ++#if defined(__FreeBSD__) || ((defined(__DragonFly__) || defined(__NetBSD__)) && !defined(HAVE_STATVFS)) #define HAVE_SYS_STATFS_H #define STATFS statfs #include diff --git a/www/seamonkey/patches/patch-cg b/www/seamonkey/patches/patch-cg index 2d0fdc37bba..f312692d63b 100644 --- a/www/seamonkey/patches/patch-cg +++ b/www/seamonkey/patches/patch-cg @@ -1,8 +1,9 @@ -$NetBSD: patch-cg,v 1.1.1.1 2006/03/30 19:15:51 ghen Exp $ +$NetBSD: patch-cg,v 1.2 2006/06/28 21:23:29 joerg Exp $ ---- extensions/transformiix/source/base/Double.cpp.orig 2004-06-17 02:12:42.000000000 +0200 -+++ extensions/transformiix/source/base/Double.cpp -@@ -49,6 +49,38 @@ +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 */ @@ -39,9 +40,12 @@ $NetBSD: patch-cg,v 1.1.1.1 2006/03/30 19:15:51 ghen 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 -@@ -128,9 +160,20 @@ const PRUint32 infMask[2] = {0, TX_DO + #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 @@ -65,7 +69,7 @@ $NetBSD: patch-cg,v 1.1.1.1 2006/03/30 19:15:51 ghen Exp $ /* * Determines whether the given double represents positive or negative -@@ -158,6 +201,7 @@ MBool Double::isNeg(double aDbl) +@@ -158,6 +201,7 @@ { return (TX_DOUBLE_HI32(aDbl) & TX_DOUBLE_HI32_SIGNBIT) != 0; } @@ -73,7 +77,7 @@ $NetBSD: patch-cg,v 1.1.1.1 2006/03/30 19:15:51 ghen Exp $ /* * Converts the given String to a double, if the String value does not -@@ -245,7 +289,7 @@ public: +@@ -245,7 +289,7 @@ { if (mState == eIllegal || mBuffer.IsEmpty() || (mBuffer.Length() == 1 && mBuffer[0] == '.')) { diff --git a/www/seamonkey/patches/patch-db b/www/seamonkey/patches/patch-db new file mode 100644 index 00000000000..f34de423bae --- /dev/null +++ b/www/seamonkey/patches/patch-db @@ -0,0 +1,14 @@ +$NetBSD: patch-db,v 1.1 2006/06/28 21:23:29 joerg 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/seamonkey/patches/patch-dc b/www/seamonkey/patches/patch-dc new file mode 100644 index 00000000000..619fce83cc5 --- /dev/null +++ b/www/seamonkey/patches/patch-dc @@ -0,0 +1,23 @@ +$NetBSD: patch-dc,v 1.1 2006/06/28 21:23:29 joerg Exp $ + +diff -ruN ../Orig/mozilla/gc/boehm/mach_dep.c ./gc/boehm/mach_dep.c +--- ../Orig/mozilla/gc/boehm/mach_dep.c 1999-09-30 11:25:45.000000000 +0900 ++++ ./gc/boehm/mach_dep.c 2005-12-04 19:44:28.000000000 +0900 +@@ -206,7 +206,7 @@ + && !defined(SCO) && !defined(SCO_ELF) \ + && !(defined(LINUX) && defined(__ELF__)) \ + && !(defined(__FreeBSD__) && defined(__ELF__)) \ +- && !defined(DOS4GW) ++ && !defined(DOS4GW) && !(defined(__DragonFly__) && defined(__ELF__)) + /* I386 code, generic code does not appear to work */ + /* It does appear to work under OS2, and asms dont */ + /* This is used for some 38g UNIX variants and for CYGWIN32 */ +@@ -220,7 +220,7 @@ + # endif + + # if ( defined(I386) && defined(LINUX) && defined(__ELF__) ) \ +- || ( defined(I386) && defined(__FreeBSD__) && defined(__ELF__) ) ++ || ( defined(I386) && (defined(__FreeBSD__) || defined(__DragonFly__)) && defined(__ELF__) ) + + /* This is modified for Linux with ELF (Note: _ELF_ only) */ + /* This section handles FreeBSD with ELF. */ diff --git a/www/seamonkey/patches/patch-dd b/www/seamonkey/patches/patch-dd new file mode 100644 index 00000000000..9f205170501 --- /dev/null +++ b/www/seamonkey/patches/patch-dd @@ -0,0 +1,14 @@ +$NetBSD: patch-dd,v 1.1 2006/06/28 21:23:29 joerg 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 +-#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/seamonkey/patches/patch-df b/www/seamonkey/patches/patch-df new file mode 100644 index 00000000000..c2228f208f8 --- /dev/null +++ b/www/seamonkey/patches/patch-df @@ -0,0 +1,32 @@ +$NetBSD: patch-df,v 1.1 2006/06/28 21:23:29 joerg Exp $ + +diff -ruN ../Orig/mozilla/nsprpub/pr/include/md/_freebsd.h ./nsprpub/pr/include/md/_freebsd.h +--- ../Orig/mozilla/nsprpub/pr/include/md/_freebsd.h 2004-11-24 06:22:35.000000000 +0900 ++++ ./nsprpub/pr/include/md/_freebsd.h 2005-12-04 19:44:37.000000000 +0900 +@@ -79,7 +79,7 @@ + #define _PR_NO_LARGE_FILES + + #if defined(_PR_PTHREADS) +-#if __FreeBSD_version >= 400008 ++#if defined(__DragonFly__) || __FreeBSD_version >= 400008 + /* + * libc_r before this version of FreeBSD doesn't have poll(). + * Although libc has poll(), it is not thread-safe so we can't +@@ -88,7 +88,7 @@ + #define _PR_POLL_AVAILABLE + #endif + #else +-#if __FreeBSD_version >= 300000 ++#if defined(__DragonFly__) || __FreeBSD_version >= 300000 + #define _PR_POLL_AVAILABLE + #define _PR_USE_POLL + #endif +@@ -97,7 +97,7 @@ + #define _PR_HAVE_SYSV_SEMAPHORES + #define PR_HAVE_SYSV_NAMED_SHARED_MEMORY + +-#if __FreeBSD_version >= 400014 ++#if defined(__DragonFly__) || __FreeBSD_version >= 400014 + #define _PR_INET6 + #define _PR_HAVE_INET_NTOP + #define _PR_HAVE_GETHOSTBYNAME2 diff --git a/www/seamonkey/patches/patch-dh b/www/seamonkey/patches/patch-dh new file mode 100644 index 00000000000..22e941352f0 --- /dev/null +++ b/www/seamonkey/patches/patch-dh @@ -0,0 +1,19 @@ +$NetBSD: patch-dh,v 1.1 2006/06/28 21:23:29 joerg Exp $ + +diff -ruN ../Orig/mozilla/xpcom/reflect/xptcall/src/md/unix/xptc_platforms_unixish_x86.h ./xpcom/reflect/xptcall/src/md/unix/xptc_platforms_unixish_x86.h +--- ../Orig/mozilla/xpcom/reflect/xptcall/src/md/unix/xptc_platforms_unixish_x86.h 2004-04-18 23:18:18.000000000 +0900 ++++ ./xpcom/reflect/xptcall/src/md/unix/xptc_platforms_unixish_x86.h 2005-12-04 19:44:41.000000000 +0900 +@@ -77,6 +77,13 @@ + #define THUNK_BASED_THIS_ADJUST + #endif + ++#elif defined(__DragonFly__) ++# if defined(__FreeBSD_cc_version) ++# define CFRONT_STYLE_THIS_ADJUST ++# else ++# define THUNK_BASED_THIS_ADJUST ++# endif ++ + #elif defined(__FreeBSD__) + /* System versions of gcc on FreeBSD don't use thunks. On 3.x, the system + * compiler is gcc 2.7.2.3, which doesn't use thunks by default. On 4.x and diff --git a/www/seamonkey/patches/patch-dj b/www/seamonkey/patches/patch-dj new file mode 100644 index 00000000000..fef04f5d739 --- /dev/null +++ b/www/seamonkey/patches/patch-dj @@ -0,0 +1,14 @@ +$NetBSD: patch-dj,v 1.1 2006/06/28 21:23:29 joerg Exp $ + +diff -ruN ../Orig/mozilla/dbm/src/mktemp.c ./dbm/src/mktemp.c +--- ../Orig/mozilla/dbm/src/mktemp.c 2003-01-21 08:13:37.000000000 +0900 ++++ ./dbm/src/mktemp.c 2005-12-04 19:44:43.000000000 +0900 +@@ -98,7 +98,7 @@ + static int + _gettemp(char *path, register int *doopen, int extraFlags) + { +-#if !defined(_WINDOWS) || defined(_WIN32) ++#if (!defined(_WINDOWS) || defined(_WIN32)) && !defined(errno) + extern int errno; + #endif + register char *start, *trv; diff --git a/www/seamonkey/patches/patch-dk b/www/seamonkey/patches/patch-dk new file mode 100644 index 00000000000..6d703bffd6b --- /dev/null +++ b/www/seamonkey/patches/patch-dk @@ -0,0 +1,14 @@ +$NetBSD: patch-dk,v 1.1 2006/06/28 21:23:29 joerg Exp $ + +diff -ruN ../Orig/mozilla/security/coreconf/config.mk ./security/coreconf/config.mk +--- ../Orig/mozilla/security/coreconf/config.mk 2004-04-26 00:02:17.000000000 +0900 ++++ ./security/coreconf/config.mk 2005-12-04 19:44:47.000000000 +0900 +@@ -63,7 +63,7 @@ + ####################################################################### + + TARGET_OSES = FreeBSD BSD_OS NetBSD OpenUNIX OS2 QNX Darwin BeOS OpenBSD \ +- OpenVMS AIX ++ OpenVMS AIX DragonFly + + ifeq (,$(filter-out $(TARGET_OSES),$(OS_TARGET))) + include $(CORE_DEPTH)/coreconf/$(OS_TARGET).mk diff --git a/www/seamonkey/patches/patch-dl b/www/seamonkey/patches/patch-dl new file mode 100644 index 00000000000..c3b4834ce42 --- /dev/null +++ b/www/seamonkey/patches/patch-dl @@ -0,0 +1,89 @@ +$NetBSD: patch-dl,v 1.1 2006/06/28 21:23:29 joerg Exp $ + +diff -ruN ../Orig/mozilla/security/coreconf/DragonFly.mk ./security/coreconf/DragonFly.mk +--- ../Orig/mozilla/security/coreconf/DragonFly.mk 1970-01-01 09:00:00.000000000 +0900 ++++ ./security/coreconf/DragonFly.mk 2005-12-04 19:44:48.000000000 +0900 +@@ -0,0 +1,83 @@ ++# ++# The contents of this file are subject to the Mozilla Public ++# License Version 1.1 (the "License"); you may not use this file ++# except in compliance with the License. You may obtain a copy of ++# the License at http://www.mozilla.org/MPL/ ++# ++# Software distributed under the License is distributed on an "AS ++# IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or ++# implied. See the License for the specific language governing ++# rights and limitations under the License. ++# ++# The Original Code is the Netscape security libraries. ++# ++# The Initial Developer of the Original Code is Netscape ++# Communications Corporation. Portions created by Netscape are ++# Copyright (C) 1994-2000 Netscape Communications Corporation. All ++# Rights Reserved. ++# ++# Contributor(s): ++# ++# Alternatively, the contents of this file may be used under the ++# terms of the GNU General Public License Version 2 or later (the ++# "GPL"), in which case the provisions of the GPL are applicable ++# instead of those above. If you wish to allow use of your ++# version of this file only under the terms of the GPL and not to ++# allow others to use your version of this file under the MPL, ++# indicate your decision by deleting the provisions above and ++# replace them with the notice and other provisions required by ++# the GPL. If you do not delete the provisions above, a recipient ++# may use your version of this file under either the MPL or the ++# GPL. ++# ++# Config stuff for DragonFly ++# ++ ++include $(CORE_DEPTH)/coreconf/UNIX.mk ++ ++DEFAULT_COMPILER = gcc ++CC = gcc ++CCC = g++ ++RANLIB = ranlib ++ ++ifeq ($(OS_TEST),alpha) ++CPU_ARCH = alpha ++else ++CPU_ARCH = x86 ++endif ++ ++OS_CFLAGS = $(DSO_CFLAGS) -ansi -Wall -DFREEBSD -DHAVE_STRERROR -DHAVE_BSD_FLOCK ++ ++DSO_CFLAGS = -fPIC ++DSO_LDOPTS = -shared -Wl,-soname -Wl,$(notdir $@) ++ ++# ++# The default implementation strategy for FreeBSD is pthreads. ++# ++ifndef CLASSIC_NSPR ++USE_PTHREADS = 1 ++DEFINES += -D_THREAD_SAFE -D_REENTRANT ++OS_LIBS += -pthread ++DSO_LDOPTS += -pthread ++endif ++ ++ARCH = freebsd ++ ++MOZ_OBJFORMAT := $(shell test -x /usr/bin/objformat && /usr/bin/objformat || echo aout) ++ ++DLL_SUFFIX = so ++ ++ifdef LIBRUNPATH ++DSO_LDOPTS += -Wl,-R$(LIBRUNPATH) ++endif ++ ++MKSHLIB = $(CC) $(DSO_LDOPTS) ++ifdef MAPFILE ++# Add LD options to restrict exported symbols to those in the map file ++endif ++# Change PROCESS to put the mapfile in the correct format for this platform ++PROCESS_MAP_FILE = cp $(LIBRARY_NAME).def $@ ++ ++G++INCLUDES = -I/usr/include/g++ ++ ++INCLUDES += -I/usr/X11R6/include diff --git a/www/seamonkey/patches/patch-dm b/www/seamonkey/patches/patch-dm new file mode 100644 index 00000000000..25ab717e0aa --- /dev/null +++ b/www/seamonkey/patches/patch-dm @@ -0,0 +1,16 @@ +$NetBSD: patch-dm,v 1.1 2006/06/28 21:23:29 joerg Exp $ + +diff -ruN ../Orig/mozilla/security/nss/cmd/platlibs.mk ./security/nss/cmd/platlibs.mk +--- ../Orig/mozilla/security/nss/cmd/platlibs.mk 2005-04-07 06:35:41.000000000 +0900 ++++ ./security/nss/cmd/platlibs.mk 2005-12-04 19:44:52.000000000 +0900 +@@ -186,8 +186,8 @@ + # If GNU ld is used, we must use the -rpath-link option to tell + # the linker where to find libsoftokn3.so, an implicit dependency + # of libnss3.so. +-ifeq (,$(filter-out BSD_OS FreeBSD Linux NetBSD, $(OS_ARCH))) +-EXTRA_SHARED_LIBS += -Wl,-rpath-link,$(DIST)/lib ++ifeq (,$(filter-out BSD_OS FreeBSD Linux NetBSD DragonFly, $(OS_ARCH))) ++EXTRA_SHARED_LIBS += -Wl,-rpath-link,$(DIST)/lib -R/usr/pkg/lib/firefox + endif + + ifeq ($(OS_ARCH), SunOS) diff --git a/www/seamonkey/patches/patch-do b/www/seamonkey/patches/patch-do new file mode 100644 index 00000000000..4c57459c292 --- /dev/null +++ b/www/seamonkey/patches/patch-do @@ -0,0 +1,88 @@ +$NetBSD: patch-do,v 1.1 2006/06/28 21:23:29 joerg Exp $ + +diff -ruN ../Orig/mozilla/directory/c-sdk/config/DragonFly.mk ./directory/c-sdk/config/DragonFly.mk +--- ../Orig/mozilla/directory/c-sdk/config/DragonFly.mk 1970-01-01 09:00:00.000000000 +0900 ++++ ./directory/c-sdk/config/DragonFly.mk 2005-12-04 19:44:55.000000000 +0900 +@@ -0,0 +1,82 @@ ++# ++# The contents of this file are subject to the Mozilla Public ++# License Version 1.1 (the "License"); you may not use this file ++# except in compliance with the License. You may obtain a copy of ++# the License at http://www.mozilla.org/MPL/ ++# ++# Software distributed under the License is distributed on an "AS ++# IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or ++# implied. See the License for the specific language governing ++# rights and limitations under the License. ++# ++# The Original Code is the Netscape Portable Runtime (NSPR). ++# ++# The Initial Developer of the Original Code is Netscape ++# Communications Corporation. Portions created by Netscape are ++# Copyright (C) 1998-2000 Netscape Communications Corporation. All ++# Rights Reserved. ++# ++# Contributor(s): ++# ++# Alternatively, the contents of this file may be used under the ++# terms of the GNU General Public License Version 2 or later (the ++# "GPL"), in which case the provisions of the GPL are applicable ++# instead of those above. If you wish to allow use of your ++# version of this file only under the terms of the GPL and not to ++# allow others to use your version of this file under the MPL, ++# indicate your decision by deleting the provisions above and ++# replace them with the notice and other provisions required by ++# the GPL. If you do not delete the provisions above, a recipient ++# may use your version of this file under either the MPL or the ++# GPL. ++# ++ ++# ++# Config stuff for DragonFly ++# ++ ++include $(MOD_DEPTH)/config/UNIX.mk ++ ++CC = gcc ++CCC = g++ ++RANLIB = ranlib ++ ++OS_REL_CFLAGS = -Di386 ++CPU_ARCH = x86 ++CPU_ARCH_TAG = _$(CPU_ARCH) ++ ++OS_CFLAGS = $(DSO_CFLAGS) $(OS_REL_CFLAGS) -ansi -Wall -pipe $(THREAD_FLAG) -DFREEBSD -DHAVE_STRERROR -DHAVE_BSD_FLOCK ++ ++# ++# The default implementation strategy for FreeBSD is pthreads. ++# ++ifeq ($(CLASSIC_NSPR),1) ++IMPL_STRATEGY = _EMU ++DEFINES += -D_PR_LOCAL_THREADS_ONLY ++else ++USE_PTHREADS = 1 ++IMPL_STRATEGY = _PTH ++DEFINES += -D_THREAD_SAFE ++THREAD_FLAG += -pthread ++endif ++ ++ARCH = freebsd ++ ++MOZ_OBJFORMAT := $(shell test -x /usr/bin/objformat && /usr/bin/objformat || echo aout) ++ ++ifeq ($(MOZ_OBJFORMAT),elf) ++DLL_SUFFIX = so ++else ++DLL_SUFFIX = so.1.0 ++endif ++ ++DSO_CFLAGS = -fPIC ++DSO_LDOPTS = -Bshareable ++ ++ifdef LIBRUNPATH ++DSO_LDOPTS += -Wl,-R$(LIBRUNPATH) ++endif ++ ++MKSHLIB = $(LD) $(DSO_LDOPTS) ++ ++G++INCLUDES = -I/usr/include/g++ diff --git a/www/seamonkey/patches/patch-dr b/www/seamonkey/patches/patch-dr new file mode 100644 index 00000000000..4288e4e9131 --- /dev/null +++ b/www/seamonkey/patches/patch-dr @@ -0,0 +1,14 @@ +$NetBSD: patch-dr,v 1.1 2006/06/28 21:23:29 joerg 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/seamonkey/patches/patch-ds b/www/seamonkey/patches/patch-ds new file mode 100644 index 00000000000..60767a2783a --- /dev/null +++ b/www/seamonkey/patches/patch-ds @@ -0,0 +1,14 @@ +$NetBSD: patch-ds,v 1.1 2006/06/28 21:23:29 joerg Exp $ + +diff -ruN ../Orig/mozilla/security/coreconf/arch.mk ./security/coreconf/arch.mk +--- ../Orig/mozilla/security/coreconf/arch.mk 2005-10-11 08:30:12.000000000 +0900 ++++ ./security/coreconf/arch.mk 2005-12-04 19:45:28.000000000 +0900 +@@ -145,7 +145,7 @@ + # IRIX 6.5-ALPHA-1289139620. + # + +-ifeq (,$(filter-out Linux FreeBSD IRIX,$(OS_ARCH))) ++ifeq (,$(filter-out Linux DragonFly FreeBSD IRIX,$(OS_ARCH))) + OS_RELEASE := $(shell echo $(OS_RELEASE) | sed 's/-.*//') + endif + diff --git a/www/seamonkey/patches/patch-dt b/www/seamonkey/patches/patch-dt new file mode 100644 index 00000000000..509c875d308 --- /dev/null +++ b/www/seamonkey/patches/patch-dt @@ -0,0 +1,14 @@ +$NetBSD: patch-dt,v 1.1 2006/06/28 21:23:29 joerg Exp $ + +diff -ruN ../Orig/mozilla/directory/c-sdk/config/arch.mk ./directory/c-sdk/config/arch.mk +--- ../Orig/mozilla/directory/c-sdk/config/arch.mk 2002-03-27 06:51:57.000000000 +0900 ++++ ./directory/c-sdk/config/arch.mk 2005-12-04 19:45:29.000000000 +0900 +@@ -138,7 +138,7 @@ + # Handle FreeBSD 2.2-STABLE and Linux 2.0.30-osfmach3 + # + +-ifeq (,$(filter-out Linux FreeBSD,$(OS_ARCH))) ++ifeq (,$(filter-out Linux DragonFly FreeBSD,$(OS_ARCH))) + OS_RELEASE := $(shell echo "$(OS_RELEASE)" | sed 's/-.*//') + endif + diff --git a/www/seamonkey/patches/patch-du b/www/seamonkey/patches/patch-du new file mode 100644 index 00000000000..a85a8e01ea2 --- /dev/null +++ b/www/seamonkey/patches/patch-du @@ -0,0 +1,18 @@ +$NetBSD: patch-du,v 1.1 2006/06/28 21:23:29 joerg 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/seamonkey/patches/patch-dv b/www/seamonkey/patches/patch-dv new file mode 100644 index 00000000000..bc204d9ab99 --- /dev/null +++ b/www/seamonkey/patches/patch-dv @@ -0,0 +1,15 @@ +$NetBSD: patch-dv,v 1.1 2006/06/28 21:23:29 joerg 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 -- cgit v1.2.3