3 files changed, 113 insertions, 113 deletions

diff --git a/databases/db5/Makefile b/databases/db5/Makefile
index 92ddcf9d1e95..035d919b0384 100644
--- a/databases/db5/Makefile
+++ b/databases/db5/Makefile
@@ -6,8 +6,7 @@
 #
 
 PORTNAME=	db5
-PORTVERSION=	5.2.42.0
-PORTREVISION=	0
+PORTVERSION=	5.3.21.0
 CATEGORIES=	databases java
 MASTER_SITES=	http://download.oracle.com/berkeley-db/
 PKGNAMEPREFIX?=
@@ -16,7 +15,7 @@ DISTNAME=	db-${PORTVERSION:R}
 DIST_SUBDIR=	bdb
 
 MAINTAINER=	mandree@FreeBSD.org
-COMMENT=	The Oracle Berkeley DB, revision 5.2
+COMMENT=	The Oracle Berkeley DB, revision ${BDBVER}
 
 BDBVER=		${PORTVERSION:R:R}
 BDBMAJ=		${BDBVER:R}
@@ -33,20 +32,22 @@ INSTALL_TARGET=	install_include install_lib install_utilities
 LIBTOOLFILES=	${CONFIGURE_SCRIPT}
 WRKSRC=		${WRKDIR}/${DISTNAME}/build_unix
 USE_LDCONFIG=	yes
+PLIST_SUB=	BDBMAJ=${BDBMAJ} BDBVER=${BDBVER}
 
 .if !defined(NOPORTDOCS)
 INSTALL_TARGET+=	install_docs docdir=${DOCSDIR}
 PORTDOCS=		*
 .endif
 
-OPTIONS=	CRYPTO "Cryptography support" ON \
-		L10N "Localization support" OFF \
-		SQL "SQL API (EXPERIMENTAL)" OFF \
-		JAVA "JAVA API (EXPERIMENTAL)" OFF
+OPTIONS_DEFINE=	CRYPTO L10N SQL JAVA
+OPTIONS_DEFAULT=CRYPTO
+CRYPTO_DESC=	Cryptography support
+L10N_DESC=	Localization support (EXPERIMENTAL)
+SQL_DESC=	Enable SQL API (EXPERIMENTAL)
 
-.include <bsd.port.pre.mk>
+.include <bsd.port.options.mk>
 
-.if defined(WITH_SQL)
+.if ${PORT_OPTIONS:MSQL}
 CONFIGURE_ARGS+=	--enable-sql_codegen --enable-sql
 PLIST_SUB+=	SQL=""
 libdb_sql=	libdb_sql
@@ -55,7 +56,7 @@ PLIST_SUB+=	SQL="@comment "
 libdb_sql=
 .endif
 
-.if defined(WITH_JAVA)
+.if ${PORT_OPTIONS:MJAVA}
 USE_JAVA=	yes
 JAVA_VERSION=	1.5+
 CONFIGURE_ARGS+=	--enable-java
@@ -68,17 +69,17 @@ PLIST_SUB+=	JAVA="@comment "
 libdb_java=
 .endif
 
-.if defined(WITH_CRYPTO)
+.if ${PORT_OPTIONS:MCRYPTO}
 CONFIGURE_ARGS+=	--with-cryptography=yes
 .else
 CONFIGURE_ARGS+=	--with-cryptography=no
 .endif
 
-.if defined(WITH_L10N)
+.if ${PORT_OPTIONS:ML10N}
 CONFIGURE_ARGS+=	--enable-localization
 .endif
 
-.if defined(WITH_DEBUG)
+.if ${PORT_OPTIONS:MDEBUG}
 CONFIGURE_ARGS+=	--enable-debug --enable-umrw
 .endif
 
