<pre style='margin:0'>
Mohamed Akram (mohd-akram) pushed a commit to branch master
in repository macports-ports.
</pre>
<p><a href="https://github.com/macports/macports-ports/commit/fcd2573857d62a51c2598c4fc951b9609a434f82">https://github.com/macports/macports-ports/commit/fcd2573857d62a51c2598c4fc951b9609a434f82</a></p>
<pre style="white-space: pre; background: #F8F8F8">The following commit(s) were added to refs/heads/master by this push:
<span style='display:block; white-space:pre;color:#404040;'> new fcd2573857d valkey: fix pidfile location
</span>fcd2573857d is described below
<span style='display:block; white-space:pre;color:#808000;'>commit fcd2573857d62a51c2598c4fc951b9609a434f82
</span>Author: Mohamed Akram <makr@macports.org>
AuthorDate: Wed May 1 04:09:11 2024 +0400
<span style='display:block; white-space:pre;color:#404040;'> valkey: fix pidfile location
</span>---
databases/valkey/Portfile | 18 ++++++++++--------
databases/valkey/files/patch-valkey.conf.diff | 2 +-
2 files changed, 11 insertions(+), 9 deletions(-)
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/databases/valkey/Portfile b/databases/valkey/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 5baee3ca79f..3b086d85be5 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/databases/valkey/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/databases/valkey/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -10,10 +10,9 @@ PortGroup makefile 1.0
</span> # clock_gettime
legacysupport.newest_darwin_requires_legacy 15
<span style='display:block; white-space:pre;background:#ffe0e0;'>-name valkey
</span> github.setup valkey-io valkey 7.2.5
github.tarball_from archive
<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 databases
license BSD
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -72,11 +71,13 @@ depends_lib path:lib/libssl.dylib:openssl
</span> # prevent conflict with redis
destroot.args-append USE_REDIS_SYMLINKS=no
<span style='display:block; white-space:pre;background:#ffe0e0;'>-set db_dir ${prefix}/var/db/valkey
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-set log_dir ${prefix}/var/log/valkey
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+set db_dir ${prefix}/var/db/${name}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+set log_dir ${prefix}/var/log/${name}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+set run_dir ${prefix}/var/run/${name}
</span>
destroot.keepdirs ${destroot}${db_dir} \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- ${destroot}${log_dir}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ${destroot}${log_dir} \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ${destroot}${run_dir}
</span>
installs_libs no
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -90,6 +91,7 @@ post-destroot {
</span> }
xinstall -o ${name} -g ${name} -d ${destroot}${db_dir}
xinstall -o ${name} -g ${name} -d ${destroot}${log_dir}
<span style='display:block; white-space:pre;background:#e0ffe0;'>+ xinstall -o ${name} -g ${name} -d ${destroot}${run_dir}
</span> }
post-activate {
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -101,10 +103,10 @@ post-activate {
</span> }
}
<span style='display:block; white-space:pre;background:#ffe0e0;'>-add_users valkey group=valkey realname=Valkey\ Database\ Server
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+add_users ${name} group=${name} realname=Valkey\ Database\ Server
</span> startupitem.create yes
<span style='display:block; white-space:pre;background:#ffe0e0;'>-startupitem.user valkey
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-startupitem.group valkey
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+startupitem.user ${name}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+startupitem.group ${name}
</span> startupitem.executable ${prefix}/bin/valkey-server ${prefix}/etc/valkey.conf
livecheck.regex ${name}-(\\d+.\\d+.\\d+)
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/databases/valkey/files/patch-valkey.conf.diff b/databases/valkey/files/patch-valkey.conf.diff
</span><span style='display:block; white-space:pre;color:#808080;'>index f051cf46cc2..74ce67255cc 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/databases/valkey/files/patch-valkey.conf.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/databases/valkey/files/patch-valkey.conf.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -6,7 +6,7 @@ diff -ur valkey-7.0.0-orig/valkey.conf valkey-7.0.0/valkey.conf
</span> # Note that on modern Linux systems "/run/valkey.pid" is more conforming
# and should be used instead.
-pidfile /var/run/valkey_6379.pid
<span style='display:block; white-space:pre;background:#ffe0e0;'>-+pidfile @PREFIX@/var/run/valkey_6379.pid
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++pidfile @PREFIX@/var/run/valkey/valkey_6379.pid
</span>
# Specify the server verbosity level.
# This can be one of:
</pre><pre style='margin:0'>
</pre>