<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/d7c903b81f2c572ddcd25dbc3f0008f48027e4dd">https://github.com/macports/macports-ports/commit/d7c903b81f2c572ddcd25dbc3f0008f48027e4dd</a></p>
<pre style="white-space: pre; background: #F8F8F8"><span style='display:block; white-space:pre;color:#808000;'>commit d7c903b81f2c572ddcd25dbc3f0008f48027e4dd
</span>Author: Nicklas Larsson <n_larsson@yahoo.com>
AuthorDate: Wed Nov 22 10:55:05 2023 +0100
<span style='display:block; white-space:pre;color:#404040;'> postgis3: clean-up, reorganise Portfile
</span>---
databases/postgis3/Portfile | 163 +++++++++++++++++++++-----------------------
1 file changed, 76 insertions(+), 87 deletions(-)
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/databases/postgis3/Portfile b/databases/postgis3/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 7910daa8548..2d4edb2e94a 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/databases/postgis3/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/databases/postgis3/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -25,75 +25,39 @@ checksums rmd160 d88cdfc8a3033a002e3db9a07e79e10bef6a9fae \
</span> sha256 aee9b60a6c884d354164b3096c4657f324454186607f859d1ce05d899798af9d \
size 14693348
<span style='display:block; white-space:pre;background:#ffe0e0;'>-depends_build port:autoconf \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+depends_build-append \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:autoconf \
</span> port:automake \
port:libtool \
port:libxslt \
port:pkgconfig
<span style='display:block; white-space:pre;background:#ffe0e0;'>-depends_lib port:geos\
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- port:libiconv\
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- port:libxml2\
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- port:json-c\
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- port:protobuf-c \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- path:lib/pkgconfig/icu-uc.pc:icu
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+depends_lib-append port:geos \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:json-c \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ path:lib/pkgconfig/icu-uc.pc:icu \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:libiconv \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:libxml2 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:protobuf-c
</span>
conflicts postgis postgis2
<span style='display:block; white-space:pre;background:#ffe0e0;'>-# PostgreSQL database variants
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-set postgresql_suffixes {12 13 14 15}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-set portsgresql_variants {}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-set postgresql_default_variant "if {"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-foreach s ${postgresql_suffixes} {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- lappend portsgresql_variants postgresql${s}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- set postgresql_default_variant "${postgresql_default_variant}!\[variant_isset postgresql${s}] && "
</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;'>-set postgresql_default_variant [string range ${postgresql_default_variant} 0 end-4]
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-set postgresql_default_variant "${postgresql_default_variant}} {default_variants +postgresql${s}}"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-eval $postgresql_default_variant
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-foreach s ${postgresql_suffixes} {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- set p postgresql${s}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- set v [string index ${s} 0].[string index ${s} 1]
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- set i [lsearch -exact ${portsgresql_variants} ${p}]
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- set c [lreplace ${portsgresql_variants} ${i} ${i}]
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- variant ${p} description "Use PostgreSQL ${v}" conflicts {*}${c} "
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- depends_lib-append port:${p}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- configure.args-append --libdir=${prefix}/lib/${p} \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- --bindir=${prefix}/lib/${p}/bin \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- --with-pgconfig=${prefix}/lib/${p}/bin/pg_config
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- build.args-append PGSQL_DOCDIR=${destroot}${prefix}/share/doc/${p} \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- PGSQL_MANDIR=${destroot}${prefix}/share/man
</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><span style='display:block; white-space:pre;background:#ffe0e0;'>-variant raster description {Build raster support} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+compiler.thread_local_storage yes
</span>
<span style='display:block; white-space:pre;background:#ffe0e0;'>- depends_lib-append port:gdal
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- configure.args-append --with-raster
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- configure.args-append --with-gdalconfig=${prefix}/bin/gdal-config
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+configure.cflags-append \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ -Diconv=libiconv -Diconv_open=libiconv_open -Diconv_close=libiconv_close
</span>
<span style='display:block; white-space:pre;background:#ffe0e0;'>-variant topology description {Build topology support} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# see https://trac.macports.org/wiki/UsingTheRightCompiler
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+configure.env-append \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ CPPBIN=${configure.cpp}
</span>
<span style='display:block; white-space:pre;background:#ffe0e0;'>- configure.args-append --with-topology
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+build.args ICONV_LDFLAGS='-L${prefix}/lib -liconv'
</span>
<span style='display:block; white-space:pre;background:#ffe0e0;'>-variant sfcgal description {Uses SFCGAL for 3D queries} {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- depends_lib-append port:sfcgal
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- configure.args-append --with-sfcgal=${prefix}/bin/sfcgal-config
</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;'>-variant lto description {Build with Link Time Optimization (LTO)} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+variant lto description {Build with Link Time Optimization (LTO)} {
</span> configure.args-append --enable-lto
}
<span style='display:block; white-space:pre;background:#ffe0e0;'>-# Set PROJ variant
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# PROJ variants
</span> set proj_versions {6 7 8 9}
<span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span> set proj_variants {}
foreach pjver ${proj_versions} {
lappend proj_variants proj${pjver}
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -101,14 +65,12 @@ foreach pjver ${proj_versions} {
</span> foreach proj_ver ${proj_versions} {
set index [lsearch -exact ${proj_variants} proj${proj_ver}]
set cflcts [lreplace ${proj_variants} ${index} ${index}]
<span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span> variant proj${proj_ver} description "Use Proj${proj_ver}" conflicts {*}${cflcts} "
depends_lib-append port:proj${proj_ver}
configure.args-append PROJ_CFLAGS=-I${prefix}/lib/proj${proj_ver}/include \
PROJ_LIBS=\"-L${prefix}/lib/proj${proj_ver}/lib -lproj\"
"
}
<span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span> set projdf "if {"
foreach pv ${proj_versions} {
set projdf "${projdf}!\[variant_isset proj${pv}\] && "
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -117,17 +79,47 @@ set projdf [string range ${projdf} 0 end-4]
</span> set projdf "${projdf}} { default_variants +proj${pv} }"
eval ${projdf}
<span style='display:block; white-space:pre;background:#ffe0e0;'>-default_variants +raster +topology
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# PostgreSQL variants
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+set pg_suffixes {12 13 14 15}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+set pg_variants {}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+set pg_default_variant "if {"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+foreach s ${pg_suffixes} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ lappend pg_variants postgresql${s}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ set pg_default_variant "${pg_default_variant}!\[variant_isset postgresql${s}] && "
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+set pg_default_variant [string range ${pg_default_variant} 0 end-4]
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+set pg_default_variant "${pg_default_variant}} {default_variants +postgresql${s}}"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+eval $pg_default_variant
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+foreach s ${pg_suffixes} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ set p postgresql${s}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ set i [lsearch -exact ${pg_variants} ${p}]
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ set c [lreplace ${pg_variants} ${i} ${i}]
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ variant ${p} description "Use PostgreSQL ${s}" conflicts {*}${c} "
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ depends_lib-append port:${p}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ configure.args-append --libdir=${prefix}/lib/${p} \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ --bindir=${prefix}/lib/${p}/bin \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ --with-pgconfig=${prefix}/lib/${p}/bin/pg_config
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ build.args-append PGSQL_DOCDIR=${destroot}${prefix}/share/doc/${p} \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ PGSQL_MANDIR=${destroot}${prefix}/share/man
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ "
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+}
</span>
<span style='display:block; white-space:pre;background:#ffe0e0;'>-# Port phases
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+variant raster description {Build raster support} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ depends_lib-append port:gdal
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ configure.args-append --with-raster
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ configure.args-append --with-gdalconfig=${prefix}/bin/gdal-config
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+}
</span>
<span style='display:block; white-space:pre;background:#ffe0e0;'>-compiler.thread_local_storage yes
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+variant sfcgal description {Uses SFCGAL for 3D queries} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ depends_lib-append port:sfcgal
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ configure.args-append --with-sfcgal=${prefix}/bin/sfcgal-config
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+}
</span>
<span style='display:block; white-space:pre;background:#ffe0e0;'>-configure.cflags-append \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- -Diconv=libiconv -Diconv_open=libiconv_open -Diconv_close=libiconv_close
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+variant topology description {Build topology support} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ configure.args-append --with-topology
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+}
</span>
<span style='display:block; white-space:pre;background:#ffe0e0;'>-# see https://trac.macports.org/wiki/UsingTheRightCompiler
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-configure.env-append CPPBIN=${configure.cpp}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+default_variants +raster +topology
</span>
post-configure {
if {[variant_exists universal] && [variant_isset universal]} {
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -140,28 +132,25 @@ post-configure {
</span> }
}
<span style='display:block; white-space:pre;background:#ffe0e0;'>-build.args ICONV_LDFLAGS='-L${prefix}/lib -liconv'
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-use_parallel_build yes
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-notes "\n\
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ! This version comes with the following warning if you use postgresql14:\n\
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ‘Due to some query performance degradation with the new fast index build\n\
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- that requires PG14, we have decided to disable the feature by default\n\
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- until we get more user testing as to the true impact of real-world queries.\n\
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- If you are running PG14+, you can reenable it by doing:\n\
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- \n\
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ALTER OPERATOR FAMILY gist_geometry_ops_2d USING gist\n\
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ADD FUNCTION 11 (geometry)\n\
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- geometry_gist_sortsupport_2d (internal);\n\
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- \n\
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- and then reindex your gist indexes.\n\
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- To revert back to the old index behavior:\n\
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- \n\
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ALTER OPERATOR FAMILY gist_geometry_ops_2d using gist\n\
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- DROP FUNCTION 11 (geometry);\n\
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- \n\
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- and then reindex your gist indexes.’"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-livecheck.type regex
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-livecheck.url ${master_sites}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-livecheck.regex {postgis2?-(\d+(?:\.\d+)*)\.[tz]}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+notes "\n\
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ! This version comes with the following warning if you use postgresql14:\n\
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ‘Due to some query performance degradation with the new fast index build\n\
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ that requires PG14, we have decided to disable the feature by default\n\
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ until we get more user testing as to the true impact of real-world queries.\n\
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ If you are running PG14+, you can reenable it by doing:\n\
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ \n\
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ALTER OPERATOR FAMILY gist_geometry_ops_2d USING gist\n\
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ADD FUNCTION 11 (geometry)\n\
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ geometry_gist_sortsupport_2d (internal);\n\
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ \n\
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ and then reindex your gist indexes.\n\
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ To revert back to the old index behavior:\n\
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ \n\
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ALTER OPERATOR FAMILY gist_geometry_ops_2d using gist\n\
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ DROP FUNCTION 11 (geometry);\n\
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ \n\
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ and then reindex your gist indexes.’"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+livecheck.type regex
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+livecheck.url ${master_sites}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+livecheck.regex {postgis2?-(\d+(?:\.\d+)*)\.[tz]}
</span></pre><pre style='margin:0'>
</pre>