diff --git a/databases/db/v3/patches/patch-db_db_cam_c b/databases/db/v3/patches/patch-db_db_cam_c
index 8aff0c9ccd..4f2e3fbe6e 100644
--- a/databases/db/v3/patches/patch-db_db_cam_c
+++ b/databases/db/v3/patches/patch-db_db_cam_c
@@ -1,7 +1,7 @@
-$OpenBSD: patch-db_db_cam_c,v 1.1.1.1 2003/12/08 17:37:55 sturm Exp $
---- db/db_cam.c.orig	2003-12-07 13:54:14.000000000 +0100
-+++ db/db_cam.c	2003-12-07 13:54:43.000000000 +0100
-@@ -13,6 +13,7 @@ static const char revid[] = "$Id: db_cam
+$OpenBSD: patch-db_db_cam_c,v 1.2 2010/10/28 10:33:16 steven Exp $
+--- db/db_cam.c.orig	Wed Jul 26 23:20:05 2000
++++ db/db_cam.c	Thu Oct 28 12:28:52 2010
+@@ -13,6 +13,7 @@ static const char revid[] = "$Id: db_cam.c,v 11.32.2.1
  
  #ifndef NO_SYSTEM_INCLUDES
  #include <sys/types.h>
diff --git a/databases/db/v3/patches/patch-dist_Makefile_in b/databases/db/v3/patches/patch-dist_Makefile_in
index ec1f7f5b95..6704cd0ad4 100644
--- a/databases/db/v3/patches/patch-dist_Makefile_in
+++ b/databases/db/v3/patches/patch-dist_Makefile_in
@@ -1,6 +1,6 @@
-$OpenBSD: patch-dist_Makefile_in,v 1.5 2005/12/25 20:35:42 sturm Exp $
+$OpenBSD: patch-dist_Makefile_in,v 1.6 2010/10/28 10:33:16 steven Exp $
 --- dist/Makefile.in.orig	Tue Jul 18 17:37:57 2000
-+++ dist/Makefile.in	Sun Dec 25 20:00:19 2005
++++ dist/Makefile.in	Thu Oct 28 12:30:14 2010
 @@ -26,7 +26,9 @@ LIBTSO_LIBS=	@LIBTSO_LIBS@
  LIBXSO_LIBS=	@LIBXSO_LIBS@
  
@@ -12,7 +12,7 @@ $OpenBSD: patch-dist_Makefile_in,v 1.5 2005/12/25 20:35:42 sturm Exp $
  SOFLAGS=	@SOFLAGS@
  SOMAJOR=	@DB_VERSION_MAJOR@
  SOVERSION=	@DB_VERSION_MAJOR@.@DB_VERSION_MINOR@
-@@ -34,11 +36,11 @@ SOVERSION=	@DB_VERSION_MAJOR@.@DB_VERSIO
+@@ -34,11 +36,11 @@ SOVERSION=	@DB_VERSION_MAJOR@.@DB_VERSION_MINOR@
  libdb=		libdb.a
  
  libso_base=	libdb
@@ -28,7 +28,7 @@ $OpenBSD: patch-dist_Makefile_in,v 1.5 2005/12/25 20:35:42 sturm Exp $
  
  ##################################################
  # C++
-@@ -49,10 +51,10 @@ libso_major=	$(libso_base)-$(SOMAJOR).@S
+@@ -49,10 +51,10 @@ libso_major=	$(libso_base)-$(SOMAJOR).@SOSUFFIX@
  ##################################################
  libcxx=		libdb_cxx.a
  libxso_base=	libdb_cxx
@@ -42,7 +42,7 @@ $OpenBSD: patch-dist_Makefile_in,v 1.5 2005/12/25 20:35:42 sturm Exp $
  
  ##################################################
  # JAVA
-@@ -71,11 +73,11 @@ JAVA_DBDIR=	$(JAVA_SRCDIR)/com/sleepycat
+@@ -71,11 +73,11 @@ JAVA_DBDIR=	$(JAVA_SRCDIR)/com/sleepycat/db
  JAVA_EXDIR=	$(JAVA_SRCDIR)/com/sleepycat/examples
  
  libjso_base=	libdb_java
@@ -58,7 +58,7 @@ $OpenBSD: patch-dist_Makefile_in,v 1.5 2005/12/25 20:35:42 sturm Exp $
  
  ##################################################
  # TCL
-@@ -86,10 +88,10 @@ libjso_g=	$(libjso_base)-$(SOVERSION)_g.
+@@ -86,10 +88,10 @@ libjso_g=	$(libjso_base)-$(SOVERSION)_g.@SOSUFFIX@
  ##################################################
  TCFLAGS=	@TCFLAGS@
  libtso_base=	libdb_tcl
