Upgrade to v2.3.11

Submitted by:	Josh Tiefenbach <josh@ican.net>

48 files changed, 840 insertions, 144 deletions

diff --git a/databases/db/Makefile b/databases/db/Makefile
index c8764c99ac7d..9e73917fcaf3 100644
--- a/databases/db/Makefile
+++ b/databases/db/Makefile
@@ -3,12 +3,12 @@
 # Date created:				12 Jun 1997
 # Whom:					Josh Tiefenbach <josh@ican.net>
 #
-# $Id: Makefile,v 1.1.1.1 1997/06/13 17:54:36 jfitz Exp $
+# $Id: Makefile,v 1.2 1997/09/05 20:22:04 jfitz Exp $
 #
 
-DISTNAME=	db-2.2.6
+DISTNAME=	db-2.3.11
 CATEGORIES=	databases
-MASTER_SITES=	http://www.bostic.com/db/packages/
+MASTER_SITES=	http://www.sleepycat.com/db/packages/
 
 MAINTAINER=	josh@ican.net
 
@@ -17,11 +17,27 @@ WRKSRC=		${WRKDIR}/${DISTNAME}/build.unix
 GNU_CONFIGURE=	YES
 CONFIGURE_SCRIPT=	../dist/configure
 CONFIGURE_ARGS=		--enable-compat185 \
-			--enable-dump185
+			--enable-dump185 --enable-cxx
 
 MAN1=	db_archive.1 db_checkpoint.1 db_deadlock.1 db_dump.1 db_load.1 \
 	db_recover.1 db_stat.1
-MAN3=	db.3 db_appinit.3 db_cursor.3 db_dbm.3 db_hsearch.3 db_lock.3 \
-	db_log.3 db_mpool.3 db_open.3 db_txn.3
+MAN3=	db_appinit.3 db_cursor.3 db_dbm.3 db_hsearch.3 db_intro.3 db_lock.3 \
+	db_log.3 db_mpool.3 db_open.3 db_txn.3 \
+	Db.3 DbEnv.3 DbException.3 DbInfo.3 DbLock.3 DbLockTab.3 DbLog.3 \
+	DbLsn.3 DbMpool.3 DbMpoolFile.3 DbTxn.3 DbTxnMgr.3 Dbc.3 Dbt.3
+
+post-install:
+	${MKDIR} ${PREFIX}/share/doc/db
+.for doc in hash.usenix.ps libtp.usenix.ps
+	${INSTALL_DATA} ${WRKSRC}/../docs/${doc} ${PREFIX}/share/doc/db
+	gzip -9 ${PREFIX}/share/doc/db/${doc}
+.endfor
+	${MKDIR} ${PREFIX}/share/examples/db
+.for example in README ex_access.c ex_appinit.c ex_btrec.c ex_lock.c ex_mpool.c ex_tpcb.c ex_tpcb.h
+	${INSTALL_DATA} ${WRKSRC}/../examples/${example} ${PREFIX}/share/examples/db
+.endfor
+.for example in AccessExample.cpp AppinitExample.cpp LockExample.cpp MpoolExample.cpp TpcbExample.cpp
+	${INSTALL_DATA} ${WRKSRC}/../examples_cxx/${example} ${PREFIX}/share/examples/db
+.endfor
 
 .include <bsd.port.mk>
diff --git a/databases/db/distinfo b/databases/db/distinfo
index 42958122b19f..eaddc52a9e34 100644
--- a/databases/db/distinfo
+++ b/databases/db/distinfo
@@ -1 +1 @@
-MD5 (db-2.2.6.tar.gz) = 280cecafe8bc046ebdd537a7bbfe3440
+MD5 (db-2.3.11.tar.gz) = 833edf9bada4c4558067fba2f97a55db
diff --git a/databases/db/pkg-descr b/databases/db/pkg-descr
index 01a4bfe0da75..adc0eae33ba5 100644
--- a/databases/db/pkg-descr
+++ b/databases/db/pkg-descr
@@ -1,5 +1,5 @@
-Version 2.0.6 of the Berkeley DB library. This version uses an incompatible
+Version 2.3.11 of the Berkeley DB library. This version uses an incompatible
 underlying database than v1.85 and a different API. Utilities are included in
-the distribution to convert v1.85 databases to v2.0.6.
+the distribution to convert v1.85 databases to v2.3.11
 
-For more information, refer to http://www.bostic.com/db/index.html
+For more information, refer to http://www.sleepycat.com
diff --git a/databases/db/pkg-plist b/databases/db/pkg-plist
index 0c25bca13109..703276f2c7b6 100644
--- a/databases/db/pkg-plist
+++ b/databases/db/pkg-plist
@@ -10,16 +10,30 @@ bin/db_load
 bin/db_recover
 bin/db_stat
 bin/db_dump185
-man/cat3/db.0
 man/cat3/db_appinit.0
 man/cat3/db_cursor.0
 man/cat3/db_dbm.0
 man/cat3/db_hsearch.0
+man/cat3/db_intro.0
 man/cat3/db_lock.0
 man/cat3/db_log.0
 man/cat3/db_mpool.0
 man/cat3/db_open.0
 man/cat3/db_txn.0
+man/cat3/Db.0
+man/cat3/DbEnv.0
+man/cat3/DbException.0
+man/cat3/DbInfo.0
+man/cat3/DbLock.0
+man/cat3/DbLockTab.0
+man/cat3/DbLog.0
+man/cat3/DbLsn.0
+man/cat3/DbMpool.0
+man/cat3/DbMpoolFile.0
+man/cat3/DbTxn.0
+man/cat3/DbTxnMgr.0
+man/cat3/Dbc.0
+man/cat3/Dbt.0
 man/cat1/db_archive.0
 man/cat1/db_checkpoint.0
 man/cat1/db_deadlock.0
@@ -27,16 +41,30 @@ man/cat1/db_dump.0
 man/cat1/db_load.0
 man/cat1/db_recover.0
 man/cat1/db_stat.0
-man/man3/db.3.gz
 man/man3/db_appinit.3.gz
 man/man3/db_cursor.3.gz
 man/man3/db_dbm.3.gz
 man/man3/db_hsearch.3.gz
+man/man3/db_intro.3.gz
 man/man3/db_lock.3.gz
 man/man3/db_log.3.gz
 man/man3/db_mpool.3.gz
 man/man3/db_open.3.gz
 man/man3/db_txn.3.gz
+man/man3/Db.3.gz
+man/man3/DbEnv.3.gz
+man/man3/DbException.3.gz
+man/man3/DbInfo.3.gz
+man/man3/DbLock.3.gz
+man/man3/DbLockTab.3.gz
+man/man3/DbLog.3.gz
+man/man3/DbLsn.3.gz
+man/man3/DbMpool.3.gz
+man/man3/DbMpoolFile.3.gz
+man/man3/DbTxn.3.gz
+man/man3/DbTxnMgr.3.gz
+man/man3/Dbc.3.gz
+man/man3/Dbt.3.gz
 man/man1/db_archive.1.gz
 man/man1/db_checkpoint.1.gz
 man/man1/db_deadlock.1.gz
@@ -44,3 +72,17 @@ man/man1/db_dump.1.gz
 man/man1/db_load.1.gz
 man/man1/db_recover.1.gz
 man/man1/db_stat.1.gz
+share/doc/db/hash.usenix.ps.gz
+share/doc/db/libtp.usenix.ps.gz
+share/examples/db/ex_access.c
+share/examples/db/ex_appinit.c
+share/examples/db/ex_btrec.c
+share/examples/db/ex_lock.c
+share/examples/db/ex_mpool.c
+share/examples/db/ex_tpcb.c
+share/examples/db/ex_tpcb.h
+share/examples/db/AccessExample.cpp
+share/examples/db/AppinitExample.cpp
+share/examples/db/LockExample.cpp
+share/examples/db/MpoolExample.cpp
+share/examples/db/TpcbExample.cpp
diff --git a/databases/db2/Makefile b/databases/db2/Makefile
index c8764c99ac7d..9e73917fcaf3 100644
--- a/databases/db2/Makefile
+++ b/databases/db2/Makefile
@@ -3,12 +3,12 @@
 # Date created:				12 Jun 1997
 # Whom:					Josh Tiefenbach <josh@ican.net>
 #
-# $Id: Makefile,v 1.1.1.1 1997/06/13 17:54:36 jfitz Exp $
+# $Id: Makefile,v 1.2 1997/09/05 20:22:04 jfitz Exp $
 #
 
-DISTNAME=	db-2.2.6
+DISTNAME=	db-2.3.11
 CATEGORIES=	databases
-MASTER_SITES=	http://www.bostic.com/db/packages/
+MASTER_SITES=	http://www.sleepycat.com/db/packages/
 
 MAINTAINER=	josh@ican.net
 
@@ -17,11 +17,27 @@ WRKSRC=		${WRKDIR}/${DISTNAME}/build.unix
 GNU_CONFIGURE=	YES
 CONFIGURE_SCRIPT=	../dist/configure
 CONFIGURE_ARGS=		--enable-compat185 \
-			--enable-dump185
+			--enable-dump185 --enable-cxx
 
 MAN1=	db_archive.1 db_checkpoint.1 db_deadlock.1 db_dump.1 db_load.1 \
 	db_recover.1 db_stat.1
-MAN3=	db.3 db_appinit.3 db_cursor.3 db_dbm.3 db_hsearch.3 db_lock.3 \
-	db_log.3 db_mpool.3 db_open.3 db_txn.3
+MAN3=	db_appinit.3 db_cursor.3 db_dbm.3 db_hsearch.3 db_intro.3 db_lock.3 \
+	db_log.3 db_mpool.3 db_open.3 db_txn.3 \
+	Db.3 DbEnv.3 DbException.3 DbInfo.3 DbLock.3 DbLockTab.3 DbLog.3 \
+	DbLsn.3 DbMpool.3 DbMpoolFile.3 DbTxn.3 DbTxnMgr.3 Dbc.3 Dbt.3
+
+post-install:
+	${MKDIR} ${PREFIX}/share/doc/db
+.for doc in hash.usenix.ps libtp.usenix.ps
+	${INSTALL_DATA} ${WRKSRC}/../docs/${doc} ${PREFIX}/share/doc/db
+	gzip -9 ${PREFIX}/share/doc/db/${doc}
+.endfor
+	${MKDIR} ${PREFIX}/share/examples/db
+.for example in README ex_access.c ex_appinit.c ex_btrec.c ex_lock.c ex_mpool.c ex_tpcb.c ex_tpcb.h
+	${INSTALL_DATA} ${WRKSRC}/../examples/${example} ${PREFIX}/share/examples/db
+.endfor
+.for example in AccessExample.cpp AppinitExample.cpp LockExample.cpp MpoolExample.cpp TpcbExample.cpp
+	${INSTALL_DATA} ${WRKSRC}/../examples_cxx/${example} ${PREFIX}/share/examples/db
+.endfor
 
 .include <bsd.port.mk>
diff --git a/databases/db2/distinfo b/databases/db2/distinfo
index 42958122b19f..eaddc52a9e34 100644
--- a/databases/db2/distinfo
+++ b/databases/db2/distinfo
@@ -1 +1 @@
-MD5 (db-2.2.6.tar.gz) = 280cecafe8bc046ebdd537a7bbfe3440
+MD5 (db-2.3.11.tar.gz) = 833edf9bada4c4558067fba2f97a55db
diff --git a/databases/db2/pkg-descr b/databases/db2/pkg-descr
index 01a4bfe0da75..adc0eae33ba5 100644
--- a/databases/db2/pkg-descr
+++ b/databases/db2/pkg-descr
@@ -1,5 +1,5 @@
-Version 2.0.6 of the Berkeley DB library. This version uses an incompatible
+Version 2.3.11 of the Berkeley DB library. This version uses an incompatible
 underlying database than v1.85 and a different API. Utilities are included in
