Add Oracle Berkeley DB 6.0.

Simplify installation over previous versions.

License change to Affero GNU General Public License v3 (AGPL v3).

Announcement:	https://oss.oracle.com/pipermail/bdb/2013-June/000056.html
ChangeLog:	http://download.oracle.com/otndocs/products/berkeleydb/html/changelog_6_0.html

6 files changed, 223 insertions, 1 deletions

diff --git a/Mk/bsd.database.mk b/Mk/bsd.database.mk
index f2a5f9825e6..42bc0c12a77 100644
--- a/Mk/bsd.database.mk
+++ b/Mk/bsd.database.mk
@@ -294,6 +294,7 @@ db46_DEPENDS=	db-4.6.0:${PORTSDIR}/databases/db46
 db47_DEPENDS=	db-4.7.0:${PORTSDIR}/databases/db47
 db48_DEPENDS=	db-4.8.0:${PORTSDIR}/databases/db48
 db5_DEPENDS=	db-5.3.0:${PORTSDIR}/databases/db5
+db6_DEPENDS=	db-6.0.0:${PORTSDIR}/databases/db6
 # Detect db versions by finding some files
 db40_FIND=	${LOCALBASE}/include/db4/db.h
 db41_FIND=	${LOCALBASE}/include/db41/db.h
@@ -304,6 +305,7 @@ db46_FIND=	${LOCALBASE}/include/db46/db.h
 db47_FIND=	${LOCALBASE}/include/db47/db.h
 db48_FIND=	${LOCALBASE}/include/db48/db.h
 db5_FIND=	${LOCALBASE}/include/db5/db.h
+db6_FIND=	${LOCALBASE}/include/db6/db.h
 
 # For specifying [40, 41, ..]+
 _DB_40P=	40 ${_DB_41P}
@@ -314,7 +316,8 @@ _DB_44P=	44 ${_DB_46P}
 _DB_46P=	46 ${_DB_47P}
 _DB_47P=	47 ${_DB_48P}
 _DB_48P=	48 ${_DB_5P}
-_DB_5P=		5
+_DB_5P=		5 ${_DB_6P}
+_DB_6P=		6
 
 # Override the global WITH_BDB_VER with the
 # port specific <UNIQUENAME>_WITH_BDB_VER
@@ -454,6 +457,10 @@ BDB_LIB_DIR=		${LOCALBASE}/lib/db48
 BDB_LIB_NAME=		db-5.3
 BDB_LIB_CXX_NAME=	db_cxx-5.3
 BDB_LIB_DIR=		${LOCALBASE}/lib/db5
+.  elif ${_BDB_VER} == 6
+BDB_LIB_NAME=		db-6.0
+BDB_LIB_CXX_NAME=	db_cxx-6.0
+BDB_LIB_DIR=		${LOCALBASE}/lib/db6
 .  endif
 BDB_LIB_NAME?=		db${_BDB_VER}
 BDB_LIB_CXX_NAME?=	db${_BDB_VER}_cxx
diff --git a/databases/Makefile b/databases/Makefile
index 93588616873..726c0c7b381 100644
--- a/databases/Makefile
+++ b/databases/Makefile
@@ -48,6 +48,7 @@
     SUBDIR += db48
     SUBDIR += db4o-mono
     SUBDIR += db5
+    SUBDIR += db6
     SUBDIR += dbXML
     SUBDIR += dbconnect
     SUBDIR += dbf
