3 files changed, 152 insertions, 104 deletions

diff --git a/databases/db5/Makefile b/databases/db5/Makefile
index cd7babef78e4..654aaceceff3 100644
--- a/databases/db5/Makefile
+++ b/databases/db5/Makefile
@@ -5,9 +5,8 @@
 # $FreeBSD$
 #
 
-PORTNAME=	db51
-PORTVERSION=	5.1.25.0
-PORTREVISION=	1
+PORTNAME=	db5
+PORTVERSION=	5.2.28.0
 CATEGORIES=	databases java
 MASTER_SITES=	http://download.oracle.com/berkeley-db/
 PKGNAMEPREFIX?=
@@ -15,10 +14,12 @@ DISTNAME=	db-${PORTVERSION:R}
 DIST_SUBDIR=	bdb
 
 MAINTAINER=	mandree@FreeBSD.org
-COMMENT=	The Oracle Berkeley DB, revision 5.1
+COMMENT=	The Oracle Berkeley DB, revision 5.2
 
 BDBVER=		${PORTVERSION:R:R}
+BDBMAJ=		${BDBVER:R}
 CONFIGURE_ARGS=	--enable-cxx --enable-stl \
+		--disable-tcl \
 		--includedir=${PREFIX}/include/${PORTNAME} \
 		--libdir=${PREFIX}/lib/${PORTNAME} \
 		--bindir=${PREFIX}/bin/${PORTNAME}
@@ -36,7 +37,9 @@ INSTALL_TARGET+=	install_docs docdir=${DOCSDIR}
 PORTDOCS=		*
 .endif
 
-OPTIONS=	SQL "SQL API (EXPERIMENTAL)" OFF \
+OPTIONS=	CRYPTO "Cryptography support" ON \
+		L10N "Localization support" OFF \
+		SQL "SQL API (EXPERIMENTAL)" OFF \
 		JAVA "JAVA API (EXPERIMENTAL)" OFF
 
 .include <bsd.port.pre.mk>
@@ -63,20 +66,37 @@ PLIST_SUB+=	JAVA="@comment "
 libdb_java=
 .endif
 
+.if defined(WITH_CRYPTO)
+CONFIGURE_ARGS+=	--with-cryptography=yes
+.else
+CONFIGURE_ARGS+=	--with-cryptography=no
+.endif
+
+.if defined(WITH_L10N)
+CONFIGURE_ARGS+=	--enable-localization
+.endif
+
+.if defined(WITH_DEBUG)
+CONFIGURE_ARGS+=	--enable-debug --enable-umrw
+.endif
+
 post-patch:
 	${REINPLACE_CMD} -e '/^DOCLIST/{s/csharp//;}' ${WRKSRC}/../dist/Makefile.in
 
 post-install:
 .for i in libdb libdb_cxx libdb_stl ${libdb_sql} ${libdb_java}
 	${LN} -s -f ${PORTNAME}/${i}-${BDBVER}.so.0 ${PREFIX}/lib
+	${LN} -s -f ${PORTNAME}/${i}-${BDBMAJ}.so.0 ${PREFIX}/lib
 	${LN} -s -f ${i}-${BDBVER}.so.0 ${PREFIX}/lib/${i}-${BDBVER}.so
+	${LN} -s -f ${i}-${BDBVER}.so.0 ${PREFIX}/lib/${i}-${BDBMAJ}.so
 	${LN} -s -f ${i}-${BDBVER}.a ${PREFIX}/lib/${PORTNAME}/${i}.a
 	${CHMOD} a-w ${PREFIX}/lib/${PORTNAME}/${i}-${BDBVER}.so.0 \
 		${PREFIX}/lib/${PORTNAME}/${i}-${BDBVER}.a \
 		${PREFIX}/lib/${PORTNAME}/${i}-${BDBVER}.la
 .endfor
 	cd ${PREFIX}/bin/${PORTNAME}; \
-	for i in *; do ${LN} -s -f ${PORTNAME}/$$i ../$$i-${BDBVER}; done
+	for i in *; do ${LN} -s -f ${PORTNAME}/$$i ../$$i-${BDBVER} ; \
+		       ${LN} -s -f ${PORTNAME}/$$i ../$$i-${BDBMAJ} ; done
 .if !defined(NOPORTDOCS)
 .for i in api_reference/TCL
 	${RM} -r -f ${DOCSDIR}/${i}
diff --git a/databases/db5/distinfo b/databases/db5/distinfo
index f82a49b9b5ae..9510313b4847 100644
--- a/databases/db5/distinfo
+++ b/databases/db5/distinfo
@@ -1,2 +1,2 @@
-SHA256 (bdb/db-5.1.25.tar.gz) = 72eac5fcae4b51b0f1edc727c0368407f29b42e3f2f50ebc31a282d0d6c0a617
-SIZE (bdb/db-5.1.25.tar.gz) = 30804092
+SHA256 (bdb/db-5.2.28.tar.gz) = 92133e3a5b4bb480db4cc349f1f6e636342910057b629a183389168f4b280e36
+SIZE (bdb/db-5.2.28.tar.gz) = 33033536
diff --git a/databases/db5/pkg-plist b/databases/db5/pkg-plist
index d39c63f72459..93eb70915664 100644
--- a/databases/db5/pkg-plist
+++ b/databases/db5/pkg-plist
@@ -1,97 +1,125 @@
 @comment $FreeBSD$
