Changes 4.6.21:

* Fix a bug where mutex contention in database environments configured for
  hybrid mutex support could result in performance degradation.
* Fix a bug where closing a database handle after aborting a transaction
  which included a failed open of that database handle could result in
  application failure.
* Fix multiple MVCC bugs including a race which could result in incorrect
  data being returned to the application.
* Fix a bug where a database store into a Hash database could self-deadlock
  in a database environment configured for the Berkeley DB Concurrent Data
  Store product and with a free-threaded DB_ENV or DB handle.
* Fix an installation bug where Berkeley DB's PHP header file was not installed
  in the correct place.

7 files changed, 147 insertions, 72 deletions

diff --git a/databases/db4/Makefile b/databases/db4/Makefile
index 280698ed686..4fa0e704f6b 100644
--- a/databases/db4/Makefile
+++ b/databases/db4/Makefile
@@ -1,22 +1,18 @@
-# $NetBSD: Makefile,v 1.52 2007/06/08 12:23:50 wiz Exp $
+# $NetBSD: Makefile,v 1.53 2008/01/10 21:55:51 adam Exp $
 
-DISTNAME=		db-4.5.20
-PKGNAME=		${DISTNAME:S/db/db4/}.2
-CATEGORIES=		databases
-MASTER_SITES=		http://download.oracle.com/berkeley-db/ \
-			http://download-uk.oracle.com/berkeley-db/
+DISTNAME=	db-4.6.21
+PKGNAME=	${DISTNAME:S/db/db4/}
+CATEGORIES=	databases
+MASTER_SITES=	http://download.oracle.com/berkeley-db/ \
+		http://download-uk.oracle.com/berkeley-db/
 
-PATCHFILES=		patch.4.5.20.1 patch.4.5.20.2
-PATCH_SITES=		http://www.oracle.com/technology/products/berkeley-db/db/update/4.5.20/
-
-MAINTAINER=		pkgsrc-users@NetBSD.org
-HOMEPAGE=		http://www.oracle.com/database/berkeley-db/db/index.html
-COMMENT=		Berkeley DB version 4 from Oracle
+MAINTAINER=	pkgsrc-users@NetBSD.org
+HOMEPAGE=	http://www.oracle.com/database/berkeley-db/db/index.html
+COMMENT=	Berkeley DB version 4 from Oracle
 
 PKG_INSTALLATION_TYPES=	overwrite pkgviews
 PKG_DESTDIR_SUPPORT=	user-destdir
 
-DIST_SUBDIR=		db4-4.5.20
 USE_LANGUAGES=		c c++
 USE_LIBTOOL=		yes
 GNU_CONFIGURE=		yes
diff --git a/databases/db4/PLIST b/databases/db4/PLIST
index 0810a1b43cf..c1b850e307b 100644
--- a/databases/db4/PLIST
+++ b/databases/db4/PLIST
@@ -1,7 +1,8 @@
-@comment $NetBSD: PLIST,v 1.11 2007/06/08 12:23:50 wiz Exp $
+@comment $NetBSD: PLIST,v 1.12 2008/01/10 21:55:51 adam Exp $
 bin/berkeley_db4_svc
 bin/db4_archive
 bin/db4_checkpoint
+bin/db4_codegen
 bin/db4_deadlock
 bin/db4_dump
 bin/db4_hotbackup
@@ -14,11 +15,11 @@ bin/db4_verify
 include/db4/db.h
 include/db4/db_185.h
 include/db4/db_cxx.h
-lib/libdb4-4.5.la
+lib/libdb4-4.6.la
 lib/libdb4-4.so
 lib/libdb4.a
 lib/libdb4.so
-lib/libdb4_cxx-4.5.la
+lib/libdb4_cxx-4.6.la
 lib/libdb4_cxx-4.so
 lib/libdb4_cxx.a
 lib/libdb4_cxx.so
@@ -31,6 +32,7 @@ share/doc/db4/api_c/db_compact.html
 share/doc/db4/api_c/db_cursor.html
 share/doc/db4/api_c/db_del.html
 share/doc/db4/api_c/db_err.html
+share/doc/db4/api_c/db_exists.html
 share/doc/db4/api_c/db_fd.html
 share/doc/db4/api_c/db_get.html
 share/doc/db4/api_c/db_get_byteswapped.html
@@ -57,6 +59,7 @@ share/doc/db4/api_c/db_set_errfile.html
 share/doc/db4/api_c/db_set_errpfx.html
 share/doc/db4/api_c/db_set_feedback.html
 share/doc/db4/api_c/db_set_flags.html
+share/doc/db4/api_c/db_set_h_compare.html
 share/doc/db4/api_c/db_set_h_ffactor.html
 share/doc/db4/api_c/db_set_h_hash.html
 share/doc/db4/api_c/db_set_h_nelem.html
@@ -64,6 +67,7 @@ share/doc/db4/api_c/db_set_lorder.html
 share/doc/db4/api_c/db_set_msgcall.html
 share/doc/db4/api_c/db_set_msgfile.html
 share/doc/db4/api_c/db_set_pagesize.html
+share/doc/db4/api_c/db_set_priority.html
 share/doc/db4/api_c/db_set_q_extentsize.html
 share/doc/db4/api_c/db_set_re_delim.html
 share/doc/db4/api_c/db_set_re_len.html
@@ -82,6 +86,7 @@ share/doc/db4/api_c/dbc_dup.html
 share/doc/db4/api_c/dbc_get.html
 share/doc/db4/api_c/dbc_list.html
 share/doc/db4/api_c/dbc_put.html
+share/doc/db4/api_c/dbc_set_priority.html
 share/doc/db4/api_c/dbm.html
 share/doc/db4/api_c/dbt_bulk.html
 share/doc/db4/api_c/dbt_class.html