@@ -114,46 +114,109 @@ $OpenBSD: patch-dist_Makefile_in,v 1.5 2005/12/25 20:35:42 sturm Exp $
  	@cd $(includedir) && $(chmod) $(fmode) db.h db_185.h db_cxx.h
  
  install_static: install_setup
-@@ -424,9 +427,9 @@ install_dynamic: install_setup
- 	@cd $(libdir) && \
+@@ -411,69 +414,72 @@ install_static: install_setup
+ 
+ install_static_cxx: install_setup
+ 	@echo "Installing DB C++ static library: $(libdir) ..."
+-	@test -d $(libdir) || \
++	test -d $(libdir) || \
+ 	    ($(mkdir) -p $(libdir) && $(chmod) $(dmode) $(libdir))
+-	@cd $(libdir) && $(rm) -f $(libcxx)
+-	@$(cp) -p $(libcxx) $(libdir)
+-	@cd $(libdir) && $(chmod) $(fmode) $(libcxx)
++	cd $(libdir) && $(rm) -f $(libcxx)
++	$(cp) -p $(libcxx) $(libdir)
++	cd $(libdir) && $(chmod) $(fmode) $(libcxx)
+ 
+ install_dynamic: install_setup
+ 	@echo "Installing DB library: $(libdir) ..."
+ 	@test -d $(libdir) || \
+ 	    ($(mkdir) -p $(libdir) && $(chmod) $(dmode) $(libdir))
+-	@cd $(libdir) && \
++	cd $(libdir) && \
  	    $(rm) -f $(libso) $(libso_default) $(libso_major)
- 	@$(INSTALLER) $(libso_target) $(libdir)
-+	@cd $(libsdir) && $(ln) -s db/$(libso)
- 	@cd $(libdir) && $(ln) -s $(libso) $(libso_default)
- 	@cd $(libdir) && $(ln) -s $(libso) $(libso_major)
+-	@$(INSTALLER) $(libso_target) $(libdir)
+-	@cd $(libdir) && $(ln) -s $(libso) $(libso_default)
+-	@cd $(libdir) && $(ln) -s $(libso) $(libso_major)
 -	@$(LIBTOOL) --mode=finish $(libdir)
++	$(INSTALLER) $(libso_target) $(libdir)
++	cd $(libsdir) && $(ln) -s db/$(libso)
++	cd $(libdir) && $(ln) -s $(libso) $(libso_default)
++	cd $(libdir) && $(ln) -s $(libso) $(libso_major)
  
  install_dynamic_cxx: install_setup
  	@echo "Installing DB C++ library: $(libdir) ..."
-@@ -435,6 +438,7 @@ install_dynamic_cxx: install_setup
- 	@cd $(libdir) && \
+-	@test -d $(libdir) || \
++	test -d $(libdir) || \
+ 	    ($(mkdir) -p $(libdir) && $(chmod) $(dmode) $(libdir))
+-	@cd $(libdir) && \
++	cd $(libdir) && \
  	    $(rm) -f $(libxso) $(libxso_default) $(libxso_major)
- 	@$(INSTALLER) $(libxso_target) $(libdir)
-+	@cd $(libsdir) && $(ln) -s db/$(libxso)
- 	@cd $(libdir) && $(ln) -s $(libxso) $(libxso_default)
- 	@cd $(libdir) && $(ln) -s $(libxso) $(libxso_major)
- 
-@@ -445,6 +449,7 @@ install_tcl: install_setup
- 	@cd $(libdir) && \
+-	@$(INSTALLER) $(libxso_target) $(libdir)
+-	@cd $(libdir) && $(ln) -s $(libxso) $(libxso_default)
+-	@cd $(libdir) && $(ln) -s $(libxso) $(libxso_major)
++	$(INSTALLER) $(libxso_target) $(libdir)
++	cd $(libsdir) && $(ln) -s db/$(libxso)
++	cd $(libdir) && $(ln) -s $(libxso) $(libxso_default)
++	cd $(libdir) && $(ln) -s $(libxso) $(libxso_major)
+ 
+ install_tcl: install_setup
+ 	@echo "Installing DB Tcl library: $(libdir) ..."
+-	@test -d $(libdir) || \
++	test -d $(libdir) || \
+ 	    ($(mkdir) -p $(libdir) && $(chmod) $(dmode) $(libdir))
+-	@cd $(libdir) && \
++	cd $(libdir) && \
  	    $(rm) -f $(libtso) $(libtso_default) $(libtso_major)
