Update to 4.4.16:

New in Berkeley DB 4.4:

  * In-memory replication
  * Client-to-client replication
  * Delayed client synchronization
  * Synchronization throttling
  * Master election speed-ups
  * Hot backup utility
  * Online Btree compaction
  * Online Btree disk space reclamation
  * Online abandoned lock removal
  * Automated recovery serialization
  * Transactional Application Developer's Guide

4 files changed, 18 insertions, 31 deletions

diff --git a/databases/db4/patches/patch-aa b/databases/db4/patches/patch-aa
index 33e7eb572cd..1a850340d4f 100644
--- a/databases/db4/patches/patch-aa
+++ b/databases/db4/patches/patch-aa
@@ -1,6 +1,6 @@
-$NetBSD: patch-aa,v 1.9 2005/10/25 06:26:48 jlam Exp $
+$NetBSD: patch-aa,v 1.10 2006/01/06 15:08:47 wiz Exp $
 
---- dist/Makefile.in.orig	2004-11-04 12:26:52.000000000 -0500
+--- dist/Makefile.in.orig	2005-11-08 13:47:22.000000000 +0100
 +++ dist/Makefile.in
 @@ -11,7 +11,7 @@ exec_prefix=@exec_prefix@
  bindir=	@bindir@
@@ -22,7 +22,7 @@ $NetBSD: patch-aa,v 1.9 2005/10/25 06:26:48 jlam Exp $
  LIBVERSION=	@DB_VERSION_MAJOR@.@DB_VERSION_MINOR@
 @@ -60,7 +60,7 @@ LIBS=		@LIBS@
  TEST_LIBS=	@TEST_LIBS@
- LIBSO_LIBS=	@LIBSO_LIBS@
+ LIBCSO_LIBS=	@LIBCSO_LIBS@ @LIBSO_LIBS@
  
 -libdb_base=	libdb
 +libdb_base=	libdb4
@@ -31,14 +31,14 @@ $NetBSD: patch-aa,v 1.9 2005/10/25 06:26:48 jlam Exp $
  libso=		$(libdb_base)-$(LIBVERSION)@SOSUFFIX@
 @@ -79,7 +79,7 @@ CXXLINK=	@MAKEFILE_CXXLINK@ @CXXFLAGS@
  XSOLINK=	@MAKEFILE_XSOLINK@ @CXXFLAGS@
- LIBXSO_LIBS=	@LIBXSO_LIBS@
+ LIBXSO_LIBS=	@LIBXSO_LIBS@ @LIBSO_LIBS@
  
 -libcxx_base=	libdb_cxx
 +libcxx_base=	libdb4_cxx
  libcxx=		$(libcxx_base).a
  libcxx_version=	$(libcxx_base)-$(LIBVERSION).a
  libxso=		$(libcxx_base)-$(LIBVERSION)@SOSUFFIX@
-@@ -109,10 +109,10 @@ JAVA_EXDIR=	$(srcdir)/examples_java/src/
+@@ -107,10 +107,10 @@ JAVA_EXDIR=	$(srcdir)/examples_java/src
  JAVA_RPCDIR=	$(srcdir)/rpc_server/java
  JAVA_SLEEPYCAT=	$(srcdir)/java/src/com/sleepycat
  
@@ -51,16 +51,16 @@ $NetBSD: patch-aa,v 1.9 2005/10/25 06:26:48 jlam Exp $
  libjso=		$(libjso_base)-$(LIBVERSION)@JMODSUFFIX@
  libjso_static=	$(libjso_base)-$(LIBVERSION).a
  libjso_target=	$(libjso_base)-$(LIBVERSION).la
-@@ -127,7 +127,7 @@ libjso_g=	$(libjso_base)-$(LIBVERSION)_g
+@@ -125,7 +125,7 @@ libjso_g=	$(libjso_base)-$(LIBVERSION)_g
  ##################################################
- TCFLAGS=	@TCFLAGS@
- LIBTSO_LIBS=	@LIBTSO_LIBS@
+ TCL_INCLUDE_SPEC=	@TCL_INCLUDE_SPEC@
+ LIBTSO_LIBS=	@LIBTSO_LIBS@ @LIBSO_LIBS@
 -libtso_base=	libdb_tcl
 +libtso_base=	libdb4_tcl
  libtso=		$(libtso_base)-$(LIBVERSION)@MODSUFFIX@
  libtso_static=	$(libtso_base)-$(LIBVERSION).a
  libtso_target=	$(libtso_base)-$(LIBVERSION).la
-@@ -883,11 +883,10 @@ install_utilities:
+@@ -903,11 +903,10 @@ install_utilities:
  	    ($(mkdir) -p $(DESTDIR)$(bindir) && \
  	    $(chmod) $(dmode) $(DESTDIR)$(bindir))
  	@for i in $(UTIL_PROGS); do \
diff --git a/databases/db4/patches/patch-ab b/databases/db4/patches/patch-ab
index 070e90104b4..79eaaf88c86 100644
--- a/databases/db4/patches/patch-ab
+++ b/databases/db4/patches/patch-ab
@@ -1,8 +1,8 @@
-$NetBSD: patch-ab,v 1.13 2005/11/09 14:41:38 tv Exp $
+$NetBSD: patch-ab,v 1.14 2006/01/06 15:08:47 wiz Exp $
 
