<pre style='margin:0'>
Christopher Nielsen (mascguy) pushed a commit to branch master
in repository macports-ports.

</pre>
<p><a href="https://github.com/macports/macports-ports/commit/1167d6797f42369c487bc55a30cbacbacaf3582d">https://github.com/macports/macports-ports/commit/1167d6797f42369c487bc55a30cbacbacaf3582d</a></p>
<pre style="white-space: pre; background: #F8F8F8"><span style='display:block; white-space:pre;color:#808000;'>commit 1167d6797f42369c487bc55a30cbacbacaf3582d
</span>Author: Christopher Nielsen <mascguy@github.com>
AuthorDate: Wed Jul 19 12:40:07 2023 -0400

<span style='display:block; white-space:pre;color:#404040;'>    libgit2: add conflict libgit2-devel; cleanup
</span>---
 devel/libgit2/Portfile | 23 ++++++++++++++---------
 1 file changed, 14 insertions(+), 9 deletions(-)

<span style='display:block; white-space:pre;color:#808080;'>diff --git a/devel/libgit2/Portfile b/devel/libgit2/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 52f276a775f..5e47548655f 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/devel/libgit2/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/devel/libgit2/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -6,24 +6,25 @@ PortGroup           cmake 1.1
</span> PortGroup           legacysupport 1.0
 PortGroup           muniversal 1.0
 
<span style='display:block; white-space:pre;background:#e0ffe0;'>+name                libgit2
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+conflicts           libgit2-devel
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span> # don't forget to update py-pygit2 and libgit2-glib as well
 github.setup        libgit2 libgit2 1.6.4 v
 github.tarball_from archive
 revision            0
 epoch               1
<span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span> categories          devel
<span style='display:block; white-space:pre;background:#ffe0e0;'>-platforms           darwin
</span> maintainers         {devans @dbevans} {mascguy @mascguy}
 license             {GPL-2 Permissive}
 
 description         A portable, pure C implementation of the Git core methods
<span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span> long_description    libgit2 is a portable, pure C implementation of the \
                     Git core methods provided as a re-entrant linkable \
                     library with a solid API, allowing you to write native \
                     speed custom Git applications in any language which \
                     supports C bindings.
<span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span> homepage            https://libgit2.org/
 
 checksums           rmd160  9ab7621fb2d03494af277192661af9a345e26996 \
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -33,7 +34,8 @@ checksums           rmd160  9ab7621fb2d03494af277192661af9a345e26996 \
</span> depends_build-append \
                     port:pkgconfig
 
<span style='display:block; white-space:pre;background:#ffe0e0;'>-depends_lib         port:curl \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+depends_lib-append \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+                    port:curl \
</span>                     port:libiconv \
                     port:libssh2 \
                     path:lib/libssl.dylib:openssl \
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -46,27 +48,30 @@ patchfiles-append   patch-tests-no-error.diff
</span> 
 configure.args-append \
                     -DREGEX_BACKEND:STRING=pcre2 \
<span style='display:block; white-space:pre;background:#ffe0e0;'>-                    -DUSE_THREADS:BOOL=OFF \
</span>                     -DUSE_ICONV:BOOL=ON \
<span style='display:block; white-space:pre;background:#ffe0e0;'>-                    -DUSE_SSH:BOOL=ON
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+                    -DUSE_SSH:BOOL=ON \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+                    -DUSE_THREADS:BOOL=OFF
</span> 
 variant threadsafe description {Build with threadsafe option} {
     configure.args-replace \
<span style='display:block; white-space:pre;background:#ffe0e0;'>-                    -DUSE_THREADS:BOOL=OFF -DUSE_THREADS:BOOL=ON
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+                    -DUSE_THREADS:BOOL=OFF \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+                    -DUSE_THREADS:BOOL=ON
</span> }
 
 default_variants    +threadsafe
 
 platform darwin 8 {
     # Fix unsetenv return value
<span style='display:block; white-space:pre;background:#ffe0e0;'>-    configure.cflags-append -D__DARWIN_UNIX03
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+    configure.cflags-append \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+                    -D__DARWIN_UNIX03
</span> 
     # Copy Apple's copyfile.h for use on Mac OS X 10.4 and higher.
     # See APPLE_LICENSE.txt for license and copying information.
     post-patch {
         file copy ${filespath}/copyfile.h ${worksrcpath}
     }
<span style='display:block; white-space:pre;background:#ffe0e0;'>-    configure.cflags-append "-I${worksrcpath}"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+    configure.cflags-append \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+                    "-I${worksrcpath}"
</span> }
 
 # customize regex to avoid release candidates, alpha, beta, etc
</pre><pre style='margin:0'>

</pre>