Subject: pkg/20289: PACKAGE UPDATE: patch to update db4 package to version 4.1.25
To: <gnats-bugs@gnats.netbsd.org>
From: Daniel Farrugia <dfarr@crack.dyndns.org>
List: netbsd-bugs
Date: 02/10/2003 19:39:21
>Number:         20289
>Category:       pkg
>Synopsis:       patch to update db4 package to version 4.1.25
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    pkg-manager
>State:          open
>Class:          change-request
>Submitter-Id:   net
>Arrival-Date:   Mon Feb 10 11:47:00 PST 2003
>Closed-Date:
>Last-Modified:
>Originator:     Daniel Farrugia
>Release:        NetBSD 1.6
>Organization:
n/a
>Environment:
n/a
>Description:

patch to update db4 package from version 4.0.14 to version 4.1.25

>How-To-Repeat:
n/a
>Fix:

diff -u -N -r -b ../db4.new/Makefile ../db4.orig/Makefile
--- ../db4.new/Makefile        Mon Feb 10 15:24:30 2003
+++ ../db4.orig/Makefile        Wed Jan  1 12:09:14 2003
@@ -1,7 +1,7 @@
 # $NetBSD: Makefile,v 1.4 2002/12/31 15:44:28 jlam Exp $
 
-DISTNAME=        db-4.1.25
-PKGNAME=        db4-4.1.25
+DISTNAME=        db-4.0.14
+PKGNAME=        db4-4.0.14
 CATEGORIES=        databases
 MASTER_SITES=        http://www.sleepycat.com/update/snapshot/
 
diff -u -N -r -b ../db4.new/PLIST ../db4.orig/PLIST
--- ../db4.new/PLIST        Mon Feb 10 15:24:30 2003
+++ ../db4.orig/PLIST        Sat Mar 30 06:35:58 2002
@@ -16,36 +16,19 @@
 lib/libdb4.a
 lib/libdb4.la
 lib/libdb4.so
-lib/libdb4.so.1
-lib/libdb4.so.1.25
+lib/libdb4.so.0
+lib/libdb4.so.0.14
 lib/libdb4_cxx.a
 lib/libdb4_cxx.la
 lib/libdb4_cxx.so
-lib/libdb4_cxx.so.1
-lib/libdb4_cxx.so.1.25
-share/doc/db4/ref/am/close.html
-share/doc/db4/ref/am/count.html
-share/doc/db4/ref/am/curclose.html
-share/doc/db4/ref/am/curdel.html
-share/doc/db4/ref/am/curdup.html
-share/doc/db4/ref/am/curget.html
-share/doc/db4/ref/am/curput.html
-share/doc/db4/ref/am/cursor.html
-share/doc/db4/ref/am/delete.html
-share/doc/db4/ref/am/get.html
-share/doc/db4/ref/am/join.html
-share/doc/db4/ref/am/open.html
-share/doc/db4/ref/am/opensub.html
-share/doc/db4/ref/am/ops.html
-share/doc/db4/ref/am/put.html
-share/doc/db4/ref/am/second.html
-share/doc/db4/ref/am/stat.html
-share/doc/db4/ref/am/sync.html
-share/doc/db4/ref/am/truncate.html
-share/doc/db4/ref/am/upgrade.html
-share/doc/db4/ref/am/verify.html
-share/doc/db4/ref/pindex.src
-share/doc/db4/ref/am_conf/bt_compare.html
+share/doc/db4/ref/mp/intro.html
+share/doc/db4/ref/mp/config.html
+share/doc/db4/ref/xa/build.html
+share/doc/db4/ref/xa/intro.html
+share/doc/db4/ref/xa/faq.html
+share/doc/db4/ref/xa/xa_config.html
+share/doc/db4/ref/xa/xa_intro.html
+share/doc/db4/ref/am_conf/select.html
 share/doc/db4/ref/am_conf/bt_minkey.html
 share/doc/db4/ref/am_conf/bt_prefix.html
 share/doc/db4/ref/am_conf/bt_recnum.html
@@ -63,8 +46,8 @@
 share/doc/db4/ref/am_conf/re_source.html
 share/doc/db4/ref/am_conf/recno.html
 share/doc/db4/ref/am_conf/renumber.html
-share/doc/db4/ref/am_conf/select.html
-share/doc/db4/ref/am_misc/align.html
+share/doc/db4/ref/am_conf/bt_compare.html
+share/doc/db4/ref/am_misc/tune.html
 share/doc/db4/ref/am_misc/dbsizes.html
 share/doc/db4/ref/am_misc/diskspace.html
 share/doc/db4/ref/am_misc/error.html
@@ -73,20 +56,15 @@
 share/doc/db4/ref/am_misc/partial.html
 share/doc/db4/ref/am_misc/perm.html
 share/doc/db4/ref/am_misc/stability.html
-share/doc/db4/ref/am_misc/struct.html
-share/doc/db4/ref/am_misc/tune.html
-share/doc/db4/ref/apprec/auto.html
-share/doc/db4/ref/apprec/config.html
-share/doc/db4/ref/apprec/def.html
-share/doc/db4/ref/apprec/intro.html
-share/doc/db4/ref/arch/bigpic.gif
-share/doc/db4/ref/arch/smallpic.gif
-share/doc/db4/ref/arch/apis.html
+share/doc/db4/ref/am_misc/align.html
+share/doc/db4/ref/arch/script.html
 share/doc/db4/ref/arch/bigpic.html
 share/doc/db4/ref/arch/progmodel.html
-share/doc/db4/ref/arch/script.html
+share/doc/db4/ref/arch/apis.html
 share/doc/db4/ref/arch/utilities.html
-share/doc/db4/ref/build_unix/aix.html
+share/doc/db4/ref/arch/bigpic.gif
+share/doc/db4/ref/arch/smallpic.gif
+share/doc/db4/ref/build_unix/ultrix.html
 share/doc/db4/ref/build_unix/conf.html
 share/doc/db4/ref/build_unix/embedix.html
 share/doc/db4/ref/build_unix/flags.html
@@ -105,7 +83,7 @@
 share/doc/db4/ref/build_unix/solaris.html
 share/doc/db4/ref/build_unix/sunos.html
 share/doc/db4/ref/build_unix/test.html
-share/doc/db4/ref/build_unix/ultrix.html
+share/doc/db4/ref/build_unix/aix.html
 share/doc/db4/ref/build_vxworks/faq.html
 share/doc/db4/ref/build_vxworks/intro.html
 share/doc/db4/ref/build_vxworks/introae.html
@@ -121,13 +99,10 @@
 share/doc/db4/ref/debug/printlog.html
 share/doc/db4/ref/debug/runtime.html
 share/doc/db4/ref/distrib/layout.html
-share/doc/db4/ref/distrib/port.html
 share/doc/db4/ref/dumpload/format.html
 share/doc/db4/ref/dumpload/text.html
 share/doc/db4/ref/dumpload/utility.html
-share/doc/db4/ref/env/create.html
-share/doc/db4/ref/env/db_config.html
-share/doc/db4/ref/env/encrypt.html
+share/doc/db4/ref/env/security.html
 share/doc/db4/ref/env/error.html
 share/doc/db4/ref/env/faq.html
 share/doc/db4/ref/env/intro.html
@@ -135,8 +110,8 @@
 share/doc/db4/ref/env/open.html
 share/doc/db4/ref/env/region.html
 share/doc/db4/ref/env/remote.html
-share/doc/db4/ref/env/security.html
-share/doc/db4/ref/intro/data.html
+share/doc/db4/ref/env/create.html
+share/doc/db4/ref/intro/where.html
 share/doc/db4/ref/intro/dbis.html
 share/doc/db4/ref/intro/dbisnot.html
 share/doc/db4/ref/intro/distrib.html
@@ -144,22 +119,21 @@
 share/doc/db4/ref/intro/products.html
 share/doc/db4/ref/intro/terrain.html
 share/doc/db4/ref/intro/what.html
-share/doc/db4/ref/intro/where.html
-share/doc/db4/ref/install/magic.txt
-share/doc/db4/ref/install/magic.s5.be.txt
-share/doc/db4/ref/install/magic.s5.le.txt
+share/doc/db4/ref/intro/data.html
 share/doc/db4/ref/install/file.html
 share/doc/db4/ref/install/multiple.html
 share/doc/db4/ref/install/rpm.html
+share/doc/db4/ref/install/magic.txt
+share/doc/db4/ref/install/magic.s5.be.txt
+share/doc/db4/ref/install/magic.s5.le.txt
 share/doc/db4/ref/java/compat.html
 share/doc/db4/ref/java/conf.html
 share/doc/db4/ref/java/faq.html
 share/doc/db4/ref/java/program.html
-share/doc/db4/ref/lock/am_conv.html
+share/doc/db4/ref/lock/twopl.html
 share/doc/db4/ref/lock/cam_conv.html
 share/doc/db4/ref/lock/config.html
 share/doc/db4/ref/lock/dead.html
-share/doc/db4/ref/lock/deaddbg.html
 share/doc/db4/ref/lock/intro.html
 share/doc/db4/ref/lock/max.html
 share/doc/db4/ref/lock/nondb.html
@@ -167,33 +141,65 @@
 share/doc/db4/ref/lock/page.html
 share/doc/db4/ref/lock/stdmode.html
 share/doc/db4/ref/lock/timeout.html
-share/doc/db4/ref/lock/twopl.html
+share/doc/db4/ref/lock/am_conv.html
 share/doc/db4/ref/log/config.html
 share/doc/db4/ref/log/intro.html
 share/doc/db4/ref/log/limits.html
-share/doc/db4/ref/mp/intro.html
-share/doc/db4/ref/mp/config.html
-share/doc/db4/ref/perl/intro.html
+share/doc/db4/ref/upgrade.4.0/txn.html
+share/doc/db4/ref/upgrade.4.0/cxx.html
+share/doc/db4/ref/upgrade.4.0/deadlock.html
+share/doc/db4/ref/upgrade.4.0/disk.html
+share/doc/db4/ref/upgrade.4.0/env.html
+share/doc/db4/ref/upgrade.4.0/intro.html
+share/doc/db4/ref/upgrade.4.0/java.html
+share/doc/db4/ref/upgrade.4.0/lock.html
+share/doc/db4/ref/upgrade.4.0/lock_id_free.html
+share/doc/db4/ref/upgrade.4.0/log.html
+share/doc/db4/ref/upgrade.4.0/mp.html
+share/doc/db4/ref/upgrade.4.0/rpc.html
+share/doc/db4/ref/upgrade.4.0/set_lk_max.html
+share/doc/db4/ref/upgrade.4.0/toc.html
+share/doc/db4/ref/upgrade.4.0/asr.html
+share/doc/db4/ref/am/verify.html
+share/doc/db4/ref/am/count.html
+share/doc/db4/ref/am/curclose.html
+share/doc/db4/ref/am/curdel.html
+share/doc/db4/ref/am/curdup.html
+share/doc/db4/ref/am/curget.html
+share/doc/db4/ref/am/curput.html
+share/doc/db4/ref/am/cursor.html
+share/doc/db4/ref/am/delete.html
+share/doc/db4/ref/am/get.html
+share/doc/db4/ref/am/join.html
+share/doc/db4/ref/am/open.html
+share/doc/db4/ref/am/opensub.html
+share/doc/db4/ref/am/ops.html
+share/doc/db4/ref/am/put.html
+share/doc/db4/ref/am/second.html
+share/doc/db4/ref/am/stat.html
+share/doc/db4/ref/am/sync.html
+share/doc/db4/ref/am/truncate.html
+share/doc/db4/ref/am/upgrade.html
+share/doc/db4/ref/am/close.html
 share/doc/db4/ref/program/solaris.txt