---- dist/configure.orig	2005-09-06 03:44:24.000000000 -0400
+--- dist/configure.orig	2005-11-12 18:42:56.000000000 +0100
 +++ dist/configure
-@@ -5417,6 +5417,7 @@ db_cv_gxx_except=no;
+@@ -5498,6 +5498,7 @@ db_cv_gxx_except=no;
  if test "$GXX" = "yes"; then
  	GXX_VERSION=`${MAKEFILE_CXX} --version`
  	case ${GXX_VERSION} in
@@ -10,7 +10,7 @@ $NetBSD: patch-ab,v 1.13 2005/11/09 14:41:38 tv Exp $
  	1.*|2.[01234567].*|*-1.*|*-2.[01234567].*)
  		db_cv_gxx_except=yes;;
  	esac
-@@ -20774,7 +20775,6 @@ LIBTOOL='$(SHELL) $(top_builddir)/libtoo
+@@ -21564,7 +21565,6 @@ LIBTOOL='$(SHELL) $(top_builddir)/libtoo
  
  
  SOFLAGS="-rpath \$(libdir)"
@@ -18,7 +18,7 @@ $NetBSD: patch-ab,v 1.13 2005/11/09 14:41:38 tv Exp $
  
  # Set SOSUFFIX and friends
  
-@@ -20866,7 +20866,7 @@ echo "${ECHO_T}$JMODSUFFIX" >&6
+@@ -21656,7 +21656,7 @@ echo "${ECHO_T}$JMODSUFFIX" >&6
  INSTALLER="\$(LIBTOOL) --mode=install cp -p"
  
  MAKEFILE_CC="\$(LIBTOOL) --mode=compile ${MAKEFILE_CC}"
@@ -27,7 +27,7 @@ $NetBSD: patch-ab,v 1.13 2005/11/09 14:41:38 tv Exp $
  MAKEFILE_CCLINK="\$(LIBTOOL) --mode=link ${MAKEFILE_CCLINK}"
  MAKEFILE_CXX="\$(LIBTOOL) --mode=compile ${MAKEFILE_CXX}"
  MAKEFILE_XSOLINK="\$(LIBTOOL) --mode=link ${MAKEFILE_CXXLINK} -avoid-version"
-@@ -21614,7 +21614,7 @@ if test "$_JTOPDIR" != "/usr"; then
+@@ -22412,7 +22412,7 @@ if test "$_JTOPDIR" != "/usr"; then
  	case "$host_os" in
  	aix*)		_JNI_INC_SUBDIRS="aix";;
  	bsdi*)		_JNI_INC_SUBDIRS="bsdos";;
@@ -36,7 +36,7 @@ $NetBSD: patch-ab,v 1.13 2005/11/09 14:41:38 tv Exp $
  	hp*)		_JNI_INC_SUBDIRS="hp-ux";;
  	linux*)		_JNI_INC_SUBDIRS="linux genunix";;
  	osf*)		_JNI_INC_SUBDIRS="alpha";;
-@@ -30025,7 +30025,7 @@ fi
+@@ -30835,7 +30835,7 @@ fi
  #
  # If the user specified we use POSIX pthreads mutexes, and we fail to find the
  # full interface, try and configure for just intra-process support.
diff --git a/databases/db4/patches/patch-ac b/databases/db4/patches/patch-ac
index 7cef1ec0b15..86b7ba9f166 100644
--- a/databases/db4/patches/patch-ac
+++ b/databases/db4/patches/patch-ac
@@ -1,6 +1,6 @@
-$NetBSD: patch-ac,v 1.5 2005/10/25 06:26:48 jlam Exp $
+$NetBSD: patch-ac,v 1.6 2006/01/06 15:08:47 wiz Exp $
 
---- hmac/sha1.c.orig	2004-01-27 22:36:11.000000000 -0500
+--- hmac/sha1.c.orig	2004-11-17 04:43:56.000000000 +0100
 +++ hmac/sha1.c
 @@ -103,6 +103,63 @@ A million repetitions of "a"
  #define R3(v,w,x,y,z,i) z+=(((w|x)&y)|(w&x))+blk(i)+0x8F1BBCDC+rol(v,5);w=rol(w,30);
diff --git a/databases/db4/patches/patch-ad b/databases/db4/patches/patch-ad
deleted file mode 100644
index 6a81a63c50b..00000000000
--- a/databases/db4/patches/patch-ad
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-ad,v 1.2 2005/10/25 06:26:48 jlam Exp $
-
---- dbinc/db_185.in.orig	2004-01-27 22:36:01.000000000 -0500
-+++ dbinc/db_185.in
-@@ -72,7 +72,7 @@
-  * XXX
-  * SGI/IRIX already has a pgno_t.
-  */
--#ifdef	sgi
-+#ifdef	__sgi
- #define	pgno_t	db_pgno_t
- #endif
-