-the distribution to convert v1.85 databases to v2.0.6.
+the distribution to convert v1.85 databases to v2.3.11
 
-For more information, refer to http://www.bostic.com/db/index.html
+For more information, refer to http://www.sleepycat.com
diff --git a/databases/db2/pkg-plist b/databases/db2/pkg-plist
index 0c25bca13109..703276f2c7b6 100644
--- a/databases/db2/pkg-plist
+++ b/databases/db2/pkg-plist
@@ -10,16 +10,30 @@ bin/db_load
 bin/db_recover
 bin/db_stat
 bin/db_dump185
-man/cat3/db.0
 man/cat3/db_appinit.0
 man/cat3/db_cursor.0
 man/cat3/db_dbm.0
 man/cat3/db_hsearch.0
+man/cat3/db_intro.0
 man/cat3/db_lock.0
 man/cat3/db_log.0
 man/cat3/db_mpool.0
 man/cat3/db_open.0
 man/cat3/db_txn.0
+man/cat3/Db.0
+man/cat3/DbEnv.0
+man/cat3/DbException.0
+man/cat3/DbInfo.0
+man/cat3/DbLock.0
+man/cat3/DbLockTab.0
+man/cat3/DbLog.0
+man/cat3/DbLsn.0
+man/cat3/DbMpool.0
+man/cat3/DbMpoolFile.0
+man/cat3/DbTxn.0
+man/cat3/DbTxnMgr.0
+man/cat3/Dbc.0
+man/cat3/Dbt.0
 man/cat1/db_archive.0
 man/cat1/db_checkpoint.0
 man/cat1/db_deadlock.0
@@ -27,16 +41,30 @@ man/cat1/db_dump.0
 man/cat1/db_load.0
 man/cat1/db_recover.0
 man/cat1/db_stat.0
-man/man3/db.3.gz
 man/man3/db_appinit.3.gz
 man/man3/db_cursor.3.gz
 man/man3/db_dbm.3.gz
 man/man3/db_hsearch.3.gz
+man/man3/db_intro.3.gz
 man/man3/db_lock.3.gz
 man/man3/db_log.3.gz
 man/man3/db_mpool.3.gz
 man/man3/db_open.3.gz
 man/man3/db_txn.3.gz
+man/man3/Db.3.gz
+man/man3/DbEnv.3.gz
+man/man3/DbException.3.gz
+man/man3/DbInfo.3.gz
+man/man3/DbLock.3.gz
+man/man3/DbLockTab.3.gz
+man/man3/DbLog.3.gz
+man/man3/DbLsn.3.gz
+man/man3/DbMpool.3.gz
+man/man3/DbMpoolFile.3.gz
+man/man3/DbTxn.3.gz
+man/man3/DbTxnMgr.3.gz
+man/man3/Dbc.3.gz
+man/man3/Dbt.3.gz
 man/man1/db_archive.1.gz
 man/man1/db_checkpoint.1.gz
 man/man1/db_deadlock.1.gz
@@ -44,3 +72,17 @@ man/man1/db_dump.1.gz
 man/man1/db_load.1.gz
 man/man1/db_recover.1.gz
 man/man1/db_stat.1.gz
+share/doc/db/hash.usenix.ps.gz
+share/doc/db/libtp.usenix.ps.gz
+share/examples/db/ex_access.c
+share/examples/db/ex_appinit.c
+share/examples/db/ex_btrec.c
+share/examples/db/ex_lock.c
+share/examples/db/ex_mpool.c
+share/examples/db/ex_tpcb.c
+share/examples/db/ex_tpcb.h
+share/examples/db/AccessExample.cpp
+share/examples/db/AppinitExample.cpp
+share/examples/db/LockExample.cpp
+share/examples/db/MpoolExample.cpp
+share/examples/db/TpcbExample.cpp
diff --git a/databases/db3/Makefile b/databases/db3/Makefile
index c8764c99ac7d..9e73917fcaf3 100644
--- a/databases/db3/Makefile
+++ b/databases/db3/Makefile
@@ -3,12 +3,12 @@
 # Date created:				12 Jun 1997
 # Whom:					Josh Tiefenbach <josh@ican.net>
 #
-# $Id: Makefile,v 1.1.1.1 1997/06/13 17:54:36 jfitz Exp $
+# $Id: Makefile,v 1.2 1997/09/05 20:22:04 jfitz Exp $
 #
 
-DISTNAME=	db-2.2.6
+DISTNAME=	db-2.3.11
 CATEGORIES=	databases
-MASTER_SITES=	http://www.bostic.com/db/packages/
+MASTER_SITES=	http://www.sleepycat.com/db/packages/
 
 MAINTAINER=	josh@ican.net
 
@@ -17,11 +17,27 @@ WRKSRC=		${WRKDIR}/${DISTNAME}/build.unix
 GNU_CONFIGURE=	YES
 CONFIGURE_SCRIPT=	../dist/configure
 CONFIGURE_ARGS=		--enable-compat185 \
-			--enable-dump185
+			--enable-dump185 --enable-cxx
 
 MAN1=	db_archive.1 db_checkpoint.1 db_deadlock.1 db_dump.1 db_load.1 \
 	db_recover.1 db_stat.1
-MAN3=	db.3 db_appinit.3 db_cursor.3 db_dbm.3 db_hsearch.3 db_lock.3 \
-	db_log.3 db_mpool.3 db_open.3 db_txn.3
+MAN3=	db_appinit.3 db_cursor.3 db_dbm.3 db_hsearch.3 db_intro.3 db_lock.3 \
+	db_log.3 db_mpool.3 db_open.3 db_txn.3 \
+	Db.3 DbEnv.3 DbException.3 DbInfo.3 DbLock.3 DbLockTab.3 DbLog.3 \
+	DbLsn.3 DbMpool.3 DbMpoolFile.3 DbTxn.3 DbTxnMgr.3 Dbc.3 Dbt.3
+
+post-install:
+	${MKDIR} ${PREFIX}/share/doc/db
+.for doc in hash.usenix.ps libtp.usenix.ps
+	${INSTALL_DATA} ${WRKSRC}/../docs/${doc} ${PREFIX}/share/doc/db
+	gzip -9 ${PREFIX}/share/doc/db/${doc}
+.endfor
+	${MKDIR} ${PREFIX}/share/examples/db
+.for example in README ex_access.c ex_appinit.c ex_btrec.c ex_lock.c ex_mpool.c ex_tpcb.c ex_tpcb.h
+	${INSTALL_DATA} ${WRKSRC}/../examples/${example} ${PREFIX}/share/examples/db
+.endfor
+.for example in AccessExample.cpp AppinitExample.cpp LockExample.cpp MpoolExample.cpp TpcbExample.cpp
+	${INSTALL_DATA} ${WRKSRC}/../examples_cxx/${example} ${PREFIX}/share/examples/db
+.endfor
 
 .include <bsd.port.mk>
diff --git a/databases/db3/distinfo b/databases/db3/distinfo
index 42958122b19f..eaddc52a9e34 100644
--- a/databases/db3/distinfo
+++ b/databases/db3/distinfo
@@ -1 +1 @@
-MD5 (db-2.2.6.tar.gz) = 280cecafe8bc046ebdd537a7bbfe3440
+MD5 (db-2.3.11.tar.gz) = 833edf9bada4c4558067fba2f97a55db
diff --git a/databases/db3/pkg-descr b/databases/db3/pkg-descr
index 01a4bfe0da75..adc0eae33ba5 100644
--- a/databases/db3/pkg-descr
+++ b/databases/db3/pkg-descr
@@ -1,5 +1,5 @@
-Version 2.0.6 of the Berkeley DB library. This version uses an incompatible
+Version 2.3.11 of the Berkeley DB library. This version uses an incompatible
 underlying database than v1.85 and a different API. Utilities are included in
-the distribution to convert v1.85 databases to v2.0.6.
+the distribution to convert v1.85 databases to v2.3.11
 
-For more information, refer to http://www.bostic.com/db/index.html
+For more information, refer to http://www.sleepycat.com
diff --git a/databases/db3/pkg-plist b/databases/db3/pkg-plist
index 0c25bca13109..703276f2c7b6 100644
--- a/databases/db3/pkg-plist
+++ b/databases/db3/pkg-plist
@@ -10,16 +10,30 @@ bin/db_load
 bin/db_recover
 bin/db_stat
 bin/db_dump185
-man/cat3/db.0
 man/cat3/db_appinit.0
 man/cat3/db_cursor.0
 man/cat3/db_dbm.0
 man/cat3/db_hsearch.0
+man/cat3/db_intro.0
 man/cat3/db_lock.0
 man/cat3/db_log.0
 man/cat3/db_mpool.0
 man/cat3/db_open.0
 man/cat3/db_txn.0
+man/cat3/Db.0
+man/cat3/DbEnv.0
+man/cat3/DbException.0
+man/cat3/DbInfo.0
+man/cat3/DbLock.0
+man/cat3/DbLockTab.0
+man/cat3/DbLog.0
+man/cat3/DbLsn.0
+man/cat3/DbMpool.0
+man/cat3/DbMpoolFile.0
+man/cat3/DbTxn.0
+man/cat3/DbTxnMgr.0
+man/cat3/Dbc.0
+man/cat3/Dbt.0
 man/cat1/db_archive.0
 man/cat1/db_checkpoint.0
 man/cat1/db_deadlock.0
@@ -27,16 +41,30 @@ man/cat1/db_dump.0
 man/cat1/db_load.0
 man/cat1/db_recover.0
 man/cat1/db_stat.0
-man/man3/db.3.gz
 man/man3/db_appinit.3.gz
 man/man3/db_cursor.3.gz
 man/man3/db_dbm.3.gz
 man/man3/db_hsearch.3.gz
+man/man3/db_intro.3.gz
 man/man3/db_lock.3.gz
 man/man3/db_log.3.gz
 man/man3/db_mpool.3.gz
 man/man3/db_open.3.gz
 man/man3/db_txn.3.gz
+man/man3/Db.3.gz
+man/man3/DbEnv.3.gz
+man/man3/DbException.3.gz
+man/man3/DbInfo.3.gz
+man/man3/DbLock.3.gz
+man/man3/DbLockTab.3.gz
+man/man3/DbLog.3.gz
+man/man3/DbLsn.3.gz
+man/man3/DbMpool.3.gz
+man/man3/DbMpoolFile.3.gz
+man/man3/DbTxn.3.gz
+man/man3/DbTxnMgr.3.gz
+man/man3/Dbc.3.gz
+man/man3/Dbt.3.gz
 man/man1/db_archive.1.gz
 man/man1/db_checkpoint.1.gz
 man/man1/db_deadlock.1.gz
@@ -44,3 +72,17 @@ man/man1/db_dump.1.gz
 man/man1/db_load.1.gz
 man/man1/db_recover.1.gz
 man/man1/db_stat.1.gz
+share/doc/db/hash.usenix.ps.gz
+share/doc/db/libtp.usenix.ps.gz
+share/examples/db/ex_access.c
+share/examples/db/ex_appinit.c
+share/examples/db/ex_btrec.c
+share/examples/db/ex_lock.c
+share/examples/db/ex_mpool.c
+share/examples/db/ex_tpcb.c
+share/examples/db/ex_tpcb.h
+share/examples/db/AccessExample.cpp
+share/examples/db/AppinitExample.cpp
+share/examples/db/LockExample.cpp
+share/examples/db/MpoolExample.cpp
+share/examples/db/TpcbExample.cpp
diff --git a/databases/db33/Makefile b/databases/db33/Makefile
index c8764c99ac7d..9e73917fcaf3 100644
--- a/databases/db33/Makefile
+++ b/databases/db33/Makefile
@@ -3,12 +3,12 @@
 # Date created:				12 Jun 1997
 # Whom:					Josh Tiefenbach <josh@ican.net>
 #
