Index: head/security/heimdal/Makefile
===================================================================
--- head/security/heimdal/Makefile	(revision 431159)
+++ head/security/heimdal/Makefile	(revision 431160)
@@ -1,123 +1,124 @@
 # Created by: nectar@FreeBSD.org
 # $FreeBSD$
 
 PORTNAME=	heimdal
 PORTVERSION=	7.1.0
 PORTREVISION=	2
 CATEGORIES=	security ipv6
 MASTER_SITES=	http://www.h5l.org/dist/src/ \
 		http://ftp.pdc.kth.se/pub/heimdal/src/ \
 		ftp://ftp.pdc.kth.se/pub/heimdal/src/ \
 		ftp://ftp.sunet.se/pub/unix/admin/mirror-pdc/heimdal/src/
 
 MAINTAINER=	hrs@FreeBSD.org
 COMMENT=	Popular BSD-licensed implementation of Kerberos 5
 
 LICENSE=	BSD3CLAUSE
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
 CONFLICTS=	krb4-[0-9]* krb5-[0-9]* krb5-maint-[0-9]* srp-[0-9]* \
 		wu-ftpd-[0-9]* wu-ftpd+ipv6-[0-9]*
 
 USES=		gettext-runtime gssapi:bootstrap,heimdal libtool pathfix \
 		pkgconfig readline makeinfo ssl
 USE_LDCONFIG=	${GSSAPILIBDIR}
 GNU_CONFIGURE=	yes
 CONFIGURE_ENV=	ac_cv_header_fnmatch_h=yes \
 		ac_cv_header_db_h=no \
 		ac_cv_header_db3_db_h=no \
 		ac_cv_header_db4_db_h=no \
 		ac_cv_header_db5_db_h=no \
 		ac_cv_header_db5_h=no \
 		ac_cv_prog_COMPILE_ET=${WRKSRC}/lib/com_err/compile_et
 CONFIGURE_ARGS=	--with-berkeley-db \
 		--with-libintl \
 		--with-libintl-include="${LOCALBASE}/include" \
 		--with-libintl-lib="${LOCALBASE}/lib" \
 		--libdir="${GSSAPILIBDIR}" \
 		--includedir="${GSSAPIINCDIR}" \
 		--with-kcm \
 		--with-openssl \
 		--with-openssl-include="${OPENSSLINC}" \
 		--with-openssl-lib="${OPENSSLLIB}" \
 		--enable-otp \
 		--enable-pthread-support \
 		--with-readline="${LOCALBASE}" \
 		--with-hdbdir="/var/${PORTNAME}" \
 		--sysconfdir="${PREFIX}/etc"
 # XXX --with-readline picks up libreadline even if found in /usr/lib.
 MAKE_ENV=	INSTALL_CATPAGES=no
 INSTALL_TARGET=	install-strip
 .if !exists(/etc/rc.d/ipropd_master)
 USE_RC_SUBR=	ipropd_master ipropd_slave
 .endif
 INFO=		heimdal hx509
 
 MAKE_JOBS_UNSAFE=	yes
 
 OPTIONS_DEFINE=	IPV6 BDB LMDB SQLITE LDAP PKINIT DIGEST KX509 CRACKLIB
 OPTIONS_DEFAULT=     BDB             PKINIT DIGEST KX509
 OPTIONS_SUB=	yes
 
 IPV6_CONFIGURE_WITH=	ipv6
 
 BDB_DESC=		Enable BerkeleyDB KDC backend support
 BDB_USES=		bdb:5 localbase
 BDB_CONFIGURE_ENV=	ac_cv_header_db${BDB_VER}_db_h=yes \
 			ac_cv_func_db_create=yes \
 			ac_cv_funclib_db_create="-l${BDB_LIB_NAME}"
 BDB_CONFIGURE_ON=	--disable-ndbm-db
 BDB_CONFIGURE_ENV_OFF=	ac_cv_header_db_h=yes \