- 	@$(INSTALLER) $(libtso_target) $(libdir)
-+	@cd $(libsdir) && $(ln) -s db/$(libtso)
- 	@cd $(libdir) && $(ln) -s $(libtso) $(libtso_default)
- 	@cd $(libdir) && $(ln) -s $(libtso) $(libtso_major)
- 
-@@ -465,13 +470,14 @@ install_docs: install_setup
+-	@$(INSTALLER) $(libtso_target) $(libdir)
+-	@cd $(libdir) && $(ln) -s $(libtso) $(libtso_default)
+-	@cd $(libdir) && $(ln) -s $(libtso) $(libtso_major)
++	$(INSTALLER) $(libtso_target) $(libdir)
++	cd $(libsdir) && $(ln) -s db/$(libtso)
++	cd $(libdir) && $(ln) -s $(libtso) $(libtso_default)
++	cd $(libdir) && $(ln) -s $(libtso) $(libtso_major)
+ 
+ install_java: install_setup
+ 	@echo "Installing DB Java library: $(libdir) ..."
+-	@test -d $(libdir) || \
++	test -d $(libdir) || \
+ 	    ($(mkdir) -p $(libdir) && $(chmod) $(dmode) $(libdir))
+-	@cd $(libdir) && \
++	cd $(libdir) && \
+ 	    $(rm) -f $(libjso) $(libjso_default) $(libjso_major)
+-	@$(INSTALLER) $(libjso_target) $(libdir)
+-	@cd $(libdir) && $(ln) -s $(libjso) $(libjso_default)
+-	@cd $(libdir) && $(ln) -s $(libjso) $(libjso_major)
+-	@cd $(libdir) && $(ln) -s $(libjso) $(libjso_g)
++	$(INSTALLER) $(libjso_target) $(libdir)
++	cd $(libdir) && $(ln) -s $(libjso) $(libjso_default)
++	cd $(libdir) && $(ln) -s $(libjso) $(libjso_major)
++	cd $(libdir) && $(ln) -s $(libjso) $(libjso_g)
+ 
+ install_docs: install_setup
+ 	@echo "Installing documentation: $(docdir) ..."
+-	@test -d $(docdir) || \
++	test -d $(docdir) || \
  	    ($(mkdir) -p $(docdir) && $(chmod) $(dmode) $(docdir))
- 	@cd $(docdir) && $(rm) -rf *
- 	@cd $(srcdir)/docs && $(cp) -pr * $(docdir)/
-+	@chown -R root:wheel $(docdir)/
+-	@cd $(docdir) && $(rm) -rf *
+-	@cd $(srcdir)/docs && $(cp) -pr * $(docdir)/
++	cd $(docdir) && $(rm) -rf *
++	cd $(srcdir)/docs && $(cp) -pr * $(docdir)/
++	chown -R root:wheel $(docdir)/
  
  install_utilities: install_setup
  	@echo "Installing DB utilities: $(bindir) ..."
- 	@test -d $(bindir) || \
+-	@test -d $(bindir) || \
++	test -d $(bindir) || \
  	    ($(mkdir) -p $(bindir) && $(chmod) $(dmode) $(bindir))
- 	@cd $(bindir) && $(rm) -f $(PROGS)
+-	@cd $(bindir) && $(rm) -f $(PROGS)
 -	@$(INSTALLER) -fp $(PROGS) $(bindir)
-+	@$(INSTALLER) $(PROGS) $(bindir)
- 	@cd $(bindir) && (test ! -f $(strip) || $(strip) $(PROGS))
- 	@cd $(bindir) && $(chmod) $(emode) $(PROGS)
- 
+-	@cd $(bindir) && (test ! -f $(strip) || $(strip) $(PROGS))
+-	@cd $(bindir) && $(chmod) $(emode) $(PROGS)
++	cd $(bindir) && $(rm) -f $(PROGS)
++	$(INSTALLER) $(PROGS) $(bindir)
++	cd $(bindir) && (test ! -f $(strip) || $(strip) $(PROGS))
++	cd $(bindir) && $(chmod) $(emode) $(PROGS)
+ 
+ uninstall:
+ 	-cd $(bindir) && $(rm) -f $(PROGS)
diff --git a/databases/db/v3/patches/patch-dist_configure b/databases/db/v3/patches/patch-dist_configure
index 0a241ba411..41ee7a6914 100644
--- a/databases/db/v3/patches/patch-dist_configure
+++ b/databases/db/v3/patches/patch-dist_configure
@@ -1,6 +1,6 @@
-$OpenBSD: patch-dist_configure,v 1.4 2005/12/25 20:35:42 sturm Exp $
+$OpenBSD: patch-dist_configure,v 1.5 2010/10/28 10:33:16 steven Exp $
 --- dist/configure.orig	Mon Jul 31 18:58:18 2000
-+++ dist/configure	Sun Dec 25 19:59:25 2005
++++ dist/configure	Thu Oct 28 12:28:52 2010
 @@ -728,7 +728,7 @@ echo "$ac_t""no" 1>&6
  
  
@@ -10,7 +10,7 @@ $OpenBSD: patch-dist_configure,v 1.4 2005/12/25 20:35:42 sturm Exp $
  DEFAULT_LIB="\$(libdb)"
  DEFAULT_INSTALL="install_static"
  