-share/doc/db4/ref/program/appsignals.html
-share/doc/db4/ref/program/cache.html
 share/doc/db4/ref/program/compatible.html
 share/doc/db4/ref/program/copy.html
 share/doc/db4/ref/program/environ.html
 share/doc/db4/ref/program/errorret.html
-share/doc/db4/ref/program/faq.html
+share/doc/db4/ref/program/extending.html
 share/doc/db4/ref/program/mt.html
 share/doc/db4/ref/program/namespace.html
 share/doc/db4/ref/program/runtime.html
 share/doc/db4/ref/program/scope.html
-share/doc/db4/ref/refs/bdb_usenix.html
+share/doc/db4/ref/program/appsignals.html
 share/doc/db4/ref/refs/bdb_usenix.ps
+share/doc/db4/ref/refs/witold.html
+share/doc/db4/ref/refs/bdb_usenix.html
+share/doc/db4/ref/refs/refs.html
 share/doc/db4/ref/refs/embedded.html
 share/doc/db4/ref/refs/hash_usenix.ps
 share/doc/db4/ref/refs/libtp_usenix.ps
-share/doc/db4/ref/refs/refs.html
-share/doc/db4/ref/refs/witold.html
-share/doc/db4/ref/rep/app.html
+share/doc/db4/ref/rep/trans.html
 share/doc/db4/ref/rep/comm.html
 share/doc/db4/ref/rep/elect.html
 share/doc/db4/ref/rep/ex.html
@@ -207,14 +213,12 @@
 share/doc/db4/ref/rep/newsite.html
 share/doc/db4/ref/rep/partition.html
 share/doc/db4/ref/rep/pri.html
-share/doc/db4/ref/rep/trans.html
+share/doc/db4/ref/rep/app.html
 share/doc/db4/ref/rpc/client.html
-share/doc/db4/ref/rpc/faq.html
 share/doc/db4/ref/rpc/intro.html
 share/doc/db4/ref/rpc/server.html
 share/doc/db4/ref/sendmail/intro.html
 share/doc/db4/ref/simple_tut/example.cs
-share/doc/db4/ref/simple_tut/close.html
 share/doc/db4/ref/simple_tut/del.html
 share/doc/db4/ref/simple_tut/errors.html
 share/doc/db4/ref/simple_tut/get.html
@@ -223,6 +227,7 @@
 share/doc/db4/ref/simple_tut/keydata.html
 share/doc/db4/ref/simple_tut/open.html
 share/doc/db4/ref/simple_tut/put.html
+share/doc/db4/ref/simple_tut/close.html
 share/doc/db4/ref/tcl/intro.html
 share/doc/db4/ref/tcl/error.html
 share/doc/db4/ref/tcl/faq.html
@@ -230,12 +235,9 @@
 share/doc/db4/ref/tcl/using.html
 share/doc/db4/ref/test/faq.html
 share/doc/db4/ref/test/run.html
-share/doc/db4/ref/transapp/transapp.cs
 share/doc/db4/ref/transapp/writetest.cs
-share/doc/db4/ref/transapp/admin.html
 share/doc/db4/ref/transapp/app.html
 share/doc/db4/ref/transapp/archival.html
-share/doc/db4/ref/transapp/atomicity.html
 share/doc/db4/ref/transapp/checkpoint.html
 share/doc/db4/ref/transapp/cursor.html
 share/doc/db4/ref/transapp/data_open.html
@@ -256,9 +258,12 @@
 share/doc/db4/ref/transapp/throughput.html
 share/doc/db4/ref/transapp/tune.html
 share/doc/db4/ref/transapp/why.html
+share/doc/db4/ref/transapp/transapp.cs
+share/doc/db4/ref/transapp/admin.html
 share/doc/db4/ref/txn/config.html
 share/doc/db4/ref/txn/intro.html
 share/doc/db4/ref/txn/limits.html
+share/doc/db4/ref/txn/other.html
 share/doc/db4/ref/upgrade/process.html
 share/doc/db4/ref/upgrade/version.html
 share/doc/db4/ref/upgrade.2.0/convert.html
@@ -266,7 +271,7 @@
 share/doc/db4/ref/upgrade.2.0/intro.html
 share/doc/db4/ref/upgrade.2.0/system.html
 share/doc/db4/ref/upgrade.2.0/toc.html
-share/doc/db4/ref/upgrade.3.0/close.html
+share/doc/db4/ref/upgrade.3.0/xa.html
 share/doc/db4/ref/upgrade.3.0/cxx.html
 share/doc/db4/ref/upgrade.3.0/db.html
 share/doc/db4/ref/upgrade.3.0/db_cxx.html
@@ -297,8 +302,8 @@
 share/doc/db4/ref/upgrade.3.0/txn_commit.html
 share/doc/db4/ref/upgrade.3.0/txn_stat.html
 share/doc/db4/ref/upgrade.3.0/value_set.html
-share/doc/db4/ref/upgrade.3.0/xa.html
-share/doc/db4/ref/upgrade.3.1/btstat.html
+share/doc/db4/ref/upgrade.3.0/close.html
+share/doc/db4/ref/upgrade.3.1/txn_check.html
 share/doc/db4/ref/upgrade.3.1/config.html
 share/doc/db4/ref/upgrade.3.1/disk.html
 share/doc/db4/ref/upgrade.3.1/dup.html
@@ -315,8 +320,8 @@
 share/doc/db4/ref/upgrade.3.1/tcl.html
 share/doc/db4/ref/upgrade.3.1/toc.html
 share/doc/db4/ref/upgrade.3.1/tmp.html
-share/doc/db4/ref/upgrade.3.1/txn_check.html
-share/doc/db4/ref/upgrade.3.2/callback.html
+share/doc/db4/ref/upgrade.3.1/btstat.html
+share/doc/db4/ref/upgrade.3.2/tx_recover.html
 share/doc/db4/ref/upgrade.3.2/db_dump.html
 share/doc/db4/ref/upgrade.3.2/disk.html
 share/doc/db4/ref/upgrade.3.2/handle.html
@@ -327,8 +332,8 @@
 share/doc/db4/ref/upgrade.3.2/renumber.html
 share/doc/db4/ref/upgrade.3.2/set_flags.html
 share/doc/db4/ref/upgrade.3.2/toc.html
-share/doc/db4/ref/upgrade.3.2/tx_recover.html
-share/doc/db4/ref/upgrade.3.3/alloc.html
+share/doc/db4/ref/upgrade.3.2/callback.html
+share/doc/db4/ref/upgrade.3.3/txn_prepare.html
 share/doc/db4/ref/upgrade.3.3/bigfile.html
 share/doc/db4/ref/upgrade.3.3/conflict.html
 share/doc/db4/ref/upgrade.3.3/disk.html
@@ -339,79 +344,34 @@
 share/doc/db4/ref/upgrade.3.3/rpc.html
 share/doc/db4/ref/upgrade.3.3/shared.html
 share/doc/db4/ref/upgrade.3.3/toc.html
-share/doc/db4/ref/upgrade.3.3/txn_prepare.html
-share/doc/db4/ref/upgrade.4.0/asr.html
-share/doc/db4/ref/upgrade.4.0/cxx.html
-share/doc/db4/ref/upgrade.4.0/deadlock.html
-share/doc/db4/ref/upgrade.4.0/disk.html
-share/doc/db4/ref/upgrade.4.0/env.html
-share/doc/db4/ref/upgrade.4.0/intro.html
-share/doc/db4/ref/upgrade.4.0/java.html
-share/doc/db4/ref/upgrade.4.0/lock.html
-share/doc/db4/ref/upgrade.4.0/lock_id_free.html
-share/doc/db4/ref/upgrade.4.0/log.html
-share/doc/db4/ref/upgrade.4.0/mp.html
-share/doc/db4/ref/upgrade.4.0/rpc.html
-share/doc/db4/ref/upgrade.4.0/set_lk_max.html
-share/doc/db4/ref/upgrade.4.0/toc.html
-share/doc/db4/ref/upgrade.4.0/txn.html
-share/doc/db4/ref/upgrade.4.1/app_dispatch.html
-share/doc/db4/ref/upgrade.4.1/checkpoint.html
-share/doc/db4/ref/upgrade.4.1/cxx.html
-share/doc/db4/ref/upgrade.4.1/disk.html
-share/doc/db4/ref/upgrade.4.1/excl.html
-share/doc/db4/ref/upgrade.4.1/fop.html
-share/doc/db4/ref/upgrade.4.1/hash_nelem.html
-share/doc/db4/ref/upgrade.4.1/incomplete.html
-share/doc/db4/ref/upgrade.4.1/intro.html
-share/doc/db4/ref/upgrade.4.1/java.html
-share/doc/db4/ref/upgrade.4.1/log_register.html
-share/doc/db4/ref/upgrade.4.1/log_stat.html
-share/doc/db4/ref/upgrade.4.1/memp_sync.html
-share/doc/db4/ref/upgrade.4.1/toc.html
-share/doc/db4/ref/xa/build.html
-share/doc/db4/ref/xa/intro.html
-share/doc/db4/ref/xa/faq.html
-share/doc/db4/ref/xa/xa_config.html
-share/doc/db4/ref/xa/xa_intro.html
-share/doc/db4/index.html
-share/doc/db4/reftoc.html
-share/doc/db4/images/api.gif
-share/doc/db4/images/next.gif
-share/doc/db4/images/prev.gif
-share/doc/db4/images/ps.gif
-share/doc/db4/images/ref.gif
-share/doc/db4/images/sleepycat.gif
-share/doc/db4/sleepycat/contact.html
+share/doc/db4/ref/upgrade.3.3/alloc.html
+share/doc/db4/ref/perl/intro.html
+share/doc/db4/ref/pindex.src
 share/doc/db4/sleepycat/legal.html
 share/doc/db4/sleepycat/license.html
