<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/81ed6fbc4222229dd327af94e07543de61df5283">https://github.com/macports/macports-ports/commit/81ed6fbc4222229dd327af94e07543de61df5283</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 81ed6fb postgis2: upgrade to 2.4 | make +postgresql10 a new and default option | re-enables json-c
</span>81ed6fb is described below
<span style='display:block; white-space:pre;color:#808000;'>commit 81ed6fbc4222229dd327af94e07543de61df5283
</span>Author: Veence <vince@macports.org>
AuthorDate: Sun Nov 5 14:54:20 2017 +0100
<span style='display:block; white-space:pre;color:#404040;'> postgis2: upgrade to 2.4 | make +postgresql10 a new and default option | re-enables json-c
</span>---
databases/postgis2/Portfile | 30 +++++++++++++++---------------
1 file changed, 15 insertions(+), 15 deletions(-)
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/databases/postgis2/Portfile b/databases/postgis2/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 5bc4115..72c4cd5 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/databases/postgis2/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/databases/postgis2/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -5,7 +5,7 @@ PortSystem 1.0
</span> name postgis2
categories databases gis
license GPL
<span style='display:block; white-space:pre;background:#ffe0e0;'>-version 2.3.2
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+version 2.4.0
</span> epoch 1
platforms darwin
maintainers vince openmaintainer
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -23,8 +23,8 @@ homepage http://postgis.refractions.net/
</span> master_sites http://download.osgeo.org/postgis/source
distname postgis-${version}
<span style='display:block; white-space:pre;background:#ffe0e0;'>-checksums rmd160 b8cd15fd7556dd06355f0a507fa4aef1aad69333 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- sha256 e92e34c18f078a3d1a2503cd870efdc4fa9e134f0bcedbbbdb8b46b0e6af09e4
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+checksums rmd160 a2a8b9e9007d2386819e639ba86160c554ded42d \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ sha256 02baa90f04da41e04b6c18eedfda53110c45ae943d4e65050f6d202f7de07d29
</span>
depends_build port:autoconf \
port:automake \
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -34,7 +34,8 @@ depends_build port:autoconf \
</span> depends_lib port:geos\
port:proj\
port:libiconv\
<span style='display:block; white-space:pre;background:#ffe0e0;'>- port:libxml2
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:libxml2\
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:json-c
</span>
# PostGIS 2.0 is not compatible with PostGIS 1.5
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -42,12 +43,12 @@ conflicts postgis
</span>
# Neither is PostGIS 2.0 compatible with PostGreSQL 8
<span style='display:block; white-space:pre;background:#ffe0e0;'>-variant postgresql95 description {Builds with postgresql 9.5} \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+variant postgresql10 description {Builds with postgresql 10.0} \
</span> conflicts postgresql96 {
<span style='display:block; white-space:pre;background:#ffe0e0;'>- depends_lib-append port:postgresql95
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- configure.args-append --libdir=${prefix}/lib/postgresql95\
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- --with-pgconfig=${prefix}/lib/postgresql95/bin/pg_config
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- build.args-append PGSQL_DOCDIR=${destroot}${prefix}/share/doc/postgresql95\
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ depends_lib-append port:postgresql10
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ configure.args-append --libdir=${prefix}/lib/postgresql10\
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ --with-pgconfig=${prefix}/lib/postgresql10/bin/pg_config
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ build.args-append PGSQL_DOCDIR=${destroot}${prefix}/share/doc/postgresql10\
</span> PGSQL_MANDIR=${destroot}${prefix}/share/man
}
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -92,7 +93,9 @@ variant comments description {Build comments -- ! broken } {
</span>
configure.args-append --datadir=${prefix}/share/${name} \
--with-projdir=${prefix} \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- --with-xsldir=${prefix}/share/xsl/docbook-xsl
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ --with-xsldir=${prefix}/share/xsl/docbook-xsl \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ --with-json \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ --with-jsondir=${prefix}/lib
</span>
build.target-append comments
destroot.target-append docs-install comments-install
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -100,8 +103,8 @@ variant comments description {Build comments -- ! broken } {
</span>
default_variants +raster +topology
<span style='display:block; white-space:pre;background:#ffe0e0;'>-if {![variant_isset postgresql95] && ![variant_isset postgresql96]} {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- default_variants +postgresql96
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+if {![variant_isset postgresql10] && ![variant_isset postgresql96]} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ default_variants +postgresql10
</span> }
# Port phases
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -109,9 +112,6 @@ if {![variant_isset postgresql95] && ![variant_isset postgresql96]} {
</span> configure.cflags-append \
-Diconv=libiconv -Diconv_open=libiconv_open -Diconv_close=libiconv_close
<span style='display:block; white-space:pre;background:#ffe0e0;'>-# JSON-C new version is incompatible with this version of PostGIS
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-configure.args-append -without-json
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span> # see https://trac.macports.org/wiki/UsingTheRightCompiler
configure.env-append CPPBIN=${configure.cpp}
</pre><pre style='margin:0'>
</pre>