-# $Id: Makefile,v 1.1.1.1 1997/06/13 17:54:36 jfitz Exp $
+# $Id: Makefile,v 1.2 1997/09/05 20:22:04 jfitz Exp $
 #
 
-DISTNAME=	db-2.2.6
+DISTNAME=	db-2.3.11
 CATEGORIES=	databases
-MASTER_SITES=	http://www.bostic.com/db/packages/
+MASTER_SITES=	http://www.sleepycat.com/db/packages/
 
 MAINTAINER=	josh@ican.net
 
@@ -17,11 +17,27 @@ WRKSRC=		${WRKDIR}/${DISTNAME}/build.unix
 GNU_CONFIGURE=	YES
 CONFIGURE_SCRIPT=	../dist/configure
 CONFIGURE_ARGS=		--enable-compat185 \
-			--enable-dump185
+			--enable-dump185 --enable-cxx
 
 MAN1=	db_archive.1 db_checkpoint.1 db_deadlock.1 db_dump.1 db_load.1 \
 	db_recover.1 db_stat.1
-MAN3=	db.3 db_appinit.3 db_cursor.3 db_dbm.3 db_hsearch.3 db_lock.3 \
-	db_log.3 db_mpool.3 db_open.3 db_txn.3
+MAN3=	db_appinit.3 db_cursor.3 db_dbm.3 db_hsearch.3 db_intro.3 db_lock.3 \
+	db_log.3 db_mpool.3 db_open.3 db_txn.3 \
+	Db.3 DbEnv.3 DbException.3 DbInfo.3 DbLock.3 DbLockTab.3 DbLog.3 \
+	DbLsn.3 DbMpool.3 DbMpoolFile.3 DbTxn.3 DbTxnMgr.3 Dbc.3 Dbt.3
+
+post-install:
+	${MKDIR} ${PREFIX}/share/doc/db
+.for doc in hash.usenix.ps libtp.usenix.ps
+	${INSTALL_DATA} ${WRKSRC}/../docs/${doc} ${PREFIX}/share/doc/db
+	gzip -9 ${PREFIX}/share/doc/db/${doc}
+.endfor
+	${MKDIR} ${PREFIX}/share/examples/db
+.for example in README ex_access.c ex_appinit.c ex_btrec.c ex_lock.c ex_mpool.c ex_tpcb.c ex_tpcb.h
+	${INSTALL_DATA} ${WRKSRC}/../examples/${example} ${PREFIX}/share/examples/db
+.endfor
+.for example in AccessExample.cpp AppinitExample.cpp LockExample.cpp MpoolExample.cpp TpcbExample.cpp
+	${INSTALL_DATA} ${WRKSRC}/../examples_cxx/${example} ${PREFIX}/share/examples/db
+.endfor
 
 .include <bsd.port.mk>
diff --git a/databases/db33/distinfo b/databases/db33/distinfo
index 42958122b19f..eaddc52a9e34 100644
--- a/databases/db33/distinfo
+++ b/databases/db33/distinfo
@@ -1 +1 @@
-MD5 (db-2.2.6.tar.gz) = 280cecafe8bc046ebdd537a7bbfe3440
+MD5 (db-2.3.11.tar.gz) = 833edf9bada4c4558067fba2f97a55db
diff --git a/databases/db33/pkg-descr b/databases/db33/pkg-descr
index 01a4bfe0da75..adc0eae33ba5 100644
--- a/databases/db33/pkg-descr
+++ b/databases/db33/pkg-descr
@@ -1,5 +1,5 @@
-Version 2.0.6 of the Berkeley DB library. This version uses an incompatible
+Version 2.3.11 of the Berkeley DB library. This version uses an incompatible
 underlying database than v1.85 and a different API. Utilities are included in
-the distribution to convert v1.85 databases to v2.0.6.
+the distribution to convert v1.85 databases to v2.3.11
 
-For more information, refer to http://www.bostic.com/db/index.html
+For more information, refer to http://www.sleepycat.com
diff --git a/databases/db33/pkg-plist b/databases/db33/pkg-plist
index 0c25bca13109..703276f2c7b6 100644
--- a/databases/db33/pkg-plist
+++ b/databases/db33/pkg-plist
@@ -10,16 +10,30 @@ bin/db_load
 bin/db_recover
 bin/db_stat
 bin/db_dump185
-man/cat3/db.0
 man/cat3/db_appinit.0
 man/cat3/db_cursor.0
 man/cat3/db_dbm.0
 man/cat3/db_hsearch.0
+man/cat3/db_intro.0
 man/cat3/db_lock.0
 man/cat3/db_log.0
 man/cat3/db_mpool.0
 man/cat3/db_open.0
 man/cat3/db_txn.0
+man/cat3/Db.0
+man/cat3/DbEnv.0
+man/cat3/DbException.0
+man/cat3/DbInfo.0
+man/cat3/DbLock.0
+man/cat3/DbLockTab.0
+man/cat3/DbLog.0
+man/cat3/DbLsn.0
+man/cat3/DbMpool.0
+man/cat3/DbMpoolFile.0
+man/cat3/DbTxn.0
+man/cat3/DbTxnMgr.0
+man/cat3/Dbc.0
+man/cat3/Dbt.0
 man/cat1/db_archive.0
 man/cat1/db_checkpoint.0
 man/cat1/db_deadlock.0
@@ -27,16 +41,30 @@ man/cat1/db_dump.0
 man/cat1/db_load.0
 man/cat1/db_recover.0
 man/cat1/db_stat.0
-man/man3/db.3.gz
 man/man3/db_appinit.3.gz
 man/man3/db_cursor.3.gz
 man/man3/db_dbm.3.gz
 man/man3/db_hsearch.3.gz
+man/man3/db_intro.3.gz
 man/man3/db_lock.3.gz
 man/man3/db_log.3.gz
 man/man3/db_mpool.3.gz
 man/man3/db_open.3.gz
 man/man3/db_txn.3.gz
+man/man3/Db.3.gz
+man/man3/DbEnv.3.gz
+man/man3/DbException.3.gz
+man/man3/DbInfo.3.gz
+man/man3/DbLock.3.gz
+man/man3/DbLockTab.3.gz
+man/man3/DbLog.3.gz
+man/man3/DbLsn.3.gz
+man/man3/DbMpool.3.gz
+man/man3/DbMpoolFile.3.gz
+man/man3/DbTxn.3.gz
+man/man3/DbTxnMgr.3.gz
+man/man3/Dbc.3.gz
+man/man3/Dbt.3.gz
 man/man1/db_archive.1.gz
 man/man1/db_checkpoint.1.gz
 man/man1/db_deadlock.1.gz
@@ -44,3 +72,17 @@ man/man1/db_dump.1.gz
 man/man1/db_load.1.gz
 man/man1/db_recover.1.gz
 man/man1/db_stat.1.gz
+share/doc/db/hash.usenix.ps.gz
+share/doc/db/libtp.usenix.ps.gz
+share/examples/db/ex_access.c
+share/examples/db/ex_appinit.c
+share/examples/db/ex_btrec.c
+share/examples/db/ex_lock.c
+share/examples/db/ex_mpool.c
+share/examples/db/ex_tpcb.c
+share/examples/db/ex_tpcb.h
+share/examples/db/AccessExample.cpp
+share/examples/db/AppinitExample.cpp
+share/examples/db/LockExample.cpp
+share/examples/db/MpoolExample.cpp
+share/examples/db/TpcbExample.cpp
diff --git a/databases/db4/Makefile b/databases/db4/Makefile
index c8764c99ac7d..9e73917fcaf3 100644
--- a/databases/db4/Makefile
+++ b/databases/db4/Makefile
@@ -3,12 +3,12 @@
 # Date created:				12 Jun 1997
 # Whom:					Josh Tiefenbach <josh@ican.net>
 #
-# $Id: Makefile,v 1.1.1.1 1997/06/13 17:54:36 jfitz Exp $
+# $Id: Makefile,v 1.2 1997/09/05 20:22:04 jfitz Exp $
 #
 
-DISTNAME=	db-2.2.6
+DISTNAME=	db-2.3.11
 CATEGORIES=	databases
-MASTER_SITES=	http://www.bostic.com/db/packages/
+MASTER_SITES=	http://www.sleepycat.com/db/packages/
 
 MAINTAINER=	josh@ican.net
 
@@ -17,11 +17,27 @@ WRKSRC=		${WRKDIR}/${DISTNAME}/build.unix
 GNU_CONFIGURE=	YES
 CONFIGURE_SCRIPT=	../dist/configure
 CONFIGURE_ARGS=		--enable-compat185 \
-			--enable-dump185
+			--enable-dump185 --enable-cxx
 
 MAN1=	db_archive.1 db_checkpoint.1 db_deadlock.1 db_dump.1 db_load.1 \
 	db_recover.1 db_stat.1
-MAN3=	db.3 db_appinit.3 db_cursor.3 db_dbm.3 db_hsearch.3 db_lock.3 \
-	db_log.3 db_mpool.3 db_open.3 db_txn.3
+MAN3=	db_appinit.3 db_cursor.3 db_dbm.3 db_hsearch.3 db_intro.3 db_lock.3 \
+	db_log.3 db_mpool.3 db_open.3 db_txn.3 \
+	Db.3 DbEnv.3 DbException.3 DbInfo.3 DbLock.3 DbLockTab.3 DbLog.3 \
+	DbLsn.3 DbMpool.3 DbMpoolFile.3 DbTxn.3 DbTxnMgr.3 Dbc.3 Dbt.3
+
+post-install:
+	${MKDIR} ${PREFIX}/share/doc/db
+.for doc in hash.usenix.ps libtp.usenix.ps
+	${INSTALL_DATA} ${WRKSRC}/../docs/${doc} ${PREFIX}/share/doc/db
+	gzip -9 ${PREFIX}/share/doc/db/${doc}
+.endfor
+	${MKDIR} ${PREFIX}/share/examples/db
+.for example in README ex_access.c ex_appinit.c ex_btrec.c ex_lock.c ex_mpool.c ex_tpcb.c ex_tpcb.h
+	${INSTALL_DATA} ${WRKSRC}/../examples/${example} ${PREFIX}/share/examples/db
+.endfor
+.for example in AccessExample.cpp AppinitExample.cpp LockExample.cpp MpoolExample.cpp TpcbExample.cpp
+	${INSTALL_DATA} ${WRKSRC}/../examples_cxx/${example} ${PREFIX}/share/examples/db
+.endfor
 
 .include <bsd.port.mk>
diff --git a/databases/db4/distinfo b/databases/db4/distinfo
index 42958122b19f..eaddc52a9e34 100644
--- a/databases/db4/distinfo
+++ b/databases/db4/distinfo
@@ -1 +1 @@
-MD5 (db-2.2.6.tar.gz) = 280cecafe8bc046ebdd537a7bbfe3440
+MD5 (db-2.3.11.tar.gz) = 833edf9bada4c4558067fba2f97a55db
diff --git a/databases/db4/pkg-descr b/databases/db4/pkg-descr
index 01a4bfe0da75..adc0eae33ba5 100644
--- a/databases/db4/pkg-descr
+++ b/databases/db4/pkg-descr
@@ -1,5 +1,5 @@
-Version 2.0.6 of the Berkeley DB library. This version uses an incompatible
+Version 2.3.11 of the Berkeley DB library. This version uses an incompatible
 underlying database than v1.85 and a different API. Utilities are included in
