Sun Jul 29 23:59:26 2018 UTC ()
Add 'inet6' option to control dependency on ucspi-tcp{6,}, even
though net/djbdns itself still doesn't support the 'inet6' option.
Bump version.


(schmonz)
diff -r1.29 -r1.30 pkgsrc/net/djbdns-run/Makefile
diff -r0 -r1.1 pkgsrc/net/djbdns-run/options.mk
cvs diff -r1.29 -r1.30 pkgsrc/net/djbdns-run/Makefile (expand / switch to unified diff)

--- pkgsrc/net/djbdns-run/Makefile 2018/07/25 16:32:34 1.29
+++ pkgsrc/net/djbdns-run/Makefile 2018/07/29 23:59:26 1.30
@@ -1,29 +1,28 @@ @@ -1,29 +1,28 @@
1# $NetBSD: Makefile,v 1.29 2018/07/25 16:32:34 schmonz Exp $ 1# $NetBSD: Makefile,v 1.30 2018/07/29 23:59:26 schmonz Exp $
2# 2#
3 3
4DISTNAME= djbdns-run-20180725 4DISTNAME= djbdns-run-20180730
5CATEGORIES= net 5CATEGORIES= net
6MASTER_SITES= # empty 6MASTER_SITES= # empty
7DISTFILES= # empty 7DISTFILES= # empty
8 8
9MAINTAINER= schmonz@NetBSD.org 9MAINTAINER= schmonz@NetBSD.org
10COMMENT= Configures djbdns to cache and serve queries 10COMMENT= Configures djbdns to cache and serve queries
11LICENSE= 2-clause-bsd 11LICENSE= 2-clause-bsd
12 12
13DEPENDS_DJBDNS= djbdns>=1.05nb5:../../net/djbdns 13DEPENDS_DJBDNS= djbdns>=1.05nb5:../../net/djbdns
14DEPENDS+= ${DEPENDS_DJBDNS} 14DEPENDS+= ${DEPENDS_DJBDNS}
15DEPENDS+= daemontools-[0-9]*:../../sysutils/daemontools 15DEPENDS+= daemontools-[0-9]*:../../sysutils/daemontools
16DEPENDS+= ucspi-tcp6-[0-9]*:../../net/ucspi-tcp6 
17 16
18WRKSRC= ${WRKDIR} 17WRKSRC= ${WRKDIR}
19NO_BUILD= yes 18NO_BUILD= yes
20NO_CHECKSUM= yes 19NO_CHECKSUM= yes
21 20
22MAKE_DIRS+= ${PKG_SYSCONFDIR}/axfrdns 21MAKE_DIRS+= ${PKG_SYSCONFDIR}/axfrdns
23MAKE_DIRS+= ${PKG_SYSCONFDIR}/dnscache/ip 22MAKE_DIRS+= ${PKG_SYSCONFDIR}/dnscache/ip
24MAKE_DIRS+= ${PKG_SYSCONFDIR}/dnscache/servers 23MAKE_DIRS+= ${PKG_SYSCONFDIR}/dnscache/servers
25MAKE_DIRS+= ${PKG_SYSCONFDIR}/rbldns 24MAKE_DIRS+= ${PKG_SYSCONFDIR}/rbldns
26MAKE_DIRS+= ${PKG_SYSCONFDIR}/tinydns 25MAKE_DIRS+= ${PKG_SYSCONFDIR}/tinydns
27PKG_GROUPS= ${DJBDNS_DJBDNS_GROUP} 26PKG_GROUPS= ${DJBDNS_DJBDNS_GROUP}
28PKG_USERS+= ${DJBDNS_AXFR_USER}:${DJBDNS_DJBDNS_GROUP} 27PKG_USERS+= ${DJBDNS_AXFR_USER}:${DJBDNS_DJBDNS_GROUP}
29PKG_USERS+= ${DJBDNS_CACHE_USER}:${DJBDNS_DJBDNS_GROUP} 28PKG_USERS+= ${DJBDNS_CACHE_USER}:${DJBDNS_DJBDNS_GROUP}
@@ -48,17 +47,19 @@ BUILD_DEFS+= DJBDNS_DJBDNS_GROUP @@ -48,17 +47,19 @@ BUILD_DEFS+= DJBDNS_DJBDNS_GROUP
48# Detect the PKG_SYSCONFDIR of the installed djbdns, so we can create 47# Detect the PKG_SYSCONFDIR of the installed djbdns, so we can create
49# config files there and refer to them from rc.d scripts. 48# config files there and refer to them from rc.d scripts.
50# 49#
51.if !defined(PKG_SYSCONFDIR.djbdns-run) 50.if !defined(PKG_SYSCONFDIR.djbdns-run)
52PKG_SYSCONFDIR.djbdns-run!= \ 51PKG_SYSCONFDIR.djbdns-run!= \
53 ${PKG_INFO} -Q PKG_SYSCONFDIR \ 52 ${PKG_INFO} -Q PKG_SYSCONFDIR \
54 ${DEPENDS_DJBDNS:C/:.*$//:Q} 2>/dev/null || \ 53 ${DEPENDS_DJBDNS:C/:.*$//:Q} 2>/dev/null || \
55 ${ECHO} "PKG_SYSCONFDIR.djbdns-run_not_set" 54 ${ECHO} "PKG_SYSCONFDIR.djbdns-run_not_set"
56. if empty(PKG_SYSCONFDIR.djbdns-run:M*not_set) 55. if empty(PKG_SYSCONFDIR.djbdns-run:M*not_set)
57MAKEVARS+= PKG_SYSCONFDIR.djbdns-run 56MAKEVARS+= PKG_SYSCONFDIR.djbdns-run
58. endif 57. endif
59.endif 58.endif
60 59
 60.include "options.mk"
 61
61do-install: 62do-install:
62 ${INSTALL_DATA} ${FILESDIR}/README.pkgsrc ${DESTDIR}${PREFIX}/share/doc/djbdns-run 63 ${INSTALL_DATA} ${FILESDIR}/README.pkgsrc ${DESTDIR}${PREFIX}/share/doc/djbdns-run
63 64
64.include "../../mk/bsd.pkg.mk" 65.include "../../mk/bsd.pkg.mk"
File Added: pkgsrc/net/djbdns-run/options.mk
# $NetBSD: options.mk,v 1.1 2018/07/29 23:59:26 schmonz Exp $

PKG_OPTIONS_VAR=		PKG_OPTIONS.djbdns-run
PKG_SUPPORTED_OPTIONS+=		inet6

.include "../../mk/bsd.options.mk"

.if !empty(PKG_OPTIONS:Minet6)
DEPENDS+=			ucspi-tcp6-[0-9]*:../../net/ucspi-tcp6
.else
DEPENDS+=			ucspi-tcp-[0-9]*:../../net/ucspi-tcp
.endif