<pre style='margin:0'>
Renee Otten (reneeotten) pushed a commit to branch master
in repository macports-ports.
</pre>
<p><a href="https://github.com/macports/macports-ports/commit/2db6583ddee7d9ed55498602e5ebb58bec9cd80e">https://github.com/macports/macports-ports/commit/2db6583ddee7d9ed55498602e5ebb58bec9cd80e</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 2db6583ddee git: make perl optional
</span>2db6583ddee is described below
<span style='display:block; white-space:pre;color:#808000;'>commit 2db6583ddee7d9ed55498602e5ebb58bec9cd80e
</span>Author: Robert Vežnaver <rveznaver@users.noreply.github.com>
AuthorDate: Fri May 28 12:40:37 2021 +0200
<span style='display:block; white-space:pre;color:#404040;'> git: make perl optional
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> * make perl an optional dependency except when +svn is selected
</span><span style='display:block; white-space:pre;color:#404040;'> * align perl branches with commit 96a5edbb2a667d1908886915cbd016bfdbc0a42d
</span><span style='display:block; white-space:pre;color:#404040;'> * default to macOS perl for diff-highlight if no perl is installed
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> Closes: https://trac.macports.org/ticket/45502
</span>---
devel/git/Portfile | 43 +++++++++++++---------
.../patch-contrib-diff-highlight-Makefile.diff | 10 -----
2 files changed, 25 insertions(+), 28 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 67b8a6e4a9c..ee24049396e 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.33.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;'>@@ -32,9 +32,9 @@ checksums git-${version}${extract.suffix} \
</span> sha256 d6d38abe3fe45b74359e65d53e51db3aa92d7f551240b7f7a779746f24c4bc31 \
size 492900
<span style='display:block; white-space:pre;background:#ffe0e0;'>-perl5.require_variant yes
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+perl5.require_variant false
</span> perl5.conflict_variants yes
<span style='display:block; white-space:pre;background:#ffe0e0;'>-perl5.branches 5.28 5.30
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+perl5.branches 5.28 5.30 5.32
</span> perl5.default_branch 5.28
perl5.create_variants ${perl5.branches}
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -44,12 +44,7 @@ depends_lib-append port:curl \
</span> port:expat \
port:libiconv
<span style='display:block; white-space:pre;background:#ffe0e0;'>-depends_run-append port:p${perl5.major}-authen-sasl \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- port:p${perl5.major}-error \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- port:p${perl5.major}-net-smtp-ssl \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- port:p${perl5.major}-term-readkey \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- port:p${perl5.major}-cgi \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- port:rsync
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+depends_run-append port:rsync
</span>
patchfiles patch-Makefile.diff \
patch-git-gui-Makefile.diff \
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -75,13 +70,32 @@ build.args CFLAGS="${CFLAGS}" \
</span> CURLDIR=${prefix} \
OPENSSLDIR=${prefix} \
ICONVDIR=${prefix} \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- PERL_PATH="${prefix}/bin/perl${perl5.major}" \
</span> NO_FINK=1 \
NO_DARWIN_PORTS=1 \
NO_R_TO_GCC_LINKER=1 \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- NO_PERL_CPAN_FALLBACK=1 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ NO_PERL=1 \
</span> V=1
<span style='display:block; white-space:pre;background:#e0ffe0;'>+if {[variant_isset ${perl5.variant}]} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ depends_run-append \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:p${perl5.major}-authen-sasl \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:p${perl5.major}-error \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:p${perl5.major}-net-smtp-ssl \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:p${perl5.major}-term-readkey \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:p${perl5.major}-cgi
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ build.args-delete \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ NO_PERL=1
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ build.args-append \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ PERL_PATH="${perl5.bin}" \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ NO_PERL_CPAN_FALLBACK=1
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+} elseif {[variant_isset svn]} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ pre-configure {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ return -code error "+svn does not work without +perl5_xx"
</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;'>+
</span> test.run yes
test.cmd make
test.target test
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -240,13 +254,6 @@ For more information, run
</span>
variant diff_highlight description {Install git diff-highlight utility from contrib} {
<span style='display:block; white-space:pre;background:#ffe0e0;'>- patchfiles-append patch-contrib-diff-highlight-Makefile.diff
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- post-patch {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- reinplace "s|%PREFIX%|${prefix}|" \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ${worksrcpath}/contrib/diff-highlight/Makefile
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span> post-build {
system -W "${worksrcpath}/contrib/diff-highlight" "make [join ${build.args}]"
}
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/devel/git/files/patch-contrib-diff-highlight-Makefile.diff b/devel/git/files/patch-contrib-diff-highlight-Makefile.diff
</span>deleted file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 44e6199aa10..00000000000
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/devel/git/files/patch-contrib-diff-highlight-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,10 +0,0 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- a/contrib/diff-highlight/Makefile.orig 2018-11-21 08:58:11.000000000 -0600
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ b/contrib/diff-highlight/Makefile 2018-12-03 14:13:53.000000000 -0600
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -1,6 +1,6 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- all: diff-highlight
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--PERL_PATH = /usr/bin/perl
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+PERL_PATH = %PREFIX%/perl
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- -include ../../config.mak
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- PERL_PATH_SQ = $(subst ','\'',$(PERL_PATH))
</span></pre><pre style='margin:0'>
</pre>