-the distribution to convert v1.85 databases to v2.0.6.
+the distribution to convert v1.85 databases to v2.3.11
 
-For more information, refer to http://www.bostic.com/db/index.html
+For more information, refer to http://www.sleepycat.com
diff --git a/databases/db4/pkg-plist b/databases/db4/pkg-plist
index 0c25bca13109..703276f2c7b6 100644
--- a/databases/db4/pkg-plist
+++ b/databases/db4/pkg-plist
@@ -10,16 +10,30 @@ bin/db_load
 bin/db_recover
 bin/db_stat
 bin/db_dump185
-man/cat3/db.0
 man/cat3/db_appinit.0
 man/cat3/db_cursor.0
 man/cat3/db_dbm.0
 man/cat3/db_hsearch.0
+man/cat3/db_intro.0
 man/cat3/db_lock.0
 man/cat3/db_log.0
 man/cat3/db_mpool.0
 man/cat3/db_open.0
 man/cat3/db_txn.0
+man/cat3/Db.0
+man/cat3/DbEnv.0
+man/cat3/DbException.0
+man/cat3/DbInfo.0
+man/cat3/DbLock.0
+man/cat3/DbLockTab.0
+man/cat3/DbLog.0
+man/cat3/DbLsn.0
+man/cat3/DbMpool.0
+man/cat3/DbMpoolFile.0
+man/cat3/DbTxn.0
+man/cat3/DbTxnMgr.0
+man/cat3/Dbc.0
+man/cat3/Dbt.0
 man/cat1/db_archive.0
 man/cat1/db_checkpoint.0
 man/cat1/db_deadlock.0
@@ -27,16 +41,30 @@ man/cat1/db_dump.0
 man/cat1/db_load.0
 man/cat1/db_recover.0
 man/cat1/db_stat.0
-man/man3/db.3.gz
 man/man3/db_appinit.3.gz
 man/man3/db_cursor.3.gz
 man/man3/db_dbm.3.gz
 man/man3/db_hsearch.3.gz
+man/man3/db_intro.3.gz
 man/man3/db_lock.3.gz
 man/man3/db_log.3.gz
 man/man3/db_mpool.3.gz
 man/man3/db_open.3.gz
 man/man3/db_txn.3.gz
+man/man3/Db.3.gz
+man/man3/DbEnv.3.gz
+man/man3/DbException.3.gz
+man/man3/DbInfo.3.gz
+man/man3/DbLock.3.gz
+man/man3/DbLockTab.3.gz
+man/man3/DbLog.3.gz
+man/man3/DbLsn.3.gz
+man/man3/DbMpool.3.gz
+man/man3/DbMpoolFile.3.gz
+man/man3/DbTxn.3.gz
+man/man3/DbTxnMgr.3.gz
+man/man3/Dbc.3.gz
+man/man3/Dbt.3.gz
 man/man1/db_archive.1.gz
 man/man1/db_checkpoint.1.gz
 man/man1/db_deadlock.1.gz
@@ -44,3 +72,17 @@ man/man1/db_dump.1.gz
 man/man1/db_load.1.gz
 man/man1/db_recover.1.gz
 man/man1/db_stat.1.gz
+share/doc/db/hash.usenix.ps.gz
+share/doc/db/libtp.usenix.ps.gz
+share/examples/db/ex_access.c
+share/examples/db/ex_appinit.c
+share/examples/db/ex_btrec.c
+share/examples/db/ex_lock.c
+share/examples/db/ex_mpool.c
+share/examples/db/ex_tpcb.c
+share/examples/db/ex_tpcb.h
+share/examples/db/AccessExample.cpp
+share/examples/db/AppinitExample.cpp
+share/examples/db/LockExample.cpp
+share/examples/db/MpoolExample.cpp
+share/examples/db/TpcbExample.cpp
diff --git a/databases/db41/Makefile b/databases/db41/Makefile
index c8764c99ac7d..9e73917fcaf3 100644
--- a/databases/db41/Makefile
+++ b/databases/db41/Makefile
@@ -3,12 +3,12 @@
 # Date created:				12 Jun 1997
 # Whom:					Josh Tiefenbach <josh@ican.net>
 #
-# $Id: Makefile,v 1.1.1.1 1997/06/13 17:54:36 jfitz Exp $
+# $Id: Makefile,v 1.2 1997/09/05 20:22:04 jfitz Exp $
 #
 
-DISTNAME=	db-2.2.6
+DISTNAME=	db-2.3.11
 CATEGORIES=	databases
-MASTER_SITES=	http://www.bostic.com/db/packages/
+MASTER_SITES=	http://www.sleepycat.com/db/packages/
 
 MAINTAINER=	josh@ican.net
 
@@ -17,11 +17,27 @@ WRKSRC=		${WRKDIR}/${DISTNAME}/build.unix
 GNU_CONFIGURE=	YES
 CONFIGURE_SCRIPT=	../dist/configure
 CONFIGURE_ARGS=		--enable-compat185 \
-			--enable-dump185
+			--enable-dump185 --enable-cxx
 
 MAN1=	db_archive.1 db_checkpoint.1 db_deadlock.1 db_dump.1 db_load.1 \
 	db_recover.1 db_stat.1
-MAN3=	db.3 db_appinit.3 db_cursor.3 db_dbm.3 db_hsearch.3 db_lock.3 \
-	db_log.3 db_mpool.3 db_open.3 db_txn.3
+MAN3=	db_appinit.3 db_cursor.3 db_dbm.3 db_hsearch.3 db_intro.3 db_lock.3 \
+	db_log.3 db_mpool.3 db_open.3 db_txn.3 \
+	Db.3 DbEnv.3 DbException.3 DbInfo.3 DbLock.3 DbLockTab.3 DbLog.3 \
+	DbLsn.3 DbMpool.3 DbMpoolFile.3 DbTxn.3 DbTxnMgr.3 Dbc.3 Dbt.3
+
+post-install:
+	${MKDIR} ${PREFIX}/share/doc/db
+.for doc in hash.usenix.ps libtp.usenix.ps
+	${INSTALL_DATA} ${WRKSRC}/../docs/${doc} ${PREFIX}/share/doc/db
+	gzip -9 ${PREFIX}/share/doc/db/${doc}
+.endfor
+	${MKDIR} ${PREFIX}/share/examples/db
+.for example in README ex_access.c ex_appinit.c ex_btrec.c ex_lock.c ex_mpool.c ex_tpcb.c ex_tpcb.h
+	${INSTALL_DATA} ${WRKSRC}/../examples/${example} ${PREFIX}/share/examples/db
+.endfor
+.for example in AccessExample.cpp AppinitExample.cpp LockExample.cpp MpoolExample.cpp TpcbExample.cpp
+	${INSTALL_DATA} ${WRKSRC}/../examples_cxx/${example} ${PREFIX}/share/examples/db
+.endfor
 
 .include <bsd.port.mk>
diff --git a/databases/db41/distinfo b/databases/db41/distinfo
index 42958122b19f..eaddc52a9e34 100644
--- a/databases/db41/distinfo
+++ b/databases/db41/distinfo
@@ -1 +1 @@
-MD5 (db-2.2.6.tar.gz) = 280cecafe8bc046ebdd537a7bbfe3440
+MD5 (db-2.3.11.tar.gz) = 833edf9bada4c4558067fba2f97a55db
diff --git a/databases/db41/pkg-descr b/databases/db41/pkg-descr
index 01a4bfe0da75..adc0eae33ba5 100644
--- a/databases/db41/pkg-descr
+++ b/databases/db41/pkg-descr
@@ -1,5 +1,5 @@
-Version 2.0.6 of the Berkeley DB library. This version uses an incompatible
+Version 2.3.11 of the Berkeley DB library. This version uses an incompatible
 underlying database than v1.85 and a different API. Utilities are included in
-the distribution to convert v1.85 databases to v2.0.6.
+the distribution to convert v1.85 databases to v2.3.11
 
-For more information, refer to http://www.bostic.com/db/index.html
+For more information, refer to http://www.sleepycat.com
diff --git a/databases/db41/pkg-plist b/databases/db41/pkg-plist
index 0c25bca13109..703276f2c7b6 100644
--- a/databases/db41/pkg-plist
+++ b/databases/db41/pkg-plist
@@ -10,16 +10,30 @@ bin/db_load
 bin/db_recover
 bin/db_stat
 bin/db_dump185
-man/cat3/db.0
 man/cat3/db_appinit.0
 man/cat3/db_cursor.0
 man/cat3/db_dbm.0
 man/cat3/db_hsearch.0
+man/cat3/db_intro.0
 man/cat3/db_lock.0
 man/cat3/db_log.0
 man/cat3/db_mpool.0
 man/cat3/db_open.0
 man/cat3/db_txn.0
+man/cat3/Db.0
+man/cat3/DbEnv.0
+man/cat3/DbException.0
+man/cat3/DbInfo.0
+man/cat3/DbLock.0
+man/cat3/DbLockTab.0
+man/cat3/DbLog.0
+man/cat3/DbLsn.0
+man/cat3/DbMpool.0
+man/cat3/DbMpoolFile.0
+man/cat3/DbTxn.0
+man/cat3/DbTxnMgr.0
+man/cat3/Dbc.0
+man/cat3/Dbt.0
 man/cat1/db_archive.0
 man/cat1/db_checkpoint.0
 man/cat1/db_deadlock.0
@@ -27,16 +41,30 @@ man/cat1/db_dump.0
 man/cat1/db_load.0
 man/cat1/db_recover.0
 man/cat1/db_stat.0
-man/man3/db.3.gz
 man/man3/db_appinit.3.gz
 man/man3/db_cursor.3.gz
 man/man3/db_dbm.3.gz
 man/man3/db_hsearch.3.gz
+man/man3/db_intro.3.gz
 man/man3/db_lock.3.gz
 man/man3/db_log.3.gz
 man/man3/db_mpool.3.gz
 man/man3/db_open.3.gz
 man/man3/db_txn.3.gz
+man/man3/Db.3.gz
+man/man3/DbEnv.3.gz
+man/man3/DbException.3.gz
+man/man3/DbInfo.3.gz
+man/man3/DbLock.3.gz
+man/man3/DbLockTab.3.gz
+man/man3/DbLog.3.gz
+man/man3/DbLsn.3.gz
+man/man3/DbMpool.3.gz
+man/man3/DbMpoolFile.3.gz
+man/man3/DbTxn.3.gz
+man/man3/DbTxnMgr.3.gz
+man/man3/Dbc.3.gz
+man/man3/Dbt.3.gz
 man/man1/db_archive.1.gz
 man/man1/db_checkpoint.1.gz
 man/man1/db_deadlock.1.gz
@@ -44,3 +72,17 @@ man/man1/db_dump.1.gz
 man/man1/db_load.1.gz
 man/man1/db_recover.1.gz
 man/man1/db_stat.1.gz
+share/doc/db/hash.usenix.ps.gz
+share/doc/db/libtp.usenix.ps.gz
+share/examples/db/ex_access.c
+share/examples/db/ex_appinit.c
+share/examples/db/ex_btrec.c
+share/examples/db/ex_lock.c
+share/examples/db/ex_mpool.c
+share/examples/db/ex_tpcb.c
+share/examples/db/ex_tpcb.h
+share/examples/db/AccessExample.cpp
+share/examples/db/AppinitExample.cpp
+share/examples/db/LockExample.cpp
+share/examples/db/MpoolExample.cpp
+share/examples/db/TpcbExample.cpp
diff --git a/databases/db42/Makefile b/databases/db42/Makefile
index c8764c99ac7d..9e73917fcaf3 100644
--- a/databases/db42/Makefile
+++ b/databases/db42/Makefile
@@ -3,12 +3,12 @@
 # Date created:				12 Jun 1997
 # Whom:					Josh Tiefenbach <josh@ican.net>
 #