@@ -101,6 +106,7 @@ share/doc/db4/api_c/env_open.html
 share/doc/db4/api_c/env_remove.html
 share/doc/db4/api_c/env_set_alloc.html
 share/doc/db4/api_c/env_set_app_dispatch.html
+share/doc/db4/api_c/env_set_cache_max.html
 share/doc/db4/api_c/env_set_cachesize.html
 share/doc/db4/api_c/env_set_data_dir.html
 share/doc/db4/api_c/env_set_encrypt.html
@@ -165,7 +171,6 @@ share/doc/db4/api_c/memp_fcreate.html
 share/doc/db4/api_c/memp_fget.html
 share/doc/db4/api_c/memp_fopen.html
 share/doc/db4/api_c/memp_fput.html
-share/doc/db4/api_c/memp_fset.html
 share/doc/db4/api_c/memp_fsync.html
 share/doc/db4/api_c/memp_list.html
 share/doc/db4/api_c/memp_maxwrite.html
@@ -193,6 +198,7 @@ share/doc/db4/api_c/mutex_set_tas_spins.html
 share/doc/db4/api_c/mutex_stat.html
 share/doc/db4/api_c/mutex_unlock.html
 share/doc/db4/api_c/object.html
+share/doc/db4/api_c/pindex.src
 share/doc/db4/api_c/rep_config.html
 share/doc/db4/api_c/rep_elect.html
 share/doc/db4/api_c/rep_limit.html
@@ -200,6 +206,7 @@ share/doc/db4/api_c/rep_list.html
 share/doc/db4/api_c/rep_message.html
 share/doc/db4/api_c/rep_nsites.html
 share/doc/db4/api_c/rep_priority.html
+share/doc/db4/api_c/rep_request.html
 share/doc/db4/api_c/rep_start.html
 share/doc/db4/api_c/rep_stat.html
 share/doc/db4/api_c/rep_sync.html
@@ -210,6 +217,7 @@ share/doc/db4/api_c/repmgr_local_site.html
 share/doc/db4/api_c/repmgr_remote_site.html
 share/doc/db4/api_c/repmgr_site_list.html
 share/doc/db4/api_c/repmgr_start.html
+share/doc/db4/api_c/repmgr_stat.html
 share/doc/db4/api_c/seq_class.html
 share/doc/db4/api_c/seq_close.html
 share/doc/db4/api_c/seq_get.html
@@ -265,6 +273,7 @@ share/doc/db4/api_cxx/db_compact.html
 share/doc/db4/api_cxx/db_cursor.html
 share/doc/db4/api_cxx/db_del.html
 share/doc/db4/api_cxx/db_err.html
+share/doc/db4/api_cxx/db_exists.html
 share/doc/db4/api_cxx/db_fd.html
 share/doc/db4/api_cxx/db_get.html
 share/doc/db4/api_cxx/db_get_byteswapped.html
@@ -292,6 +301,7 @@ share/doc/db4/api_cxx/db_set_error_stream.html
 share/doc/db4/api_cxx/db_set_errpfx.html
 share/doc/db4/api_cxx/db_set_feedback.html
 share/doc/db4/api_cxx/db_set_flags.html
+share/doc/db4/api_cxx/db_set_h_compare.html
 share/doc/db4/api_cxx/db_set_h_ffactor.html
 share/doc/db4/api_cxx/db_set_h_hash.html
 share/doc/db4/api_cxx/db_set_h_nelem.html
@@ -300,6 +310,7 @@ share/doc/db4/api_cxx/db_set_msg_stream.html
 share/doc/db4/api_cxx/db_set_msgcall.html
 share/doc/db4/api_cxx/db_set_msgfile.html
 share/doc/db4/api_cxx/db_set_pagesize.html
+share/doc/db4/api_cxx/db_set_priority.html
 share/doc/db4/api_cxx/db_set_q_extentsize.html
 share/doc/db4/api_cxx/db_set_re_delim.html
 share/doc/db4/api_cxx/db_set_re_len.html
@@ -318,6 +329,7 @@ share/doc/db4/api_cxx/dbc_dup.html
 share/doc/db4/api_cxx/dbc_get.html
 share/doc/db4/api_cxx/dbc_list.html
 share/doc/db4/api_cxx/dbc_put.html
+share/doc/db4/api_cxx/dbc_set_priority.html
 share/doc/db4/api_cxx/dbt_bulk_class.html
 share/doc/db4/api_cxx/dbt_class.html
 share/doc/db4/api_cxx/dbt_package.html
@@ -337,6 +349,7 @@ share/doc/db4/api_cxx/env_open.html
 share/doc/db4/api_cxx/env_remove.html
 share/doc/db4/api_cxx/env_set_alloc.html
 share/doc/db4/api_cxx/env_set_app_dispatch.html
+share/doc/db4/api_cxx/env_set_cache_max.html
 share/doc/db4/api_cxx/env_set_cachesize.html
 share/doc/db4/api_cxx/env_set_data_dir.html
 share/doc/db4/api_cxx/env_set_encrypt.html
@@ -406,7 +419,6 @@ share/doc/db4/api_cxx/memp_fcreate.html
 share/doc/db4/api_cxx/memp_fget.html
 share/doc/db4/api_cxx/memp_fopen.html
 share/doc/db4/api_cxx/memp_fput.html
-share/doc/db4/api_cxx/memp_fset.html
 share/doc/db4/api_cxx/memp_fsync.html
 share/doc/db4/api_cxx/memp_list.html
 share/doc/db4/api_cxx/memp_maxwrite.html