-@@ -1602,7 +1602,6 @@ echo "configure:1601: checking libtool c
+@@ -1602,7 +1602,6 @@ echo "configure:1601: checking libtool configuration" 
  	${CONFIG_SHELL-/bin/sh} $srcdir/ltconfig \
  		--no-verify $srcdir/ltmain.sh \
  		--output=./libtool $host_os \
@@ -18,7 +18,7 @@ $OpenBSD: patch-dist_configure,v 1.4 2005/12/25 20:35:42 sturm Exp $
  	|| { echo "configure: error: libtool configure failed" 1>&2; exit 1; }
  
  	SOSUFFIX=`sed -e '/^library_names_spec=/!d' -e 's/.*\.\([a-zA-Z0-9_]*\).*/\1/' ./libtool`
-@@ -1615,9 +1614,11 @@ echo "configure:1601: checking libtool c
+@@ -1615,9 +1614,11 @@ echo "configure:1601: checking libtool configuration" 
  	MAKEFILE_CXX="\$(LIBTOOL) --mode=compile ${SAVE_CXX}"
  	MAKEFILE_CCLINK="\$(LIBTOOL) --mode=link ${SAVE_CC}"
  
@@ -32,7 +32,7 @@ $OpenBSD: patch-dist_configure,v 1.4 2005/12/25 20:35:42 sturm Exp $
  	SOFLAGS="-rpath \$(libdir)"
  	o=".lo"
  fi
-@@ -1936,7 +1937,7 @@ echo "configure:1911: checking for exist
+@@ -1936,7 +1937,7 @@ echo "configure:1911: checking for existence of $TCL_B
  		TCFLAGS="-I$TCL_PREFIX/include"
  	fi
  