-# $Id: Makefile,v 1.1.1.1 1997/06/13 17:54:36 jfitz Exp $
+# $Id: Makefile,v 1.2 1997/09/05 20:22:04 jfitz Exp $
 #
 
-DISTNAME=	db-2.2.6
+DISTNAME=	db-2.3.11
 CATEGORIES=	databases
-MASTER_SITES=	http://www.bostic.com/db/packages/
+MASTER_SITES=	http://www.sleepycat.com/db/packages/
 
 MAINTAINER=	josh@ican.net
 
@@ -17,11 +17,27 @@ WRKSRC=		${WRKDIR}/${DISTNAME}/build.unix
 GNU_CONFIGURE=	YES
 CONFIGURE_SCRIPT=	../dist/configure
 CONFIGURE_ARGS=		--enable-compat185 \
-			--enable-dump185
+			--enable-dump185 --enable-cxx
 
 MAN1=	db_archive.1 db_checkpoint.1 db_deadlock.1 db_dump.1 db_load.1 \
 	db_recover.1 db_stat.1
-MAN3=	db.3 db_appinit.3 db_cursor.3 db_dbm.3 db_hsearch.3 db_lock.3 \
-	db_log.3 db_mpool.3 db_open.3 db_txn.3
+MAN3=	db_appinit.3 db_cursor.3 db_dbm.3 db_hsearch.3 db_intro.3 db_lock.3 \
+	db_log.3 db_mpool.3 db_open.3 db_txn.3 \
+	Db.3 DbEnv.3 DbException.3 DbInfo.3 DbLock.3 DbLockTab.3 DbLog.3 \
+	DbLsn.3 DbMpool.3 DbMpoolFile.3 DbTxn.3 DbTxnMgr.3 Dbc.3 Dbt.3
+
+post-install:
+	${MKDIR} ${PREFIX}/share/doc/db
+.for doc in hash.usenix.ps libtp.usenix.ps
+	${INSTALL_DATA} ${WRKSRC}/../docs/${doc} ${PREFIX}/share/doc/db
+	gzip -9 ${PREFIX}/share/doc/db/${doc}
+.endfor
+	${MKDIR} ${PREFIX}/share/examples/db
+.for example in README ex_access.c ex_appinit.c ex_btrec.c ex_lock.c ex_mpool.c ex_tpcb.c ex_tpcb.h
+	${INSTALL_DATA} ${WRKSRC}/../examples/${example} ${PREFIX}/share/examples/db
+.endfor
+.for example in AccessExample.cpp AppinitExample.cpp LockExample.cpp MpoolExample.cpp TpcbExample.cpp
+	${INSTALL_DATA} ${WRKSRC}/../examples_cxx/${example} ${PREFIX}/share/examples/db
+.endfor
 
 .include <bsd.port.mk>
diff --git a/databases/db42/distinfo b/databases/db42/distinfo
index 42958122b19f..eaddc52a9e34 100644
--- a/databases/db42/distinfo
+++ b/databases/db42/distinfo
@@ -1 +1 @@
-MD5 (db-2.2.6.tar.gz) = 280cecafe8bc046ebdd537a7bbfe3440
+MD5 (db-2.3.11.tar.gz) = 833edf9bada4c4558067fba2f97a55db
diff --git a/databases/db42/pkg-descr b/databases/db42/pkg-descr
index 01a4bfe0da75..adc0eae33ba5 100644
--- a/databases/db42/pkg-descr
+++ b/databases/db42/pkg-descr
@@ -1,5 +1,5 @@
-Version 2.0.6 of the Berkeley DB library. This version uses an incompatible
+Version 2.3.11 of the Berkeley DB library. This version uses an incompatible
 underlying database than v1.85 and a different API. Utilities are included in
-the distribution to convert v1.85 databases to v2.0.6.
+the distribution to convert v1.85 databases to v2.3.11
 
-For more information, refer to http://www.bostic.com/db/index.html
+For more information, refer to http://www.sleepycat.com
diff --git a/databases/db42/pkg-plist b/databases/db42/pkg-plist
index 0c25bca13109..703276f2c7b6 100644
--- a/databases/db42/pkg-plist
+++ b/databases/db42/pkg-plist
@@ -10,16 +10,30 @@ bin/db_load
 bin/db_recover
 bin/db_stat
 bin/db_dump185
-man/cat3/db.0
 man/cat3/db_appinit.0
 man/cat3/db_cursor.0
 man/cat3/db_dbm.0
 man/cat3/db_hsearch.0
+man/cat3/db_intro.0
 man/cat3/db_lock.0
 man/cat3/db_log.0
 man/cat3/db_mpool.0
 man/cat3/db_open.0
 man/cat3/db_txn.0
+man/cat3/Db.0
+man/cat3/DbEnv.0
+man/cat3/DbException.0
+man/cat3/DbInfo.0
+man/cat3/DbLock.0
+man/cat3/DbLockTab.0
+man/cat3/DbLog.0
+man/cat3/DbLsn.0
+man/cat3/DbMpool.0
+man/cat3/DbMpoolFile.0
+man/cat3/DbTxn.0
+man/cat3/DbTxnMgr.0
+man/cat3/Dbc.0
+man/cat3/Dbt.0
 man/cat1/db_archive.0
 man/cat1/db_checkpoint.0
 man/cat1/db_deadlock.0
@@ -27,16 +41,30 @@ man/cat1/db_dump.0
 man/cat1/db_load.0
 man/cat1/db_recover.0
 man/cat1/db_stat.0
-man/man3/db.3.gz
 man/man3/db_appinit.3.gz
 man/man3/db_cursor.3.gz
 man/man3/db_dbm.3.gz
 man/man3/db_hsearch.3.gz
+man/man3/db_intro.3.gz
 man/man3/db_lock.3.gz
 man/man3/db_log.3.gz
 man/man3/db_mpool.3.gz
 man/man3/db_open.3.gz
 man/man3/db_txn.3.gz
+man/man3/Db.3.gz
+man/man3/DbEnv.3.gz
+man/man3/DbException.3.gz
+man/man3/DbInfo.3.gz
+man/man3/DbLock.3.gz
+man/man3/DbLockTab.3.gz
+man/man3/DbLog.3.gz
+man/man3/DbLsn.3.gz
+man/man3/DbMpool.3.gz
+man/man3/DbMpoolFile.3.gz
+man/man3/DbTxn.3.gz
+man/man3/DbTxnMgr.3.gz
+man/man3/Dbc.3.gz
+man/man3/Dbt.3.gz
 man/man1/db_archive.1.gz
 man/man1/db_checkpoint.1.gz
 man/man1/db_deadlock.1.gz
@@ -44,3 +72,17 @@ man/man1/db_dump.1.gz
 man/man1/db_load.1.gz
 man/man1/db_recover.1.gz
 man/man1/db_stat.1.gz
+share/doc/db/hash.usenix.ps.gz
+share/doc/db/libtp.usenix.ps.gz
+share/examples/db/ex_access.c
+share/examples/db/ex_appinit.c
+share/examples/db/ex_btrec.c
+share/examples/db/ex_lock.c
+share/examples/db/ex_mpool.c
+share/examples/db/ex_tpcb.c
+share/examples/db/ex_tpcb.h
+share/examples/db/AccessExample.cpp
+share/examples/db/AppinitExample.cpp
+share/examples/db/LockExample.cpp
+share/examples/db/MpoolExample.cpp
+share/examples/db/TpcbExample.cpp
diff --git a/databases/db43/Makefile b/databases/db43/Makefile
index c8764c99ac7d..9e73917fcaf3 100644
--- a/databases/db43/Makefile
+++ b/databases/db43/Makefile
@@ -3,12 +3,12 @@
 # Date created:				12 Jun 1997
 # Whom:					Josh Tiefenbach <josh@ican.net>
 #
-# $Id: Makefile,v 1.1.1.1 1997/06/13 17:54:36 jfitz Exp $
+# $Id: Makefile,v 1.2 1997/09/05 20:22:04 jfitz Exp $
 #
 
-DISTNAME=	db-2.2.6
+DISTNAME=	db-2.3.11
 CATEGORIES=	databases
-MASTER_SITES=	http://www.bostic.com/db/packages/
+MASTER_SITES=	http://www.sleepycat.com/db/packages/
 
 MAINTAINER=	josh@ican.net
 
@@ -17,11 +17,27 @@ WRKSRC=		${WRKDIR}/${DISTNAME}/build.unix
 GNU_CONFIGURE=	YES
 CONFIGURE_SCRIPT=	../dist/configure
 CONFIGURE_ARGS=		--enable-compat185 \
-			--enable-dump185
+			--enable-dump185 --enable-cxx
 
 MAN1=	db_archive.1 db_checkpoint.1 db_deadlock.1 db_dump.1 db_load.1 \
 	db_recover.1 db_stat.1
-MAN3=	db.3 db_appinit.3 db_cursor.3 db_dbm.3 db_hsearch.3 db_lock.3 \
-	db_log.3 db_mpool.3 db_open.3 db_txn.3
+MAN3=	db_appinit.3 db_cursor.3 db_dbm.3 db_hsearch.3 db_intro.3 db_lock.3 \
+	db_log.3 db_mpool.3 db_open.3 db_txn.3 \
+	Db.3 DbEnv.3 DbException.3 DbInfo.3 DbLock.3 DbLockTab.3 DbLog.3 \
+	DbLsn.3 DbMpool.3 DbMpoolFile.3 DbTxn.3 DbTxnMgr.3 Dbc.3 Dbt.3
+
+post-install:
+	${MKDIR} ${PREFIX}/share/doc/db
+.for doc in hash.usenix.ps libtp.usenix.ps
+	${INSTALL_DATA} ${WRKSRC}/../docs/${doc} ${PREFIX}/share/doc/db
+	gzip -9 ${PREFIX}/share/doc/db/${doc}
+.endfor
+	${MKDIR} ${PREFIX}/share/examples/db
+.for example in README ex_access.c ex_appinit.c ex_btrec.c ex_lock.c ex_mpool.c ex_tpcb.c ex_tpcb.h
+	${INSTALL_DATA} ${WRKSRC}/../examples/${example} ${PREFIX}/share/examples/db
+.endfor
+.for example in AccessExample.cpp AppinitExample.cpp LockExample.cpp MpoolExample.cpp TpcbExample.cpp
+	${INSTALL_DATA} ${WRKSRC}/../examples_cxx/${example} ${PREFIX}/share/examples/db
+.endfor
 
 .include <bsd.port.mk>
diff --git a/databases/db43/distinfo b/databases/db43/distinfo
index 42958122b19f..eaddc52a9e34 100644
--- a/databases/db43/distinfo
+++ b/databases/db43/distinfo
@@ -1 +1 @@
-MD5 (db-2.2.6.tar.gz) = 280cecafe8bc046ebdd537a7bbfe3440
+MD5 (db-2.3.11.tar.gz) = 833edf9bada4c4558067fba2f97a55db
diff --git a/databases/db43/pkg-descr b/databases/db43/pkg-descr
index 01a4bfe0da75..adc0eae33ba5 100644
--- a/databases/db43/pkg-descr
+++ b/databases/db43/pkg-descr
@@ -1,5 +1,5 @@
-Version 2.0.6 of the Berkeley DB library. This version uses an incompatible
+Version 2.3.11 of the Berkeley DB library. This version uses an incompatible
 underlying database than v1.85 and a different API. Utilities are included in
