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
This commit is contained in:
he 2009-05-29 13:22:11 +00:00
parent 38570ec2a1
commit 65884b8764
18 changed files with 750 additions and 457 deletions

View file

@ -1,7 +1,7 @@
# $NetBSD: Makefile,v 1.6 2009/03/18 00:08:39 abs Exp $
# $NetBSD: Makefile,v 1.7 2009/05/29 13:22:11 he Exp $
MOZILLA= sunbird
PKGREVISION= 1
#PKGREVISION= 1
COMMENT= Mozilla stand-alone calendar application

View file

@ -1,14 +1,17 @@
# $NetBSD: Makefile-sunbird.common,v 1.13 2009/03/18 00:08:39 abs Exp $
# $NetBSD: Makefile-sunbird.common,v 1.14 2009/05/29 13:22:11 he Exp $
# used by time/sunbird/Makefile
MOZILLA_BIN= sunbird-bin
MOZ_VER= 0.3.1
MOZ_VER= 0.9
EXTRACT_SUFX= .tar.bz2
DISTNAME= sunbird-${MOZ_VER}.source
DISTNAME= lightning-sunbird-${MOZ_VER}-source
CATEGORIES= time
MASTER_SITES= ${MASTER_SITE_MOZILLA:=calendar/sunbird/releases/${MOZ_VER}/source/}
HOMEPAGE= http://www.mozilla.org/projects/calendar/sunbird/
LICENSE= mozilla-trademark-license
PKG_DESTDIR_SUPPORT= user-destdir
CONFIGURE_ENV+= MOZ_SUNBIRD=1
MAKE_ENV+= MOZ_SUNBIRD=1
@ -17,11 +20,12 @@ DISTINFO_FILE= ${.CURDIR}/../../time/sunbird/distinfo
PATCHDIR= ${.CURDIR}/../../time/sunbird/patches
CONFIGURE_ARGS+= --enable-application=calendar
# To avoid use of ancient cairo embedded in distribution:
CONFIGURE_ARGS+= --enable-system-cairo
.include "../../graphics/cairo/buildlink3.mk"
CHECK_FILES_SKIP+= ${PREFIX}/lib/${MOZILLA}/chrome/app-chrome.manifest
CHECK_FILES_SKIP+= ${PREFIX}/lib/${MOZILLA}/components/compreg.dat
CHECK_FILES_SKIP+= ${PREFIX}/lib/${MOZILLA}/components/xpti.dat
PKG_DESTDIR_SUPPORT= user-destdir
.include "../../www/seamonkey/Makefile.common"

File diff suppressed because it is too large Load diff

View file

