BerkeleyDB cleanup - stage 3

Version 2 of Berkeley DB has been repo-copied to databases/db2, for
naming consistency with the other ports.  Fix dependencies accordingly.

21 files changed, 15 insertions, 1142 deletions

diff --git a/CVSROOT/modules b/CVSROOT/modules
index 76a9100..223fc8f 100644
--- a/CVSROOT/modules
+++ b/CVSROOT/modules
@@ -1097,7 +1097,7 @@ darkstat	ports/net/darkstat
 datapipe	ports/net/datapipe
 date		src/bin/date
 datedif		ports/misc/datedif
-db		ports/databases/db
+db2		ports/databases/db2
 db3		ports/databases/db3
 db4		ports/databases/db4
 dbXML		ports/databases/dbXML
diff --git a/chinese/libtabe/Makefile b/chinese/libtabe/Makefile
index 9197bf6..4e26becc 100644
--- a/chinese/libtabe/Makefile
+++ b/chinese/libtabe/Makefile
@@ -16,7 +16,7 @@ MAINTAINER=	kcwu@ck.tp.edu.tw
 .if !defined(USE_DB2)
 LIB_DEPENDS=	db3.3:${PORTSDIR}/databases/db3
 .else
-LIB_DEPENDS=	db2.0:${PORTSDIR}/databases/db
+LIB_DEPENDS=	db2.0:${PORTSDIR}/databases/db2
 .endif
 
 WRKSRC=		${WRKDIR}/libtabe
diff --git a/chinese/xcin25/Makefile b/chinese/xcin25/Makefile
index c6011da..fee0f87 100644
--- a/chinese/xcin25/Makefile
+++ b/chinese/xcin25/Makefile
@@ -23,7 +23,7 @@ LIB_DEPENDS=	tabe.2:${PORTSDIR}/chinese/libtabe \
 .if !defined(USE_DB2)
 LIB_DEPENDS+=	db3.3:${PORTSDIR}/databases/db3
 .else
-LIB_DEPENDS+=	db2.0:${PORTSDIR}/databases/db
+LIB_DEPENDS+=	db2.0:${PORTSDIR}/databases/db2
 .endif
 RUN_DEPENDS=	${X11BASE}/lib/X11/fonts/local/kc15f.pcf.gz:${PORTSDIR}/chinese/kcfonts \
 		${LOCALBASE}/share/tabe/libtabe-0.2.5:${PORTSDIR}/chinese/libtabe
diff --git a/databases/Makefile b/databases/Makefile
index 5a2cc3f..2038ce7 100644
--- a/databases/Makefile
+++ b/databases/Makefile
@@ -8,7 +8,7 @@
     SUBDIR += cdb
     SUBDIR += clip
     SUBDIR += cyrus-imspd
-    SUBDIR += db
+    SUBDIR += db2
     SUBDIR += db3
     SUBDIR += db4
     SUBDIR += dbXML
