Date: Tue, 13 Apr 2021 23:10:33 GMT From: Kevin Bowling <kbowling@FreeBSD.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org Subject: git: d94ae2c3c666 - main - dns/knot-resolver: Fix @sample use Message-ID: <202104132310.13DNAXO0014869@gitrepo.freebsd.org>
next in thread | raw e-mail | index | archive | help
The branch main has been updated by kbowling: URL: https://cgit.FreeBSD.org/ports/commit/?id=d94ae2c3c666fd3c26e4a5e572ad084d88a8b5f3 commit d94ae2c3c666fd3c26e4a5e572ad084d88a8b5f3 Author: Kevin Bowling <kbowling@FreeBSD.org> AuthorDate: 2021-04-13 23:07:49 +0000 Commit: Kevin Bowling <kbowling@FreeBSD.org> CommitDate: 2021-04-13 23:07:49 +0000 dns/knot-resolver: Fix @sample use The port was not using the @sample functionality correctly, stage the correct sample config in post-install and fix the pkg-plist. PR: 254765 Reported by: Marcel <marcel@brickporch.com> Approved by: maintainer timeout --- dns/knot-resolver/Makefile | 4 +++- dns/knot-resolver/pkg-plist | 2 +- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/dns/knot-resolver/Makefile b/dns/knot-resolver/Makefile index 80fdb42dc661..96d479e76b9a 100644 --- a/dns/knot-resolver/Makefile +++ b/dns/knot-resolver/Makefile @@ -60,7 +60,7 @@ MESON_ARGS= --buildtype=release \ --prefix=${LOCALBASE} \ -Duser=${USERS} \ -Dgroup=${GROUPS} \ - -Dinstall_kresd_conf=enabled \ + -Dinstall_kresd_conf=disabled \ -Dclient=enabled \ -Dutils=enabled \ -Dkeyfile_default=${ETCDIR}/root.keys \ @@ -153,5 +153,7 @@ post-install: ${STRIP_CMD} ${STAGEDIR}${PREFIX}/${STRIP_TGT}; \ fi .endfor + ${INSTALL_DATA} ${WRKSRC}/etc/config/config.personal \ + ${STAGEDIR}${ETCDIR}/kresd.conf.sample .include <bsd.port.mk> diff --git a/dns/knot-resolver/pkg-plist b/dns/knot-resolver/pkg-plist index 2684bb39b90f..68b5268537ae 100644 --- a/dns/knot-resolver/pkg-plist +++ b/dns/knot-resolver/pkg-plist @@ -1,4 +1,4 @@ -@sample %%ETCDIR%%/kresd.conf +@sample %%ETCDIR%%/kresd.conf.sample %%ETCDIR%%/icann-ca.pem %%ETCDIR%%/root.hints include/libkres/api.h
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202104132310.13DNAXO0014869>