CVS commit: pkgsrc/net/djbdns

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

Module Name:    pkgsrc
Committed By:   schmonz
Date:           Mon Jun 18 10:44:38 UTC 2018

Modified Files:
        pkgsrc/net/djbdns: Makefile distinfo options.mk

Log Message:
Look for /etc/dnsrewrite under PKG_SYSCONFBASE. While here, update to
latest IPv6 patch (still conflicting with other default patches, so
commented out). Enable 'djbdns-tinydns64' by default, regardless of
platform. Bump PKGREVISION.


To generate a diff of this commit:
cvs rdiff -u -r1.65 -r1.66 pkgsrc/net/djbdns/Makefile
cvs rdiff -u -r1.25 -r1.26 pkgsrc/net/djbdns/distinfo
cvs rdiff -u -r1.18 -r1.19 pkgsrc/net/djbdns/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/Makefile
diff -u pkgsrc/net/djbdns/Makefile:1.65 pkgsrc/net/djbdns/Makefile:1.66
--- pkgsrc/net/djbdns/Makefile:1.65     Thu Oct 26 14:42:51 2017
+++ pkgsrc/net/djbdns/Makefile  Mon Jun 18 10:44:38 2018
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.65 2017/10/26 14:42:51 schmonz Exp $
+# $NetBSD: Makefile,v 1.66 2018/06/18 10:44:38 schmonz Exp $
 
 DISTNAME=              djbdns-1.05
-PKGREVISION=           12
+PKGREVISION=           13
 CATEGORIES=            net
 MASTER_SITES=          http://cr.yp.to/djbdns/
 DISTFILES=             ${DISTNAME}${EXTRACT_SUFX} ${MANPAGES}
@@ -16,13 +16,19 @@ SITES.${MANPAGES}=  http://smarden.org/pa
 
 DJB_RESTRICTED=                no
 
-EGDIR=                 ${PREFIX}/share/examples/djbdns
+SUBST_CLASSES+=                etc
+SUBST_STAGE.etc=       do-configure
+SUBST_FILES.etc=       dns_rcrw.c
+SUBST_SED.etc=         -e 's|/etc/dnsrewrite|${PKG_SYSCONFBASE}/dnsrewrite|g'
+SUBST_MESSAGE.etc=     Fixing prefix.
+
+EGDIR=                 ${PREFIX}/share/examples/${PKGBASE}
 CFLAGS+=               -DPKG_SYSCONFDIR="\"${PKG_SYSCONFDIR}\""
 MAKE_DIRS+=            ${PKG_SYSCONFDIR}
 CONF_FILES+=           ${EGDIR}/dnsroots.global ${PKG_SYSCONFDIR}/dnsroots.global
-PLIST_SRC=             ${PKGDIR}/PLIST
+BUILD_DEFS+=           PKG_SYSCONFBASE
 
-INSTALLATION_DIRS=     bin man ${PKGMANDIR}/man1 ${PKGMANDIR}/man5 ${PKGMANDIR}/man8 share/examples/djbdns
+INSTALLATION_DIRS=     bin ${PKGMANDIR}/man1 ${PKGMANDIR}/man5 ${PKGMANDIR}/man8 share/examples/${PKGBASE}
 
 post-install:
        cd ${WRKDIR}/${PKGBASE}-man; for i in 1 5 8; do                 \

Index: pkgsrc/net/djbdns/distinfo
diff -u pkgsrc/net/djbdns/distinfo:1.25 pkgsrc/net/djbdns/distinfo:1.26
--- pkgsrc/net/djbdns/distinfo:1.25     Thu Oct 26 14:42:51 2017
+++ pkgsrc/net/djbdns/distinfo  Mon Jun 18 10:44:38 2018
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.25 2017/10/26 14:42:51 schmonz Exp $
+$NetBSD: distinfo,v 1.26 2018/06/18 10:44:38 schmonz Exp $
 
 SHA1 (djbdns-1.05.tar.gz) = 2efdb3a039d0c548f40936aa9cb30829e0ce8c3d
 RMD160 (djbdns-1.05.tar.gz) = a832cbfd93e4ccec6a565492a4ee0b3c1b4b68ed
@@ -8,10 +8,10 @@ SHA1 (djbdns-1.05-man-20031023.tar.gz) =
 RMD160 (djbdns-1.05-man-20031023.tar.gz) = 42a5b3305513851dfe1da46df6f405bc81602fbe
 SHA512 (djbdns-1.05-man-20031023.tar.gz) = 98af7bd9033a2205fbbc0f23b7eab45b9756f6ceff5199a62952e19c89c9fe3c03495cb6f8621d388f883c40650309a1509095417df3f54af21a71350c4aa183
 Size (djbdns-1.05-man-20031023.tar.gz) = 17170 bytes