diff --git a/databases/db/Makefile b/databases/db/Makefile
deleted file mode 100644
index 1e8ea3a..0000000
--- a/databases/db/Makefile
+++ /dev/null
@@ -1,42 +0,0 @@
-# ports collection makefile for:	Berkeley DB
-# Date created:				26 Jan 1998
-# Whom:					Josh Tiefenbach <josh@ican.net>
-#
-# $FreeBSD$
-#
-
-PORTNAME=	db
-PORTVERSION=	2.7.7
-PORTREVISION=	1
-CATEGORIES=	databases
-MASTER_SITES=	http://www.sleepycat.com/update/snapshot/
-
-MAINTAINER=	ade@FreeBSD.org
-
-Y2K=		http://www.sleepycat.com/faq.html#A8
-
-WRKSRC=		${WRKDIR}/${DISTNAME}/build_unix
-
-INSTALLS_SHLIB=		yes
-GNU_CONFIGURE=		yes
-CONFIGURE_SCRIPT=	../dist/configure
-CONFIGURE_ARGS=		--enable-compat185 \
-			--enable-dump185 --enable-cxx
-
-post-install:
-	@-${RM} -fr ${PREFIX}/share/examples/db2
-	${MKDIR} ${PREFIX}/share/examples/db2
-	cd ${WRKSRC}/..; \
-	    tar -cf - --exclude tags examples/ examples_cxx/ examples_java/. \
-		| ( cd ${PREFIX}/share/examples/db2; tar xf - )
-	@${ECHO_MSG} ""
-	@${ECHO_MSG} "Java support for ${PKGNAME} is *not* built by default, and requires that you"
-	@${ECHO_MSG} "have a working copy of the JDK (v1.1) installed."
-	@${ECHO_MSG} ""
-	@${ECHO_MSG} "To build java support, please read:"
-	@${ECHO_MSG} ""
-	@${ECHO_MSG} "${WRKDIR}/${DISTNAME}/java/README"
-	@${ECHO_MSG} ""
-	@${ECHO_MSG} "and follow the directions therein."
-
-.include <bsd.port.mk>
diff --git a/databases/db/distinfo b/databases/db/distinfo
deleted file mode 100644
index d761baf..0000000
--- a/databases/db/distinfo
+++ /dev/null
@@ -1 +0,0 @@
-MD5 (db-2.7.7.tar.gz) = 20256735091ee382c6601117d82d749a
diff --git a/databases/db/files/patch-aa b/databases/db/files/patch-aa
deleted file mode 100644
index db3d430..0000000
--- a/databases/db/files/patch-aa
+++ /dev/null
@@ -1,506 +0,0 @@
---- ../dist/Makefile.in.orig	Mon Dec  7 21:05:59 1998
-+++ ../dist/Makefile.in	Tue Jun  6 17:44:50 2000
-@@ -1,13 +1,16 @@
- # @(#)Makefile.in	10.62 (Sleepycat) 12/7/98
- 
-+SOVER?=	0
-+
- srcdir=	@srcdir@/..
- CPPFLAGS=-I. -I$(srcdir)/include @CPPFLAGS@
-+SHAREDFLAGS= -fpic -DPIC
- CFLAGS=	-c @CFLAGS@ $(CPPFLAGS)
- CC=	@CC@
- CXXFLAGS=-c @CXXFLAGS@ $(CPPFLAGS)
- CXX=	@CXX@
--LDFLAGS=@LDFLAGS@
--LIBS=	@LIBS@
-+LDFLAGS=@LDFLAGS@ -L.
-+LIBS=	@LIBS@ -ldb2
- 
- SHELL=	@db_cv_path_sh@
- ar=	@db_cv_path_ar@ cr
-@@ -43,85 +46,91 @@
- LOBJS=	@LIBOBJS@
- POBJS=	err.o getlong.o
- 
--libdb=	libdb.a
--all: $(libdb) $(PROGS)
-+libdb=  libdb2.a
-+libdbso=  libdb2.so.$(SOVER)
-+all: $(libdb) $(libdbso) $(PROGS)
- 
- $(libdb): db.h $(OBJS) $(LOBJS)
- 	$(rm) -f $@
- 	$(ar) $@ $(OBJS) $(LOBJS)
- 	test ! -f $(ranlib) || $(ranlib) $@
- 
-+$(libdbso): db.h $(OBJS:S/.o$/.so/g) $(LOBJS:S/.o$/.so/g)
-+	$(rm) -f $@
-+	$(CXX) -shared -Wl,-x -Wl,-assert -Wl,pure-text -Wl,-soname,$@ -o $@ $(OBJS:S/.o$/.so/g) $(LOBJS:S/.o$/.so/g)
-+	ln -sf $@ libdb2.so
-+
- DBA=	db_archive.o $(POBJS)
--db_archive: $(DBA) $(libdb)
--	$(CC) -o $@ $(LDFLAGS) $(DBA) $(libdb) $(LIBS)
-+db_archive: $(DBA) $(libdbso)
-+	$(CC) -o $@ $(LDFLAGS) $(DBA) $(LIBS)
- 
- DBB=	db_checkpoint.o $(POBJS)
--db_checkpoint: $(DBB) $(libdb)
--	$(CC) -o $@ $(LDFLAGS) $(DBB) $(libdb) $(LIBS)
-+db_checkpoint: $(DBB) $(libdbso)
-+	$(CC) -o $@ $(LDFLAGS) $(DBB) $(LIBS)
- 
- DBC=	db_deadlock.o $(POBJS)
--db_deadlock: $(DBC) $(libdb)
--	$(CC) -o $@ $(LDFLAGS) $(DBC) $(libdb) $(LIBS)
-+db_deadlock: $(DBC) $(libdbso)
-+	$(CC) -o $@ $(LDFLAGS) $(DBC) $(LIBS)
- 
- DBD=	db_dump.o $(POBJS)
--db_dump: $(DBD) $(libdb)
--	$(CC) -o $@ $(LDFLAGS) $(DBD) $(libdb) $(LIBS)
-+db_dump: $(DBD) $(libdbso)
-+	$(CC) -o $@ $(LDFLAGS) $(DBD) $(LIBS)
- 
- DBE=	db_dump185.o $(POBJS)
- db_dump185: $(DBE)
- 	$(CC) -o $@ $(LDFLAGS) $(DBE) $(LIBS)
- 
- DBF=	db_load.o $(POBJS)
--db_load: $(DBF) $(libdb)
--	$(CC) -o $@ $(LDFLAGS) $(DBF) $(libdb) $(LIBS)
-+db_load: $(DBF) $(libdbso)
-+	$(CC) -o $@ $(LDFLAGS) $(DBF) $(LIBS)
- 
- DBG=	db_printlog.o $(POBJS)
--db_printlog: $(DBG) $(libdb)
--	$(CC) -o $@ $(LDFLAGS) $(DBG) $(libdb) $(LIBS)
-+db_printlog: $(DBG) $(libdbso)
-+	$(CC) -o $@ $(LDFLAGS) $(DBG) $(LIBS)
- 
- DBH=	db_recover.o $(POBJS)
--db_recover: $(DBH) $(libdb)
--	$(CC) -o $@ $(LDFLAGS) $(DBH) $(libdb) $(LIBS)
-+db_recover: $(DBH) $(libdbso)
-+	$(CC) -o $@ $(LDFLAGS) $(DBH) $(LIBS)
- 
- DBI=	db_stat.o $(POBJS)
--db_stat: $(DBI) $(libdb)
--	$(CC) -o $@ $(LDFLAGS) $(DBI) $(libdb) $(LIBS)
-+db_stat: $(DBI) $(libdbso)
-+	$(CC) -o $@ $(LDFLAGS) $(DBI) $(LIBS)
- 
- EPROGS=	ex_access ex_appinit ex_btrec ex_lock ex_mpool ex_thread ex_tpcb
- DBJ=	ex_access.o
--ex_access: $(DBJ) $(libdb)
--	$(CC) -o $@ $(LDFLAGS) $(DBJ) $(libdb) $(LIBS)
-+ex_access: $(DBJ) $(libdbso)
-+	$(CC) -o $@ $(LDFLAGS) $(DBJ) $(LIBS)
- 
- DBK=	ex_appinit.o
--ex_appinit: $(DBK) $(libdb)
--	$(CC) -o $@ $(LDFLAGS) $(DBK) $(libdb) $(LIBS)
-+ex_appinit: $(DBK) $(libdbso)
-+	$(CC) -o $@ $(LDFLAGS) $(DBK) $(LIBS)
- 
- DBL=	ex_btrec.o
--ex_btrec: $(DBL) $(libdb)
--	$(CC) -o $@ $(LDFLAGS) $(DBL) $(libdb) $(LIBS)
-+ex_btrec: $(DBL) $(libdbso)
-+	$(CC) -o $@ $(LDFLAGS) $(DBL) $(LIBS)
- 
- DBM=	ex_lock.o $(POBJS)
--ex_lock: $(DBM) $(libdb)
--	$(CC) -o $@ $(LDFLAGS) $(DBM) $(libdb) $(LIBS)
-+ex_lock: $(DBM) $(libdbso)
-+	$(CC) -o $@ $(LDFLAGS) $(DBM) $(LIBS)
- 
- DBN=	ex_mpool.o
--ex_mpool: $(DBN) $(libdb)
--	$(CC) -o $@ $(LDFLAGS) $(DBN) $(libdb) $(LIBS)
-+ex_mpool: $(DBN) $(libdbso)
-+	$(CC) -o $@ $(LDFLAGS) $(DBN) $(LIBS)
- 
- DBO=	ex_thread.o
--ex_thread: $(DBO) $(libdb)
--	$(CC) -o $@ $(LDFLAGS) $(DBO) $(libdb) $(LIBS)
-+ex_thread: $(DBO) $(libdbso)
-+	$(CC) -o $@ $(LDFLAGS) $(DBO) $(LIBS)
- 
- DBP=	ex_tpcb.o $(POBJS)
--ex_tpcb: $(DBP) $(libdb)
--	$(CC) -o $@ $(LDFLAGS) $(DBP) $(libdb) $(LIBS)
-+ex_tpcb: $(DBP) $(libdbso)
-+	$(CC) -o $@ $(LDFLAGS) $(DBP) $(LIBS)
- 
- DBT=	tclAppInit.o tcl_dbm.o tcl_hsearch.o tcl_lock.o tcl_log.o tcl_mpool.o \
- 	tcl_mutex.o tcl_ndbm.o tcl_txn.o utils.o $(POBJS)
- 
- dbtest: .dbtestrc
--dbtest: $(DBT) $(libdb)
--	$(CC) -o $@ $(LDFLAGS) $(DBT) $(libdb) $(LIBS)
-+dbtest: $(DBT) $(libdbso)
-+	$(CC) -o $@ $(LDFLAGS) $(DBT) $(LIBS)
- 
- AOBJS=	err.o getcwd.o getlong.o getopt.o memcmp.o memcpy.o memmove.o \
- 	raise.o snprintf.o strerror.o strsep.o vsnprintf.o
-@@ -131,8 +140,8 @@
- 	$(rm) -f $(DBA) $(DBB) $(DBC) $(DBD) $(DBE) $(DBF) $(DBG) $(DBH)
- 	$(rm) -f $(DBI) $(DBJ) $(DBK) $(DBL) $(DBM) $(DBN) $(DBO) $(DBP)
- 	$(rm) -f $(DBT)
--	$(rm) -f $(PROGS) $(EPROGS) $(POBJS) $(LOBJS) @build_test@
--	$(rm) -f core *.core .dbtestrc $(libdb)
-+	$(rm) -f $(PROGS) $(EPROGS) $(POBJS) $(LOBJS) *.so @build_test@
-+	$(rm) -f core *.core .dbtestrc $(libdb) $(libdbso)
- 
- depend obj:
- 
-@@ -141,11 +150,11 @@
- 	$(rm) -f confdefs.h db.h db_int.h db_185.h include.tcl
- 
- prefix=	@prefix@
--bindir=	$(prefix)/BerkeleyDB/bin
--datadir=$(prefix)/BerkeleyDB/share
--includedir=$(prefix)/BerkeleyDB/include
--libdir=	$(prefix)/BerkeleyDB/lib
--mandir=	$(prefix)/BerkeleyDB/docs
-+bindir= $(prefix)/bin
-+datadir=$(prefix)/share/db2
-+includedir=$(prefix)/include/db2
-+libdir= $(prefix)/lib
-+mandir= $(prefix)/share/doc/db2
- 
- dmode=	755
- emode=	555
-@@ -170,6 +179,9 @@
- 	@cd $(libdir) && $(rm) -f $(libdb)
- 	@$(cp) -p $(libdb) $(libdir)
- 	@cd $(libdir) && $(chmod) $(fmode) $(libdb)
-+	@$(cp) -p $(libdbso) $(libdir)
-+	@cd $(libdir) && $(chmod) $(fmode) $(libdbso)
-+	ln -sf $(libdbso) $(libdir)/libdb2.so
- 	@echo "Installing DB utilities: $(bindir) ..."
- 	@test -d $(bindir) || \
- 	    ($(mkdir) -p $(bindir) && $(chmod) $(dmode) $(bindir))
-@@ -506,3 +518,320 @@
- 	$(CC) $(CFLAGS) $?
- vsnprintf.o: $(srcdir)/clib/vsnprintf.c
- 	$(CC) $(CFLAGS) $?
-+
-+# Shared build
-+# Programs.
-+db_archive.so: $(srcdir)/db_archive/db_archive.c
-+	$(CC) $(CFLAGS) $(SHAREDFLAGS) $? -o $@
-+db_checkpoint.so: $(srcdir)/db_checkpoint/db_checkpoint.c
-+	$(CC) $(CFLAGS) $(SHAREDFLAGS) $? -o $@
-+db_deadlock.so: $(srcdir)/db_deadlock/db_deadlock.c
-+	$(CC) $(CFLAGS) $(SHAREDFLAGS) $? -o $@
-+db_dump.so: $(srcdir)/db_dump/db_dump.c
-+	$(CC) $(CFLAGS) $(SHAREDFLAGS) $? -o $@
-+db_dump185.so: $(srcdir)/db_dump185/db_dump185.c
-+	$(CC) $(CFLAGS) $(SHAREDFLAGS) $? -o $@
-+db_load.so: $(srcdir)/db_load/db_load.c
-+	$(CC) $(CFLAGS) $(SHAREDFLAGS) $? -o $@
-+db_printlog.so: $(srcdir)/db_printlog/db_printlog.c
-+	$(CC) $(CFLAGS) $(SHAREDFLAGS) $? -o $@
-+db_recover.so: $(srcdir)/db_recover/db_recover.c
-+	$(CC) $(CFLAGS) $(SHAREDFLAGS) $? -o $@
-+db_stat.so: $(srcdir)/db_stat/db_stat.c
-+	$(CC) $(CFLAGS) $(SHAREDFLAGS) $? -o $@
-+
-+# Examples.
-+ex_access.so: $(srcdir)/examples/ex_access.c
-+	$(CC) $(CFLAGS) $(SHAREDFLAGS) $? -o $@
-+ex_appinit.so: $(srcdir)/examples/ex_appinit.c
-+	$(CC) $(CFLAGS) $(SHAREDFLAGS) $? -o $@
-+ex_btrec.so: $(srcdir)/examples/ex_btrec.c
-+	$(CC) $(CFLAGS) $(SHAREDFLAGS) $? -o $@
-+ex_lock.so: $(srcdir)/examples/ex_lock.c
-+	$(CC) $(CFLAGS) $(SHAREDFLAGS) $? -o $@
-+ex_mpool.so: $(srcdir)/examples/ex_mpool.c
-+	$(CC) $(CFLAGS) $(SHAREDFLAGS) $? -o $@
-+ex_thread.so: $(srcdir)/examples/ex_thread.c
-+	$(CC) $(CFLAGS) $(SHAREDFLAGS) $? -o $@
-+ex_tpcb.so: $(srcdir)/examples/ex_tpcb.c
-+	$(CC) $(CFLAGS) $(SHAREDFLAGS) $? -o $@
-+
-+# DB files.
-+db.so: $(srcdir)/db/db.c
-+	$(CC) $(CFLAGS) $(SHAREDFLAGS) $? -o $@
-+db_am.so: $(srcdir)/db/db_am.c
-+	$(CC) $(CFLAGS) $(SHAREDFLAGS) $? -o $@
-+db_auto.so: $(srcdir)/db/db_auto.c
-+	$(CC) $(CFLAGS) $(SHAREDFLAGS) $? -o $@
-+db_conv.so: $(srcdir)/db/db_conv.c
-+	$(CC) $(CFLAGS) $(SHAREDFLAGS) $? -o $@
-+db_dispatch.so: $(srcdir)/db/db_dispatch.c
-+	$(CC) $(CFLAGS) $(SHAREDFLAGS) $? -o $@
-+db_dup.so: $(srcdir)/db/db_dup.c
-+	$(CC) $(CFLAGS) $(SHAREDFLAGS) $? -o $@
-+db_iface.so: $(srcdir)/db/db_iface.c
-+	$(CC) $(CFLAGS) $(SHAREDFLAGS) $? -o $@
-+db_join.so: $(srcdir)/db/db_join.c
-+	$(CC) $(CFLAGS) $(SHAREDFLAGS) $? -o $@
-+db_overflow.so: $(srcdir)/db/db_overflow.c
-+	$(CC) $(CFLAGS) $(SHAREDFLAGS) $? -o $@
-+db_pr.so: $(srcdir)/db/db_pr.c
-+	$(CC) $(CFLAGS) $(SHAREDFLAGS) $? -o $@
-+db_rec.so: $(srcdir)/db/db_rec.c
-+	$(CC) $(CFLAGS) $(SHAREDFLAGS) $? -o $@
-+db_ret.so: $(srcdir)/db/db_ret.c
-+	$(CC) $(CFLAGS) $(SHAREDFLAGS) $? -o $@
-+
-+# Btree source files.
-+bt_compare.so: $(srcdir)/btree/bt_compare.c
-+	$(CC) $(CFLAGS) $(SHAREDFLAGS) $? -o $@
-+bt_conv.so: $(srcdir)/btree/bt_conv.c
-+	$(CC) $(CFLAGS) $(SHAREDFLAGS) $? -o $@
-+bt_curadj.so: $(srcdir)/btree/bt_curadj.c
-+	$(CC) $(CFLAGS) $(SHAREDFLAGS) $? -o $@
-+bt_cursor.so: $(srcdir)/btree/bt_cursor.c
-+	$(CC) $(CFLAGS) $(SHAREDFLAGS) $? -o $@
-+bt_delete.so: $(srcdir)/btree/bt_delete.c
-+	$(CC) $(CFLAGS) $(SHAREDFLAGS) $? -o $@
-+bt_open.so: $(srcdir)/btree/bt_open.c
-+	$(CC) $(CFLAGS) $(SHAREDFLAGS) $? -o $@
-+bt_page.so: $(srcdir)/btree/bt_page.c
-+	$(CC) $(CFLAGS) $(SHAREDFLAGS) $? -o $@
-+bt_put.so: $(srcdir)/btree/bt_put.c
-+	$(CC) $(CFLAGS) $(SHAREDFLAGS) $? -o $@
-+bt_rec.so: $(srcdir)/btree/bt_rec.c
-+	$(CC) $(CFLAGS) $(SHAREDFLAGS) $? -o $@
-+bt_recno.so: $(srcdir)/btree/bt_recno.c
-+	$(CC) $(CFLAGS) $(SHAREDFLAGS) $? -o $@
-+bt_rsearch.so: $(srcdir)/btree/bt_rsearch.c
-+	$(CC) $(CFLAGS) $(SHAREDFLAGS) $? -o $@
-+bt_search.so: $(srcdir)/btree/bt_search.c
-+	$(CC) $(CFLAGS) $(SHAREDFLAGS) $? -o $@
-+bt_split.so: $(srcdir)/btree/bt_split.c
-+	$(CC) $(CFLAGS) $(SHAREDFLAGS) $? -o $@
-+bt_stack.so: $(srcdir)/btree/bt_stack.c
-+	$(CC) $(CFLAGS) $(SHAREDFLAGS) $? -o $@
-+bt_stat.so: $(srcdir)/btree/bt_stat.c
-+	$(CC) $(CFLAGS) $(SHAREDFLAGS) $? -o $@
-+btree_auto.so: $(srcdir)/btree/btree_auto.c
-+	$(CC) $(CFLAGS) $(SHAREDFLAGS) $? -o $@
-+
-+# C++ interface files.
-+cxx_app.so: $(srcdir)/cxx/cxx_app.cpp
-+	$(CXX) $(CXXFLAGS) $(SHAREDFLAGS) $? -o $@
-+cxx_except.so: $(srcdir)/cxx/cxx_except.cpp
-+	$(CXX) $(CXXFLAGS) $(SHAREDFLAGS) $? -o $@
-+cxx_lock.so: $(srcdir)/cxx/cxx_lock.cpp
-+	$(CXX) $(CXXFLAGS) $(SHAREDFLAGS) $? -o $@
-+cxx_log.so: $(srcdir)/cxx/cxx_log.cpp
-+	$(CXX) $(CXXFLAGS) $(SHAREDFLAGS) $? -o $@
-+cxx_mpool.so: $(srcdir)/cxx/cxx_mpool.cpp
-+	$(CXX) $(CXXFLAGS) $(SHAREDFLAGS) $? -o $@
-+cxx_table.so: $(srcdir)/cxx/cxx_table.cpp
-+	$(CXX) $(CXXFLAGS) $(SHAREDFLAGS) $? -o $@
-+cxx_txn.so: $(srcdir)/cxx/cxx_txn.cpp
-+	$(CXX) $(CXXFLAGS) $(SHAREDFLAGS) $? -o $@
-+
-+# Hash source files.
-+hash_auto.so: $(srcdir)/hash/hash_auto.c
-+	$(CC) $(CFLAGS) $(SHAREDFLAGS) $? -o $@
-+hash.so: $(srcdir)/hash/hash.c
-+	$(CC) $(CFLAGS) $(SHAREDFLAGS) $? -o $@
-+hash_conv.so: $(srcdir)/hash/hash_conv.c
-+	$(CC) $(CFLAGS) $(SHAREDFLAGS) $? -o $@
-+hash_dup.so: $(srcdir)/hash/hash_dup.c
-+	$(CC) $(CFLAGS) $(SHAREDFLAGS) $? -o $@
-+hash_func.so: $(srcdir)/hash/hash_func.c
-+	$(CC) $(CFLAGS) $(SHAREDFLAGS) $? -o $@
-+hash_page.so: $(srcdir)/hash/hash_page.c
-+	$(CC) $(CFLAGS) $(SHAREDFLAGS) $? -o $@
-+hash_rec.so: $(srcdir)/hash/hash_rec.c
-+	$(CC) $(CFLAGS) $(SHAREDFLAGS) $? -o $@
-+hash_stat.so: $(srcdir)/hash/hash_stat.c
-+	$(CC) $(CFLAGS) $(SHAREDFLAGS) $? -o $@
-+
-+# Lock source files.
-+lock.so: $(srcdir)/lock/lock.c
-+	$(CC) $(CFLAGS) $(SHAREDFLAGS) $? -o $@
-+lock_conflict.so:$(srcdir)/lock/lock_conflict.c
-+	$(CC) $(CFLAGS) $(SHAREDFLAGS) $? -o $@
-+lock_deadlock.so:$(srcdir)/lock/lock_deadlock.c
-+	$(CC) $(CFLAGS) $(SHAREDFLAGS) $? -o $@
-+lock_region.so:$(srcdir)/lock/lock_region.c
-+	$(CC) $(CFLAGS) $(SHAREDFLAGS) $? -o $@
-+lock_util.so:$(srcdir)/lock/lock_util.c
-+	$(CC) $(CFLAGS) $(SHAREDFLAGS) $? -o $@
-+
-+# Log source files.
-+log.so: $(srcdir)/log/log.c
-+	$(CC) $(CFLAGS) $(SHAREDFLAGS) $? -o $@
-+log_archive.so: $(srcdir)/log/log_archive.c
-+	$(CC) $(CFLAGS) $(SHAREDFLAGS) $? -o $@
-+log_auto.so: $(srcdir)/log/log_auto.c
-+	$(CC) $(CFLAGS) $(SHAREDFLAGS) $? -o $@
-+log_compare.so: $(srcdir)/log/log_compare.c
-+	$(CC) $(CFLAGS) $(SHAREDFLAGS) $? -o $@
-+log_findckp.so: $(srcdir)/log/log_findckp.c
-+	$(CC) $(CFLAGS) $(SHAREDFLAGS) $? -o $@
-+log_get.so: $(srcdir)/log/log_get.c
-+	$(CC) $(CFLAGS) $(SHAREDFLAGS) $? -o $@
-+log_put.so: $(srcdir)/log/log_put.c
-+	$(CC) $(CFLAGS) $(SHAREDFLAGS) $? -o $@
-+log_rec.so: $(srcdir)/log/log_rec.c
-+	$(CC) $(CFLAGS) $(SHAREDFLAGS) $? -o $@
-+log_register.so: $(srcdir)/log/log_register.c
-+	$(CC) $(CFLAGS) $(SHAREDFLAGS) $? -o $@
-+
-+# Mpool source files.
-+mp_bh.so: $(srcdir)/mp/mp_bh.c
-+	$(CC) $(CFLAGS) $(SHAREDFLAGS) $? -o $@
-+mp_fget.so: $(srcdir)/mp/mp_fget.c
-+	$(CC) $(CFLAGS) $(SHAREDFLAGS) $? -o $@
-+mp_fopen.so: $(srcdir)/mp/mp_fopen.c
-+	$(CC) $(CFLAGS) $(SHAREDFLAGS) $? -o $@
-+mp_fput.so: $(srcdir)/mp/mp_fput.c
-+	$(CC) $(CFLAGS) $(SHAREDFLAGS) $? -o $@
-+mp_fset.so: $(srcdir)/mp/mp_fset.c
-+	$(CC) $(CFLAGS) $(SHAREDFLAGS) $? -o $@
-+mp_open.so: $(srcdir)/mp/mp_open.c
-+	$(CC) $(CFLAGS) $(SHAREDFLAGS) $? -o $@
-+mp_pr.so: $(srcdir)/mp/mp_pr.c
-+	$(CC) $(CFLAGS) $(SHAREDFLAGS) $? -o $@
-+mp_region.so: $(srcdir)/mp/mp_region.c
-+	$(CC) $(CFLAGS) $(SHAREDFLAGS) $? -o $@
-+mp_sync.so: $(srcdir)/mp/mp_sync.c
-+	$(CC) $(CFLAGS) $(SHAREDFLAGS) $? -o $@
-+
-+# Mutex source files.
-+mutex.so: $(srcdir)/mutex/mutex.c
-+	$(CC) $(CFLAGS) $(SHAREDFLAGS) $? -o $@
-+# XXX
-+# UTS4 spinlocks
-+uts4_cc.so: $(srcdir)/mutex/uts4_cc.s
-+	$(AS) $(ASFLAGS) $(SHAREDFLAGS) -o $@ $? -o $@
-+
-+# Transaction source files.
-+txn.so: $(srcdir)/txn/txn.c
-+	$(CC) $(CFLAGS) $(SHAREDFLAGS) $? -o $@
-+txn_auto.so: $(srcdir)/txn/txn_auto.c
-+	$(CC) $(CFLAGS) $(SHAREDFLAGS) $? -o $@
-+txn_rec.so: $(srcdir)/txn/txn_rec.c
-+	$(CC) $(CFLAGS) $(SHAREDFLAGS) $? -o $@
-+
-+# XA source files.
-+xa.so: $(srcdir)/xa/xa.c
-+	$(CC) $(CFLAGS) $(SHAREDFLAGS) $? -o $@
-+xa_db.so: $(srcdir)/xa/xa_db.c
-+	$(CC) $(CFLAGS) $(SHAREDFLAGS) $? -o $@
-+xa_map.so: $(srcdir)/xa/xa_map.c
-+	$(CC) $(CFLAGS) $(SHAREDFLAGS) $? -o $@
-+
-+# Historic interfaces.
-+hsearch.so: $(srcdir)/hsearch/hsearch.c
-+	$(CC) $(CFLAGS) $(SHAREDFLAGS) $? -o $@
-+dbm.so: $(srcdir)/dbm/dbm.c
-+	$(CC) $(CFLAGS) $(SHAREDFLAGS) $? -o $@
-+db185.so: $(srcdir)/db185/db185.c
-+	$(CC) $(CFLAGS) $(SHAREDFLAGS) $? -o $@
-+
-+# Common source files.
-+db_appinit.so: $(srcdir)/common/db_appinit.c
-+	$(CC) $(CFLAGS) $(SHAREDFLAGS) $? -o $@
-+db_apprec.so: $(srcdir)/common/db_apprec.c
-+	$(CC) $(CFLAGS) $(SHAREDFLAGS) $? -o $@
-+db_byteorder.so: $(srcdir)/common/db_byteorder.c
-+	$(CC) $(CFLAGS) $(SHAREDFLAGS) $? -o $@
-+db_err.so: $(srcdir)/common/db_err.c
-+	$(CC) $(CFLAGS) $(SHAREDFLAGS) $? -o $@
-+db_log2.so: $(srcdir)/common/db_log2.c
-+	$(CC) $(CFLAGS) $(SHAREDFLAGS) $? -o $@
-+db_region.so: $(srcdir)/common/db_region.c
-+	$(CC) $(CFLAGS) $(SHAREDFLAGS) $? -o $@
-+db_salloc.so: $(srcdir)/common/db_salloc.c
-+	$(CC) $(CFLAGS) $(SHAREDFLAGS) $? -o $@
-+db_shash.so: $(srcdir)/common/db_shash.c
-+	$(CC) $(CFLAGS) $(SHAREDFLAGS) $? -o $@
-+
-+# OS specific source files.
-+os_abs.so: $(srcdir)/os/os_abs.c
-+	$(CC) $(CFLAGS) $(SHAREDFLAGS) $? -o $@
-+os_alloc.so: $(srcdir)/os/os_alloc.c
-+	$(CC) $(CFLAGS) $(SHAREDFLAGS) $? -o $@
-+os_config.so: $(srcdir)/os/os_config.c
-+	$(CC) $(CFLAGS) $(SHAREDFLAGS) $? -o $@
-+os_dir.so: $(srcdir)/os/os_dir.c
-+	$(CC) $(CFLAGS) $(SHAREDFLAGS) $? -o $@
-+os_fid.so: $(srcdir)/os/os_fid.c
-+	$(CC) $(CFLAGS) $(SHAREDFLAGS) $? -o $@
-+os_fsync.so: $(srcdir)/os/os_fsync.c
-+	$(CC) $(CFLAGS) $(SHAREDFLAGS) $? -o $@
-+os_map.so: $(srcdir)/os/os_map.c
-+	$(CC) $(CFLAGS) $(SHAREDFLAGS) $? -o $@
-+os_oflags.so: $(srcdir)/os/os_oflags.c
-+	$(CC) $(CFLAGS) $(SHAREDFLAGS) $? -o $@
-+os_open.so: $(srcdir)/os/os_open.c
-+	$(CC) $(CFLAGS) $(SHAREDFLAGS) $? -o $@
-+os_rpath.so: $(srcdir)/os/os_rpath.c
-+	$(CC) $(CFLAGS) $(SHAREDFLAGS) $? -o $@
-+os_rw.so: $(srcdir)/os/os_rw.c
-+	$(CC) $(CFLAGS) $(SHAREDFLAGS) $? -o $@
-+os_seek.so: $(srcdir)/os/os_seek.c
-+	$(CC) $(CFLAGS) $(SHAREDFLAGS) $? -o $@
-+os_sleep.so: $(srcdir)/os/os_sleep.c
-+	$(CC) $(CFLAGS) $(SHAREDFLAGS) $? -o $@
-+os_spin.so: $(srcdir)/os/os_spin.c
-+	$(CC) $(CFLAGS) $(SHAREDFLAGS) $? -o $@
-+os_stat.so: $(srcdir)/os/os_stat.c
-+	$(CC) $(CFLAGS) $(SHAREDFLAGS) $? -o $@
-+os_tmpdir.so: $(srcdir)/os/os_tmpdir.c
-+	$(CC) $(CFLAGS) $(SHAREDFLAGS) $? -o $@
-+os_unlink.so: $(srcdir)/os/os_unlink.c
-+	$(CC) $(CFLAGS) $(SHAREDFLAGS) $? -o $@
-+
-+# Test programs.
-+tclAppInit.so: $(srcdir)/test/tclAppInit.c
-+	$(CC) $(CFLAGS) $(SHAREDFLAGS) $? -o $@
-+tcl_dbm.so: $(srcdir)/test/tcl_dbm.c
-+	$(CC) $(CFLAGS) $(SHAREDFLAGS) $? -o $@
-+tcl_hsearch.so: $(srcdir)/test/tcl_hsearch.c
-+	$(CC) $(CFLAGS) $(SHAREDFLAGS) $? -o $@
-+tcl_lock.so: $(srcdir)/test/tcl_lock.c
-+	$(CC) $(CFLAGS) $(SHAREDFLAGS) $? -o $@
-+tcl_log.so: $(srcdir)/test/tcl_log.c
-+	$(CC) $(CFLAGS) $(SHAREDFLAGS) $? -o $@
-+tcl_mpool.so: $(srcdir)/test/tcl_mpool.c
-+	$(CC) $(CFLAGS) $(SHAREDFLAGS) $? -o $@
-+tcl_mutex.so: $(srcdir)/test/tcl_mutex.c
-+	$(CC) $(CFLAGS) $(SHAREDFLAGS) $? -o $@
-+tcl_ndbm.so: $(srcdir)/test/tcl_ndbm.c
-+	$(CC) $(CFLAGS) $(SHAREDFLAGS) $? -o $@
-+tcl_txn.so: $(srcdir)/test/tcl_txn.c
-+	$(CC) $(CFLAGS) $(SHAREDFLAGS) $? -o $@
-+utils.so: $(srcdir)/test/utils.c
-+	$(CC) $(CFLAGS) $(SHAREDFLAGS) $? -o $@
-+
-+# Replacement source files.
-+err.so: $(srcdir)/clib/err.c
-+	$(CC) $(CFLAGS) $(SHAREDFLAGS) $? -o $@
-+getcwd.so: $(srcdir)/clib/getcwd.c
-+	$(CC) $(CFLAGS) $(SHAREDFLAGS) $? -o $@
-+getlong.so: $(srcdir)/clib/getlong.c
-+	$(CC) $(CFLAGS) $(SHAREDFLAGS) $? -o $@
-+getopt.so: $(srcdir)/clib/getopt.c
-+	$(CC) $(CFLAGS) $(SHAREDFLAGS) $? -o $@
-+memcmp.so: $(srcdir)/clib/memcmp.c
-+	$(CC) $(CFLAGS) $(SHAREDFLAGS) $? -o $@
-+memcpy.so: $(srcdir)/clib/memmove.c
-+	$(CC) -DMEMCOPY $(CFLAGS) $(SHAREDFLAGS) $? -o $@
-+memmove.so: $(srcdir)/clib/memmove.c
-+	$(CC) -DMEMMOVE $(CFLAGS) $(SHAREDFLAGS) $? -o $@
-+raise.so: $(srcdir)/clib/raise.c
-+	$(CC) $(CFLAGS) $(SHAREDFLAGS) $? -o $@
-+snprintf.so: $(srcdir)/clib/snprintf.c
-+	$(CC) $(CFLAGS) $(SHAREDFLAGS) $? -o $@
-+strerror.so: $(srcdir)/clib/strerror.c
-+	$(CC) $(CFLAGS) $(SHAREDFLAGS) $? -o $@
-+strsep.so: $(srcdir)/clib/strsep.c
-+	$(CC) $(CFLAGS) $(SHAREDFLAGS) $? -o $@
-+vsnprintf.so: $(srcdir)/clib/vsnprintf.c
-+	$(CC) $(CFLAGS) $(SHAREDFLAGS) $? -o $@
diff --git a/databases/db/pkg-comment b/databases/db/pkg-comment
deleted file mode 100644
index 39a54a2..0000000
--- a/databases/db/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-The Berkeley DB package, revision 2
diff --git a/databases/db/pkg-descr b/databases/db/pkg-descr
deleted file mode 100644
index 58fd9f8..0000000
--- a/databases/db/pkg-descr
+++ /dev/null
@@ -1,13 +0,0 @@
-Revesion 2 of the Berkeley DB library. This version uses an incompatible
-underlying database format than revision 1 and a different standard API.
-Utilities are included in the distribution to convert v1.85 databases to v2
-databases, and a backwards compatible API is provided to maintain
-compatibility with programs using the v1.85 interface.
-
-There are minor interface changes in this release which may require that DB
-applications be modified and recompiled. For a complete discussion of
-interface changes, see:
-
-http://www.sleepycat.com/update/
-  
-WWW: http://www.sleepycat.com/
diff --git a/databases/db/pkg-plist b/databases/db/pkg-plist
deleted file mode 100644
index 961bc04..0000000
--- a/databases/db/pkg-plist
+++ /dev/null
@@ -1,564 +0,0 @@
-include/db2/db.h
-include/db2/db_cxx.h
-include/db2/db_185.h
-lib/libdb2.a
-lib/libdb2.so
-lib/libdb2.so.0
-bin/db_archive
-bin/db_checkpoint
-bin/db_deadlock
-bin/db_dump
-bin/db_dump185
-bin/db_load
-bin/db_printlog
-bin/db_recover
-bin/db_stat
-share/doc/db2/api_c/Db/close.html
-share/doc/db2/api_c/Db/cursor.html
-share/doc/db2/api_c/Db/del.html
-share/doc/db2/api_c/Db/fd.html
-share/doc/db2/api_c/Db/get.html
-share/doc/db2/api_c/Db/join.html
-share/doc/db2/api_c/Db/open.html
-share/doc/db2/api_c/Db/put.html
-share/doc/db2/api_c/Db/stat.html
-share/doc/db2/api_c/Db/sync.html
-share/doc/db2/api_c/DbEnv/appexit.html
-share/doc/db2/api_c/DbEnv/appinit.html
-share/doc/db2/api_c/DbEnv/env.html
-share/doc/db2/api_c/DbEnv/version.html
-share/doc/db2/api_c/DbInfo/info.html
-share/doc/db2/api_c/DbLock/put.html
-share/doc/db2/api_c/DbLockTab/close.html
-share/doc/db2/api_c/DbLockTab/detect.html
-share/doc/db2/api_c/DbLockTab/get.html
-share/doc/db2/api_c/DbLockTab/id.html
-share/doc/db2/api_c/DbLockTab/open.html
-share/doc/db2/api_c/DbLockTab/stat.html
-share/doc/db2/api_c/DbLockTab/unlink.html
-share/doc/db2/api_c/DbLockTab/vec.html
-share/doc/db2/api_c/DbLog/archive.html
-share/doc/db2/api_c/DbLog/close.html
-share/doc/db2/api_c/DbLog/compare.html
-share/doc/db2/api_c/DbLog/db_register.html
-share/doc/db2/api_c/DbLog/db_unregister.html
-share/doc/db2/api_c/DbLog/file.html
-share/doc/db2/api_c/DbLog/flush.html
-share/doc/db2/api_c/DbLog/get.html
-share/doc/db2/api_c/DbLog/lsn.html
-share/doc/db2/api_c/DbLog/open.html
-share/doc/db2/api_c/DbLog/put.html
-share/doc/db2/api_c/DbLog/stat.html
-share/doc/db2/api_c/DbLog/unlink.html
-share/doc/db2/api_c/DbMpool/close.html
-share/doc/db2/api_c/DbMpool/db_register.html
-share/doc/db2/api_c/DbMpool/open.html
-share/doc/db2/api_c/DbMpool/stat.html
-share/doc/db2/api_c/DbMpool/sync.html
-share/doc/db2/api_c/DbMpool/trickle.html
-share/doc/db2/api_c/DbMpool/unlink.html
-share/doc/db2/api_c/DbMpoolFile/close.html
-share/doc/db2/api_c/DbMpoolFile/get.html
-share/doc/db2/api_c/DbMpoolFile/open.html
-share/doc/db2/api_c/DbMpoolFile/put.html
-share/doc/db2/api_c/DbMpoolFile/set.html
-share/doc/db2/api_c/DbMpoolFile/sync.html
-share/doc/db2/api_c/DbTxn/abort.html
-share/doc/db2/api_c/DbTxn/commit.html
-share/doc/db2/api_c/DbTxn/id.html
-share/doc/db2/api_c/DbTxn/prepare.html
-share/doc/db2/api_c/DbTxnMgr/begin.html
-share/doc/db2/api_c/DbTxnMgr/checkpoint.html
-share/doc/db2/api_c/DbTxnMgr/close.html
-share/doc/db2/api_c/DbTxnMgr/open.html
-share/doc/db2/api_c/DbTxnMgr/stat.html
-share/doc/db2/api_c/DbTxnMgr/unlink.html
-share/doc/db2/api_c/Dbc/close.html
-share/doc/db2/api_c/Dbc/del.html
-share/doc/db2/api_c/Dbc/get.html
-share/doc/db2/api_c/Dbc/put.html
-share/doc/db2/api_c/Dbt/dbt.html
-share/doc/db2/api_c/historic/dbm.html
-share/doc/db2/api_c/historic/hsearch.html
-share/doc/db2/api_c/index/flags.html
-share/doc/db2/api_c/index/function.html
-share/doc/db2/api_c/index/structure.html
-share/doc/db2/api_c/internal/db_jump_set.html
-share/doc/db2/api_c/internal/db_value_set.html
-share/doc/db2/api_cxx/Db/class.html
-share/doc/db2/api_cxx/Db/close.html
-share/doc/db2/api_cxx/Db/cursor.html
-share/doc/db2/api_cxx/Db/del.html
-share/doc/db2/api_cxx/Db/fd.html
-share/doc/db2/api_cxx/Db/get.html
-share/doc/db2/api_cxx/Db/get_byteswapped.html
-share/doc/db2/api_cxx/Db/get_type.html
-share/doc/db2/api_cxx/Db/join.html
-share/doc/db2/api_cxx/Db/open.html
-share/doc/db2/api_cxx/Db/put.html
-share/doc/db2/api_cxx/Db/stat.html
-share/doc/db2/api_cxx/Db/sync.html
-share/doc/db2/api_cxx/DbEnv/appexit.html
-share/doc/db2/api_cxx/DbEnv/appinit.html
-share/doc/db2/api_cxx/DbEnv/class.html
-share/doc/db2/api_cxx/DbEnv/get_lg_info.html
-share/doc/db2/api_cxx/DbEnv/get_lk_info.html
-share/doc/db2/api_cxx/DbEnv/get_mp_info.html
-share/doc/db2/api_cxx/DbEnv/get_tx_info.html
-share/doc/db2/api_cxx/DbEnv/set_errcall.html
-share/doc/db2/api_cxx/DbEnv/set_errfile.html
-share/doc/db2/api_cxx/DbEnv/set_error_model.html
-share/doc/db2/api_cxx/DbEnv/set_error_stream.html
-share/doc/db2/api_cxx/DbEnv/set_errpfx.html
-share/doc/db2/api_cxx/DbEnv/set_lg_max.html
-share/doc/db2/api_cxx/DbEnv/set_lk_conflicts.html
-share/doc/db2/api_cxx/DbEnv/set_lk_detect.html
-share/doc/db2/api_cxx/DbEnv/set_lk_max.html
-share/doc/db2/api_cxx/DbEnv/set_lk_modes.html
-share/doc/db2/api_cxx/DbEnv/set_lorder.html
-share/doc/db2/api_cxx/DbEnv/set_mp_mmapsize.html
-share/doc/db2/api_cxx/DbEnv/set_mp_size.html
-share/doc/db2/api_cxx/DbEnv/set_tx_max.html
-share/doc/db2/api_cxx/DbEnv/set_tx_recover.html
-share/doc/db2/api_cxx/DbEnv/set_verbose.html
-share/doc/db2/api_cxx/DbEnv/version.html
-share/doc/db2/api_cxx/DbException/class.html
-share/doc/db2/api_cxx/DbException/get_errno.html
-share/doc/db2/api_cxx/DbException/what.html
-share/doc/db2/api_cxx/DbInfo/class.html
-share/doc/db2/api_cxx/DbInfo/set_bt_compare.html
-share/doc/db2/api_cxx/DbInfo/set_bt_maxkey.html
-share/doc/db2/api_cxx/DbInfo/set_bt_minkey.html
-share/doc/db2/api_cxx/DbInfo/set_bt_prefix.html
-share/doc/db2/api_cxx/DbInfo/set_cachesize.html
-share/doc/db2/api_cxx/DbInfo/set_compare.html
-share/doc/db2/api_cxx/DbInfo/set_flags.html
-share/doc/db2/api_cxx/DbInfo/set_h_ffactor.html
-share/doc/db2/api_cxx/DbInfo/set_h_hash.html
-share/doc/db2/api_cxx/DbInfo/set_h_nelem.html
-share/doc/db2/api_cxx/DbInfo/set_lorder.html
-share/doc/db2/api_cxx/DbInfo/set_malloc.html
-share/doc/db2/api_cxx/DbInfo/set_pagesize.html
-share/doc/db2/api_cxx/DbInfo/set_re_delim.html
-share/doc/db2/api_cxx/DbInfo/set_re_len.html
-share/doc/db2/api_cxx/DbInfo/set_re_pad.html
-share/doc/db2/api_cxx/DbInfo/set_re_source.html
-share/doc/db2/api_cxx/DbLock/class.html
-share/doc/db2/api_cxx/DbLock/put.html
-share/doc/db2/api_cxx/DbLockTab/class.html
-share/doc/db2/api_cxx/DbLockTab/close.html
-share/doc/db2/api_cxx/DbLockTab/detect.html
-share/doc/db2/api_cxx/DbLockTab/get.html
-share/doc/db2/api_cxx/DbLockTab/id.html
-share/doc/db2/api_cxx/DbLockTab/open.html
-share/doc/db2/api_cxx/DbLockTab/stat.html
-share/doc/db2/api_cxx/DbLockTab/unlink.html
-share/doc/db2/api_cxx/DbLockTab/vec.html
-share/doc/db2/api_cxx/DbLog/archive.html
-share/doc/db2/api_cxx/DbLog/class.html
-share/doc/db2/api_cxx/DbLog/close.html
-share/doc/db2/api_cxx/DbLog/compare.html
-share/doc/db2/api_cxx/DbLog/db_register.html
-share/doc/db2/api_cxx/DbLog/db_unregister.html
-share/doc/db2/api_cxx/DbLog/file.html
-share/doc/db2/api_cxx/DbLog/flush.html
-share/doc/db2/api_cxx/DbLog/get.html
-share/doc/db2/api_cxx/DbLog/open.html
-share/doc/db2/api_cxx/DbLog/put.html
-share/doc/db2/api_cxx/DbLog/stat.html
-share/doc/db2/api_cxx/DbLog/unlink.html
-share/doc/db2/api_cxx/DbLsn/class.html
-share/doc/db2/api_cxx/DbMpool/class.html
-share/doc/db2/api_cxx/DbMpool/close.html
-share/doc/db2/api_cxx/DbMpool/db_register.html
-share/doc/db2/api_cxx/DbMpool/open.html
-share/doc/db2/api_cxx/DbMpool/stat.html
-share/doc/db2/api_cxx/DbMpool/sync.html
-share/doc/db2/api_cxx/DbMpool/trickle.html
-share/doc/db2/api_cxx/DbMpool/unlink.html
-share/doc/db2/api_cxx/DbMpoolFile/class.html
-share/doc/db2/api_cxx/DbMpoolFile/close.html
-share/doc/db2/api_cxx/DbMpoolFile/get.html
-share/doc/db2/api_cxx/DbMpoolFile/open.html
-share/doc/db2/api_cxx/DbMpoolFile/put.html
-share/doc/db2/api_cxx/DbMpoolFile/set.html
-share/doc/db2/api_cxx/DbMpoolFile/sync.html
-share/doc/db2/api_cxx/DbTxn/abort.html
-share/doc/db2/api_cxx/DbTxn/class.html
-share/doc/db2/api_cxx/DbTxn/commit.html
-share/doc/db2/api_cxx/DbTxn/id.html
-share/doc/db2/api_cxx/DbTxn/prepare.html
-share/doc/db2/api_cxx/DbTxnMgr/begin.html
-share/doc/db2/api_cxx/DbTxnMgr/checkpoint.html
-share/doc/db2/api_cxx/DbTxnMgr/class.html
-share/doc/db2/api_cxx/DbTxnMgr/close.html
-share/doc/db2/api_cxx/DbTxnMgr/open.html
-share/doc/db2/api_cxx/DbTxnMgr/stat.html
-share/doc/db2/api_cxx/DbTxnMgr/unlink.html
-share/doc/db2/api_cxx/Dbc/class.html
-share/doc/db2/api_cxx/Dbc/close.html
-share/doc/db2/api_cxx/Dbc/del.html
-share/doc/db2/api_cxx/Dbc/get.html
-share/doc/db2/api_cxx/Dbc/put.html
-share/doc/db2/api_cxx/Dbt/class.html
-share/doc/db2/api_cxx/index/class.html
-share/doc/db2/api_java/Db/class.html
-share/doc/db2/api_java/Db/close.html
-share/doc/db2/api_java/Db/cursor.html
-share/doc/db2/api_java/Db/del.html
-share/doc/db2/api_java/Db/fd.html
-share/doc/db2/api_java/Db/get.html
-share/doc/db2/api_java/Db/get_byteswapped.html
-share/doc/db2/api_java/Db/get_type.html
-share/doc/db2/api_java/Db/join.html
-share/doc/db2/api_java/Db/open.html
-share/doc/db2/api_java/Db/put.html
-share/doc/db2/api_java/Db/stat.html
-share/doc/db2/api_java/Db/sync.html
-share/doc/db2/api_java/DbEnv/appexit.html
-share/doc/db2/api_java/DbEnv/appinit.html
-share/doc/db2/api_java/DbEnv/class.html
-share/doc/db2/api_java/DbEnv/get_lg_info.html
-share/doc/db2/api_java/DbEnv/get_lk_info.html
-share/doc/db2/api_java/DbEnv/get_mp_info.html
-share/doc/db2/api_java/DbEnv/get_tx_info.html
-share/doc/db2/api_java/DbEnv/set_errcall.html
-share/doc/db2/api_java/DbEnv/set_error_stream.html
-share/doc/db2/api_java/DbEnv/set_errpfx.html
-share/doc/db2/api_java/DbEnv/set_lg_max.html
-share/doc/db2/api_java/DbEnv/set_lk_conflicts.html
-share/doc/db2/api_java/DbEnv/set_lk_detect.html
-share/doc/db2/api_java/DbEnv/set_lk_max.html
-share/doc/db2/api_java/DbEnv/set_lk_modes.html
-share/doc/db2/api_java/DbEnv/set_lorder.html
-share/doc/db2/api_java/DbEnv/set_mp_mmapsize.html
-share/doc/db2/api_java/DbEnv/set_mp_size.html
-share/doc/db2/api_java/DbEnv/set_tx_max.html
-share/doc/db2/api_java/DbEnv/set_verbose.html
-share/doc/db2/api_java/DbEnv/version.html
-share/doc/db2/api_java/DbException/class.html
-share/doc/db2/api_java/DbException/get_errno.html
-share/doc/db2/api_java/DbInfo/class.html
-share/doc/db2/api_java/DbInfo/set_bt_compare.html
-share/doc/db2/api_java/DbInfo/set_bt_maxkey.html
-share/doc/db2/api_java/DbInfo/set_bt_minkey.html
-share/doc/db2/api_java/DbInfo/set_bt_prefix.html
-share/doc/db2/api_java/DbInfo/set_cachesize.html
-share/doc/db2/api_java/DbInfo/set_compare.html
-share/doc/db2/api_java/DbInfo/set_flags.html
-share/doc/db2/api_java/DbInfo/set_h_ffactor.html
-share/doc/db2/api_java/DbInfo/set_h_hash.html
-share/doc/db2/api_java/DbInfo/set_h_nelem.html
-share/doc/db2/api_java/DbInfo/set_lorder.html
-share/doc/db2/api_java/DbInfo/set_malloc.html
-share/doc/db2/api_java/DbInfo/set_pagesize.html
-share/doc/db2/api_java/DbInfo/set_re_delim.html
-share/doc/db2/api_java/DbInfo/set_re_len.html
-share/doc/db2/api_java/DbInfo/set_re_pad.html
-share/doc/db2/api_java/DbInfo/set_re_source.html
-share/doc/db2/api_java/DbLock/class.html
-share/doc/db2/api_java/DbLock/put.html
-share/doc/db2/api_java/DbLockTab/class.html
-share/doc/db2/api_java/DbLockTab/close.html
-share/doc/db2/api_java/DbLockTab/detect.html
-share/doc/db2/api_java/DbLockTab/get.html
-share/doc/db2/api_java/DbLockTab/id.html
-share/doc/db2/api_java/DbLockTab/open.html
-share/doc/db2/api_java/DbLockTab/stat.html
-share/doc/db2/api_java/DbLockTab/unlink.html
-share/doc/db2/api_java/DbLockTab/vec.html
-share/doc/db2/api_java/DbLog/archive.html
-share/doc/db2/api_java/DbLog/class.html
-share/doc/db2/api_java/DbLog/close.html
-share/doc/db2/api_java/DbLog/compare.html
-share/doc/db2/api_java/DbLog/db_register.html
-share/doc/db2/api_java/DbLog/db_unregister.html
-share/doc/db2/api_java/DbLog/file.html
-share/doc/db2/api_java/DbLog/flush.html
-share/doc/db2/api_java/DbLog/get.html
-share/doc/db2/api_java/DbLog/open.html
-share/doc/db2/api_java/DbLog/put.html
-share/doc/db2/api_java/DbLog/stat.html
-share/doc/db2/api_java/DbLog/unlink.html
-share/doc/db2/api_java/DbLsn/class.html
-share/doc/db2/api_java/DbMpool/class.html
-share/doc/db2/api_java/DbMpool/close.html
-share/doc/db2/api_java/DbMpool/db_register.html
-share/doc/db2/api_java/DbMpool/open.html
-share/doc/db2/api_java/DbMpool/stat.html
-share/doc/db2/api_java/DbMpool/sync.html
-share/doc/db2/api_java/DbMpool/trickle.html
-share/doc/db2/api_java/DbMpool/unlink.html
-share/doc/db2/api_java/DbMpoolFile/class.html
-share/doc/db2/api_java/DbMpoolFile/close.html
-share/doc/db2/api_java/DbMpoolFile/get.html
-share/doc/db2/api_java/DbMpoolFile/open.html
-share/doc/db2/api_java/DbMpoolFile/put.html
-share/doc/db2/api_java/DbMpoolFile/set.html
-share/doc/db2/api_java/DbMpoolFile/sync.html
-share/doc/db2/api_java/DbRunRecoveryException/class.html
-share/doc/db2/api_java/DbTxn/abort.html
-share/doc/db2/api_java/DbTxn/class.html
-share/doc/db2/api_java/DbTxn/commit.html
-share/doc/db2/api_java/DbTxn/id.html
-share/doc/db2/api_java/DbTxn/prepare.html
-share/doc/db2/api_java/DbTxnMgr/begin.html
-share/doc/db2/api_java/DbTxnMgr/checkpoint.html
-share/doc/db2/api_java/DbTxnMgr/class.html
-share/doc/db2/api_java/DbTxnMgr/close.html
-share/doc/db2/api_java/DbTxnMgr/open.html
-share/doc/db2/api_java/DbTxnMgr/stat.html
-share/doc/db2/api_java/DbTxnMgr/unlink.html
-share/doc/db2/api_java/Dbc/class.html
-share/doc/db2/api_java/Dbc/close.html
-share/doc/db2/api_java/Dbc/del.html
-share/doc/db2/api_java/Dbc/get.html
-share/doc/db2/api_java/Dbc/put.html
-share/doc/db2/api_java/Dbt/class.html
-share/doc/db2/api_java/index/class.html
-share/doc/db2/build/java.html
-share/doc/db2/build/shared.html
-share/doc/db2/build/shared_gcc.html
-share/doc/db2/build/shared_hp.html
-share/doc/db2/build/unix.html
-share/doc/db2/build/unix_faq.html
-share/doc/db2/build/win16.html
-share/doc/db2/build/win32.html
-share/doc/db2/build/win_faq.html
-share/doc/db2/distrib/layout.html
-share/doc/db2/images/folder.gif
-share/doc/db2/images/folder_open.gif
-share/doc/db2/images/next.gif
-share/doc/db2/images/prev.gif
-share/doc/db2/images/ps.gif
-share/doc/db2/images/sleepycat.gif
-share/doc/db2/images/toc.gif
-share/doc/db2/index.html
-share/doc/db2/packages/hash_usenix.ps
-share/doc/db2/packages/index.html
-share/doc/db2/packages/libtp_usenix.ps
-share/doc/db2/packages/witold.html
-share/doc/db2/ref/am/bt_compare.html
-share/doc/db2/ref/am/bt_dup.html
-share/doc/db2/ref/am/bt_maxkey.html
-share/doc/db2/ref/am/bt_minkey.html
-share/doc/db2/ref/am/bt_prefix.html
-share/doc/db2/ref/am/bt_recnum.html
-share/doc/db2/ref/am/byteorder.html
-share/doc/db2/ref/am/cachesize.html
-share/doc/db2/ref/am/close.html
-share/doc/db2/ref/am/compare.html
-share/doc/db2/ref/am/curclose.html
-share/doc/db2/ref/am/curdel.html
-share/doc/db2/ref/am/curget.html
-share/doc/db2/ref/am/curput.html
-share/doc/db2/ref/am/cursor.html
-share/doc/db2/ref/am/delete.html
-share/doc/db2/ref/am/get.html
-share/doc/db2/ref/am/h_dup.html
-share/doc/db2/ref/am/h_ffactor.html
-share/doc/db2/ref/am/h_hash.html
-share/doc/db2/ref/am/h_nelem.html
-share/doc/db2/ref/am/intro.html
-share/doc/db2/ref/am/join.html
-share/doc/db2/ref/am/logrec.html
-share/doc/db2/ref/am/malloc.html
-share/doc/db2/ref/am/ops.html
-share/doc/db2/ref/am/pagesize.html
-share/doc/db2/ref/am/partial.html
-share/doc/db2/ref/am/put.html
-share/doc/db2/ref/am/re_delim.html
-share/doc/db2/ref/am/re_len.html
-share/doc/db2/ref/am/re_pad.html
-share/doc/db2/ref/am/re_source.html
-share/doc/db2/ref/am/renumber.html
-share/doc/db2/ref/am/select.html
-share/doc/db2/ref/am/stat.html
-share/doc/db2/ref/am/sync.html
-share/doc/db2/ref/arch/apis.html
-share/doc/db2/ref/arch/bigpic.gif
-share/doc/db2/ref/arch/bigpic.html
-share/doc/db2/ref/arch/env.html
-share/doc/db2/ref/arch/extending.html
-share/doc/db2/ref/arch/progmodel.html
-share/doc/db2/ref/arch/script.html
-share/doc/db2/ref/arch/smallpic.gif
-share/doc/db2/ref/arch/subsystem.html
-share/doc/db2/ref/arch/utilities.html
-share/doc/db2/ref/cam/intro.html
-share/doc/db2/ref/debug/runtime.html
-share/doc/db2/ref/dumpload/format.html
-share/doc/db2/ref/dumpload/text.html
-share/doc/db2/ref/dumpload/utility.html
-share/doc/db2/ref/env/create.html
-share/doc/db2/ref/env/naming.html
-share/doc/db2/ref/env/open.html
-share/doc/db2/ref/env/region.html
-share/doc/db2/ref/env/security.html
-share/doc/db2/ref/install/file.html
-share/doc/db2/ref/install/magic.s5.be.txt
-share/doc/db2/ref/install/magic.s5.le.txt
-share/doc/db2/ref/install/magic.txt
-share/doc/db2/ref/intro/distrib.html
-share/doc/db2/ref/intro/do.html
-share/doc/db2/ref/intro/what.html
-share/doc/db2/ref/intro/where.html
-share/doc/db2/ref/lock/stdmode.html
-share/doc/db2/ref/log/config.html
-share/doc/db2/ref/log/intro.html
-share/doc/db2/ref/log/limits.html
-share/doc/db2/ref/mp/config.html
-share/doc/db2/ref/mp/intro.html
-share/doc/db2/ref/perl/intro.html
-share/doc/db2/ref/program/appsignals.html
-share/doc/db2/ref/program/byteorder.html
-share/doc/db2/ref/program/compatible.html
-share/doc/db2/ref/program/convert.html
-share/doc/db2/ref/program/dbsizes.html
-share/doc/db2/ref/program/environ.html
-share/doc/db2/ref/program/errorret.html
-share/doc/db2/ref/program/java.html
-share/doc/db2/ref/program/runtime.html
-share/doc/db2/ref/program/solaris.txt
-share/doc/db2/ref/program/thread.html
-share/doc/db2/ref/program/version.html
-share/doc/db2/ref/sendmail/intro.html
-share/doc/db2/ref/simple_tut/close.html
-share/doc/db2/ref/simple_tut/del.html
-share/doc/db2/ref/simple_tut/errors.html
-share/doc/db2/ref/simple_tut/example.txt
-share/doc/db2/ref/simple_tut/get.html
-share/doc/db2/ref/simple_tut/intro.html
-share/doc/db2/ref/simple_tut/keydata.html
-share/doc/db2/ref/simple_tut/open.html
-share/doc/db2/ref/simple_tut/put.html
-share/doc/db2/ref/toc.html
-share/doc/db2/ref/transapp/admin.html
-share/doc/db2/ref/transapp/apps.html
-share/doc/db2/ref/transapp/archival.html
-share/doc/db2/ref/transapp/checkpoint.html
-share/doc/db2/ref/transapp/deadlock.html
-share/doc/db2/ref/transapp/filesys.html
-share/doc/db2/ref/transapp/intro.html
-share/doc/db2/ref/transapp/recovery.html
-share/doc/db2/ref/transapp/throughput.html
-share/doc/db2/ref/transapp/writetest.txt
-share/doc/db2/ref/txn/config.html
-share/doc/db2/ref/txn/limits.html
-share/doc/db2/ref/txn/other.html
-share/doc/db2/ref/txn/stability.html
-share/doc/db2/sleepycat/contact.html
-share/doc/db2/sleepycat/products.html
-share/doc/db2/test/build.html
-share/doc/db2/test/build_faq.html
-share/doc/db2/test/debug.html
-share/doc/db2/test/run.html
-share/doc/db2/utility/db_archive.html
-share/doc/db2/utility/db_checkpoint.html
-share/doc/db2/utility/db_deadlock.html
-share/doc/db2/utility/db_dump.html
-share/doc/db2/utility/db_load.html
-share/doc/db2/utility/db_recover.html
-share/doc/db2/utility/db_stat.html
-share/doc/db2/utility/index.html
-share/examples/db2/examples/README
-share/examples/db2/examples/ex_access.c
-share/examples/db2/examples/ex_appinit.c
-share/examples/db2/examples/ex_btrec.c
-share/examples/db2/examples/ex_lock.c
-share/examples/db2/examples/ex_mpool.c
-share/examples/db2/examples/ex_thread.c
-share/examples/db2/examples/ex_tpcb.c
-share/examples/db2/examples/ex_tpcb.h
-share/examples/db2/examples_cxx/AccessExample.cpp
-share/examples/db2/examples_cxx/AppinitExample.cpp
-share/examples/db2/examples_cxx/LockExample.cpp
-share/examples/db2/examples_cxx/MpoolExample.cpp
-share/examples/db2/examples_cxx/TpcbExample.cpp
-share/examples/db2/examples_java/AccessExample.java
-share/examples/db2/examples_java/AppinitExample.java
-share/examples/db2/examples_java/LockExample.java
-share/examples/db2/examples_java/TpcbExample.java
-@dirrm include/db2
-@dirrm share/examples/db2/examples
-@dirrm share/examples/db2/examples_cxx
-@dirrm share/examples/db2/examples_java
-@dirrm share/examples/db2
-@dirrm share/doc/db2/api_c/DbTxn
-@dirrm share/doc/db2/api_c/DbEnv
-@dirrm share/doc/db2/api_c/DbInfo
-@dirrm share/doc/db2/api_c/DbLock
-@dirrm share/doc/db2/api_c/DbLockTab
-@dirrm share/doc/db2/api_c/DbLog
-@dirrm share/doc/db2/api_c/DbMpool
-@dirrm share/doc/db2/api_c/DbMpoolFile
-@dirrm share/doc/db2/api_c/Db
-@dirrm share/doc/db2/api_c/DbTxnMgr
-@dirrm share/doc/db2/api_c/Dbc
-@dirrm share/doc/db2/api_c/Dbt
-@dirrm share/doc/db2/api_c/historic
-@dirrm share/doc/db2/api_c/index
-@dirrm share/doc/db2/api_c/internal
-@dirrm share/doc/db2/api_c/special
-@dirrm share/doc/db2/api_c
-@dirrm share/doc/db2/test
-@dirrm share/doc/db2/sleepycat
-@dirrm share/doc/db2/ref/txn
-@dirrm share/doc/db2/ref/am
-@dirrm share/doc/db2/ref/arch
-@dirrm share/doc/db2/ref/cam
-@dirrm share/doc/db2/ref/debug
-@dirrm share/doc/db2/ref/dumpload
-@dirrm share/doc/db2/ref/env
-@dirrm share/doc/db2/ref/intro
-@dirrm share/doc/db2/ref/install
-@dirrm share/doc/db2/ref/lock
-@dirrm share/doc/db2/ref/log
-@dirrm share/doc/db2/ref/mp
-@dirrm share/doc/db2/ref/perl
-@dirrm share/doc/db2/ref/program
-@dirrm share/doc/db2/ref/sendmail
-@dirrm share/doc/db2/ref/simple_tut
-@dirrm share/doc/db2/ref/transapp
-@dirrm share/doc/db2/ref
-@dirrm share/doc/db2/packages
-@dirrm share/doc/db2/api_cxx/DbLsn
-@dirrm share/doc/db2/api_cxx/Dbc
-@dirrm share/doc/db2/api_cxx/DbEnv
-@dirrm share/doc/db2/api_cxx/DbException
-@dirrm share/doc/db2/api_cxx/DbInfo
-@dirrm share/doc/db2/api_cxx/DbLock
-@dirrm share/doc/db2/api_cxx/DbLockTab
-@dirrm share/doc/db2/api_cxx/DbLog
-@dirrm share/doc/db2/api_cxx/Db
-@dirrm share/doc/db2/api_cxx/DbMpool
-@dirrm share/doc/db2/api_cxx/DbMpoolFile
-@dirrm share/doc/db2/api_cxx/DbTxn
-@dirrm share/doc/db2/api_cxx/DbTxnMgr
-@dirrm share/doc/db2/api_cxx/Dbt
-@dirrm share/doc/db2/api_cxx/index
-@dirrm share/doc/db2/api_cxx/special
-@dirrm share/doc/db2/api_cxx
-@dirrm share/doc/db2/utility
-@dirrm share/doc/db2/distrib
-@dirrm share/doc/db2/build
-@dirrm share/doc/db2/api_java/DbMpool
-@dirrm share/doc/db2/api_java/DbEnv
-@dirrm share/doc/db2/api_java/DbException
-@dirrm share/doc/db2/api_java/DbInfo
-@dirrm share/doc/db2/api_java/DbLock
-@dirrm share/doc/db2/api_java/DbLockTab
-@dirrm share/doc/db2/api_java/DbLog
-@dirrm share/doc/db2/api_java/DbLsn
-@dirrm share/doc/db2/api_java/Db
-@dirrm share/doc/db2/api_java/DbMpoolFile
-@dirrm share/doc/db2/api_java/DbRunRecoveryException
-@dirrm share/doc/db2/api_java/DbTxn
-@dirrm share/doc/db2/api_java/DbTxnMgr
-@dirrm share/doc/db2/api_java/Dbc
-@dirrm share/doc/db2/api_java/Dbt
-@dirrm share/doc/db2/api_java/index
-@dirrm share/doc/db2/api_java/special
-@dirrm share/doc/db2/api_java
-@dirrm share/doc/db2/images
-@dirrm share/doc/db2
diff --git a/devel/kdesdk/Makefile b/devel/kdesdk/Makefile
index e93eb1b..87991f2 100644
--- a/devel/kdesdk/Makefile
+++ b/devel/kdesdk/Makefile
@@ -16,7 +16,7 @@ MAINTAINER=	kde@FreeBSD.org
 
 BUILD_DEPENDS=	autoconf213:${PORTSDIR}/devel/autoconf213 \
 		automake14:${PORTSDIR}/devel/automake14
