svn commit: r320540 - in head: Mk databases databases/db6 databases/db6/files
Matthias Andree
mandree at FreeBSD.org
Tue Jun 11 08:15:25 UTC 2013
Author: mandree
Date: Tue Jun 11 08:15:22 2013
New Revision: 320540
URL: http://svnweb.freebsd.org/changeset/ports/320540
Log:
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
Added:
head/databases/db6/
- copied from r320512, head/databases/db5/
Deleted:
head/databases/db6/files/
Modified:
head/Mk/bsd.database.mk
head/databases/Makefile
head/databases/db6/Makefile
head/databases/db6/distinfo (contents, props changed)
head/databases/db6/pkg-descr (contents, props changed)
head/databases/db6/pkg-plist (contents, props changed)
Modified: head/Mk/bsd.database.mk
==============================================================================
--- head/Mk/bsd.database.mk Tue Jun 11 07:45:34 2013 (r320539)
+++ head/Mk/bsd.database.mk Tue Jun 11 08:15:22 2013 (r320540)
@@ -294,6 +294,7 @@ db46_DEPENDS= db-4.6.0:${PORTSDIR}/datab
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.
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
Modified: head/databases/Makefile
==============================================================================
--- head/databases/Makefile Tue Jun 11 07:45:34 2013 (r320539)
+++ head/databases/Makefile Tue Jun 11 08:15:22 2013 (r320540)
@@ -48,6 +48,7 @@
SUBDIR += db48
SUBDIR += db4o-mono
SUBDIR += db5
+ SUBDIR += db6
SUBDIR += dbXML
SUBDIR += dbconnect
SUBDIR += dbf
Modified: head/databases/db6/Makefile
==============================================================================
--- head/databases/db5/Makefile Tue Jun 11 00:19:18 2013 (r320512)
+++ head/databases/db6/Makefile Tue Jun 11 08:15:22 2013 (r320540)
@@ -1,18 +1,20 @@
# Created by: Matthias Andree <mandree at FreeBSD.org>
# $FreeBSD$
-PORTNAME= db5
-PORTVERSION= 5.3.21.0
+PORTNAME= db6
+PORTVERSION= 6.0.19.0
CATEGORIES= databases java
MASTER_SITES= http://download.oracle.com/berkeley-db/
PKGNAMEPREFIX?=
-# the distfiles aren't named db5-* but db-*:
+# the distfiles aren't named db6-* but db-*:
DISTNAME= db-${PORTVERSION:R}
DIST_SUBDIR= bdb
MAINTAINER= mandree at FreeBSD.org
COMMENT= The Oracle Berkeley DB, revision ${BDBVER}
+LICENSE= AGPLv3
+
BDBVER= ${PORTVERSION:R:R}
BDBMAJ= ${BDBVER:R}
CONFIGURE_ARGS= --enable-cxx --enable-stl \
@@ -29,6 +31,7 @@ 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
@@ -39,7 +42,7 @@ SQL_DESC= Enable SQL API (EXPERIMENTAL)
.include <bsd.port.options.mk>
.if ${PORT_OPTIONS:MDOCS}
-INSTALL_TARGET+=install_docs docdir=${DOCSDIR}
+INSTALL_TARGET+=install_docs
PORTDOCS= *
.endif
@@ -84,18 +87,11 @@ post-patch:
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 ${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.0
+ ${LN} -s -f ${PORTNAME}/${i}-${BDBVER}.so ${PREFIX}/lib
${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} ; \
- ${LN} -s -f ${PORTNAME}/$$i ../$$i-${BDBMAJ} ; done
+ 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}
Modified: head/databases/db6/distinfo
==============================================================================
--- head/databases/db5/distinfo Tue Jun 11 00:19:18 2013 (r320512)
+++ head/databases/db6/distinfo Tue Jun 11 08:15:22 2013 (r320540)
@@ -1,2 +1,2 @@
-SHA256 (bdb/db-5.3.21.tar.gz) = ddd92a930317df92021054c03992392db9ea5cddba43bef8920d392a82114fb8
-SIZE (bdb/db-5.3.21.tar.gz) = 35062469
+SHA256 (bdb/db-6.0.19.tar.gz) = 2917c28f60903908c2ca4587ded1363b812c4e830a5326aaa77c9879d13ae18e
+SIZE (bdb/db-6.0.19.tar.gz) = 36541923
Modified: head/databases/db6/pkg-descr
==============================================================================
--- head/databases/db5/pkg-descr Tue Jun 11 00:19:18 2013 (r320512)
+++ head/databases/db6/pkg-descr Tue Jun 11 08:15:22 2013 (r320540)
@@ -8,4 +8,7 @@ administration. As a developer, you can
be confident that Oracle Berkeley DB will manage your persistence
needs.
-WWW: http://www.oracle.com/us/products/database/berkeley-db/db/
+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/
Modified: head/databases/db6/pkg-plist
==============================================================================
--- head/databases/db5/pkg-plist Tue Jun 11 00:19:18 2013 (r320512)
+++ head/databases/db6/pkg-plist Tue Jun 11 08:15:22 2013 (r320540)
@@ -1,124 +1,88 @@
-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
-%%SQL%%bin/db5/db_sql_codegen
-bin/db5/db_stat
-bin/db5/db_tuner
-bin/db5/db_upgrade
-bin/db5/db_verify
-%%SQL%%bin/db5/dbsql
-bin/db_archive-%%BDBMAJ%%
+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-%%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_container.h
-include/db5/dbstl_dbc.h
-include/db5/dbstl_dbt.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
-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-%%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
-%%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/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/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
+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-%%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
- at dirrm lib/db5
- at dirrm include/db5
- at dirrm bin/db5
+ at dirrm lib/db%%BDBMAJ%%
+ at dirrm include/db%%BDBMAJ%%
+ at dirrm bin/db%%BDBMAJ%%
More information about the svn-ports-all
mailing list