-			ac_cv_func_db_create=no
+			ac_cv_func_db_create=no \
+			ac_cv_funclib_db_create=no
 BDB_CONFIGURE_OFF=	--enable-ndbm-db
 
 LMDB_DESC=		Enable LMDB KDC backend support
 LMDB_CONFIGURE_ENABLE=	mdb_db
 LMDB_LIB_DEPENDS=	liblmdb.so:databases/lmdb
 
 SQLITE_DESC=		Enable SQLite KDC backend support
 SQLITE_USES=		sqlite
 SQLITE_CONFIGURE_ON=	--with-sqlite3-include="${LOCALBASE}/include" \
 			--with-sqlite3-lib="${LOCALBASE}/lib"
 SQLITE_CONFIGURE_WITH=	sqlite3
 
 LDAP_DESC=		Enable OpenLDAP KDC backend support
 LDAP_USE=		OPENLDAP=yes
 LDAP_CONFIGURE_ON= 	--with-openldap-include="${LOCALBASE}/include" \
 			--with-openldap-lib="${LOCALBASE}/lib"
 LDAP_CONFIGURE_WITH=	openldap
 
 PKINIT_DESC=		Enable PK-INIT support
 PKINIT_CONFIGURE_ENABLE=pk-init
 
 DIGEST_DESC=		Enable DIGEST support
 DIGEST_CONFIGURE_ENABLE=digest
 
 KX509_DESC=		Enable kx509 support
 KX509_CONFIGURE_ENABLE=	kx509
 
 CRACKLIB_DESC=		Use CrackLib for password quality checking
 CRACKLIB_LIB_DEPENDS=	libcrack.so:security/cracklib
 
 .include <bsd.port.options.mk>
 
 .if ${PORT_OPTIONS:MLDAP}
 WANT_OPENLDAP_SASL?=	yes
 .endif
 
 post-extract:
 	@${MKDIR} ${WRKSRC}/kpasswdd-cracklib
 	${INSTALL_DATA} ${FILESDIR}/kpasswdd-cracklib.c \
 	    ${WRKSRC}/kpasswdd-cracklib
 	${INSTALL_DATA} ${FILESDIR}/kpasswdd-Makefile \
 	    ${WRKSRC}/kpasswdd-cracklib/Makefile
 
 post-build-CRACKLIB-on:
 	cd ${WRKSRC}/kpasswdd-cracklib && \
 	    ${SETENV} ${MAKE_ENV} ${MAKE} ${MAKE_ARGS} ${BUILD_TARGET}
 
 post-install-CRACKLIB-on:
 	cd ${WRKSRC}/kpasswdd-cracklib && \
 	    ${SETENV} ${MAKE_ENV} ${MAKE} ${MAKE_ARGS} ${INSTALL_TARGET}
 
 .include <bsd.port.mk>
Index: head/security/heimdal/files/patch-configure
===================================================================
--- head/security/heimdal/files/patch-configure	(revision 431159)
+++ head/security/heimdal/files/patch-configure	(revision 431160)
@@ -1,39 +1,39 @@
 --- configure.orig	2016-12-20 04:24:03 UTC
 +++ configure
-@@ -9588,7 +9588,7 @@ $as_echo_n "checking whether the $compil
-   hardcode_minus_L=no
-   hardcode_shlibpath_var=unsupported
-   inherit_rpath=no
--  link_all_deplibs=unknown
-+  link_all_deplibs=no
-   module_cmds=
-   module_expsym_cmds=
-   old_archive_from_new_cmds=
-@@ -16126,7 +16126,7 @@ case "$host" in
+@@ -16126,7 +16126,7 @@
      ;;
  *-*-freebsd*)
  	native_pthread_support=yes
 -	PTHREAD_LIBADD="-pthread"
 +	PTHREAD_LIBADD="-lpthread"
  	;;
  *-*-openbsd*)
  	native_pthread_support=yes
-@@ -16935,6 +16935,9 @@ esac
+@@ -16362,7 +16362,7 @@
+   $as_echo_n "(cached) " >&6
+ else
  
+-if eval "test \"\$ac_cv_func_db_create\" != yes" ; then
++if eval "test \"\$ac_cv_func_db_create\" = yes" ; then
+ 	ac_save_LIBS="$LIBS"
+ 	for ac_lib in "" $dbheader db-5 db5 db4 db3 db; do
+ 		case "$ac_lib" in
+@@ -16935,6 +16935,9 @@
+ 
  $as_echo "#define HAVE_NDBM 1" >>confdefs.h
        have_ndbm=yes
 +      if test "$db_type" = "unknown"; then
 +      db_type=ndbm
 +      fi
      else
  
        $as_unset ac_cv_func_dbm_firstkey
-@@ -28685,7 +28688,7 @@ fi
+@@ -28685,7 +28688,7 @@
  
  krb_cv_compile_et="no"
  krb_cv_com_err_need_r=""
 -krb_cv_compile_et_cross=no
 +krb_cv_compile_et_cross=yes
  if test "${COMPILE_ET}" != "no"; then
  
  { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether compile_et has the features we need" >&5