-LIB_DEPENDS=	db2.0:${PORTSDIR}/databases/db
+LIB_DEPENDS=	db2.0:${PORTSDIR}/databases/db2
 
 USE_KDEBASE_VER=2
 USE_BZIP2=	yes
diff --git a/devel/kdesdk3/Makefile b/devel/kdesdk3/Makefile
index 1e09ebc..e354485 100644
--- a/devel/kdesdk3/Makefile
+++ b/devel/kdesdk3/Makefile
@@ -14,7 +14,7 @@ DIST_SUBDIR=	KDE
 
 MAINTAINER=	kde@FreeBSD.org
 
-LIB_DEPENDS=	db2.0:${PORTSDIR}/databases/db
+LIB_DEPENDS=	db2.0:${PORTSDIR}/databases/db2
 
 USE_KDEBASE_VER=3
 GNU_CONFIGURE=	yes
diff --git a/devel/kdesdk4/Makefile b/devel/kdesdk4/Makefile
index 1e09ebc..e354485 100644
--- a/devel/kdesdk4/Makefile
+++ b/devel/kdesdk4/Makefile
@@ -14,7 +14,7 @@ DIST_SUBDIR=	KDE
 
 MAINTAINER=	kde@FreeBSD.org
 
-LIB_DEPENDS=	db2.0:${PORTSDIR}/databases/db
+LIB_DEPENDS=	db2.0:${PORTSDIR}/databases/db2
 
 USE_KDEBASE_VER=3
 GNU_CONFIGURE=	yes
