<pre style='margin:0'>
Renee Otten (reneeotten) pushed a commit to branch master
in repository macports-ports.
</pre>
<p><a href="https://github.com/macports/macports-ports/commit/e6c1acf635b2673c9f31ffe6f25332f3b3ec9d47">https://github.com/macports/macports-ports/commit/e6c1acf635b2673c9f31ffe6f25332f3b3ec9d47</a></p>
<pre style="white-space: pre; background: #F8F8F8"><span style='display:block; white-space:pre;color:#808000;'>commit e6c1acf635b2673c9f31ffe6f25332f3b3ec9d47
</span>Author: Nicklas Larsson <n_larsson@yahoo.com>
AuthorDate: Tue Mar 26 17:39:16 2024 +0100
<span style='display:block; white-space:pre;color:#404040;'> osm2pgsql: depend of new postgis3 subports
</span>---
gis/osm2pgsql/Portfile | 17 ++++-------------
1 file changed, 4 insertions(+), 13 deletions(-)
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/gis/osm2pgsql/Portfile b/gis/osm2pgsql/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 18a87e9ac7b..813269bc6f8 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/gis/osm2pgsql/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/gis/osm2pgsql/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -47,7 +47,6 @@ depends_lib-append port:bzip2 \
</span> port:nlohmann-json \
port:${port_libfmt} \
port:${opencv} \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- port:postgis3 \
</span> port:potrace \
port:proj8 \
port:protozero \
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -72,20 +71,12 @@ foreach suffix ${postgresql_suffixes} {
</span> set conf [lreplace ${postgresql_variants} ${index} ${index}]
variant ${vrt} description "Use ${vrt}" conflicts {*}${conf} "
<span style='display:block; white-space:pre;background:#ffe0e0;'>- depends_lib-append port:${vrt}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ depends_lib-append port:${vrt} \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:pg${suffix}-postgis3
</span> configure.args-append -DPostgreSQL_INCLUDE_DIR=${prefix}/include/${vrt}
configure.args-append -DPostgreSQL_TYPE_INCLUDE_DIR=${prefix}/include/${vrt}
configure.args-append -DPostgreSQL_LIBRARY=${prefix}/lib/${vrt}/libpq.dylib
"
<span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if {[variant_isset ${vrt}]} {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if {![catch {set result [active_variants postgis3 ${vrt}]}]} {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if {!$result} {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ui_msg "Error: postgis3 isn't installed on the required postgresql version!"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- return -code error "Variant mismatch."
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span> }
# postgresql default
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -111,7 +102,7 @@ configure.args-append "-DEXTERNAL_PROTOZERO=ON"
</span> configure.args-append "-DEXTERNAL_FMT=ON"
if {${subport} eq ${name}} {
<span style='display:block; white-space:pre;background:#ffe0e0;'>- revision 0
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ revision 1
</span>
if {(![variant_isset lua])} {
configure.args-append "-DWITH_LUA=OFF"
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -121,7 +112,7 @@ if {${subport} eq ${name}} {
</span> }
subport ${name}-lua {
<span style='display:block; white-space:pre;background:#ffe0e0;'>- revision 0
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ revision 1
</span>
depends_lib-append port:lua
</pre><pre style='margin:0'>
</pre>