--- databases/db5/Makefile	(revision 475965)
+++ databases/db5/Makefile	(working copy)
@@ -3,7 +3,7 @@ 
 
 PORTNAME=	db5
 PORTVERSION=	5.3.28
-PORTREVISION=	6
+PORTREVISION=	7
 CATEGORIES=	databases java
 MASTER_SITES=	http://download.oracle.com/berkeley-db/
 PKGNAMEPREFIX?=
@@ -16,14 +16,14 @@ 
 COMMENT=	Oracle Berkeley DB, revision ${BDBVER}
 
 LICENSE=	SLEEPYCAT
+LICENSE_GROUPS=	FSF GPL OSI
 LICENSE_NAME=	Sleepycat
+LICENSE_FILE=	${WRKSRC}/../LICENSE
 LICENSE_PERMS=	dist-mirror dist-sell pkg-mirror pkg-sell auto-accept
-LICENSE_FILE=	${WRKSRC}/../LICENSE
-LICENSE_GROUPS=	FSF GPL OSI
 
 BDBVER=		${PORTVERSION:R}
 BDBMAJ=		${BDBVER:R}
-CONFIGURE_ARGS=	--enable-cxx --enable-stl \
+CONFIGURE_ARGS=	--enable-cxx --enable-stl --enable-dbm \
 		--enable-compat185 --enable-dump185 \
 		--includedir=${PREFIX}/include/${PORTNAME} \
 		--libdir=${PREFIX}/lib/${PORTNAME} \
@@ -31,6 +31,7 @@ 
 CONFIGURE_SCRIPT=	../dist/configure
 GNU_CONFIGURE=	yes
 USES=		gmake libtool
+USE_GCC=	yes
 INSTALL_TARGET=	install_include install_lib install_utilities
 WRKSRC=		${WRKDIR}/${DISTNAME}/build_unix
 PATCH_WRKSRC=	${WRKDIR}/${DISTNAME}
--- databases/db6/Makefile	(revision 475965)
+++ databases/db6/Makefile	(working copy)
@@ -3,6 +3,7 @@ 
 
 PORTNAME=	db6
 PORTVERSION=	6.2.32
+PORTREVISION=	1
 CATEGORIES=	databases java
 MASTER_SITES=	http://download.oracle.com/berkeley-db/
 PKGNAMEPREFIX?=
@@ -19,7 +20,7 @@ 
 
 BDBVER=		${PORTVERSION:R}
 BDBMAJ=		${BDBVER:R}
-CONFIGURE_ARGS=	--enable-cxx --enable-stl \
+CONFIGURE_ARGS=	--enable-cxx --enable-stl --enable-dbm \
 		--enable-compat185 --enable-dump185 \
 		--includedir=${PREFIX}/include/${PORTNAME} \
 		--libdir=${PREFIX}/lib/${PORTNAME} \
@@ -27,6 +28,7 @@ 
 CONFIGURE_SCRIPT=	../dist/configure
 GNU_CONFIGURE=	yes
 USES=		gmake libtool
+USE_GCC=	yes
 INSTALL_TARGET=	install_include install_lib install_utilities
 WRKSRC=		${WRKDIR}/${DISTNAME}/build_unix
 PATCH_WRKSRC=	${WRKDIR}/${DISTNAME}
@@ -74,6 +76,7 @@ 
 .for i in ${DBLIBS}
 	${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/${PORTNAME}/${i}-${BDBVER}.so
 	${LN} -s -f ${PORTNAME}/${i}-${BDBVER}.so ${STAGEDIR}${PREFIX}/lib
+	${LN} -s -f ${PORTNAME}/${i}-${BDBVER}.so ${STAGEDIR}${PREFIX}/lib/${i}-${BDBMAJ}.so
 	${LN} -s -f ${i}-${BDBVER}.a ${STAGEDIR}${PREFIX}/lib/${PORTNAME}/${i}.a
 .endfor
 	cd ${STAGEDIR}${PREFIX}/bin/${PORTNAME}; \
--- databases/db6/pkg-plist	(revision 475965)
+++ databases/db6/pkg-plist	(working copy)
@@ -74,6 +74,12 @@ 
 %%SQL%%lib/db%%BDBMAJ%%/libdb_sql.a
 %%SQL%%lib/db%%BDBMAJ%%/libdb_sql.so
 %%SQL%%lib/db%%BDBMAJ%%/libdb_sql-%%BDBMAJ%%.so
+%%TCL%%lib/db%%BDBMAJ%%/libdb_tcl-%%BDBVER%%.a
+%%TCL%%lib/db%%BDBMAJ%%/libdb_tcl-%%BDBVER%%.so
+%%TCL%%lib/db%%BDBMAJ%%/libdb_tcl-%%BDBMAJ%%.so
+%%TCL%%lib/db%%BDBMAJ%%/libdb_tcl.a
+%%TCL%%lib/db%%BDBMAJ%%/libdb_tcl.so
+%%TCL%%lib/db%%BDBMAJ%%/pkgIndex.tcl
 lib/db%%BDBMAJ%%/libdb_stl-%%BDBVER%%.a
 lib/db%%BDBMAJ%%/libdb_stl-%%BDBVER%%.so
 lib/db%%BDBMAJ%%/libdb_stl-%%BDBMAJ%%.so
@@ -80,14 +86,14 @@ 
 lib/db%%BDBMAJ%%/libdb_stl.a
 lib/db%%BDBMAJ%%/libdb_stl.so
 lib/libdb-%%BDBVER%%.so
+lib/libdb-%%BDBMAJ%%.so
 lib/libdb_cxx-%%BDBVER%%.so
+lib/libdb_cxx-%%BDBMAJ%%.so
 %%JAVA%%lib/libdb_java-%%BDBVER%%.so
+%%JAVA%%lib/libdb_java-%%BDBMAJ%%.so
 %%SQL%%lib/libdb_sql-%%BDBVER%%.so
+%%SQL%%lib/libdb_sql-%%BDBMAJ%%.so
 lib/libdb_stl-%%BDBVER%%.so
-%%TCL%%lib/db6/libdb_tcl-%%BDBVER%%.a
-%%TCL%%lib/db6/libdb_tcl-%%BDBVER%%.so
-%%TCL%%lib/db6/libdb_tcl-6.so
-%%TCL%%lib/db6/libdb_tcl.a
-%%TCL%%lib/db6/libdb_tcl.so
-%%TCL%%lib/db6/pkgIndex.tcl
+lib/libdb_stl-%%BDBMAJ%%.so
 %%TCL%%lib/libdb_tcl-%%BDBVER%%.so
+%%TCL%%lib/libdb_tcl-%%BDBMAJ%%.so