Update to latest snapshot.

Sponsored by:	Absolight

4 files changed, 17 insertions, 10 deletions

diff --git a/dns/bind9-devel/Makefile b/dns/bind9-devel/Makefile
index 55408d3a8633..251617f034d4 100644
--- a/dns/bind9-devel/Makefile
+++ b/dns/bind9-devel/Makefile
@@ -16,8 +16,8 @@ COMMENT=	BIND DNS suite with updated DNSSEC and DNS64
 LICENSE=	MPL
 
 # ISC releases things like 9.8.0-P1, which our versioning doesn't like
-ISCVERSION=	9.12.0a.2016.07.14
-HASH=		203b693
+ISCVERSION=	9.12.0a.2016.07.25
+HASH=		c854d9c
 
 MAKE_JOBS_UNSAFE=	yes
 
@@ -47,7 +47,7 @@ SUB_FILES=	pkg-message
 
 OPTIONS_DEFAULT=	SSL THREADS SIGCHASE IDN GSSAPI_NONE DLZ_FILESYSTEM
 OPTIONS_DEFINE=		IDN LARGE_FILE PYTHON START_LATE \
-			FIXED_RRSET SIGCHASE IPV6 THREADS FILTER_AAAA
+			FIXED_RRSET SIGCHASE IPV6 THREADS FILTER_AAAA LMDB
 OPTIONS_RADIO=	CRYPTO GOSTDEF
 OPTIONS_RADIO_CRYPTO=	SSL NATIVE_PKCS11
 OPTIONS_RADIO_GOSTDEF=	GOST GOST_ASN1
@@ -80,6 +80,7 @@ MINCACHE_DESC=		Use the mincachettl patch
 PORTREVISION_DESC=	Show PORTREVISION in the version string
 FETCHLIMIT_DESC=	Enable the query quotas for resolvers
 QUERYTRACE_DESC=	Enable the very verbose query tracelogging
+LMDB_DESC=		Use LMDB for zone management
 
 LINKS_DESC=		Create conf file symlinks in ${PREFIX}
 NEWSTATS_DESC=		Enable alternate xml statistics channel format
@@ -105,6 +106,10 @@ SSL_CONFIGURE_ON=	--with-openssl=${OPENSSLBASE}
 SSL_USE=		openssl=yes
 SSL_CONFIGURE_OFF=	--disable-openssl-version-check --without-openssl
 
+LMDB_CONFIGURE_WITH=	lmdb
+LMDB_LIB_DEPENDS=	liblmdb.so:databases/lmdb
+LMDB_BROKEN_OFF=	Does not install without LMDB
+
 NEWSTATS_CONFIGURE_ENABLE=	newstats
 
 IDN_USES=		iconv
diff --git a/dns/bind9-devel/distinfo b/dns/bind9-devel/distinfo
index fbebb2054ea7..3755fa1aa5b7 100644
--- a/dns/bind9-devel/distinfo
+++ b/dns/bind9-devel/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1468926927
-SHA256 (bind9-203b693.tar.gz) = 1702e2e597c88234c319b2ab83a286e28e6e58e23790858d0165dee6de1f5957
-SIZE (bind9-203b693.tar.gz) = 11763050
+TIMESTAMP = 1469455518
+SHA256 (bind9-c854d9c.tar.gz) = 94ebac19753f17c9e64efa4d08916df8dea79aaa2233f741c5985c3ba306bb4a
+SIZE (bind9-c854d9c.tar.gz) = 11756529
diff --git a/dns/bind9-devel/files/patch-configure b/dns/bind9-devel/files/patch-configure
index da037e5615cb..73f21a13a75f 100644
--- a/dns/bind9-devel/files/patch-configure
+++ b/dns/bind9-devel/files/patch-configure
@@ -1,6 +1,6 @@
---- configure.orig	2016-07-14 05:13:57 UTC
+--- configure.orig	2016-07-25 11:18:47 UTC
 +++ configure
-@@ -14338,27 +14338,9 @@ done
+@@ -14345,27 +14345,9 @@ done
  		# problems start to show up.
  		saved_libs="$LIBS"
  		for TRY_LIBS in \
@@ -30,7 +30,7 @@
  		    { $as_echo "$as_me:${as_lineno-$LINENO}: checking linking as $TRY_LIBS" >&5
  $as_echo_n "checking linking as $TRY_LIBS... " >&6; }
  		    cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-@@ -14401,47 +14383,7 @@ $as_echo "no" >&6; } ;;
+@@ -14408,47 +14390,7 @@ $as_echo "no" >&6; } ;;
  		no) as_fn_error $? "could not determine proper GSSAPI linkage" "$LINENO" 5 ;;
  		esac
  
@@ -79,7 +79,7 @@
  		DNS_GSSAPI_LIBS="$LIBS"
  
  		{ $as_echo "$as_me:${as_lineno-$LINENO}: result: using GSSAPI from $use_gssapi/lib and $use_gssapi/include" >&5
-@@ -22318,7 +22260,7 @@ $as_echo "" >&6; }
+@@ -22464,7 +22406,7 @@ $as_echo "" >&6; }
  			# Check other locations for includes.
  			# Order is important (sigh).
  
diff --git a/dns/bind9-devel/pkg-plist b/dns/bind9-devel/pkg-plist
index 03d26fc1dacb..28a2d5e29746 100644
--- a/dns/bind9-devel/pkg-plist
+++ b/dns/bind9-devel/pkg-plist
@@ -383,6 +383,7 @@ man/man8/named-checkconf.8.gz
 man/man8/named-checkzone.8.gz
 man/man8/named-compilezone.8.gz
 man/man8/named-journalprint.8.gz
+%%LMDB%%man/man8/named-nzd2nzf.8.gz
 man/man8/named.8.gz
 man/man8/nsec3hash.8.gz
 %%NATIVE_PKCS11%%man/man8/pkcs11-destroy.8.gz
@@ -413,6 +414,7 @@ sbin/named-checkconf
 sbin/named-checkzone
 sbin/named-compilezone
 sbin/named-journalprint
+%%LMDB%%sbin/named-nzd2nzf
 sbin/named-rrchecker
 sbin/nsec3hash
 %%NATIVE_PKCS11%%sbin/pkcs11-destroy