-SHA1 (djbdns-1.05-test27.diff.bz2) = f0380ec1866f49c0bcf6369a923ac0a4a5095da8
-RMD160 (djbdns-1.05-test27.diff.bz2) = bc24b8596b235d9a5c7558b5f37dab0d9ca418de
-SHA512 (djbdns-1.05-test27.diff.bz2) = e5acf26ff353ae20b6c2186140255bf0ae478a75a9946163d4474a003afbf8c2f47e61a12fc3ed4b9eff17ec8732e9d91bfbb10fb2762310b067180b6d471ba0
-Size (djbdns-1.05-test27.diff.bz2) = 20695 bytes
+SHA1 (djbdns-1.05-test28.diff.xz) = 92abf8b17368a8b2924fe6e5eb9ada988defbc6c
+RMD160 (djbdns-1.05-test28.diff.xz) = 2ee73a5b2080f6b20ded49b74999889f996bb8cc
+SHA512 (djbdns-1.05-test28.diff.xz) = 7fbfeda10221a0a09897c2e744df5606c83113c394ce055d822b0d8733873d72567a88c37905d21c7d2395170fc12b9e9eb133a941aa809f1b9856872ab48230
+Size (djbdns-1.05-test28.diff.xz) = 22072 bytes
 SHA1 (djbdns-1.05-ignoreip2.patch) = ec4281a6864bd044a84fbfcaaf42baa6b003976d
 RMD160 (djbdns-1.05-ignoreip2.patch) = bf8a0d38ae7bfb09a8ab2a04600680613db10aaa
 SHA512 (djbdns-1.05-ignoreip2.patch) = 4e7075c7400374c954fcf15b4c30d226a3e952da780cf77e1c303a7b350d069252c999da1f29e56100cb8964d1583e843a0acee1009f88551fea9040ca41145b

Index: pkgsrc/net/djbdns/options.mk
diff -u pkgsrc/net/djbdns/options.mk:1.18 pkgsrc/net/djbdns/options.mk:1.19
--- pkgsrc/net/djbdns/options.mk:1.18   Thu Dec 15 12:04:20 2016
+++ pkgsrc/net/djbdns/options.mk        Mon Jun 18 10:44:38 2018
@@ -1,4 +1,4 @@
-# $NetBSD: options.mk,v 1.18 2016/12/15 12:04:20 schmonz Exp $
+# $NetBSD: options.mk,v 1.19 2018/06/18 10:44:38 schmonz Exp $
 
 PKG_OPTIONS_VAR=               PKG_OPTIONS.djbdns
 PKG_SUPPORTED_OPTIONS+=                # inet6
@@ -6,23 +6,19 @@ PKG_SUPPORTED_OPTIONS+=               djbdns-cachesta
 PKG_SUPPORTED_OPTIONS+=                djbdns-tinydns64
 PKG_OPTIONS_OPTIONAL_GROUPS=   qmerge
 PKG_OPTIONS_GROUP.qmerge=      djbdns-qmerge1 djbdns-qmerge2
-PKG_SUGGESTED_OPTIONS+=                djbdns-qmerge2
-
-
-.if ${MACHINE_ARCH} == "sparc64" || \
-       ${MACHINE_ARCH} == "alpha" || \
-       ${MACHINE_ARCH} == "x86_64"
-PKG_SUGGESTED_OPTIONS+=   djbdns-tinydns64
-.endif
+PKG_SUGGESTED_OPTIONS+=                djbdns-qmerge2 djbdns-tinydns64
 
 .include "../../mk/bsd.options.mk"
 
 PLIST_VARS+=                   inet6
 #.if !empty(PKG_OPTIONS:Minet6)
-#IPV6_PATCH=                   djbdns-1.05-test27.diff.bz2
+#IPV6_PATCH=                   djbdns-1.05-test28.diff.xz
 #PATCHFILES+=                  ${IPV6_PATCH}
 #SITES.${IPV6_PATCH}=          http://www.fefe.de/dns/
+#USE_TOOLS+=                   xzcat
+#PATCH_DIST_CAT.${IPV6_PATCH}= xzcat < ${IPV6_PATCH}
 #PATCH_DIST_STRIP.${IPV6_PATCH}=       -p1
+#MAKE_JOBS_SAFE=                       no
 #PLIST.inet6=                  yes
 #.endif