<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/4ccc792d7799187842270a79f1761e01a89cac92">https://github.com/macports/macports-ports/commit/4ccc792d7799187842270a79f1761e01a89cac92</a></p>
<pre style="white-space: pre; background: #F8F8F8"><span style='display:block; white-space:pre;color:#808000;'>commit 4ccc792d7799187842270a79f1761e01a89cac92
</span>Author: nilason <n_larsson@yahoo.com>
AuthorDate: Sat May 13 15:44:32 2023 +0200
<span style='display:block; white-space:pre;color:#404040;'> libgeotiff: make +proj9 default
</span>---
graphics/libgeotiff/Portfile | 37 +++++++++++++++++++++----------------
1 file changed, 21 insertions(+), 16 deletions(-)
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/graphics/libgeotiff/Portfile b/graphics/libgeotiff/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index a41579b5278..316713634fe 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/graphics/libgeotiff/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/graphics/libgeotiff/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -4,7 +4,7 @@ PortSystem 1.0
</span>
name libgeotiff
version 1.7.1
<span style='display:block; white-space:pre;background:#ffe0e0;'>-revision 1
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+revision 2
</span> categories graphics
platforms darwin
license X11
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -16,31 +16,36 @@ description Library and tools for dealing with GeoTIFF
</span> long_description This software provides support for the Tag Image File \
Format (TIFF) Geo extensions.
<span style='display:block; white-space:pre;background:#ffe0e0;'>-homepage http://geotiff.osgeo.org/
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-master_sites http://download.osgeo.org/geotiff/libgeotiff/
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+homepage https://geotiff.osgeo.org/
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+master_sites https://download.osgeo.org/geotiff/libgeotiff/
</span>
checksums rmd160 221970a969e613acb1034634eda70a7ab7fc22f7 \
sha256 05ab1347aaa471fc97347d8d4269ff0c00f30fa666d956baba37948ec87e55d6 \
size 542779
<span style='display:block; white-space:pre;background:#ffe0e0;'>-variant proj7 conflicts proj8 proj9 {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- depends_lib-append port:proj7
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- configure.args-append --with-proj=${prefix}/lib/proj7
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# Set PROJ
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+set proj_versions {7 8 9}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+set proj_variants {}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+foreach pjver ${proj_versions} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ lappend proj_variants proj${pjver}
</span> }
<span style='display:block; white-space:pre;background:#e0ffe0;'>+foreach proj_ver ${proj_versions} {
</span>
<span style='display:block; white-space:pre;background:#ffe0e0;'>-variant proj8 conflicts proj7 proj9 {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- depends_lib-append port:proj8
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- configure.args-append --with-proj=${prefix}/lib/proj8
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ set index [lsearch -exact ${proj_variants} proj${proj_ver}]
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ set cflcts [lreplace ${proj_variants} ${index} ${index}]
</span>
<span style='display:block; white-space:pre;background:#ffe0e0;'>-variant proj9 conflicts proj7 proj8 {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- depends_lib-append port:proj9
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- configure.args-append --with-proj=${prefix}/lib/proj9
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ variant proj${proj_ver} description "Use Proj${proj_ver}" conflicts {*}${cflcts} "
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ depends_lib-append port:proj${proj_ver}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ configure.args-append --with-proj=${prefix}/lib/proj${proj_ver}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ "
</span> }
<span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-if {![variant_isset proj7] && ![variant_isset proj8] && ![variant_isset proj9]} {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- default_variants +proj8
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+set projdf "if {"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+foreach pv ${proj_versions} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ set projdf "${projdf}!\[variant_isset proj${pv}\] && "
</span> }
<span style='display:block; white-space:pre;background:#e0ffe0;'>+set projdf [string range ${projdf} 0 end-4]
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+set projdf "${projdf}} { default_variants +proj${pv} }"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+eval ${projdf}
</span>
depends_lib port:tiff \
port:zlib \
</pre><pre style='margin:0'>
</pre>