+share/doc/db4/sleepycat/contact.html
+share/doc/db4/api_c/c_pindex.html
 share/doc/db4/api_c/db_associate.html
 share/doc/db4/api_c/pindex.src
-share/doc/db4/api_c/db_class.html
 share/doc/db4/api_c/db_close.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_fd.html
 share/doc/db4/api_c/db_get.html
 share/doc/db4/api_c/db_get_byteswapped.html
 share/doc/db4/api_c/db_get_type.html
 share/doc/db4/api_c/db_join.html
 share/doc/db4/api_c/db_key_range.html
-share/doc/db4/api_c/db_list.html
 share/doc/db4/api_c/db_open.html
 share/doc/db4/api_c/db_put.html
 share/doc/db4/api_c/db_remove.html
 share/doc/db4/api_c/db_rename.html
 share/doc/db4/api_c/db_set_append_recno.html
-share/doc/db4/api_c/db_stat.html
 share/doc/db4/api_c/db_set_bt_compare.html
 share/doc/db4/api_c/db_set_bt_minkey.html
 share/doc/db4/api_c/db_set_bt_prefix.html
-share/doc/db4/api_c/db_set_cache_priority.html
 share/doc/db4/api_c/db_set_cachesize.html
 share/doc/db4/api_c/db_set_dup_compare.html
-share/doc/db4/api_c/db_set_encrypt.html
 share/doc/db4/api_c/db_set_errcall.html
 share/doc/db4/api_c/db_set_errpfx.html
 share/doc/db4/api_c/db_set_feedback.html
@@ -421,45 +381,29 @@
 share/doc/db4/api_c/db_set_h_nelem.html
 share/doc/db4/api_c/db_set_lorder.html
 share/doc/db4/api_c/db_set_pagesize.html
-share/doc/db4/api_c/db_sync.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
 share/doc/db4/api_c/db_set_re_pad.html
+share/doc/db4/api_c/db_stat.html
 share/doc/db4/api_c/db_set_re_source.html
+share/doc/db4/api_c/db_sync.html
 share/doc/db4/api_c/db_truncate.html
 share/doc/db4/api_c/db_upgrade.html
 share/doc/db4/api_c/db_verify.html
-share/doc/db4/api_c/dbt_class.html
-share/doc/db4/api_c/db_create.html
-share/doc/db4/api_c/db_set_alloc.html
-share/doc/db4/api_c/db_set_errfile.html
-share/doc/db4/api_c/db_set_paniccall.html
-share/doc/db4/api_c/dbt_bulk.html
-share/doc/db4/api_c/dbc_class.html
 share/doc/db4/api_c/dbc_close.html
 share/doc/db4/api_c/dbc_count.html
 share/doc/db4/api_c/dbc_del.html
 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/c_index.html
-share/doc/db4/api_c/env_class.html
 share/doc/db4/api_c/env_close.html
-share/doc/db4/api_c/env_dbremove.html
-share/doc/db4/api_c/env_dbrename.html
-share/doc/db4/api_c/env_err.html
-share/doc/db4/api_c/env_list.html
 share/doc/db4/api_c/env_open.html
 share/doc/db4/api_c/env_remove.html
-share/doc/db4/api_c/env_set_app_dispatch.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
 share/doc/db4/api_c/env_set_errcall.html
 share/doc/db4/api_c/env_set_errpfx.html
-share/doc/db4/api_c/dbm.html
 share/doc/db4/api_c/env_set_feedback.html
 share/doc/db4/api_c/env_set_flags.html
 share/doc/db4/api_c/env_set_lg_bsize.html
@@ -472,6 +416,7 @@
 share/doc/db4/api_c/env_set_lk_max_locks.html
 share/doc/db4/api_c/env_set_lk_max_objects.html
 share/doc/db4/api_c/env_set_mp_mmapsize.html
+share/doc/db4/api_c/env_set_rec_init.html
 share/doc/db4/api_c/env_set_rpc_server.html
 share/doc/db4/api_c/env_set_shm_key.html
 share/doc/db4/api_c/env_set_tas_spins.html
@@ -479,21 +424,15 @@
 share/doc/db4/api_c/env_set_timeout.html
 share/doc/db4/api_c/env_set_tmp_dir.html
 share/doc/db4/api_c/env_set_tx_max.html
+share/doc/db4/api_c/env_set_tx_recover.html
 share/doc/db4/api_c/env_set_tx_timestamp.html
 share/doc/db4/api_c/env_set_verbose.html
 share/doc/db4/api_c/env_strerror.html
 share/doc/db4/api_c/env_version.html
-share/doc/db4/api_c/env_create.html
-share/doc/db4/api_c/env_set_alloc.html
-share/doc/db4/api_c/env_set_errfile.html
-share/doc/db4/api_c/env_set_paniccall.html
-share/doc/db4/api_c/hsearch.html
-share/doc/db4/api_c/lock_class.html
 share/doc/db4/api_c/lock_detect.html
 share/doc/db4/api_c/lock_get.html
 share/doc/db4/api_c/lock_id.html
 share/doc/db4/api_c/lock_id_free.html
-share/doc/db4/api_c/lock_list.html
 share/doc/db4/api_c/lock_put.html
 share/doc/db4/api_c/lock_stat.html
 share/doc/db4/api_c/lock_vec.html
@@ -502,23 +441,41 @@
 share/doc/db4/api_c/log_cursor.html
 share/doc/db4/api_c/log_file.html
 share/doc/db4/api_c/log_flush.html
-share/doc/db4/api_c/log_list.html
 share/doc/db4/api_c/log_put.html
+share/doc/db4/api_c/log_register.html
 share/doc/db4/api_c/log_stat.html
-share/doc/db4/api_c/logc_class.html
+share/doc/db4/api_c/log_unregister.html
 share/doc/db4/api_c/logc_close.html
 share/doc/db4/api_c/logc_get.html
-share/doc/db4/api_c/lsn_class.html
 share/doc/db4/api_c/memp_fclose.html
 share/doc/db4/api_c/memp_fopen.html
 share/doc/db4/api_c/memp_fsync.html
-share/doc/db4/api_c/memp_list.html
 share/doc/db4/api_c/memp_register.html
 share/doc/db4/api_c/memp_stat.html
 share/doc/db4/api_c/memp_sync.html
 share/doc/db4/api_c/memp_trickle.html
-share/doc/db4/api_c/mempfile_class.html
-share/doc/db4/api_c/memp_fcreate.html
+share/doc/db4/api_c/rep_elect.html
+share/doc/db4/api_c/rep_message.html
+share/doc/db4/api_c/rep_start.html
+share/doc/db4/api_c/rep_transport.html
+share/doc/db4/api_c/txn_abort.html
+share/doc/db4/api_c/txn_begin.html
+share/doc/db4/api_c/txn_checkpoint.html
+share/doc/db4/api_c/txn_commit.html
+share/doc/db4/api_c/txn_discard.html
+share/doc/db4/api_c/txn_prepare.html
+share/doc/db4/api_c/txn_recover.html
+share/doc/db4/api_c/txn_set_timeout.html
+share/doc/db4/api_c/txn_stat.html
+share/doc/db4/api_c/db_err.html
+share/doc/db4/api_c/db_set_alloc.html
+share/doc/db4/api_c/db_set_errfile.html
+share/doc/db4/api_c/db_set_paniccall.html
+share/doc/db4/api_c/dbt_bulk.html
+share/doc/db4/api_c/env_err.html
+share/doc/db4/api_c/env_set_alloc.html
+share/doc/db4/api_c/env_set_errfile.html
+share/doc/db4/api_c/env_set_paniccall.html
 share/doc/db4/api_c/memp_fget.html
 share/doc/db4/api_c/memp_fput.html
 share/doc/db4/api_c/memp_fset.html
@@ -527,13 +484,13 @@
 share/doc/db4/api_c/memp_set_ftype.html
 share/doc/db4/api_c/memp_set_lsn_offset.html
 share/doc/db4/api_c/memp_set_pgcookie.html
-share/doc/db4/api_c/rep_elect.html
-share/doc/db4/api_c/rep_limit.html
-share/doc/db4/api_c/rep_list.html
-share/doc/db4/api_c/rep_message.html
-share/doc/db4/api_c/rep_start.html
-share/doc/db4/api_c/rep_stat.html
-share/doc/db4/api_c/rep_transport.html
+share/doc/db4/api_c/db_create.html
+share/doc/db4/api_c/db_lsn.html
+share/doc/db4/api_c/dbm.html
+share/doc/db4/api_c/dbt.html
+share/doc/db4/api_c/env_create.html
+share/doc/db4/api_c/hsearch.html
+share/doc/db4/api_c/memp_fcreate.html
 share/doc/db4/api_c/set_func_close.html
 share/doc/db4/api_c/set_func_dirfree.html
 share/doc/db4/api_c/set_func_dirlist.html
@@ -553,209 +510,29 @@
 share/doc/db4/api_c/set_func_unmap.html
 share/doc/db4/api_c/set_func_write.html
 share/doc/db4/api_c/set_func_yield.html
