5 files changed, 49 insertions, 58 deletions

diff --git a/dns/bind98/Makefile b/dns/bind98/Makefile
index 6c899c3cd8ea..51d4e57fd1d0 100644
--- a/dns/bind98/Makefile
+++ b/dns/bind98/Makefile
@@ -2,7 +2,6 @@
 
 PORTNAME=	bind
 PORTVERSION=	${ISCVERSION:S/-P/P/}
-PORTREVISION=	5
 CATEGORIES=	dns net ipv6
 MASTER_SITES=	ISC/bind9/${ISCVERSION}
 PKGNAMESUFFIX=	98
@@ -14,7 +13,7 @@ COMMENT=	BIND DNS suite with updated DNSSEC and DNS64
 LICENSE=	ISCL
 
 # ISC releases things like 9.8.0-P1, which our versioning doesn't like
-ISCVERSION=	9.8.7-P1
+ISCVERSION=	9.8.8
 
 PORTSCOUT=	limit:^9.8.
 
@@ -98,7 +97,7 @@ RPZ_NSIP_CONFIGURE_ENABLE=	rpz-nsip
 
 RPZ_NSDNAME_CONFIGURE_ENABLE=	rpz-nsdname
 
-RPZRRL_PATCH_PATCHFILES=	9.8.7-P1-rpz2+rl.14038.05.patch:vix
+RPZRRL_PATCH_PATCHFILES=	9.8.8-rpz2+rl.14038.05.patch:vix
 RPZRRL_PATCH_PATCH_SITES=	http://ss.vix.su/~vjs/:vix ${MASTER_SITE_LOCAL:S/%SUBDIR%/mat\/bind/:S/$/:vix/}
 
 GOST_CONFIGURE_WITH=	gost
@@ -167,6 +166,8 @@ CONFIGURE_ARGS+=	--prefix=${PREFIX} \
 			--sysconfdir=${BIND_DESTETC}
 SUB_LIST+=	BIND_DESTETC="${BIND_DESTETC}"
 
+PORTDOCS=	*
+
 .if ${OPSYS} == FreeBSD && ${OSVERSION} >= 1000100
 PLIST_SUB+=	NOBASE="" BASE="@comment "
 USE_RC_SUBR+=	named
@@ -198,15 +199,14 @@ post-patch:
 		${WRKSRC}/bin/named/Makefile.in.Dist > \
 		${WRKSRC}/bin/named/Makefile.in
 
-.if ${PORT_OPTIONS:MDOCS}
-PORTDOCS=	*
-.endif
+post-configure:
+	@${REINPLACE_CMD} -e '/^SO_LDFLAGS/s/-Wl,-rpath,/-rpath /' ${WRKSRC}/bin/tests/system/dlzexternal/Makefile
+
 post-install:
 .if ${PORT_OPTIONS:MDOCS}