diff --git a/databases/db6/Makefile b/databases/db6/Makefile
new file mode 100644
index 00000000000..db9e66eb146
--- /dev/null
+++ b/databases/db6/Makefile
@@ -0,0 +1,110 @@
+# Created by: Matthias Andree <mandree@FreeBSD.org>
+# $FreeBSD$
+
+PORTNAME=	db6
+PORTVERSION=	6.0.19.0
+CATEGORIES=	databases java
+MASTER_SITES=	http://download.oracle.com/berkeley-db/
+PKGNAMEPREFIX?=
+# the distfiles aren't named db6-* but db-*:
+DISTNAME=	db-${PORTVERSION:R}
+DIST_SUBDIR=	bdb
+
+MAINTAINER=	mandree@FreeBSD.org
+COMMENT=	The Oracle Berkeley DB, revision ${BDBVER}
+
+LICENSE=	AGPLv3
+
+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}
+CONFIGURE_SCRIPT=	../dist/configure
+GNU_CONFIGURE=	yes
+MAKE_JOBS_SAFE=	yes
+USE_GMAKE=	yes
+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}
+MAKE_ARGS+=	docdir=${DOCSDIR}
+
+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.options.mk>
+
+.if ${PORT_OPTIONS:MDOCS}
+INSTALL_TARGET+=install_docs
+PORTDOCS=	*
+.endif
+
+.if ${PORT_OPTIONS:MSQL}
+CONFIGURE_ARGS+=	--enable-sql_codegen --enable-sql
+PLIST_SUB+=	SQL=""
+libdb_sql=	libdb_sql
+.else
+PLIST_SUB+=	SQL="@comment "
+libdb_sql=
+.endif
+
+.if ${PORT_OPTIONS:MJAVA}
+USE_JAVA=	yes
+JAVA_VERSION=	1.6+
+CONFIGURE_ARGS+=	--enable-java
+CPPFLAGS+=	"-I${JAVA_HOME}/include"
+CONFIGURE_ENV=	JAVAC="${JAVAC}" JAR="${JAR}" JAVA="${JAVA}"
+PLIST_SUB+=	JAVA=""
+libdb_java=	libdb_java
+.else
+PLIST_SUB+=	JAVA="@comment "
+libdb_java=
+.endif
+
+.if ${PORT_OPTIONS:MCRYPTO}
+CONFIGURE_ARGS+=	--with-cryptography=yes
+.else
+CONFIGURE_ARGS+=	--with-cryptography=no
+.endif
+
+.if ${PORT_OPTIONS:ML10N}
+CONFIGURE_ARGS+=	--enable-localization
+.endif
+
+.if ${PORT_OPTIONS:MDEBUG}
+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 ${PREFIX}/lib
+	${LN} -s -f ${i}-${BDBVER}.a ${PREFIX}/lib/${PORTNAME}/${i}.a
+.endfor
+	cd ${PREFIX}/bin/${PORTNAME}; \
+	for i in *; do ${LN} -s -f ${PORTNAME}/$$i ../$$i-${BDBVER} ; done
+.if ${PORT_OPTIONS:MDOCS}
+.for i in api_reference/TCL
+	${RM} -r -f ${DOCSDIR}/${i}
+.endfor
+.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 empty(PORT_OPTIONS:MSQL)
+	${RM} -r -f ${DOCSDIR}/bdb-sql
+.endif
+.endif
+
+.include <bsd.port.mk>
diff --git a/databases/db6/distinfo b/databases/db6/distinfo
new file mode 100644
index 00000000000..9de59bcbe49
--- /dev/null
+++ b/databases/db6/distinfo
@@ -0,0 +1,2 @@
+SHA256 (bdb/db-6.0.19.tar.gz) = 2917c28f60903908c2ca4587ded1363b812c4e830a5326aaa77c9879d13ae18e
+SIZE (bdb/db-6.0.19.tar.gz) = 36541923
diff --git a/databases/db6/pkg-descr b/databases/db6/pkg-descr
new file mode 100644
index 00000000000..5a07be1d25f
--- /dev/null
+++ b/databases/db6/pkg-descr
@@ -0,0 +1,14 @@
+Oracle Berkeley DB is a family of open source embeddable databases
+that allows developers to incorporate within their applications a
+fast, scalable, transactional database engine with industrial grade
+reliability and availability. As a result, customers and end-users
+will experience an application that simply works, reliably manages
+data, can scale under extreme load, but requires no ongoing database
+administration. As a developer, you can focus on your application and
+be confident that Oracle Berkeley DB will manage your persistence
+needs.
+
+Note that Berkeley DB 6 changed license to the
+Affero GNU General Public License v3 (AGPL v3).
+
+WWW: http://www.oracle.com/us/products/database/berkeley-db/db/
diff --git a/databases/db6/pkg-plist b/databases/db6/pkg-plist
new file mode 100644
index 00000000000..b795c67d409
--- /dev/null
+++ b/databases/db6/pkg-plist
@@ -0,0 +1,88 @@
+bin/db%%BDBMAJ%%/db_archive
+bin/db%%BDBMAJ%%/db_checkpoint
+bin/db%%BDBMAJ%%/db_deadlock
+bin/db%%BDBMAJ%%/db_dump
+bin/db%%BDBMAJ%%/db_hotbackup
+bin/db%%BDBMAJ%%/db_load
+bin/db%%BDBMAJ%%/db_log_verify
+bin/db%%BDBMAJ%%/db_printlog
+bin/db%%BDBMAJ%%/db_recover
+bin/db%%BDBMAJ%%/db_replicate
+%%SQL%%bin/db%%BDBMAJ%%/db_sql_codegen
+bin/db%%BDBMAJ%%/db_stat
+bin/db%%BDBMAJ%%/db_tuner
+bin/db%%BDBMAJ%%/db_upgrade
+bin/db%%BDBMAJ%%/db_verify
+%%SQL%%bin/db%%BDBMAJ%%/dbsql
+bin/db_archive-%%BDBVER%%
+bin/db_checkpoint-%%BDBVER%%
+bin/db_deadlock-%%BDBVER%%
+bin/db_dump-%%BDBVER%%
+bin/db_hotbackup-%%BDBVER%%
+bin/db_load-%%BDBVER%%
+bin/db_log_verify-%%BDBVER%%
+bin/db_printlog-%%BDBVER%%
+bin/db_recover-%%BDBVER%%
+bin/db_replicate-%%BDBVER%%
+%%SQL%%bin/db_sql_codegen-%%BDBVER%%
+bin/db_stat-%%BDBVER%%
+bin/db_tuner-%%BDBVER%%
+bin/db_upgrade-%%BDBVER%%
+bin/db_verify-%%BDBVER%%
+%%SQL%%bin/dbsql-%%BDBVER%%
+include/db%%BDBMAJ%%/db.h
+include/db%%BDBMAJ%%/db_cxx.h
+%%SQL%%include/db%%BDBMAJ%%/dbsql.h
+include/db%%BDBMAJ%%/dbstl_base_iterator.h
+include/db%%BDBMAJ%%/dbstl_common.h
+include/db%%BDBMAJ%%/dbstl_container.h
+include/db%%BDBMAJ%%/dbstl_dbc.h
+include/db%%BDBMAJ%%/dbstl_dbt.h
+include/db%%BDBMAJ%%/dbstl_element_ref.h
+include/db%%BDBMAJ%%/dbstl_exception.h
+include/db%%BDBMAJ%%/dbstl_inner_utility.h
+include/db%%BDBMAJ%%/dbstl_map.h
+include/db%%BDBMAJ%%/dbstl_resource_manager.h
+include/db%%BDBMAJ%%/dbstl_set.h
+include/db%%BDBMAJ%%/dbstl_utility.h
+include/db%%BDBMAJ%%/dbstl_vector.h
+%%JAVA%%lib/db%%BDBMAJ%%/db.jar
+lib/db%%BDBMAJ%%/libdb-%%BDBVER%%.a
+lib/db%%BDBMAJ%%/libdb-%%BDBVER%%.la
+lib/db%%BDBMAJ%%/libdb-%%BDBVER%%.so
+lib/db%%BDBMAJ%%/libdb-%%BDBMAJ%%.so
+lib/db%%BDBMAJ%%/libdb.a
+lib/db%%BDBMAJ%%/libdb.so
+lib/db%%BDBMAJ%%/libdb_cxx-%%BDBVER%%.a
+lib/db%%BDBMAJ%%/libdb_cxx-%%BDBVER%%.la
+lib/db%%BDBMAJ%%/libdb_cxx-%%BDBVER%%.so
+lib/db%%BDBMAJ%%/libdb_cxx-%%BDBMAJ%%.so
+lib/db%%BDBMAJ%%/libdb_cxx.a
+lib/db%%BDBMAJ%%/libdb_cxx.so
+%%JAVA%%lib/db%%BDBMAJ%%/libdb_java-%%BDBVER%%.a
+%%JAVA%%lib/db%%BDBMAJ%%/libdb_java-%%BDBVER%%.la
+%%JAVA%%lib/db%%BDBMAJ%%/libdb_java-%%BDBVER%%.so
+%%JAVA%%lib/db%%BDBMAJ%%/libdb_java-%%BDBVER%%_g.so
+%%JAVA%%lib/db%%BDBMAJ%%/libdb_java.a
+%%JAVA%%lib/db%%BDBMAJ%%/libdb_java.so
+%%JAVA%%lib/db%%BDBMAJ%%/libdb_java-%%BDBMAJ%%.so
+%%SQL%%lib/db%%BDBMAJ%%/libdb_sql-%%BDBVER%%.a
+%%SQL%%lib/db%%BDBMAJ%%/libdb_sql-%%BDBVER%%.la
+%%SQL%%lib/db%%BDBMAJ%%/libdb_sql-%%BDBVER%%.so
+%%SQL%%lib/db%%BDBMAJ%%/libdb_sql.a
+%%SQL%%lib/db%%BDBMAJ%%/libdb_sql.so
+%%SQL%%lib/db%%BDBMAJ%%/libdb_sql-%%BDBMAJ%%.so
+lib/db%%BDBMAJ%%/libdb_stl-%%BDBVER%%.a
+lib/db%%BDBMAJ%%/libdb_stl-%%BDBVER%%.la
+lib/db%%BDBMAJ%%/libdb_stl-%%BDBVER%%.so
+lib/db%%BDBMAJ%%/libdb_stl-%%BDBMAJ%%.so
+lib/db%%BDBMAJ%%/libdb_stl.a
+lib/db%%BDBMAJ%%/libdb_stl.so
+lib/libdb-%%BDBVER%%.so
+lib/libdb_cxx-%%BDBVER%%.so
+%%JAVA%%lib/libdb_java-%%BDBVER%%.so
+%%SQL%%lib/libdb_sql-%%BDBVER%%.so
+lib/libdb_stl-%%BDBVER%%.so
+@dirrm lib/db%%BDBMAJ%%
+@dirrm include/db%%BDBMAJ%%
+@dirrm bin/db%%BDBMAJ%%