Date: Wed, 14 Apr 2021 00:39:15 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: fed0c40be92a - main - dns/knot-resolver: Apply maintainer's cleanup Message-ID: <202104140039.13E0dF6x024993@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=fed0c40be92a3890a800250b21c5d470f1aad294 commit fed0c40be92a3890a800250b21c5d470f1aad294 Author: Kevin Bowling <kbowling@FreeBSD.org> AuthorDate: 2021-04-14 00:32:57 +0000 Commit: Kevin Bowling <kbowling@FreeBSD.org> CommitDate: 2021-04-14 00:39:05 +0000 dns/knot-resolver: Apply maintainer's cleanup This also fixes the kresd.conf @sample, prefer the maintainer's approach in the cleanup patch that arrived after d94ae2c3c666 PR: 254765 Approved by: Leo Vandewoestijne <freebsd@dns.company> (maintainer) --- dns/knot-resolver/Makefile | 23 +++++++++++------------ 1 file changed, 11 insertions(+), 12 deletions(-) diff --git a/dns/knot-resolver/Makefile b/dns/knot-resolver/Makefile index 96d479e76b9a..d2045d364e4f 100644 --- a/dns/knot-resolver/Makefile +++ b/dns/knot-resolver/Makefile @@ -18,14 +18,14 @@ BUILD_DEPENDS= bash:shells/bash \ lua51-cqueues>=20200726_1:devel/lua-cqueues@lua51 \ luacheck:devel/lua-luacheck -LIB_DEPENDS= libknot.so:dns/knot3-lib \ - libdnssec.so:dns/knot3-lib \ - libzscanner.so:dns/knot3-lib \ +LIB_DEPENDS= libdnssec.so:dns/knot3-lib \ libgnutls.so:security/gnutls \ + libknot.so:dns/knot3-lib \ liblmdb.so:databases/lmdb \ libluajit-5.1.so:lang/luajit-openresty \ libnghttp2.so:www/libnghttp2 \ - libuv.so:devel/libuv + libuv.so:devel/libuv \ + libzscanner.so:dns/knot3-lib RUN_DEPENDS= lua51-cqueues>=20200726_1:devel/lua-cqueues@lua51 @@ -58,13 +58,14 @@ MESON_ARGS= --buildtype=release \ --libdir=${PREFIX}/lib \ --pkg-config-path=${PREFIX}/libdata/pkgconfig \ --prefix=${LOCALBASE} \ + -Dclient=enabled \ -Duser=${USERS} \ -Dgroup=${GROUPS} \ - -Dinstall_kresd_conf=disabled \ - -Dclient=enabled \ - -Dutils=enabled \ + -Dinstall_kresd_conf=enabled \ -Dkeyfile_default=${ETCDIR}/root.keys \ - -Droot_hints=${ETCDIR}/root.hints + -Droot_hints=${ETCDIR}/root.hints \ + -Duser=${USERS} \ + -Dutils=enabled LDFLAGS+= -L${LOCALBASE}/lib @@ -113,8 +114,7 @@ TESTCONF_MESON_OFF= -Dconfig_tests=disabled TESTEXTRA_BROKEN= CMake Error: The source directory misses CMakeLists.txt TESTEXTRA_BUILD_DEPENDS= git:devel/git TESTEXTRA_USES= cmake python:3 -TESTEXTRA_MESON_ON= -Dextra_tests=enabled \ - -Dsendmmsg=disabled +TESTEXTRA_MESON_ON= -Dextra_tests=enabled -Dsendmmsg=disabled TESTEXTRA_MESON_OFF= -Dextra_tests=disabled TESTUNIT_BUILD_DEPENDS= cmocka>=1.1.1:sysutils/cmocka @@ -147,13 +147,12 @@ pre-install: pre-install-TEST-on: do-test post-install: + ${MV} ${STAGEDIR}${ETCDIR}/kresd.conf ${STAGEDIR}${ETCDIR}/kresd.conf.sample ${INSTALL_DATA} ${PORTDOCS:S,^,${WRKSRC}/,} ${STAGEDIR}${DOCSDIR}/ .for STRIP_TGT in ${STRIP_TARGETS} if [ -f ${STAGEDIR}${PREFIX}/${STRIP_TGT} ]; then \ ${STRIP_CMD} ${STAGEDIR}${PREFIX}/${STRIP_TGT}; \ fi .endfor - ${INSTALL_DATA} ${WRKSRC}/etc/config/config.personal \ - ${STAGEDIR}${ETCDIR}/kresd.conf.sample .include <bsd.port.mk>
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202104140039.13E0dF6x024993>