CVS commit: pkgsrc/net/bind912

["Havard Eidnes" <he%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   he
Date:           Thu Jan 17 08:53:37 UTC 2019

Modified Files:
        pkgsrc/net/bind912: Makefile PLIST options.mk

Log Message:
Add a "dnstap" option, defaults to off.
Bump PKGREVISION.


To generate a diff of this commit:
cvs rdiff -u -r1.7 -r1.8 pkgsrc/net/bind912/Makefile
cvs rdiff -u -r1.1 -r1.2 pkgsrc/net/bind912/PLIST
cvs rdiff -u -r1.2 -r1.3 pkgsrc/net/bind912/options.mk

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: pkgsrc/net/bind912/Makefile
diff -u pkgsrc/net/bind912/Makefile:1.7 pkgsrc/net/bind912/Makefile:1.8
--- pkgsrc/net/bind912/Makefile:1.7     Sat Dec 15 16:40:20 2018
+++ pkgsrc/net/bind912/Makefile Thu Jan 17 08:53:37 2019
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.7 2018/12/15 16:40:20 taca Exp $
+# $NetBSD: Makefile,v 1.8 2019/01/17 08:53:37 he Exp $
 
 DISTNAME=      bind-${BIND_VERSION}
 PKGNAME=       ${DISTNAME:S/-P/pl/}
+PKGREVISION=   1
 CATEGORIES=    net
 MASTER_SITES=  ftp://ftp.isc.org/isc/bind9/${BIND_VERSION}/
 

Index: pkgsrc/net/bind912/PLIST
diff -u pkgsrc/net/bind912/PLIST:1.1 pkgsrc/net/bind912/PLIST:1.2
--- pkgsrc/net/bind912/PLIST:1.1        Sun Sep  9 13:16:01 2018
+++ pkgsrc/net/bind912/PLIST    Thu Jan 17 08:53:37 2019
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.1 2018/09/09 13:16:01 taca Exp $
+@comment $NetBSD: PLIST,v 1.2 2019/01/17 08:53:37 he Exp $
 bin/arpaname
 bin/bind9-config
 bin/delv
@@ -9,6 +9,7 @@ bin/mdig
 bin/named-rrchecker
 bin/nslookup
 bin/nsupdate
+${PLIST.dnstap}bin/dnstap-read
 include/bind9/check.h
 include/bind9/getaddresses.h
 include/bind9/version.h
@@ -35,6 +36,7 @@ include/dns/dns64.h
 include/dns/dnsrps.h
 include/dns/dnssec.h
 include/dns/dnstap.h
+${PLIST.dnstap}include/dns/dnstap.pb-c.h
 include/dns/ds.h
 include/dns/dsdigest.h
 include/dns/dyndb.h
@@ -310,6 +312,7 @@ ${PLIST.pkcs11}man/man8/pkcs11-destroy.8
 ${PLIST.pkcs11}man/man8/pkcs11-keygen.8
 ${PLIST.pkcs11}man/man8/pkcs11-list.8
 ${PLIST.pkcs11}man/man8/pkcs11-tokens.8
+${PLIST.dnstap}man/man1/dnstap-read.1
 man/man8/rndc-confgen.8
 man/man8/rndc.8
 man/man8/tsig-keygen.8

Index: pkgsrc/net/bind912/options.mk
diff -u pkgsrc/net/bind912/options.mk:1.2 pkgsrc/net/bind912/options.mk:1.3
--- pkgsrc/net/bind912/options.mk:1.2   Wed Oct 24 11:10:31 2018
+++ pkgsrc/net/bind912/options.mk       Thu Jan 17 08:53:37 2019
@@ -1,13 +1,13 @@
-# $NetBSD: options.mk,v 1.2 2018/10/24 11:10:31 jperkin Exp $
+# $NetBSD: options.mk,v 1.3 2019/01/17 08:53:37 he Exp $
 
 PKG_OPTIONS_VAR=       PKG_OPTIONS.bind912
 PKG_SUPPORTED_OPTIONS= bind-dig-sigchase bind-xml-statistics-server
 PKG_SUPPORTED_OPTIONS+=        bind-json-statistics-server
 PKG_SUPPORTED_OPTIONS+=        inet6 threads readline mysql pgsql ldap dlz-filesystem
-PKG_SUPPORTED_OPTIONS+=        fetchlimit geoip pkcs11 sit tuning
+PKG_SUPPORTED_OPTIONS+=        fetchlimit geoip pkcs11 sit tuning dnstap
 PKG_SUGGESTED_OPTIONS+=        readline
 
-PLIST_VARS+=   inet6 pkcs11
+PLIST_VARS+=   inet6 pkcs11 dnstap
 
 PTHREAD_OPTS+=         native
 .include "../../mk/pthread.buildlink3.mk"
@@ -82,6 +82,14 @@ CONFIGURE_ARGS+=     --enable-sit
 CONFIGURE_ARGS+=       --with-tuning=large
 .endif
 
+.if !empty(PKG_OPTIONS:Mdnstap)
+CONFIGURE_ARGS+=       --enable-dnstap
+PLIST.dnstap=          yes
+.include "../../net/fstrm/buildlink3.mk"
+.include "../../devel/protobuf/buildlink3.mk"
+.include "../../devel/protobuf-c/buildlink3.mk"
+.endif
+
 ###
 ### The statistics server in bind99 and later needs libxml2
 ###