-share/doc/db4/api_c/txn_abort.html
-share/doc/db4/api_c/txn_begin.html
-share/doc/db4/api_c/txn_checkpoint.html
-share/doc/db4/api_c/txn_class.html
-share/doc/db4/api_c/txn_commit.html
-share/doc/db4/api_c/txn_discard.html
-share/doc/db4/api_c/txn_list.html
-share/doc/db4/api_c/txn_prepare.html
-share/doc/db4/api_c/txn_recover.html
-share/doc/db4/api_c/txn_set_timeout.html
-share/doc/db4/api_c/txn_stat.html
-share/doc/db4/api_c/c_pindex.html
-share/doc/db4/api_cxx/db_associate.html
-share/doc/db4/api_cxx/pindex.src
-share/doc/db4/api_cxx/db_class.html
-share/doc/db4/api_cxx/db_close.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_fd.html
-share/doc/db4/api_cxx/db_get.html
-share/doc/db4/api_cxx/db_get_byteswapped.html
-share/doc/db4/api_cxx/db_get_type.html
-share/doc/db4/api_cxx/db_join.html
-share/doc/db4/api_cxx/db_key_range.html
-share/doc/db4/api_cxx/db_list.html
-share/doc/db4/api_cxx/db_open.html
-share/doc/db4/api_cxx/db_put.html
-share/doc/db4/api_cxx/db_remove.html
-share/doc/db4/api_cxx/db_rename.html
-share/doc/db4/api_cxx/db_set_append_recno.html
-share/doc/db4/api_cxx/db_stat.html
-share/doc/db4/api_cxx/db_set_bt_compare.html
-share/doc/db4/api_cxx/db_set_bt_minkey.html
-share/doc/db4/api_cxx/db_set_bt_prefix.html
-share/doc/db4/api_cxx/db_set_cache_priority.html
-share/doc/db4/api_cxx/db_set_cachesize.html
-share/doc/db4/api_cxx/db_set_dup_compare.html
-share/doc/db4/api_cxx/db_set_encrypt.html
-share/doc/db4/api_cxx/db_set_errcall.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_ffactor.html
-share/doc/db4/api_cxx/db_set_h_hash.html
-share/doc/db4/api_cxx/db_set_h_nelem.html
-share/doc/db4/api_cxx/db_set_lorder.html
-share/doc/db4/api_cxx/db_set_pagesize.html
-share/doc/db4/api_cxx/db_sync.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
-share/doc/db4/api_cxx/db_set_re_pad.html
-share/doc/db4/api_cxx/db_set_re_source.html
-share/doc/db4/api_cxx/db_truncate.html
-share/doc/db4/api_cxx/db_upgrade.html
-share/doc/db4/api_cxx/db_verify.html
-share/doc/db4/api_cxx/dbt_class.html
-share/doc/db4/api_cxx/db_set_alloc.html
-share/doc/db4/api_cxx/db_set_errfile.html
-share/doc/db4/api_cxx/db_set_error_stream.html
-share/doc/db4/api_cxx/db_set_paniccall.html
-share/doc/db4/api_cxx/dbt_bulk.html
-share/doc/db4/api_cxx/dbc_class.html
-share/doc/db4/api_cxx/dbc_close.html
-share/doc/db4/api_cxx/dbc_count.html
-share/doc/db4/api_cxx/dbc_del.html
-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/except_class.html
-share/doc/db4/api_cxx/runrec_class.html
-share/doc/db4/api_cxx/c_index.html
-share/doc/db4/api_cxx/env_class.html
-share/doc/db4/api_cxx/env_close.html
-share/doc/db4/api_cxx/env_dbremove.html
-share/doc/db4/api_cxx/env_dbrename.html
-share/doc/db4/api_cxx/env_err.html
-share/doc/db4/api_cxx/env_list.html
-share/doc/db4/api_cxx/env_open.html
-share/doc/db4/api_cxx/env_remove.html
-share/doc/db4/api_cxx/env_set_app_dispatch.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
-share/doc/db4/api_cxx/env_set_errcall.html
-share/doc/db4/api_cxx/env_set_errpfx.html
-share/doc/db4/api_cxx/env_set_feedback.html
-share/doc/db4/api_cxx/env_set_flags.html
-share/doc/db4/api_cxx/env_set_lg_bsize.html
-share/doc/db4/api_cxx/env_set_lg_dir.html
-share/doc/db4/api_cxx/env_set_lg_max.html
-share/doc/db4/api_cxx/env_set_lg_regionmax.html
-share/doc/db4/api_cxx/env_set_lk_conflicts.html
-share/doc/db4/api_cxx/env_set_lk_detect.html
-share/doc/db4/api_cxx/env_set_lk_max_lockers.html
-share/doc/db4/api_cxx/env_set_lk_max_locks.html
-share/doc/db4/api_cxx/env_set_lk_max_objects.html
-share/doc/db4/api_cxx/env_set_mp_mmapsize.html
-share/doc/db4/api_cxx/lock_class.html
-share/doc/db4/api_cxx/env_set_rpc_server.html
-share/doc/db4/api_cxx/env_set_shm_key.html
-share/doc/db4/api_cxx/env_set_tas_spins.html
-share/doc/db4/api_cxx/env_set_timeout.html
-share/doc/db4/api_cxx/env_set_tmp_dir.html
-share/doc/db4/api_cxx/env_set_tx_max.html
-share/doc/db4/api_cxx/env_set_tx_timestamp.html
-share/doc/db4/api_cxx/env_set_verbose.html
-share/doc/db4/api_cxx/env_strerror.html
-share/doc/db4/api_cxx/env_version.html
-share/doc/db4/api_cxx/env_set_errfile.html
-share/doc/db4/api_cxx/env_set_paniccall.html
-share/doc/db4/api_cxx/env_set_alloc.html
-share/doc/db4/api_cxx/env_set_error_stream.html
-share/doc/db4/api_cxx/lock_detect.html
-share/doc/db4/api_cxx/lock_get.html
-share/doc/db4/api_cxx/txn_id.html
-share/doc/db4/api_cxx/lock_id.html
-share/doc/db4/api_cxx/lock_id_free.html
-share/doc/db4/api_cxx/lock_list.html
-share/doc/db4/api_cxx/lock_put.html
-share/doc/db4/api_cxx/lock_stat.html
-share/doc/db4/api_cxx/lock_vec.html
-share/doc/db4/api_cxx/deadlock_class.html
-share/doc/db4/api_cxx/lockng_class.html
-share/doc/db4/api_cxx/log_archive.html
-share/doc/db4/api_cxx/log_compare.html
-share/doc/db4/api_cxx/log_cursor.html
-share/doc/db4/api_cxx/log_file.html
-share/doc/db4/api_cxx/log_flush.html
-share/doc/db4/api_cxx/log_list.html
-share/doc/db4/api_cxx/log_put.html
-share/doc/db4/api_cxx/log_stat.html
-share/doc/db4/api_cxx/logc_class.html
-share/doc/db4/api_cxx/logc_close.html
-share/doc/db4/api_cxx/logc_get.html
-share/doc/db4/api_cxx/lsn_class.html
-share/doc/db4/api_cxx/memp_fclose.html
-share/doc/db4/api_cxx/memp_fopen.html
-share/doc/db4/api_cxx/memp_fsync.html
-share/doc/db4/api_cxx/memp_list.html
-share/doc/db4/api_cxx/memp_register.html
-share/doc/db4/api_cxx/memp_stat.html
-share/doc/db4/api_cxx/memp_sync.html
-share/doc/db4/api_cxx/memp_trickle.html
-share/doc/db4/api_cxx/mempfile_class.html
-share/doc/db4/api_cxx/memp_fcreate.html
-share/doc/db4/api_cxx/memp_fget.html
-share/doc/db4/api_cxx/memp_fput.html
-share/doc/db4/api_cxx/memp_fset.html
-share/doc/db4/api_cxx/memp_set_clear_len.html
-share/doc/db4/api_cxx/memp_set_fileid.html
-share/doc/db4/api_cxx/memp_set_ftype.html
-share/doc/db4/api_cxx/memp_set_lsn_offset.html
-share/doc/db4/api_cxx/memp_set_pgcookie.html
-share/doc/db4/api_cxx/memp_class.html
-share/doc/db4/api_cxx/rep_elect.html
-share/doc/db4/api_cxx/rep_limit.html
-share/doc/db4/api_cxx/rep_list.html
-share/doc/db4/api_cxx/rep_message.html
-share/doc/db4/api_cxx/rep_start.html
-share/doc/db4/api_cxx/rep_stat.html
-share/doc/db4/api_cxx/rep_transport.html
-share/doc/db4/api_cxx/txn_abort.html
-share/doc/db4/api_cxx/txn_begin.html
-share/doc/db4/api_cxx/txn_checkpoint.html
-share/doc/db4/api_cxx/txn_class.html
-share/doc/db4/api_cxx/txn_commit.html
-share/doc/db4/api_cxx/txn_discard.html
-share/doc/db4/api_cxx/txn_list.html
-share/doc/db4/api_cxx/txn_prepare.html
-share/doc/db4/api_cxx/txn_recover.html
-share/doc/db4/api_cxx/txn_set_timeout.html
-share/doc/db4/api_cxx/txn_stat.html
-share/doc/db4/api_cxx/cxx_pindex.html
+share/doc/db4/api_c/c_index.html
+share/doc/db4/api_java/java_pindex.html
 share/doc/db4/api_java/db_associate.html
 share/doc/db4/api_java/pindex.src
-share/doc/db4/api_java/db_class.html
 share/doc/db4/api_java/db_close.html
 share/doc/db4/api_java/db_cursor.html
 share/doc/db4/api_java/db_del.html
-share/doc/db4/api_java/db_err.html
 share/doc/db4/api_java/db_fd.html
 share/doc/db4/api_java/db_get.html
 share/doc/db4/api_java/db_get_byteswapped.html
 share/doc/db4/api_java/db_get_type.html
 share/doc/db4/api_java/db_join.html
 share/doc/db4/api_java/db_key_range.html
-share/doc/db4/api_java/db_list.html
 share/doc/db4/api_java/db_open.html
 share/doc/db4/api_java/db_put.html
 share/doc/db4/api_java/db_remove.html
 share/doc/db4/api_java/db_rename.html
 share/doc/db4/api_java/db_set_append_recno.html
-share/doc/db4/api_java/db_stat.html
 share/doc/db4/api_java/db_set_bt_compare.html
 share/doc/db4/api_java/db_set_bt_minkey.html
 share/doc/db4/api_java/db_set_bt_prefix.html
-share/doc/db4/api_java/db_set_cache_priority.html
 share/doc/db4/api_java/db_set_cachesize.html
 share/doc/db4/api_java/db_set_dup_compare.html
-share/doc/db4/api_java/db_set_encrypt.html
 share/doc/db4/api_java/db_set_errcall.html
 share/doc/db4/api_java/db_set_errpfx.html
 share/doc/db4/api_java/db_set_feedback.html
@@ -765,41 +542,27 @@
 share/doc/db4/api_java/db_set_h_nelem.html
 share/doc/db4/api_java/db_set_lorder.html
 share/doc/db4/api_java/db_set_pagesize.html
-share/doc/db4/api_java/db_sync.html
 share/doc/db4/api_java/db_set_q_extentsize.html
 share/doc/db4/api_java/db_set_re_delim.html
 share/doc/db4/api_java/db_set_re_len.html
 share/doc/db4/api_java/db_set_re_pad.html
+share/doc/db4/api_java/db_stat.html
 share/doc/db4/api_java/db_set_re_source.html
+share/doc/db4/api_java/db_sync.html
 share/doc/db4/api_java/db_truncate.html
 share/doc/db4/api_java/db_upgrade.html
 share/doc/db4/api_java/db_verify.html
-share/doc/db4/api_java/dbt_class.html
-share/doc/db4/api_java/db_set_error_stream.html
-share/doc/db4/api_java/dbt_bulk_class.html
-share/doc/db4/api_java/dbc_class.html
 share/doc/db4/api_java/dbc_close.html
 share/doc/db4/api_java/dbc_count.html
 share/doc/db4/api_java/dbc_del.html
 share/doc/db4/api_java/dbc_dup.html
 share/doc/db4/api_java/dbc_get.html
-share/doc/db4/api_java/dbc_list.html
 share/doc/db4/api_java/dbc_put.html
