Index: head/databases/db6/Makefile
===================================================================
--- head/databases/db6/Makefile	(revision 417589)
+++ head/databases/db6/Makefile	(revision 417590)
@@ -1,109 +1,112 @@
 # Created by: Matthias Andree <mandree@FreeBSD.org>
 # $FreeBSD$
 
 PORTNAME=	db6
 PORTVERSION=	6.2.23
 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
 
 BDBVER=		${PORTVERSION:R}
 BDBMAJ=		${BDBVER:R}
 CONFIGURE_ARGS=	--enable-cxx --enable-stl \
 		--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}
+WRKSRC_SUBDIR=	build_unix
+#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 <bsd.port.options.mk>
 
 .if ${ARCH} == "aarch64" || ${ARCH:Marmv6*}
 # db6 uses a deprecated instruction for mutexes on ARM, fbsd bug#197227
 # and also bug #205001
 CONFIGURE_ARGS+=	--enable-posixmutexes
 .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 ${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
-.if empty(PORT_OPTIONS:MJAVA)
+
+post-install-JAVA-off:
 	${RM} -r -f ${STAGEDIR}${DOCSDIR}/java
 .for i in gsg gsg_db_rep gsg_txn
 	${RM} -r -f ${STAGEDIR}${DOCSDIR}/${i}/JAVA
 .endfor
-.endif
-.if empty(PORT_OPTIONS:MSQL)
+
+post-install-SQL-off:
 	${RM} -r -f ${STAGEDIR}${DOCSDIR}/bdb-sql
-.endif
-.if !empty(PORT_OPTIONS:MTCL)
+
+post-install-SQL-on:
+	${INSTALL_SCRIPT} ${WRKSRC}/../lang/sql/upgrade61.sh \
+	    ${STAGEDIR}${PREFIX}/bin/${PORTNAME}-upgrade61.sh
+
+post-install-TCL-off:
 	echo "package ifneeded Db_tcl ${BDBVER} \
 	      [list load [file join $$dir libdb_tcl-${BDBVER}.so]] \
 	     " > ${STAGEDIR}${PREFIX}/lib/${PORTNAME}/pkgIndex.tcl
-.else
+
+post-install-TCL-on:
 .for i in api_reference/TCL
 	${RM} -r -f ${STAGEDIR}${DOCSDIR}/${i}
 .endfor
-.endif
-
-post-install-SQL-on:
-	${INSTALL_SCRIPT} ${WRKSRC}/../lang/sql/upgrade61.sh \
-	    ${STAGEDIR}${PREFIX}/bin/${PORTNAME}-upgrade61.sh
 
 .include <bsd.port.mk>
Index: head/databases/db6/files/patch-lang_sql_upgrade61.sh
===================================================================
--- head/databases/db6/files/patch-lang_sql_upgrade61.sh	(revision 417589)
+++ head/databases/db6/files/patch-lang_sql_upgrade61.sh	(revision 417590)
@@ -1,27 +1,27 @@
---- lang/sql/upgrade61.sh.orig	2016-03-28 19:45:53 UTC
-+++ lang/sql/upgrade61.sh
+--- ../lang/sql/upgrade61.sh.orig	2016-03-28 19:45:53 UTC
++++ ../lang/sql/upgrade61.sh
 @@ -1,12 +1,19 @@
  #!/bin/sh
  # This script upgrades SQL databases from BDB 5.0 to early 6.1
  # to late 6.1 and up by reindexing them.
 +# 
 +# Originally provided by Oracle as part of the Oracle BerkeleyDB
 +# 12.1.6.* tarballs.
  #
 +# Bugfixed for proper quoting and error checking
 +# by Matthias Andree <mandree@FreeBSD.org>
  
 -for var in $@
 +rc=0
 +for var in "$@"
  do
 -    echo Recovering database $var
 -    db_recover -f -h ${var}-journal
 -    echo Reindexing database $var
 -    echo .quit | dbsql -cmd REINDEX  $var
 +    echo "Recovering database $var"
 +    db_recover-%%BDBVER%% -f -h "${var}-journal" || { rc=1 ; continue ; }
 +    echo "Reindexing database $var"
 +    echo .quit | dbsql-%%BDBVER%% -cmd REINDEX "$var" || rc=1
  done
 +exit $rc
Index: head/databases/db6/files/patch-src_dbinc_mutex__int.h
===================================================================
--- head/databases/db6/files/patch-src_dbinc_mutex__int.h	(revision 417589)
+++ head/databases/db6/files/patch-src_dbinc_mutex__int.h	(revision 417590)
@@ -1,11 +1,11 @@
---- src/dbinc/mutex_int.h.orig	2016-03-28 19:45:54 UTC
-+++ src/dbinc/mutex_int.h
+--- ../src/dbinc/mutex_int.h.orig	2016-03-28 19:45:54 UTC
++++ ../src/dbinc/mutex_int.h
 @@ -652,7 +652,7 @@ MUTEX_SET(int *tsl)  {
  	 : "=&r" (__r), "+r" (tsl)
  	 :
  	 : "cr0", "memory");
 -	 return (int)tsl;
 +	 return (tsl != 0);
  }
  
  static inline int