<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/38a334d86e6ff563425b7b32ed89bf3da89202f5">https://github.com/macports/macports-ports/commit/38a334d86e6ff563425b7b32ed89bf3da89202f5</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 38a334d86e6 git-devel: new subport for development version of git (version 2.40.0-rc2)
</span>38a334d86e6 is described below
<span style='display:block; white-space:pre;color:#808000;'>commit 38a334d86e6ff563425b7b32ed89bf3da89202f5
</span>Author: Herby Gillot <herby.gillot@gmail.com>
AuthorDate: Tue Mar 7 22:16:48 2023 -0500
<span style='display:block; white-space:pre;color:#404040;'> git-devel: new subport for development version of git (version 2.40.0-rc2)
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> This subport allows for testing development versions of git.
</span>---
devel/git/Portfile | 155 ++++++++++++++++++++++++++++++++++++++---------------
1 file changed, 112 insertions(+), 43 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 66ba5db3cfb..5ba7e91c7e8 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;'>@@ -6,28 +6,59 @@ PortGroup perl5 1.0
</span>
legacysupport.newest_darwin_requires_legacy 10
<span style='display:block; white-space:pre;background:#e0ffe0;'>+# RELEASE VERSION
</span> name git
version 2.39.2
revision 0
<span style='display:block; white-space:pre;background:#e0ffe0;'>+homepage https://git-scm.com/
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span> description A fast version control system
<span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span> long_description Git is a fast, scalable, distributed open source version \
control system focusing on speed and efficiency.
<span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# DEVELOPMENT VERSION
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+subport ${name}-devel {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ PortGroup github 1.0
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ github.setup git git 2.40.0-rc2 v
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ github.tarball_from archive
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ description \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ {*}${description} (Development Version)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ long_description \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ {*}${long_description} (Development Version)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ conflicts git
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span> maintainers {ciserlohn @ci42} \
{gmail.com:herby.gillot @herbygillot} \
openmaintainer
<span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+default_variants +doc +pcre +credential_osxkeychain +diff_highlight
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span> categories devel
license GPL-2 LGPL-2.1+
installs_libs no
<span style='display:block; white-space:pre;background:#ffe0e0;'>-homepage https://git-scm.com/
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-master_sites https://www.kernel.org/pub/software/scm/git/ \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- https://cdn.kernel.org/pub/software/scm/git/
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-distname git-${version}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-use_xz yes
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-distfiles git-${version}${extract.suffix} \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- git-manpages-${version}${extract.suffix}
</span>
<span style='display:block; white-space:pre;background:#ffe0e0;'>-checksums git-${version}${extract.suffix} \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+master_sites-append https://www.kernel.org/pub/software/scm/git/:git \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ https://cdn.kernel.org/pub/software/scm/git/:git
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+conflicts ${name}-devel
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+if {${name} eq ${subport}} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # RELEASE VERSION
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ distname git-${version}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ use_xz yes
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ distfiles-append \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ git-${version}${extract.suffix}:git \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ git-manpages-${version}${extract.suffix}:git
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ checksums git-${version}${extract.suffix} \
</span> rmd160 fae317477d3deaff885f932b0eab9889bfd1eeab \
sha256 475f75f1373b2cd4e438706185175966d5c11f68c4db1e48c26257c43ddcf2d6 \
size 7163224 \
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -36,6 +67,24 @@ checksums git-${version}${extract.suffix} \
</span> sha256 0b3927a2f09db3d3ec91dd548409a7129d3af9dabf11847401872c8c0c529b25 \
size 557080
<span style='display:block; white-space:pre;background:#e0ffe0;'>+ extract.only git-${version}${extract.suffix} \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ git-manpages-${version}${extract.suffix}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+} else {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # DEVELOPMENT VERSION
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ checksums ${distname}${extract.suffix} \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ rmd160 76af90b0d9a51bad6eb96a14d65c5d45ad4bea45 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ sha256 5d64e985b6bf065b5d43bd62e39e27603b159fc7bdeebc25e8ac98754e14506a \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ size 10608830
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ depends_build-append \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:asciidoc \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:xmlto
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ build.target all man html
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span> perl5.require_variant false
perl5.conflict_variants yes
perl5.branches 5.28 5.30 5.32 5.34
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -66,9 +115,6 @@ if {${os.platform} eq "darwin" && ${os.major} < 14} {
</span> patchfiles-append patch-ignore-fsmonitor-daemon-backend.diff
}
<span style='display:block; white-space:pre;background:#ffe0e0;'>-extract.only git-${version}${extract.suffix} \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- git-manpages-${version}${extract.suffix}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span> use_configure no
compiler.c_standard 1999
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -121,7 +167,8 @@ pre-test {
</span> destroot.target install
pre-destroot {
destroot.args {*}${build.args}
<span style='display:block; white-space:pre;background:#ffe0e0;'>- xinstall -m 644 ${worksrcpath}/contrib/subtree/git-subtree.1 ${workpath}/man1
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ xinstall -m 0644 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ${worksrcpath}/contrib/subtree/git-subtree.1 ${workpath}/man1
</span> }
set docdestroot ${destroot}${prefix}/share/doc/git-doc
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -129,12 +176,23 @@ 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:#e0ffe0;'>+
</span> foreach f {1 5 7} {
xinstall -d ${destroot}${prefix}/share/man/man${f}
<span style='display:block; white-space:pre;background:#ffe0e0;'>- foreach m [glob -directory ${workpath} man${f}/*.${f}] {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- xinstall ${m} ${destroot}${prefix}/share/man/man${f}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if {${name} eq ${subport}} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # RELEASE man pages
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ foreach m [glob -directory ${workpath} man${f}/*.${f}] {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ xinstall ${m} ${destroot}${prefix}/share/man/man${f}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ } else {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # DEVEL man pages
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ foreach m [glob -directory ${worksrcpath} Documentation/*.${f}] {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ xinstall ${m} ${destroot}${prefix}/share/man/man${f}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span> }
}
<span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span> if {![variant_isset svn]} {
system "rm ${destroot}${prefix}/libexec/git-core/git-svn*"
}
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -150,16 +208,16 @@ post-destroot {
</span>
set completions_path ${destroot}${prefix}/share/bash-completion/completions
xinstall -d ${completions_path}
<span style='display:block; white-space:pre;background:#ffe0e0;'>- xinstall -m 644 ${worksrcpath}/contrib/completion/git-completion.bash \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ xinstall -m 0644 ${worksrcpath}/contrib/completion/git-completion.bash \
</span> ${completions_path}/git
set share_path ${destroot}${prefix}/share/${name}
xinstall -d ${share_path}
<span style='display:block; white-space:pre;background:#ffe0e0;'>- xinstall -m 644 ${worksrcpath}/contrib/completion/git-prompt.sh \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ xinstall -m 0644 ${worksrcpath}/contrib/completion/git-prompt.sh \
</span> ${share_path}/git-prompt.sh
xinstall -d ${destroot}${prefix}/libexec/git-core
<span style='display:block; white-space:pre;background:#ffe0e0;'>- xinstall -m 755 ${worksrcpath}/contrib/subtree/git-subtree.sh \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ xinstall -m 0755 ${worksrcpath}/contrib/subtree/git-subtree.sh \
</span> ${destroot}${prefix}/libexec/git-core/git-subtree
# Tiger doesn't build the GUI, so check for its existence before mucking with it
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -181,39 +239,52 @@ variant pcre description {Use pcre} {
</span> }
variant doc description {Install HTML and plaintext documentation} {
<span style='display:block; white-space:pre;background:#ffe0e0;'>- distfiles-append git-htmldocs-${version}${extract.suffix}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- checksums-append git-htmldocs-${version}${extract.suffix} \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if {${name} eq ${subport}} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # RELEASE
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ distfiles-append git-htmldocs-${version}${extract.suffix}:git
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ checksums-append git-htmldocs-${version}${extract.suffix} \
</span> rmd160 98cea7039d4d87e8c1ba422303638ca825e6b4aa \
sha256 f729edf1821c688efc6767b1c0bb728aec673bc15b80a6b8be6a18c2cbb9d67e \
size 1505352
<span style='display:block; white-space:pre;background:#ffe0e0;'>- patchfiles-append patch-git-subtree.html.diff
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- post-extract {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- file mkdir ${workpath}/htmldocs
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- system -W ${workpath}/htmldocs "${extract.cmd} ${extract.pre_args} \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- '${distpath}/git-htmldocs-${version}${extract.suffix}' \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ${extract.post_args}"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ patchfiles-append patch-git-subtree.html.diff
</span>
<span style='display:block; white-space:pre;background:#ffe0e0;'>- pre-destroot {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- xinstall -m 644 ${worksrcpath}/contrib/subtree/git-subtree.html ${workpath}/htmldocs
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ post-extract {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ file mkdir ${workpath}/htmldocs
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ system -W ${workpath}/htmldocs "${extract.cmd} ${extract.pre_args} \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ '${distpath}/git-htmldocs-${version}${extract.suffix}' \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ${extract.post_args}"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span>
<span style='display:block; white-space:pre;background:#ffe0e0;'>- post-destroot {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- foreach f [glob ${workpath}/htmldocs/*] {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- file delete -force "${docdestroot}/[file tail ${f}]"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- file attribute ${f} -permissions ugo+r
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- copy ${f} ${docdestroot}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ pre-destroot {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ xinstall -m 0644 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ${worksrcpath}/contrib/subtree/git-subtree.html \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ${workpath}/htmldocs
</span> }
<span style='display:block; white-space:pre;background:#ffe0e0;'>- fs-traverse f [list ${docdestroot}/howto ${docdestroot}/technical ${docdestroot}/RelNotes] {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if {[file isdirectory ${f}]} {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- file attribute ${f} -permissions ugo+rx
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- } else {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ post-destroot {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ foreach f [glob ${workpath}/htmldocs/*] {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ file delete -force "${docdestroot}/[file tail ${f}]"
</span> file attribute ${f} -permissions ugo+r
<span style='display:block; white-space:pre;background:#e0ffe0;'>+ copy ${f} ${docdestroot}
</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;'>+ fs-traverse f [list ${docdestroot}/howto ${docdestroot}/technical ${docdestroot}/RelNotes] {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if {[file isdirectory ${f}]} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ file attribute ${f} -permissions ugo+rx
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ } else {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ file attribute ${f} -permissions ugo+r
</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;'>+ } else {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # DEVEL
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ post-destroot {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ system -W ${worksrcpath} \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ "${destroot.cmd} install-html prefix=${destroot}/${prefix}"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span> }
}
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -227,14 +298,14 @@ variant gitweb description {Install gitweb.cgi} {
</span> xinstall -W ${worksrcpath}/gitweb \
gitweb.cgi \
${destroot}${prefix}/share/${name}/gitweb
<span style='display:block; white-space:pre;background:#ffe0e0;'>- xinstall -m 444 -W ${worksrcpath}/gitweb/static \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ xinstall -m 0444 -W ${worksrcpath}/gitweb/static \
</span> gitweb.css \
gitweb.js \
git-favicon.png \
git-logo.png \
${destroot}${prefix}/share/${name}/gitweb
xinstall -d ${docdestroot}/gitweb
<span style='display:block; white-space:pre;background:#ffe0e0;'>- xinstall -m 444 -W ${worksrcpath}/gitweb README INSTALL \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ xinstall -m 0444 -W ${worksrcpath}/gitweb README INSTALL \
</span> ${docdestroot}/gitweb
}
}
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -323,7 +394,5 @@ platform darwin 8 {
</span> build.args-append CC_LD_DYNPATH=-R
}
<span style='display:block; white-space:pre;background:#ffe0e0;'>-default_variants +doc +pcre +credential_osxkeychain +diff_highlight
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span> livecheck.type regexm
livecheck.regex {<span class="version">.*?(\d+\.\d+\.\d+).*?</span>}
</pre><pre style='margin:0'>
</pre>