@@ -442,6 +454,7 @@ share/doc/db4/api_cxx/rep_list.html
 share/doc/db4/api_cxx/rep_message.html
 share/doc/db4/api_cxx/rep_nsites.html
 share/doc/db4/api_cxx/rep_priority.html
+share/doc/db4/api_cxx/rep_request.html
 share/doc/db4/api_cxx/rep_start.html
 share/doc/db4/api_cxx/rep_stat.html
 share/doc/db4/api_cxx/rep_sync.html
@@ -452,6 +465,7 @@ share/doc/db4/api_cxx/repmgr_local_site.html
 share/doc/db4/api_cxx/repmgr_remote_site.html
 share/doc/db4/api_cxx/repmgr_site_list.html
 share/doc/db4/api_cxx/repmgr_start.html
+share/doc/db4/api_cxx/repmgr_stat.html
 share/doc/db4/api_cxx/runrec_class.html
 share/doc/db4/api_cxx/seq_class.html
 share/doc/db4/api_cxx/seq_close.html
@@ -509,6 +523,9 @@ share/doc/db4/api_tcl/txn_abort.html
 share/doc/db4/api_tcl/txn_checkpoint.html
 share/doc/db4/api_tcl/txn_commit.html
 share/doc/db4/api_tcl/version.html
+share/doc/db4/articles/inmemory/C/InMemoryDBApplication.pdf
+share/doc/db4/articles/inmemory/C/gettingStarted.css
+share/doc/db4/articles/inmemory/C/index.html
 share/doc/db4/collections/tutorial/BasicProgram.html
 share/doc/db4/collections/tutorial/BerkeleyDB-Java-Collections.pdf
 share/doc/db4/collections/tutorial/Entity.html
@@ -853,7 +870,6 @@ share/doc/db4/gsg_txn/JAVA/txnnowait.html
 share/doc/db4/gsg_txn/JAVA/usingtxns.html
 share/doc/db4/gsg_txn/JAVA/wrapup.html
 share/doc/db4/gsg_txn/JAVA/writeblock.jpg
-share/doc/db4/images/Oracle_BerkeleyDB_clr.bmp
 share/doc/db4/images/api.gif
 share/doc/db4/images/next.gif
 share/doc/db4/images/prev.gif
@@ -902,6 +918,7 @@ share/doc/db4/java/com/sleepycat/bind/serial/package-frame.html
 share/doc/db4/java/com/sleepycat/bind/serial/package-summary.html
 share/doc/db4/java/com/sleepycat/bind/serial/package-tree.html
 share/doc/db4/java/com/sleepycat/bind/serial/package-use.html
+share/doc/db4/java/com/sleepycat/bind/tuple/BigIntegerBinding.html
 share/doc/db4/java/com/sleepycat/bind/tuple/BooleanBinding.html
 share/doc/db4/java/com/sleepycat/bind/tuple/ByteBinding.html
 share/doc/db4/java/com/sleepycat/bind/tuple/CharacterBinding.html
@@ -925,6 +942,7 @@ share/doc/db4/java/com/sleepycat/bind/tuple/TupleTupleBinding.html
 share/doc/db4/java/com/sleepycat/bind/tuple/TupleTupleKeyCreator.html
 share/doc/db4/java/com/sleepycat/bind/tuple/TupleTupleMarshalledBinding.html
 share/doc/db4/java/com/sleepycat/bind/tuple/TupleTupleMarshalledKeyCreator.html
+share/doc/db4/java/com/sleepycat/bind/tuple/class-use/BigIntegerBinding.html
 share/doc/db4/java/com/sleepycat/bind/tuple/class-use/BooleanBinding.html
 share/doc/db4/java/com/sleepycat/bind/tuple/class-use/ByteBinding.html
 share/doc/db4/java/com/sleepycat/bind/tuple/class-use/CharacterBinding.html
@@ -1016,7 +1034,7 @@ share/doc/db4/java/com/sleepycat/db/Environment.html
 share/doc/db4/java/com/sleepycat/db/EnvironmentConfig.html
 share/doc/db4/java/com/sleepycat/db/ErrorHandler.html
 share/doc/db4/java/com/sleepycat/db/EventHandler.html
-share/doc/db4/java/com/sleepycat/db/EventType.html
+share/doc/db4/java/com/sleepycat/db/EventHandlerAdapter.html
 share/doc/db4/java/com/sleepycat/db/FeedbackHandler.html
 share/doc/db4/java/com/sleepycat/db/HashStats.html
 share/doc/db4/java/com/sleepycat/db/Hasher.html
@@ -1057,9 +1075,12 @@ share/doc/db4/java/com/sleepycat/db/ReplicationHandleDeadException.html
 share/doc/db4/java/com/sleepycat/db/ReplicationHoldElectionException.html
 share/doc/db4/java/com/sleepycat/db/ReplicationHostAddress.html
 share/doc/db4/java/com/sleepycat/db/ReplicationJoinFailureException.html
+share/doc/db4/java/com/sleepycat/db/ReplicationLeaseExpiredException.html
+share/doc/db4/java/com/sleepycat/db/ReplicationLeaseTimeoutException.html
 share/doc/db4/java/com/sleepycat/db/ReplicationLockoutException.html
 share/doc/db4/java/com/sleepycat/db/ReplicationManagerAckPolicy.html
 share/doc/db4/java/com/sleepycat/db/ReplicationManagerStartPolicy.html
+share/doc/db4/java/com/sleepycat/db/ReplicationManagerStats.html
 share/doc/db4/java/com/sleepycat/db/ReplicationSiteUnavailableException.html
 share/doc/db4/java/com/sleepycat/db/ReplicationStats.html
 share/doc/db4/java/com/sleepycat/db/ReplicationStatus.html