-share/doc/db4/api_java/except_class.html
-share/doc/db4/api_java/runrec_class.html
-share/doc/db4/api_java/c_index.html
-share/doc/db4/api_java/env_class.html
 share/doc/db4/api_java/env_close.html
-share/doc/db4/api_java/env_dbremove.html
-share/doc/db4/api_java/env_dbrename.html
-share/doc/db4/api_java/env_err.html
-share/doc/db4/api_java/env_list.html
 share/doc/db4/api_java/env_open.html
 share/doc/db4/api_java/env_remove.html
-share/doc/db4/api_java/env_set_app_dispatch.html
 share/doc/db4/api_java/env_set_cachesize.html
 share/doc/db4/api_java/env_set_data_dir.html
-share/doc/db4/api_java/env_set_encrypt.html
 share/doc/db4/api_java/env_set_errcall.html
 share/doc/db4/api_java/env_set_errpfx.html
 share/doc/db4/api_java/env_set_feedback.html
@@ -814,6 +577,7 @@
 share/doc/db4/api_java/env_set_lk_max_locks.html
 share/doc/db4/api_java/env_set_lk_max_objects.html
 share/doc/db4/api_java/env_set_mp_mmapsize.html
+share/doc/db4/api_java/env_set_rec_init.html
 share/doc/db4/api_java/env_set_rpc_server.html
 share/doc/db4/api_java/env_set_shm_key.html
 share/doc/db4/api_java/env_set_tas_spins.html
@@ -821,64 +585,230 @@
 share/doc/db4/api_java/env_set_timeout.html
 share/doc/db4/api_java/env_set_tmp_dir.html
 share/doc/db4/api_java/env_set_tx_max.html
+share/doc/db4/api_java/env_set_tx_recover.html
 share/doc/db4/api_java/env_set_tx_timestamp.html
 share/doc/db4/api_java/env_set_verbose.html
 share/doc/db4/api_java/env_strerror.html
 share/doc/db4/api_java/env_version.html
-share/doc/db4/api_java/env_set_error_stream.html
-share/doc/db4/api_java/lock_class.html
 share/doc/db4/api_java/lock_detect.html
 share/doc/db4/api_java/lock_get.html
 share/doc/db4/api_java/lock_id.html
 share/doc/db4/api_java/lock_id_free.html
-share/doc/db4/api_java/lock_list.html
 share/doc/db4/api_java/lock_put.html
 share/doc/db4/api_java/lock_stat.html
 share/doc/db4/api_java/lock_vec.html
-share/doc/db4/api_java/deadlock_class.html
-share/doc/db4/api_java/lockng_class.html
 share/doc/db4/api_java/log_archive.html
 share/doc/db4/api_java/log_compare.html
 share/doc/db4/api_java/log_cursor.html
 share/doc/db4/api_java/log_file.html
 share/doc/db4/api_java/log_flush.html
-share/doc/db4/api_java/log_list.html
 share/doc/db4/api_java/log_put.html
+share/doc/db4/api_java/log_register.html
 share/doc/db4/api_java/log_stat.html
-share/doc/db4/api_java/logc_class.html
+share/doc/db4/api_java/log_unregister.html
 share/doc/db4/api_java/logc_close.html
 share/doc/db4/api_java/logc_get.html
-share/doc/db4/api_java/lsn_class.html
 share/doc/db4/api_java/memp_fclose.html
 share/doc/db4/api_java/memp_fopen.html
 share/doc/db4/api_java/memp_fsync.html
-share/doc/db4/api_java/memp_list.html
 share/doc/db4/api_java/memp_register.html
 share/doc/db4/api_java/memp_stat.html
 share/doc/db4/api_java/memp_sync.html
 share/doc/db4/api_java/memp_trickle.html
-share/doc/db4/api_java/mempfile_class.html
-share/doc/db4/api_java/memp_class.html
 share/doc/db4/api_java/rep_elect.html
-share/doc/db4/api_java/rep_limit.html
-share/doc/db4/api_java/rep_list.html
 share/doc/db4/api_java/rep_message.html
 share/doc/db4/api_java/rep_start.html
-share/doc/db4/api_java/rep_stat.html
 share/doc/db4/api_java/rep_transport.html
 share/doc/db4/api_java/txn_abort.html
 share/doc/db4/api_java/txn_begin.html
 share/doc/db4/api_java/txn_checkpoint.html
-share/doc/db4/api_java/txn_class.html
 share/doc/db4/api_java/txn_commit.html
 share/doc/db4/api_java/txn_discard.html
-share/doc/db4/api_java/txn_list.html
 share/doc/db4/api_java/txn_prepare.html
 share/doc/db4/api_java/txn_recover.html
-share/doc/db4/api_java/txn_stat.html
-share/doc/db4/api_java/java_pindex.html
 share/doc/db4/api_java/txn_set_timeout.html
-share/doc/db4/api_tcl/db_close.html
+share/doc/db4/api_java/txn_stat.html
+share/doc/db4/api_java/db_class.html
+share/doc/db4/api_java/dbc_class.html
+share/doc/db4/api_java/dbenv_class.html
+share/doc/db4/api_java/dbt_class.html
+share/doc/db4/api_java/env_set_error_stream.html
+share/doc/db4/api_java/except_class.html
+share/doc/db4/api_java/get_dbt.html
+share/doc/db4/api_java/get_errno.html
+share/doc/db4/api_java/lock_class.html
+share/doc/db4/api_java/logc_class.html
+share/doc/db4/api_java/lsn_class.html
+share/doc/db4/api_java/mem_class.html
+share/doc/db4/api_java/txn_class.html
+share/doc/db4/api_java/dbt_bulk_class.html
+share/doc/db4/api_java/deadlock_class.html
+share/doc/db4/api_java/runrec_class.html
+share/doc/db4/api_java/c_index.html
+share/doc/db4/api_cxx/cxx_pindex.html
+share/doc/db4/api_cxx/db_associate.html
+share/doc/db4/api_cxx/pindex.src
+share/doc/db4/api_cxx/db_close.html
+share/doc/db4/api_cxx/db_cursor.html
+share/doc/db4/api_cxx/db_del.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
+share/doc/db4/api_cxx/db_get_type.html
+share/doc/db4/api_cxx/db_join.html
+share/doc/db4/api_cxx/db_key_range.html
+share/doc/db4/api_cxx/db_open.html
+share/doc/db4/api_cxx/db_put.html
+share/doc/db4/api_cxx/db_remove.html
+share/doc/db4/api_cxx/db_rename.html
+share/doc/db4/api_cxx/db_set_append_recno.html
+share/doc/db4/api_cxx/db_set_bt_compare.html
+share/doc/db4/api_cxx/db_set_bt_minkey.html
+share/doc/db4/api_cxx/db_set_bt_prefix.html
+share/doc/db4/api_cxx/db_set_cachesize.html
+share/doc/db4/api_cxx/db_set_dup_compare.html
+share/doc/db4/api_cxx/db_set_errcall.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_ffactor.html
+share/doc/db4/api_cxx/db_set_h_hash.html
+share/doc/db4/api_cxx/db_set_h_nelem.html
+share/doc/db4/api_cxx/db_set_lorder.html
+share/doc/db4/api_cxx/db_set_pagesize.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
+share/doc/db4/api_cxx/db_set_re_pad.html
+share/doc/db4/api_cxx/db_stat.html
+share/doc/db4/api_cxx/db_set_re_source.html
+share/doc/db4/api_cxx/db_sync.html
+share/doc/db4/api_cxx/db_truncate.html
+share/doc/db4/api_cxx/db_upgrade.html
+share/doc/db4/api_cxx/db_verify.html
+share/doc/db4/api_cxx/dbc_close.html
+share/doc/db4/api_cxx/dbc_count.html
+share/doc/db4/api_cxx/dbc_del.html
+share/doc/db4/api_cxx/dbc_dup.html
+share/doc/db4/api_cxx/dbc_get.html
+share/doc/db4/api_cxx/dbc_put.html
+share/doc/db4/api_cxx/env_close.html
+share/doc/db4/api_cxx/env_open.html
+share/doc/db4/api_cxx/env_remove.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_errcall.html
+share/doc/db4/api_cxx/env_set_errpfx.html
+share/doc/db4/api_cxx/env_set_feedback.html
+share/doc/db4/api_cxx/env_set_flags.html
+share/doc/db4/api_cxx/env_set_lg_bsize.html
+share/doc/db4/api_cxx/env_set_lg_dir.html
+share/doc/db4/api_cxx/env_set_lg_max.html
+share/doc/db4/api_cxx/env_set_lg_regionmax.html
+share/doc/db4/api_cxx/env_set_lk_conflicts.html
+share/doc/db4/api_cxx/env_set_lk_detect.html
+share/doc/db4/api_cxx/env_set_lk_max_lockers.html
+share/doc/db4/api_cxx/env_set_lk_max_locks.html
+share/doc/db4/api_cxx/env_set_lk_max_objects.html
+share/doc/db4/api_cxx/env_set_mp_mmapsize.html
+share/doc/db4/api_cxx/env_set_rec_init.html
+share/doc/db4/api_cxx/env_set_rpc_server.html
+share/doc/db4/api_cxx/env_set_shm_key.html
+share/doc/db4/api_cxx/env_set_tas_spins.html
+share/doc/db4/api_cxx/txn_id.html
+share/doc/db4/api_cxx/env_set_timeout.html
+share/doc/db4/api_cxx/env_set_tmp_dir.html
+share/doc/db4/api_cxx/env_set_tx_max.html
+share/doc/db4/api_cxx/env_set_tx_recover.html
+share/doc/db4/api_cxx/env_set_tx_timestamp.html
+share/doc/db4/api_cxx/env_set_verbose.html
+share/doc/db4/api_cxx/env_strerror.html
+share/doc/db4/api_cxx/env_version.html
+share/doc/db4/api_cxx/lock_detect.html
+share/doc/db4/api_cxx/lock_get.html
+share/doc/db4/api_cxx/lock_id.html
+share/doc/db4/api_cxx/lock_id_free.html
+share/doc/db4/api_cxx/lock_put.html
+share/doc/db4/api_cxx/lock_stat.html
+share/doc/db4/api_cxx/lock_vec.html
+share/doc/db4/api_cxx/log_archive.html
+share/doc/db4/api_cxx/log_compare.html
+share/doc/db4/api_cxx/log_cursor.html
+share/doc/db4/api_cxx/log_file.html
+share/doc/db4/api_cxx/log_flush.html
+share/doc/db4/api_cxx/log_put.html
+share/doc/db4/api_cxx/log_register.html
+share/doc/db4/api_cxx/log_stat.html
+share/doc/db4/api_cxx/log_unregister.html
+share/doc/db4/api_cxx/logc_close.html
+share/doc/db4/api_cxx/logc_get.html
+share/doc/db4/api_cxx/memp_fclose.html
+share/doc/db4/api_cxx/memp_fopen.html
+share/doc/db4/api_cxx/memp_fsync.html
+share/doc/db4/api_cxx/memp_register.html
+share/doc/db4/api_cxx/memp_stat.html
+share/doc/db4/api_cxx/memp_sync.html
+share/doc/db4/api_cxx/memp_trickle.html
+share/doc/db4/api_cxx/rep_elect.html
+share/doc/db4/api_cxx/rep_message.html
+share/doc/db4/api_cxx/rep_start.html
+share/doc/db4/api_cxx/rep_transport.html
+share/doc/db4/api_cxx/txn_abort.html
+share/doc/db4/api_cxx/txn_begin.html
+share/doc/db4/api_cxx/txn_checkpoint.html
+share/doc/db4/api_cxx/txn_commit.html
+share/doc/db4/api_cxx/txn_discard.html
+share/doc/db4/api_cxx/txn_prepare.html
+share/doc/db4/api_cxx/txn_recover.html
+share/doc/db4/api_cxx/txn_set_timeout.html
+share/doc/db4/api_cxx/txn_stat.html
+share/doc/db4/api_cxx/db_err.html
+share/doc/db4/api_cxx/db_set_alloc.html
+share/doc/db4/api_cxx/db_set_errfile.html
+share/doc/db4/api_cxx/db_set_paniccall.html
+share/doc/db4/api_cxx/dbt_bulk.html
+share/doc/db4/api_cxx/env_err.html
+share/doc/db4/api_cxx/env_set_alloc.html
+share/doc/db4/api_cxx/env_set_errfile.html
+share/doc/db4/api_cxx/env_set_paniccall.html
+share/doc/db4/api_cxx/memp_fget.html
+share/doc/db4/api_cxx/memp_fput.html
+share/doc/db4/api_cxx/memp_fset.html
+share/doc/db4/api_cxx/memp_set_clear_len.html
+share/doc/db4/api_cxx/memp_set_fileid.html
+share/doc/db4/api_cxx/memp_set_ftype.html
+share/doc/db4/api_cxx/memp_set_lsn_offset.html
+share/doc/db4/api_cxx/memp_set_pgcookie.html
+share/doc/db4/api_cxx/db_class.html
+share/doc/db4/api_cxx/dbc_class.html
+share/doc/db4/api_cxx/dbenv_class.html
+share/doc/db4/api_cxx/dbt_class.html
+share/doc/db4/api_cxx/env_set_error_stream.html
+share/doc/db4/api_cxx/except_class.html
+share/doc/db4/api_cxx/get_dbt.html
+share/doc/db4/api_cxx/get_errno.html
+share/doc/db4/api_cxx/lock_class.html
+share/doc/db4/api_cxx/logc_class.html
+share/doc/db4/api_cxx/lsn_class.html
+share/doc/db4/api_cxx/mem_class.html
+share/doc/db4/api_cxx/what.html
+share/doc/db4/api_cxx/txn_class.html
+share/doc/db4/api_cxx/memp_fcreate.html
+share/doc/db4/api_cxx/mempfile_class.html
+share/doc/db4/api_cxx/c_index.html
+share/doc/db4/utility/db_verify.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_deadlock.html
+share/doc/db4/utility/db_dump.html
+share/doc/db4/utility/db_load.html
+share/doc/db4/utility/db_printlog.html
+share/doc/db4/utility/db_recover.html
+share/doc/db4/utility/db_stat.html
+share/doc/db4/utility/db_upgrade.html
+share/doc/db4/utility/index.html
+share/doc/db4/api_tcl/tcl_pindex.html
 share/doc/db4/api_tcl/pindex.src
 share/doc/db4/api_tcl/db_count.html
 share/doc/db4/api_tcl/db_cursor.html