@@ -99,19 +100,19 @@ post-install:
 	cd ${PREFIX}/bin/${PORTNAME}; \
 	for i in *; do ${LN} -s -f ${PORTNAME}/$$i ../$$i-${BDBVER} ; \
 		       ${LN} -s -f ${PORTNAME}/$$i ../$$i-${BDBMAJ} ; done
-.if !defined(NOPORTDOCS)
+.if ${PORT_OPTIONS:MDOCS}
 .for i in api_reference/TCL
 	${RM} -r -f ${DOCSDIR}/${i}
 .endfor
-.if !defined(WITH_JAVA)
+.if empty(PORT_OPTIONS:MJAVA)
 	${RM} -r -f ${DOCSDIR}/java
 .for i in gsg gsg_db_rep gsg_txn
 	${RM} -r -f ${DOCSDIR}/${i}/JAVA
 .endfor
 .endif
-.if !defined(WITH_SQL)
+.if empty(PORT_OPTIONS:MSQL)
 	${RM} -r -f ${DOCSDIR}/bdb-sql
 .endif
 .endif
 
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
diff --git a/databases/db5/distinfo b/databases/db5/distinfo
index c6012348dfe1..9ddc47457546 100644
--- a/databases/db5/distinfo
+++ b/databases/db5/distinfo
@@ -1,2 +1,2 @@
-SHA256 (bdb/db-5.2.42.tar.gz) = 5626f51b3f904c0e00b5ce5ea7904d941b46cfc904557545edd4190e7316a1a5
-SIZE (bdb/db-5.2.42.tar.gz) = 34659298
+SHA256 (bdb/db-5.3.21.tar.gz) = ddd92a930317df92021054c03992392db9ea5cddba43bef8920d392a82114fb8
+SIZE (bdb/db-5.3.21.tar.gz) = 35062469
diff --git a/databases/db5/pkg-plist b/databases/db5/pkg-plist
index 93eb70915664..213017820da9 100644
--- a/databases/db5/pkg-plist
+++ b/databases/db5/pkg-plist
@@ -1,4 +1,3 @@
-@comment $FreeBSD$
 bin/db5/db_archive
 bin/db5/db_checkpoint
 bin/db5/db_deadlock
@@ -9,117 +8,117 @@ 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_tuner
 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
+%%SQL%%bin/db5/dbsql
+bin/db_archive-%%BDBMAJ%%
+bin/db_archive-%%BDBVER%%
+bin/db_checkpoint-%%BDBMAJ%%
+bin/db_checkpoint-%%BDBVER%%
+bin/db_deadlock-%%BDBMAJ%%
+bin/db_deadlock-%%BDBVER%%
+bin/db_dump-%%BDBMAJ%%
+bin/db_dump-%%BDBVER%%
+bin/db_hotbackup-%%BDBMAJ%%
+bin/db_hotbackup-%%BDBVER%%
+bin/db_load-%%BDBMAJ%%
+bin/db_load-%%BDBVER%%
+bin/db_log_verify-%%BDBMAJ%%
+bin/db_log_verify-%%BDBVER%%
+bin/db_printlog-%%BDBMAJ%%
+bin/db_printlog-%%BDBVER%%
+bin/db_recover-%%BDBMAJ%%
+bin/db_recover-%%BDBVER%%
+bin/db_replicate-%%BDBMAJ%%
+bin/db_replicate-%%BDBVER%%
+%%SQL%%bin/db_sql_codegen-%%BDBMAJ%%
+%%SQL%%bin/db_sql_codegen-%%BDBVER%%
+bin/db_stat-%%BDBMAJ%%
+bin/db_stat-%%BDBVER%%
+bin/db_tuner-%%BDBMAJ%%
+bin/db_tuner-%%BDBVER%%
+bin/db_upgrade-%%BDBMAJ%%
+bin/db_upgrade-%%BDBVER%%
+bin/db_verify-%%BDBMAJ%%
+bin/db_verify-%%BDBVER%%
+%%SQL%%bin/dbsql-%%BDBMAJ%%
+%%SQL%%bin/dbsql-%%BDBVER%%
 include/db5/db.h
 include/db5/db_cxx.h
 %%SQL%%include/db5/dbsql.h