@@ -1070,6 +1091,7 @@ share/doc/db4/java/com/sleepycat/db/SecondaryConfig.html
 share/doc/db4/java/com/sleepycat/db/SecondaryCursor.html
 share/doc/db4/java/com/sleepycat/db/SecondaryDatabase.html
 share/doc/db4/java/com/sleepycat/db/SecondaryKeyCreator.html
+share/doc/db4/java/com/sleepycat/db/SecondaryMultiKeyCreator.html
 share/doc/db4/java/com/sleepycat/db/Sequence.html
 share/doc/db4/java/com/sleepycat/db/SequenceConfig.html
 share/doc/db4/java/com/sleepycat/db/SequenceStats.html
@@ -1078,7 +1100,7 @@ share/doc/db4/java/com/sleepycat/db/Transaction.html
 share/doc/db4/java/com/sleepycat/db/TransactionConfig.html
 share/doc/db4/java/com/sleepycat/db/TransactionStats.Active.html
 share/doc/db4/java/com/sleepycat/db/TransactionStats.html
-share/doc/db4/java/com/sleepycat/db/UpdateConflictException.html
+share/doc/db4/java/com/sleepycat/db/VerboseConfig.html
 share/doc/db4/java/com/sleepycat/db/VerifyConfig.html
 share/doc/db4/java/com/sleepycat/db/VersionMismatchException.html
 share/doc/db4/java/com/sleepycat/db/class-use/BtreePrefixCalculator.html
@@ -1103,7 +1125,7 @@ share/doc/db4/java/com/sleepycat/db/class-use/Environment.html
 share/doc/db4/java/com/sleepycat/db/class-use/EnvironmentConfig.html
 share/doc/db4/java/com/sleepycat/db/class-use/ErrorHandler.html
 share/doc/db4/java/com/sleepycat/db/class-use/EventHandler.html
-share/doc/db4/java/com/sleepycat/db/class-use/EventType.html
+share/doc/db4/java/com/sleepycat/db/class-use/EventHandlerAdapter.html
 share/doc/db4/java/com/sleepycat/db/class-use/FeedbackHandler.html
 share/doc/db4/java/com/sleepycat/db/class-use/HashStats.html
 share/doc/db4/java/com/sleepycat/db/class-use/Hasher.html
@@ -1144,9 +1166,12 @@ share/doc/db4/java/com/sleepycat/db/class-use/ReplicationHandleDeadException.htm
 share/doc/db4/java/com/sleepycat/db/class-use/ReplicationHoldElectionException.html
 share/doc/db4/java/com/sleepycat/db/class-use/ReplicationHostAddress.html
 share/doc/db4/java/com/sleepycat/db/class-use/ReplicationJoinFailureException.html
+share/doc/db4/java/com/sleepycat/db/class-use/ReplicationLeaseExpiredException.html
+share/doc/db4/java/com/sleepycat/db/class-use/ReplicationLeaseTimeoutException.html
 share/doc/db4/java/com/sleepycat/db/class-use/ReplicationLockoutException.html
 share/doc/db4/java/com/sleepycat/db/class-use/ReplicationManagerAckPolicy.html
 share/doc/db4/java/com/sleepycat/db/class-use/ReplicationManagerStartPolicy.html
+share/doc/db4/java/com/sleepycat/db/class-use/ReplicationManagerStats.html
 share/doc/db4/java/com/sleepycat/db/class-use/ReplicationSiteUnavailableException.html
 share/doc/db4/java/com/sleepycat/db/class-use/ReplicationStats.html
 share/doc/db4/java/com/sleepycat/db/class-use/ReplicationStatus.html
@@ -1157,6 +1182,7 @@ share/doc/db4/java/com/sleepycat/db/class-use/SecondaryConfig.html
 share/doc/db4/java/com/sleepycat/db/class-use/SecondaryCursor.html
 share/doc/db4/java/com/sleepycat/db/class-use/SecondaryDatabase.html
 share/doc/db4/java/com/sleepycat/db/class-use/SecondaryKeyCreator.html
+share/doc/db4/java/com/sleepycat/db/class-use/SecondaryMultiKeyCreator.html
 share/doc/db4/java/com/sleepycat/db/class-use/Sequence.html
 share/doc/db4/java/com/sleepycat/db/class-use/SequenceConfig.html
 share/doc/db4/java/com/sleepycat/db/class-use/SequenceStats.html
@@ -1165,7 +1191,7 @@ share/doc/db4/java/com/sleepycat/db/class-use/Transaction.html
 share/doc/db4/java/com/sleepycat/db/class-use/TransactionConfig.html
 share/doc/db4/java/com/sleepycat/db/class-use/TransactionStats.Active.html
 share/doc/db4/java/com/sleepycat/db/class-use/TransactionStats.html
-share/doc/db4/java/com/sleepycat/db/class-use/UpdateConflictException.html
+share/doc/db4/java/com/sleepycat/db/class-use/VerboseConfig.html
 share/doc/db4/java/com/sleepycat/db/class-use/VerifyConfig.html
 share/doc/db4/java/com/sleepycat/db/class-use/VersionMismatchException.html
 share/doc/db4/java/com/sleepycat/db/package-frame.html
@@ -1205,7 +1231,6 @@ share/doc/db4/java/resources/inherit.gif
 share/doc/db4/java/serialized-form.html
 share/doc/db4/java/style.css
 share/doc/db4/license/license_db.html
-share/doc/db4/license/license_xml.html
 share/doc/db4/ref/am/close.html
 share/doc/db4/ref/am/count.html
 share/doc/db4/ref/am/curclose.html