@@ -890,8 +820,8 @@
 share/doc/db4/api_tcl/db_join.html
 share/doc/db4/api_tcl/db_open.html
 share/doc/db4/api_tcl/db_put.html
-share/doc/db4/api_tcl/db_remove.html
 share/doc/db4/api_tcl/db_rename.html
+share/doc/db4/api_tcl/db_remove.html
 share/doc/db4/api_tcl/db_stat.html
 share/doc/db4/api_tcl/db_sync.html
 share/doc/db4/api_tcl/db_truncate.html
@@ -901,8 +831,6 @@
 share/doc/db4/api_tcl/dbc_get.html
 share/doc/db4/api_tcl/dbc_put.html
 share/doc/db4/api_tcl/env_close.html
-share/doc/db4/api_tcl/env_dbremove.html
-share/doc/db4/api_tcl/env_dbrename.html
 share/doc/db4/api_tcl/env_open.html
 share/doc/db4/api_tcl/env_remove.html
 share/doc/db4/api_tcl/tcl_index.html
@@ -910,23 +838,19 @@
 share/doc/db4/api_tcl/txn_abort.html
 share/doc/db4/api_tcl/txn_commit.html
 share/doc/db4/api_tcl/version.html
-share/doc/db4/api_tcl/tcl_pindex.html
-share/doc/db4/utility/index.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_deadlock.html
-share/doc/db4/utility/db_dump.html
-share/doc/db4/utility/db_load.html
-share/doc/db4/utility/db_printlog.html
-share/doc/db4/utility/db_recover.html
-share/doc/db4/utility/db_stat.html
-share/doc/db4/utility/db_upgrade.html
-share/doc/db4/utility/db_verify.html
-@dirrm share/doc/db4/ref/am
+share/doc/db4/api_tcl/db_close.html
+share/doc/db4/images/api.gif
+share/doc/db4/images/next.gif
+share/doc/db4/images/prev.gif
+share/doc/db4/images/ps.gif
+share/doc/db4/images/ref.gif
+share/doc/db4/images/sleepycat.gif
+share/doc/db4/index.html
+share/doc/db4/reftoc.html
+@dirrm share/doc/db4/ref/mp
+@dirrm share/doc/db4/ref/xa
 @dirrm share/doc/db4/ref/am_conf
 @dirrm share/doc/db4/ref/am_misc
-@dirrm share/doc/db4/ref/apprec
 @dirrm share/doc/db4/ref/arch
 @dirrm share/doc/db4/ref/build_unix
 @dirrm share/doc/db4/ref/build_vxworks
@@ -941,14 +865,15 @@
 @dirrm share/doc/db4/ref/java
 @dirrm share/doc/db4/ref/lock
 @dirrm share/doc/db4/ref/log
-@dirrm share/doc/db4/ref/mp
-@dirrm share/doc/db4/ref/perl
+@dirrm share/doc/db4/ref/upgrade.4.0
+@dirrm share/doc/db4/ref/am
 @dirrm share/doc/db4/ref/program
 @dirrm share/doc/db4/ref/refs
 @dirrm share/doc/db4/ref/rep
 @dirrm share/doc/db4/ref/rpc
 @dirrm share/doc/db4/ref/sendmail
 @dirrm share/doc/db4/ref/simple_tut
+@dirrm share/doc/db4/ref/splash
 @dirrm share/doc/db4/ref/tcl
 @dirrm share/doc/db4/ref/test
 @dirrm share/doc/db4/ref/transapp
@@ -959,16 +884,14 @@
 @dirrm share/doc/db4/ref/upgrade.3.1
 @dirrm share/doc/db4/ref/upgrade.3.2
 @dirrm share/doc/db4/ref/upgrade.3.3
-@dirrm share/doc/db4/ref/upgrade.4.0
-@dirrm share/doc/db4/ref/upgrade.4.1
-@dirrm share/doc/db4/ref/xa
-@dirrm share/doc/db4/ref
-@dirrm share/doc/db4/images
+@dirrm share/doc/db4/ref/perl
 @dirrm share/doc/db4/sleepycat
 @dirrm share/doc/db4/api_c
-@dirrm share/doc/db4/api_cxx
 @dirrm share/doc/db4/api_java
-@dirrm share/doc/db4/api_tcl
+@dirrm share/doc/db4/api_cxx
 @dirrm share/doc/db4/utility
+@dirrm share/doc/db4/api_tcl
+@dirrm share/doc/db4/images
+@dirrm share/doc/db4/ref
 @dirrm share/doc/db4
 @dirrm include/db4
diff -u -N -r -b ../db4.new/buildlink2.mk ../db4.orig/buildlink2.mk
--- ../db4.new/buildlink2.mk        Mon Feb 10 15:24:31 2003
+++ ../db4.orig/buildlink2.mk        Wed Sep 11 17:25:13 2002
@@ -5,7 +5,7 @@
 DB4_BUILDLINK2_MK=        # defined
 
 BUILDLINK_PACKAGES+=                db4
-BUILDLINK_DEPENDS.db4?=                db4>=4.1.25
+BUILDLINK_DEPENDS.db4?=                db4>=4.0.14
 BUILDLINK_PKGSRCDIR.db4?=        ../../databases/db4
 
 EVAL_PREFIX+=        BUILDLINK_PREFIX.db4=db4
diff -u -N -r -b ../db4.new/distinfo ../db4.orig/distinfo
--- ../db4.new/distinfo        Mon Feb 10 15:24:31 2003
+++ ../db4.orig/distinfo        Sat Mar 30 06:35:58 2002
@@ -1,6 +1,6 @@
 $NetBSD: distinfo,v 1.1.1.1 2002/03/30 05:35:58 uebayasi Exp $
 
-SHA1 (db-4.1.25.tar.gz) = fc462d40046e85f715db54fc8acece99f9a7bd4c
-Size (db-4.1.25.tar.gz) = 3080234 bytes
-SHA1 (patch-aa) = a52173c6bfa6ce0668ded14cb03a9a6872f674e5
-SHA1 (patch-ab) = 92c17cb51c479a10cbb9ac655afdb5c1b77d25b9
+SHA1 (db-4.0.14.tar.gz) = a0fcf0ec521ffb7a7ea342b1ec2ea9bc9f8402ee
+Size (db-4.0.14.tar.gz) = 2701799 bytes
+SHA1 (patch-aa) = 56cfc57a92b30ca25b8ccc46676a4e7d99ac4000
+SHA1 (patch-ab) = bfe64ff7ca92e73bb6c00a7333e57b30950fbf2e
diff -u -N -r -b ../db4.new/patches/patch-aa ../db4.orig/patches/patch-aa
--- ../db4.new/patches/patch-aa        Mon Feb 10 15:24:31 2003
+++ ../db4.orig/patches/patch-aa        Sat Mar 30 06:35:58 2002
@@ -1,5 +1,7 @@
---- ../dist/Makefile.in.orig        Fri Aug 30 20:11:56 2002
-+++ ../dist/Makefile.in        Sun Feb  9 16:56:25 2003
+$NetBSD: patch-aa,v 1.1.1.1 2002/03/30 05:35:58 uebayasi Exp $
+
+--- ../dist/Makefile.orig        Mon Mar 18 16:20:22 2002
++++ ../dist/Makefile.in                Mon Mar 18 16:20:33 2002
 @@ -11,7 +11,7 @@
  bindir=        @bindir@
  includedir=@includedir@
