<pre style='margin:0'>
Landon Fuller (landonf) pushed a commit to branch master
in repository macports-ports.
</pre>
<p><a href="https://github.com/macports/macports-ports/commit/c0c4d87d622f0a172acbdd897df8b83876d7a06c">https://github.com/macports/macports-ports/commit/c0c4d87d622f0a172acbdd897df8b83876d7a06c</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 c0c4d87d622 git-cinnabar: update to 0.5.8
</span>c0c4d87d622 is described below
<span style='display:block; white-space:pre;color:#808000;'>commit c0c4d87d622f0a172acbdd897df8b83876d7a06c
</span>Author: Landon Fuller <landonf@macports.org>
AuthorDate: Mon Jun 13 12:09:13 2022 -0600
<span style='display:block; white-space:pre;color:#404040;'> git-cinnabar: update to 0.5.8
</span>---
devel/git-cinnabar/Portfile | 21 ++++-----
devel/git-cinnabar/files/patch-python3 | 80 +++++++++++++++-------------------
2 files changed, 47 insertions(+), 54 deletions(-)
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/devel/git-cinnabar/Portfile b/devel/git-cinnabar/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 9c79177b229..69878b0356c 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/devel/git-cinnabar/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/devel/git-cinnabar/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -4,7 +4,7 @@ PortSystem 1.0
</span> PortGroup github 1.0
name git-cinnabar
<span style='display:block; white-space:pre;background:#ffe0e0;'>-github.setup glandium git-cinnabar 0.5.7
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+github.setup glandium git-cinnabar 0.5.8
</span> github.tarball_from archive
categories devel python
platforms darwin
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -13,7 +13,7 @@ license GPL-2
</span> description Git remote helper to interact with mercurial repositories.
long_description {*}${description}.
<span style='display:block; white-space:pre;background:#ffe0e0;'>-set git_version 2.31.1
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+set git_version 2.34.0
</span>
master_sites-append https://www.kernel.org/pub/software/scm/git/:git-core \
https://cdn.kernel.org/pub/software/scm/git/:git-core
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -21,13 +21,13 @@ master_sites-append https://www.kernel.org/pub/software/scm/git/:git-core \
</span> distfiles-append git-${git_version}${extract.suffix}:git-core
checksums ${name}-${version}${extract.suffix} \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- rmd160 92cb87f4509d14e094fccf0db399a3fcf4cc3cec \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- sha256 1f30b79b89b421ba33e47f00a8301da5b7533e10cc6314c4febd23ad6ed4b17b \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- size 176569 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ rmd160 3cbc83aada3cc8afface4609a778d73ef7b9bc7d \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ sha256 7971c2ae17d2b919f915efab35e3aba583b951d53ca2bc6ebf69bbd0c22f1067 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ size 181517 \
</span> git-${git_version}${extract.suffix} \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- rmd160 869ba3aa521d59e5b2d74f1c0ad5d1e05d99635c \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- sha256 46d37c229e9d786510e0c53b60065704ce92d5aedc16f2c5111e3ed35093bfa7 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- size 10128216
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ rmd160 5af786d7deb8eea4b8584b93de8230aeaaff35f8 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ sha256 0ce6222bfd31938b29360150286b51c77c643fa97740b1d35b6d1ceef8b0ecd7 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ size 10426038
</span>
conflicts git-remote-hg
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -36,14 +36,14 @@ post-extract {
</span> file rename -- ${workpath}/git-${git_version} ${worksrcpath}/git-core
}
<span style='display:block; white-space:pre;background:#ffe0e0;'>-depends_lib port:python39 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+depends_lib port:python310 \
</span> port:mercurial
patchfiles patch-python3 \
patch-Makefile.in
post-patch {
<span style='display:block; white-space:pre;background:#ffe0e0;'>- set python_bin ${prefix}/bin/python3.9
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ set python_bin ${prefix}/bin/python3.10
</span> reinplace "1 s|/usr/bin/env python.*|${python_bin}|g" \
${worksrcpath}/git-cinnabar \
${worksrcpath}/git-remote-hg
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -64,6 +64,7 @@ destroot {
</span> xinstall -m 0755 \
${worksrcpath}/git-remote-hg \
${worksrcpath}/git-cinnabar-helper \
<span style='display:block; white-space:pre;background:#e0ffe0;'>+ ${worksrcpath}/git-cinnabar \
</span> ${destroot}${install_dir}
file copy -- ${worksrcpath}/cinnabar ${destroot}${pythonlib_dir}/cinnabar
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/devel/git-cinnabar/files/patch-python3 b/devel/git-cinnabar/files/patch-python3
</span><span style='display:block; white-space:pre;color:#808080;'>index 51fa94cb145..b6ab6887a9d 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/devel/git-cinnabar/files/patch-python3
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/devel/git-cinnabar/files/patch-python3
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,58 +1,50 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- git-remote-hg.orig 2021-06-17 17:39:44.000000000 -0600
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ git-remote-hg 2021-06-17 17:44:04.000000000 -0600
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -1,25 +1,4 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- git-cinnabar.orig 2022-06-13 11:59:59.000000000 -0600
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ git-cinnabar 2022-06-13 12:00:23.000000000 -0600
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -1,21 +1,4 @@
</span> -#!/bin/sh
-''':'
<span style='display:block; white-space:pre;background:#ffe0e0;'>--experiments=",${GIT_CINNABAR_EXPERIMENTS-$(git config cinnabar.experiments)},"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--case "$experiments" in
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--*,python3,*)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- PYTHON=python3
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- ;;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--*,python=*,*)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- PYTHON=${experiments#*,python=}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- PYTHON=${PYTHON%%,*}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- ;;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--*)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- if command -v python2.7 > /dev/null; then
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- PYTHON=python2.7
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- else
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- PYTHON=python2
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- fi
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- ;;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--esac
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--exec $PYTHON $0 "$@"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-py="$GIT_CINNABAR_PYTHON"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-if test -z "$py"; then
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- for py in python3 python2.7 python2; do
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- "$py" -c "from mercurial import hg" >/dev/null 2>&1 && break
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- py=
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- done
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-fi
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-if test -z "$py"; then
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- for py in python3 python2.7 python2; do
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- command -v "$py" > /dev/null && break
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- py=python3
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- done
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-fi
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-exec "$py" "$0" "$@"
</span> -exit 1
-'''
+#!/usr/bin/env python
<span style='display:block; white-space:pre;background:#ffe0e0;'>- from __future__ import division
</span> import os
<span style='display:block; white-space:pre;background:#ffe0e0;'>---- git-cinnabar.orig 2021-06-17 17:39:39.000000000 -0600
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ git-cinnabar 2021-06-17 17:44:09.000000000 -0600
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -1,25 +1,4 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ import sys
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- git-remote-hg.orig 2022-06-13 11:59:59.000000000 -0600
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ git-remote-hg 2022-06-13 12:00:30.000000000 -0600
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -1,21 +1,4 @@
</span> -#!/bin/sh
-''':'
<span style='display:block; white-space:pre;background:#ffe0e0;'>--experiments=",${GIT_CINNABAR_EXPERIMENTS-$(git config cinnabar.experiments)},"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--case "$experiments" in
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--*,python3,*)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- PYTHON=python3
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- ;;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--*,python=*,*)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- PYTHON=${experiments#*,python=}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- PYTHON=${PYTHON%%,*}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- ;;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--*)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- if command -v python2.7 > /dev/null; then
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- PYTHON=python2.7
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- else
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- PYTHON=python2
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- fi
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- ;;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--esac
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--exec $PYTHON $0 "$@"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-py="$GIT_CINNABAR_PYTHON"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-if test -z "$py"; then
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- for py in python3 python2.7 python2; do
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- "$py" -c "from mercurial import hg" >/dev/null 2>&1 && break
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- py=
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- done
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-fi
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-if test -z "$py"; then
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- for py in python3 python2.7 python2; do
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- command -v "$py" > /dev/null && break
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- py=python3
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- done
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-fi
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-exec "$py" "$0" "$@"
</span> -exit 1
-'''
+#!/usr/bin/env python
<span style='display:block; white-space:pre;background:#e0ffe0;'>+ from __future__ import division
</span> import os
<span style='display:block; white-space:pre;background:#ffe0e0;'>- import sys
</span></pre><pre style='margin:0'>
</pre>