diff options
Diffstat (limited to 'time/sunbird/patches')
44 files changed, 1013 insertions, 26 deletions
diff --git a/time/sunbird/patches/patch-ab b/time/sunbird/patches/patch-ab index d3878fa6198..9abcaa7c256 100644 --- a/time/sunbird/patches/patch-ab +++ b/time/sunbird/patches/patch-ab @@ -1,6 +1,6 @@ -$NetBSD: patch-ab,v 1.2 2006/06/07 19:29:59 ghen Exp $ +$NetBSD: patch-ab,v 1.3 2006/06/27 11:11:52 joerg Exp $ ---- configure.in.orig 2006-06-07 17:51:37.000000000 +0200 +--- configure.in.orig 2006-05-06 17:53:27.000000000 +0000 +++ configure.in @@ -1489,7 +1489,6 @@ case "$target" in DSO_LDOPTS='' @@ -10,17 +10,26 @@ $NetBSD: patch-ab,v 1.2 2006/06/07 19:29:59 ghen Exp $ TARGET_NSPR_MDCPUCFG='\"md/_darwin.cfg\"' # set MACOSX to generate lib/mac/MoreFiles/Makefile MACOSX=1 -@@ -1522,6 +1521,9 @@ case "$target" in +@@ -1522,6 +1521,18 @@ case "$target" in # MKSHLIB_FORCE_ALL='-Wl,-Bforcearchive' # MKSHLIB_UNFORCE_ALL='' # fi + if test "$LIBRUNPATH"; then + DSO_LDOPTS="-Wl,-R$LIBRUNPATH $DSO_LDOPTS" + fi ++ ;; ++ ++*-dragonfly*) ++ if test ! "$GNU_CC"; then ++ DSO_LDOPTS="-Bshareable $DSO_LDOPTS" ++ fi ++ if test "$LIBRUNPATH"; then ++ DSO_LDOPTS="-Wl,-R$LIBRUNPATH $DSO_LDOPTS" ++ fi ;; *-hpux*) -@@ -1705,7 +1707,6 @@ case "$target" in +@@ -1705,7 +1716,6 @@ case "$target" in BIN_SUFFIX='.exe' USE_SHORT_LIBNAME=1 MOZ_ENABLE_COREXFONTS= @@ -28,7 +37,7 @@ $NetBSD: patch-ab,v 1.2 2006/06/07 19:29:59 ghen Exp $ MOZ_USER_DIR="Mozilla" ;; -@@ -1952,6 +1953,14 @@ case "$target" in +@@ -1952,6 +1962,14 @@ case "$target" in fi MKSHLIB='$(CXX) $(CXXFLAGS) $(DSO_PIC_CFLAGS) $(DSO_LDOPTS) -Wl,-soname,lib$(LIBRARY_NAME)$(DLL_SUFFIX) -o $@' MKCSHLIB='$(CC) $(CFLAGS) $(DSO_PIC_CFLAGS) $(DSO_LDOPTS) -Wl,-soname,lib$(LIBRARY_NAME)$(DLL_SUFFIX) -o $@' @@ -43,7 +52,7 @@ $NetBSD: patch-ab,v 1.2 2006/06/07 19:29:59 ghen Exp $ ;; *-nto*) -@@ -1992,6 +2001,13 @@ case "$target" in +@@ -1992,6 +2010,13 @@ case "$target" in if test "$LIBRUNPATH"; then DSO_LDOPTS="-R$LIBRUNPATH $DSO_LDOPTS" fi @@ -57,7 +66,27 @@ $NetBSD: patch-ab,v 1.2 2006/06/07 19:29:59 ghen Exp $ ;; *-openvms*) -@@ -5929,7 +5945,7 @@ dnl ==================================== +@@ -2688,7 +2713,7 @@ dnl Checks for header files. + dnl ======================================================== + AC_HEADER_DIRENT + case "$target_os" in +-freebsd*) ++freebsd* | dragonfly*) + # for stuff like -lXshm + CPPFLAGS="${CPPFLAGS} ${X_CFLAGS}" + ;; +@@ -2948,6 +2973,10 @@ then + fi + ;; + ++ *-*-dragonfly*) ++ _PTHREAD_LDFLAGS="-pthread" ++ ;; ++ + *-*-openbsd*|*-*-bsdi*) + AC_DEFINE(_REENTRANT) + AC_DEFINE(_THREAD_SAFE) +@@ -5929,7 +5958,7 @@ dnl ==================================== dnl = Enable code optimization. ON by default. dnl ======================================================== if test -z "$MOZ_OPTIMIZE_FLAGS"; then diff --git a/time/sunbird/patches/patch-ac b/time/sunbird/patches/patch-ac index bfa0cb5b10c..5b2ef8be79b 100644 --- a/time/sunbird/patches/patch-ac +++ b/time/sunbird/patches/patch-ac @@ -1,8 +1,16 @@ -$NetBSD: patch-ac,v 1.2 2006/06/07 19:29:59 ghen Exp $ +$NetBSD: patch-ac,v 1.3 2006/06/27 11:11:52 joerg Exp $ ---- xpcom/reflect/xptcall/src/md/unix/Makefile.in.orig 2006-06-07 17:51:56.000000000 +0200 +--- xpcom/reflect/xptcall/src/md/unix/Makefile.in.orig 2006-03-28 20:03:49.000000000 +0000 +++ xpcom/reflect/xptcall/src/md/unix/Makefile.in -@@ -69,6 +69,9 @@ ifeq (Darwin,$(OS_ARCH)) +@@ -62,13 +62,16 @@ include $(topsrcdir)/config/config.mk + # + # Lots of Unixish x86 flavors + # +-ifneq (,$(filter FreeBSD NetBSD OpenBSD BSD_OS Darwin,$(OS_ARCH))) ++ifneq (,$(filter DragonFly FreeBSD NetBSD OpenBSD BSD_OS Darwin,$(OS_ARCH))) + ifeq (86,$(findstring 86,$(OS_TEST))) + CPPSRCS := xptcinvoke_unixish_x86.cpp xptcstubs_unixish_x86.cpp + ifeq (Darwin,$(OS_ARCH)) DEFINES += -DKEEP_STACK_16_BYTE_ALIGNED endif endif diff --git a/time/sunbird/patches/patch-af b/time/sunbird/patches/patch-af index 08c6d453ea2..eb52387b181 100644 --- a/time/sunbird/patches/patch-af +++ b/time/sunbird/patches/patch-af @@ -1,6 +1,6 @@ -$NetBSD: patch-af,v 1.1.1.1 2006/02/05 21:56:25 ghen Exp $ +$NetBSD: patch-af,v 1.2 2006/06/27 11:11:52 joerg Exp $ ---- security/nss/lib/freebl/unix_rand.c.orig 2006-02-02 16:57:57.000000000 +0100 +--- security/nss/lib/freebl/unix_rand.c.orig 2006-04-04 01:01:51.000000000 +0000 +++ security/nss/lib/freebl/unix_rand.c @@ -35,6 +35,7 @@ * ***** END LICENSE BLOCK ***** */ @@ -10,7 +10,17 @@ $NetBSD: patch-af,v 1.1.1.1 2006/02/05 21:56:25 ghen Exp $ #include <string.h> #include <signal.h> #include <unistd.h> -@@ -694,7 +695,11 @@ safe_popen(char *cmd) +@@ -81,7 +82,8 @@ static size_t CopyLowBits(void *dst, siz + } + + #if defined(SCO) || defined(UNIXWARE) || defined(BSDI) || defined(FREEBSD) \ +- || defined(NETBSD) || defined(NTO) || defined(DARWIN) || defined(OPENBSD) ++ || defined(NETBSD) || defined(NTO) || defined(DARWIN) || defined(OPENBSD) \ ++ || defined(DRAGONFLY) + #include <sys/times.h> + + #define getdtablesize() sysconf(_SC_OPEN_MAX) +@@ -694,7 +696,11 @@ safe_popen(char *cmd) /* 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); diff --git a/time/sunbird/patches/patch-aq b/time/sunbird/patches/patch-aq index 4a2db4f7cf5..03493cd6492 100644 --- a/time/sunbird/patches/patch-aq +++ b/time/sunbird/patches/patch-aq @@ -1,8 +1,8 @@ -$NetBSD: patch-aq,v 1.1.1.1 2006/02/05 21:56:26 ghen Exp $ +$NetBSD: patch-aq,v 1.2 2006/06/27 11:11:52 joerg Exp $ ---- directory/c-sdk/configure.in.orig 2006-02-02 16:57:57.000000000 +0100 +--- directory/c-sdk/configure.in.orig 2006-04-11 21:12:58.000000000 +0000 +++ directory/c-sdk/configure.in -@@ -54,7 +54,7 @@ USE_64= +@@ -58,7 +58,7 @@ USE_64= USE_CPLUS= USE_IPV6= USE_MDUPDATE= @@ -11,3 +11,49 @@ $NetBSD: patch-aq,v 1.1.1.1 2006/02/05 21:56:26 ghen Exp $ _DEBUG_FLAGS=-g MOZ_DEBUG=1 MOZ_OPTIMIZE= +@@ -1183,6 +1183,24 @@ tools are selected during the Xcode/Deve + DSO_LDOPTS=-Bshareable + ;; + ++*-*-dragonfly*) ++ if test -z "$USE_NSPR_THREADS"; then ++ USE_PTHREADS=1 ++ fi ++ AC_DEFINE(XP_UNIX) ++ AC_DEFINE(DRAGONFLY) ++ AC_DEFINE(HAVE_BSD_FLOCK) ++ CFLAGS="$CFLAGS $(DSO_CFLAGS) -ansi -Wall" ++ MOZ_OBJFORMAT=`test -x /usr/bin/objformat && /usr/bin/objformat || echo aout` ++ if test "$MOZ_OBJFORMAT" = "elf"; then ++ DLL_SUFFIX=so ++ else ++ DLL_SUFFIX=so.1.0 ++ fi ++ DSO_CFLAGS=-fPIC ++ DSO_LDOPTS=-Bshareable ++ ;; ++ + *-hpux*) + AC_DEFINE(XP_UNIX) + AC_DEFINE(HPUX) +@@ -2270,7 +2288,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 +@@ -2328,6 +2346,11 @@ case "$target" in + AC_DEFINE(_PR_LOCAL_THREADS_ONLY) + fi + ;; ++*-dragonfly*) ++ if test -n "$USE_NSPR_THREADS"; then ++ AC_DEFINE(_PR_LOCAL_THREADS_ONLY) ++ fi ++ ;; + *-hpux*) + if test -n "$USE_NSPR_THREADS"; then + AC_DEFINE(_PR_LOCAL_THREADS_ONLY) diff --git a/time/sunbird/patches/patch-bo b/time/sunbird/patches/patch-bo index 954593655a6..2c8a7020ca4 100644 --- a/time/sunbird/patches/patch-bo +++ b/time/sunbird/patches/patch-bo @@ -1,8 +1,8 @@ -$NetBSD: patch-bo,v 1.1.1.1 2006/02/05 21:56:26 ghen Exp $ +$NetBSD: patch-bo,v 1.2 2006/06/27 11:11:52 joerg Exp $ ---- nsprpub/configure.in.orig 2006-02-02 16:57:57.000000000 +0100 +--- nsprpub/configure.in.orig 2006-04-28 00:53:35.000000000 +0000 +++ nsprpub/configure.in -@@ -58,7 +58,7 @@ USE_CPLUS= +@@ -62,7 +62,7 @@ USE_CPLUS= USE_IPV6= USE_MDUPDATE= _MACOSX_DEPLOYMENT_TARGET= @@ -11,17 +11,38 @@ $NetBSD: patch-bo,v 1.1.1.1 2006/02/05 21:56:26 ghen Exp $ _DEBUG_FLAGS=-g MOZ_DEBUG=1 MOZ_OPTIMIZE= -@@ -1087,6 +1087,9 @@ tools are selected during the Xcode/Deve +@@ -1133,6 +1133,30 @@ tools are selected during the Xcode/Deve DSO_LDOPTS='-shared -Wl,-soname -Wl,$(notdir $@)' MDCPUCFG_H=_freebsd.cfg PR_MD_CSRCS=freebsd.c + if test "$LIBRUNPATH"; then + DSO_LDOPTS="$DSO_LDOPTS -Wl,-R$LIBRUNPATH" + fi ++ ;; ++ ++*-dragonfly*) ++ if test -z "$USE_NSPR_THREADS"; then ++ USE_PTHREADS=1 ++ fi ++ AC_DEFINE(XP_UNIX) ++ AC_DEFINE(DRAGONFLY) ++ AC_DEFINE(HAVE_BSD_FLOCK) ++ AC_DEFINE(HAVE_SOCKLEN_T) ++ CFLAGS="$CFLAGS $(DSO_CFLAGS) -ansi -Wall" ++ MOZ_OBJFORMAT=elf ++ DLL_SUFFIX=so ++ MKSHLIB='$(CC) $(DSO_LDOPTS) -o $@' ++ DSO_CFLAGS=-fPIC ++ DSO_LDOPTS='-shared -Wl,-soname -Wl,$(notdir $@)' ++ MDCPUCFG_H=_freebsd.cfg ++ PR_MD_CSRCS=freebsd.c ++ if test "$LIBRUNPATH"; then ++ DSO_LDOPTS="$DSO_LDOPTS -Wl,-R$LIBRUNPATH" ++ fi ;; *-hpux*) -@@ -1600,6 +1603,7 @@ mips-nec-sysv*) +@@ -1660,6 +1684,7 @@ mips-nec-sysv*) AC_DEFINE(XP_UNIX) AC_DEFINE(NETBSD) AC_DEFINE(HAVE_BSD_FLOCK) @@ -29,3 +50,26 @@ $NetBSD: patch-bo,v 1.1.1.1 2006/02/05 21:56:26 ghen Exp $ USE_NSPR_THREADS=1 MDCPUCFG_H=_netbsd.cfg PR_MD_CSRCS=netbsd.c +@@ -2472,6 +2497,10 @@ if test -n "$USE_PTHREADS"; then + _PTHREAD_LDFLAGS="-lc_r" + fi + ;; ++ *-freebsd*) ++ AC_DEFINE(_REENTRANT) ++ _PTHREAD_LDFLAGS="-pthread" ++ ;; + *-netbsd*) + if test "$ac_cv_have_dash_pthread" = "yes"; then + _PTHREAD_LDFLAGS="-pthread" +@@ -2548,6 +2577,11 @@ case "$target" in + AC_DEFINE(_PR_LOCAL_THREADS_ONLY) + fi + ;; ++*-dragonfly*) ++ if test -n "$USE_NSPR_THREADS"; then ++ AC_DEFINE(_PR_LOCAL_THREADS_ONLY) ++ fi ++ ;; + *-hpux*) + if test -n "$USE_NSPR_THREADS"; then + AC_DEFINE(_PR_LOCAL_THREADS_ONLY) diff --git a/time/sunbird/patches/patch-br b/time/sunbird/patches/patch-br index 526d4d92454..526f1f75428 100644 --- a/time/sunbird/patches/patch-br +++ b/time/sunbird/patches/patch-br @@ -1,8 +1,17 @@ -$NetBSD: patch-br,v 1.1.1.1 2006/02/05 21:56:26 ghen Exp $ +$NetBSD: patch-br,v 1.2 2006/06/27 11:11:52 joerg Exp $ ---- nsprpub/pr/src/misc/prnetdb.c.orig 2006-02-02 16:57:57.000000000 +0100 +--- nsprpub/pr/src/misc/prnetdb.c.orig 2006-02-28 00:03:51.000000000 +0000 +++ nsprpub/pr/src/misc/prnetdb.c -@@ -2110,7 +2110,17 @@ PR_IMPLEMENT(PRAddrInfo *) PR_GetAddrInf +@@ -325,7 +325,7 @@ _pr_QueryNetIfs(void) + } + + #elif (defined(DARWIN) && defined(HAVE_GETIFADDRS)) || defined(FREEBSD) \ +- || defined(NETBSD) || defined(OPENBSD) ++ || defined(NETBSD) || defined(OPENBSD) || defined(DRAGONFLY) + + /* + * Use the BSD getifaddrs function. +@@ -2111,7 +2111,17 @@ PR_IMPLEMENT(PRAddrInfo *) PR_GetAddrInf */ hints.ai_socktype = SOCK_STREAM; diff --git a/time/sunbird/patches/patch-bs b/time/sunbird/patches/patch-bs index 6250c2787f0..1818b740c94 100644 --- a/time/sunbird/patches/patch-bs +++ b/time/sunbird/patches/patch-bs @@ -1,6 +1,6 @@ -$NetBSD: patch-bs,v 1.1.1.1 2006/02/05 21:56:26 ghen Exp $ +$NetBSD: patch-bs,v 1.2 2006/06/27 11:11:52 joerg Exp $ ---- config/mkdepend/imakemdep.h.orig 2006-02-02 16:57:57.000000000 +0100 +--- config/mkdepend/imakemdep.h.orig 2004-04-20 21:38:14.000000000 +0000 +++ config/mkdepend/imakemdep.h @@ -440,6 +440,9 @@ char *cpp_argv[ARGUMENTS] = { # ifdef __i386__ @@ -12,3 +12,13 @@ $NetBSD: patch-bs,v 1.1.1.1 2006/02/05 21:56:26 ghen Exp $ # ifdef __GNUC__ "-traditional", # endif +@@ -716,6 +719,9 @@ struct symtab predefs[] = { + #ifdef __FreeBSD__ + {"__FreeBSD__", "1"}, + #endif ++#ifdef __DragonFly__ ++ {"__DragonFly__", "1"}, ++#endif + #ifdef __NetBSD__ + {"__NetBSD__", "1"}, + #endif diff --git a/time/sunbird/patches/patch-da b/time/sunbird/patches/patch-da new file mode 100644 index 00000000000..33f6499a156 --- /dev/null +++ b/time/sunbird/patches/patch-da @@ -0,0 +1,13 @@ +$NetBSD: patch-da,v 1.1 2006/06/27 11:11:52 joerg Exp $ + +--- calendar/libical/src/libical/Makefile.in.orig 2006-06-26 13:32:40.000000000 +0000 ++++ calendar/libical/src/libical/Makefile.in +@@ -85,7 +85,7 @@ endif + + DEFINES += -DHAVE_CONFIG_H + +-ifneq (,$(filter BeOS Darwin OpenVMS NetBSD FreeBSD,$(OS_ARCH))) ++ifneq (,$(filter BeOS Darwin OpenVMS NetBSD FreeBSD DragonFly,$(OS_ARCH))) + DEFINES += -D__USE_BSD=1 + endif + diff --git a/time/sunbird/patches/patch-db b/time/sunbird/patches/patch-db new file mode 100644 index 00000000000..5cd10586282 --- /dev/null +++ b/time/sunbird/patches/patch-db @@ -0,0 +1,26 @@ +$NetBSD: patch-db,v 1.1 2006/06/27 11:11:52 joerg Exp $ + +--- config/rules.mk.orig 2006-06-26 13:35:05.000000000 +0000 ++++ config/rules.mk +@@ -464,6 +464,12 @@ EXTRA_DSO_LDOPTS += -Wl,-Bsymbolic + endif + endif + ++ifeq ($(OS_ARCH),DragonFly) ++ifdef IS_COMPONENT ++EXTRA_DSO_LDOPTS += -Wl,-Bsymbolic ++endif ++endif ++ + ifeq ($(OS_ARCH),NetBSD) + ifneq (,$(filter arc cobalt hpcmips mipsco newsmips pmax sgimips,$(OS_TEST))) + ifeq ($(MODULE),layout) +@@ -961,7 +967,7 @@ ifneq (,$(BUILD_STATIC_LIBS)$(FORCE_STAT + LOBJS += $(SHARED_LIBRARY_LIBS) + endif + else +-ifneq (,$(filter OSF1 BSD_OS FreeBSD NetBSD OpenBSD SunOS Darwin,$(OS_ARCH))) ++ifneq (,$(filter OSF1 BSD_OS FreeBSD NetBSD OpenBSD SunOS Darwin DragonFly,$(OS_ARCH))) + CLEANUP1 := | egrep -v '(________64ELEL_|__.SYMDEF)' + CLEANUP2 := rm -f ________64ELEL_ __.SYMDEF + else diff --git a/time/sunbird/patches/patch-dc b/time/sunbird/patches/patch-dc new file mode 100644 index 00000000000..0811612f295 --- /dev/null +++ b/time/sunbird/patches/patch-dc @@ -0,0 +1,13 @@ +$NetBSD: patch-dc,v 1.1 2006/06/27 11:11:52 joerg Exp $ + +--- config/config.mk.orig 2006-06-26 13:35:47.000000000 +0000 ++++ config/config.mk +@@ -120,7 +120,7 @@ endif + # but save the version to allow multiple versions of the same base + # platform to be built in the same tree. + # +-ifneq (,$(filter FreeBSD HP-UX IRIX Linux NetBSD OpenBSD OSF1 SunOS,$(OS_ARCH))) ++ifneq (,$(filter FreeBSD HP-UX IRIX Linux NetBSD OpenBSD OSF1 SunOS DragonFly,$(OS_ARCH))) + OS_RELEASE := $(basename $(OS_RELEASE)) + + # Allow the user to ignore the OS_VERSION, which is usually irrelevant. diff --git a/time/sunbird/patches/patch-dd b/time/sunbird/patches/patch-dd new file mode 100644 index 00000000000..789525333de --- /dev/null +++ b/time/sunbird/patches/patch-dd @@ -0,0 +1,13 @@ +$NetBSD: patch-dd,v 1.1 2006/06/27 11:11:52 joerg Exp $ + +--- content/xslt/src/base/txDouble.cpp.orig 2006-06-26 13:36:02.000000000 +0000 ++++ content/xslt/src/base/txDouble.cpp +@@ -50,7 +50,7 @@ + */ + + //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; diff --git a/time/sunbird/patches/patch-de b/time/sunbird/patches/patch-de new file mode 100644 index 00000000000..d99fbcd3072 --- /dev/null +++ b/time/sunbird/patches/patch-de @@ -0,0 +1,85 @@ +$NetBSD: patch-de,v 1.1 2006/06/27 11:11:52 joerg Exp $ + +--- /dev/null 2006-06-26 13:41:46.000000000 +0000 ++++ directory/c-sdk/config/DragonFly.mk +@@ -0,0 +1,80 @@ ++# ++# ***** BEGIN LICENSE BLOCK ***** ++# Version: MPL 1.1/GPL 2.0/LGPL 2.1 ++# ++# The contents of this file are subject to the Mozilla Public License Version ++# 1.1 (the "License"); you may not use this file except in compliance with ++# the License. You may obtain a copy of the License at ++# http://www.mozilla.org/MPL/ ++# ++# Software distributed under the License is distributed on an "AS IS" basis, ++# WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License ++# for the specific language governing rights and limitations under the ++# License. ++# ++# The Original Code is the Netscape Portable Runtime (NSPR). ++# ++# The Initial Developer of the Original Code is ++# Netscape Communications Corporation. ++# Portions created by the Initial Developer are Copyright (C) 1998-2000 ++# the Initial Developer. All Rights Reserved. ++# ++# Contributor(s): ++# ++# Alternatively, the contents of this file may be used under the terms of ++# either of the GNU General Public License Version 2 or later (the "GPL"), ++# or the GNU Lesser General Public License Version 2.1 or later (the "LGPL"), ++# in which case the provisions of the GPL or the LGPL are applicable instead ++# of those above. If you wish to allow use of your version of this file only ++# under the terms of either the GPL or the LGPL, and not to allow others to ++# use your version of this file under the terms of the MPL, indicate your ++# decision by deleting the provisions above and replace them with the notice ++# and other provisions required by the GPL or the LGPL. If you do not delete ++# the provisions above, a recipient may use your version of this file under ++# the terms of any one of the MPL, the GPL or the LGPL. ++# ++# ***** END LICENSE BLOCK ***** ++ ++# ++# Config stuff for DragonFly ++# ++ ++include $(MOD_DEPTH)/config/UNIX.mk ++ ++CC = gcc ++CCC = g++ ++RANLIB = ranlib ++ ++ifeq ($(OS_TEST),alpha) ++CPU_ARCH = alpha ++else ++OS_REL_CFLAGS = -Di386 ++CPU_ARCH = x86 ++endif ++CPU_ARCH_TAG = _$(CPU_ARCH) ++ ++OS_CFLAGS = $(DSO_CFLAGS) $(OS_REL_CFLAGS) -ansi -Wall -pipe $(THREAD_FLAG) -DFREEBSD -DHAVE_STRERROR -DHAVE_BSD_FLOCK ++ ++# ++# The default implementation strategy for FreeBSD is pthreads. ++# ++ifeq ($(CLASSIC_NSPR),1) ++IMPL_STRATEGY = _EMU ++DEFINES += -D_PR_LOCAL_THREADS_ONLY ++else ++USE_PTHREADS = 1 ++IMPL_STRATEGY = _PTH ++DEFINES += -D_THREAD_SAFE ++THREAD_FLAG += -pthread ++endif ++ ++ARCH = dragonfly ++ ++MOZ_OBJFORMAT := elf ++ ++DLL_SUFFIX = so ++ ++DSO_CFLAGS = -fPIC ++DSO_LDOPTS = -Bshareable ++ ++MKSHLIB = $(LD) $(DSO_LDOPTS) diff --git a/time/sunbird/patches/patch-df b/time/sunbird/patches/patch-df new file mode 100644 index 00000000000..53cf2cac809 --- /dev/null +++ b/time/sunbird/patches/patch-df @@ -0,0 +1,49 @@ +$NetBSD: patch-df,v 1.1 2006/06/27 11:11:52 joerg Exp $ + +--- directory/c-sdk/ldap/include/portable.h.orig 2006-06-26 13:42:37.000000000 +0000 ++++ directory/c-sdk/ldap/include/portable.h +@@ -122,7 +122,7 @@ + * some systems don't have the BSD re_comp and re_exec routines + */ + #ifndef NEED_BSDREGEX +-#if ( defined( SYSV ) || defined( NETBSD ) || defined( freebsd ) || defined( linux ) || defined( DARWIN )) && !defined(sgi) ++#if ( defined( SYSV ) || defined( NETBSD ) || defined( freebsd ) || defined( linux ) || defined( DARWIN )) && !defined(sgi) || defined(dragonfly) + #define NEED_BSDREGEX + #endif + #endif +@@ -141,7 +141,7 @@ + * Are sys_errlist and sys_nerr declared in stdio.h? + */ + #ifndef SYSERRLIST_IN_STDIO +-#if defined( freebsd ) ++#if defined( freebsd ) || defined(dragonfly) + #define SYSERRLIST_IN_STDIO + #endif + #endif +@@ -193,7 +193,7 @@ + */ + #if !defined(NSLDAPI_CONNECT_MUST_NOT_BE_INTERRUPTED) && \ + ( defined(AIX) || defined(IRIX) || defined(HPUX) || defined(SUNOS4) \ +- || defined(SOLARIS) || defined(OSF1) ||defined(freebsd)) ++ || defined(SOLARIS) || defined(OSF1) ||defined(freebsd) || defined(dragonfly)) + #define NSLDAPI_CONNECT_MUST_NOT_BE_INTERRUPTED + #endif + +@@ -276,7 +276,7 @@ int strncasecmp(const char *, const char + defined(UnixWare) || defined(NETBSD) || \ + defined(FREEBSD) || defined(OPENBSD) || \ + (defined(LINUX) && __GLIBC__ < 2) || \ +- (defined(AIX) && !defined(USE_REENTRANT_LIBC)) ++ (defined(AIX) && !defined(USE_REENTRANT_LIBC) || defined(dragonfly)) + #define GETHOSTBYNAME( n, r, b, l, e ) gethostbyname( n ) + #elif defined(AIX) + /* Maybe this is for another version of AIX? +@@ -313,7 +313,7 @@ typedef char GETHOSTBYNAME_buf_t [NSLDAP + || defined(OSF1V4) || defined(AIX) || defined(UnixWare) \ + || defined(hpux) || defined(HPUX11) || defined(NETBSD) \ + || defined(IRIX6) || defined(FREEBSD) || defined(VMS) \ +- || defined(NTO) || defined(OPENBSD) ++ || defined(NTO) || defined(OPENBSD) || defined(DRAGONFLY) + #define NSLDAPI_CTIME( c, b, l ) ctime_r( c, b ) + #elif defined( OSF1V3 ) + #define NSLDAPI_CTIME( c, b, l ) (ctime_r( c, b, l ) ? NULL : b) diff --git a/time/sunbird/patches/patch-dg b/time/sunbird/patches/patch-dg new file mode 100644 index 00000000000..c951f8c0824 --- /dev/null +++ b/time/sunbird/patches/patch-dg @@ -0,0 +1,14 @@ +$NetBSD: patch-dg,v 1.1 2006/06/27 11:11:52 joerg Exp $ + +--- directory/c-sdk/ldap/libraries/liblber/lber-int.h.orig 2006-06-26 13:43:49.000000000 +0000 ++++ directory/c-sdk/ldap/libraries/liblber/lber-int.h +@@ -63,9 +63,6 @@ extern "C" { + #ifdef macintosh + # include "ldap-macos.h" + #else /* macintosh */ +-#if !defined(BSDI) && !defined(DARWIN) && !defined(FREEBSD) +-# include <malloc.h> +-#endif + # include <errno.h> + # include <sys/types.h> + #if defined(SUNOS4) || defined(SCOOS) diff --git a/time/sunbird/patches/patch-dh b/time/sunbird/patches/patch-dh new file mode 100644 index 00000000000..9f7dfa8ee9f --- /dev/null +++ b/time/sunbird/patches/patch-dh @@ -0,0 +1,13 @@ +$NetBSD: patch-dh,v 1.1 2006/06/27 11:11:52 joerg Exp $ + +--- directory/c-sdk/ldap/libraries/libprldap/ldappr-error.c.orig 2006-06-26 13:46:03.000000000 +0000 ++++ directory/c-sdk/ldap/libraries/libprldap/ldappr-error.c +@@ -233,7 +233,7 @@ struct prldap_errormap_entry { + + #if defined(__hpux) || defined(_AIX) || defined(OSF1) || defined(DARWIN) || \ + defined(BEOS) || defined(FREEBSD) || defined(BSDI) || defined(VMS) || \ +- defined(OPENBSD) || defined(NETBSD) ++ defined(OPENBSD) || defined(NETBSD) || defined(DRAGONFLY) + #define EDEADLOCK -1 + #endif + diff --git a/time/sunbird/patches/patch-di b/time/sunbird/patches/patch-di new file mode 100644 index 00000000000..c6cc0ef2c05 --- /dev/null +++ b/time/sunbird/patches/patch-di @@ -0,0 +1,14 @@ +$NetBSD: patch-di,v 1.1 2006/06/27 11:11:52 joerg Exp $ + +--- xpcom/reflect/xptcall/src/md/unix/xptc_platforms_unixish_x86.h.orig 2006-06-26 15:25:37.000000000 +0000 ++++ xpcom/reflect/xptcall/src/md/unix/xptc_platforms_unixish_x86.h +@@ -103,6 +103,9 @@ + #define THUNK_BASED_THIS_ADJUST + #endif + ++#elif defined(__DragonFly__) ++#define THUNK_BASED_THIS_ADJUST ++ + #elif defined(__NetBSD__) + #define THUNK_BASED_THIS_ADJUST + diff --git a/time/sunbird/patches/patch-dj b/time/sunbird/patches/patch-dj new file mode 100644 index 00000000000..a219d027ebc --- /dev/null +++ b/time/sunbird/patches/patch-dj @@ -0,0 +1,13 @@ +$NetBSD: patch-dj,v 1.1 2006/06/27 11:11:52 joerg Exp $ + +--- ef/Exports/md/jni_md.h.orig 2006-06-26 13:55:06.000000000 +0000 ++++ ef/Exports/md/jni_md.h +@@ -27,7 +27,7 @@ typedef long jint; + typedef __int64 jlong; + typedef signed char jbyte; + +-#elif defined(LINUX) || defined(FREEBSD) ++#elif defined(LINUX) || defined(FREEBSD) || defined(DRAGONFLY) + #define JNIEXPORT + #define JNIIMPORT + #define JNICALL(returnType) __attribute__((stdcall)) returnType diff --git a/time/sunbird/patches/patch-dk b/time/sunbird/patches/patch-dk new file mode 100644 index 00000000000..a828710df92 --- /dev/null +++ b/time/sunbird/patches/patch-dk @@ -0,0 +1,13 @@ +$NetBSD: patch-dk,v 1.1 2006/06/27 11:11:52 joerg Exp $ + +--- ef/Runtime/System/Thread.cpp.orig 2006-06-26 13:55:26.000000000 +0000 ++++ ef/Runtime/System/Thread.cpp +@@ -31,7 +31,7 @@ + + #ifdef _WIN32 + #include "md/x86/x86Win32Thread.h" +-#elif defined LINUX || defined FREEBSD || defined NETBSD ++#elif defined LINUX || defined FREEBSD || defined NETBSD || defined DRAGONFLY + #include "x86UnixishThread.h" + #else + diff --git a/time/sunbird/patches/patch-dl b/time/sunbird/patches/patch-dl new file mode 100644 index 00000000000..6a88a95745b --- /dev/null +++ b/time/sunbird/patches/patch-dl @@ -0,0 +1,13 @@ +$NetBSD: patch-dl,v 1.1 2006/06/27 11:11:52 joerg Exp $ + +--- ef/Runtime/System/Thread.h.orig 2006-06-26 14:02:15.000000000 +0000 ++++ ef/Runtime/System/Thread.h +@@ -36,7 +36,7 @@ typedef CONTEXT ThreadContext; + typedef void* HANDLE; + typedef struct sigcontext ThreadContext; + +-#elif defined (__FreeBSD__) || defined (__NetBSD__) ++#elif defined (__FreeBSD__) || defined (__NetBSD__) || defined(__DragonFly__) + + #include <machine/signal.h> + diff --git a/time/sunbird/patches/patch-dm b/time/sunbird/patches/patch-dm new file mode 100644 index 00000000000..1839796406c --- /dev/null +++ b/time/sunbird/patches/patch-dm @@ -0,0 +1,13 @@ +$NetBSD: patch-dm,v 1.1 2006/06/27 11:11:52 joerg Exp $ + +--- ef/Runtime/System/md/x86/x86UnixishThread.cpp.orig 2006-06-26 14:02:43.000000000 +0000 ++++ ef/Runtime/System/md/x86/x86UnixishThread.cpp +@@ -36,7 +36,7 @@ + #include "NativeCodeCache.h" + #include "Exceptions.h" + +-#if defined( FREEBSD ) || defined ( NETBSD ) ++#if defined( FREEBSD ) || defined ( NETBSD ) || defined(DRAGONFLY) + + #define CONTEXT_EBP(ctxt) ctxt.sc_ebp + #define CONTEXT_EIP(ctxt) ctxt.sc_eip diff --git a/time/sunbird/patches/patch-dn b/time/sunbird/patches/patch-dn new file mode 100644 index 00000000000..04347687c89 --- /dev/null +++ b/time/sunbird/patches/patch-dn @@ -0,0 +1,72 @@ +$NetBSD: patch-dn,v 1.1 2006/06/27 11:11:52 joerg Exp $ + +--- /dev/null 2006-06-26 14:04:45.000000000 +0000 ++++ ef/config/DragonFly.mk +@@ -0,0 +1,67 @@ ++# ++# The contents of this file are subject to the Netscape Public ++# License Version 1.1 (the "License"); you may not use this file ++# except in compliance with the License. You may obtain a copy of ++# the License at http://www.mozilla.org/NPL/ ++# ++# Software distributed under the License is distributed on an "AS ++# IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or ++# implied. See the License for the specific language governing ++# rights and limitations under the License. ++# ++# The Original Code is mozilla.org code. ++# ++# The Initial Developer of the Original Code is Netscape ++# Communications Corporation. Portions created by Netscape are ++# Copyright (C) 1998 Netscape Communications Corporation. All ++# Rights Reserved. ++# ++# Contributor(s): ++ ++# ++# Config stuff for DragonFly ++# ++ ++include $(DEPTH)/config/UNIX.mk ++ ++ifeq (86,$(findstring 86,$(OS_TEST))) ++CPU_ARCH := x86 ++else ++CPU_ARCH := $(OS_TEST) ++endif ++ ++IMPL_STRATEGY = _EMU ++DEFAULT_COMPILER = gcc ++CC = gcc ++CXX = g++ ++AS = gcc -c ++RANLIB = ranlib ++MKSHLIB = $(CC) $(DSO_LDOPTS) ++MKMODULE = ld -Ur -o $@ ++ ++WARNING_CFLAG = -Wall ++ ++# used by mkdepend ++X11INCLUDES = -I/usr/X11R6/include ++SYS_INCLUDES = -I$(subst libgcc.a,include, \ ++ $(shell $(CC) -print-libgcc-file-name)) ++SYS_INCLUDES += -I$(subst libgcc.a,include, \ ++ $(shell $(CCC) -print-libgcc-file-name)) ++ ++ifeq ($(CPU_ARCH),x86) ++DEPENDFLAGS += -D__i386__ ++endif ++ ++OS_REL_CFLAGS = -mno-486 -Di386 ++ ++OS_CFLAGS = $(DSO_CFLAGS) $(OS_REL_CFLAGS) -DFREEBSD -ansi -Wall -pipe -DHAVE_STRERROR -DHAVE_BSD_FLOCK ++OS_CXXFLAGS = $(OS_CFLAGS) ++OS_ASFLAGS = -DDRAGONFLY ++OS_LDFLAGS = ++OS_LIBS = -lm ++ ++DSO_CFLAGS = -fPIC ++DSO_LDFLAGS = -Wl,export-dynamic ++DSO_LDOPTS = -shared -Xlinker -E ++ ++PERL = perl diff --git a/time/sunbird/patches/patch-do b/time/sunbird/patches/patch-do new file mode 100644 index 00000000000..332079a91cc --- /dev/null +++ b/time/sunbird/patches/patch-do @@ -0,0 +1,13 @@ +$NetBSD: patch-do,v 1.1 2006/06/27 11:11:52 joerg Exp $ + +--- embedding/browser/qt/src/config/qtconfig.mk.orig 2006-06-26 14:06:26.000000000 +0000 ++++ embedding/browser/qt/src/config/qtconfig.mk +@@ -4,7 +4,7 @@ + FULLDIST = `(cd $(DIST); pwd)` + DIST_QTDESIGNERPLUGINS = $(FULLDIST)/lib/designer + +-ifneq (,$(filter Linux FreeBSD SunOS,$(OS_ARCH))) ++ifneq (,$(filter Linux DragonFly FreeBSD SunOS,$(OS_ARCH))) + UIC = $(QTDIR)/bin/uic -L $(DIST_QTDESIGNERPLUGINS) + endif + ifeq ($(OS_ARCH), WINNT) diff --git a/time/sunbird/patches/patch-dp b/time/sunbird/patches/patch-dp new file mode 100644 index 00000000000..13c2b64e4f7 --- /dev/null +++ b/time/sunbird/patches/patch-dp @@ -0,0 +1,14 @@ +$NetBSD: patch-dp,v 1.1 2006/06/27 11:11:52 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/time/sunbird/patches/patch-dq b/time/sunbird/patches/patch-dq new file mode 100644 index 00000000000..e9d02840922 --- /dev/null +++ b/time/sunbird/patches/patch-dq @@ -0,0 +1,23 @@ +$NetBSD: patch-dq,v 1.1 2006/06/27 11:11:52 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/time/sunbird/patches/patch-dr b/time/sunbird/patches/patch-dr new file mode 100644 index 00000000000..ca7d0c130d7 --- /dev/null +++ b/time/sunbird/patches/patch-dr @@ -0,0 +1,40 @@ +$NetBSD: patch-dr,v 1.1 2006/06/27 11:11:52 joerg Exp $ + +--- nsprpub/pr/include/md/_freebsd.h.orig 2006-06-26 14:27:03.000000000 +0000 ++++ nsprpub/pr/include/md/_freebsd.h +@@ -40,7 +40,7 @@ + + #include "prthread.h" + +-#if __FreeBSD__ >= 2 ++#if defined(__FreeBSD__) && __FreeBSD__ >= 2 + #include <osreldate.h> /* for __FreeBSD_version */ + #endif + #include <sys/syscall.h> +@@ -79,7 +79,7 @@ + #define _PR_NO_LARGE_FILES + + #if defined(_PR_PTHREADS) +-#if __FreeBSD_version >= 400008 ++#if defined(__DragonFly__) || defined(__FreeBSD__) &&__FreeBSD_version >= 400008 + /* + * libc_r before this version of FreeBSD doesn't have poll(). + * Although libc has poll(), it is not thread-safe so we can't +@@ -88,7 +88,7 @@ + #define _PR_POLL_AVAILABLE + #endif + #else +-#if __FreeBSD_version >= 300000 ++#if defined(__DragonFly__) || __FreeBSD_version >= 300000 + #define _PR_POLL_AVAILABLE + #define _PR_USE_POLL + #endif +@@ -97,7 +97,7 @@ + #define _PR_HAVE_SYSV_SEMAPHORES + #define PR_HAVE_SYSV_NAMED_SHARED_MEMORY + +-#if __FreeBSD_version >= 400014 ++#if defined(__DragonFly__) || __FreeBSD_version >= 400014 + #define _PR_INET6 + #define _PR_HAVE_INET_NTOP + #define _PR_HAVE_GETHOSTBYNAME2 diff --git a/time/sunbird/patches/patch-ds b/time/sunbird/patches/patch-ds new file mode 100644 index 00000000000..2612b8ab677 --- /dev/null +++ b/time/sunbird/patches/patch-ds @@ -0,0 +1,49 @@ +$NetBSD: patch-ds,v 1.1 2006/06/27 11:11:52 joerg Exp $ + +--- nsprpub/pr/include/md/_pth.h.orig 2006-06-26 14:28:04.000000000 +0000 ++++ nsprpub/pr/include/md/_pth.h +@@ -93,7 +93,7 @@ + #define _PT_PTHREAD_MUTEXATTR_INIT pthread_mutexattr_init + #define _PT_PTHREAD_MUTEXATTR_DESTROY pthread_mutexattr_destroy + #define _PT_PTHREAD_MUTEX_INIT(m, a) pthread_mutex_init(&(m), &(a)) +-#if defined(FREEBSD) ++#if defined(FREEBSD) || defined(DRAGONFLY) + #define _PT_PTHREAD_MUTEX_IS_LOCKED(m) pt_pthread_mutex_is_locked(&(m)) + #else + #define _PT_PTHREAD_MUTEX_IS_LOCKED(m) (EBUSY == pthread_mutex_trylock(&(m))) +@@ -144,7 +144,7 @@ + #define _PT_PTHREAD_COPY_THR_HANDLE(st, dt) (dt) = (st) + #elif defined(IRIX) || defined(OSF1) || defined(AIX) || defined(SOLARIS) \ + || defined(LINUX) || defined(__GNU__) || defined(__GLIBC__) \ +- || defined(HPUX) || defined(FREEBSD) \ ++ || defined(HPUX) || defined(FREEBSD) || defined(DRAGONFLY) \ + || defined(NETBSD) || defined(OPENBSD) || defined(BSDI) \ + || defined(VMS) || defined(NTO) || defined(DARWIN) \ + || defined(UNIXWARE) || defined(RISCOS) +@@ -204,7 +204,7 @@ + || defined(LINUX) || defined(__GNU__)|| defined(__GLIBC__) \ + || defined(FREEBSD) || defined(NETBSD) || defined(OPENBSD) \ + || defined(BSDI) || defined(VMS) || defined(UNIXWARE) \ +- || defined(DARWIN) ++ || defined(DARWIN) || defined(DRAGONFLY) + #define PT_NO_SIGTIMEDWAIT + #endif + +@@ -242,7 +242,7 @@ + #endif /* defined(_PR_DCETHREADS) */ + + #elif defined(LINUX) || defined(__GNU__) || defined(__GLIBC__) \ +- || defined(FREEBSD) ++ || defined(FREEBSD) || defined(DRAGONFLY) + #define PT_PRIO_MIN sched_get_priority_min(SCHED_OTHER) + #define PT_PRIO_MAX sched_get_priority_max(SCHED_OTHER) + #elif defined(NTO) +@@ -302,7 +302,7 @@ extern int (*_PT_aix_yield_fcn)(); + || defined(LINUX) || defined(__GNU__) || defined(__GLIBC__) \ + || defined(FREEBSD) || defined(NETBSD) || defined(OPENBSD) \ + || defined(BSDI) || defined(NTO) || defined(DARWIN) \ +- || defined(UNIXWARE) || defined(RISCOS) ++ || defined(UNIXWARE) || defined(RISCOS) || defined(DRAGONFLY) + #define _PT_PTHREAD_YIELD() sched_yield() + #else + #error "Need to define _PT_PTHREAD_YIELD for this platform" diff --git a/time/sunbird/patches/patch-dt b/time/sunbird/patches/patch-dt new file mode 100644 index 00000000000..a84c08f9f84 --- /dev/null +++ b/time/sunbird/patches/patch-dt @@ -0,0 +1,13 @@ +$NetBSD: patch-dt,v 1.1 2006/06/27 11:11:52 joerg Exp $ + +--- nsprpub/pr/include/md/prosdep.h.orig 2006-06-26 14:36:19.000000000 +0000 ++++ nsprpub/pr/include/md/prosdep.h +@@ -72,7 +72,7 @@ PR_BEGIN_EXTERN_C + #if defined(AIX) + #include "md/_aix.h" + +-#elif defined(FREEBSD) ++#elif defined(FREEBSD) || defined(DRAGONFLY) + #include "md/_freebsd.h" + + #elif defined(NETBSD) diff --git a/time/sunbird/patches/patch-du b/time/sunbird/patches/patch-du new file mode 100644 index 00000000000..5bc3c1278b6 --- /dev/null +++ b/time/sunbird/patches/patch-du @@ -0,0 +1,13 @@ +$NetBSD: patch-du,v 1.1 2006/06/27 11:11:52 joerg Exp $ + +--- nsprpub/pr/src/linking/prlink.c.orig 2006-06-26 14:36:45.000000000 +0000 ++++ nsprpub/pr/src/linking/prlink.c +@@ -1616,7 +1616,7 @@ PR_IMPLEMENT(char *) + PR_GetLibraryFilePathname(const char *name, PRFuncPtr addr) + { + #if defined(USE_DLFCN) && (defined(SOLARIS) || defined(FREEBSD) \ +- || defined(LINUX) || defined(__GNU__) || defined(__GLIBC__)) ++ || defined(LINUX) || defined(__GNU__) || defined(__GLIBC__) || defined(DRAGONFLY)) + Dl_info dli; + char *result; + diff --git a/time/sunbird/patches/patch-dv b/time/sunbird/patches/patch-dv new file mode 100644 index 00000000000..d9063c7225a --- /dev/null +++ b/time/sunbird/patches/patch-dv @@ -0,0 +1,13 @@ +$NetBSD: patch-dv,v 1.1 2006/06/27 11:11:52 joerg Exp $ + +--- nsprpub/pr/src/md/prosdep.c.orig 2006-06-26 14:37:07.000000000 +0000 ++++ nsprpub/pr/src/md/prosdep.c +@@ -66,7 +66,7 @@ static void GetPageSize(void) + #if defined SUNOS4 || defined BSDI || defined AIX \ + || defined LINUX || defined __GNU__ || defined __GLIBC__ \ + || defined FREEBSD || defined NETBSD || defined OPENBSD \ +- || defined DARWIN || defined NEXTSTEP ++ || defined DARWIN || defined NEXTSTEP || defined DRAGONFLY + _pr_pageSize = getpagesize(); + #elif defined(HPUX) + /* I have no idea. Don't get me started. --Rob */ diff --git a/time/sunbird/patches/patch-dw b/time/sunbird/patches/patch-dw new file mode 100644 index 00000000000..999afe0bf56 --- /dev/null +++ b/time/sunbird/patches/patch-dw @@ -0,0 +1,14 @@ +$NetBSD: patch-dw,v 1.1 2006/06/27 11:11:52 joerg Exp $ + +--- nsprpub/pr/src/md/unix/unix.c.orig 2006-06-26 14:37:27.000000000 +0000 ++++ nsprpub/pr/src/md/unix/unix.c +@@ -78,7 +78,8 @@ + #define _PRSockLen_t int + #elif (defined(AIX) && !defined(AIX4_1)) || defined(FREEBSD) \ + || defined(NETBSD) || defined(OPENBSD) || defined(UNIXWARE) \ +- || defined(DGUX) || defined(VMS) || defined(NTO) || defined(RISCOS) ++ || defined(DGUX) || defined(VMS) || defined(NTO) || defined(RISCOS) \ ++ || defined(DRAGONFLY) + #define _PRSockLen_t size_t + #else + #error "Cannot determine architecture" diff --git a/time/sunbird/patches/patch-dx b/time/sunbird/patches/patch-dx new file mode 100644 index 00000000000..5bc71175fb3 --- /dev/null +++ b/time/sunbird/patches/patch-dx @@ -0,0 +1,14 @@ +$NetBSD: patch-dx,v 1.1 2006/06/27 11:11:52 joerg Exp $ + +--- nsprpub/pr/src/md/unix/uxrng.c.orig 2006-06-26 14:37:48.000000000 +0000 ++++ nsprpub/pr/src/md/unix/uxrng.c +@@ -139,7 +139,8 @@ GetHighResClock(void *buf, size_t maxbyt + } + + #elif (defined(LINUX) || defined(FREEBSD) || defined(__FreeBSD_kernel__) \ +- || defined(NETBSD) || defined(__NetBSD_kernel__) || defined(OPENBSD)) ++ || defined(NETBSD) || defined(__NetBSD_kernel__) || defined(OPENBSD)) \ ++ || defined(DRAGONFLY) + #include <sys/types.h> + #include <sys/stat.h> + #include <fcntl.h> diff --git a/time/sunbird/patches/patch-dy b/time/sunbird/patches/patch-dy new file mode 100644 index 00000000000..83ca8465737 --- /dev/null +++ b/time/sunbird/patches/patch-dy @@ -0,0 +1,13 @@ +$NetBSD: patch-dy,v 1.1 2006/06/27 11:11:52 joerg Exp $ + +--- nsprpub/pr/src/md/unix/uxwrap.c.orig 2006-06-26 14:38:09.000000000 +0000 ++++ nsprpub/pr/src/md/unix/uxwrap.c +@@ -346,7 +346,7 @@ int poll(struct pollfd filedes[], int nf + int poll(struct pollfd *filedes, nfds_t nfds, int timeout) + #elif defined(OPENBSD) + int poll(struct pollfd filedes[], nfds_t nfds, int timeout) +-#elif defined(FREEBSD) ++#elif defined(FREEBSD) || defined(DRAGONLFY) + int poll(struct pollfd *filedes, unsigned nfds, int timeout) + #else + int poll(struct pollfd *filedes, unsigned long nfds, int timeout) diff --git a/time/sunbird/patches/patch-dz b/time/sunbird/patches/patch-dz new file mode 100644 index 00000000000..0bb70ee83f9 --- /dev/null +++ b/time/sunbird/patches/patch-dz @@ -0,0 +1,13 @@ +$NetBSD: patch-dz,v 1.1 2006/06/27 11:11:52 joerg Exp $ + +--- nsprpub/pr/src/misc/prsystem.c.orig 2006-06-26 14:38:54.000000000 +0000 ++++ nsprpub/pr/src/misc/prsystem.c +@@ -56,7 +56,7 @@ + + /* BSD-derived systems use sysctl() to get the number of processors */ + #if defined(BSDI) || defined(FREEBSD) || defined(NETBSD) \ +- || defined(OPENBSD) || defined(DARWIN) ++ || defined(OPENBSD) || defined(DARWIN) || defined(DRAGONFLY) + #define _PR_HAVE_SYSCTL + #include <sys/param.h> + #include <sys/sysctl.h> diff --git a/time/sunbird/patches/patch-ea b/time/sunbird/patches/patch-ea new file mode 100644 index 00000000000..9a755e13542 --- /dev/null +++ b/time/sunbird/patches/patch-ea @@ -0,0 +1,13 @@ +$NetBSD: patch-ea,v 1.1 2006/06/27 11:11:52 joerg Exp $ + +--- nsprpub/pr/src/misc/prtime.c.orig 2006-06-26 14:39:12.000000000 +0000 ++++ nsprpub/pr/src/misc/prtime.c +@@ -1656,7 +1656,7 @@ PR_FormatTime(char *buf, int buflen, con + + #if defined(SUNOS4) || (__GLIBC__ >= 2) || defined(XP_BEOS) \ + || defined(NETBSD) || defined(OPENBSD) || defined(FREEBSD) \ +- || defined(DARWIN) ++ || defined(DARWIN) || defined(DRAGONFLY) + a.tm_zone = NULL; + a.tm_gmtoff = tm->tm_params.tp_gmt_offset + tm->tm_params.tp_dst_offset; + #endif diff --git a/time/sunbird/patches/patch-eb b/time/sunbird/patches/patch-eb new file mode 100644 index 00000000000..312ff13bad8 --- /dev/null +++ b/time/sunbird/patches/patch-eb @@ -0,0 +1,22 @@ +$NetBSD: patch-eb,v 1.1 2006/06/27 11:11:52 joerg Exp $ + +--- nsprpub/pr/src/pthreads/ptio.c.orig 2006-06-26 14:39:26.000000000 +0000 ++++ nsprpub/pr/src/pthreads/ptio.c +@@ -209,7 +209,7 @@ static PRBool _pr_ipv6_v6only_on_by_defa + || defined(LINUX) || defined(__GNU__) || defined(__GLIBC__) \ + || defined(FREEBSD) || defined(NETBSD) || defined(OPENBSD) \ + || defined(BSDI) || defined(VMS) || defined(NTO) || defined(DARWIN) \ +- || defined(UNIXWARE) || defined(RISCOS) ++ || defined(UNIXWARE) || defined(RISCOS) || defined(DRAGONFLY) + #define _PRSelectFdSetArg_t fd_set * + #else + #error "Cannot determine architecture" +@@ -3234,7 +3234,7 @@ static PRIOMethods _pr_socketpollfd_meth + || defined(LINUX) || defined(__GNU__) || defined(__GLIBC__) \ + || defined(AIX) || defined(FREEBSD) || defined(NETBSD) \ + || defined(OPENBSD) || defined(BSDI) || defined(VMS) || defined(NTO) \ +- || defined(DARWIN) || defined(UNIXWARE) || defined(RISCOS) ++ || defined(DARWIN) || defined(UNIXWARE) || defined(RISCOS) || defined(DRAGONFLY) + #define _PR_FCNTL_FLAGS O_NONBLOCK + #else + #error "Can't determine architecture" diff --git a/time/sunbird/patches/patch-ec b/time/sunbird/patches/patch-ec new file mode 100644 index 00000000000..9512c219e42 --- /dev/null +++ b/time/sunbird/patches/patch-ec @@ -0,0 +1,13 @@ +$NetBSD: patch-ec,v 1.1 2006/06/27 11:11:52 joerg Exp $ + +--- nsprpub/pr/src/pthreads/ptsynch.c.orig 2006-06-26 14:39:56.000000000 +0000 ++++ nsprpub/pr/src/pthreads/ptsynch.c +@@ -811,7 +811,7 @@ PR_IMPLEMENT(PRStatus) PR_DeleteSemaphor + * From the semctl(2) man page in glibc 2.0 + */ + #if (defined(__GNU_LIBRARY__) && !defined(_SEM_SEMUN_UNDEFINED)) \ +- || defined(FREEBSD) || defined(OPENBSD) || defined(BSDI) ++ || defined(FREEBSD) || defined(OPENBSD) || defined(BSDI) || defined(DRAGONFLY) + /* union semun is defined by including <sys/sem.h> */ + #else + /* according to X/OPEN we have to define it ourselves */ diff --git a/time/sunbird/patches/patch-ed b/time/sunbird/patches/patch-ed new file mode 100644 index 00000000000..d933c9b06a6 --- /dev/null +++ b/time/sunbird/patches/patch-ed @@ -0,0 +1,22 @@ +$NetBSD: patch-ed,v 1.1 2006/06/27 11:11:52 joerg Exp $ + +--- nsprpub/pr/src/pthreads/ptthread.c.orig 2006-06-26 14:40:42.000000000 +0000 ++++ nsprpub/pr/src/pthreads/ptthread.c +@@ -847,7 +847,7 @@ void _PR_InitThreads( + #endif + + #if defined(_PR_DCETHREADS) || defined(_POSIX_THREAD_PRIORITY_SCHEDULING) +-#if defined(FREEBSD) ++#if defined(FREEBSD) || defined(DRAGONFLY) + { + pthread_attr_t attr; + int policy; +@@ -1234,7 +1234,7 @@ static void suspend_signal_handler(PRInt + { + #if !defined(FREEBSD) && !defined(NETBSD) && !defined(OPENBSD) \ + && !defined(BSDI) && !defined(VMS) && !defined(UNIXWARE) \ +- && !defined(DARWIN) && !defined(RISCOS) /*XXX*/ ++ && !defined(DARWIN) && !defined(RISCOS) && !defined(DRAGONFLY) /*XXX*/ + PRIntn rv; + sigwait(&sigwait_set, &rv); + #endif diff --git a/time/sunbird/patches/patch-ee b/time/sunbird/patches/patch-ee new file mode 100644 index 00000000000..b56899b130c --- /dev/null +++ b/time/sunbird/patches/patch-ee @@ -0,0 +1,13 @@ +$NetBSD: patch-ee,v 1.1 2006/06/27 11:11:52 joerg Exp $ + +--- xpcom/build/malloc.c.orig 2006-06-26 14:41:22.000000000 +0000 ++++ xpcom/build/malloc.c +@@ -918,7 +918,7 @@ struct mallinfo { + + + #ifdef LACKS_UNISTD_H +-#if !defined(__FreeBSD__) && !defined(__OpenBSD__) && !defined(__NetBSD__) ++#if !defined(__FreeBSD__) && !defined(__OpenBSD__) && !defined(__NetBSD__) && !defined(__DragonFly__) + #if __STD_C + extern Void_t* sbrk(ptrdiff_t); + #else diff --git a/time/sunbird/patches/patch-ef b/time/sunbird/patches/patch-ef new file mode 100644 index 00000000000..e4006dbcc1a --- /dev/null +++ b/time/sunbird/patches/patch-ef @@ -0,0 +1,13 @@ +$NetBSD: patch-ef,v 1.1 2006/06/27 11:11:52 joerg Exp $ + +--- security/nss/lib/freebl/Makefile.orig 2006-06-26 17:51:23.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/time/sunbird/patches/patch-eg b/time/sunbird/patches/patch-eg new file mode 100644 index 00000000000..e291bfc77ea --- /dev/null +++ b/time/sunbird/patches/patch-eg @@ -0,0 +1,13 @@ +$NetBSD: patch-eg,v 1.1 2006/06/27 11:11:52 joerg Exp $ + +--- security/nss/cmd/platlibs.mk.orig 2006-06-26 17:51:46.000000000 +0000 ++++ security/nss/cmd/platlibs.mk +@@ -172,7 +172,7 @@ endif + # If GNU ld is used, we must use the -rpath-link option to tell + # the linker where to find libsoftokn3.so, an implicit dependency + # of libnss3.so. +-ifeq (,$(filter-out BSD_OS FreeBSD Linux NetBSD, $(OS_ARCH))) ++ifeq (,$(filter-out BSD_OS DragonFly FreeBSD Linux NetBSD, $(OS_ARCH))) + EXTRA_SHARED_LIBS += -Wl,-rpath-link,$(DIST)/lib + endif + diff --git a/time/sunbird/patches/patch-eh b/time/sunbird/patches/patch-eh new file mode 100644 index 00000000000..0eda29e3039 --- /dev/null +++ b/time/sunbird/patches/patch-eh @@ -0,0 +1,13 @@ +$NetBSD: patch-eh,v 1.1 2006/06/27 11:11:52 joerg Exp $ + +--- security/coreconf/nsinstall/pathsub.c.orig 2006-06-26 17:52:04.000000000 +0000 ++++ security/coreconf/nsinstall/pathsub.c +@@ -38,7 +38,7 @@ + ** Pathname subroutines. + */ + #include <assert.h> +-#if defined(FREEBSD) || defined(BSDI) || defined(DARWIN) ++#if defined(FREEBSD) || defined(BSDI) || defined(DARWIN) || defined(DRAGONFLY) + #include <sys/types.h> + #endif /* FREEBSD */ + #include <dirent.h> diff --git a/time/sunbird/patches/patch-ei b/time/sunbird/patches/patch-ei new file mode 100644 index 00000000000..7c46e054b27 --- /dev/null +++ b/time/sunbird/patches/patch-ei @@ -0,0 +1,13 @@ +$NetBSD: patch-ei,v 1.1 2006/06/27 11:11:52 joerg Exp $ + +--- security/coreconf/config.mk.orig 2006-06-26 17:52:20.000000000 +0000 ++++ security/coreconf/config.mk +@@ -63,7 +63,7 @@ endif + ####################################################################### + + TARGET_OSES = FreeBSD BSD_OS NetBSD OpenUNIX OS2 QNX Darwin BeOS OpenBSD \ +- OpenVMS AIX ++ OpenVMS AIX DragonFly + + ifeq (,$(filter-out $(TARGET_OSES),$(OS_TARGET))) + include $(CORE_DEPTH)/coreconf/$(OS_TARGET).mk diff --git a/time/sunbird/patches/patch-ej b/time/sunbird/patches/patch-ej new file mode 100644 index 00000000000..c6a98234bdd --- /dev/null +++ b/time/sunbird/patches/patch-ej @@ -0,0 +1,86 @@ +$NetBSD: patch-ej,v 1.1 2006/06/27 11:11:52 joerg Exp $ + +--- /dev/null 2006-06-26 17:53:40.000000000 +0000 ++++ security/coreconf/DragonFly.mk +@@ -0,0 +1,81 @@ ++# ++# ***** BEGIN LICENSE BLOCK ***** ++# Version: MPL 1.1/GPL 2.0/LGPL 2.1 ++# ++# The contents of this file are subject to the Mozilla Public License Version ++# 1.1 (the "License"); you may not use this file except in compliance with ++# the License. You may obtain a copy of the License at ++# http://www.mozilla.org/MPL/ ++# ++# Software distributed under the License is distributed on an "AS IS" basis, ++# WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License ++# for the specific language governing rights and limitations under the ++# License. ++# ++# The Original Code is the Netscape security libraries. ++# ++# The Initial Developer of the Original Code is ++# Netscape Communications Corporation. ++# Portions created by the Initial Developer are Copyright (C) 1994-2000 ++# the Initial Developer. All Rights Reserved. ++# ++# Contributor(s): ++# ++# Alternatively, the contents of this file may be used under the terms of ++# either the GNU General Public License Version 2 or later (the "GPL"), or ++# the GNU Lesser General Public License Version 2.1 or later (the "LGPL"), ++# in which case the provisions of the GPL or the LGPL are applicable instead ++# of those above. If you wish to allow use of your version of this file only ++# under the terms of either the GPL or the LGPL, and not to allow others to ++# use your version of this file under the terms of the MPL, indicate your ++# decision by deleting the provisions above and replace them with the notice ++# and other provisions required by the GPL or the LGPL. If you do not delete ++# the provisions above, a recipient may use your version of this file under ++# the terms of any one of the MPL, the GPL or the LGPL. ++# ++# ***** END LICENSE BLOCK ***** ++ ++include $(CORE_DEPTH)/coreconf/UNIX.mk ++ ++DEFAULT_COMPILER = gcc ++CC = gcc ++CCC = g++ ++RANLIB = ranlib ++ ++ifeq ($(OS_TEST),alpha) ++CPU_ARCH = alpha ++else ++CPU_ARCH = x86 ++endif ++ ++OS_CFLAGS = $(DSO_CFLAGS) -ansi -Wall -DDRAGONFLY -DHAVE_STRERROR -DHAVE_BSD_FLOCK ++ ++DSO_CFLAGS = -fPIC ++DSO_LDOPTS = -shared -Wl,-soname -Wl,$(notdir $@) ++ ++# ++# The default implementation strategy for DragonFly is pthreads. ++# ++ifndef CLASSIC_NSPR ++USE_PTHREADS = 1 ++DEFINES += -D_THREAD_SAFE -D_REENTRANT ++OS_LIBS += -pthread ++DSO_LDOPTS += -pthread ++endif ++ ++ARCH = dragonfly ++ ++MOZ_OBJFORMAT := elf ++ ++DLL_SUFFIX = so ++ ++MKSHLIB = $(CC) $(DSO_LDOPTS) ++ifdef MAPFILE ++ MKSHLIB += -Wl,--version-script,$(MAPFILE) ++endif ++PROCESS_MAP_FILE = grep -v ';-' $< | \ ++ sed -e 's,;+,,' -e 's; DATA ;;' -e 's,;;,,' -e 's,;.*,;,' > $@ ++ ++G++INCLUDES = -I/usr/include/g++ ++ ++INCLUDES += -I/usr/X11R6/include diff --git a/time/sunbird/patches/patch-ek b/time/sunbird/patches/patch-ek new file mode 100644 index 00000000000..4ffd0be09b4 --- /dev/null +++ b/time/sunbird/patches/patch-ek @@ -0,0 +1,14 @@ +$NetBSD: patch-ek,v 1.1 2006/06/27 11:11:52 joerg Exp $ + +--- dbm/src/mktemp.c.orig 2006-06-26 18:13:20.000000000 +0000 ++++ dbm/src/mktemp.c +@@ -96,9 +96,6 @@ mktemp(char *path) + static int + _gettemp(char *path, register int *doopen, int extraFlags) + { +-#if !defined(_WINDOWS) || defined(_WIN32) +- extern int errno; +-#endif + register char *start, *trv; + struct stat sbuf; + unsigned int pid; |