<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/8e148e65612d42d1688bfce11b99dbd45d2fe7e7">https://github.com/macports/macports-ports/commit/8e148e65612d42d1688bfce11b99dbd45d2fe7e7</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 8e148e6 grass: push to 7.2.0 | qgis, gdal-grass, postgis2: jump Portfiles for new grass release, make postgresql96 the default
</span>8e148e6 is described below
<span style='display:block; white-space:pre;color:#808000;'>commit 8e148e65612d42d1688bfce11b99dbd45d2fe7e7
</span>Author: Veence <vince@macports.org>
AuthorDate: Thu Dec 29 11:09:02 2016 +0100
<span style='display:block; white-space:pre;color:#404040;'> grass: push to 7.2.0 | qgis, gdal-grass, postgis2: jump Portfiles for new grass release, make postgresql96 the default
</span>---
databases/postgis2/Portfile | 2 +-
gis/gdal-grass/Portfile | 3 ++-
gis/grass7/Portfile | 15 +++++++--------
gis/qgis/Portfile | 6 +++---
gis/qgis/files/patch-app_info_plist_in.diff | 2 +-
5 files changed, 14 insertions(+), 14 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 ad9e46a..13051cf 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;'>@@ -101,7 +101,7 @@ variant comments description {Build comments -- ! broken } {
</span> default_variants +raster +topology
if {![variant_isset postgresql95] && ![variant_isset postgresql96]} {
<span style='display:block; white-space:pre;background:#ffe0e0;'>- default_variants +postgresql95
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ default_variants +postgresql96
</span> }
# Port phases
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/gis/gdal-grass/Portfile b/gis/gdal-grass/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 9554303..0a1d855 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/gis/gdal-grass/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/gis/gdal-grass/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -5,6 +5,7 @@ PortSystem 1.0
</span> name gdal-grass
categories gis
version 2.1.0
<span style='display:block; white-space:pre;background:#e0ffe0;'>+revision 1
</span> maintainers vince
description This plugin allows GDAL to read GRASS files
long_description This plugin allows GDAL to read GRASS files
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -25,7 +26,7 @@ checksums md5 a272099fc145db1e5e7837a96e4e6691 \
</span> use_configure yes
configure.args-append --with-gdal=${prefix}/bin/gdal-config
<span style='display:block; white-space:pre;background:#ffe0e0;'>-configure.args-append --with-grass=${prefix}/share/grass-7.2.0RC2
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+configure.args-append --with-grass=${prefix}/share/grass-7.2.0
</span>
variant postgresql96 conflicts postgresql95 {
configure.args-append --with-postgres-includes=${prefix}/include/postgresql96
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/gis/grass7/Portfile b/gis/grass7/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 9bf7a22..efb8b5b 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/gis/grass7/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/gis/grass7/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -5,9 +5,8 @@ PortGroup wxWidgets 1.0
</span> PortGroup active_variants 1.1
name grass7
<span style='display:block; white-space:pre;background:#ffe0e0;'>-version 7.1.99.2
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-revision 3
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-set realVersion 7.2.0RC2
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+version 7.2.0
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+set realVersion ${version}
</span> #distname grass-${version}
distname grass-${realVersion}
maintainers nomaintainer
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -22,8 +21,8 @@ long_description GRASS is a Geographic Information System (GIS) used for \
</span> homepage http://grass.osgeo.org/
master_sites ${homepage}grass[join [lrange [split ${realVersion} .] 0 1] {}]/source/
<span style='display:block; white-space:pre;background:#ffe0e0;'>-checksums rmd160 64064bb4a62ad59120f08587d69fc5a31d96afcc \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- sha256 bd75cdc9a7b541d1bc72acc6d43ea35c7a6a4c2767c771a7a03a623b345037f3
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+checksums rmd160 432b56f69665e4fae7bd8a908742b25012471c01 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ sha256 f0bc0c3cfccc98330ce01547bd86d8281f93f05a45b6115eb33044a07cf70750
</span>
wxWidgets.use wxPython-3.0
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -45,9 +44,9 @@ depends_lib port:freetype \
</span>
pre-patch {
exec sed -e s#&&&#${prefix}# \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- ${filespath}/patch_libraster-gdal_c.diff.tplt > \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ${worksrcpath}/patch_libraster-gdal_c.diff
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- exec patch -p0 -d ${worksrcpath} < ${worksrcpath}/patch_libraster-gdal_c.diff
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ${filespath}/patch-libraster_gdal_c.diff.tplt > \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ${worksrcpath}/patch-libraster_gdal_c.diff
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ exec patch -p0 -d ${worksrcpath} < ${worksrcpath}/patch-libraster_gdal_c.diff
</span> }
patchfiles patch-configure.diff \
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/gis/qgis/Portfile b/gis/qgis/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index e10af8f..e91346a 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/gis/qgis/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/gis/qgis/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -5,7 +5,7 @@ PortGroup cmake 1.0
</span> PortGroup github 1.0
version 2.18.2
<span style='display:block; white-space:pre;background:#ffe0e0;'>-revision 1
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+revision 2
</span> set version_u [string map {. _} ${version}]
github.setup qgis QGIS ${version_u} final-
categories gis
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -183,7 +183,7 @@ foreach s ${postgresql_suffixes} {
</span> set pgd "${pgd}!\[variant_isset postgresql${s}\] && "
}
set pgd [string range ${pgd} 0 end-4]
<span style='display:block; white-space:pre;background:#ffe0e0;'>-set pgd "${pgd}} { default_variants +postgresql95 }"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+set pgd "${pgd}} { default_variants +postgresql96 }"
</span> eval ${pgd}
variant grass description "Build Grass 7 plugin" {
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -192,7 +192,7 @@ variant grass description "Build Grass 7 plugin" {
</span> configure.args-delete "-DWITH_GRASS7=OFF"
configure.args-append "-DWITH_GRASS7=ON"
configure.args-append \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- "-DGRASS_PREFIX7=${prefix}/share/grass-7.2.0RC2"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ "-DGRASS_PREFIX7=${prefix}/share/grass-7.2.0"
</span> }
configure.dir ${worksrcpath}/build
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/gis/qgis/files/patch-app_info_plist_in.diff b/gis/qgis/files/patch-app_info_plist_in.diff
</span><span style='display:block; white-space:pre;color:#808080;'>index 70ef016..0aa3920 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/gis/qgis/files/patch-app_info_plist_in.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/gis/qgis/files/patch-app_info_plist_in.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -15,7 +15,7 @@
</span> + <key>GRASS_VERSION</key>
+ <string>7.2.0</string>
+ <key>GRASS_LD_LIBRARY_PATH</key>
<span style='display:block; white-space:pre;background:#ffe0e0;'>-+ <string>@@@/share/grass-7.2.0RC2/lib</string>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ <string>@@@/share/grass-7.2.0/lib</string>
</span> + <key>GRASS_PERL</key>
+ <string>@@@/bin/perl</string>
+ </dict>
</pre><pre style='margin:0'>
</pre>