Index: head/databases/db5/Makefile =================================================================== --- head/databases/db5/Makefile (revision 476240) +++ head/databases/db5/Makefile (revision 476241) @@ -1,120 +1,120 @@ # Created by: Matthias Andree # $FreeBSD$ PORTNAME= db5 PORTVERSION= 5.3.28 -PORTREVISION= 6 +PORTREVISION= 7 CATEGORIES= databases java MASTER_SITES= http://download.oracle.com/berkeley-db/ PKGNAMEPREFIX?= # # the distfiles aren't named db5-* but db-*: DISTNAME= db-${PORTVERSION} DIST_SUBDIR= bdb MAINTAINER= mandree@FreeBSD.org COMMENT= Oracle Berkeley DB, revision ${BDBVER} LICENSE= SLEEPYCAT +LICENSE_GROUPS= FSF GPL OSI LICENSE_NAME= Sleepycat -LICENSE_PERMS= dist-mirror dist-sell pkg-mirror pkg-sell auto-accept LICENSE_FILE= ${WRKSRC}/../LICENSE -LICENSE_GROUPS= FSF GPL OSI +LICENSE_PERMS= dist-mirror dist-sell pkg-mirror pkg-sell auto-accept 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} \ --bindir=${PREFIX}/bin/${PORTNAME} CONFIGURE_SCRIPT= ../dist/configure GNU_CONFIGURE= yes USES= gmake libtool INSTALL_TARGET= install_include install_lib install_utilities WRKSRC= ${WRKDIR}/${DISTNAME}/build_unix PATCH_WRKSRC= ${WRKDIR}/${DISTNAME} USE_LDCONFIG= yes PLIST_SUB= BDBMAJ=${BDBMAJ} BDBVER=${BDBVER} MAKE_ARGS+= docdir=${DOCSDIR} CFLAGS+= -Wall -Wextra OPTIONS_DEFINE= CRYPTO L10N SQL JAVA TCL DOCS OPTIONS_DEFAULT=CRYPTO OPTIONS_SUB= yes CRYPTO_DESC= Cryptography support L10N_DESC= Localization support (EXPERIMENTAL) SQL_DESC= Enable SQL API (EXPERIMENTAL) PORTDOCS= * DBLIBS= libdb libdb_cxx libdb_stl DEBUG_CONFIGURE_ENABLE= debug umrw CRYPTO_CONFIGURE_WITH= cryptography=yes L10N_CONFIGURE_ENABLE= localization SQL_CONFIGURE_ENABLE= sql sql_codegen SQL_VARS= DBLIBS+=libdb_sql JAVA_USE= java # db5 is incompatible with openjdk8 and causes IllegalArgument # exceptions during build JAVA_VARS= DBLIBS+=libdb_java JAVA_VERSION="1.6 1.7" JAVA_CONFIGURE_ENABLE= java JAVA_CPPFLAGS= -I"${JAVA_HOME}/include" JAVA_CONFIGURE_ENV= JAVAC="${JAVAC}" JAR="${JAR}" JAVA="${JAVA}" JAVACFLAGS="-Xlint:unchecked" TCL_CONFIGURE_ENABLE= tcl TCL_USES= tcl:85+ TCL_CONFIGURE_WITH= tcl=${TCL_LIBDIR} TCL_VARS= DBLIBS+=libdb_tcl DOCS_INSTALL_TARGET= install_docs .include .if ${ARCH} == aarch64 || ${ARCH:Marmv*} # db5 uses a deprecated instruction for mutexes on ARM, fbsd bug#197227 # and also bug#205001 CONFIGURE_ARGS+= --enable-posixmutexes . if ${OSVERSION} > 1100100 # ^ leave that as ">" it really is greater than but NOT equal # force POSIX mutexes - the OS supports PTHREAD_PROCESS_SHARED CONFIGURE_ARGS+= --with-mutex=POSIX/pthreads . endif .endif post-patch: ${REINPLACE_CMD} -e '/^DOCLIST/{s/csharp//;}' ${WRKSRC}/../dist/Makefile.in ${REINPLACE_CMD} -Ee 's/[[:<:]]atomic_init[[:>:]]/db_atomic_init/g' ${WRKSRC}/../src/mp/mp* ${WRKSRC}/../src/mutex/mut_* post-install: .for i in ${DBLIBS} ${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/${PORTNAME}/${i}-${BDBVER}.so.0 ${LN} -s -f ${PORTNAME}/${i}-${BDBVER}.so.0 ${STAGEDIR}${PREFIX}/lib ${LN} -s -f ${PORTNAME}/${i}-${BDBMAJ}.so ${STAGEDIR}${PREFIX}/lib ${LN} -s -f ${i}-${BDBVER}.so.0 ${STAGEDIR}${PREFIX}/lib/${i}-${BDBVER}.so ${LN} -s -f ${i}-${BDBVER}.so.0 ${STAGEDIR}${PREFIX}/lib/${i}-${BDBMAJ}.so.0 ${LN} -s -f ${i}-${BDBVER}.a ${STAGEDIR}${PREFIX}/lib/${PORTNAME}/${i}.a .endfor cd ${STAGEDIR}${PREFIX}/bin/${PORTNAME}; \ for i in *; do ${LN} -s -f ${PORTNAME}/$$i ../$$i-${BDBVER} ; \ ${LN} -s -f ${PORTNAME}/$$i ../$$i-${BDBMAJ} ; done post-install-JAVA-off: ${RM} -r ${STAGEDIR}${DOCSDIR}/java .for i in gsg gsg_db_rep gsg_txn ${RM} -r ${STAGEDIR}${DOCSDIR}/${i}/JAVA .endfor post-install-SQL-off: ${RM} -r ${STAGEDIR}${DOCSDIR}/bdb-sql post-install-TCL-on: echo "package ifneeded Db_tcl ${BDBVER} \ [list load [file join $$dir libdb_tcl-${BDBVER}.so]] \ " > ${STAGEDIR}${PREFIX}/lib/${PORTNAME}/pkgIndex.tcl post-install-TCL-off: .for i in api_reference/TCL ${RM} -r ${STAGEDIR}${DOCSDIR}/${i} .endfor .include Index: head/databases/db5/files/patch-src_dbinc_db.in =================================================================== --- head/databases/db5/files/patch-src_dbinc_db.in (nonexistent) +++ head/databases/db5/files/patch-src_dbinc_db.in (revision 476241) @@ -0,0 +1,15 @@ +--- src/dbinc/db.in.orig 2013-09-09 15:35:08 UTC ++++ src/dbinc/db.in +@@ -2778,11 +2778,11 @@ typedef struct { + #define dbmclose __db_dbm_close@DB_VERSION_UNIQUE_NAME@ + #if !defined(__cplusplus) + #define delete(a) __db_dbm_delete@DB_VERSION_UNIQUE_NAME@(a) ++#define store(a, b) __db_dbm_store@DB_VERSION_UNIQUE_NAME@(a, b) + #endif + #define fetch(a) __db_dbm_fetch@DB_VERSION_UNIQUE_NAME@(a) + #define firstkey __db_dbm_firstkey@DB_VERSION_UNIQUE_NAME@ + #define nextkey(a) __db_dbm_nextkey@DB_VERSION_UNIQUE_NAME@(a) +-#define store(a, b) __db_dbm_store@DB_VERSION_UNIQUE_NAME@(a, b) + + /******************************************************* + * Hsearch historic interface. Property changes on: head/databases/db5/files/patch-src_dbinc_db.in ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property Index: head/databases/db6/Makefile =================================================================== --- head/databases/db6/Makefile (revision 476240) +++ head/databases/db6/Makefile (revision 476241) @@ -1,105 +1,117 @@ # Created by: Matthias Andree # $FreeBSD$ PORTNAME= db6 PORTVERSION= 6.2.32 +PORTREVISION= 1 CATEGORIES= databases java MASTER_SITES= http://download.oracle.com/berkeley-db/ PKGNAMEPREFIX?= # # the distfiles aren't named db6-* but db-*: DISTNAME= db-${PORTVERSION} DIST_SUBDIR= bdb MAINTAINER= mandree@FreeBSD.org COMMENT= Oracle Berkeley DB, revision ${BDBVER} LICENSE= AGPLv3 LICENSE_FILE= ${WRKSRC}/../LICENSE +BROKEN_mips64= no usable MUTEX implementation, assy works only for MIPS32, POSIX mutexes are unshared + 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} \ --bindir=${PREFIX}/bin/${PORTNAME} CONFIGURE_SCRIPT= ../dist/configure GNU_CONFIGURE= yes USES= gmake libtool INSTALL_TARGET= install_include install_lib install_utilities WRKSRC= ${WRKDIR}/${DISTNAME}/build_unix PATCH_WRKSRC= ${WRKDIR}/${DISTNAME} USE_LDCONFIG= yes PLIST_SUB= BDBMAJ=${BDBMAJ} BDBVER=${BDBVER} MAKE_ARGS+= docdir=${DOCSDIR} OPTIONS_DEFINE= CRYPTO L10N SQL JAVA TCL DOCS OPTIONS_DEFAULT=CRYPTO OPTIONS_SUB= yes CRYPTO_DESC= Cryptography support L10N_DESC= Localization support (EXPERIMENTAL) SQL_DESC= Enable SQL API (EXPERIMENTAL) PORTDOCS= * DBLIBS= libdb libdb_cxx libdb_stl DEBUG_CONFIGURE_ENABLE= debug umrw CRYPTO_CONFIGURE_WITH= cryptography=yes L10N_CONFIGURE_ENABLE= localization SQL_CONFIGURE_ENABLE= sql sql_codegen SQL_VARS= DBLIBS+=libdb_sql JAVA_USE= java JAVA_VARS= DBLIBS+=libdb_java JAVA_VERSION=1.6+ JAVA_CONFIGURE_ENABLE= java JAVA_CPPFLAGS= -I"${JAVA_HOME}/include" JAVA_CONFIGURE_ENV= JAVAC="${JAVAC}" JAR="${JAR}" JAVA="${JAVA}" TCL_CONFIGURE_ENABLE= tcl TCL_USES= tcl:85+ TCL_CONFIGURE_WITH= tcl=${TCL_LIBDIR} TCL_VARS= DBLIBS+=libdb_tcl DOCS_INSTALL_TARGET= install_docs .include +.if ${ARCH} == aarch64 +. if ${OSVERSION} > 1100100 +CONFIGURE_ARGS+= --with-mutex=POSIX/pthreads +. else +CONFIGURE_ARGS+= --enable-posixmutexes +. endif +.endif + post-patch: ${REINPLACE_CMD} -e '/^DOCLIST/{s/csharp//;}' ${WRKSRC}/../dist/Makefile.in ${REINPLACE_CMD} -Ee 's/[[:<:]]atomic_init[[:>:]]/db_atomic_init/g' \ ${WRKSRC}/../src/mp/mp* ${WRKSRC}/../src/mutex/mut_* \ ${WRKSRC}/../src/dbinc/atomic.h ${REINPLACE_CMD} -e 's/%%BDBVER%%/${BDBVER}/' ${WRKSRC}/../lang/sql/upgrade61.sh post-install: .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}; \ for i in *; do ${LN} -s -f ${PORTNAME}/$$i ../$$i-${BDBVER} ; done post-install-JAVA-off: ${RM} -r ${STAGEDIR}${DOCSDIR}/java .for i in gsg gsg_db_rep gsg_txn ${RM} -r ${STAGEDIR}${DOCSDIR}/${i}/JAVA .endfor post-install-SQL-off: ${RM} -r ${STAGEDIR}${DOCSDIR}/bdb-sql post-install-SQL-on: ${INSTALL_SCRIPT} ${WRKSRC}/../lang/sql/upgrade61.sh \ ${STAGEDIR}${PREFIX}/bin/${PORTNAME}-upgrade61.sh post-install-TCL-on: echo "package ifneeded Db_tcl ${BDBVER} \ [list load [file join $$dir libdb_tcl-${BDBVER}.so]] \ " > ${STAGEDIR}${PREFIX}/lib/${PORTNAME}/pkgIndex.tcl post-install-TCL-off: .for i in api_reference/TCL ${RM} -r ${STAGEDIR}${DOCSDIR}/${i} .endfor .include Index: head/databases/db6/files/patch-src_dbinc_db.in =================================================================== --- head/databases/db6/files/patch-src_dbinc_db.in (nonexistent) +++ head/databases/db6/files/patch-src_dbinc_db.in (revision 476241) @@ -0,0 +1,15 @@ +--- src/dbinc/db.in.orig 2017-04-13 14:06:20 UTC ++++ src/dbinc/db.in +@@ -2997,11 +2997,11 @@ typedef struct { + #define dbmclose __db_dbm_close@DB_VERSION_UNIQUE_NAME@ + #if !defined(__cplusplus) + #define delete(a) __db_dbm_delete@DB_VERSION_UNIQUE_NAME@(a) ++#define store(a, b) __db_dbm_store@DB_VERSION_UNIQUE_NAME@(a, b) + #endif + #define fetch(a) __db_dbm_fetch@DB_VERSION_UNIQUE_NAME@(a) + #define firstkey __db_dbm_firstkey@DB_VERSION_UNIQUE_NAME@ + #define nextkey(a) __db_dbm_nextkey@DB_VERSION_UNIQUE_NAME@(a) +-#define store(a, b) __db_dbm_store@DB_VERSION_UNIQUE_NAME@(a, b) + + /******************************************************* + * Hsearch historic interface. Property changes on: head/databases/db6/files/patch-src_dbinc_db.in ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property Index: head/databases/db6/pkg-plist =================================================================== --- head/databases/db6/pkg-plist (revision 476240) +++ head/databases/db6/pkg-plist (revision 476241) @@ -1,93 +1,99 @@ bin/db%%BDBMAJ%%/db_archive bin/db%%BDBMAJ%%/db_checkpoint bin/db%%BDBMAJ%%/db_convert bin/db%%BDBMAJ%%/db_deadlock bin/db%%BDBMAJ%%/db_dump bin/db%%BDBMAJ%%/db_dump185 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%%-upgrade61.sh %%SQL%%bin/db%%BDBMAJ%%/dbsql bin/db_archive-%%BDBVER%% bin/db_checkpoint-%%BDBVER%% bin/db_convert-%%BDBVER%% bin/db_deadlock-%%BDBVER%% bin/db_dump-%%BDBVER%% bin/db_dump185-%%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_185.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%%.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%%.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%%.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%%.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%%.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-%%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/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 %%TCL%%lib/libdb_tcl-%%BDBVER%%.so +%%TCL%%lib/libdb_tcl-%%BDBMAJ%%.so