<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/735d84065a35e15be8d7cc0049bc63e357b07fdd">https://github.com/macports/macports-ports/commit/735d84065a35e15be8d7cc0049bc63e357b07fdd</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 735d84065a3 gdal: move error messages to the pre-configure phase. Fixes https://trac.macports.org/ticket/63837
</span>735d84065a3 is described below
<span style='display:block; white-space:pre;color:#808000;'>commit 735d84065a35e15be8d7cc0049bc63e357b07fdd
</span>Author: Veence <vince@macports.org>
AuthorDate: Wed Jan 12 10:15:05 2022 +0100
<span style='display:block; white-space:pre;color:#404040;'> gdal: move error messages to the pre-configure phase. Fixes https://trac.macports.org/ticket/63837
</span>---
gis/gdal/Portfile | 14 +++++++++-----
1 file changed, 9 insertions(+), 5 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 9920e8a08fd..5893c2d1e99 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;'>@@ -317,11 +317,13 @@ variant libkml \
</span> }
variant grass description {Enable GRASS 7 GIS I/O} {
<span style='display:block; white-space:pre;background:#ffe0e0;'>- if {[catch {lindex [registry_active grass7] 0}]} {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ui_error "The grass variant requires grass 7 to be installed."
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ui_error "Since grass7 depends on gdal, please first install gdal WITHOUT the grass variant."
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ui_error "Then install grass7, then reinstall gdal with the grass variant."
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #return -code error "Missing GRASS 7."
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ pre-configure {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if {[catch {lindex [registry_active grass7] 0}]} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ui_error "The grass variant requires grass 7 to be installed."
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ui_error "Since grass7 depends on gdal, please first install gdal WITHOUT the grass variant."
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ui_error "Then install grass7, then reinstall gdal with the grass variant."
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ return -code error "Missing GRASS 7."
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span> }
configure.args-delete --without-grass
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -451,7 +453,9 @@ variant netcdf description {Enable NetCDF file format} {
</span>
#JPEG-2K
variant jasper {
<span style='display:block; white-space:pre;background:#e0ffe0;'>+ pre-configure {
</span> return -code error "The Jasper variant is deprecated. Use +openjpeg for JPEG2K support."
<span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span> }
variant openjpeg \
</pre><pre style='margin:0'>
</pre>