CVS commit: pkgsrc/net/knot-resolver

["Adam Ciarcinski" <adam%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   adam
Date:           Fri Sep  4 07:57:46 UTC 2026

Modified Files:
        pkgsrc/net/knot-resolver: Makefile PLIST

Log Message:
knot-resolver: fix build on Darwin


To generate a diff of this commit:
cvs rdiff -u -r1.4 -r1.5 pkgsrc/net/knot-resolver/Makefile
cvs rdiff -u -r1.1 -r1.2 pkgsrc/net/knot-resolver/PLIST

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: pkgsrc/net/knot-resolver/Makefile
diff -u pkgsrc/net/knot-resolver/Makefile:1.4 pkgsrc/net/knot-resolver/Makefile:1.5
--- pkgsrc/net/knot-resolver/Makefile:1.4       Wed Aug 26 10:19:08 2026
+++ pkgsrc/net/knot-resolver/Makefile   Fri Sep  4 07:57:46 2026
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.4 2026/08/26 10:19:08 adam Exp $
+# $NetBSD: Makefile,v 1.5 2026/09/04 07:57:46 adam Exp $
 
 DISTNAME=      knot-resolver-6.4.2
 PKGREVISION=   1
@@ -11,12 +11,12 @@ HOMEPAGE=   https://secure.nic.cz/files/kn
 COMMENT=       Knot (resolver) DNS server
 LICENSE=       gnu-gpl-v3
 
-USE_TOOLS+=    pkg-config
-USE_TOOLS+=    cmake
-USE_TOOLS+=    bash
 USE_LANGUAGES= c c++
 USE_LIBTOOL=   yes
-DEPENDS+=      daemonize-[0-9]*:../../sysutils/daemonize
+USE_TOOLS+=    bash cmake pkg-config
+DEPENDS+=      daemonize>=0:../../sysutils/daemonize
+
+.include "../../mk/bsd.prefs.mk"
 
 RCD_SCRIPTS=   kresd
 
@@ -29,7 +29,6 @@ PKG_GECOS.${KRESD_USER}=      kresd daemon us
 PKG_GROUPS_VARS+=              KRESD_GROUP
 PKG_USERS_VARS=                        KRESD_USER
 
-
 CONF_FILES+=   ${PREFIX}/share/examples/knot-resolver/icann-ca.pem  ${PKG_SYSCONFDIR}/knot-resolver/icann-ca.pem
 CONF_FILES+=   ${PREFIX}/share/examples/knot-resolver/root.hints    ${PKG_SYSCONFDIR}/knot-resolver/root.hints
 CONF_FILES+=   ${PREFIX}/share/examples/knot-resolver/root.keys     ${PKG_SYSCONFDIR}/knot-resolver/root.keys
@@ -44,18 +43,31 @@ post-install:
        ${MV} ${DESTDIR}${PREFIX}/etc/knot-resolver/root.keys ${DESTDIR}${PREFIX}/share/examples/knot-resolver/
        ${RMDIR} ${DESTDIR}${PREFIX}/etc/knot-resolver
 
-.include "../../net/knot/buildlink3.mk"
-.include "../../devel/libuv/buildlink3.mk"
-.include "../../databases/lmdb/buildlink3.mk"
-.include "../../lang/LuaJIT2/buildlink3.mk"
-.include "../../devel/libidn/buildlink3.mk"
-.include "../../devel/userspace-rcu/buildlink3.mk"
-.include "../../devel/zlib/buildlink3.mk"
-.include "../../security/gnutls/buildlink3.mk"
-.include "../../devel/editline/buildlink3.mk"
+OPSYSVARS+=    SOEXT
+SOEXT.Darwin=  dylib
+SOEXT.*=       so
+PLIST_SUBST+=  SOEXT=${SOEXT}
+PLIST_VARS=    notdarwin
+
+.if ${OPSYS} == "Darwin"
+# error: call to undeclared function 'malloc_stats_print'
+MESON_ARGS+=           -Dmalloc=disabled
+.else
+PLIST.notdarwin=       yes
 .include "../../devel/jemalloc/buildlink3.mk"
+.endif
+
+.include "../../databases/lmdb/buildlink3.mk"
 .include "../../devel/cmocka/buildlink3.mk"
+.include "../../devel/editline/buildlink3.mk"
+.include "../../devel/libidn/buildlink3.mk"
+.include "../../devel/libuv/buildlink3.mk"
 .include "../../devel/meson/build.mk"
 .include "../../devel/protobuf-c/buildlink3.mk"
+.include "../../devel/userspace-rcu/buildlink3.mk"
+.include "../../devel/zlib/buildlink3.mk"
+.include "../../lang/LuaJIT2/buildlink3.mk"
+.include "../../net/knot/buildlink3.mk"
 .include "../../net/fstrm/buildlink3.mk"
+.include "../../security/gnutls/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"

Index: pkgsrc/net/knot-resolver/PLIST
diff -u pkgsrc/net/knot-resolver/PLIST:1.1 pkgsrc/net/knot-resolver/PLIST:1.2
--- pkgsrc/net/knot-resolver/PLIST:1.1  Sat Jun 27 20:39:03 2026
+++ pkgsrc/net/knot-resolver/PLIST      Fri Sep  4 07:57:46 2026
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.1 2026/06/27 20:39:03 drixter Exp $
+@comment $NetBSD: PLIST,v 1.2 2026/09/04 07:57:46 adam Exp $
 include/libkres/api.h
 include/libkres/array.h
 include/libkres/cdb_api.h
@@ -30,26 +30,26 @@ include/libkres/top.h
 include/libkres/trie.h
 include/libkres/utils.h
 include/libkres/zonecut.h
-lib/knot-resolver/ahocorasick.so
-lib/knot-resolver/debug_opensslkeylog.so
+lib/knot-resolver/ahocorasick.${SOEXT}
+${PLIST.notdarwin}lib/knot-resolver/debug_opensslkeylog.${SOEXT}
 lib/knot-resolver/distro-preconfig.lua
 lib/knot-resolver/kluautil.lua
 lib/knot-resolver/kres-gen.lua
 lib/knot-resolver/kres.lua
-lib/knot-resolver/kres_modules/bogus_log.so
+lib/knot-resolver/kres_modules/bogus_log.${SOEXT}
 lib/knot-resolver/kres_modules/daf.lua
 lib/knot-resolver/kres_modules/daf/daf.js
 lib/knot-resolver/kres_modules/detect_time_jump.lua
 lib/knot-resolver/kres_modules/detect_time_skew.lua
 lib/knot-resolver/kres_modules/dns64.lua
-lib/knot-resolver/kres_modules/dnstap.so
-lib/knot-resolver/kres_modules/edns_keepalive.so
+lib/knot-resolver/kres_modules/dnstap.${SOEXT}
+lib/knot-resolver/kres_modules/edns_keepalive.${SOEXT}
 lib/knot-resolver/kres_modules/etcd.lua
 lib/knot-resolver/kres_modules/experimental_dot_auth.lua
-lib/knot-resolver/kres_modules/extended_error.so
+lib/knot-resolver/kres_modules/extended_error.${SOEXT}
 lib/knot-resolver/kres_modules/fallback.lua
 lib/knot-resolver/kres_modules/graphite.lua
-lib/knot-resolver/kres_modules/hints.so
+lib/knot-resolver/kres_modules/hints.${SOEXT}
 lib/knot-resolver/kres_modules/http.lua
 lib/knot-resolver/kres_modules/http/bootstrap-theme.min.css
 lib/knot-resolver/kres_modules/http/bootstrap.min.css
@@ -71,7 +71,7 @@ lib/knot-resolver/kres_modules/http/topo
 lib/knot-resolver/kres_modules/http_doh.lua
 lib/knot-resolver/kres_modules/http_tls_cert.lua
 lib/knot-resolver/kres_modules/http_trace.lua
-lib/knot-resolver/kres_modules/nsid.so
+lib/knot-resolver/kres_modules/nsid.${SOEXT}
 lib/knot-resolver/kres_modules/policy.lua
 lib/knot-resolver/kres_modules/predict.lua
 lib/knot-resolver/kres_modules/prefetch.lua
@@ -79,10 +79,10 @@ lib/knot-resolver/kres_modules/prefill.l
 lib/knot-resolver/kres_modules/priming.lua
 lib/knot-resolver/kres_modules/prometheus.lua
 lib/knot-resolver/kres_modules/rebinding.lua
-lib/knot-resolver/kres_modules/refuse_nord.so
+lib/knot-resolver/kres_modules/refuse_nord.${SOEXT}
 lib/knot-resolver/kres_modules/renumber.lua
 lib/knot-resolver/kres_modules/serve_stale.lua
-lib/knot-resolver/kres_modules/stats.so
+lib/knot-resolver/kres_modules/stats.${SOEXT}
 lib/knot-resolver/kres_modules/ta_sentinel.lua
 lib/knot-resolver/kres_modules/ta_signal_query.lua
 lib/knot-resolver/kres_modules/ta_update.lua