CVS commit: pkgsrc/net/djbdns-run

["Amitai Schleier" <schmonz%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   schmonz
Date:           Mon Jan  7 19:45:48 UTC 2019

Modified Files:
        pkgsrc/net/djbdns-run: Makefile PLIST options.mk

Log Message:
Get a copy of dnsroots.global from djbdns and use the copy as
CONF_FILES. Fixes build on NetBSD that somehow wasn't broken on OS X.


To generate a diff of this commit:
cvs rdiff -u -r1.31 -r1.32 pkgsrc/net/djbdns-run/Makefile
cvs rdiff -u -r1.7 -r1.8 pkgsrc/net/djbdns-run/PLIST
cvs rdiff -u -r1.2 -r1.3 pkgsrc/net/djbdns-run/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/djbdns-run/Makefile
diff -u pkgsrc/net/djbdns-run/Makefile:1.31 pkgsrc/net/djbdns-run/Makefile:1.32
--- pkgsrc/net/djbdns-run/Makefile:1.31 Mon Jan  7 14:01:55 2019
+++ pkgsrc/net/djbdns-run/Makefile      Mon Jan  7 19:45:48 2019
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.31 2019/01/07 14:01:55 schmonz Exp $
+# $NetBSD: Makefile,v 1.32 2019/01/07 19:45:48 schmonz Exp $
 #
 
 DISTNAME=              djbdns-run-20190107
@@ -41,9 +41,9 @@ BUILD_DEFS+=          DJBDNS_AXFR_USER DJBDNS_CA
 BUILD_DEFS+=           DJBDNS_RBL_USER DJBDNS_TINY_USER
 BUILD_DEFS+=           DJBDNS_DJBDNS_GROUP
 
-CONF_FILES+=           ${PKG_SYSCONFDIR}/dnsroots.global \
+CONF_FILES+=           ${PREFIX}/share/examples/${PKGBASE}/dnsroots.global \
                        ${PKG_SYSCONFDIR}/dnscache/servers/@
-CONF_FILES+=           ${PREFIX}/share/examples/djbdns-run/axfrdns-tcp \
+CONF_FILES+=           ${PREFIX}/share/examples/${PKGBASE}/axfrdns-tcp \
                        ${PKG_SYSCONFDIR}/axfrdns/tcp
 
 .include "options.mk"
@@ -67,5 +67,6 @@ do-install:
        ${INSTALL_DATA} ${FILESDIR}/README.pkgsrc ${DESTDIR}${PREFIX}/share/doc/djbdns-run
        ${INSTALL_DATA} ${FILESDIR}/axfrdns-tcp ${DESTDIR}${PREFIX}/share/examples/djbdns-run
        ${INSTALL_DATA} ${FILESDIR}/dnscache-ip ${DESTDIR}${PREFIX}/share/examples/djbdns-run
+       ${INSTALL_DATA} ${PREFIX}/${DNSROOTS_GLOBAL} ${DESTDIR}${PREFIX}/share/examples/djbdns-run
 
 .include "../../mk/bsd.pkg.mk"

Index: pkgsrc/net/djbdns-run/PLIST
diff -u pkgsrc/net/djbdns-run/PLIST:1.7 pkgsrc/net/djbdns-run/PLIST:1.8
--- pkgsrc/net/djbdns-run/PLIST:1.7     Mon Jan  7 14:01:55 2019
+++ pkgsrc/net/djbdns-run/PLIST Mon Jan  7 19:45:48 2019
@@ -1,4 +1,5 @@
-@comment $NetBSD: PLIST,v 1.7 2019/01/07 14:01:55 schmonz Exp $
+@comment $NetBSD: PLIST,v 1.8 2019/01/07 19:45:48 schmonz Exp $
 share/doc/djbdns-run/README.pkgsrc
 share/examples/djbdns-run/axfrdns-tcp
 share/examples/djbdns-run/dnscache-ip
+share/examples/djbdns-run/dnsroots.global

Index: pkgsrc/net/djbdns-run/options.mk
diff -u pkgsrc/net/djbdns-run/options.mk:1.2 pkgsrc/net/djbdns-run/options.mk:1.3
--- pkgsrc/net/djbdns-run/options.mk:1.2        Mon Jan  7 14:01:55 2019
+++ pkgsrc/net/djbdns-run/options.mk    Mon Jan  7 19:45:48 2019
@@ -1,4 +1,4 @@
-# $NetBSD: options.mk,v 1.2 2019/01/07 14:01:55 schmonz Exp $
+# $NetBSD: options.mk,v 1.3 2019/01/07 19:45:48 schmonz Exp $
 
 PKG_OPTIONS_VAR=       PKG_OPTIONS.djbdns-run
 PKG_SUPPORTED_OPTIONS+=        inet6
@@ -12,6 +12,7 @@ FILES_SUBST+=         DNSCACHE_SENDIP=${DNSCACH
 .if !empty(PKG_OPTIONS:Minet6)
 DEPENDS_DJBDNS=                djbdnscurve6-[0-9]*:../../net/djbdnscurve6
 DEPENDS+=              ucspi-tcp6-[0-9]*:../../net/ucspi-tcp6
+DNSROOTS_GLOBAL=       share/examples/djbdnscurve6/dnsroots.global
 TINYDNS_LISTENIP=      ::
 DNSCACHE_LISTENIP=     ::1
 DNSCACHE_SENDIP=       ::
@@ -20,6 +21,7 @@ CONF_FILES+=          ${PREFIX}/share/examples/$
 .else
 DEPENDS_DJBDNS=                djbdns>=1.05nb5:../../net/djbdns
 DEPENDS+=              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
 DNSCACHE_SENDIP=       0.0.0.0