diff --git a/databases/db/v3/patches/patch-env_env_open_c b/databases/db/v3/patches/patch-env_env_open_c
index 4d962d5c25..993418249a 100644
--- a/databases/db/v3/patches/patch-env_env_open_c
+++ b/databases/db/v3/patches/patch-env_env_open_c
@@ -1,7 +1,7 @@
-$OpenBSD: patch-env_env_open_c,v 1.1.1.1 2003/12/08 17:37:55 sturm Exp $
---- env/env_open.c.orig	Tue Jun 17 01:25:53 2003
-+++ env/env_open.c	Tue Jun 17 01:26:27 2003
-@@ -784,7 +784,7 @@ illegal:	__db_err(dbenv, "mis-formatted 
+$OpenBSD: patch-env_env_open_c,v 1.2 2010/10/28 10:33:16 steven Exp $
+--- env/env_open.c.orig	Fri Jun 30 15:34:54 2000
++++ env/env_open.c	Thu Oct 28 12:28:52 2010
+@@ -784,7 +784,7 @@ illegal:	__db_err(dbenv, "mis-formatted name-value pai
  		return (dbenv->set_lg_dir(dbenv, value));
  
  	if (!strcasecmp(name, "set_lk_detect")) {
@@ -10,7 +10,7 @@ $OpenBSD: patch-env_env_open_c,v 1.1.1.1 2003/12/08 17:37:55 sturm Exp $
  			goto badarg;
  		if (!strcasecmp(value, "db_lock_default"))
  			flags = DB_LOCK_DEFAULT;
-@@ -840,7 +840,7 @@ illegal:	__db_err(dbenv, "mis-formatted 
+@@ -840,7 +840,7 @@ illegal:	__db_err(dbenv, "mis-formatted name-value pai
  	}
  
  	if (!strcasecmp(name, "set_verbose")) {
diff --git a/databases/db/v3/patches/patch-tcl_tcl_compat_c b/databases/db/v3/patches/patch-tcl_tcl_compat_c
index e5cc237ee6..43a9c5e68b 100644
--- a/databases/db/v3/patches/patch-tcl_tcl_compat_c
+++ b/databases/db/v3/patches/patch-tcl_tcl_compat_c
@@ -1,6 +1,6 @@
-$OpenBSD: patch-tcl_tcl_compat_c,v 1.1 2004/01/10 08:36:28 sturm Exp $
---- tcl/tcl_compat.c.orig	2004-01-08 23:18:45.000000000 +0100
-+++ tcl/tcl_compat.c	2004-01-08 23:21:06.000000000 +0100
+$OpenBSD: patch-tcl_tcl_compat_c,v 1.2 2010/10/28 10:33:16 steven Exp $
+--- tcl/tcl_compat.c.orig	Mon May 22 20:36:50 2000
++++ tcl/tcl_compat.c	Thu Oct 28 12:28:52 2010
 @@ -74,7 +74,7 @@ bdb_HCommand(interp, objc, objv)
  	 * in the 'berkdb' command.
  	 */
@@ -28,7 +28,7 @@ $OpenBSD: patch-tcl_tcl_compat_c,v 1.1 2004/01/10 08:36:28 sturm Exp $
  		    TCL_EXACT, &optindex) != TCL_OK) {
  			arg = Tcl_GetStringFromObj(objv[i], NULL);
  			if (arg[0] == '-') {
-@@ -345,7 +345,7 @@ bdb_DbmCommand(interp, objc, objv, flag,
+@@ -345,7 +345,7 @@ bdb_DbmCommand(interp, objc, objv, flag, dbm)
  	 * in the 'berkdb' command.
  	 */
  	if (Tcl_GetIndexFromObj(interp,
@@ -37,7 +37,7 @@ $OpenBSD: patch-tcl_tcl_compat_c,v 1.1 2004/01/10 08:36:28 sturm Exp $
  		return (IS_HELP(objv[1]));
  
  	switch ((enum dbmcmds)cmdindex) {
-@@ -433,7 +433,7 @@ bdb_DbmCommand(interp, objc, objv, flag,
+@@ -433,7 +433,7 @@ bdb_DbmCommand(interp, objc, objv, flag, dbm)
  		if (flag == DBTCL_DBM)
  			ret = store(key, data);
  		else if (flag == DBTCL_NDBM) {
@@ -73,7 +73,7 @@ $OpenBSD: patch-tcl_tcl_compat_c,v 1.1 2004/01/10 08:36:28 sturm Exp $
  		return (IS_HELP(objv[1]));
  
  	res = NULL;
-@@ -965,7 +965,7 @@ mutex_Cmd(clientData, interp, objc, objv
+@@ -965,7 +965,7 @@ mutex_Cmd(clientData, interp, objc, objv)
  	 * defined above.
  	 */
  	if (Tcl_GetIndexFromObj(interp,
diff --git a/databases/db/v3/patches/patch-tcl_tcl_db_c b/databases/db/v3/patches/patch-tcl_tcl_db_c
index 2224e16777..9de00d21f8 100644
--- a/databases/db/v3/patches/patch-tcl_tcl_db_c
+++ b/databases/db/v3/patches/patch-tcl_tcl_db_c
@@ -1,6 +1,6 @@
-$OpenBSD: patch-tcl_tcl_db_c,v 1.1 2004/01/10 08:36:28 sturm Exp $
---- tcl/tcl_db.c.orig	2004-01-08 23:21:17.000000000 +0100
-+++ tcl/tcl_db.c	2004-01-08 23:22:34.000000000 +0100
+$OpenBSD: patch-tcl_tcl_db_c,v 1.2 2010/10/28 10:33:16 steven Exp $
+--- tcl/tcl_db.c.orig	Mon May 22 20:36:50 2000
++++ tcl/tcl_db.c	Thu Oct 28 12:28:52 2010
 @@ -121,7 +121,7 @@ db_Cmd(clientData, interp, objc, objv)
  	 * defined above.
  	 */
@@ -46,7 +46,7 @@ $OpenBSD: patch-tcl_tcl_db_c,v 1.1 2004/01/10 08:36:28 sturm Exp $
  		    TCL_EXACT, &optindex) != TCL_OK) {
  			/*
  			 * If we don't have a -glob or -txn, then the
-@@ -1286,7 +1286,7 @@ tcl_DbCursor(interp, objc, objv, dbp, db
+@@ -1286,7 +1286,7 @@ tcl_DbCursor(interp, objc, objv, dbp, dbcp)
  	 */
  	i = 2;
  	while (i < objc) {
@@ -55,7 +55,7 @@ $OpenBSD: patch-tcl_tcl_db_c,v 1.1 2004/01/10 08:36:28 sturm Exp $
  		    TCL_EXACT, &optindex) != TCL_OK) {
  			result = IS_HELP(objv[i]);
  			goto out;
-@@ -1359,7 +1359,7 @@ tcl_DbJoin(interp, objc, objv, dbp, dbcp
+@@ -1359,7 +1359,7 @@ tcl_DbJoin(interp, objc, objv, dbp, dbcp)
  	i = 2;
  	adj = i;
  	while (i < objc) {
diff --git a/databases/db/v3/patches/patch-tcl_tcl_env_c b/databases/db/v3/patches/patch-tcl_tcl_env_c
index 3dd5db010d..a5fe8a116d 100644
--- a/databases/db/v3/patches/patch-tcl_tcl_env_c
+++ b/databases/db/v3/patches/patch-tcl_tcl_env_c
@@ -1,6 +1,6 @@
-$OpenBSD: patch-tcl_tcl_env_c,v 1.1 2004/01/10 08:36:28 sturm Exp $
---- tcl/tcl_env.c.orig	2004-01-08 23:27:00.000000000 +0100
-+++ tcl/tcl_env.c	2004-01-08 23:27:53.000000000 +0100
+$OpenBSD: patch-tcl_tcl_env_c,v 1.2 2010/10/28 10:33:16 steven Exp $
+--- tcl/tcl_env.c.orig	Wed May 10 22:12:18 2000
++++ tcl/tcl_env.c	Thu Oct 28 12:28:52 2010
 @@ -127,7 +127,7 @@ env_Cmd(clientData, interp, objc, objv)
  	 * Get the command name index from the object based on the berkdbcmds
  	 * defined above.
@@ -10,7 +10,7 @@ $OpenBSD: patch-tcl_tcl_env_c,v 1.1 2004/01/10 08:36:28 sturm Exp $
  	    TCL_EXACT, &cmdindex) != TCL_OK)
  		return (IS_HELP(objv[1]));
  	res = NULL;
-@@ -309,7 +309,7 @@ tcl_EnvRemove(interp, objc, objv, envp, 
+@@ -309,7 +309,7 @@ tcl_EnvRemove(interp, objc, objv, envp, envip)
  
  	i = 2;
  	while (i < objc) {
@@ -19,7 +19,7 @@ $OpenBSD: patch-tcl_tcl_env_c,v 1.1 2004/01/10 08:36:28 sturm Exp $
  		    TCL_EXACT, &optindex) != TCL_OK) {
  			result = IS_HELP(objv[i]);
  			goto error;
-@@ -525,7 +525,7 @@ tcl_EnvVerbose(interp, envp, which, onof
+@@ -525,7 +525,7 @@ tcl_EnvVerbose(interp, envp, which, onoff)
  	int on, optindex, ret;
  	u_int32_t wh;
  
@@ -28,7 +28,7 @@ $OpenBSD: patch-tcl_tcl_env_c,v 1.1 2004/01/10 08:36:28 sturm Exp $
  	    TCL_EXACT, &optindex) != TCL_OK)
  		return (IS_HELP(which));
  
-@@ -545,7 +545,7 @@ tcl_EnvVerbose(interp, envp, which, onof
+@@ -545,7 +545,7 @@ tcl_EnvVerbose(interp, envp, which, onoff)
  	default:
  		return(TCL_ERROR);
  	}
diff --git a/databases/db/v3/patches/patch-tcl_tcl_mp_c b/databases/db/v3/patches/patch-tcl_tcl_mp_c
index 65bbb93b19..be29115f65 100644
--- a/databases/db/v3/patches/patch-tcl_tcl_mp_c
+++ b/databases/db/v3/patches/patch-tcl_tcl_mp_c
@@ -1,6 +1,6 @@
-$OpenBSD: patch-tcl_tcl_mp_c,v 1.1 2004/01/10 08:36:28 sturm Exp $
---- tcl/tcl_mp.c.orig	2004-01-08 23:29:23.000000000 +0100
-+++ tcl/tcl_mp.c	2004-01-08 23:29:58.000000000 +0100
+$OpenBSD: patch-tcl_tcl_mp_c,v 1.2 2010/10/28 10:33:16 steven Exp $
+--- tcl/tcl_mp.c.orig	Wed May 17 21:40:01 2000
++++ tcl/tcl_mp.c	Thu Oct 28 12:28:52 2010
 @@ -187,7 +187,7 @@ tcl_Mp(interp, objc, objv, envp, envip)
  	memset(newname, 0, MSG_SIZE);
  	while (i < objc) {
@@ -37,7 +37,7 @@ $OpenBSD: patch-tcl_tcl_mp_c,v 1.1 2004/01/10 08:36:28 sturm Exp $
  		return (IS_HELP(objv[1]));
  
  	res = NULL;
-@@ -697,7 +697,7 @@ tcl_Pg(interp, objc, objv, page, mp, pgi
+@@ -697,7 +697,7 @@ tcl_Pg(interp, objc, objv, page, mp, pgip, putop)
  	flag = 0;
  	while (i < objc) {
  		if (Tcl_GetIndexFromObj(interp, objv[i],
diff --git a/databases/db/v3/patches/patch-tcl_tcl_txn_c b/databases/db/v3/patches/patch-tcl_tcl_txn_c
index eb2b70ae23..c22c3b70b4 100644
--- a/databases/db/v3/patches/patch-tcl_tcl_txn_c
+++ b/databases/db/v3/patches/patch-tcl_tcl_txn_c
@@ -1,7 +1,7 @@
-$OpenBSD: patch-tcl_tcl_txn_c,v 1.1 2004/01/10 08:36:28 sturm Exp $
---- tcl/tcl_txn.c.orig	2004-01-08 23:30:03.000000000 +0100
-+++ tcl/tcl_txn.c	2004-01-08 23:30:50.000000000 +0100
-@@ -90,7 +90,7 @@ tcl_TxnCheckpoint(interp, objc, objv, en
+$OpenBSD: patch-tcl_tcl_txn_c,v 1.2 2010/10/28 10:33:16 steven Exp $
+--- tcl/tcl_txn.c.orig	Fri Apr 21 20:18:58 2000
++++ tcl/tcl_txn.c	Thu Oct 28 12:28:53 2010
+@@ -90,7 +90,7 @@ tcl_TxnCheckpoint(interp, objc, objv, envp)
  	i = 2;
  	while (i < objc) {
  		if (Tcl_GetIndexFromObj(interp, objv[i],
@@ -28,7 +28,7 @@ $OpenBSD: patch-tcl_tcl_txn_c,v 1.1 2004/01/10 08:36:28 sturm Exp $
  		return (IS_HELP(objv[1]));
  
  	res = NULL;
-@@ -451,7 +451,7 @@ tcl_TxnCommit(interp, objc, objv, txnp, 
+@@ -451,7 +451,7 @@ tcl_TxnCommit(interp, objc, objv, txnp, txnip)
  		return (TCL_ERROR);
  	}
  	if (objc == 3) {
diff --git a/databases/db/v4/patches/patch-dist_Makefile_in b/databases/db/v4/patches/patch-dist_Makefile_in
index 0226708ccc..70c488270b 100644
--- a/databases/db/v4/patches/patch-dist_Makefile_in
+++ b/databases/db/v4/patches/patch-dist_Makefile_in
@@ -1,6 +1,6 @@
-$OpenBSD: patch-dist_Makefile_in,v 1.9 2007/10/26 14:06:02 steven Exp $
+$OpenBSD: patch-dist_Makefile_in,v 1.10 2010/10/28 10:33:16 steven Exp $
 --- dist/Makefile.in.orig	Thu Jul  5 20:35:02 2007
-+++ dist/Makefile.in	Sat Sep 15 20:54:42 2007
++++ dist/Makefile.in	Thu Oct 28 12:27:31 2010
 @@ -11,7 +11,8 @@ exec_prefix=@exec_prefix@
  bindir=	@bindir@
  includedir=@includedir@
@@ -224,19 +224,41 @@ $OpenBSD: patch-dist_Makefile_in,v 1.9 2007/10/26 14:06:02 steven Exp $
  	$(CCLINK) -o $@ $(LDFLAGS) \
  	    db_verify@o@ util_cache@o@ util_sig@o@ $(DEF_LIB) $(LIBS)
  	$(POSTLINK) $@
-@@ -738,7 +733,7 @@ install_include:
+@@ -727,41 +722,36 @@ library_install: install_include install_lib install_u
+ uninstall: uninstall_include uninstall_lib uninstall_utilities uninstall_docs
+ 
+ install_setup:
+-	@test -d $(DESTDIR)$(prefix) || \
++	test -d $(DESTDIR)$(prefix) || \
+ 	    ($(MKDIR) -p $(DESTDIR)$(prefix) && \
+ 	    $(CHMOD) $(dmode) $(DESTDIR)$(prefix))
+ 
+ INCDOT=	db.h db_cxx.h @ADDITIONAL_INCS@
+ install_include:
+ 	@echo "Installing DB include files: $(DESTDIR)$(includedir) ..."
+-	@test -d $(DESTDIR)$(includedir) || \
++	test -d $(DESTDIR)$(includedir) || \
  	    ($(MKDIR) -p $(DESTDIR)$(includedir) && \
  	    $(CHMOD) $(dmode) $(DESTDIR)$(includedir))
- 	@cd $(DESTDIR)$(includedir) && $(RM) -f $(INCDOT)
+-	@cd $(DESTDIR)$(includedir) && $(RM) -f $(INCDOT)
 -	@$(CP) -p $(INCDOT) $(DESTDIR)$(includedir)
-+	@${BSD_INSTALL_DATA} -p $(INCDOT) $(DESTDIR)$(includedir)
- 	@cd $(DESTDIR)$(includedir) && $(CHMOD) $(fmode) $(INCDOT)
+-	@cd $(DESTDIR)$(includedir) && $(CHMOD) $(fmode) $(INCDOT)
++	cd $(DESTDIR)$(includedir) && $(RM) -f $(INCDOT)
++	${BSD_INSTALL_DATA} -p $(INCDOT) $(DESTDIR)$(includedir)
++	cd $(DESTDIR)$(includedir) && $(CHMOD) $(fmode) $(INCDOT)
  
  uninstall_include:
-@@ -752,15 +747,10 @@ install_lib:
- 	@cd $(DESTDIR)$(libdir) && $(RM) -f $(LIB_INSTALL_FILE_LIST)
- 	@$(INSTALLER) @INSTALL_LIBS@ $(DESTDIR)$(libdir)
- 	@(cd $(DESTDIR)$(libdir) && \
+ 	@cd $(DESTDIR)$(includedir) && $(RM) -f $(INCDOT)
+ 
+ install_lib:
+ 	@echo "Installing DB library: $(DESTDIR)$(libdir) ..."
+-	@test -d $(DESTDIR)$(libdir) || \
++	test -d $(DESTDIR)$(libdir) || \
+ 	    ($(MKDIR) -p $(DESTDIR)$(libdir) && \
+ 	    $(CHMOD) $(dmode) $(DESTDIR)$(libdir))
+-	@cd $(DESTDIR)$(libdir) && $(RM) -f $(LIB_INSTALL_FILE_LIST)
+-	@$(INSTALLER) @INSTALL_LIBS@ $(DESTDIR)$(libdir)
+-	@(cd $(DESTDIR)$(libdir) && \
 -	    test -f $(libso) && $(LN) -s $(libso) $(libso_default); \
 -	    test -f $(libso) && $(LN) -s $(libso) $(libso_major); \
 -	    test -f $(libxso) && $(LN) -s $(libxso) $(libxso_default); \
@@ -246,18 +268,44 @@ $OpenBSD: patch-dist_Makefile_in,v 1.9 2007/10/26 14:06:02 steven Exp $
 -	    test -f $(libjso) && $(LN) -s $(libjso) $(libjso_default); \
 -	    test -f $(libjso) && $(LN) -s $(libjso) $(libjso_major); \
 -	    test -f $(libjso) && $(LN) -s $(libjso) $(libjso_g)) || exit 0
+-	@(test -f $(libj_jarfile) && \
++	cd $(DESTDIR)$(libdir) && $(RM) -f $(LIB_INSTALL_FILE_LIST)
++	$(INSTALLER) @INSTALL_LIBS@ $(DESTDIR)$(libdir)
++	(cd $(DESTDIR)$(libdir) && \
 +	    test -f $(libso) && $(LN) -s db4/$(libso) ..; \
 +	    test -f $(libxso) && $(LN) -s db4/$(libxso) ..; \
 +	    test -f $(libtso) && $(LN) -s db4/$(libtso) ..; \
 +	    test -f $(libjso) && $(LN) -s db4/$(libjso) ..) || exit 0
- 	@(test -f $(libj_jarfile) && \
++	(test -f $(libj_jarfile) && \
  	    $(CP) $(libj_jarfile) $(DESTDIR)$(libdir) && \
  	    $(CHMOD) $(fmode) $(DESTDIR)$(libdir)/$(libj_jarfile)) || exit 0
-@@ -796,6 +786,7 @@ install_docs:
+ 
+@@ -770,10 +760,10 @@ uninstall_lib:
+ 
+ install_utilities:
+ 	@echo "Installing DB utilities: $(DESTDIR)$(bindir) ..."
+-	@test -d $(DESTDIR)$(bindir) || \
++	test -d $(DESTDIR)$(bindir) || \
+ 	    ($(MKDIR) -p $(DESTDIR)$(bindir) && \
+ 	    $(CHMOD) $(dmode) $(DESTDIR)$(bindir))
+-	@for i in $(UTIL_PROGS); do \
++	for i in $(UTIL_PROGS); do \
+ 		test -f $$i.exe && i=$$i.exe || i=$$i; \
+ 		$(RM) -f $(DESTDIR)$(bindir)/$$i; \
+ 		$(INSTALLER) $$i $(DESTDIR)$(bindir)/$$i; \
+@@ -791,11 +781,12 @@ DOCLIST=api_c api_cxx api_tcl articles collections gsg
+ 
+ install_docs:
+ 	@echo "Installing documentation: $(DESTDIR)$(docdir) ..."
+-	@test -d $(DESTDIR)$(docdir) || \
++	test -d $(DESTDIR)$(docdir) || \
+ 	    ($(MKDIR) -p $(DESTDIR)$(docdir) && \
  	    $(CHMOD) $(dmode) $(DESTDIR)$(docdir))
- 	@cd $(DESTDIR)$(docdir) && $(RM) -rf $(DOCLIST)
- 	@cd $(srcdir)/docs && $(CP) -pr $(DOCLIST) $(DESTDIR)$(docdir)/
-+	@chown -R root:wheel $(DESTDIR)$(docdir)/
+-	@cd $(DESTDIR)$(docdir) && $(RM) -rf $(DOCLIST)
+-	@cd $(srcdir)/docs && $(CP) -pr $(DOCLIST) $(DESTDIR)$(docdir)/
++	cd $(DESTDIR)$(docdir) && $(RM) -rf $(DOCLIST)
++	cd $(srcdir)/docs && $(CP) -pr $(DOCLIST) $(DESTDIR)$(docdir)/
++	chown -R root:wheel $(DESTDIR)$(docdir)/
  
  uninstall_docs:
  	@cd $(DESTDIR)$(docdir) && $(RM) -rf $(DOCLIST)