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

</pre>
<p><a href="https://github.com/macports/macports-ports/commit/61fe5542908da7e0ba47357ca12f92074c3175dd">https://github.com/macports/macports-ports/commit/61fe5542908da7e0ba47357ca12f92074c3175dd</a></p>
<pre style="white-space: pre; background: #F8F8F8"><span style='display:block; white-space:pre;color:#808000;'>commit 61fe5542908da7e0ba47357ca12f92074c3175dd
</span>Author: Vadim-Valdis Yudaev <judaew@outlook.de>
AuthorDate: Fri Oct 15 14:30:31 2021 +0300

<span style='display:block; white-space:pre;color:#404040;'>    podman: Overwrite dir list in defaultHelperBinariesDir
</span><span style='display:block; white-space:pre;color:#404040;'>    
</span><span style='display:block; white-space:pre;color:#404040;'>    See: https://github.com/containers/podman/issues/11960
</span><span style='display:block; white-space:pre;color:#404040;'>    Closed: https://trac.macports.org/ticket/63628
</span>---
 sysutils/podman/Portfile                                    | 13 ++++++++++---
 .../files/patch-defaultHelperBinariesDir-for-MacPorts.diff  | 13 +++++++++++++
 2 files changed, 23 insertions(+), 3 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 ec733b94f79..72dd2464fec 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;'>@@ -4,7 +4,7 @@ PortSystem          1.0
</span> PortGroup           golang 1.0
 
 go.setup            github.com/containers/podman 3.4.0 v
<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          sysutils
 license             Apache-2
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -24,6 +24,10 @@ checksums           ${distname}${extract.suffix} \
</span>                         sha256  5ebf7c7dfb10c84eb15263a8776a53b58357c60318c373e33e65bcf99c087679 \
                         size    10951433
 
<span style='display:block; white-space:pre;background:#e0ffe0;'>+post-extract {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+    reinplace "s|-mod=vendor||g" ${worksrcpath}/Makefile
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span> # Podman machine is currently only supported on Linux and Intel Macs, see:
 # * https://podman.io/blogs/2021/09/06/podman-on-macs.html
 # * https://github.com/containers/podman/issues/10577
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -31,8 +35,11 @@ if {${configure.build_arch} ne "arm64"} {
</span>     depends_run     port:gvisor-tap-vsock port:qemu
 }
 
<span style='display:block; white-space:pre;background:#ffe0e0;'>-post-extract {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-    reinplace "s|-mod=vendor||g" ${worksrcpath}/Makefile
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+patchfiles          patch-defaultHelperBinariesDir-for-MacPorts.diff
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+post-patch {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+    reinplace "s|@@PREFIX@@|${prefix}|g" \
</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>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 00000000000..4793d02a5b5
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--- /dev/null
</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;'>@@ -0,0 +1,13 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- vendor/github.com/containers/common/pkg/config/config_darwin.go.orig   2021-10-15 14:07:21.000000000 +0300
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ vendor/github.com/containers/common/pkg/config/config_darwin.go        2021-10-15 14:10:41.000000000 +0300
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -17,6 +17,9 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ var defaultHelperBinariesDir = []string{
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++  // MacPorts install paths
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++  "@@PREFIX@@/libexec",
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++  "@@PREFIX@@/bin",
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+   // Homebrew install paths
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+   "/usr/local/opt/podman/libexec",
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+   "/opt/homebrew/bin",
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span></pre><pre style='margin:0'>

</pre>