From owner-dev-commits-ports-all@freebsd.org Wed Apr 14 00:39:16 2021 Return-Path: Delivered-To: dev-commits-ports-all@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id 31FC25F3550; Wed, 14 Apr 2021 00:39:16 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4FKkBD0yH5z3qdx; Wed, 14 Apr 2021 00:39:16 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 0901B1444E; Wed, 14 Apr 2021 00:39:16 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 13E0dFwJ024994; Wed, 14 Apr 2021 00:39:15 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 13E0dF6x024993; Wed, 14 Apr 2021 00:39:15 GMT (envelope-from git) Date: Wed, 14 Apr 2021 00:39:15 GMT Message-Id: <202104140039.13E0dF6x024993@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Kevin Bowling Subject: git: fed0c40be92a - main - dns/knot-resolver: Apply maintainer's cleanup MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: kbowling X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: fed0c40be92a3890a800250b21c5d470f1aad294 Auto-Submitted: auto-generated X-BeenThere: dev-commits-ports-all@freebsd.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: Commit messages for all branches of the ports repository List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 14 Apr 2021 00:39:16 -0000 The branch main has been updated by kbowling: URL: https://cgit.FreeBSD.org/ports/commit/?id=fed0c40be92a3890a800250b21c5d470f1aad294 commit fed0c40be92a3890a800250b21c5d470f1aad294 Author: Kevin Bowling AuthorDate: 2021-04-14 00:32:57 +0000 Commit: Kevin Bowling 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 (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