-	${MKDIR} ${STAGEDIR}${DOCSDIR}/arm ${STAGEDIR}${DOCSDIR}/misc
+	${MKDIR} ${STAGEDIR}${DOCSDIR}/arm
 	${INSTALL_DATA} ${WRKSRC}/doc/arm/*.html ${STAGEDIR}${DOCSDIR}/arm
 	${INSTALL_DATA} ${WRKSRC}/doc/arm/Bv9ARM.pdf ${STAGEDIR}${DOCSDIR}
-	${INSTALL_DATA} ${WRKSRC}/doc/misc/[a-z]* ${STAGEDIR}${DOCSDIR}/misc
 	${INSTALL_DATA} ${WRKSRC}/CHANGES ${WRKSRC}/COPYRIGHT ${WRKSRC}/FAQ \
 		${WRKSRC}/HISTORY ${WRKSRC}/README ${STAGEDIR}${DOCSDIR}
 .endif
diff --git a/dns/bind98/distinfo b/dns/bind98/distinfo
index 50385b41bbef..77a401aee52a 100644
--- a/dns/bind98/distinfo
+++ b/dns/bind98/distinfo
@@ -1,4 +1,4 @@
-SHA256 (bind-9.8.7-P1.tar.gz) = 7760b3862e52d318fb2ff429f095680cbfc8efc0c43c3e7675b72f79e4702ddf
-SIZE (bind-9.8.7-P1.tar.gz) = 7478466
-SHA256 (9.8.7-P1-rpz2+rl.14038.05.patch) = 309348938f46959490227ffaacac071ce5eaab9408d6f6bb6a07465dc716bde9
-SIZE (9.8.7-P1-rpz2+rl.14038.05.patch) = 344326
+SHA256 (bind-9.8.8.tar.gz) = c3e4e0241814385adeaf82e2154032a0c25ac993bcce21a10b1ee0e3093ee68a
+SIZE (bind-9.8.8.tar.gz) = 7545962
+SHA256 (9.8.8-rpz2+rl.14038.05.patch) = 97cdb86bdc344f206dd2bc2355b0ff327c6d0e0db8aeb120f2f87dac2276b8a1
+SIZE (9.8.8-rpz2+rl.14038.05.patch) = 269650
diff --git a/dns/bind98/files/named.conf.in b/dns/bind98/files/named.conf.in
index 6c3215883552..d8bb64d741e7 100644
--- a/dns/bind98/files/named.conf.in
+++ b/dns/bind98/files/named.conf.in
@@ -52,7 +52,7 @@ options {
 // the entries in /etc/resolv.conf, uncomment the following line and
 // set named_auto_forward=yes in /etc/rc.conf.  You can also enable
 // named_auto_forward_only (the effect of which is described above).
-//	include "/etc/namedb/auto_forward.conf";
+//	include "%%BIND_DESTETC%%/auto_forward.conf";
 
 	/*
 	   Modern versions of BIND use a random UDP port for each outgoing
@@ -100,7 +100,7 @@ zone "." { type hint; file "%%BIND_DESTETC%%/named.root"; };
 /*
 zone "." {
 	type slave;
-	file "/etc/namedb/slave/root.slave";
+	file "%%BIND_DESTETC%%/slave/root.slave";
 	masters {
 		192.5.5.241;	// F.ROOT-SERVERS.NET.
 	};
@@ -108,7 +108,7 @@ zone "." {
 };
 zone "arpa" {
 	type slave;
-	file "/etc/namedb/slave/arpa.slave";
+	file "%%BIND_DESTETC%%/slave/arpa.slave";
 	masters {
 		192.5.5.241;	// F.ROOT-SERVERS.NET.
 	};
@@ -345,14 +345,14 @@ zone "example.org" {
 	allow-update {
 		key "exampleorgkey";
 	};
-	file "/etc/namedb/dynamic/example.org";
+	file "%%BIND_DESTETC%%/dynamic/example.org";
 };
 */
 
 /* Example of a slave reverse zone
 zone "1.168.192.in-addr.arpa" {
 	type slave;
-	file "/etc/namedb/slave/1.168.192.in-addr.arpa";
+	file "%%BIND_DESTETC%%/slave/1.168.192.in-addr.arpa";
 	masters {
 		192.168.1.1;
 	};
diff --git a/dns/bind98/files/patch-configure b/dns/bind98/files/patch-configure
index ce8542fd7a79..437622523144 100644
--- a/dns/bind98/files/patch-configure
+++ b/dns/bind98/files/patch-configure
@@ -1,28 +1,11 @@
---- ./configure.orig	2014-05-24 02:06:09.000000000 +0200
-+++ ./configure	2014-06-16 13:02:09.000000000 +0200
-@@ -13935,6 +13935,8 @@
+--- configure.orig	2014-09-16 19:27:25 UTC
++++ configure
+@@ -13969,6 +13969,8 @@
  		    "-lgssapi_krb5 -lkrb5 -lk5crypto -lcom_err -lresolv" \
  		    "-lgssapi" \
  		    "-lgssapi -lkrb5 -ldes -lcrypt -lasn1 -lroken -lcom_err" \
 +		    "-lkrb5 -lgssapi_krb5 -lkrb5support -lk5crypto -lcom_err" \
 +		    "-lgssapi -lkrb5 -lgssapi_krb5 -lcrypto -lcrypt -lasn1 -lroken -lcom_err" \
  		    "-lgssapi -lkrb5 -lcrypto -lcrypt -lasn1 -lroken -lcom_err" \
+ 		    "-lgssapi -lkrb5 -lgssapi_krb5 -lcrypto -lcrypt -lasn1 -lroken -lcom_err" \
  		    "-lgssapi -lkrb5 -lhx509 -lcrypto -lcrypt -lasn1 -lroken -lcom_err" \
- 		    "-lgss -lkrb5"
-@@ -13954,12 +13956,14 @@
- $as_echo_n "checking linking as $TRY_LIBS... " >&6; }
- 		    cat confdefs.h - <<_ACEOF >conftest.$ac_ext
- /* end confdefs.h.  */
-+#include <gssapi/gssapi.h>
-+#include <gssapi/gssapi_krb5.h>
-+#include <krb5.h>
- 
- int
- main ()
- {
--gss_acquire_cred();krb5_init_context()
--  ;
-+gss_acquire_cred(0,0,0,0,0,0,0,0);krb5_init_context(0);gsskrb5_register_acceptor_identity(0);
-   return 0;
- }
- _ACEOF
diff --git a/dns/bind98/pkg-plist b/dns/bind98/pkg-plist
index 2979b460c7dd..ff99c6ecf1c0 100644
--- a/dns/bind98/pkg-plist
+++ b/dns/bind98/pkg-plist
@@ -7,8 +7,10 @@ bin/nsupdate
 include/bind9/check.h
 include/bind9/getaddresses.h
 include/bind9/version.h
