<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/f1ad2e24d596103fd46896769053758dccc80dda">https://github.com/macports/macports-ports/commit/f1ad2e24d596103fd46896769053758dccc80dda</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 f1ad2e24d59 postgis3: add port:pkgconfig to depends_build
</span>f1ad2e24d59 is described below
<span style='display:block; white-space:pre;color:#808000;'>commit f1ad2e24d596103fd46896769053758dccc80dda
</span>Author: Frank Dean <frankdean@users.noreply.github.com>
AuthorDate: Fri Oct 1 18:09:20 2021 +0100
<span style='display:block; white-space:pre;color:#404040;'> postgis3: add port:pkgconfig to depends_build
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> Running port install with -vst occasionally fails to find proj.h.
</span><span style='display:block; white-space:pre;color:#404040;'> configure.ac checks for pkg-config but only issues a warning when not
</span><span style='display:block; white-space:pre;color:#404040;'> found. Hopefully, this is all that is needed to fix the apparently
</span><span style='display:block; white-space:pre;color:#404040;'> random build failures.
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> - Fix `port lint` warnings
</span><span style='display:block; white-space:pre;color:#404040;'> - Upgrade to latest version
</span>---
databases/postgis3/Portfile | 27 ++++++++++++++-------------
1 file changed, 14 insertions(+), 13 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 64f01aa095b..c35119dd641 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,7 +5,7 @@ PortSystem 1.0
</span> name postgis3
categories databases gis
license GPL-2+
<span style='display:block; white-space:pre;background:#ffe0e0;'>-version 3.1.3
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+version 3.1.4
</span> revision 0
platforms darwin
maintainers {vince @Veence} openmaintainer
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -22,14 +22,15 @@ homepage http://postgis.net/
</span> master_sites http://download.osgeo.org/postgis/source
distname postgis-${version}
<span style='display:block; white-space:pre;background:#ffe0e0;'>-checksums rmd160 01542d4351c39c67b88837d8ac6c98133d8a7bdc \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- sha256 71e929553bb73a0413206a0f92df5180ac6579c500d8ddce3a03559f1b349fcb \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- size 17273487
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+checksums rmd160 daa6339bda59ccf043ba48ea642a2bf079d41ece \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ sha256 dc8e3fe8bc532e422f5d724c5a7c437f6555511716f6410d4d2db9762e1a3796 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ size 17269391
</span>
depends_build port:autoconf \
port:automake \
port:libtool \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- port:libxslt
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:libxslt \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:pkgconfig
</span>
depends_lib port:geos\
port:libiconv\
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -43,7 +44,7 @@ conflicts postgis postgis2
</span>
# Neither is PostGIS 2.0 compatible with PostGreSQL 8
# Database variants (from the GDAL port)
<span style='display:block; white-space:pre;background:#ffe0e0;'>-set postgresql_suffixes {13 12 11 10}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+set postgresql_suffixes {13 12}
</span>
set postgresql_variants {}
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -66,8 +67,8 @@ foreach suffix ${postgresql_suffixes} {
</span> --with-pgconfig=${prefix}/lib/${vrt}/bin/pg_config
build.args-append \
PGSQL_DOCDIR=${destroot}${prefix}/share/doc/${vrt} \
<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:#e0ffe0;'>+ PGSQL_MANDIR=${destroot}${prefix}/share/man
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ "
</span> }
# postgresql default
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -99,25 +100,25 @@ 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 conflicts {proj7 proj8} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+variant proj6 description {Build with Proj 6} conflicts proj7 proj8 {
</span> depends_lib-append port:proj6
configure.args-append PROJ_CFLAGS=-I${prefix}/lib/proj6/include
configure.args-append PROJ_LIBS="-L${prefix}/lib/proj6/lib -lproj"
}
<span style='display:block; white-space:pre;background:#ffe0e0;'>-variant proj7 conflicts {proj6 proj8} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+variant proj7 description {Build with Proj 7} conflicts proj6 proj8 {
</span> depends_lib-append port:proj7
configure.args-append PROJ_CFLAGS=-I${prefix}/lib/proj7/include
configure.args-append PROJ_LIBS="-L${prefix}/lib/proj7/lib -lproj"
}
<span style='display:block; white-space:pre;background:#ffe0e0;'>-variant proj8 conflicts {proj6 proj7} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+variant proj8 description {Build with Proj 8} conflicts proj6 proj7 {
</span> depends_lib-append port:proj8
configure.args-append PROJ_CFLAGS=-I${prefix}/lib/proj8/include
configure.args-append PROJ_LIBS="-L${prefix}/lib/proj8/lib -lproj"
}
<span style='display:block; white-space:pre;background:#ffe0e0;'>-default_variants +raster +topology
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+default_variants +raster +topology
</span>
if {![variant_isset proj6] && ![variant_isset proj7] && ![variant_isset proj8]} {
default_variants +proj8
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -126,7 +127,7 @@ if {![variant_isset proj6] && ![variant_isset proj7] && ![variant_isset proj8]}
</span> # Port phases
configure.cflags-append \
<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;'>+ -Diconv=libiconv -Diconv_open=libiconv_open -Diconv_close=libiconv_close
</span>
# see https://trac.macports.org/wiki/UsingTheRightCompiler
configure.env-append CPPBIN=${configure.cpp}
</pre><pre style='margin:0'>
</pre>