<pre style='margin:0'>
Christopher Nielsen (mascguy) pushed a commit to branch master
in repository macports-ports.
</pre>
<p><a href="https://github.com/macports/macports-ports/commit/0fb2dfdcac48ca3d2a495540b9cbecf1620dc549">https://github.com/macports/macports-ports/commit/0fb2dfdcac48ca3d2a495540b9cbecf1620dc549</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 0fb2dfdcac4 netpbm: python dependency to 3.10
</span>0fb2dfdcac4 is described below
<span style='display:block; white-space:pre;color:#808000;'>commit 0fb2dfdcac48ca3d2a495540b9cbecf1620dc549
</span>Author: Lukas Oberhuber <lukaso@gmail.com>
AuthorDate: Mon Sep 26 00:26:59 2022 +0100
<span style='display:block; white-space:pre;color:#404040;'> netpbm: python dependency to 3.10
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> Updates the python dependency to python 3.10 from python 2.7 for
</span><span style='display:block; white-space:pre;color:#404040;'> os.major > 20.
</span>---
graphics/netpbm/Portfile | 18 ++++++++----------
1 file changed, 8 insertions(+), 10 deletions(-)
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/graphics/netpbm/Portfile b/graphics/netpbm/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 5016c0b63f3..511c467b5aa 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/graphics/netpbm/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/graphics/netpbm/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -301,22 +301,20 @@ platform darwin 8 {
</span> set data [read $fl]
close $fl
if {[regexp "build 4061" ${data}]} {
<span style='display:block; white-space:pre;background:#ffe0e0;'>- ui_msg "On Mac OS X ${macosx_version}, ${name} @${version} does not work with gcc version \"${data}\"."
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ui_msg "On Mac OS X ${macos_version}, ${name} @${version} does not work with gcc version \"${data}\"."
</span> return -code error "incompatible gcc version"
}
}
}
patchfiles-append patch-python.diff
<span style='display:block; white-space:pre;background:#ffe0e0;'>-if {${os.platform} eq "darwin" && (${os.major} < 10 || ${os.major} > 20)} {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # The system python on 10.5 and earlier is too old and 12.3 and
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # later no longer have a system python.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- depends_build-append \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- port:python27
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- configure.python ${prefix}/bin/python2.7
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-} else {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- configure.python /usr/bin/python
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+set python_branch 3.10
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+set python_version [string map {. {}} ${python_branch}]
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+configure.python ${prefix}/bin/python${python_branch}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+depends_build-append port:python${python_version}
</span> post-patch {
reinplace \
"s|__MACPORTS_PYTHON__|${configure.python}|g" \
</pre><pre style='margin:0'>
</pre>