+include/dns/acache.h
 include/dns/acl.h
 include/dns/adb.h
+include/dns/bit.h
 include/dns/byaddr.h
 include/dns/cache.h
 include/dns/callbacks.h
@@ -21,25 +23,34 @@ include/dns/dbtable.h
 include/dns/diff.h
 include/dns/dispatch.h
 include/dns/dlz.h
+include/dns/dlz_dlopen.h
+include/dns/dns64.h
 include/dns/dnssec.h
 include/dns/ds.h
+include/dns/ecdb.h
 include/dns/enumclass.h
 include/dns/enumtype.h
 include/dns/events.h
 include/dns/fixedname.h
+include/dns/forward.h
 include/dns/iptable.h
 include/dns/journal.h
+include/dns/keydata.h
 include/dns/keyflags.h
 include/dns/keytable.h
 include/dns/keyvalues.h
 include/dns/lib.h
 include/dns/log.h
+include/dns/lookup.h
 include/dns/master.h
 include/dns/masterdump.h
 include/dns/message.h
 include/dns/name.h
 include/dns/ncache.h
 include/dns/nsec.h
+include/dns/nsec3.h
+include/dns/opcode.h
+include/dns/order.h
 include/dns/peer.h
 include/dns/portlist.h
 include/dns/private.h
@@ -58,14 +69,17 @@ include/dns/resolver.h
 include/dns/result.h
 include/dns/rootns.h
 include/dns/rpz.h
+include/dns/rriterator.h
 include/dns/sdb.h
 include/dns/sdlz.h
 include/dns/secalg.h
 include/dns/secproto.h
 include/dns/soa.h
 include/dns/ssu.h
+include/dns/stats.h
 include/dns/tcpmsg.h
 include/dns/time.h
+include/dns/timer.h
 include/dns/tkey.h
 include/dns/tsec.h
 include/dns/tsig.h
@@ -85,6 +99,8 @@ include/dst/result.h
 include/isc/app.h
 include/isc/assertions.h
 include/isc/atomic.h
