<pre style='margin:0'>
Vadym-Valdis Yudaiev (judaew) pushed a commit to branch master
in repository macports-ports.

</pre>
<p><a href="https://github.com/macports/macports-ports/commit/31e7cfadf91d6231377051de17a20b5885e3030d">https://github.com/macports/macports-ports/commit/31e7cfadf91d6231377051de17a20b5885e3030d</a></p>
<pre style="white-space: pre; background: #F8F8F8"><span style='display:block; white-space:pre;color:#808000;'>commit 31e7cfadf91d6231377051de17a20b5885e3030d
</span>Author: Vadym-Valdis Yudaiev <judaew@outlook.de>
AuthorDate: Wed Mar 20 00:23:52 2024 +0200

<span style='display:block; white-space:pre;color:#404040;'>    podman: update to 5.0.0
</span>---
 sysutils/podman/Portfile                                 | 16 +++++++---------
 .../patch-defaultHelperBinariesDir-for-MacPorts.diff     | 10 +++++-----
 .../podman/files/patch-getEdk2CodeFd-for-MacPorts.diff   | 10 ----------
 3 files changed, 12 insertions(+), 24 deletions(-)

<span style='display:block; white-space:pre;color:#808080;'>diff --git a/sysutils/podman/Portfile b/sysutils/podman/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 4695e61375a..9c3cc506240 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/sysutils/podman/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/sysutils/podman/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -6,7 +6,7 @@ PortGroup           golang 1.0
</span> # After the upgrade, it is highly recommended to test the `podman machine`.
 # This port has problems with this command from time to time.
 # See https://gist.github.com/judaew/85c6e8a62bf0e7f5be5188e020492e21
<span style='display:block; white-space:pre;background:#ffe0e0;'>-go.setup            github.com/containers/podman 4.9.3 v
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+go.setup            github.com/containers/podman 5.0.0 v
</span> github.tarball_from archive
 revision            0
 
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -22,9 +22,9 @@ long_description    \
</span>     install the remote client and then setup ssh connection information.
 
 checksums           ${distname}${extract.suffix} \
<span style='display:block; white-space:pre;background:#ffe0e0;'>-                        rmd160  dd87729822e5486c174815445e814546b3a7e98b \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-                        sha256  37afc5bba2738c68dc24400893b99226c658cc9a2b22309f4d7abe7225d8c437 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-                        size    21727849
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+                        rmd160  447472e76367731b1277478482eeaa010dc4d48f \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+                        sha256  818db636955a1eeec4dcb586d18783ab86a8afd07e3f4adaf25920b3697316c9 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+                        size    21861935
</span> 
 set py_ver          3.12
 set py_ver_nodot    [string map {. {}} ${py_ver}]
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -33,15 +33,13 @@ depends_build-append \
</span>                     port:go-md2man \
                     port:python${py_ver_nodot} \
                     port:pre-commit
<span style='display:block; white-space:pre;background:#ffe0e0;'>-depends_run         port:gvisor-tap-vsock port:qemu
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+depends_run         port:gvisor-tap-vsock port:vfkit port:qemu
</span> 
<span style='display:block; white-space:pre;background:#ffe0e0;'>-patchfiles          patch-defaultHelperBinariesDir-for-MacPorts.diff \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-                    patch-getEdk2CodeFd-for-MacPorts.diff
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+patchfiles          patch-defaultHelperBinariesDir-for-MacPorts.diff
</span> 
 post-patch {
     reinplace "s|@@PREFIX@@|${prefix}|g" \
<span style='display:block; white-space:pre;background:#ffe0e0;'>-        ${worksrcpath}/vendor/github.com/containers/common/pkg/config/config_darwin.go \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-        ${worksrcpath}/pkg/machine/qemu/options_darwin_arm64.go
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+        ${worksrcpath}/vendor/github.com/containers/common/pkg/config/config_darwin.go
</span> }
 
 build.cmd           make
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/sysutils/podman/files/patch-defaultHelperBinariesDir-for-MacPorts.diff b/sysutils/podman/files/patch-defaultHelperBinariesDir-for-MacPorts.diff
</span><span style='display:block; white-space:pre;color:#808080;'>index e9fea1bab0e..76f78459225 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/sysutils/podman/files/patch-defaultHelperBinariesDir-for-MacPorts.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/sysutils/podman/files/patch-defaultHelperBinariesDir-for-MacPorts.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,12 +1,12 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- vendor/github.com/containers/common/pkg/config/config_darwin.go
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ vendor/github.com/containers/common/pkg/config/config_darwin.go
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -35,6 +35,9 @@ var defaultHelperBinariesDir = []string{
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- vendor/github.com/containers/common/pkg/config/config_darwin.go.orig   2024-03-19 23:36:25.000000000 +0200
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ vendor/github.com/containers/common/pkg/config/config_darwin.go        2024-03-19 23:56:09.275397878 +0200
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -15,6 +15,9 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ var defaultHelperBinariesDir = []string{
</span>   // Relative to the binary directory
        "$BINDIR/../libexec/podman",
<span style='display:block; white-space:pre;background:#ffe0e0;'>-        // Homebrew install paths
</span> + // MacPorts install paths
 +      "@@PREFIX@@/libexec",
 +      "@@PREFIX@@/bin",
<span style='display:block; white-space:pre;background:#e0ffe0;'>+        // Homebrew install paths
</span>   "/usr/local/opt/podman/libexec/podman",
        "/opt/homebrew/opt/podman/libexec/podman",
<span style='display:block; white-space:pre;background:#ffe0e0;'>-        "/opt/homebrew/bin",
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/sysutils/podman/files/patch-getEdk2CodeFd-for-MacPorts.diff b/sysutils/podman/files/patch-getEdk2CodeFd-for-MacPorts.diff
</span>deleted file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 84931d42ac0..00000000000
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/sysutils/podman/files/patch-getEdk2CodeFd-for-MacPorts.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,10 +0,0 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- pkg/machine/qemu/options_darwin_arm64.go
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ pkg/machine/qemu/options_darwin_arm64.go
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -64,6 +64,7 @@ func getEdk2CodeFdPathFromQemuBinaryPath() string {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- func getEdk2CodeFd(name string) string {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-   dirs := []string{
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-           getEdk2CodeFdPathFromQemuBinaryPath(),
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+        "@@PREFIX@@/share/qemu",
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-           "/opt/homebrew/opt/podman/libexec/share/qemu",
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-           "/usr/local/share/qemu",
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-           "/opt/homebrew/share/qemu",
</span></pre><pre style='margin:0'>

</pre>