diff --git a/devel/tcl-neo/Makefile b/devel/tcl-neo/Makefile
index 4b0d4d5..69abf76 100644
--- a/devel/tcl-neo/Makefile
+++ b/devel/tcl-neo/Makefile
@@ -16,7 +16,7 @@ DISTNAME=	neowebscript-3.3
 MAINTAINER=	mi@aldan.algebra.com
 
 LIB_DEPENDS=	tclx83:${PORTSDIR}/lang/tclX82 \
-		db2:${PORTSDIR}/databases/db
+		db2:${PORTSDIR}/databases/db2
 
 # Not yet -- openldap used db3, neo used db2 :(
 #		ldap.2:${PORTSDIR}/net/openldap2
diff --git a/lang/tinycobol/Makefile b/lang/tinycobol/Makefile
index d9c7eab..101749f 100644
--- a/lang/tinycobol/Makefile
+++ b/lang/tinycobol/Makefile
@@ -15,7 +15,7 @@ MAINTAINER=	patrick@freebsd.org
 
 BROKEN=		"Does not package correctly"
 
-LIB_DEPENDS=	db2.0:${PORTSDIR}/databases/db \
+LIB_DEPENDS=	db2.0:${PORTSDIR}/databases/db2 \
 		gnugetopt.1:${PORTSDIR}/devel/libgnugetopt
 
 ONLY_FOR_ARCHS=	i386