@@ -18,7 +20,7 @@
  SOFLAGS=        @SOFLAGS@
  SOMAJOR=        @DB_VERSION_MAJOR@
  SOVERSION=        @DB_VERSION_MAJOR@.@DB_VERSION_MINOR@
-@@ -59,13 +59,13 @@
+@@ -60,13 +60,13 @@
  LIBS=                @LIBS@
  LIBSO_LIBS=        @LIBSO_LIBS@
  
@@ -27,23 +29,19 @@
 -libso=                $(libso_base)-$(SOVERSION).@SOSUFFIX@
 -libso_static=        $(libso_base)-$(SOVERSION).a
 -libso_target=        $(libso_base)-$(SOVERSION).la
-+libdb=                libdb.la
++libdb=                $(libso_base).la
 +libso_base=        libdb4
-+libso=                $(libso_base).$(SOSUFFIX).@SOVERSION@
-+libso_static=        $(libso_base).a
++libso=                $(libso_base).@SOSUFFIX@.$(SOVERSION)
++libso_static=        $(libso_base).la
 +libso_target=        $(libso_base).la
  libso_default=        $(libso_base).@SOSUFFIX@
 -libso_major=        $(libso_base)-$(SOMAJOR).@SOSUFFIX@
-+libso_major=        $(libso_base).$(SOSUFFIX).@SOMAJOR@
++libso_major=        $(libso_base).@SOSUFFIX@.$(SOMAJOR)
  
  ##################################################
  # C++ API.
-@@ -75,16 +75,16 @@
- CXXFLAGS=        -c $(CPPFLAGS) @CXXFLAGS@
- CXX=                @MAKEFILE_CXX@
- CXXLINK=        @MAKEFILE_CXXLINK@
--XSOLINK=        @MAKEFILE_XSOLINK@
-+XSOLINK=        @MAKEFILE_XSOLINK@ -version-info 
@DB_VERSION_MINOR@:@DB_VERSION_PATCH@
+@@ -79,13 +79,13 @@
+ XSOLINK=        @MAKEFILE_XSOLINK@
  LIBXSO_LIBS=        @LIBXSO_LIBS@
  
 -libcxx=                libdb_cxx.a
@@ -53,70 +51,67 @@
 -libxso_target=        $(libxso_base)-$(SOVERSION).la
 +libcxx=                libdb4_cxx.a
 +libxso_base=        libdb4_cxx
-+libxso=                $(libxso_base).$(SOSUFFIX).@SOVERSION@
++libxso=                $(libxso_base).@SOSUFFIX@.$(SOVERSION)
 +libxso_static=        $(libxso_base).a
 +libxso_target=        $(libxso_base).la
  libxso_default=        $(libxso_base).@SOSUFFIX@
 -libxso_major=        $(libxso_base)-$(SOMAJOR).@SOSUFFIX@
-+libxso_major=        $(libxso_base).$(SOSUFFIX).@SOMAJOR@
++libxso_major=        $(libxso_base).@SOSUFFIX@.$(SOMAJOR)
  
  ##################################################
  # Java API.
-@@ -107,16 +107,16 @@
+@@ -105,15 +105,15 @@
+ JAVA_DBDIR=        $(JAVA_SRCDIR)/$(JAVA_DBREL)
  JAVA_EXDIR=        $(JAVA_SRCDIR)/$(JAVA_EXREL)
- JAVA_RPCDIR=        $(srcdir)/rpc_server/java
  
 -libj_jarfile=        db.jar
 +libj_jarfile=        db4.jar
  libj_exjarfile=        dbexamples.jar
- rpc_jarfile=        dbsvc.jar
 -libjso_base=        libdb_java
--libjso=                $(libjso_base)-$(SOVERSION).@JMODSUFFIX@
--libjso_static=        $(libjso_base)-$(SOVERSION).a
--libjso_target=        $(libjso_base)-$(SOVERSION).la
+-libjso=                $(libjso_base)-$(SOVERSION).@SOSUFFIX@
 +libjso_base=        libdb4_java
-+libjso=                $(libjso_base).$(JMODSUFFIX).@SOVERSION@
-+libjso_static=        $(libjso_base).a
++libjso=                $(libjso_base).@SOSUFFIX@.$(SOVERSION)
+ libjso_static=        $(libjso_base)-$(SOVERSION).a
+-libjso_target=        $(libjso_base)-$(SOVERSION).la
 +libjso_target=        $(libjso_base).la
- libjso_default=        $(libjso_base).@JMODSUFFIX@
--libjso_major=        $(libjso_base)-$(SOMAJOR).@JMODSUFFIX@
--libjso_g=        $(libjso_base)-$(SOVERSION)_g.@JMODSUFFIX@
-+libjso_major=        $(libjso_base).$(JMODSUFFIX).@SOMAJOR@
-+libjso_g=        $(libjso_base)_g.$(JMODSUFFIX).@SOVERSION@
+ libjso_default=        $(libjso_base).@SOSUFFIX@
+-libjso_major=        $(libjso_base)-$(SOMAJOR).@SOSUFFIX@
+-libjso_g=        $(libjso_base)-$(SOVERSION)_g.@SOSUFFIX@
++libjso_major=        $(libjso_base).@SOSUFFIX@.$(SOMAJOR)
++libjso_g=        $(libjso_base)_g.@SOSUFFIX@.$(SOVERSION)
  
  ##################################################
  # TCL API.
-@@ -125,12 +125,12 @@
+@@ -122,12 +122,12 @@
  ##################################################
  TCFLAGS=        @TCFLAGS@
  LIBTSO_LIBS=        @LIBTSO_LIBS@
 -libtso_base=        libdb_tcl
--libtso=                $(libtso_base)-$(SOVERSION).@MODSUFFIX@
--libtso_static=        $(libtso_base)-$(SOVERSION).a
--libtso_target=        $(libtso_base)-$(SOVERSION).la
+-libtso=                $(libtso_base)-$(SOVERSION).@SOSUFFIX@
 +libtso_base=        libdb4_tcl
-+libtso=                $(libtso_base).$(MODSUFFIX).@SOVERSION@
-+libtso_static=        $(libtso_base).a
++libtso=                $(libtso_base).@SOSUFFIX@.$(SOVERSION)
+ libtso_static=        $(libtso_base)-$(SOVERSION).a
+-libtso_target=        $(libtso_base)-$(SOVERSION).la
 +libtso_target=        $(libtso_base).la
- libtso_default=        $(libtso_base).@MODSUFFIX@
--libtso_major=        $(libtso_base)-$(SOMAJOR).@MODSUFFIX@
-+libtso_major=        $(libtso_base).$(MODSUFFIX).@SOMAJOR@
+ libtso_default=        $(libtso_base).@SOSUFFIX@
+-libtso_major=        $(libtso_base)-$(SOMAJOR).@SOSUFFIX@
++libtso_major=        $(libtso_base).@SOSUFFIX@.$(SOMAJOR)
  
  ##################################################
  # db_dump185 UTILITY
-@@ -364,8 +364,9 @@
+@@ -235,8 +235,9 @@
+         db_server_proc@o@ db_server_svc@o@ db_server_util@o@ gen_db_server@o@
  
  UTIL_PROGS=\
-         @ADDITIONAL_PROGS@ \
--        db_archive db_checkpoint db_deadlock \
+-        @ADDITIONAL_PROGS@ db_archive db_checkpoint db_deadlock \
 -        db_dump db_load db_printlog db_recover db_stat db_upgrade db_verify
-+        db4_archive db4_checkpoint db4_deadlock \
++        @ADDITIONAL_PROGS@ db4_archive db4_checkpoint db4_deadlock \
 +        db4_dump db4_load db4_printlog db4_recover db4_stat db4_upgrade \
 +        db4_verify
  
  ##################################################
  # List of files installed into the library directory.
-@@ -410,14 +411,6 @@
+@@ -281,14 +282,6 @@
  ##################################################
  library_build: @INSTALL_LIBS@ @ADDITIONAL_LANG@ $(UTIL_PROGS)
  
@@ -131,7 +126,16 @@
  $(libso_target): $(C_OBJS)
          $(SOLINK) $(SOFLAGS) $(LDFLAGS) -o $@ $(C_OBJS) $(LIBSO_LIBS)
  
-@@ -463,17 +456,17 @@
+@@ -312,7 +305,7 @@
+ 
+ $(libj_jarfile): $(JAVA_DBSRCS)
+         @test -d $(JAVA_CLASSTOP) || \
+-           ($(mkdir) -p $(JAVA_CLASSTOP) && $(chmod) $(dmode) 
$(JAVA_CLASSTOP))
++            ($(mkdir) -p $(JAVA_CLASSTOP) && $(chmod) $(dmode) 
$(JAVA_CLASSTOP))
+         $(JAVAC) -d $(JAVA_CLASSTOP) $(JAVACFLAGS) $(JAVA_DBSRCS)
+         cd $(JAVA_CLASSTOP) && $(JAR) cf ../$(libj_jarfile) $(JAVA_DBREL)
+ 
+@@ -325,58 +318,58 @@
  ##################################################
  # Utilities
  ##################################################
@@ -141,21 +145,6 @@
              $(RPC_SRV_OBJS) util_log@o@ $(DEF_LIB) $(LIBS)
          $(POSTLINK) $@
  
--berkeley_db_cxxsvc: $(RPC_CXXSRV_OBJS) util_log@o@ $(DEF_LIB_CXX)
-+berkeley_db4_cxxsvc: $(RPC_CXXSRV_OBJS) util_log@o@ $(DEF_LIB_CXX)
-         $(CXXLINK) -o $@ $(LDFLAGS) \
-             $(RPC_CXXSRV_OBJS) util_log@o@ $(DEF_LIB_CXX) $(LIBS)
-         $(POSTLINK) $@
- 
--berkeley_db_javasvc: $(rpc_jarfile)
-+berkeley_db4_javasvc: $(rpc_jarfile)
-         echo > $@ "#!/bin/sh"
-         echo >> $@ 
CLASSPATH="$(CLASSPATH):$(rpc_jarfile):$(JAVA_RPCDIR)/oncrpc.jar"
-         echo >> $@ LD_LIBRARY_PATH=.libs
-@@ -481,53 +474,53 @@
-         echo >> $@ exec java com.sleepycat.db.rpcserver.DbServer \$$@
-         chmod +x $@
- 
 -db_archive: db_archive@o@ util_sig@o@ $(DEF_LIB)
 +db4_archive: db_archive@o@ util_sig@o@ $(DEF_LIB)
          $(CCLINK) -o $@ $(LDFLAGS) \