+include/isc/backtrace.h
+include/isc/base32.h
 include/isc/base64.h
 include/isc/bind9.h
 include/isc/bitstring.h
@@ -110,6 +126,7 @@ include/isc/httpd.h
 include/isc/int.h
 include/isc/interfaceiter.h
 include/isc/iterated_hash.h
+include/isc/keyboard.h
 include/isc/lang.h
 include/isc/lex.h
 include/isc/lfsr.h
@@ -127,12 +144,14 @@ include/isc/namespace.h
 include/isc/net.h
 include/isc/netaddr.h
 include/isc/netdb.h
+include/isc/netscope.h
 include/isc/offset.h
 include/isc/once.h
 include/isc/ondestroy.h
 include/isc/os.h
 include/isc/parseint.h
 include/isc/platform.h
+include/isc/portset.h
 include/isc/print.h
 include/isc/quota.h
 include/isc/radix.h
@@ -152,9 +171,11 @@ include/isc/sha2.h
 include/isc/sockaddr.h
 include/isc/socket.h
 include/isc/stat.h
+include/isc/stats.h
 include/isc/stdio.h
 include/isc/stdlib.h
 include/isc/stdtime.h
+include/isc/strerror.h
 include/isc/string.h
 include/isc/symtab.h
 include/isc/syslog.h
@@ -182,6 +203,7 @@ include/isccc/util.h
 include/isccc/version.h
 include/isccfg/aclconf.h
 include/isccfg/cfg.h
+include/isccfg/dnsconf.h
 include/isccfg/grammar.h
 include/isccfg/log.h
 include/isccfg/namedconf.h
@@ -198,6 +220,8 @@ include/lwres/net.h
 include/lwres/netdb.h
 include/lwres/platform.h
 include/lwres/result.h
+include/lwres/stdlib.h
+include/lwres/string.h
 include/lwres/version.h
 lib/libbind9.a
 lib/libdns.a
@@ -342,23 +366,7 @@ sbin/rndc-confgen
 %%NOBASE%%%%ETCDIR%%/master/localhost-forward.db
 %%NOBASE%%%%ETCDIR%%/master/localhost-reverse.db
 %%NOBASE%%%%ETCDIR%%/rndc.conf.sample
-%%NOBASE%%@exec mkdir -p %D/%%ETCDIR%%/dynamic
-%%NOBASE%%@exec chown bind:bind %D/%%ETCDIR%%/dynamic
-%%NOBASE%%@dirrmtry %%ETCDIR%%/dynamic
-%%NOBASE%%@exec mkdir -p %D/%%ETCDIR%%/master
-%%NOBASE%%@exec chown bind:bind %D/%%ETCDIR%%/master
-%%NOBASE%%@dirrmtry %%ETCDIR%%/master
-%%NOBASE%%@exec mkdir -p %D/%%ETCDIR%%/slave
-%%NOBASE%%@exec chown bind:bind %D/%%ETCDIR%%/slave
-%%NOBASE%%@dirrmtry %%ETCDIR%%/slave
-%%NOBASE%%@exec mkdir -p %D/%%ETCDIR%%/working
-%%NOBASE%%@exec chown bind:bind %D/%%ETCDIR%%/working
-%%NOBASE%%@dirrmtry %%ETCDIR%%/working
-%%NOBASE%%@dirrmtry %%ETCDIR%%
-@dirrm include/bind9
-@dirrm include/dns
-@dirrm include/dst
-@dirrmtry include/isc
-@dirrm include/isccc
-@dirrm include/isccfg
-@dirrm include/lwres
+%%NOBASE%%@dir(bind,bind,) %%ETCDIR%%/dynamic
+%%NOBASE%%@dir(bind,bind,) %%ETCDIR%%/master
+%%NOBASE%%@dir(bind,bind,) %%ETCDIR%%/slave
+%%NOBASE%%@dir(bind,bind,) %%ETCDIR%%/working