@@ -1269,6 +1294,8 @@ share/doc/db4/ref/arch/progmodel.html
 share/doc/db4/ref/arch/script.html
 share/doc/db4/ref/arch/smallpic.gif
 share/doc/db4/ref/arch/utilities.html
+share/doc/db4/ref/build_brew/intro.html
+share/doc/db4/ref/build_s60/intro.html
 share/doc/db4/ref/build_unix/aix.html
 share/doc/db4/ref/build_unix/conf.html
 share/doc/db4/ref/build_unix/flags.html
@@ -1298,10 +1325,48 @@ share/doc/db4/ref/build_win/intro.html
 share/doc/db4/ref/build_win/notes.html
 share/doc/db4/ref/build_win/small.html
 share/doc/db4/ref/build_win/test.html
+share/doc/db4/ref/build_wince/faq.html
+share/doc/db4/ref/build_wince/intro.html
+share/doc/db4/ref/build_wince/notes.html
 share/doc/db4/ref/cam/app.html
 share/doc/db4/ref/cam/fail.html
 share/doc/db4/ref/cam/intro.html
-share/doc/db4/ref/debug/common.html
+share/doc/db4/ref/changelog/2.1.html
+share/doc/db4/ref/changelog/2.2.html
+share/doc/db4/ref/changelog/2.3.10.html
+share/doc/db4/ref/changelog/2.3.11.html
+share/doc/db4/ref/changelog/2.3.12.html
+share/doc/db4/ref/changelog/2.3.14.html
+share/doc/db4/ref/changelog/2.3.16.html
+share/doc/db4/ref/changelog/2.3.5.html
+share/doc/db4/ref/changelog/2.3.html
+share/doc/db4/ref/changelog/2.4.10.html
+share/doc/db4/ref/changelog/2.4.14.html
+share/doc/db4/ref/changelog/2.5.9.html
+share/doc/db4/ref/changelog/2.6.4.html
+share/doc/db4/ref/changelog/2.6.5.html
+share/doc/db4/ref/changelog/2.6.6.html
+share/doc/db4/ref/changelog/2.6.7.html
+share/doc/db4/ref/changelog/2.7.1.html
+share/doc/db4/ref/changelog/2.7.3.html
+share/doc/db4/ref/changelog/2.7.4.html
+share/doc/db4/ref/changelog/2.7.5.html
+share/doc/db4/ref/changelog/2.7.7.html
+share/doc/db4/ref/changelog/3.0.55.html
+share/doc/db4/ref/changelog/3.1.14.html
+share/doc/db4/ref/changelog/3.1.17.html
+share/doc/db4/ref/changelog/3.2.9.html
+share/doc/db4/ref/changelog/3.3.11.html
+share/doc/db4/ref/changelog/4.0.14.html
+share/doc/db4/ref/changelog/4.1.24.html
+share/doc/db4/ref/changelog/4.1.25.html
+share/doc/db4/ref/changelog/4.2.52.html
+share/doc/db4/ref/changelog/4.3.29.html
+share/doc/db4/ref/changelog/4.4.16.html
+share/doc/db4/ref/changelog/4.4.20.html
+share/doc/db4/ref/changelog/4.5.20.html
+share/doc/db4/ref/changelog/4.6.html
+share/doc/db4/ref/changelog/toc.html
 share/doc/db4/ref/debug/compile.html
 share/doc/db4/ref/debug/intro.html
 share/doc/db4/ref/debug/printlog.html
@@ -1375,7 +1440,6 @@ share/doc/db4/ref/program/ram.html
 share/doc/db4/ref/program/runtime.html
 share/doc/db4/ref/program/scope.html
 share/doc/db4/ref/program/solaris.txt
-share/doc/db4/ref/refs/bdb_usenix.html
 share/doc/db4/ref/refs/bdb_usenix.ps
 share/doc/db4/ref/refs/embedded.html
 share/doc/db4/ref/refs/hash_usenix.ps
@@ -1602,6 +1666,17 @@ share/doc/db4/ref/upgrade.4.5/rep_event.html
 share/doc/db4/ref/upgrade.4.5/rep_set.html
 share/doc/db4/ref/upgrade.4.5/source.html
 share/doc/db4/ref/upgrade.4.5/toc.html
+share/doc/db4/ref/upgrade.4.6/cursor.html
+share/doc/db4/ref/upgrade.4.6/disk.html
+share/doc/db4/ref/upgrade.4.6/event.html
+share/doc/db4/ref/upgrade.4.6/full_election.html
+share/doc/db4/ref/upgrade.4.6/intro.html
+share/doc/db4/ref/upgrade.4.6/memp_fput.html
+share/doc/db4/ref/upgrade.4.6/memp_fset.html
+share/doc/db4/ref/upgrade.4.6/toc.html
+share/doc/db4/ref/upgrade.4.6/verb.html
+share/doc/db4/ref/upgrade.4.6/verbose.html
+share/doc/db4/ref/upgrade.4.6/win.html
 share/doc/db4/ref/upgrade/process.html
 share/doc/db4/ref/upgrade/version.html
 share/doc/db4/ref/xa/build.html
@@ -1612,6 +1687,7 @@ share/doc/db4/ref/xa/xa_intro.html
 share/doc/db4/utility/berkeley_db_svc.html
 share/doc/db4/utility/db_archive.html
 share/doc/db4/utility/db_checkpoint.html
+share/doc/db4/utility/db_codegen.html
 share/doc/db4/utility/db_deadlock.html
 share/doc/db4/utility/db_dump.html
 share/doc/db4/utility/db_hotbackup.html
@@ -1624,6 +1700,7 @@ share/doc/db4/utility/db_verify.html
 share/doc/db4/utility/index.html
 @dirrm share/doc/db4/utility
 @dirrm share/doc/db4/ref/xa