@@ -174,19 +163,19 @@
              db_deadlock@o@ util_log@o@ util_sig@o@ $(DEF_LIB) $(LIBS)
          $(POSTLINK) $@
  
--db_dump: db_dump@o@ util_cache@o@ util_sig@o@ $(DEF_LIB)
-+db4_dump: db_dump@o@ util_cache@o@ util_sig@o@ $(DEF_LIB)
-         $(CCLINK) -o $@ $(LDFLAGS) db_dump@o@ util_cache@o@ util_sig@o@ 
$(DEF_LIB) $(LIBS)
+-db_dump: db_dump@o@ util_sig@o@ $(DEF_LIB)
++db4_dump: db_dump@o@ util_sig@o@ $(DEF_LIB)
+         $(CCLINK) -o $@ $(LDFLAGS) db_dump@o@ util_sig@o@ $(DEF_LIB) $(LIBS)
          $(POSTLINK) $@
  
--db_dump185: db_dump185@o@ @LTLIBOBJS@
-+db4_dump185: db_dump185@o@ @LTLIBOBJS@
-         $(CCLINK) -o $@ $(LDFLAGS) db_dump185@o@ @LTLIBOBJS@ $(DB185LIB)
+-db_dump185: db_dump185@o@ @LIBOBJS@
++db4_dump185: db_dump185@o@ @LIBOBJS@
+         $(CCLINK) -o $@ $(LDFLAGS) db_dump185@o@ @LIBOBJS@ $(DB185LIB)
          $(POSTLINK) $@
  
--db_load: db_load@o@ util_cache@o@ util_sig@o@ $(DEF_LIB)
-+db4_load: db_load@o@ util_cache@o@ util_sig@o@ $(DEF_LIB)
-         $(CCLINK) -o $@ $(LDFLAGS) db_load@o@ util_cache@o@ util_sig@o@ 
$(DEF_LIB) $(LIBS)
+-db_load: db_load@o@ util_sig@o@ $(DEF_LIB)
++db4_load: db_load@o@ util_sig@o@ $(DEF_LIB)
+         $(CCLINK) -o $@ $(LDFLAGS) db_load@o@ util_sig@o@ $(DEF_LIB) $(LIBS)
          $(POSTLINK) $@
  
 -db_printlog: db_printlog@o@ util_sig@o@ $(DEF_LIB)
@@ -201,9 +190,9 @@
              db_recover@o@ util_sig@o@ $(DEF_LIB) $(LIBS)
          $(POSTLINK) $@
  
--db_stat: db_stat@o@ util_cache@o@ util_sig@o@ $(DEF_LIB)
-+db4_stat: db_stat@o@ util_cache@o@ util_sig@o@ $(DEF_LIB)
-         $(CCLINK) -o $@ $(LDFLAGS) db_stat@o@ util_cache@o@ util_sig@o@ 
$(DEF_LIB) $(LIBS)
+-db_stat: db_stat@o@ util_sig@o@ $(DEF_LIB)
++db4_stat: db_stat@o@ util_sig@o@ $(DEF_LIB)
+         $(CCLINK) -o $@ $(LDFLAGS) db_stat@o@ util_sig@o@ $(DEF_LIB) $(LIBS)
          $(POSTLINK) $@
  
 -db_upgrade: db_upgrade@o@ util_sig@o@ $(DEF_LIB)
@@ -212,12 +201,12 @@
              db_upgrade@o@ util_sig@o@ $(DEF_LIB) $(LIBS)
          $(POSTLINK) $@
  
--db_verify: db_verify@o@ util_cache@o@ util_sig@o@ $(DEF_LIB)
-+db4_verify: db_verify@o@ util_cache@o@ util_sig@o@ $(DEF_LIB)
+-db_verify: db_verify@o@ util_sig@o@ $(DEF_LIB)
++db4_verify: db_verify@o@ util_sig@o@ $(DEF_LIB)
          $(CCLINK) -o $@ $(LDFLAGS) \
-             db_verify@o@ util_cache@o@ util_sig@o@ $(DEF_LIB) $(LIBS)
+             db_verify@o@ util_sig@o@ $(DEF_LIB) $(LIBS)
          $(POSTLINK) $@
-@@ -548,15 +541,11 @@
+@@ -397,15 +390,11 @@
  INCINC=        cxx_common.h cxx_except.h
  install_include:
          @echo "Installing DB include files: $(includedir) ..."
@@ -225,18 +214,18 @@
 -            ($(mkdir) -p $(includedir) && $(chmod) $(dmode) $(includedir))
 -        @cd $(includedir) && $(rm) -f $(INCDOT) $(INCINC)
 -        @$(cp) -p $(INCDOT) $(includedir)
--        @cd $(srcdir)/dbinc/ && $(cp) -p $(INCINC) $(includedir)
+-        @cd $(srcdir)/include/ && $(cp) -p $(INCINC) $(includedir)
 -        @cd $(includedir) && $(chmod) $(fmode) $(INCDOT) $(INCINC)
 +        ${BSD_INSTALL_DATA_DIR} $(includedir)
 +        ${BSD_INSTALL_DATA} $(INCDOT) $(includedir)
-+        @cd $(srcdir)/dbinc/ && ${BSD_INSTALL_DATA} $(INCINC) $(includedir)
++        @cd $(srcdir)/include/ && ${BSD_INSTALL_DATA} $(INCINC) $(includedir)
  
  uninstall_include:
 -        @cd $(includedir) && $(rm) -f $(INCDOT) $(INCINC)
  
  install_lib:
          @echo "Installing DB library: $(libdir) ..."
-@@ -565,8 +554,6 @@
+@@ -414,8 +403,6 @@
          @cd $(libdir) && $(rm) -f $(LIB_INSTALL_FILE_LIST)
          @$(INSTALLER) @INSTALL_LIBS@ $(libdir)
          @(cd $(libdir) && \
@@ -245,7 +234,7 @@
              test -f $(libso_static) && $(ln) -s $(libso_static) $(libdb); \
              test -f $(libxso) && $(ln) -s $(libxso) $(libxso_default); \
              test -f $(libxso) && $(ln) -s $(libxso) $(libxso_major); \
-@@ -605,8 +592,7 @@
+@@ -461,8 +448,7 @@
          sleepycat utility
  install_docs:
          @echo "Installing documentation: $(docdir) ..."
diff -u -N -r -b ../db4.new/patches/patch-ab ../db4.orig/patches/patch-ab
--- ../db4.new/patches/patch-ab        Mon Feb 10 15:24:31 2003
+++ ../db4.orig/patches/patch-ab        Sat Mar 30 06:35:59 2002
@@ -1,38 +1,36 @@
---- ../dist/configure.orig        Thu Dec 19 17:55:03 2002
-+++ ../dist/configure        Sun Feb  9 17:36:43 2003
-@@ -4696,6 +4696,7 @@
+$NetBSD: patch-ab,v 1.1.1.1 2002/03/30 05:35:59 uebayasi Exp $
+
+--- ../dist/configure.orig        Sun Nov 18 10:45:49 2001
++++ ../dist/configure        Mon Mar 18 16:19:01 2002
+@@ -4443,6 +4443,7 @@
  if test "$GXX" = "yes"; then
          GXX_VERSION=`${MAKEFILE_CXX} --version`
          case ${GXX_VERSION} in
-+        egcs*)  CXXFLAGS="-fexceptions CXXFLAGS";;
++        egcs*)  CXXFLAGS="-fexceptions $CXXFLAGS";;
          1.*|2.[01234567].*|*-1.*|*-2.[01234567].*)
                  db_cv_gxx_except=yes;;
          esac
-@@ -9477,7 +9478,8 @@
+@@ -8777,7 +8778,8 @@
          release=""
          libname=libfoo
          eval library_names=\"$library_names_spec\"
--        _SOSUFFIX=`echo "$library_names" | sed -e 's/.*\.\([a-zA-Z0-9_]*\).*/
\1/'`
-+        _SOSUFFIX=`./libtool --config | sed -e '/^library_names_spec=/!d' -
e 's/.*\.\([a-zA-Z0-9_]*\).*/\1/'`
+-SOSUFFIX=`echo "$library_names" | sed -e 's/.*\.\([a-zA-Z0-9_]*\).*/\1/'`
++SOSUFFIX=`./libtool --config | sed -e '/^library_names_spec=/!d' -
e 's/.*\.\([a-zA-Z0-9_]*\).*/\1/'`
 +
-         if test "$_SOSUFFIX" = '' ; then
-                 _SOSUFFIX=so
-                 if test "$enable_shared" = "yes" && test "$_SOSUFFIX_MESSAGE" 
= ""; then
-@@ -9552,10 +9554,10 @@
- INSTALLER="\$(LIBTOOL) --mode=install cp -p"
+ echo "$as_me:8781: result: $SOSUFFIX" >&5
+ echo "${ECHO_T}$SOSUFFIX" >&6
+ 
+@@ -8794,7 +8796,7 @@
+ INSTALLER="\$(LIBTOOL) --mode=install cp"
  
  MAKEFILE_CC="\$(LIBTOOL) --mode=compile ${MAKEFILE_CC}"
 -MAKEFILE_SOLINK="\$(LIBTOOL) --mode=link ${MAKEFILE_CCLINK} -avoid-version"
 +MAKEFILE_SOLINK="\$(LIBTOOL) --mode=link ${MAKEFILE_CCLINK}"
  MAKEFILE_CCLINK="\$(LIBTOOL) --mode=link ${MAKEFILE_CCLINK}"
  MAKEFILE_CXX="\$(LIBTOOL) --mode=compile ${MAKEFILE_CXX}"
--MAKEFILE_XSOLINK="\$(LIBTOOL) --mode=link ${MAKEFILE_CXXLINK} -avoid-version"
-+MAKEFILE_XSOLINK="\$(LIBTOOL) --mode=link ${MAKEFILE_CXXLINK}"
- MAKEFILE_CXXLINK="\$(LIBTOOL) --mode=link ${MAKEFILE_CXXLINK}"
- 
- # Configure for shared libraries, static libraries, or both.  If both are
-@@ -9974,7 +9976,7 @@
- 
+ MAKEFILE_XSOLINK="\$(LIBTOOL) --mode=link ${MAKEFILE_CXXLINK} -avoid-version"
+@@ -9173,7 +9175,7 @@
+ EOF
  
          RPC_CLIENT_OBJS="\$(RPC_CLIENT_OBJS)"
 -        ADDITIONAL_PROGS="berkeley_db_svc $ADDITIONAL_PROGS"

----- End forwarded message -----





>Release-Note:
>Audit-Trail:
>Unformatted:
 >System:            n/a
 >Architecture:      n/a
 >Machine:           n/a