CVS commit: pkgsrc/net/djbdns-run

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

Module Name:    pkgsrc
Committed By:   schmonz
Date:           Sun Mar 30 17:34:18 UTC 2025

Modified Files:
        pkgsrc/net/djbdns-run: Makefile options.mk
Removed Files:
        pkgsrc/net/djbdns-run/files: dnscache-ip

Log Message:
djbdns-run: generate 0-byte dnscache-ip during build. NFCI.


To generate a diff of this commit:
cvs rdiff -u -r1.37 -r1.38 pkgsrc/net/djbdns-run/Makefile
cvs rdiff -u -r1.4 -r1.5 pkgsrc/net/djbdns-run/options.mk
cvs rdiff -u -r1.1 -r0 pkgsrc/net/djbdns-run/files/dnscache-ip

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.37 pkgsrc/net/djbdns-run/Makefile:1.38
--- pkgsrc/net/djbdns-run/Makefile:1.37 Fri Oct 16 09:28:14 2020
+++ pkgsrc/net/djbdns-run/Makefile      Sun Mar 30 17:34:18 2025
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.37 2020/10/16 09:28:14 schmonz Exp $
+# $NetBSD: Makefile,v 1.38 2025/03/30 17:34:18 schmonz Exp $
 #
 
 DISTNAME=              djbdns-run-20201016
@@ -14,7 +14,6 @@ DEPENDS+=             ${DEPENDS_DJBDNS}
 DEPENDS+=              daemontools-[0-9]*:../../sysutils/daemontools
 
 WRKSRC=                        ${WRKDIR}
-NO_BUILD=              yes
 NO_CHECKSUM=           yes
 
 MAKE_DIRS+=            ${PKG_SYSCONFDIR}/axfrdns
@@ -46,20 +45,23 @@ CONF_FILES+=                ${PREFIX}/share/examples/$
 CONF_FILES+=           ${PREFIX}/share/examples/${PKGBASE}/axfrdns-tcp \
                        ${PKG_SYSCONFDIR}/axfrdns/tcp
 
+SUBST_CLASSES+=                rcd
+SUBST_STAGE.rcd=       pre-configure
+SUBST_FILES.rcd=       README.pkgsrc
+SUBST_VARS.rcd=                PKG_SYSCONFDIR RCD_SCRIPTS_DIR
+
 .include "options.mk"
 
 post-extract:
        ${CP} ${FILESDIR}/README.pkgsrc ${WRKSRC}/
 
-SUBST_CLASSES+=                rcd
-SUBST_STAGE.rcd=       pre-configure
-SUBST_FILES.rcd=       README.pkgsrc
-SUBST_VARS.rcd=                PKG_SYSCONFDIR RCD_SCRIPTS_DIR
+do-build:
+       ${TOUCH} ${WRKSRC}/dnscache-ip
 
 do-install:
        ${INSTALL_DATA} ${WRKSRC}/README.pkgsrc ${DESTDIR}${PREFIX}/share/doc/djbdns-run
+       ${INSTALL_DATA} ${WRKSRC}/dnscache-ip ${DESTDIR}${PREFIX}/share/examples/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/options.mk
diff -u pkgsrc/net/djbdns-run/options.mk:1.4 pkgsrc/net/djbdns-run/options.mk:1.5
--- pkgsrc/net/djbdns-run/options.mk:1.4        Tue Jan  8 18:29:29 2019
+++ pkgsrc/net/djbdns-run/options.mk    Sun Mar 30 17:34:18 2025
@@ -1,4 +1,4 @@
-# $NetBSD: options.mk,v 1.4 2019/01/08 18:29:29 schmonz Exp $
+# $NetBSD: options.mk,v 1.5 2025/03/30 17:34:18 schmonz Exp $
 
 PKG_OPTIONS_VAR=       PKG_OPTIONS.djbdns-run
 PKG_SUPPORTED_OPTIONS+=        inet6
@@ -16,8 +16,6 @@ DNSROOTS_GLOBAL=      share/examples/djbdnscu
 TINYDNS_LISTENIP=      ::
 DNSCACHE_LISTENIP=     ::1
 DNSCACHE_SENDIP=       ::
-CONF_FILES+=           ${PREFIX}/share/examples/${PKGBASE}/dnscache-ip \
-                       ${PKG_SYSCONFDIR}/dnscache/ip/::1
 .else
 DEPENDS_DJBDNS=                djbdns>=1.05nb5:../../net/djbdns
 DEPENDS+=              {ucspi-tcp6-[0-9]*,ucspi-tcp-[0-9]*}:../../net/ucspi-tcp
@@ -25,6 +23,6 @@ DNSROOTS_GLOBAL=      share/examples/djbdns/d
 TINYDNS_LISTENIP=      0.0.0.0
 DNSCACHE_LISTENIP=     127.0.0.1
 DNSCACHE_SENDIP=       0.0.0.0
-CONF_FILES+=           ${PREFIX}/share/examples/${PKGBASE}/dnscache-ip \
-                       ${PKG_SYSCONFDIR}/dnscache/ip/127.0.0.1
 .endif
+CONF_FILES+=           ${PREFIX}/share/examples/${PKGBASE}/dnscache-ip \
+                       ${PKG_SYSCONFDIR}/dnscache/ip/${DNSCACHE_LISTENIP}