[pkgsrc/trunk]: pkgsrc/net/djbdns-run Let ucspi-tcp6, if installed, satisfy t...

[schmonz <schmonz%pkgsrc.org@localhost>]

details:   https://anonhg.NetBSD.org/pkgsrc/rev/126bd5589150
branches:  trunk
changeset: 389793:126bd5589150
user:      schmonz <schmonz%pkgsrc.org@localhost>
date:      Tue Jan 08 18:29:29 2019 +0000

description:
Let ucspi-tcp6, if installed, satisfy the non-'inet6' DEPENDS. Fix
rbldns_needcdb() to operate on rbldns_data. Ride previous bump.

diffstat:

 net/djbdns-run/files/rbldns.sh |  6 +++---
 net/djbdns-run/options.mk      |  4 ++--
 2 files changed, 5 insertions(+), 5 deletions(-)

diffs (40 lines):

diff -r 16c8d8b377be -r 126bd5589150 net/djbdns-run/files/rbldns.sh
--- a/net/djbdns-run/files/rbldns.sh    Tue Jan 08 18:19:41 2019 +0000
+++ b/net/djbdns-run/files/rbldns.sh    Tue Jan 08 18:29:29 2019 +0000
@@ -1,6 +1,6 @@
 #!@RCD_SCRIPTS_SHELL@
 #
-# $NetBSD: rbldns.sh,v 1.8 2019/01/07 14:01:55 schmonz Exp $
+# $NetBSD: rbldns.sh,v 1.9 2019/01/08 18:29:30 schmonz Exp $
 #
 # @PKGNAME@ script to control rbldns (local RBL service).
 #
@@ -57,8 +57,8 @@
 }
 
 rbldns_needcdb() {
-       _src=${axfrdns_tcprules}
-       _dst=${axfrdns_tcprules}.cdb
+       _src=${rbldns_data}
+       _dst=${rbldns_data}.cdb
        [ -f "${_src}" -a "${_src}" -nt "${_dst}" ] || [ ! -f "${_dst}" ]
 }
 
diff -r 16c8d8b377be -r 126bd5589150 net/djbdns-run/options.mk
--- a/net/djbdns-run/options.mk Tue Jan 08 18:19:41 2019 +0000
+++ b/net/djbdns-run/options.mk Tue Jan 08 18:29:29 2019 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: options.mk,v 1.3 2019/01/07 19:45:48 schmonz Exp $
+# $NetBSD: options.mk,v 1.4 2019/01/08 18:29:29 schmonz Exp $
 
 PKG_OPTIONS_VAR=       PKG_OPTIONS.djbdns-run
 PKG_SUPPORTED_OPTIONS+=        inet6
@@ -20,7 +20,7 @@
                        ${PKG_SYSCONFDIR}/dnscache/ip/::1
 .else
 DEPENDS_DJBDNS=                djbdns>=1.05nb5:../../net/djbdns
-DEPENDS+=              ucspi-tcp-[0-9]*:../../net/ucspi-tcp
+DEPENDS+=              {ucspi-tcp6-[0-9]*,ucspi-tcp-[0-9]*}:../../net/ucspi-tcp
 DNSROOTS_GLOBAL=       share/examples/djbdns/dnsroots.global
 TINYDNS_LISTENIP=      0.0.0.0
 DNSCACHE_LISTENIP=     127.0.0.1