<pre style='margin:0'>
Marius Schamschula (Schamschula) pushed a commit to branch master
in repository macports-ports.

</pre>
<p><a href="https://github.com/macports/macports-ports/commit/1c30f15820bee109a570702bedda25e9c607a699">https://github.com/macports/macports-ports/commit/1c30f15820bee109a570702bedda25e9c607a699</a></p>
<pre style="white-space: pre; background: #F8F8F8"><span style='display:block; white-space:pre;color:#808000;'>commit 1c30f15820bee109a570702bedda25e9c607a699
</span>Author: Kirill A. Korinsky <kirill@korins.ky>
AuthorDate: Fri Jan 5 15:36:04 2024 +0100

<span style='display:block; white-space:pre;color:#404040;'>    knot-resolver: add missed dependency and respect run path
</span>---
 net/knot-resolver/Portfile                  | 33 +++++++++++++++++++++++++----
 net/knot-resolver/files/respect-rundir.diff | 13 ++++++++++++
 2 files changed, 42 insertions(+), 4 deletions(-)

<span style='display:block; white-space:pre;color:#808080;'>diff --git a/net/knot-resolver/Portfile b/net/knot-resolver/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 3ffcc300def..c4ed4c99f5b 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/net/knot-resolver/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/net/knot-resolver/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -9,7 +9,7 @@ legacysupport.newest_darwin_requires_legacy 15
</span> 
 name                knot-resolver
 version             5.7.0
<span style='display:block; white-space:pre;background:#ffe0e0;'>-revision            0
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+revision            1
</span> categories          net
 license             GPL-3+
 maintainers         {mps @Schamschula} {@catap korins.ky:kirill} openmaintainer
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -36,19 +36,44 @@ depends_lib         path:lib/libluajit-5.1.2.dylib:luajit \
</span>                     port:libuv \
                     port:lmdb \
                     port:nghttp2 \
<span style='display:block; white-space:pre;background:#e0ffe0;'>+                    port:lua51-psl \
</span>                     port:protobuf-c
 
<span style='display:block; white-space:pre;background:#ffe0e0;'>-patchfiles-append   respect-pkgconfig-libdir.diff
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+patchfiles-append   respect-pkgconfig-libdir.diff \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+                    respect-rundir.diff
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+configure.args      -Dkeyfile_default=${prefix}/var/lib/knot-resolver/root.ds \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+                    -Dinstall_kresd_conf=enabled \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+                    -Dinstall_root_keys=enabled \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+                    -Dmanaged_ta=enabled \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+                    -Dunit_tests=disabled
</span> 
 # Should match knot port
 platforms {darwin >= 15}
 
 startupitem.create      yes
 startupitem.netchange   yes
<span style='display:block; white-space:pre;background:#ffe0e0;'>-startupitem.executable  ${prefix}/sbin/kresd -n ${prefix}/var/run/knot-resolver
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+startupitem.executable  ${prefix}/sbin/kresd -n \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+                        -c ${prefix}/etc/knot-resolver/kresd.conf \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+                        ${prefix}/var/run/knot-resolver
</span> 
<span style='display:block; white-space:pre;background:#ffe0e0;'>-destroot.keepdirs       ${destroot}${prefix}/var/run/knot-resolver
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+destroot.keepdirs       ${destroot}${prefix}/var/cache/knot-resolver \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+                        ${destroot}${prefix}/var/lib/knot-resolver \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+                        ${destroot}${prefix}/var/run/knot-resolver
</span> 
 post-destroot {
<span style='display:block; white-space:pre;background:#e0ffe0;'>+    move                ${destroot}${prefix}/etc/knot-resolver/kresd.conf \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+                        ${destroot}${prefix}/etc/knot-resolver/kresd.sample.conf
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+    xinstall -m 755 -o root -d ${destroot}${prefix}/var/cache/knot-resolver
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+    xinstall -m 755 -o root -d ${destroot}${prefix}/var/lib/knot-resolver
</span>     xinstall -m 755 -o root -d ${destroot}${prefix}/var/run/knot-resolver
 }
<span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+notes "
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+To complete the installation, run:
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+sudo cp ${prefix}/etc/knot-resolver/kresd.sample.conf ${prefix}/etc/knotknot-resolver/kresd.conf
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+Edit as necessary. (See the kresd.conf manpage for additional information.)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+"
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/net/knot-resolver/files/respect-rundir.diff b/net/knot-resolver/files/respect-rundir.diff
</span>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 00000000000..6a188e3f9bf
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--- /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/net/knot-resolver/files/respect-rundir.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -0,0 +1,13 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+diff --git meson.build meson.build
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+index 1dfc160b..a84a2520 100644
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- meson.build
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ meson.build
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -52,7 +52,7 @@ etc_dir = prefix / get_option('sysconfdir') / 'knot-resolver'
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ lib_dir = prefix / get_option('libdir') / 'knot-resolver'
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ modules_dir = lib_dir / 'kres_modules'
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ sbin_dir = prefix / get_option('sbindir')
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-run_dir = '/run' / 'knot-resolver'
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++run_dir = prefix / get_option('localstatedir') / 'run' / 'knot-resolver'
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ systemd_work_dir = prefix / get_option('localstatedir') / 'lib' / 'knot-resolver'
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ systemd_cache_dir = prefix / get_option('localstatedir') / 'cache' / 'knot-resolver'
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ systemd_unit_dir = prefix / 'lib' / 'systemd' / 'system'
</span></pre><pre style='margin:0'>

</pre>