<pre style='margin:0'>
Ryan Carsten Schmidt (ryandesign) pushed a commit to branch master
in repository macports-ports.

</pre>
<p><a href="https://github.com/macports/macports-ports/commit/ecd4e3d914ef83dca4028e3d58209955b2e00016">https://github.com/macports/macports-ports/commit/ecd4e3d914ef83dca4028e3d58209955b2e00016</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 ecd4e3d914e git-flow: Fix failure to fetch git submodules
</span>ecd4e3d914e is described below

<span style='display:block; white-space:pre;color:#808000;'>commit ecd4e3d914ef83dca4028e3d58209955b2e00016
</span>Author: Ryan Carsten Schmidt <ryandesign@macports.org>
AuthorDate: Mon Jan 22 03:14:03 2024 -0600

<span style='display:block; white-space:pre;color:#404040;'>    git-flow: Fix failure to fetch git submodules
</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/65473
</span>---
 devel/git-flow/Portfile               | 46 ++++++++++-------------------------
 devel/git-flow/files/gitmodules.patch |  9 +++++++
 2 files changed, 22 insertions(+), 33 deletions(-)

<span style='display:block; white-space:pre;color:#808080;'>diff --git a/devel/git-flow/Portfile b/devel/git-flow/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 1ce6638794c..d1ba76a1e1f 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/devel/git-flow/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/devel/git-flow/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -7,7 +7,6 @@ set realname            git-flow
</span> set description_common  {Git extensions for Vincent Driessen branching.}
 
 github.setup            nvie gitflow 0.4.1
<span style='display:block; white-space:pre;background:#ffe0e0;'>-fetch.type              git
</span> name                    ${realname}
 revision                3
 categories              devel
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -18,83 +17,64 @@ supported_archs         noarch
</span> 
 description             {*}${description_common} (nvie)
 long_description        {*}${description_common} \
<span style='display:block; white-space:pre;background:#ffe0e0;'>-                        This is the canonical nvie version, not maintained.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-conflicts               ${realname}-devel ${realname}-avh ${realname}-hf
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+                        This is the original nvie version, not maintained.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+conflicts               ${realname} ${realname}-devel ${realname}-avh ${realname}-hf
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+conflicts-delete        ${subport}
</span> 
 depends_run-append      port:git \
                         port:util-linux
 
<span style='display:block; white-space:pre;background:#ffe0e0;'>-if {${subport} eq ${name}} {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-    destroot.destdir      prefix=${destroot}${prefix}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+if {${subport} ne "${realname}-avh"} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+    fetch.type          git
</span>     post-fetch {
<span style='display:block; white-space:pre;background:#ffe0e0;'>-        # Does the github portgroup support 'clone --recursive'?
</span>         # This will be removed once the python re-write is complete.
<span style='display:block; white-space:pre;background:#e0ffe0;'>+        system -W ${worksrcpath} "patch -p0 < [shellescape ${filespath}/gitmodules.patch]"
</span>         system -W ${worksrcpath} "git submodule update --init"
     }
 }
 
<span style='display:block; white-space:pre;background:#e0ffe0;'>+if {${subport} ne "${realname}-hf"} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+    destroot.destdir    prefix=${destroot}${prefix}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span> subport ${realname}-devel {
     github.setup        nvie gitflow 15aab26490facf285acef56cb5d61025eacb3a69
<span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span>     version             20120925
     revision            0
     license             {BSD LGPL-2.1+}
     description         {*}${description_common} (nvie devel)
     long_description    {*}${description_common} \
                         This is the nvie develop branch, not maintained.
<span style='display:block; white-space:pre;background:#ffe0e0;'>-    conflicts           ${realname} ${realname}-avh ${realname}-hf
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-    destroot.destdir    prefix=${destroot}${prefix}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-    post-fetch {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-        # Does the github portgroup support 'clone --recursive'?
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-        # This will be removed once the python re-write is complete.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-        system -W ${worksrcpath} "git submodule update --init"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-    }
</span> 
     livecheck.type      none
 }
 
 subport ${realname}-avh {
     github.setup        petervanderdoes gitflow 1.12.3
<span style='display:block; white-space:pre;background:#ffe0e0;'>-    fetch.type          standard
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span>     revision            0
     license             {BSD LGPL-2.1+}
     description         {*}${description_common} (avh Edition)
     long_description    {*}${description_common} \
<span style='display:block; white-space:pre;background:#ffe0e0;'>-                        This is the AVH Edition, and is actively developed.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-    conflicts           ${realname} ${realname}-devel ${realname}-hf
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+                        This is the AVH Edition, not maintained.
</span> 
     distfiles           ${distname}${extract.suffix}
     checksums           rmd160  046157420cc45deb35a9aede5f88c30a23926a45 \
                         sha256  12fefdfa90c0cef2711af048334bb3f5fd15638803ccaf9e791153ce96439b27 \
                         size    66179
<span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-    destroot.destdir    prefix=${destroot}${prefix}
</span> }
 
 subport ${realname}-hf {
     github.setup        datasift gitflow 1.5.2
<span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span>     revision            1
     license             {BSD LGPL-2.1+}
     description         {*}${description_common} (HubFlow)
     long_description    {*}${description_common} \
<span style='display:block; white-space:pre;background:#ffe0e0;'>-                        This is the HubFlow version, and is actively developed.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-    conflicts           ${realname} ${realname}-devel ${realname}-avh
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+                        This is the HubFlow version, not maintained.
</span> 
     destroot.env        INSTALL_INTO=${destroot}${prefix}/bin
     destroot.cmd        ./install.sh
     destroot.destdir
<span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-    post-fetch {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-        # Does the github portgroup support 'clone --recursive'?
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-        # This will be removed once the python re-write is complete.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-        system -W ${worksrcpath} "git submodule update --init"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-    }
</span> }
 
 use_configure           no
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/devel/git-flow/files/gitmodules.patch b/devel/git-flow/files/gitmodules.patch
</span>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 00000000000..78d56a9abd0
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--- /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/devel/git-flow/files/gitmodules.patch
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -0,0 +1,9 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+Use https:// because GitHub no longer supports unauthenticated git://
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+https://github.com/nvie/gitflow/issues/6478
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- .gitmodules.orig       2024-01-22 03:01:50.000000000 -0600
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ .gitmodules    2024-01-22 03:02:45.000000000 -0600
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -1,3 +1,3 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ [submodule "shFlags"]
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+   path = shFlags
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-  url = git://github.com/nvie/shFlags.git
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++  url = https://github.com/nvie/shFlags.git
</span></pre><pre style='margin:0'>

</pre>