+include/db5/dbstl_base_iterator.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_container.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_exception.h
 include/db5/dbstl_inner_utility.h
+include/db5/dbstl_map.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
+include/db5/dbstl_set.h
+include/db5/dbstl_utility.h
+include/db5/dbstl_vector.h
+%%JAVA%%lib/db5/db.jar
+lib/db5/libdb-%%BDBVER%%.a
+lib/db5/libdb-%%BDBVER%%.la
+lib/db5/libdb-%%BDBVER%%.so
+lib/db5/libdb-%%BDBVER%%.so.0
+lib/db5/libdb-%%BDBMAJ%%.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-%%BDBVER%%.a
+lib/db5/libdb_cxx-%%BDBVER%%.la
+lib/db5/libdb_cxx-%%BDBVER%%.so
+lib/db5/libdb_cxx-%%BDBVER%%.so.0
+lib/db5/libdb_cxx-%%BDBMAJ%%.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-%%BDBVER%%.a
+%%JAVA%%lib/db5/libdb_java-%%BDBVER%%.la
+%%JAVA%%lib/db5/libdb_java-%%BDBVER%%.so
+%%JAVA%%lib/db5/libdb_java-%%BDBVER%%.so.0
+%%JAVA%%lib/db5/libdb_java-%%BDBVER%%_g.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
+%%JAVA%%lib/db5/libdb_java-%%BDBMAJ%%.so
+%%SQL%%lib/db5/libdb_sql-%%BDBVER%%.a
+%%SQL%%lib/db5/libdb_sql-%%BDBVER%%.la
+%%SQL%%lib/db5/libdb_sql-%%BDBVER%%.so
+%%SQL%%lib/db5/libdb_sql-%%BDBVER%%.so.0
 %%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
+%%SQL%%lib/db5/libdb_sql-%%BDBMAJ%%.so
+lib/db5/libdb_stl-%%BDBVER%%.a
+lib/db5/libdb_stl-%%BDBVER%%.la
+lib/db5/libdb_stl-%%BDBVER%%.so
+lib/db5/libdb_stl-%%BDBVER%%.so.0
+lib/db5/libdb_stl-%%BDBMAJ%%.so
+lib/db5/libdb_stl.a
+lib/db5/libdb_stl.so
+lib/libdb-%%BDBMAJ%%.so
+lib/libdb-%%BDBMAJ%%.so.0
+lib/libdb-%%BDBVER%%.so
+lib/libdb-%%BDBVER%%.so.0
+lib/libdb_cxx-%%BDBMAJ%%.so
+lib/libdb_cxx-%%BDBMAJ%%.so.0
+lib/libdb_cxx-%%BDBVER%%.so
+lib/libdb_cxx-%%BDBVER%%.so.0
+%%JAVA%%lib/libdb_java-%%BDBMAJ%%.so
+%%JAVA%%lib/libdb_java-%%BDBMAJ%%.so.0
+%%JAVA%%lib/libdb_java-%%BDBVER%%.so
+%%JAVA%%lib/libdb_java-%%BDBVER%%.so.0
+%%SQL%%lib/libdb_sql-%%BDBMAJ%%.so
+%%SQL%%lib/libdb_sql-%%BDBMAJ%%.so.0
+%%SQL%%lib/libdb_sql-%%BDBVER%%.so
+%%SQL%%lib/libdb_sql-%%BDBVER%%.so.0
+lib/libdb_stl-%%BDBMAJ%%.so
+lib/libdb_stl-%%BDBMAJ%%.so.0
+lib/libdb_stl-%%BDBVER%%.so
+lib/libdb_stl-%%BDBVER%%.so.0
+@dirrm lib/db5
+@dirrm include/db5
+@dirrm bin/db5