-the distribution to convert v1.85 databases to v2.0.6.
+the distribution to convert v1.85 databases to v2.3.11
 
-For more information, refer to http://www.bostic.com/db/index.html
+For more information, refer to http://www.sleepycat.com
diff --git a/databases/db43/pkg-plist b/databases/db43/pkg-plist
index 0c25bca13109..703276f2c7b6 100644
--- a/databases/db43/pkg-plist
+++ b/databases/db43/pkg-plist
@@ -10,16 +10,30 @@ bin/db_load
 bin/db_recover
 bin/db_stat
 bin/db_dump185
-man/cat3/db.0
 man/cat3/db_appinit.0
 man/cat3/db_cursor.0
 man/cat3/db_dbm.0
 man/cat3/db_hsearch.0
+man/cat3/db_intro.0
 man/cat3/db_lock.0
 man/cat3/db_log.0
 man/cat3/db_mpool.0
 man/cat3/db_open.0
 man/cat3/db_txn.0
+man/cat3/Db.0
+man/cat3/DbEnv.0
+man/cat3/DbException.0
+man/cat3/DbInfo.0
+man/cat3/DbLock.0
+man/cat3/DbLockTab.0
+man/cat3/DbLog.0
+man/cat3/DbLsn.0
+man/cat3/DbMpool.0
+man/cat3/DbMpoolFile.0
+man/cat3/DbTxn.0
+man/cat3/DbTxnMgr.0
+man/cat3/Dbc.0
+man/cat3/Dbt.0
 man/cat1/db_archive.0
 man/cat1/db_checkpoint.0
 man/cat1/db_deadlock.0
@@ -27,16 +41,30 @@ man/cat1/db_dump.0
 man/cat1/db_load.0
 man/cat1/db_recover.0
 man/cat1/db_stat.0
-man/man3/db.3.gz
 man/man3/db_appinit.3.gz
 man/man3/db_cursor.3.gz
 man/man3/db_dbm.3.gz
 man/man3/db_hsearch.3.gz
+man/man3/db_intro.3.gz
 man/man3/db_lock.3.gz
 man/man3/db_log.3.gz
 man/man3/db_mpool.3.gz
 man/man3/db_open.3.gz
 man/man3/db_txn.3.gz
+man/man3/Db.3.gz
+man/man3/DbEnv.3.gz
+man/man3/DbException.3.gz
+man/man3/DbInfo.3.gz
+man/man3/DbLock.3.gz
+man/man3/DbLockTab.3.gz
+man/man3/DbLog.3.gz
+man/man3/DbLsn.3.gz
+man/man3/DbMpool.3.gz
+man/man3/DbMpoolFile.3.gz
+man/man3/DbTxn.3.gz
+man/man3/DbTxnMgr.3.gz
+man/man3/Dbc.3.gz
+man/man3/Dbt.3.gz
 man/man1/db_archive.1.gz
 man/man1/db_checkpoint.1.gz
 man/man1/db_deadlock.1.gz
@@ -44,3 +72,17 @@ man/man1/db_dump.1.gz
 man/man1/db_load.1.gz
 man/man1/db_recover.1.gz
 man/man1/db_stat.1.gz
+share/doc/db/hash.usenix.ps.gz
+share/doc/db/libtp.usenix.ps.gz
+share/examples/db/ex_access.c
+share/examples/db/ex_appinit.c
+share/examples/db/ex_btrec.c
+share/examples/db/ex_lock.c
+share/examples/db/ex_mpool.c
+share/examples/db/ex_tpcb.c
+share/examples/db/ex_tpcb.h
+share/examples/db/AccessExample.cpp
+share/examples/db/AppinitExample.cpp
+share/examples/db/LockExample.cpp
+share/examples/db/MpoolExample.cpp
+share/examples/db/TpcbExample.cpp
diff --git a/databases/db44/Makefile b/databases/db44/Makefile
index c8764c99ac7d..9e73917fcaf3 100644
--- a/databases/db44/Makefile
+++ b/databases/db44/Makefile
@@ -3,12 +3,12 @@
 # Date created:				12 Jun 1997
 # Whom:					Josh Tiefenbach <josh@ican.net>
 #
-# $Id: Makefile,v 1.1.1.1 1997/06/13 17:54:36 jfitz Exp $
+# $Id: Makefile,v 1.2 1997/09/05 20:22:04 jfitz Exp $
 #
 
-DISTNAME=	db-2.2.6
+DISTNAME=	db-2.3.11
 CATEGORIES=	databases
-MASTER_SITES=	http://www.bostic.com/db/packages/
+MASTER_SITES=	http://www.sleepycat.com/db/packages/
 
 MAINTAINER=	josh@ican.net
 
@@ -17,11 +17,27 @@ WRKSRC=		${WRKDIR}/${DISTNAME}/build.unix
 GNU_CONFIGURE=	YES
 CONFIGURE_SCRIPT=	../dist/configure
 CONFIGURE_ARGS=		--enable-compat185 \
-			--enable-dump185
+			--enable-dump185 --enable-cxx
 
 MAN1=	db_archive.1 db_checkpoint.1 db_deadlock.1 db_dump.1 db_load.1 \
 	db_recover.1 db_stat.1
-MAN3=	db.3 db_appinit.3 db_cursor.3 db_dbm.3 db_hsearch.3 db_lock.3 \
-	db_log.3 db_mpool.3 db_open.3 db_txn.3
+MAN3=	db_appinit.3 db_cursor.3 db_dbm.3 db_hsearch.3 db_intro.3 db_lock.3 \
+	db_log.3 db_mpool.3 db_open.3 db_txn.3 \
+	Db.3 DbEnv.3 DbException.3 DbInfo.3 DbLock.3 DbLockTab.3 DbLog.3 \
+	DbLsn.3 DbMpool.3 DbMpoolFile.3 DbTxn.3 DbTxnMgr.3 Dbc.3 Dbt.3
+
+post-install:
+	${MKDIR} ${PREFIX}/share/doc/db
+.for doc in hash.usenix.ps libtp.usenix.ps
+	${INSTALL_DATA} ${WRKSRC}/../docs/${doc} ${PREFIX}/share/doc/db
+	gzip -9 ${PREFIX}/share/doc/db/${doc}
+.endfor
+	${MKDIR} ${PREFIX}/share/examples/db
+.for example in README ex_access.c ex_appinit.c ex_btrec.c ex_lock.c ex_mpool.c ex_tpcb.c ex_tpcb.h
+	${INSTALL_DATA} ${WRKSRC}/../examples/${example} ${PREFIX}/share/examples/db
+.endfor
+.for example in AccessExample.cpp AppinitExample.cpp LockExample.cpp MpoolExample.cpp TpcbExample.cpp
+	${INSTALL_DATA} ${WRKSRC}/../examples_cxx/${example} ${PREFIX}/share/examples/db
+.endfor
 
 .include <bsd.port.mk>
diff --git a/databases/db44/distinfo b/databases/db44/distinfo
index 42958122b19f..eaddc52a9e34 100644
--- a/databases/db44/distinfo
+++ b/databases/db44/distinfo
@@ -1 +1 @@
-MD5 (db-2.2.6.tar.gz) = 280cecafe8bc046ebdd537a7bbfe3440
+MD5 (db-2.3.11.tar.gz) = 833edf9bada4c4558067fba2f97a55db
diff --git a/databases/db44/pkg-descr b/databases/db44/pkg-descr
index 01a4bfe0da75..adc0eae33ba5 100644
--- a/databases/db44/pkg-descr
+++ b/databases/db44/pkg-descr
@@ -1,5 +1,5 @@
-Version 2.0.6 of the Berkeley DB library. This version uses an incompatible
+Version 2.3.11 of the Berkeley DB library. This version uses an incompatible
 underlying database than v1.85 and a different API. Utilities are included in
-the distribution to convert v1.85 databases to v2.0.6.
+the distribution to convert v1.85 databases to v2.3.11
 
-For more information, refer to http://www.bostic.com/db/index.html
+For more information, refer to http://www.sleepycat.com
diff --git a/databases/db44/pkg-plist b/databases/db44/pkg-plist
index 0c25bca13109..703276f2c7b6 100644
--- a/databases/db44/pkg-plist
+++ b/databases/db44/pkg-plist
@@ -10,16 +10,30 @@ bin/db_load
 bin/db_recover
 bin/db_stat
 bin/db_dump185
-man/cat3/db.0
 man/cat3/db_appinit.0
 man/cat3/db_cursor.0
 man/cat3/db_dbm.0
 man/cat3/db_hsearch.0
+man/cat3/db_intro.0
 man/cat3/db_lock.0
 man/cat3/db_log.0
 man/cat3/db_mpool.0
 man/cat3/db_open.0
 man/cat3/db_txn.0
+man/cat3/Db.0
+man/cat3/DbEnv.0
+man/cat3/DbException.0
+man/cat3/DbInfo.0
+man/cat3/DbLock.0
+man/cat3/DbLockTab.0
+man/cat3/DbLog.0
+man/cat3/DbLsn.0
+man/cat3/DbMpool.0
+man/cat3/DbMpoolFile.0
+man/cat3/DbTxn.0
+man/cat3/DbTxnMgr.0
+man/cat3/Dbc.0
+man/cat3/Dbt.0
 man/cat1/db_archive.0
 man/cat1/db_checkpoint.0
 man/cat1/db_deadlock.0
@@ -27,16 +41,30 @@ man/cat1/db_dump.0
 man/cat1/db_load.0
 man/cat1/db_recover.0
 man/cat1/db_stat.0
-man/man3/db.3.gz
 man/man3/db_appinit.3.gz
 man/man3/db_cursor.3.gz
 man/man3/db_dbm.3.gz
 man/man3/db_hsearch.3.gz
+man/man3/db_intro.3.gz
 man/man3/db_lock.3.gz
 man/man3/db_log.3.gz
 man/man3/db_mpool.3.gz
 man/man3/db_open.3.gz
 man/man3/db_txn.3.gz
+man/man3/Db.3.gz
+man/man3/DbEnv.3.gz
+man/man3/DbException.3.gz
+man/man3/DbInfo.3.gz
+man/man3/DbLock.3.gz
+man/man3/DbLockTab.3.gz
+man/man3/DbLog.3.gz
+man/man3/DbLsn.3.gz
+man/man3/DbMpool.3.gz
+man/man3/DbMpoolFile.3.gz
+man/man3/DbTxn.3.gz
+man/man3/DbTxnMgr.3.gz
+man/man3/Dbc.3.gz
+man/man3/Dbt.3.gz
 man/man1/db_archive.1.gz
 man/man1/db_checkpoint.1.gz
 man/man1/db_deadlock.1.gz
@@ -44,3 +72,17 @@ man/man1/db_dump.1.gz
 man/man1/db_load.1.gz
 man/man1/db_recover.1.gz
 man/man1/db_stat.1.gz
+share/doc/db/hash.usenix.ps.gz
+share/doc/db/libtp.usenix.ps.gz
+share/examples/db/ex_access.c
+share/examples/db/ex_appinit.c
+share/examples/db/ex_btrec.c
+share/examples/db/ex_lock.c
+share/examples/db/ex_mpool.c
+share/examples/db/ex_tpcb.c
+share/examples/db/ex_tpcb.h
+share/examples/db/AccessExample.cpp
+share/examples/db/AppinitExample.cpp
+share/examples/db/LockExample.cpp
+share/examples/db/MpoolExample.cpp
+share/examples/db/TpcbExample.cpp
diff --git a/databases/db45/Makefile b/databases/db45/Makefile
index c8764c99ac7d..9e73917fcaf3 100644
--- a/databases/db45/Makefile
+++ b/databases/db45/Makefile
@@ -3,12 +3,12 @@
 # Date created:				12 Jun 1997
 # Whom:					Josh Tiefenbach <josh@ican.net>
 #
