<pre style='margin:0'>
Vincent (Veence) pushed a commit to branch master
in repository macports-ports.
</pre>
<p><a href="https://github.com/macports/macports-ports/commit/727643e91325facbfffd2f3c2341bdcf4236e2f6">https://github.com/macports/macports-ports/commit/727643e91325facbfffd2f3c2341bdcf4236e2f6</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 727643e9132 gdal: fix conflict lines and makes it libressl compatible
</span>727643e9132 is described below
<span style='display:block; white-space:pre;color:#808000;'>commit 727643e91325facbfffd2f3c2341bdcf4236e2f6
</span>Author: Veence <vince@macports.org>
AuthorDate: Fri Aug 13 15:46:44 2021 +0200
<span style='display:block; white-space:pre;color:#404040;'> gdal: fix conflict lines and makes it libressl compatible
</span>---
gis/gdal/Portfile | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/gis/gdal/Portfile b/gis/gdal/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index fb6568f74ab..f00798cf682 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/gis/gdal/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/gis/gdal/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -61,7 +61,7 @@ depends_lib-append port:zlib \
</span> port:sqlite3 \
port:spatialite \
port:curl \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- port:openssl \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ path:lib/libssl.dylib:openssl \
</span> port:charls
set PYINST ""
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -544,17 +544,17 @@ variant cfitsio description {Enable fits support} {
</span> configure.optflags -DGDAL_COMPILATION
# Proj version
<span style='display:block; white-space:pre;background:#ffe0e0;'>-variant proj6 conflicts {proj7 proj8} description {Use proj 6} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+variant proj6 conflicts proj7 proj8 description {Use proj 6} {
</span> depends_lib-append port:proj6
configure.args-append --with-proj=${prefix}/lib/proj6
}
<span style='display:block; white-space:pre;background:#ffe0e0;'>-variant proj7 conflicts {proj6 proj8} description {Use proj 7} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+variant proj7 conflicts proj6 proj8 description {Use proj 7} {
</span> depends_lib-append port:proj7
configure.args-append --with-proj=${prefix}/lib/proj7
}
<span style='display:block; white-space:pre;background:#ffe0e0;'>-variant proj8 conflicts {proj6 proj7} description {Use proj 7} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+variant proj8 conflicts proj6 proj7 description {Use proj 7} {
</span> depends_lib-append port:proj8
configure.args-append --with-proj=${prefix}/lib/proj8
}
</pre><pre style='margin:0'>
</pre>