+@dirrm share/doc/db4/ref/upgrade.4.6
 @dirrm share/doc/db4/ref/upgrade.4.5
 @dirrm share/doc/db4/ref/upgrade.4.4
 @dirrm share/doc/db4/ref/upgrade.4.3
@@ -1656,10 +1733,14 @@ share/doc/db4/utility/index.html
 @dirrm share/doc/db4/ref/dumpload
 @dirrm share/doc/db4/ref/distrib
 @dirrm share/doc/db4/ref/debug
+@dirrm share/doc/db4/ref/changelog
 @dirrm share/doc/db4/ref/cam
+@dirrm share/doc/db4/ref/build_wince
 @dirrm share/doc/db4/ref/build_win
 @dirrm share/doc/db4/ref/build_vxworks
 @dirrm share/doc/db4/ref/build_unix
+@dirrm share/doc/db4/ref/build_s60
+@dirrm share/doc/db4/ref/build_brew
 @dirrm share/doc/db4/ref/arch
 @dirrm share/doc/db4/ref/apprec
 @dirrm share/doc/db4/ref/am_misc
@@ -1698,6 +1779,9 @@ share/doc/db4/utility/index.html
 @dirrm share/doc/db4/gsg
 @dirrm share/doc/db4/collections/tutorial
 @dirrm share/doc/db4/collections
+@dirrm share/doc/db4/articles/inmemory/C
+@dirrm share/doc/db4/articles/inmemory
+@dirrm share/doc/db4/articles
 @dirrm share/doc/db4/api_tcl
 @dirrm share/doc/db4/api_cxx
 @dirrm share/doc/db4/api_c
diff --git a/databases/db4/buildlink3.mk b/databases/db4/buildlink3.mk
index d2bb54d13ef..1e6fe5e5d04 100644
--- a/databases/db4/buildlink3.mk
+++ b/databases/db4/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.31 2007/06/08 12:23:51 wiz Exp $
+# $NetBSD: buildlink3.mk,v 1.32 2008/01/10 21:55:52 adam Exp $
 
 BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH}+
 DB4_BUILDLINK3_MK:=	${DB4_BUILDLINK3_MK}+
@@ -12,7 +12,7 @@ BUILDLINK_PACKAGES+=	db4
 BUILDLINK_ORDER:=	${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}db4
 
 .if !empty(DB4_BUILDLINK3_MK:M+)
-BUILDLINK_API_DEPENDS.db4+=	db4>=4.5.20
+BUILDLINK_API_DEPENDS.db4+=	db4>=4.6.21
 BUILDLINK_PKGSRCDIR.db4?=	../../databases/db4
 BUILDLINK_INCDIRS.db4?=		include/db4
 BUILDLINK_LDADD.db4=		-ldb4
diff --git a/databases/db4/distinfo b/databases/db4/distinfo
index 77dea515afe..56b11b6009c 100644
--- a/databases/db4/distinfo
+++ b/databases/db4/distinfo
@@ -1,14 +1,8 @@
-$NetBSD: distinfo,v 1.27 2007/06/08 12:23:51 wiz Exp $
+$NetBSD: distinfo,v 1.28 2008/01/10 21:55:52 adam Exp $
 
-SHA1 (db4-4.5.20/db-4.5.20.tar.gz) = 0e5a6c152c5d7089899481d9de689d1f7e77bde1
-RMD160 (db4-4.5.20/db-4.5.20.tar.gz) = 5fc492efcddce6f446c5977128f5526f73763e01
-Size (db4-4.5.20/db-4.5.20.tar.gz) = 9281894 bytes
-SHA1 (db4-4.5.20/patch.4.5.20.1) = 0d55d4d7357b896bde91e096b40bfc100bb27d9d
-RMD160 (db4-4.5.20/patch.4.5.20.1) = 52093e6c3d952cb8193db35e45aa4462ba0772be
-Size (db4-4.5.20/patch.4.5.20.1) = 984 bytes
-SHA1 (db4-4.5.20/patch.4.5.20.2) = a3fcbc023489c059659f789d9473ac25d6d3a477
-RMD160 (db4-4.5.20/patch.4.5.20.2) = d35069e8267f02e64e6f1be046d6cb9e75e9e720
-Size (db4-4.5.20/patch.4.5.20.2) = 1752 bytes
-SHA1 (patch-aa) = fd05d88e6580e7d9f47baca9586b8f992b08137c
-SHA1 (patch-ab) = 0d5ab416a60ba2e50d77880601d00792cc0ec61d
-SHA1 (patch-ac) = 1b318e4024976e1c6567229622e0b50e2db3f9d3
+SHA1 (db-4.6.21.tar.gz) = 5be3beb82e42a78ff671a3f5a4c30e5652972119
+RMD160 (db-4.6.21.tar.gz) = ccf9a4b85cc0464b2f3c2f2da29d99328fd4978e
+Size (db-4.6.21.tar.gz) = 11881885 bytes
+SHA1 (patch-aa) = 003eae2562496764c2ba15aee14a5894cca23ca4
+SHA1 (patch-ab) = 32af80b165582baa259a487950e6a165f0d8f86b
+SHA1 (patch-ac) = 72930ded2e676e810242df60f94703f37a8be853
diff --git a/databases/db4/patches/patch-aa b/databases/db4/patches/patch-aa
index a27eaf5bb3f..0679de162bd 100644
--- a/databases/db4/patches/patch-aa
+++ b/databases/db4/patches/patch-aa
@@ -1,6 +1,6 @@
-$NetBSD: patch-aa,v 1.12 2007/06/08 12:23:51 wiz Exp $
+$NetBSD: patch-aa,v 1.13 2008/01/10 21:55:53 adam Exp $
 