@ -1,14 +1,14 @@
$NetBSD: distinfo,v 1.11 2009/05/02 07:51:03 hasso Exp $
$NetBSD: distinfo,v 1.12 2009/05/29 13:22:11 he Exp $
SHA1 (sunbird-0.3.1.source.tar.bz2) = f8a397746f0e3abf15273de5232c447746a8d370
RMD160 (sunbird-0.3.1.source.tar.bz2) = b2fe3d03ce20500641e18da07fafda031d7b882e
Size (sunbird-0.3.1.source.tar.bz2) = 44088609 bytes
SHA1 (lightning-sunbird-0.9-source.tar.bz2) = e85bbc08515cc64258fbba837b89f6ba55005480
RMD160 (lightning-sunbird-0.9-source.tar.bz2) = d127fd16a59b945b10b125edf27a310c52a2725f
Size (lightning-sunbird-0.9-source.tar.bz2) = 43121977 bytes
SHA1 (patch-aa) = b9c9f28e3c2d9ff5e3b982dda6d1332e2c025570
SHA1 (patch-ab) = d68fc0b694680f3e78d79a6d149ff0ff3eab5e72
SHA1 (patch-ac) = 889d805590865e1aa800db73230b05984070d779
SHA1 (patch-ac) = 33d8d57bb714ec7ff4384bffe9eccd57c037b619
SHA1 (patch-ad) = efca5ab6ad16fbc7a16f20ca181b23add7dd6f78
SHA1 (patch-ae) = 8e31ede283ba33528f825ab6dd794eb4e17b78d9
SHA1 (patch-af) = 601c1cc9dd94418dc6f4893c2df2fa79265bfd5f
SHA1 (patch-af) = 1897c40eda862df3a657fc01b6268fc3251f2eb5
SHA1 (patch-ah) = 6d39a2f657a91741fcfe30977510244d576a1406
SHA1 (patch-ai) = 189aa46f116e424c23368e1c7fbc6c56dd389954
SHA1 (patch-aj) = 279b54da26dae06118856ffbac3ed2fce793d3e9
@ -16,17 +16,16 @@ SHA1 (patch-ak) = 152e395269da7423e1eafa16f8850b3b9ed516fd
SHA1 (patch-al) = 52680212e8bfc75b70dad9f76d816f13bd15a0fa
SHA1 (patch-an) = ece4b8f63b40b7284fdde840c45310e791a4b3a9
SHA1 (patch-ao) = c7859e18c9fbd583be11de5b87dcf638121913cb
SHA1 (patch-ap) = 7aa03607d77c39612e6d48771e7c514c4b2a6243
SHA1 (patch-aq) = 9e7ba653cb7beaa2d8e74797e89dc5fc1ef15b4b
SHA1 (patch-at) = 1b541df50b9ed94613524d1d48ff98970d8f21dd
SHA1 (patch-ap) = 9ca3715eaef7d86933621665f81cc19a79059ed0
SHA1 (patch-aq) = 5a2491a2e8d9e0a173b637b669eb7b0c66286e27
SHA1 (patch-aw) = 65d44e92ece767ac56b8a9ffe4ab4eadf61c0cb7
SHA1 (patch-ax) = 761c47168cadc8fcfedc98ec89a09aa82473f6a0
SHA1 (patch-ba) = dc4b09d9be363345b4a0b15d49442686de8ac4fd
SHA1 (patch-ba) = 0721d521bf032b91997bac5dab69bce04cd5af87
SHA1 (patch-bb) = e9d6fb2fd23765963fa69685d40189c6a810db07
SHA1 (patch-bm) = 99276d866a1b9ae108fcde5d198f80231fdffd2b
SHA1 (patch-bo) = 05b13cec917445eb9e99c1619ae89e86e660d945
SHA1 (patch-bq) = c178922beb612f8ff659c909b8873bf6a0077916
SHA1 (patch-br) = 5e0bb533d65726ec439d625f55dbb50846e641cb
SHA1 (patch-br) = c555c374ce71e538affd1e81d6e867cc88a78d0a
SHA1 (patch-bs) = b1e929f13bec6525a251203328b3e5e35ec45f1e
SHA1 (patch-bu) = 76e0f7b3789ecdfda0a92d969efaec82fa36d283
SHA1 (patch-bv) = aa54e6552c9a25eb17a0aa9f500980853d076853
@ -39,27 +38,27 @@ SHA1 (patch-da) = 4eaf577ac0ac5e656cfec2fe9d87f8a13c876c60
SHA1 (patch-db) = 895f85ae169bd7a20ca108a11bc071053367cd68
SHA1 (patch-dc) = 688aa10ecfdf6124745de3f951bd1ed57a12edea
SHA1 (patch-de) = 1f6e18de3aecf33c81dd86cd054de9f31d10ef6c
SHA1 (patch-df) = 4d3f910383adda9119742b9058b42b1b26c0c39e
SHA1 (patch-df) = 129e748b9904871adfabda6d019edd64e266432e
SHA1 (patch-dg) = c2b41b55228f85fb0284f957e1c8de96fe09b968
SHA1 (patch-dh) = 83bb03edc9b69bf6abc8a162239bde2651bfdf7b
SHA1 (patch-di) = b1780bb0a6ba5ffddb4b98cc20a4dc396531ec43
SHA1 (patch-dn) = 18fd32e620bf13e43574249c768340d5f86b5a61
SHA1 (patch-do) = 72a44d5d2e6e22b2473a93de56512d1730ccd32d
SHA1 (patch-dr) = 7c730bf66a25697e71286c85bc531cb5c79b2364
SHA1 (patch-ds) = 19bd30df8edacacec93ba4703cc334ed8d50846f
SHA1 (patch-ds) = dded2661261e67e2f7641b1d6198d3d1957ad03f
SHA1 (patch-dt) = 755021d5309407f8708e68ab46df87e617a574dc
SHA1 (patch-du) = 203b753bb931157c09fc02fc392cbb35ac941103
SHA1 (patch-dv) = 5af0f9091f0acdf31c71c38964a3a0969bc9a144
SHA1 (patch-du) = 145247918da5a30320eb87eeca49a5db6a1d6451
SHA1 (patch-dv) = da5ff6980a57804bcf5d3cbb9e3923b2743c365c
SHA1 (patch-dw) = 5c9eaae8b2e6b2c1a52cd6b53906fec94248fa63
SHA1 (patch-dx) = dc5794ac4293c957e8c45e8dc15b0a6122bb33f2
SHA1 (patch-dx) = 8d8d8eab339b33ce908939662e4bf38781568b05
SHA1 (patch-dy) = 013c6dbc75abb71da2f490d384c0aec93c25100f
SHA1 (patch-dz) = 9217e3b97a0fc4ad49d3e5a1b021aee3eea1cd45
SHA1 (patch-ea) = e9998b9d97d2d2cdebca65d999cb7efecd20808f
SHA1 (patch-eb) = ef12390d2f0cfdae249d30f8554146de9013eea1
SHA1 (patch-eb) = b1b08bfd52762618e4c3b082ab96a0448fc4706f
SHA1 (patch-ec) = de00e4082cbf7898cc0ce3aef3902e30c161fbdf
SHA1 (patch-ed) = 54623e821570546cde89aa540ed0efc95f2ed314
SHA1 (patch-ee) = 0a209b1cae6bcb1adba9215cbce023e78e00955f
SHA1 (patch-ef) = 0730e715e22f5838c306a1d09fa4a6379c7e3a47
SHA1 (patch-ef) = 6ef560d688b3b67450b9582c95d9239ab4749f61
SHA1 (patch-eg) = f5b7b62c26ea747602cdb17f82e6fd502ef0bdc7
SHA1 (patch-eh) = 2eca0d714a88eac56732424c70f4049f667bdd6a
SHA1 (patch-ei) = b42438f95e68bb761bf69b5c5b7c0edfda462e2c

View file

@ -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

View file

@ -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));

View file

@ -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

View file

@ -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
;;

View file

@ -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 {

View file

@ -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

View file

@ -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;

View file

@ -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) \

View file

@ -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)

View file

@ -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;

View file

@ -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

View file

@ -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>

View file

@ -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)

View file

@ -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