<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/031565f93ce26514d89082b96a8f4c60d784d505">https://github.com/macports/macports-ports/commit/031565f93ce26514d89082b96a8f4c60d784d505</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 031565f93ce postgis3: Update to version 3.3.2
</span>031565f93ce is described below
<span style='display:block; white-space:pre;color:#808000;'>commit 031565f93ce26514d89082b96a8f4c60d784d505
</span>Author: nilason <n_larsson@yahoo.com>
AuthorDate: Thu May 11 15:07:36 2023 +0200
<span style='display:block; white-space:pre;color:#404040;'> postgis3: Update to version 3.3.2
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> Following variants were added:
</span><span style='display:block; white-space:pre;color:#404040;'> - +postgresql15 (now default)
</span><span style='display:block; white-space:pre;color:#404040;'> - +proj9 (now default)
</span><span style='display:block; white-space:pre;color:#404040;'> - +lto, build with Link Time Optimization
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> Some general linting improvements were also made.
</span>---
databases/postgis3/Portfile | 154 +++++++++++++++++++++-----------------------
1 file changed, 74 insertions(+), 80 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 fe937b01f72..1e1a45a1825 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;'>@@ -5,8 +5,8 @@ PortSystem 1.0
</span> name postgis3
categories databases gis
license GPL-2+
<span style='display:block; white-space:pre;background:#ffe0e0;'>-version 3.2.0
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-revision 5
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+version 3.3.2
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+revision 0
</span> platforms darwin
maintainers {vince @Veence} openmaintainer
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -17,14 +17,14 @@ long_description PostGIS adds geometrical, geographical and topological\
</span> types, and functions operating thereon, to the PostGreSQL\
database. It also handles raster tiles and MVT format.
<span style='display:block; white-space:pre;background:#ffe0e0;'>-homepage http://postgis.net/
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+homepage https://postgis.net/
</span>
<span style='display:block; white-space:pre;background:#ffe0e0;'>-master_sites http://download.osgeo.org/postgis/source
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+master_sites https://download.osgeo.org/postgis/source
</span> distname postgis-${version}
<span style='display:block; white-space:pre;background:#ffe0e0;'>-checksums rmd160 ac46701c61ef4b86b4346eb9c5f17d5e8bee6cbd \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- sha256 7ab9e154c6947c0cffb8fa12d70806add9aa060e62b6c86a2e206f9d4b507cfd \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- size 16884722
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+checksums rmd160 09eddf9110c0d2c9d01572d6142615d8ddf7c379 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ sha256 9a2a219da005a1730a39d1959a1c7cec619b1efb009b65be80ffc25bad299068 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ size 17793976
</span>
depends_build port:autoconf \
port:automake \
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -39,51 +39,37 @@ depends_lib port:geos\
</span> port:protobuf-c \
path:lib/pkgconfig/icu-uc.pc:icu
<span style='display:block; white-space:pre;background:#ffe0e0;'>-# PostGIS 3.0 is not compatible with prior releases
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span> conflicts postgis postgis2
<span style='display:block; white-space:pre;background:#ffe0e0;'>-# Neither is PostGIS 2.0 compatible with PostGreSQL 8
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-# Database variants (from the GDAL port)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-set postgresql_suffixes {14 13 12}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# PostgreSQL database variants
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+set postgresql_suffixes {12 13 14 15}
</span>
<span style='display:block; white-space:pre;background:#ffe0e0;'>-set postgresql_variants {}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+set portsgresql_variants {}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+set postgresql_default_variant "if {"
</span>
<span style='display:block; white-space:pre;background:#ffe0e0;'>-foreach suffix ${postgresql_suffixes} {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- lappend postgresql_variants postgresql${suffix}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+foreach s ${postgresql_suffixes} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ lappend portsgresql_variants postgresql${s}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ set postgresql_default_variant "${postgresql_default_variant}!\[variant_isset postgresql${s}] && "
</span> }
<span style='display:block; white-space:pre;background:#ffe0e0;'>-foreach suffix ${postgresql_suffixes} {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- set vrt postgresql${suffix}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- set pgversion [string index ${suffix} 0].[string index ${suffix} 1]
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- set index [lsearch -exact ${postgresql_variants} ${vrt}]
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- set conf [lreplace ${postgresql_variants} ${index} ${index}]
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- variant ${vrt} \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- conflicts ${conf} \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- description "Use PostgreSQL ${pgversion}" \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- "
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- depends_lib-append port:${vrt}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- configure.args-append --libdir=${prefix}/lib/${vrt} \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- --with-pgconfig=${prefix}/lib/${vrt}/bin/pg_config
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- build.args-append \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- PGSQL_DOCDIR=${destroot}${prefix}/share/doc/${vrt} \
</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;'>-# postgresql default
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-set pgdefault "if {"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-foreach suffix ${postgresql_suffixes} {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- set pgdefault "${pgdefault}!\[variant_isset postgresql${suffix}\] && "
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+set postgresql_default_variant [string range ${postgresql_default_variant} 0 end-4]
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+set postgresql_default_variant "${postgresql_default_variant}} {default_variants +postgresql${s}}"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+eval $postgresql_default_variant
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+foreach s ${postgresql_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 v [string index ${s} 0].[string index ${s} 1]
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ set i [lsearch -exact ${portsgresql_variants} ${p}]
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ set c [lreplace ${portsgresql_variants} ${i} ${i}]
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ variant ${p} description "Use PostgreSQL ${v}" 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;'>+ --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:#ffe0e0;'>-set pgdefault [string range ${pgdefault} 0 end-4]
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-set pgdefault "${pgdefault}} { default_variants +postgresql14 }"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-eval ${pgdefault}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span> variant raster description {Build raster support} {
depends_lib-append port:gdal
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -101,37 +87,45 @@ variant sfcgal description {Uses SFCGAL for 3D queries} {
</span> configure.args-append --with-sfcgal=${prefix}/bin/sfcgal-config
}
<span style='display:block; white-space:pre;background:#ffe0e0;'>-variant proj6 description {Build with Proj 6} conflicts proj7 proj8 {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- depends_lib-append port:proj6
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- configure.args-append PROJ_CFLAGS=-I${prefix}/lib/proj6/include
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- configure.args-append PROJ_LIBS="-L${prefix}/lib/proj6/lib -lproj"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+variant lto description {Build with Link Time Optimization (LTO)} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ configure.args-append --enable-lto
</span> }
<span style='display:block; white-space:pre;background:#ffe0e0;'>-variant proj7 description {Build with Proj 7} conflicts proj6 proj8 {
</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 PROJ_CFLAGS=-I${prefix}/lib/proj7/include
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- configure.args-append PROJ_LIBS="-L${prefix}/lib/proj7/lib -lproj"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# Set PROJ variant
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+set proj_versions {6 7 8 9}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</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;'>+}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+foreach proj_ver ${proj_versions} {
</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:#e0ffe0;'>+
</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 PROJ_CFLAGS=-I${prefix}/lib/proj${proj_ver}/include \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ PROJ_LIBS=\"-L${prefix}/lib/proj${proj_ver}/lib -lproj\"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ "
</span> }
<span style='display:block; white-space:pre;background:#ffe0e0;'>-variant proj8 description {Build with Proj 8} conflicts proj6 proj7 {
</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 PROJ_CFLAGS=-I${prefix}/lib/proj8/include
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- configure.args-append PROJ_LIBS="-L${prefix}/lib/proj8/lib -lproj"
</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>
default_variants +raster +topology
<span style='display:block; white-space:pre;background:#ffe0e0;'>-if {![variant_isset proj6] && ![variant_isset proj7] && ![variant_isset proj8]} {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- default_variants +proj8
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span> # Port phases
configure.cflags-append \
-Diconv=libiconv -Diconv_open=libiconv_open -Diconv_close=libiconv_close
# see https://trac.macports.org/wiki/UsingTheRightCompiler
<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;'>+configure.env-append CPPBIN=${configure.cpp}
</span>
post-configure {
if {[variant_exists universal] && [variant_isset universal]} {
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -145,25 +139,25 @@ post-configure {
</span> }
build.args ICONV_LDFLAGS='-L${prefix}/lib -liconv'
<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 "
</span>\
<span style='display:block; white-space:pre;background:#ffe0e0;'>- ! This version comes with the following warning if you use postgresql14:
</span>\
<span style='display:block; white-space:pre;background:#ffe0e0;'>- ‘Due to some query performance degradation with the new fast index build\
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- that requires PG14, we have decided to disable the feature by default\
</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.\
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- If you are running PG14+, you can reenable it by doing:
</span>\
<span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span>\
<span style='display:block; white-space:pre;background:#ffe0e0;'>- ALTER OPERATOR FAMILY gist_geometry_ops_2d USING gist
</span>\
<span style='display:block; white-space:pre;background:#ffe0e0;'>- ADD FUNCTION 11 (geometry)
</span>\
<span style='display:block; white-space:pre;background:#ffe0e0;'>- geometry_gist_sortsupport_2d (internal);
</span>\
<span style='display:block; white-space:pre;background:#ffe0e0;'>-
</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;'>- To revert back to the old index behavior:
</span>\
<span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span>\
<span style='display:block; white-space:pre;background:#ffe0e0;'>- ALTER OPERATOR FAMILY gist_geometry_ops_2d using gist
</span>\
<span style='display:block; white-space:pre;background:#ffe0e0;'>- DROP FUNCTION 11 (geometry);
</span>\
<span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span>\
<span style='display:block; white-space:pre;background:#e0ffe0;'>+use_parallel_build yes
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</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> and then reindex your gist indexes.’"
livecheck.type regex
</pre><pre style='margin:0'>
</pre>