Import PyBSDDB 3.4.0. Rename historical wrapper to bsddb185.
diff --git a/Modules/Setup.dist b/Modules/Setup.dist
index b8532ab..b4635cc 100644
--- a/Modules/Setup.dist
+++ b/Modules/Setup.dist
@@ -393,25 +393,30 @@
#gdbm gdbmmodule.c -I/usr/local/include -L/usr/local/lib -lgdbm
-# Berkeley DB interface.
+# Sleepycat Berkeley DB interface.
+#
+# This requires the Sleepycat DB code, see http://www.sleepycat.com/
+# The minimum supported version of that library is 3.0.
+#
+# Edit the variables DB and DBLIBVERto point to the db top directory
+# and the subdirectory of PORT where you built it.
+#DB=/usr/local/BerkeleyDB.4.0
+#DBLIBVER=4.0
+#DBINC=$(DB)/include
+#DBLIB=$(DB)/lib
+#_bsddb _bsddb.c -I$(DBINC) -L$(DBLIB) -ldb-$(DBLIBVER
+
+# Historical Berkeley DB 1.85
#
# This requires the Berkeley DB code, see
# ftp://ftp.cs.berkeley.edu/pub/4bsd/db.1.85.tar.gz
#
-# Edit the variables DB and DBPORT to point to the db top directory
-# and the subdirectory of PORT where you built it.
-#
-# (See http://electricrain.com/greg/python/bsddb3/ for an interface to
-# BSD DB 3.x.)
-
-# Note: If a db.h file is found by configure, bsddb will be enabled
-# automatically via Setup.config.in. It only needs to be enabled here
-# if it is not automatically enabled there; check the generated
-# Setup.config before enabling it here.
-
+# This module is deprecated; the historical BSDDB library has bugs
+# that can cause data corruption. If you can, use the Sleepycat library
+# instead.
#DB=/depot/sundry/src/berkeley-db/db.1.85
#DBPORT=$(DB)/PORT/irix.5.3
-#bsddb bsddbmodule.c -I$(DBPORT)/include -I$(DBPORT) $(DBPORT)/libdb.a
+#bsddb185 bsddbmodule.c -I$(DBPORT)/include -I$(DBPORT) $(DBPORT)/libdb.a