diff options
author | he <he@pkgsrc.org> | 2009-05-29 13:22:11 +0000 |
---|---|---|
committer | he <he@pkgsrc.org> | 2009-05-29 13:22:11 +0000 |
commit | 14d3864f52f2ba96bfc0112e6a01c6a77d8fb44f (patch) | |
tree | ac302051d494f8b7f1a9b9d93110b7658d3b4cd1 /time/sunbird/patches | |
parent | cc27cc85e92e069a780a1f7c29143460e2223d01 (diff) | |
download | pkgsrc-14d3864f52f2ba96bfc0112e6a01c6a77d8fb44f.tar.gz |
Update from version 0.3.1 to 0.9.
Reviewed and tested by wiz@.
Pkgsrc changes:
o Adapt the large set of diffs to the new version.
o Depend directly on cairo and turn off the use of the ancient
version of cairo embedded in the distribution. (Caused build
failures with a newer cairo installed from pkgsrc.)
Upstream changes:
What's New in Sunbird 0.9
- - - - - - - - - - - - -
Sunbird 0.9 is the latest release of our standalone calendar
application. We recommend that all users upgrade to this latest
version.
The following features have been added to Sunbird 0.9:
* Events spanning days now have a visual indicator indicating
them as connected events
* When reloading a remote calendar a progress indicator is now shown
* The so-called "minimonth" (small calendar month in the upper
left) has been given a visual overhaul
* The calendar views (day, week, multiweek, month) have been
given a visual overhaul
* CalDAV support and interoperability with various CalDAV
servers has been improved
* The application stability and memory consumption has been
greatly improved
* A full list of changes that have gone into this release can
be found on The Rumbling Edge website at
http://www.rumblingedge.com/2008/09/21/sunbird-09-released/
Release Date: September 23, 2008
What's New in Sunbird 0.8
- - - - - - - - - - - - -
Sunbird 0.8 is the latest release of our standalone calendar
application. We recommend that all users upgrade to this latest
version.
The following features have been added to Sunbird 0.8:
* A new icon set which matches more closely the icon style of
other mozilla applications
* Category colors are now shown next to an event box, giving
users a much better overview of their differently categorized
events
* Events with alarms now have a visual indicator showing an alarm bell
* A totally overhauled alarm dialog
* Sunbird now recognizes the timezone definitions in .ics files
created by other applications. This fixes the longstanding
issue of Sunbird miscalculating the date or time of events
contained in those files
* The timezone guessing has been significantly improved
* Sunbird now contains experimental support for viewing remote
calendars offline. This feature has known bugs and is included
for testing purposes only
* Sunbird contains several performance fixes, which should
improve working with larger calendar files
* You can now define for each of your calendars, whether you
want to be notified of alarms for events in these calendars or
not
* A full list of changes that have gone into this release can
be found on The Rumbling Edge website at
http://weblogs.mozillazine.org/rumblingedge/archives/2007/11/sb_0-8.html
Release Date: April 04, 2008
What's New in Mozilla Sunbird (R) 0.7
- - - - - - - - - - - - - - - - - - -
Mozilla Sunbird 0.7 is the latest release of our standalone calendar
application. We recommend that all users upgrade to this latest
version.
* A redesigned event/task dialog has been enabled to gather
feedback from the community. It offers a much cleaner user
interface and additional functionality including:
o Events/Tasks can be created in different timezones
o Integrated display of recurrence patterns, reminders
o Custom recurrences and reminders
o Clear separation between tasks and events
* The new event summary dialog lists all the details of tasks
and events for calendar which are read-only.
* Colliding events (events in the same time slot) are shrunk
so that they fit into the display of a day. This no longer
affects other events on the same day.
* Localized releases of Sunbird in Chinese (simplified),
Georgian, Lithuanian, Portuguese (European), Spanish (Argentina)
and Turkish
* A full list of changes that have gone into this release can
be found on The Rumbling Edge website at
http://weblogs.mozillazine.org/rumblingedge/archives/2007/07/sb_0-7.html
Release Date: October 25, 2007
What's New in Mozilla Sunbird (R) 0.5
- - - - - - - - - - - - - - - - - - -
Mozilla Sunbird 0.5 is the latest release of our standalone calendar
application. We recommend that all users upgrade to this latest
version.
* Much more polished user interface in the calendar views
* Working hours are back
* Automatic migration of data in Sunbird 0.2, iCal.app, and Evolution
* Much improved printing functionality
* Support for Google Calendar (via the Google Calendar Provider extension)
* Vastly improved reliability
* Many performance improvements
* Many usability improvements
* A full list of changes that have gone into this release can
be found on The Rumbling Edge weblog at
http://weblogs.mozillazine.org/rumblingedge/archives/2006/12/sb_0-5.html
Release Date: June 27, 2007
Diffstat (limited to 'time/sunbird/patches')
-rw-r--r-- | time/sunbird/patches/patch-ac | 22 | ||||
-rw-r--r-- | time/sunbird/patches/patch-af | 19 | ||||
-rw-r--r-- | time/sunbird/patches/patch-ap | 8 | ||||
-rw-r--r-- | time/sunbird/patches/patch-aq | 14 | ||||
-rw-r--r-- | time/sunbird/patches/patch-at | 36 | ||||
-rw-r--r-- | time/sunbird/patches/patch-ba | 4 | ||||
-rw-r--r-- | time/sunbird/patches/patch-br | 16 | ||||
-rw-r--r-- | time/sunbird/patches/patch-df | 24 | ||||
-rw-r--r-- | time/sunbird/patches/patch-ds | 32 | ||||
-rw-r--r-- | time/sunbird/patches/patch-du | 12 | ||||
-rw-r--r-- | time/sunbird/patches/patch-dv | 10 | ||||
-rw-r--r-- | time/sunbird/patches/patch-dx | 14 | ||||
-rw-r--r-- | time/sunbird/patches/patch-eb | 14 | ||||
-rw-r--r-- | time/sunbird/patches/patch-ef | 10 |
14 files changed, 94 insertions, 141 deletions
diff --git a/time/sunbird/patches/patch-ac b/time/sunbird/patches/patch-ac index 579f3511291..defaa9f9503 100644 --- a/time/sunbird/patches/patch-ac +++ b/time/sunbird/patches/patch-ac @@ -1,8 +1,8 @@ -$NetBSD: patch-ac,v 1.4 2006/09/26 19:41:48 salo Exp $ +$NetBSD: patch-ac,v 1.5 2009/05/29 13:22:11 he Exp $ ---- 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.orig 2008-02-19 22:11:34.000000000 +0100 +++ xpcom/reflect/xptcall/src/md/unix/Makefile.in -@@ -62,13 +62,16 @@ include $(topsrcdir)/config/config.mk +@@ -62,7 +62,7 @@ include $(topsrcdir)/config/config.mk # # Lots of Unixish x86 flavors # @@ -10,17 +10,19 @@ $NetBSD: patch-ac,v 1.4 2006/09/26 19:41:48 salo Exp $ +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 +@@ -72,6 +72,10 @@ endif + # + ifeq ($(OS_ARCH)$(OS_TEST),OpenBSDamd64) + CPPSRCS := xptcinvoke_openbsd_amd64.cpp xptcstubs_openbsd_amd64.cpp ++else +ifeq (amd64,$(OS_TEST)) +CPPSRCS := xptcinvoke_x86_64_linux.cpp xptcstubs_x86_64_linux.cpp +endif endif # # New code for Linux, et. al., with gcc -@@ -161,7 +164,7 @@ endif +@@ -180,7 +184,7 @@ endif # NetBSD/ARM # ifeq ($(OS_ARCH),NetBSD) @@ -29,7 +31,7 @@ $NetBSD: patch-ac,v 1.4 2006/09/26 19:41:48 salo Exp $ CPPSRCS := xptcinvoke_arm_netbsd.cpp xptcstubs_arm_netbsd.cpp endif endif -@@ -195,7 +198,7 @@ endif +@@ -224,7 +228,7 @@ endif # NetBSD/m68k # ifeq ($(OS_ARCH),NetBSD) @@ -38,7 +40,7 @@ $NetBSD: patch-ac,v 1.4 2006/09/26 19:41:48 salo Exp $ CPPSRCS := xptcinvoke_netbsd_m68k.cpp xptcstubs_netbsd_m68k.cpp endif endif -@@ -278,6 +281,7 @@ endif +@@ -307,6 +311,7 @@ endif ifneq (,$(filter NetBSDmacppc NetBSDbebox NetBSDofppc NetBSDprep NetBSDamigappc,$(OS_ARCH)$(OS_TEST))) CPPSRCS := xptcinvoke_ppc_netbsd.cpp xptcstubs_ppc_netbsd.cpp ASFILES := xptcinvoke_asm_ppc_netbsd.s xptcstubs_asm_ppc_netbsd.s @@ -46,7 +48,7 @@ $NetBSD: patch-ac,v 1.4 2006/09/26 19:41:48 salo Exp $ endif # -@@ -326,6 +330,13 @@ ifeq ($(OS_ARCH)$(OS_TEST),NetBSDsparc) +@@ -363,6 +368,13 @@ ifeq ($(OS_ARCH)$(OS_TEST),NetBSDsparc) CPPSRCS := xptcinvoke_sparc_netbsd.cpp xptcstubs_sparc_netbsd.cpp ASFILES := xptcinvoke_asm_sparc_netbsd.s xptcstubs_asm_sparc_netbsd.s endif diff --git a/time/sunbird/patches/patch-af b/time/sunbird/patches/patch-af index ccb38695192..c549f04cdad 100644 --- a/time/sunbird/patches/patch-af +++ b/time/sunbird/patches/patch-af @@ -1,6 +1,6 @@ -$NetBSD: patch-af,v 1.3 2006/10/12 13:42:34 ghen Exp $ +$NetBSD: patch-af,v 1.4 2009/05/29 13:22:11 he Exp $ ---- security/nss/lib/freebl/unix_rand.c.orig 2006-04-04 01:01:51.000000000 +0000 +--- security/nss/lib/freebl/unix_rand.c.orig 2007-07-26 01:18:55.000000000 +0200 +++ security/nss/lib/freebl/unix_rand.c @@ -35,6 +35,7 @@ * ***** END LICENSE BLOCK ***** */ @@ -10,7 +10,7 @@ $NetBSD: patch-af,v 1.3 2006/10/12 13:42:34 ghen Exp $ #include <string.h> #include <signal.h> #include <unistd.h> -@@ -183,7 +183,8 @@ static SECStatus RNG_kstat(PRUint32* fed +@@ -185,7 +186,8 @@ static SECStatus RNG_kstat(PRUint32* fed #endif #if defined(SCO) || defined(UNIXWARE) || defined(BSDI) || defined(FREEBSD) \ @@ -20,16 +20,3 @@ $NetBSD: patch-af,v 1.3 2006/10/12 13:42:34 ghen Exp $ #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); -- close(0); -+ fd = open("/dev/null", O_RDONLY); -+ if (fd != 0) { -+ dup2(fd, 0); -+ close(fd); -+ } - { - int ndesc = getdtablesize(); - for (fd = PR_MIN(65536, ndesc); --fd > 2; close(fd)); diff --git a/time/sunbird/patches/patch-ap b/time/sunbird/patches/patch-ap index 6d88f3085a5..89e3b16f563 100644 --- a/time/sunbird/patches/patch-ap +++ b/time/sunbird/patches/patch-ap @@ -1,13 +1,13 @@ -$NetBSD: patch-ap,v 1.2 2006/06/07 19:29:59 ghen Exp $ +$NetBSD: patch-ap,v 1.3 2009/05/29 13:22:11 he Exp $ ---- security/coreconf/command.mk.orig 2006-06-07 17:51:56.000000000 +0200 +--- security/coreconf/command.mk.orig 2007-05-09 03:38:16.000000000 +0200 +++ security/coreconf/command.mk @@ -45,7 +45,7 @@ ASFLAGS += $(CFLAGS) CCF = $(CC) $(CFLAGS) LINK_DLL = $(LINK) $(OS_DLLFLAGS) $(DLLFLAGS) LINK_EXE = $(LINK) $(OS_LFLAGS) $(LFLAGS) -CFLAGS = $(OPTIMIZER) $(OS_CFLAGS) $(XP_DEFINE) $(DEFINES) $(INCLUDES) \ -+CFLAGS += $(OS_CFLAGS) $(XP_DEFINE) $(DEFINES) $(INCLUDES) \ ++CFLAGS = $(OS_CFLAGS) $(XP_DEFINE) $(DEFINES) $(INCLUDES) \ $(XCFLAGS) + PERL = perl RANLIB = echo - TAR = /bin/tar diff --git a/time/sunbird/patches/patch-aq b/time/sunbird/patches/patch-aq index 03493cd6492..72616470462 100644 --- a/time/sunbird/patches/patch-aq +++ b/time/sunbird/patches/patch-aq @@ -1,6 +1,6 @@ -$NetBSD: patch-aq,v 1.2 2006/06/27 11:11:52 joerg Exp $ +$NetBSD: patch-aq,v 1.3 2009/05/29 13:22:11 he Exp $ ---- directory/c-sdk/configure.in.orig 2006-04-11 21:12:58.000000000 +0000 +--- directory/c-sdk/configure.in.orig 2007-07-11 22:43:19.000000000 +0200 +++ directory/c-sdk/configure.in @@ -58,7 +58,7 @@ USE_64= USE_CPLUS= @@ -11,13 +11,13 @@ $NetBSD: patch-aq,v 1.2 2006/06/27 11:11:52 joerg Exp $ _DEBUG_FLAGS=-g MOZ_DEBUG=1 MOZ_OPTIMIZE= -@@ -1183,6 +1183,24 @@ tools are selected during the Xcode/Deve - DSO_LDOPTS=-Bshareable +@@ -1049,6 +1049,24 @@ tools are selected during the Xcode/Deve + PR_MD_CSRCS=freebsd.c ;; +*-*-dragonfly*) + if test -z "$USE_NSPR_THREADS"; then -+ USE_PTHREADS=1 ++ USE_PTHREADS=1 + fi + AC_DEFINE(XP_UNIX) + AC_DEFINE(DRAGONFLY) @@ -36,7 +36,7 @@ $NetBSD: patch-aq,v 1.2 2006/06/27 11:11:52 joerg Exp $ *-hpux*) AC_DEFINE(XP_UNIX) AC_DEFINE(HPUX) -@@ -2270,7 +2288,7 @@ if test -n "$USE_PTHREADS"; then +@@ -2180,7 +2198,7 @@ if test -n "$USE_PTHREADS"; then _PTHREAD_LDFLAGS= fi ;; @@ -45,7 +45,7 @@ $NetBSD: patch-aq,v 1.2 2006/06/27 11:11:52 joerg Exp $ 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 +@@ -2238,6 +2256,11 @@ case "$target" in AC_DEFINE(_PR_LOCAL_THREADS_ONLY) fi ;; diff --git a/time/sunbird/patches/patch-at b/time/sunbird/patches/patch-at deleted file mode 100644 index 864d6b219dd..00000000000 --- a/time/sunbird/patches/patch-at +++ /dev/null @@ -1,36 +0,0 @@ -$NetBSD: patch-at,v 1.1 2006/10/23 10:49:34 markd Exp $ - ---- directory/c-sdk/ldap/libraries/libprldap/ldappr-io.c.orig 2006-05-25 11:38:04.000000000 +1200 -+++ directory/c-sdk/ldap/libraries/libprldap/ldappr-io.c -@@ -292,12 +292,12 @@ prldap_try_one_address( struct lextiof_s - * Set up address and open a TCP socket: - */ - if ( PR_SUCCESS != PR_SetNetAddr( PR_IpAddrNull, /* don't touch IP addr. */ -- PRLDAP_DEFAULT_ADDRESS_FAMILY, (PRUint16)port, addrp )) { -+ PR_NetAddrFamily( addrp ), (PRUint16)port, addrp )) { - return( -1 ); - } - - if (( prsockp->prsock_prfd = PR_OpenTCPSocket( -- PRLDAP_DEFAULT_ADDRESS_FAMILY )) == NULL ) { -+ PR_NetAddrFamily( addrp ))) == NULL ) { - return( -1 ); - } - -@@ -390,14 +390,14 @@ prldap_connect( const char *hostlist, in - - if ( PR_SUCCESS == PR_StringToNetAddr( host, &addr )) { - -- if ( PRLDAP_DEFAULT_ADDRESS_FAMILY == PR_AF_INET6 && -+ /*if ( PRLDAP_DEFAULT_ADDRESS_FAMILY == PR_AF_INET6 && - PR_AF_INET == PR_NetAddrFamily( &addr )) { - PRUint32 ipv4ip = addr.inet.ip; - memset( &addr, 0, sizeof(addr)); - PR_ConvertIPv4AddrToIPv6( ipv4ip, &addr.ipv6.ip ); - addr.ipv6.family = PR_AF_INET6; - -- } -+ }*/ - rc = prldap_try_one_address( prsockp, &addr, port, - timeout, options ); - } else { diff --git a/time/sunbird/patches/patch-ba b/time/sunbird/patches/patch-ba index 1cbcc6480e4..0010aed631a 100644 --- a/time/sunbird/patches/patch-ba +++ b/time/sunbird/patches/patch-ba @@ -1,4 +1,4 @@ -$NetBSD: patch-ba,v 1.1.1.1 2006/02/05 21:56:26 ghen Exp $ +$NetBSD: patch-ba,v 1.2 2009/05/29 13:22:11 he Exp $ --- nsprpub/pr/include/md/_netbsd.cfg.orig 2006-02-02 16:57:57.000000000 +0100 +++ nsprpub/pr/include/md/_netbsd.cfg @@ -17,7 +17,7 @@ $NetBSD: patch-ba,v 1.1.1.1 2006/02/05 21:56:26 ghen Exp $ #define PR_ALIGN_OF_POINTER 4 -#elif defined(__sparc__) || defined(__MIPSEB__) -+#elif defined(__sparc_v9__) ++#elif defined(__sparc_v9) + +#undef IS_LITTLE_ENDIAN +#define IS_BIG_ENDIAN 1 diff --git a/time/sunbird/patches/patch-br b/time/sunbird/patches/patch-br index 1a85ad921fa..669dc754875 100644 --- a/time/sunbird/patches/patch-br +++ b/time/sunbird/patches/patch-br @@ -1,8 +1,8 @@ -$NetBSD: patch-br,v 1.3 2009/04/07 17:25:55 hasso Exp $ +$NetBSD: patch-br,v 1.4 2009/05/29 13:22:11 he Exp $ ---- nsprpub/pr/src/misc/prnetdb.c.orig 2008-05-02 11:18:14 +0300 -+++ nsprpub/pr/src/misc/prnetdb.c 2009-04-04 19:53:32 +0300 -@@ -114,6 +114,11 @@ PRLock *_pr_dnsLock = NULL; +--- nsprpub/pr/src/misc/prnetdb.c.orig 2006-11-14 18:41:59.000000000 +0100 ++++ nsprpub/pr/src/misc/prnetdb.c +@@ -113,6 +113,11 @@ PRLock *_pr_dnsLock = NULL; #define _PR_HAVE_5_ARG_GETPROTO_R #endif @@ -11,10 +11,10 @@ $NetBSD: patch-br,v 1.3 2009/04/07 17:25:55 hasso Exp $ +#define _PR_HAVE_5_ARG_GETPROTO_R +#endif + - /* BeOS has glibc but not the glibc-style getprotobyxxx_r functions. */ - #if (defined(__GLIBC__) && __GLIBC__ >= 2 && !defined(XP_BEOS)) + #if (defined(LINUX) && defined(__GLIBC__) && __GLIBC__ >= 2) #define _PR_HAVE_GETPROTO_R -@@ -331,7 +336,7 @@ _pr_QueryNetIfs(void) + #define _PR_HAVE_5_ARG_GETPROTO_R +@@ -329,7 +334,7 @@ _pr_QueryNetIfs(void) } #elif (defined(DARWIN) && defined(HAVE_GETIFADDRS)) || defined(FREEBSD) \ @@ -23,7 +23,7 @@ $NetBSD: patch-br,v 1.3 2009/04/07 17:25:55 hasso Exp $ /* * Use the BSD getifaddrs function. -@@ -2023,7 +2028,17 @@ PR_IMPLEMENT(PRAddrInfo *) PR_GetAddrInf +@@ -2115,7 +2120,17 @@ PR_IMPLEMENT(PRAddrInfo *) PR_GetAddrInf */ hints.ai_socktype = SOCK_STREAM; diff --git a/time/sunbird/patches/patch-df b/time/sunbird/patches/patch-df index 53cf2cac809..cb476fc33d6 100644 --- a/time/sunbird/patches/patch-df +++ b/time/sunbird/patches/patch-df @@ -1,8 +1,8 @@ -$NetBSD: patch-df,v 1.1 2006/06/27 11:11:52 joerg Exp $ +$NetBSD: patch-df,v 1.2 2009/05/29 13:22:11 he Exp $ ---- directory/c-sdk/ldap/include/portable.h.orig 2006-06-26 13:42:37.000000000 +0000 +--- directory/c-sdk/ldap/include/portable.h.orig 2006-02-03 15:44:40.000000000 +0100 +++ directory/c-sdk/ldap/include/portable.h -@@ -122,7 +122,7 @@ +@@ -131,7 +131,7 @@ * some systems don't have the BSD re_comp and re_exec routines */ #ifndef NEED_BSDREGEX @@ -11,7 +11,7 @@ $NetBSD: patch-df,v 1.1 2006/06/27 11:11:52 joerg Exp $ #define NEED_BSDREGEX #endif #endif -@@ -141,7 +141,7 @@ +@@ -150,7 +150,7 @@ * Are sys_errlist and sys_nerr declared in stdio.h? */ #ifndef SYSERRLIST_IN_STDIO @@ -20,25 +20,25 @@ $NetBSD: patch-df,v 1.1 2006/06/27 11:11:52 joerg Exp $ #define SYSERRLIST_IN_STDIO #endif #endif -@@ -193,7 +193,7 @@ +@@ -202,7 +202,7 @@ */ - #if !defined(NSLDAPI_CONNECT_MUST_NOT_BE_INTERRUPTED) && \ + #if !defined(LDAP_CONNECT_MUST_NOT_BE_INTERRUPTED) && \ ( defined(AIX) || defined(IRIX) || defined(HPUX) || defined(SUNOS4) \ - || defined(SOLARIS) || defined(OSF1) ||defined(freebsd)) -+ || defined(SOLARIS) || defined(OSF1) ||defined(freebsd) || defined(dragonfly)) - #define NSLDAPI_CONNECT_MUST_NOT_BE_INTERRUPTED ++ || defined(SOLARIS) || defined(OSF1) ||defined(freebsd) || defined(dragonfly)) + #define LDAP_CONNECT_MUST_NOT_BE_INTERRUPTED #endif -@@ -276,7 +276,7 @@ int strncasecmp(const char *, const char - defined(UnixWare) || defined(NETBSD) || \ +@@ -293,7 +293,7 @@ int strncasecmp(const char *, const char + ( defined(HPUX10) && !defined(_REENTRANT)) || defined(HPUX11) || \ + defined(UnixWare) || defined(LINUX) || defined(NETBSD) || \ defined(FREEBSD) || defined(OPENBSD) || \ - (defined(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 +@@ -326,7 +326,7 @@ typedef char GETHOSTBYNAME_buf_t [BUFSIZ || defined(OSF1V4) || defined(AIX) || defined(UnixWare) \ || defined(hpux) || defined(HPUX11) || defined(NETBSD) \ || defined(IRIX6) || defined(FREEBSD) || defined(VMS) \ diff --git a/time/sunbird/patches/patch-ds b/time/sunbird/patches/patch-ds index 2612b8ab677..347bd199d6c 100644 --- a/time/sunbird/patches/patch-ds +++ b/time/sunbird/patches/patch-ds @@ -1,6 +1,6 @@ -$NetBSD: patch-ds,v 1.1 2006/06/27 11:11:52 joerg Exp $ +$NetBSD: patch-ds,v 1.2 2009/05/29 13:22:11 he Exp $ ---- nsprpub/pr/include/md/_pth.h.orig 2006-06-26 14:28:04.000000000 +0000 +--- nsprpub/pr/include/md/_pth.h.orig 2007-10-31 18:36:57.000000000 +0100 +++ nsprpub/pr/include/md/_pth.h @@ -93,7 +93,7 @@ #define _PT_PTHREAD_MUTEXATTR_INIT pthread_mutexattr_init @@ -11,17 +11,17 @@ $NetBSD: patch-ds,v 1.1 2006/06/27 11:11:52 joerg Exp $ #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) +@@ -145,7 +145,7 @@ #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(HPUX) || defined(LINUX) || defined(FREEBSD) \ || defined(NETBSD) || defined(OPENBSD) || defined(BSDI) \ - || defined(VMS) || defined(NTO) || defined(DARWIN) \ +- || defined(VMS) || defined(NTO) || defined(DARWIN) \ ++ || defined(VMS) || defined(NTO) || defined(DARWIN) || defined(DRAGONFLY)\ || defined(UNIXWARE) || defined(RISCOS) -@@ -204,7 +204,7 @@ - || defined(LINUX) || defined(__GNU__)|| defined(__GLIBC__) \ + #define _PT_PTHREAD_INVALIDATE_THR_HANDLE(t) (t) = 0 + #define _PT_PTHREAD_THR_HANDLE_IS_INVALID(t) (t) == 0 +@@ -198,7 +198,7 @@ + #if (defined(AIX) && !defined(AIX4_3_PLUS)) || defined(LINUX) \ || defined(FREEBSD) || defined(NETBSD) || defined(OPENBSD) \ || defined(BSDI) || defined(VMS) || defined(UNIXWARE) \ - || defined(DARWIN) @@ -29,17 +29,17 @@ $NetBSD: patch-ds,v 1.1 2006/06/27 11:11:52 joerg Exp $ #define PT_NO_SIGTIMEDWAIT #endif -@@ -242,7 +242,7 @@ +@@ -228,7 +228,7 @@ + #define PT_PRIO_MAX sched_get_priority_max(SCHED_OTHER) #endif /* defined(_PR_DCETHREADS) */ - #elif defined(LINUX) || defined(__GNU__) || defined(__GLIBC__) \ -- || defined(FREEBSD) -+ || defined(FREEBSD) || defined(DRAGONFLY) +-#elif defined(LINUX) || defined(FREEBSD) ++#elif defined(LINUX) || defined(FREEBSD) || defined(DRAGONFLY) #define PT_PRIO_MIN sched_get_priority_min(SCHED_OTHER) #define PT_PRIO_MAX sched_get_priority_max(SCHED_OTHER) #elif defined(NTO) -@@ -302,7 +302,7 @@ extern int (*_PT_aix_yield_fcn)(); - || defined(LINUX) || defined(__GNU__) || defined(__GLIBC__) \ +@@ -287,7 +287,7 @@ extern int (*_PT_aix_yield_fcn)(); + #elif defined(HPUX) || defined(LINUX) || defined(SOLARIS) \ || defined(FREEBSD) || defined(NETBSD) || defined(OPENBSD) \ || defined(BSDI) || defined(NTO) || defined(DARWIN) \ - || defined(UNIXWARE) || defined(RISCOS) diff --git a/time/sunbird/patches/patch-du b/time/sunbird/patches/patch-du index 5bc3c1278b6..54f14c127ba 100644 --- a/time/sunbird/patches/patch-du +++ b/time/sunbird/patches/patch-du @@ -1,13 +1,13 @@ -$NetBSD: patch-du,v 1.1 2006/06/27 11:11:52 joerg Exp $ +$NetBSD: patch-du,v 1.2 2009/05/29 13:22:11 he Exp $ ---- nsprpub/pr/src/linking/prlink.c.orig 2006-06-26 14:36:45.000000000 +0000 +--- nsprpub/pr/src/linking/prlink.c.orig 2006-10-07 01:36:22.000000000 +0200 +++ nsprpub/pr/src/linking/prlink.c -@@ -1616,7 +1616,7 @@ PR_IMPLEMENT(char *) +@@ -1606,7 +1606,7 @@ PR_LoadStaticLibrary(const char *name, c + 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)) +-#if defined(SOLARIS) || defined(LINUX) || defined(FREEBSD) ++#if defined(SOLARIS) || defined(LINUX) || defined(FREEBSD) || defined(DRAGONFLY) Dl_info dli; char *result; diff --git a/time/sunbird/patches/patch-dv b/time/sunbird/patches/patch-dv index d9063c7225a..d1b94491f89 100644 --- a/time/sunbird/patches/patch-dv +++ b/time/sunbird/patches/patch-dv @@ -1,10 +1,10 @@ -$NetBSD: patch-dv,v 1.1 2006/06/27 11:11:52 joerg Exp $ +$NetBSD: patch-dv,v 1.2 2009/05/29 13:22:11 he Exp $ ---- nsprpub/pr/src/md/prosdep.c.orig 2006-06-26 14:37:07.000000000 +0000 +--- nsprpub/pr/src/md/prosdep.c.orig 2004-04-25 17:00:58.000000000 +0200 +++ 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__ \ +@@ -65,7 +65,7 @@ static void GetPageSize(void) + #ifdef XP_UNIX + #if defined SUNOS4 || defined LINUX || defined BSDI || defined AIX \ || defined FREEBSD || defined NETBSD || defined OPENBSD \ - || defined DARWIN || defined NEXTSTEP + || defined DARWIN || defined NEXTSTEP || defined DRAGONFLY diff --git a/time/sunbird/patches/patch-dx b/time/sunbird/patches/patch-dx index 5bc71175fb3..4746eb85ac7 100644 --- a/time/sunbird/patches/patch-dx +++ b/time/sunbird/patches/patch-dx @@ -1,14 +1,14 @@ -$NetBSD: patch-dx,v 1.1 2006/06/27 11:11:52 joerg Exp $ +$NetBSD: patch-dx,v 1.2 2009/05/29 13:22:11 he Exp $ ---- nsprpub/pr/src/md/unix/uxrng.c.orig 2006-06-26 14:37:48.000000000 +0000 +--- nsprpub/pr/src/md/unix/uxrng.c.orig 2005-07-02 00:26:36.000000000 +0200 +++ nsprpub/pr/src/md/unix/uxrng.c -@@ -139,7 +139,8 @@ GetHighResClock(void *buf, size_t maxbyt +@@ -138,7 +138,8 @@ GetHighResClock(void *buf, size_t maxbyt + return 0; } - #elif (defined(LINUX) || defined(FREEBSD) || defined(__FreeBSD_kernel__) \ -- || defined(NETBSD) || defined(__NetBSD_kernel__) || defined(OPENBSD)) -+ || defined(NETBSD) || defined(__NetBSD_kernel__) || defined(OPENBSD)) \ -+ || defined(DRAGONFLY) +-#elif (defined(LINUX) || defined(FREEBSD) || defined(NETBSD) || defined(OPENBSD)) ++#elif (defined(LINUX) || defined(FREEBSD) || defined(NETBSD) || \ ++ defined(OPENBSD) || defined(DRAGONFLY)) #include <sys/types.h> #include <sys/stat.h> #include <fcntl.h> diff --git a/time/sunbird/patches/patch-eb b/time/sunbird/patches/patch-eb index 312ff13bad8..226b35f5a29 100644 --- a/time/sunbird/patches/patch-eb +++ b/time/sunbird/patches/patch-eb @@ -1,9 +1,9 @@ -$NetBSD: patch-eb,v 1.1 2006/06/27 11:11:52 joerg Exp $ +$NetBSD: patch-eb,v 1.2 2009/05/29 13:22:11 he Exp $ ---- nsprpub/pr/src/pthreads/ptio.c.orig 2006-06-26 14:39:26.000000000 +0000 +--- nsprpub/pr/src/pthreads/ptio.c.orig 2007-08-29 03:29:59.000000000 +0200 +++ nsprpub/pr/src/pthreads/ptio.c -@@ -209,7 +209,7 @@ static PRBool _pr_ipv6_v6only_on_by_defa - || defined(LINUX) || defined(__GNU__) || defined(__GLIBC__) \ +@@ -208,7 +208,7 @@ static PRBool _pr_ipv6_v6only_on_by_defa + || defined(HPUX10_30) || defined(HPUX11) || defined(LINUX) \ || defined(FREEBSD) || defined(NETBSD) || defined(OPENBSD) \ || defined(BSDI) || defined(VMS) || defined(NTO) || defined(DARWIN) \ - || defined(UNIXWARE) || defined(RISCOS) @@ -11,9 +11,9 @@ $NetBSD: patch-eb,v 1.1 2006/06/27 11:11:52 joerg Exp $ #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) \ +@@ -3249,7 +3249,7 @@ static PRIOMethods _pr_socketpollfd_meth + #if defined(HPUX) || defined(OSF1) || defined(SOLARIS) || defined (IRIX) \ + || defined(AIX) || defined(LINUX) || defined(FREEBSD) || defined(NETBSD) \ || defined(OPENBSD) || defined(BSDI) || defined(VMS) || defined(NTO) \ - || defined(DARWIN) || defined(UNIXWARE) || defined(RISCOS) + || defined(DARWIN) || defined(UNIXWARE) || defined(RISCOS) || defined(DRAGONFLY) diff --git a/time/sunbird/patches/patch-ef b/time/sunbird/patches/patch-ef index e4006dbcc1a..f444b3482d5 100644 --- a/time/sunbird/patches/patch-ef +++ b/time/sunbird/patches/patch-ef @@ -1,13 +1,13 @@ -$NetBSD: patch-ef,v 1.1 2006/06/27 11:11:52 joerg Exp $ +$NetBSD: patch-ef,v 1.2 2009/05/29 13:22:11 he Exp $ ---- security/nss/lib/freebl/Makefile.orig 2006-06-26 17:51:23.000000000 +0000 +--- security/nss/lib/freebl/Makefile.orig 2007-11-14 23:47:33.000000000 +0100 +++ security/nss/lib/freebl/Makefile -@@ -192,7 +192,7 @@ endif +@@ -194,7 +194,7 @@ endif # to bind the blapi function references in FREEBLVector vector # (ldvector.c) to the blapi functions defined in the freebl # shared libraries. --ifeq (,$(filter-out BSD_OS FreeBSD Linux NetBSD, $(OS_TARGET))) -+ifeq (,$(filter-out BSD_OS DragonFly FreeBSD Linux NetBSD, $(OS_TARGET))) +-ifeq (,$(filter-out BSD_OS FreeBSD Linux NetBSD OpenBSD, $(OS_TARGET))) ++ifeq (,$(filter-out BSD_OS DragonFly FreeBSD Linux NetBSD OpenBSD, $(OS_TARGET))) MKSHLIB += -Wl,-Bsymbolic endif |