Update to latest commit.

3 files changed, 9 insertions, 14 deletions

diff --git a/dns/bind9-devel/Makefile b/dns/bind9-devel/Makefile
index 9a73379596dc..24317db64946 100644
--- a/dns/bind9-devel/Makefile
+++ b/dns/bind9-devel/Makefile
@@ -48,13 +48,13 @@ RUN_DEPENDS=	bind-tools>0:dns/bind-tools
 # XXX: remove tar:bz2
 USES=		autoreconf compiler:c11 cpe libedit libtool pkgconfig ssl tar:bz2
 # ISC releases things like 9.8.0-P1, which our versioning doesn't like
-ISCVERSION=	9.17.0a0.2020.06.06
+ISCVERSION=	9.17.0a0.2020.06.11
 # XXX: Remove gitlab
 USE_GITLAB=	yes
 GL_SITE=	https://gitlab.isc.org
 GL_ACCOUNT=	isc-projects
 GL_PROJECT=	bind9
-GL_COMMIT=	d95951729025a8775a8a85d61a76fb5389a71adc
+GL_COMMIT=	50d3344ca5b098b1e629e2c123393a308e80bad4
 
 CPE_VENDOR=	isc
 CPE_VERSION=	${ISCVERSION:C/-.*//}
@@ -228,13 +228,9 @@ SUB_LIST+=	ENGINES=/usr/lib/engines
 SUB_LIST+=	ENGINES=${LOCALBASE}/lib/engines
 .endif
 
-# XXX: Remove
-post-extract:
-	echo "SRCID=${GL_COMMIT}" > ${WRKSRC}/srcid
-
 # XXX: Remove first REINPLACE_CMD
 post-patch:
-	@${REINPLACE_CMD} -e '/^m4_define.*bind_VERSION_EXTRA/s#)#-${GL_COMMIT})#' \
+	@${REINPLACE_CMD} -e '/^m4_define(\[bind_SRCID/s/\[m4.*\]/${GL_COMMIT}/' \
 		${WRKSRC}/configure.ac
 .for FILE in check/named-checkconf.rst named/named.rst nsupdate/nsupdate.rst \
 	rndc/rndc.rst
diff --git a/dns/bind9-devel/distinfo b/dns/bind9-devel/distinfo
index 17598947d85e..076d7e9d93b4 100644
--- a/dns/bind9-devel/distinfo
+++ b/dns/bind9-devel/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1591625667
-SHA256 (isc-projects-bind9-d95951729025a8775a8a85d61a76fb5389a71adc_GL0.tar.gz) = 5f9eada8f63c7561702b75ca19e7807d025f4fe48e736a0021cd523db836adca
-SIZE (isc-projects-bind9-d95951729025a8775a8a85d61a76fb5389a71adc_GL0.tar.gz) = 4484049
+TIMESTAMP = 1592220429
+SHA256 (isc-projects-bind9-50d3344ca5b098b1e629e2c123393a308e80bad4_GL0.tar.gz) = a20e3794650a02bbd8f2d5424272608b39c18a276217b4624a7b5f8ba9786ab5
+SIZE (isc-projects-bind9-50d3344ca5b098b1e629e2c123393a308e80bad4_GL0.tar.gz) = 4485845
diff --git a/dns/bind9-devel/files/extrapatch-no-bind-tools b/dns/bind9-devel/files/extrapatch-no-bind-tools
index cc7ad2158093..fe884c981766 100644
--- a/dns/bind9-devel/files/extrapatch-no-bind-tools
+++ b/dns/bind9-devel/files/extrapatch-no-bind-tools
@@ -1,6 +1,6 @@
 Exclude the "tools" from building and installing.
 
---- bin/Makefile.am.orig	2020-06-01 11:40:58 UTC
+--- bin/Makefile.am.orig	2020-06-11 06:07:21 UTC
 +++ bin/Makefile.am
 @@ -1,4 +1,4 @@
 -SUBDIRS = named rndc dig delv dnssec tools nsupdate check confgen tests plugins
@@ -8,9 +8,9 @@ Exclude the "tools" from building and installing.
  
  if HAVE_PKCS11
  SUBDIRS += pkcs11
---- bin/tools/Makefile.am.orig	2020-06-01 11:40:58 UTC
+--- bin/tools/Makefile.am.orig	2020-06-11 06:07:21 UTC
 +++ bin/tools/Makefile.am
-@@ -8,13 +8,8 @@
+@@ -8,12 +8,7 @@ LDADD =				\
  	$(LIBISC_LIBS)		\
  	$(LIBDNS_LIBS)
  
@@ -24,4 +24,3 @@ Exclude the "tools" from building and installing.
  
  arpaname_LDADD =		\
  	$(LIBISC_LIBS)
-