-bin/db51/db_archive
-bin/db51/db_checkpoint
-bin/db51/db_deadlock
-bin/db51/db_dump
-bin/db51/db_hotbackup
-bin/db51/db_load
-bin/db51/db_log_verify
-bin/db51/db_printlog
-bin/db51/db_recover
-bin/db51/db_replicate
-%%SQL%%bin/db51/dbsql
-%%SQL%%bin/db51/db_sql_codegen
-bin/db51/db_stat
-bin/db51/db_upgrade
-bin/db51/db_verify
-bin/db_archive-5.1
-bin/db_checkpoint-5.1
-bin/db_deadlock-5.1
-bin/db_dump-5.1
-bin/db_hotbackup-5.1
-bin/db_load-5.1
-bin/db_log_verify-5.1
-bin/db_printlog-5.1
-bin/db_recover-5.1
-bin/db_replicate-5.1
-%%SQL%%bin/dbsql-5.1
-%%SQL%%bin/db_sql_codegen-5.1
-bin/db_stat-5.1
-bin/db_upgrade-5.1
-bin/db_verify-5.1
-include/db51/db.h
-include/db51/db_cxx.h
-%%SQL%%include/db51/dbsql.h
-include/db51/dbstl_common.h
-include/db51/dbstl_set.h
-include/db51/dbstl_vector.h
-include/db51/dbstl_exception.h
-include/db51/dbstl_map.h
-include/db51/dbstl_utility.h
-include/db51/dbstl_dbc.h
-include/db51/dbstl_dbt.h
-include/db51/dbstl_base_iterator.h
-include/db51/dbstl_container.h
-include/db51/dbstl_element_ref.h
-include/db51/dbstl_inner_utility.h
-include/db51/dbstl_resource_manager.h
-lib/db51/libdb-5.1.a
-lib/db51/libdb-5.1.la
-lib/db51/libdb-5.1.so
-lib/db51/libdb-5.1.so.0
-lib/db51/libdb-5.so
-lib/db51/libdb.a
-lib/db51/libdb.so
-lib/db51/libdb_cxx-5.1.a
-lib/db51/libdb_cxx-5.1.la
-lib/db51/libdb_cxx-5.1.so
-lib/db51/libdb_cxx-5.1.so.0
-lib/db51/libdb_cxx-5.so
-lib/db51/libdb_cxx.a
-lib/db51/libdb_cxx.so
-lib/db51/libdb_stl-5.1.a
-lib/db51/libdb_stl-5.1.la
-lib/db51/libdb_stl-5.1.so
-lib/db51/libdb_stl-5.1.so.0
-lib/db51/libdb_stl-5.so
-lib/db51/libdb_stl.a
-lib/db51/libdb_stl.so
-%%JAVA%%lib/db51/db.jar
-%%JAVA%%lib/db51/libdb_java-5.1.a
-%%JAVA%%lib/db51/libdb_java-5.1.la
-%%JAVA%%lib/db51/libdb_java-5.1.so
-%%JAVA%%lib/db51/libdb_java-5.1.so.0
-%%JAVA%%lib/db51/libdb_java-5.1_g.so
-%%JAVA%%lib/db51/libdb_java-5.so
-%%JAVA%%lib/db51/libdb_java.a
-%%JAVA%%lib/db51/libdb_java.so
-%%JAVA%%lib/libdb_java-5.1.so
-%%JAVA%%lib/libdb_java-5.1.so.0
-%%SQL%%lib/db51/libdb_sql-5.1.a
-%%SQL%%lib/db51/libdb_sql-5.1.la
-%%SQL%%lib/db51/libdb_sql-5.1.so
-%%SQL%%lib/db51/libdb_sql-5.1.so.0
-%%SQL%%lib/db51/libdb_sql-5.so
-%%SQL%%lib/db51/libdb_sql.a
-%%SQL%%lib/db51/libdb_sql.so
-%%SQL%%lib/libdb_sql-5.1.so
-%%SQL%%lib/libdb_sql-5.1.so.0
-lib/libdb-5.1.so.0
-lib/libdb-5.1.so
-lib/libdb_cxx-5.1.so
-lib/libdb_cxx-5.1.so.0
-lib/libdb_stl-5.1.so
-lib/libdb_stl-5.1.so.0
-@dirrmtry lib/db51
-@dirrmtry include/db51
-@dirrmtry bin/db51
+bin/db5/db_archive
+bin/db5/db_checkpoint
+bin/db5/db_deadlock
+bin/db5/db_dump
+bin/db5/db_hotbackup
+bin/db5/db_load
+bin/db5/db_log_verify
+bin/db5/db_printlog
+bin/db5/db_recover
+bin/db5/db_replicate
+bin/db5/db_tuner
+bin/db_archive-5
+bin/db_checkpoint-5
+%%SQL%%bin/db_sql_codegen-5
+bin/db_deadlock-5
+bin/db_dump-5
+bin/db_hotbackup-5
+bin/db_load-5
+bin/db_log_verify-5
+bin/db_printlog-5
+bin/db_recover-5
+bin/db_replicate-5
+bin/db_stat-5
+bin/db_tuner-5
+bin/db_upgrade-5
+bin/db_verify-5
+%%SQL%%bin/db5/dbsql
+%%SQL%%bin/db5/db_sql_codegen
+bin/db5/db_stat
+bin/db5/db_upgrade
+bin/db5/db_verify
+bin/db_archive-5.2
+bin/db_checkpoint-5.2
+bin/db_deadlock-5.2
+bin/db_dump-5.2
+bin/db_hotbackup-5.2
+bin/db_load-5.2
+bin/db_log_verify-5.2
+bin/db_printlog-5.2
+bin/db_recover-5.2
+bin/db_replicate-5.2
+bin/db_tuner-5.2
+%%SQL%%bin/dbsql-5
+%%SQL%%bin/dbsql-5.2
+%%SQL%%bin/db_sql_codegen-5.2
+bin/db_stat-5.2
+bin/db_upgrade-5.2
+bin/db_verify-5.2
+include/db5/db.h
+include/db5/db_cxx.h
+%%SQL%%include/db5/dbsql.h
+include/db5/dbstl_common.h
+include/db5/dbstl_set.h
+include/db5/dbstl_vector.h
+include/db5/dbstl_exception.h
+include/db5/dbstl_map.h
+include/db5/dbstl_utility.h
+include/db5/dbstl_dbc.h
+include/db5/dbstl_dbt.h
+include/db5/dbstl_base_iterator.h
+include/db5/dbstl_container.h
+include/db5/dbstl_element_ref.h
+include/db5/dbstl_inner_utility.h
+include/db5/dbstl_resource_manager.h
+lib/db5/libdb-5.2.a
+lib/db5/libdb-5.2.la
+lib/db5/libdb-5.2.so
+lib/db5/libdb-5.2.so.0
+lib/db5/libdb-5.so
+lib/db5/libdb.a
+lib/db5/libdb.so
+lib/db5/libdb_cxx-5.2.a
+lib/db5/libdb_cxx-5.2.la
+lib/db5/libdb_cxx-5.2.so
+lib/db5/libdb_cxx-5.2.so.0
+lib/db5/libdb_cxx-5.so
+lib/db5/libdb_cxx.a
+lib/db5/libdb_cxx.so
+lib/db5/libdb_stl-5.2.a
+lib/db5/libdb_stl-5.2.la
+lib/db5/libdb_stl-5.2.so
+lib/db5/libdb_stl-5.2.so.0
+lib/db5/libdb_stl-5.so
+lib/db5/libdb_stl.a
+lib/db5/libdb_stl.so
+%%JAVA%%lib/db5/db.jar
+%%JAVA%%lib/db5/libdb_java-5.2.a
+%%JAVA%%lib/db5/libdb_java-5.2.la
+%%JAVA%%lib/db5/libdb_java-5.2.so
+%%JAVA%%lib/db5/libdb_java-5.2.so.0
+%%JAVA%%lib/db5/libdb_java-5.2_g.so
+%%JAVA%%lib/db5/libdb_java-5.so
+%%JAVA%%lib/db5/libdb_java.a
+%%JAVA%%lib/db5/libdb_java.so
+%%JAVA%%lib/libdb_java-5.2.so
+%%JAVA%%lib/libdb_java-5.2.so.0
+%%SQL%%lib/db5/libdb_sql-5.2.a
+%%SQL%%lib/db5/libdb_sql-5.2.la
+%%SQL%%lib/db5/libdb_sql-5.2.so
+%%SQL%%lib/db5/libdb_sql-5.2.so.0
+%%SQL%%lib/db5/libdb_sql-5.so
+%%SQL%%lib/db5/libdb_sql.a
+%%SQL%%lib/db5/libdb_sql.so
+%%SQL%%lib/libdb_sql-5.2.so
+%%SQL%%lib/libdb_sql-5.2.so.0
+lib/libdb-5.2.so.0
+lib/libdb-5.2.so
+lib/libdb-5.so
+lib/libdb_cxx-5.2.so
+lib/libdb_cxx-5.2.so.0
+lib/libdb_stl-5.2.so
+lib/libdb_stl-5.2.so.0
+lib/libdb-5.so.0
+lib/libdb_cxx-5.so.0
+lib/libdb_cxx-5.so
+lib/libdb_stl-5.so.0
+lib/libdb_stl-5.so
+%%SQL%%lib/libdb_sql-5.so.0
+%%SQL%%lib/libdb_sql-5.so
+%%JAVA%%lib/libdb_java-5.so.0
+%%JAVA%%lib/libdb_java-5.so
+@dirrmtry lib/db5
+@dirrmtry include/db5
+@dirrmtry bin/db5