---- dist/Makefile.in.orig	2006-09-13 16:22:38.000000000 +0000
+--- dist/Makefile.in.orig	2007-07-05 20:35:02.000000000 +0200
 +++ dist/Makefile.in
 @@ -11,7 +11,7 @@ exec_prefix=@exec_prefix@
  bindir=	@bindir@
@@ -59,7 +59,7 @@ $NetBSD: patch-aa,v 1.12 2007/06/08 12:23:51 wiz Exp $
  libtso=		$(libtso_base)-$(LIBVERSION)@MODSUFFIX@
  libtso_static=	$(libtso_base)-$(LIBVERSION).a
  libtso_target=	$(libtso_base)-$(LIBVERSION).la
-@@ -723,8 +723,7 @@ install_include:
+@@ -738,8 +738,7 @@ install_include:
  	    ($(MKDIR) -p $(DESTDIR)$(includedir) && \
  	    $(CHMOD) $(dmode) $(DESTDIR)$(includedir))
  	@cd $(DESTDIR)$(includedir) && $(RM) -f $(INCDOT)
@@ -69,7 +69,7 @@ $NetBSD: patch-aa,v 1.12 2007/06/08 12:23:51 wiz Exp $
  
  uninstall_include:
  	@cd $(DESTDIR)$(includedir) && $(RM) -f $(INCDOT)
-@@ -735,7 +734,7 @@ install_lib:
+@@ -750,7 +749,7 @@ install_lib:
  	    ($(MKDIR) -p $(DESTDIR)$(libdir) && \
  	    $(CHMOD) $(dmode) $(DESTDIR)$(libdir))
  	@cd $(DESTDIR)$(libdir) && $(RM) -f $(LIB_INSTALL_FILE_LIST)
@@ -78,14 +78,14 @@ $NetBSD: patch-aa,v 1.12 2007/06/08 12:23:51 wiz Exp $
  	@(cd $(DESTDIR)$(libdir) && \
  	    test -f $(libso) && $(LN) -s $(libso) $(libso_default); \
  	    test -f $(libso) && $(LN) -s $(libso) $(libso_major); \
-@@ -759,11 +758,8 @@ install_utilities:
+@@ -774,11 +773,8 @@ install_utilities:
  	    ($(MKDIR) -p $(DESTDIR)$(bindir) && \
  	    $(CHMOD) $(dmode) $(DESTDIR)$(bindir))
  	@for i in $(UTIL_PROGS); do \
 -		test -f $$i.exe && i=$$i.exe || i=$$i; \
 -		$(RM) -f $(DESTDIR)$(bindir)/$$i; \
 -		$(INSTALLER) $$i $(DESTDIR)$(bindir)/$$i; \
--		test "$(STRIP)" = "none" || $(STRIP) $(DESTDIR)$(bindir)/$$i; \
+-		$(STRIP) $(DESTDIR)$(bindir)/$$i; \
 -		$(CHMOD) $(emode) $(DESTDIR)$(bindir)/$$i; \
 +		target="${DESTDIR}${bindir}/`echo $$i | sed '${transform}'`"; \
 +		libtool --mode=install ${BSD_INSTALL_PROGRAM} $$i $$target; \
diff --git a/databases/db4/patches/patch-ab b/databases/db4/patches/patch-ab
index 75399c98cd9..c2f1cf7d83b 100644
--- a/databases/db4/patches/patch-ab
+++ b/databases/db4/patches/patch-ab
@@ -1,8 +1,8 @@
-$NetBSD: patch-ab,v 1.16 2007/06/08 12:23:51 wiz Exp $
+$NetBSD: patch-ab,v 1.17 2008/01/10 21:55:53 adam Exp $
 
---- dist/configure.orig	2006-09-20 20:07:20.000000000 +0000
+--- dist/configure.orig	2007-09-27 17:32:04.000000000 +0200
 +++ dist/configure
-@@ -6288,6 +6288,7 @@ db_cv_gxx_except=no;
+@@ -5938,6 +5938,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.16 2007/06/08 12:23:51 wiz Exp $
  	1.*|2.[01234567].*|*-1.*|*-2.[01234567].*)
  		db_cv_gxx_except=yes;;
  	esac
-@@ -6304,7 +6305,7 @@ fi
+@@ -5954,7 +5955,7 @@ fi
  # we're using.
  case "$host_os" in
  sysv5UnixWare*|sysv5OpenUNIX8*)
@@ -19,7 +19,7 @@ $NetBSD: patch-ab,v 1.16 2007/06/08 12:23:51 wiz Exp $
  		CPPFLAGS="$CPPFLAGS -pthread"
  		LDFLAGS="$LDFLAGS -pthread"
  	else
-@@ -21832,7 +21833,6 @@ LIBTOOL='$(SHELL) $(top_builddir)/libtoo
+@@ -21078,7 +21079,6 @@ LIBTOOL='$(SHELL) $(top_builddir)/libtoo
  
  
  SOFLAGS="-rpath \$(libdir)"
@@ -27,7 +27,7 @@ $NetBSD: patch-ab,v 1.16 2007/06/08 12:23:51 wiz Exp $
  
  # Set SOSUFFIX and friends
  
-@@ -21924,7 +21924,7 @@ echo "${ECHO_T}$JMODSUFFIX" >&6; }
+@@ -21170,7 +21170,7 @@ echo "${ECHO_T}$JMODSUFFIX" >&6; }
  INSTALLER="\$(LIBTOOL) --mode=install cp -p"
  
  MAKEFILE_CC="\$(LIBTOOL) --mode=compile ${MAKEFILE_CC}"
