3 files changed, 40 insertions, 7 deletions

diff --git a/databases/db6/Makefile b/databases/db6/Makefile
index c995dde9f732..41b133b6a431 100644
--- a/databases/db6/Makefile
+++ b/databases/db6/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	db6
 PORTVERSION=	6.2.32
+PORTREVISION=	1
 CATEGORIES=	databases java
 MASTER_SITES=	http://download.oracle.com/berkeley-db/
 PKGNAMEPREFIX?=
@@ -17,9 +18,11 @@ 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} \
@@ -63,6 +66,14 @@ DOCS_INSTALL_TARGET=	install_docs
 
 .include <bsd.port.options.mk>
 
+.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' \
@@ -74,6 +85,7 @@ 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}; \
diff --git a/databases/db6/files/patch-src_dbinc_db.in b/databases/db6/files/patch-src_dbinc_db.in
new file mode 100644
index 000000000000..08032b1c27da
--- /dev/null
+++ b/databases/db6/files/patch-src_dbinc_db.in
@@ -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.
diff --git a/databases/db6/pkg-plist b/databases/db6/pkg-plist
index 4b5960251fe4..b57e261fc54f 100644
--- a/databases/db6/pkg-plist
+++ b/databases/db6/pkg-plist
@@ -80,14 +80,20 @@ 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