<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/70217fe70ee6dc7926cb8bfd58dc91852a762ca8">https://github.com/macports/macports-ports/commit/70217fe70ee6dc7926cb8bfd58dc91852a762ca8</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 70217fe postgis2: upgrade to 2.4.2, fixes licence issue and improve Portfile Should fix: https://trac.macports.org/ticket/55461 and: https://trac.macports.org/ticket/55460
</span>70217fe is described below
<span style='display:block; white-space:pre;color:#808000;'>commit 70217fe70ee6dc7926cb8bfd58dc91852a762ca8
</span>Author: Veence <vince@macports.org>
AuthorDate: Sun Dec 3 16:21:14 2017 +0100
<span style='display:block; white-space:pre;color:#404040;'> postgis2: upgrade to 2.4.2, fixes licence issue and improve Portfile
</span><span style='display:block; white-space:pre;color:#404040;'> Should fix: https://trac.macports.org/ticket/55461
</span><span style='display:block; white-space:pre;color:#404040;'> and: https://trac.macports.org/ticket/55460
</span>---
databases/postgis2/Portfile | 69 +++++++++++++++++++++++++--------------------
1 file changed, 38 insertions(+), 31 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 15f2dcf..5cd48f0 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;'>@@ -4,8 +4,8 @@ PortSystem 1.0
</span>
name postgis2
categories databases gis
<span style='display:block; white-space:pre;background:#ffe0e0;'>-license GPL
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-version 2.4.0
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+license GPL-2+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+version 2.4.2
</span> epoch 1
platforms darwin
maintainers vince openmaintainer
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -23,9 +23,9 @@ 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 a2a8b9e9007d2386819e639ba86160c554ded42d \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- sha256 02baa90f04da41e04b6c18eedfda53110c45ae943d4e65050f6d202f7de07d29
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+checksums rmd160 b0b358866977cd418c38447ee5fccd27585f8ee5 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ sha256 23625bc99ed440d53a20225721095a3f5c653b62421c4d597c8038f0d7a321d9
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span> depends_build port:autoconf \
port:automake \
port:libtool \
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -42,34 +42,46 @@ depends_lib port:geos\
</span> conflicts postgis
# Neither is PostGIS 2.0 compatible with PostGreSQL 8
<span style='display:block; white-space:pre;background:#e0ffe0;'>+# Database variants (from the GDAL port)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+set postgresql_suffixes {10 95 96}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+set postgresql_variants {}
</span>
<span style='display:block; white-space:pre;background:#ffe0e0;'>-variant postgresql10 description {Builds with postgresql 10.0} \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- conflicts postgresql96 postgresql95 {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- depends_lib-append port:postgresql10
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- configure.args-append --libdir=${prefix}/lib/postgresql10\
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- --with-pgconfig=${prefix}/lib/postgresql10/bin/pg_config
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- build.args-append PGSQL_DOCDIR=${destroot}${prefix}/share/doc/postgresql10\
</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:#e0ffe0;'>+foreach suffix ${postgresql_suffixes} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ lappend postgresql_variants postgresql${suffix}
</span> }
<span style='display:block; white-space:pre;background:#ffe0e0;'>-variant postgresql96 description {Builds with postgresql 9.6} \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- conflicts postgresql95 postgresql10 {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- depends_lib-append port:postgresql96
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- configure.args-append --libdir=${prefix}/lib/postgresql96\
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- --with-pgconfig=${prefix}/lib/postgresql96/bin/pg_config
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- build.args-append PGSQL_DOCDIR=${destroot}${prefix}/share/doc/postgresql96\
</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:#e0ffe0;'>+foreach suffix ${postgresql_suffixes} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ set vrt postgresql${suffix}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ set pgversion [string index ${suffix} 0].[string index ${suffix} 1]
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ set index [lsearch -exact ${postgresql_variants} ${vrt}]
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ set conf [lreplace ${postgresql_variants} ${index} ${index}]
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ variant ${vrt} \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ conflicts ${conf} \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ description "Use PostgreSQL ${pgversion}" \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ "
</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;'>+ configure.args-append --libdir=${prefix}/lib/${vrt} \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ --with-pgconfig=${prefix}/lib/${vrt}/bin/pg_config
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ build.args-append \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ PGSQL_DOCDIR=${destroot}${prefix}/share/doc/${vrt} \
</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;'>-variant postgresql95 description {Builds with postgresql 9.5} \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- conflicts postgresql96 postgresql10 {
</span><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:#ffe0e0;'>- PGSQL_MANDIR=${destroot}${prefix}/share/man
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# postgresql default
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+set pgdefault "if {"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+foreach suffix ${postgresql_suffixes} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ set pgdefault "${pgdefault}!\[variant_isset postgresql${suffix}\] && "
</span> }
<span style='display:block; white-space:pre;background:#e0ffe0;'>+set pgdefault [string range ${pgdefault} 0 end-4]
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+set pgdefault "${pgdefault}} { default_variants +postgresql10 }"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+eval ${pgdefault}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span> variant raster description {Build raster support} {
depends_lib-append port:gdal
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -112,10 +124,6 @@ variant comments description {Build comments -- ! broken } {
</span>
default_variants +raster +topology
<span style='display:block; white-space:pre;background:#ffe0e0;'>-if {![variant_isset postgresql10] && ![variant_isset postgresql96]} {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- default_variants +postgresql10
</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 \
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -138,7 +146,6 @@ post-configure {
</span> build.args ICONV_LDFLAGS='-L${prefix}/lib -liconv'
use_parallel_build no
<span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span> livecheck.type regex
livecheck.url ${master_sites}
livecheck.regex {postgis2?-(\d+(?:\.\d+)*)\.[tz]}
</pre><pre style='margin:0'>
</pre>