-# $Id: Makefile,v 1.1.1.1 1997/06/13 17:54:36 jfitz Exp $
+# $Id: Makefile,v 1.2 1997/09/05 20:22:04 jfitz Exp $
 #
 
-DISTNAME=	db-2.2.6
+DISTNAME=	db-2.3.11
 CATEGORIES=	databases
-MASTER_SITES=	http://www.bostic.com/db/packages/
+MASTER_SITES=	http://www.sleepycat.com/db/packages/
 
 MAINTAINER=	josh@ican.net
 
@@ -17,11 +17,27 @@ WRKSRC=		${WRKDIR}/${DISTNAME}/build.unix
 GNU_CONFIGURE=	YES
 CONFIGURE_SCRIPT=	../dist/configure
 CONFIGURE_ARGS=		--enable-compat185 \
-			--enable-dump185
+			--enable-dump185 --enable-cxx
 
 MAN1=	db_archive.1 db_checkpoint.1 db_deadlock.1 db_dump.1 db_load.1 \
 	db_recover.1 db_stat.1
-MAN3=	db.3 db_appinit.3 db_cursor.3 db_dbm.3 db_hsearch.3 db_lock.3 \
-	db_log.3 db_mpool.3 db_open.3 db_txn.3
+MAN3=	db_appinit.3 db_cursor.3 db_dbm.3 db_hsearch.3 db_intro.3 db_lock.3 \
+	db_log.3 db_mpool.3 db_open.3 db_txn.3 \
+	Db.3 DbEnv.3 DbException.3 DbInfo.3 DbLock.3 DbLockTab.3 DbLog.3 \
+	DbLsn.3 DbMpool.3 DbMpoolFile.3 DbTxn.3 DbTxnMgr.3 Dbc.3 Dbt.3
+
+post-install:
+	${MKDIR} ${PREFIX}/share/doc/db
+.for doc in hash.usenix.ps libtp.usenix.ps
+	${INSTALL_DATA} ${WRKSRC}/../docs/${doc} ${PREFIX}/share/doc/db
+	gzip -9 ${PREFIX}/share/doc/db/${doc}
+.endfor
+	${MKDIR} ${PREFIX}/share/examples/db
+.for example in README ex_access.c ex_appinit.c ex_btrec.c ex_lock.c ex_mpool.c ex_tpcb.c ex_tpcb.h
+	${INSTALL_DATA} ${WRKSRC}/../examples/${example} ${PREFIX}/share/examples/db
+.endfor
+.for example in AccessExample.cpp AppinitExample.cpp LockExample.cpp MpoolExample.cpp TpcbExample.cpp
+	${INSTALL_DATA} ${WRKSRC}/../examples_cxx/${example} ${PREFIX}/share/examples/db
+.endfor
 
 .include <bsd.port.mk>
diff --git a/databases/db45/distinfo b/databases/db45/distinfo
index 42958122b19f..eaddc52a9e34 100644
--- a/databases/db45/distinfo
+++ b/databases/db45/distinfo
@@ -1 +1 @@
-MD5 (db-2.2.6.tar.gz) = 280cecafe8bc046ebdd537a7bbfe3440
+MD5 (db-2.3.11.tar.gz) = 833edf9bada4c4558067fba2f97a55db
diff --git a/databases/db45/pkg-descr b/databases/db45/pkg-descr
index 01a4bfe0da75..adc0eae33ba5 100644
--- a/databases/db45/pkg-descr
+++ b/databases/db45/pkg-descr
@@ -1,5 +1,5 @@
-Version 2.0.6 of the Berkeley DB library. This version uses an incompatible
+Version 2.3.11 of the Berkeley DB library. This version uses an incompatible
 underlying database than v1.85 and a different API. Utilities are included in
-the distribution to convert v1.85 databases to v2.0.6.
+the distribution to convert v1.85 databases to v2.3.11
 
-For more information, refer to http://www.bostic.com/db/index.html
+For more information, refer to http://www.sleepycat.com
diff --git a/databases/db45/pkg-plist b/databases/db45/pkg-plist
index 0c25bca13109..703276f2c7b6 100644
--- a/databases/db45/pkg-plist
+++ b/databases/db45/pkg-plist
@@ -10,16 +10,30 @@ bin/db_load
 bin/db_recover
 bin/db_stat
 bin/db_dump185
-man/cat3/db.0
 man/cat3/db_appinit.0
 man/cat3/db_cursor.0
 man/cat3/db_dbm.0
 man/cat3/db_hsearch.0
+man/cat3/db_intro.0
 man/cat3/db_lock.0
 man/cat3/db_log.0
 man/cat3/db_mpool.0
 man/cat3/db_open.0
 man/cat3/db_txn.0
+man/cat3/Db.0
+man/cat3/DbEnv.0
+man/cat3/DbException.0
+man/cat3/DbInfo.0
+man/cat3/DbLock.0
+man/cat3/DbLockTab.0
+man/cat3/DbLog.0
+man/cat3/DbLsn.0
+man/cat3/DbMpool.0
+man/cat3/DbMpoolFile.0
+man/cat3/DbTxn.0
+man/cat3/DbTxnMgr.0
+man/cat3/Dbc.0
+man/cat3/Dbt.0
 man/cat1/db_archive.0
 man/cat1/db_checkpoint.0
 man/cat1/db_deadlock.0
@@ -27,16 +41,30 @@ man/cat1/db_dump.0
 man/cat1/db_load.0
 man/cat1/db_recover.0
 man/cat1/db_stat.0
-man/man3/db.3.gz
 man/man3/db_appinit.3.gz
 man/man3/db_cursor.3.gz
 man/man3/db_dbm.3.gz
 man/man3/db_hsearch.3.gz
+man/man3/db_intro.3.gz
 man/man3/db_lock.3.gz
 man/man3/db_log.3.gz
 man/man3/db_mpool.3.gz
 man/man3/db_open.3.gz
 man/man3/db_txn.3.gz
+man/man3/Db.3.gz
+man/man3/DbEnv.3.gz
+man/man3/DbException.3.gz
+man/man3/DbInfo.3.gz
+man/man3/DbLock.3.gz
+man/man3/DbLockTab.3.gz
+man/man3/DbLog.3.gz
+man/man3/DbLsn.3.gz
+man/man3/DbMpool.3.gz
+man/man3/DbMpoolFile.3.gz
+man/man3/DbTxn.3.gz
+man/man3/DbTxnMgr.3.gz
+man/man3/Dbc.3.gz
+man/man3/Dbt.3.gz
 man/man1/db_archive.1.gz
 man/man1/db_checkpoint.1.gz
 man/man1/db_deadlock.1.gz
@@ -44,3 +72,17 @@ man/man1/db_dump.1.gz
 man/man1/db_load.1.gz
 man/man1/db_recover.1.gz
 man/man1/db_stat.1.gz
+share/doc/db/hash.usenix.ps.gz
+share/doc/db/libtp.usenix.ps.gz
+share/examples/db/ex_access.c
+share/examples/db/ex_appinit.c
+share/examples/db/ex_btrec.c
+share/examples/db/ex_lock.c
+share/examples/db/ex_mpool.c
+share/examples/db/ex_tpcb.c
+share/examples/db/ex_tpcb.h
+share/examples/db/AccessExample.cpp
+share/examples/db/AppinitExample.cpp
+share/examples/db/LockExample.cpp
+share/examples/db/MpoolExample.cpp
+share/examples/db/TpcbExample.cpp
diff --git a/databases/db46/Makefile b/databases/db46/Makefile
index c8764c99ac7d..9e73917fcaf3 100644
--- a/databases/db46/Makefile
+++ b/databases/db46/Makefile
@@ -3,12 +3,12 @@
 # Date created:				12 Jun 1997
 # Whom:					Josh Tiefenbach <josh@ican.net>
 #
-# $Id: Makefile,v 1.1.1.1 1997/06/13 17:54:36 jfitz Exp $
+# $Id: Makefile,v 1.2 1997/09/05 20:22:04 jfitz Exp $
 #
 
-DISTNAME=	db-2.2.6
+DISTNAME=	db-2.3.11
 CATEGORIES=	databases
-MASTER_SITES=	http://www.bostic.com/db/packages/
+MASTER_SITES=	http://www.sleepycat.com/db/packages/
 
 MAINTAINER=	josh@ican.net
 
@@ -17,11 +17,27 @@ WRKSRC=		${WRKDIR}/${DISTNAME}/build.unix
 GNU_CONFIGURE=	YES
 CONFIGURE_SCRIPT=	../dist/configure
 CONFIGURE_ARGS=		--enable-compat185 \
-			--enable-dump185
+			--enable-dump185 --enable-cxx
 
 MAN1=	db_archive.1 db_checkpoint.1 db_deadlock.1 db_dump.1 db_load.1 \
 	db_recover.1 db_stat.1
-MAN3=	db.3 db_appinit.3 db_cursor.3 db_dbm.3 db_hsearch.3 db_lock.3 \
-	db_log.3 db_mpool.3 db_open.3 db_txn.3
+MAN3=	db_appinit.3 db_cursor.3 db_dbm.3 db_hsearch.3 db_intro.3 db_lock.3 \
+	db_log.3 db_mpool.3 db_open.3 db_txn.3 \
+	Db.3 DbEnv.3 DbException.3 DbInfo.3 DbLock.3 DbLockTab.3 DbLog.3 \
+	DbLsn.3 DbMpool.3 DbMpoolFile.3 DbTxn.3 DbTxnMgr.3 Dbc.3 Dbt.3
+
+post-install:
+	${MKDIR} ${PREFIX}/share/doc/db
+.for doc in hash.usenix.ps libtp.usenix.ps
+	${INSTALL_DATA} ${WRKSRC}/../docs/${doc} ${PREFIX}/share/doc/db
+	gzip -9 ${PREFIX}/share/doc/db/${doc}
+.endfor
+	${MKDIR} ${PREFIX}/share/examples/db
+.for example in README ex_access.c ex_appinit.c ex_btrec.c ex_lock.c ex_mpool.c ex_tpcb.c ex_tpcb.h
+	${INSTALL_DATA} ${WRKSRC}/../examples/${example} ${PREFIX}/share/examples/db
+.endfor
+.for example in AccessExample.cpp AppinitExample.cpp LockExample.cpp MpoolExample.cpp TpcbExample.cpp
+	${INSTALL_DATA} ${WRKSRC}/../examples_cxx/${example} ${PREFIX}/share/examples/db
+.endfor
 
 .include <bsd.port.mk>
diff --git a/databases/db46/distinfo b/databases/db46/distinfo
index 42958122b19f..eaddc52a9e34 100644
--- a/databases/db46/distinfo
+++ b/databases/db46/distinfo
@@ -1 +1 @@
-MD5 (db-2.2.6.tar.gz) = 280cecafe8bc046ebdd537a7bbfe3440
+MD5 (db-2.3.11.tar.gz) = 833edf9bada4c4558067fba2f97a55db
diff --git a/databases/db46/pkg-descr b/databases/db46/pkg-descr
index 01a4bfe0da75..adc0eae33ba5 100644
--- a/databases/db46/pkg-descr
+++ b/databases/db46/pkg-descr
@@ -1,5 +1,5 @@
-Version 2.0.6 of the Berkeley DB library. This version uses an incompatible
+Version 2.3.11 of the Berkeley DB library. This version uses an incompatible
 underlying database than v1.85 and a different API. Utilities are included in
