<pre style='margin:0'>
Mojca Miklavec (mojca) pushed a commit to branch master
in repository macports-ports.
</pre>
<p><a href="https://github.com/macports/macports-ports/commit/c14efe5d596d9b3af07ae5268a6275899a1f9eb2">https://github.com/macports/macports-ports/commit/c14efe5d596d9b3af07ae5268a6275899a1f9eb2</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 c14efe5d596 git: remove python as required dependency
</span>c14efe5d596 is described below
<span style='display:block; white-space:pre;color:#808000;'>commit c14efe5d596d9b3af07ae5268a6275899a1f9eb2
</span>Author: Herby Gillot <herby.gillot@gmail.com>
AuthorDate: Tue Mar 16 13:09:04 2021 -0400
<span style='display:block; white-space:pre;color:#404040;'> git: remove python as required dependency
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> Make it an optional variant instead. Python is only needed for a particular
</span><span style='display:block; white-space:pre;color:#404040;'> script for interacting with other version control systems (specifically
</span><span style='display:block; white-space:pre;color:#404040;'> Perforce). It is not needed to build git.
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> Fixes: https://trac.macports.org/ticket/58862
</span>---
devel/git/Portfile | 15 +++++++++++----
1 file changed, 11 insertions(+), 4 deletions(-)
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/devel/git/Portfile b/devel/git/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index b1d84bdc721..6d7da56fc66 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/devel/git/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/devel/git/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -5,7 +5,7 @@ PortGroup perl5 1.0
</span>
name git
version 2.31.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>
description A fast version control system
long_description Git is a fast, scalable, distributed open source version \
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -42,8 +42,7 @@ depends_lib-append port:curl \
</span> port:zlib \
path:lib/libssl.dylib:openssl \
port:expat \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- port:libiconv \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- port:python38
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:libiconv
</span>
depends_run-append port:p${perl5.major}-authen-sasl \
port:p${perl5.major}-error \
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -76,7 +75,6 @@ build.args CFLAGS="${CFLAGS}" \
</span> OPENSSLDIR=${prefix} \
ICONVDIR=${prefix} \
PERL_PATH="${prefix}/bin/perl${perl5.major}" \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- PYTHON_PATH="${prefix}/bin/python3.8" \
</span> NO_FINK=1 \
NO_DARWIN_PORTS=1 \
NO_R_TO_GCC_LINKER=1 \
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -238,6 +236,15 @@ variant diff_highlight description {Install git diff-highlight utility from cont
</span> }
}
<span style='display:block; white-space:pre;background:#e0ffe0;'>+# Python is only needed to enable certain tools for interacting with other
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# version control systems, such as git-p4 (for interfacing with Perforce).
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# This variant enables git to use MacPorts' Python as it builds these
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# additional tools.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+variant python description {Build with Python support} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ depends_lib-append port:python39
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ build.args-append PYTHON_PATH="${prefix}/bin/python3.9"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span> platform darwin 8 {
build.args-append NO_APPLE_COMMON_CRYPTO=1
build.args-append CC_LD_DYNPATH=-R
</pre><pre style='margin:0'>
</pre>