summaryrefslogtreecommitdiff
path: root/net/djbdns-run
diff options
context:
space:
mode:
authorschmonz <schmonz@pkgsrc.org>2019-01-07 19:45:48 +0000
committerschmonz <schmonz@pkgsrc.org>2019-01-07 19:45:48 +0000
commita940d68f664b30aa451b66e9692bf07dbe607704 (patch)
tree83b30dc0c80e6741fc924f48040cafbf8bcb1b83 /net/djbdns-run
parent86d0db30c113d8e4c6cc83a94d5380dc16d57ad7 (diff)
downloadpkgsrc-a940d68f664b30aa451b66e9692bf07dbe607704.tar.gz
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.
Diffstat (limited to 'net/djbdns-run')
-rw-r--r--net/djbdns-run/Makefile7
-rw-r--r--net/djbdns-run/PLIST3
-rw-r--r--net/djbdns-run/options.mk4
3 files changed, 9 insertions, 5 deletions
diff --git a/net/djbdns-run/Makefile b/net/djbdns-run/Makefile
index 899ae129bbd..09e47035356 100644
--- a/net/djbdns-run/Makefile
+++ b/net/djbdns-run/Makefile
@@ -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_CACHE_USER DJBDNS_LOG_USER
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"
diff --git a/net/djbdns-run/PLIST b/net/djbdns-run/PLIST
index 4744b116132..c33a3c1d3fd 100644
--- a/net/djbdns-run/PLIST
+++ b/net/djbdns-run/PLIST
@@ -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
diff --git a/net/djbdns-run/options.mk b/net/djbdns-run/options.mk
index ca3d4247697..4e8d574d78b 100644
--- a/net/djbdns-run/options.mk
+++ b/net/djbdns-run/options.mk
@@ -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=${DNSCACHE_SENDIP:Q}
.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/${PKGBASE}/dnscache-ip \
.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