-the distribution to convert v1.85 databases to v2.0.6.
+the distribution to convert v1.85 databases to v2.3.11
 
-For more information, refer to http://www.bostic.com/db/index.html
+For more information, refer to http://www.sleepycat.com
diff --git a/databases/db46/pkg-plist b/databases/db46/pkg-plist
index 0c25bca13109..703276f2c7b6 100644
--- a/databases/db46/pkg-plist
+++ b/databases/db46/pkg-plist
@@ -10,16 +10,30 @@ bin/db_load
 bin/db_recover
 bin/db_stat
 bin/db_dump185
-man/cat3/db.0
 man/cat3/db_appinit.0
 man/cat3/db_cursor.0
 man/cat3/db_dbm.0
 man/cat3/db_hsearch.0
+man/cat3/db_intro.0
 man/cat3/db_lock.0
 man/cat3/db_log.0
 man/cat3/db_mpool.0
 man/cat3/db_open.0
 man/cat3/db_txn.0
+man/cat3/Db.0
+man/cat3/DbEnv.0
+man/cat3/DbException.0
+man/cat3/DbInfo.0
+man/cat3/DbLock.0
+man/cat3/DbLockTab.0
+man/cat3/DbLog.0
+man/cat3/DbLsn.0
+man/cat3/DbMpool.0
+man/cat3/DbMpoolFile.0
+man/cat3/DbTxn.0
+man/cat3/DbTxnMgr.0
+man/cat3/Dbc.0
+man/cat3/Dbt.0
 man/cat1/db_archive.0
 man/cat1/db_checkpoint.0
 man/cat1/db_deadlock.0
@@ -27,16 +41,30 @@ man/cat1/db_dump.0
 man/cat1/db_load.0
 man/cat1/db_recover.0
 man/cat1/db_stat.0
-man/man3/db.3.gz
 man/man3/db_appinit.3.gz
 man/man3/db_cursor.3.gz
 man/man3/db_dbm.3.gz
 man/man3/db_hsearch.3.gz
+man/man3/db_intro.3.gz
 man/man3/db_lock.3.gz
 man/man3/db_log.3.gz
 man/man3/db_mpool.3.gz
 man/man3/db_open.3.gz
 man/man3/db_txn.3.gz
+man/man3/Db.3.gz
+man/man3/DbEnv.3.gz
+man/man3/DbException.3.gz
+man/man3/DbInfo.3.gz
+man/man3/DbLock.3.gz
+man/man3/DbLockTab.3.gz
+man/man3/DbLog.3.gz
+man/man3/DbLsn.3.gz
+man/man3/DbMpool.3.gz
+man/man3/DbMpoolFile.3.gz
+man/man3/DbTxn.3.gz
+man/man3/DbTxnMgr.3.gz
+man/man3/Dbc.3.gz
+man/man3/Dbt.3.gz
 man/man1/db_archive.1.gz
 man/man1/db_checkpoint.1.gz
 man/man1/db_deadlock.1.gz
@@ -44,3 +72,17 @@ man/man1/db_dump.1.gz
 man/man1/db_load.1.gz
 man/man1/db_recover.1.gz
 man/man1/db_stat.1.gz
+share/doc/db/hash.usenix.ps.gz
+share/doc/db/libtp.usenix.ps.gz
+share/examples/db/ex_access.c
+share/examples/db/ex_appinit.c
+share/examples/db/ex_btrec.c
+share/examples/db/ex_lock.c
+share/examples/db/ex_mpool.c
+share/examples/db/ex_tpcb.c
+share/examples/db/ex_tpcb.h
+share/examples/db/AccessExample.cpp
+share/examples/db/AppinitExample.cpp
+share/examples/db/LockExample.cpp
+share/examples/db/MpoolExample.cpp
+share/examples/db/TpcbExample.cpp
diff --git a/databases/db47/Makefile b/databases/db47/Makefile
index c8764c99ac7d..9e73917fcaf3 100644
--- a/databases/db47/Makefile
+++ b/databases/db47/Makefile
@@ -3,12 +3,12 @@
 # Date created:				12 Jun 1997
 # Whom:					Josh Tiefenbach <josh@ican.net>
 #
-# $Id: Makefile,v 1.1.1.1 1997/06/13 17:54:36 jfitz Exp $
+# $Id: Makefile,v 1.2 1997/09/05 20:22:04 jfitz Exp $
 #
 
-DISTNAME=	db-2.2.6
+DISTNAME=	db-2.3.11
 CATEGORIES=	databases
-MASTER_SITES=	http://www.bostic.com/db/packages/
+MASTER_SITES=	http://www.sleepycat.com/db/packages/
 
 MAINTAINER=	josh@ican.net
 
@@ -17,11 +17,27 @@ WRKSRC=		${WRKDIR}/${DISTNAME}/build.unix
 GNU_CONFIGURE=	YES
 CONFIGURE_SCRIPT=	../dist/configure
 CONFIGURE_ARGS=		--enable-compat185 \
-			--enable-dump185
+			--enable-dump185 --enable-cxx
 
 MAN1=	db_archive.1 db_checkpoint.1 db_deadlock.1 db_dump.1 db_load.1 \
 	db_recover.1 db_stat.1
-MAN3=	db.3 db_appinit.3 db_cursor.3 db_dbm.3 db_hsearch.3 db_lock.3 \
-	db_log.3 db_mpool.3 db_open.3 db_txn.3
+MAN3=	db_appinit.3 db_cursor.3 db_dbm.3 db_hsearch.3 db_intro.3 db_lock.3 \
+	db_log.3 db_mpool.3 db_open.3 db_txn.3 \
+	Db.3 DbEnv.3 DbException.3 DbInfo.3 DbLock.3 DbLockTab.3 DbLog.3 \
+	DbLsn.3 DbMpool.3 DbMpoolFile.3 DbTxn.3 DbTxnMgr.3 Dbc.3 Dbt.3
+
+post-install:
+	${MKDIR} ${PREFIX}/share/doc/db
+.for doc in hash.usenix.ps libtp.usenix.ps
+	${INSTALL_DATA} ${WRKSRC}/../docs/${doc} ${PREFIX}/share/doc/db
+	gzip -9 ${PREFIX}/share/doc/db/${doc}
+.endfor
+	${MKDIR} ${PREFIX}/share/examples/db
+.for example in README ex_access.c ex_appinit.c ex_btrec.c ex_lock.c ex_mpool.c ex_tpcb.c ex_tpcb.h
+	${INSTALL_DATA} ${WRKSRC}/../examples/${example} ${PREFIX}/share/examples/db
+.endfor
+.for example in AccessExample.cpp AppinitExample.cpp LockExample.cpp MpoolExample.cpp TpcbExample.cpp
+	${INSTALL_DATA} ${WRKSRC}/../examples_cxx/${example} ${PREFIX}/share/examples/db
+.endfor
 
 .include <bsd.port.mk>
diff --git a/databases/db47/distinfo b/databases/db47/distinfo
index 42958122b19f..eaddc52a9e34 100644
--- a/databases/db47/distinfo
+++ b/databases/db47/distinfo
@@ -1 +1 @@
-MD5 (db-2.2.6.tar.gz) = 280cecafe8bc046ebdd537a7bbfe3440
+MD5 (db-2.3.11.tar.gz) = 833edf9bada4c4558067fba2f97a55db
diff --git a/databases/db47/pkg-descr b/databases/db47/pkg-descr
index 01a4bfe0da75..adc0eae33ba5 100644
--- a/databases/db47/pkg-descr
+++ b/databases/db47/pkg-descr
@@ -1,5 +1,5 @@
-Version 2.0.6 of the Berkeley DB library. This version uses an incompatible
+Version 2.3.11 of the Berkeley DB library. This version uses an incompatible
 underlying database than v1.85 and a different API. Utilities are included in
-the distribution to convert v1.85 databases to v2.0.6.
+the distribution to convert v1.85 databases to v2.3.11
 
-For more information, refer to http://www.bostic.com/db/index.html
+For more information, refer to http://www.sleepycat.com
diff --git a/databases/db47/pkg-plist b/databases/db47/pkg-plist
index 0c25bca13109..703276f2c7b6 100644
--- a/databases/db47/pkg-plist
+++ b/databases/db47/pkg-plist
@@ -10,16 +10,30 @@ bin/db_load
 bin/db_recover
 bin/db_stat
 bin/db_dump185
-man/cat3/db.0
 man/cat3/db_appinit.0
 man/cat3/db_cursor.0
 man/cat3/db_dbm.0
 man/cat3/db_hsearch.0
+man/cat3/db_intro.0
 man/cat3/db_lock.0
 man/cat3/db_log.0
 man/cat3/db_mpool.0
 man/cat3/db_open.0
 man/cat3/db_txn.0
+man/cat3/Db.0
+man/cat3/DbEnv.0
+man/cat3/DbException.0
+man/cat3/DbInfo.0
+man/cat3/DbLock.0
+man/cat3/DbLockTab.0
+man/cat3/DbLog.0
+man/cat3/DbLsn.0
+man/cat3/DbMpool.0
+man/cat3/DbMpoolFile.0
+man/cat3/DbTxn.0
+man/cat3/DbTxnMgr.0
+man/cat3/Dbc.0
+man/cat3/Dbt.0
 man/cat1/db_archive.0
 man/cat1/db_checkpoint.0
 man/cat1/db_deadlock.0
@@ -27,16 +41,30 @@ man/cat1/db_dump.0
 man/cat1/db_load.0
 man/cat1/db_recover.0
 man/cat1/db_stat.0
-man/man3/db.3.gz
 man/man3/db_appinit.3.gz
 man/man3/db_cursor.3.gz
 man/man3/db_dbm.3.gz
 man/man3/db_hsearch.3.gz
+man/man3/db_intro.3.gz
 man/man3/db_lock.3.gz
 man/man3/db_log.3.gz
 man/man3/db_mpool.3.gz
 man/man3/db_open.3.gz
 man/man3/db_txn.3.gz
+man/man3/Db.3.gz
+man/man3/DbEnv.3.gz
+man/man3/DbException.3.gz
+man/man3/DbInfo.3.gz
+man/man3/DbLock.3.gz
+man/man3/DbLockTab.3.gz
+man/man3/DbLog.3.gz
+man/man3/DbLsn.3.gz
+man/man3/DbMpool.3.gz
+man/man3/DbMpoolFile.3.gz
+man/man3/DbTxn.3.gz
+man/man3/DbTxnMgr.3.gz
+man/man3/Dbc.3.gz
+man/man3/Dbt.3.gz
 man/man1/db_archive.1.gz
 man/man1/db_checkpoint.1.gz
 man/man1/db_deadlock.1.gz
@@ -44,3 +72,17 @@ man/man1/db_dump.1.gz
 man/man1/db_load.1.gz
 man/man1/db_recover.1.gz
 man/man1/db_stat.1.gz
+share/doc/db/hash.usenix.ps.gz
+share/doc/db/libtp.usenix.ps.gz
+share/examples/db/ex_access.c
+share/examples/db/ex_appinit.c
+share/examples/db/ex_btrec.c
+share/examples/db/ex_lock.c
+share/examples/db/ex_mpool.c
+share/examples/db/ex_tpcb.c
+share/examples/db/ex_tpcb.h
+share/examples/db/AccessExample.cpp
+share/examples/db/AppinitExample.cpp
+share/examples/db/LockExample.cpp
+share/examples/db/MpoolExample.cpp
+share/examples/db/TpcbExample.cpp