@@ -36,7 +36,7 @@ $NetBSD: patch-ab,v 1.16 2007/06/08 12:23:51 wiz Exp $
  MAKEFILE_CCLINK="\$(LIBTOOL) --mode=link ${MAKEFILE_CCLINK}"
  MAKEFILE_CXX="\$(LIBTOOL) --mode=compile ${MAKEFILE_CXX}"
  MAKEFILE_XSOLINK="\$(LIBTOOL) --mode=link ${MAKEFILE_CXXLINK} -avoid-version"
-@@ -22691,7 +22691,7 @@ if test "$_JTOPDIR" != "/usr"; then
+@@ -21937,7 +21937,7 @@ if test "$_JTOPDIR" != "/usr"; then
  	case "$host_os" in
  	aix*)		_JNI_INC_SUBDIRS="aix";;
  	bsdi*)		_JNI_INC_SUBDIRS="bsdos";;
@@ -45,12 +45,12 @@ $NetBSD: patch-ab,v 1.16 2007/06/08 12:23:51 wiz Exp $
  	hp*)		_JNI_INC_SUBDIRS="hp-ux";;
  	linux*)		_JNI_INC_SUBDIRS="linux genunix";;
  	osf*)		_JNI_INC_SUBDIRS="alpha";;
-@@ -31972,7 +31972,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.
--if test "$db_cv_mutex" = no -o "$db_cv_mutex" = "posix_only"; then
-+if test "$ac_cv_lib_pthread_main" = yes -a "$db_cv_mutex" = no -o "$db_cv_mutex" = "posix_only"; then
- 	LIBS="$LIBS -lpthread"
+@@ -29859,7 +29859,7 @@ rm -f core conftest.err conftest.$ac_obj
+ 	# 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.
+-	if test "$db_cv_mutex" = no -o "$db_cv_mutex" = posix_only; then
++	if test "$ac_cv_lib_pthread_main" = yes -a "$db_cv_mutex" = no -o "$db_cv_mutex" = posix_only; then
+ 		LIBS="$LIBS -lpthread"
  
  if test "$cross_compiling" = yes; then
diff --git a/databases/db4/patches/patch-ac b/databases/db4/patches/patch-ac
index 65e84657034..314d81e714c 100644
--- a/databases/db4/patches/patch-ac
+++ b/databases/db4/patches/patch-ac
@@ -1,10 +1,10 @@
-$NetBSD: patch-ac,v 1.7 2007/06/08 12:23:51 wiz Exp $
+$NetBSD: patch-ac,v 1.8 2008/01/10 21:55:53 adam Exp $
 
---- hmac/sha1.c.orig	2006-09-09 00:45:39.000000000 +0000
+--- hmac/sha1.c.orig	2008-01-09 19:15:23.000000000 +0100
 +++ hmac/sha1.c
-@@ -99,6 +99,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);
- #define R4(v,w,x,y,z,i) z+=(w^x^y)+blk(i)+0xCA62C1D6+rol(v,5);w=rol(w,30);
+@@ -98,6 +98,64 @@ 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);
+ #define	R4(v,w,x,y,z,i) z+=(w^x^y)+blk(i)+0xCA62C1D6+rol(v,5);w=rol(w,30);
  
 +typedef union {
 +    unsigned char c[64];
@@ -63,11 +63,12 @@ $NetBSD: patch-ac,v 1.7 2007/06/08 12:23:51 wiz Exp $
 +    nR4(e,a,b,c,d,76); nR4(d,e,a,b,c,77); nR4(c,d,e,a,b,78); nR4(b,c,d,e,a,79);
 +}
 +#endif
- 
++
  #ifdef VERBOSE  /* SAK */
  static void __db_SHAPrintContext __P((SHA1_CTX *, char *));
-@@ -131,10 +188,6 @@ __db_SHA1Transform(state, buffer)
-         unsigned char *buffer;
+ static void
+@@ -129,10 +187,6 @@ __db_SHA1Transform(state, buffer)
+ 	unsigned char *buffer;
  {
  u_int32_t a, b, c, d, e;
 -typedef union {
@@ -75,9 +76,9 @@ $NetBSD: patch-ac,v 1.7 2007/06/08 12:23:51 wiz Exp $
 -    u_int32_t l[16];
 -} CHAR64LONG16;
  CHAR64LONG16* block;
- static int is_bigendian = -1;
+     int is_bigendian;
  #ifdef SHA1HANDSOFF
-@@ -153,6 +206,13 @@ static int is_bigendian = -1;
+@@ -151,6 +205,13 @@ CHAR64LONG16* block;
      c = state[2];
      d = state[3];
      e = state[4];
@@ -91,7 +92,7 @@ $NetBSD: patch-ac,v 1.7 2007/06/08 12:23:51 wiz Exp $
      /* 4 rounds of 20 operations each. Loop unrolled. */
      R0(a,b,c,d,e, 0); R0(e,a,b,c,d, 1); R0(d,e,a,b,c, 2); R0(c,d,e,a,b, 3);
      R0(b,c,d,e,a, 4); R0(a,b,c,d,e, 5); R0(e,a,b,c,d, 6); R0(d,e,a,b,c, 7);
-@@ -174,6 +234,8 @@ static int is_bigendian = -1;
+@@ -172,6 +233,8 @@ CHAR64LONG16* block;
      R4(c,d,e,a,b,68); R4(b,c,d,e,a,69); R4(a,b,c,d,e,70); R4(e,a,b,c,d,71);
      R4(d,e,a,b,c,72); R4(c,d,e,a,b,73); R4(b,c,d,e,a,74); R4(a,b,c,d,e,75);
      R4(e,a,b,c,d,76); R4(d,e,a,b,c,77); R4(c,d,e,a,b,78); R4(b,c,d,e,a,79);