<pre style='margin:0'>
Herby Gillot (herbygillot) pushed a commit to branch master
in repository macports-ports.
</pre>
<p><a href="https://github.com/macports/macports-ports/commit/4bfc47deb6919ff5a90fdf8c6b90317586324322">https://github.com/macports/macports-ports/commit/4bfc47deb6919ff5a90fdf8c6b90317586324322</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 4bfc47deb69 git: do not bundle tk for gui
</span>4bfc47deb69 is described below
<span style='display:block; white-space:pre;color:#808000;'>commit 4bfc47deb6919ff5a90fdf8c6b90317586324322
</span>Author: Mohamed Akram <mohd.akram@outlook.com>
AuthorDate: Mon Feb 14 02:50:01 2022 +0400
<span style='display:block; white-space:pre;color:#404040;'> git: do not bundle tk for gui
</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/62036
</span><span style='display:block; white-space:pre;color:#404040;'> Fixes: https://trac.macports.org/ticket/64249
</span>---
devel/git/Portfile | 7 +++++--
devel/git/files/patch-git-gui-Makefile.diff | 11 -----------
2 files changed, 5 insertions(+), 13 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 c8b7ce989b8..efbe7749f79 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.35.2
<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;'>@@ -51,7 +51,6 @@ depends_lib-append port:curl \
</span> depends_run-append path:bin/rsync:rsync
patchfiles patch-Makefile.diff \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- patch-git-gui-Makefile.diff \
</span> patch-git-subtree.1.diff \
patch-sha1dc-older-apple-gcc-versions.diff \
patch-gitk-git-gitk.diff
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -116,6 +115,7 @@ pre-destroot {
</span> }
set docdestroot ${destroot}${prefix}/share/doc/git-doc
<span style='display:block; white-space:pre;background:#e0ffe0;'>+set guidir ${prefix}/share/git-gui/lib/Git\ Gui.app/Contents
</span> set system_gitconfig ${prefix}/etc/gitconfig
post-destroot {
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -152,6 +152,9 @@ post-destroot {
</span> xinstall -m 755 ${worksrcpath}/contrib/subtree/git-subtree.sh \
${destroot}${prefix}/libexec/git-core/git-subtree
<span style='display:block; white-space:pre;background:#e0ffe0;'>+ system "echo exec wish \"'${guidir}/Resources/Scripts/AppMain.tcl'\" '\"$@\"' > \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ '${destroot}${guidir}/MacOS/Wish'"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span> file delete -force ${share_path}/contrib
copy ${worksrcpath}/contrib ${share_path}
}
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/devel/git/files/patch-git-gui-Makefile.diff b/devel/git/files/patch-git-gui-Makefile.diff
</span>deleted file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index b22ef465e32..00000000000
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/devel/git/files/patch-git-gui-Makefile.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,11 +0,0 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- ./git-gui/Makefile.orig 2020-10-23 00:31:53.000000000 +0200
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ ./git-gui/Makefile 2020-10-29 13:49:22.000000000 +0100
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -104,7 +104,7 @@ else
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- endif
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ifeq ($(uname_S),Darwin)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- TKFRAMEWORK = /Library/Frameworks/Tk.framework/Resources/Wish.app
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ TKFRAMEWORK = /System/Library/Frameworks/Tk.framework/Resources/Wish.app
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ifeq ($(shell echo "$(uname_R)" | awk -F. '{if ($$1 >= 9) print "y"}')_$(shell test -d $(TKFRAMEWORK) || echo n),y_n)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- TKFRAMEWORK = /System/Library/Frameworks/Tk.framework/Resources/Wish.app
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ifeq ($(shell test -d $(TKFRAMEWORK) || echo n),n)
</span></pre><pre style='margin:0'>
</pre>