diff --git a/mail/cucipop/Makefile b/mail/cucipop/Makefile
index 965fb50..e002baa 100644
--- a/mail/cucipop/Makefile
+++ b/mail/cucipop/Makefile
@@ -23,7 +23,7 @@ PATCHFILES=	cucipop-1.31-v6-20010223.diff.gz
 PATCH_DIST_STRIP=	-p1
 .endif
 
-#BUILD_DEPENDS=  ${PREFIX}/include/db2/db.h:${PORTSDIR}/databases/db
+#BUILD_DEPENDS=  ${PREFIX}/include/db2/db.h:${PORTSDIR}/databases/db2
 
 MAINTAINER=	vanilla@FreeBSD.org
 
diff --git a/net/openldap/Makefile b/net/openldap/Makefile
index eefa715..0352d1a 100644
--- a/net/openldap/Makefile
+++ b/net/openldap/Makefile
@@ -34,7 +34,7 @@ CONFIGURE_ARGS+=	--enable-wrappers
 .endif
 
 .if defined(WITH_DB2)
-BUILD_DEPENDS=	${LOCALBASE}/lib/libdb2.a:${PORTSDIR}/databases/db/
+BUILD_DEPENDS=	${LOCALBASE}/lib/libdb2.a:${PORTSDIR}/databases/db2
 
 CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include/db2 ${PTHREAD_CFLAGS}" \
 		LDFLAGS="-L${LOCALBASE}/lib"
diff --git a/net/openldap12/Makefile b/net/openldap12/Makefile
index eefa715..0352d1a 100644
--- a/net/openldap12/Makefile
+++ b/net/openldap12/Makefile
@@ -34,7 +34,7 @@ CONFIGURE_ARGS+=	--enable-wrappers
 .endif
 
 .if defined(WITH_DB2)
-BUILD_DEPENDS=	${LOCALBASE}/lib/libdb2.a:${PORTSDIR}/databases/db/
+BUILD_DEPENDS=	${LOCALBASE}/lib/libdb2.a:${PORTSDIR}/databases/db2
 
 CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include/db2 ${PTHREAD_CFLAGS}" \
 		LDFLAGS="-L${LOCALBASE}/lib"
diff --git a/security/pks/Makefile b/security/pks/Makefile
index df68c58..0221c58 100644
--- a/security/pks/Makefile
+++ b/security/pks/Makefile
@@ -20,7 +20,7 @@ PATCH_DIST_STRIP=-p1
 
 MAINTAINER=	jharris@widomaker.com
 
-LIB_DEPENDS=	db2.0:${PORTSDIR}/databases/db
+LIB_DEPENDS=	db2.0:${PORTSDIR}/databases/db2
 
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS= --datadir=${PREFIX}/share/pks --localstatedir=/var/pks \
diff --git a/textproc/rasqal/Makefile b/textproc/rasqal/Makefile
index 6e6d52d..fc85cec 100644
--- a/textproc/rasqal/Makefile
+++ b/textproc/rasqal/Makefile
@@ -16,7 +16,7 @@ MASTER_SITE_SUBDIR=	librdf
 
 MAINTAINER=	ports@FreeBSD.org
 
-LIB_DEPENDS=	db2.0:${PORTSDIR}/databases/db \
+LIB_DEPENDS=	db2.0:${PORTSDIR}/databases/db2 \
 		gdbm.2:${PORTSDIR}/databases/gdbm \
 		expat.3:${PORTSDIR}/textproc/expat2 \
 		xml2.5:${PORTSDIR}/textproc/libxml2 \
diff --git a/textproc/redland/Makefile b/textproc/redland/Makefile
index 6e6d52d..fc85cec 100644
--- a/textproc/redland/Makefile
+++ b/textproc/redland/Makefile
@@ -16,7 +16,7 @@ MASTER_SITE_SUBDIR=	librdf
 
 MAINTAINER=	ports@FreeBSD.org
 
-LIB_DEPENDS=	db2.0:${PORTSDIR}/databases/db \
+LIB_DEPENDS=	db2.0:${PORTSDIR}/databases/db2 \
 		gdbm.2:${PORTSDIR}/databases/gdbm \
 		expat.3:${PORTSDIR}/textproc/expat2 \
 		xml2.5:${PORTSDIR}/textproc/libxml2 \