<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/bbf74ad6887cd8852c6206b4627a87dd39a2368d">https://github.com/macports/macports-ports/commit/bbf74ad6887cd8852c6206b4627a87dd39a2368d</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 bbf74ad grass7: add bzip2 support, make postgresql 10 default, add a gui variant
</span>bbf74ad is described below
<span style='display:block; white-space:pre;color:#808000;'>commit bbf74ad6887cd8852c6206b4627a87dd39a2368d
</span>Author: Veence <vince@macports.org>
AuthorDate: Fri Dec 8 18:20:58 2017 +0100
<span style='display:block; white-space:pre;color:#404040;'> grass7: add bzip2 support, make postgresql 10 default, add a gui variant
</span>---
gis/grass7/Portfile | 125 ++++++++++++++++++++++++++++++----------------------
1 file changed, 73 insertions(+), 52 deletions(-)
<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 043f310..22ff1a5 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;'>@@ -1,51 +1,48 @@
</span> # -*- coding: utf-8; mode: tcl; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- vim:fenc=utf-8:ft=tcl:et:sw=4:ts=4:sts=4
<span style='display:block; white-space:pre;background:#ffe0e0;'>-PortSystem 1.0
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-PortGroup wxWidgets 1.0
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-PortGroup active_variants 1.1
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-name grass7
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-version 7.2.2
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-set realVersion ${version}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-#distname grass-${version}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-distname grass-${realVersion}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-maintainers nomaintainer
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-categories gis
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-license GPL-2+
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-platforms darwin
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-description GRASS
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-long_description GRASS is a Geographic Information System (GIS) used for \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- geospatial data management and analysis.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-homepage http://grass.osgeo.org/
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-master_sites ${homepage}grass[join [lrange [split ${realVersion} .] 0 1] {}]/source/
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+PortSystem 1.0
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+PortGroup wxWidgets 1.0
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+name grass7
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+version 7.2.2
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+revision 1
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+set realVersion ${version}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+#distname grass-${version}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+distname grass-${realVersion}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+maintainers nomaintainer
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+categories gis
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+license GPL-2+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+platforms darwin
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+description GRASS
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+long_description GRASS is a Geographic Information System (GIS) used for \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ geospatial data management and analysis.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+homepage http://grass.osgeo.org/
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+master_sites ${homepage}grass[join [lrange [split ${realVersion} .] 0 1] {}]/source/
</span>
checksums rmd160 6b0889a5e45f7d8d5560b1ecf21ed5428fb9473d \
sha256 bbbfb37c2e39a1027d27ce05471f7a93d74d6add2d5804f8e2e462daf392f47b
<span style='display:block; white-space:pre;background:#ffe0e0;'>-wxWidgets.use wxPython-3.0
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-depends_build port:pkgconfig
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-depends_lib port:freetype \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- port:fftw-3 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- port:gdal \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- port:geos \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- port:tiff \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- port:libpng \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- port:proj\
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- port:liblas\
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- path:lib/pkgconfig/cairo.pc:cairo \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- port:readline \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- port:python27 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- port:py27-pillow \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- port:py27-numpy \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- port:${wxWidgets.port} \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- port:py27-${wxWidgets.port}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-patchfiles patch-configure.diff \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- patch-Install_make.diff \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- patch-libraster_gdal_c.diff
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+depends_build port:pkgconfig
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+depends_lib port:bzip2 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:freetype \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:fftw-3 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:gdal \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:geos \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:tiff \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:libpng \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:proj\
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:liblas\
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ path:lib/pkgconfig/cairo.pc:cairo \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:readline \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:python27 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:py27-pillow \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:py27-numpy
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+patchfiles patch-configure.diff \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ patch-Install_make.diff \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ patch-libraster_gdal_c.diff
</span>
post-patch {
set python_bin ${prefix}/bin/python2.7
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -65,6 +62,9 @@ configure.ldflags-append -framework OpenCL
</span> configure.args \
--prefix=${prefix}/share \
--exec-prefix=${prefix} \
<span style='display:block; white-space:pre;background:#e0ffe0;'>+ --with-bzlib \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ --with-bzlib-includes=${prefix}/include \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ --with-bzlib-libs=${prefix}/lib \
</span> --with-fftw-includes=${prefix}/include \
--with-fftw-libs=${prefix}/lib \
--with-freetype \
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -93,23 +93,39 @@ configure.args \
</span> --with-lapack=no \
--with-readline \
--with-readline-includes=${prefix}/include/readline \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- --with-readline-libs=${prefix}/lib \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- --with-wxwidgets=${wxWidgets.wxconfig}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ --with-readline-libs=${prefix}/lib
</span>
build.target default
<span style='display:block; white-space:pre;background:#ffe0e0;'>-#default_variants +postgresql96
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+variant gui description {Builds with WxPython GUI} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ wxWidgets.use wxPython-3.0
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ depends_lib-append port:${wxWidgets.port} \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:py27-${wxWidgets.port}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ configure.args-append --with-wxwidgets=${wxWidgets.wxconfig}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+}
</span>
variant mysql5 description {Add MySQL 5 support} {
<span style='display:block; white-space:pre;background:#ffe0e0;'>- depends_lib-append path:bin/mysql_config5:mysql5
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- configure.args-append --with-mysql
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- configure.args-append --with-mysql-includes=${prefix}/include/mysql5/mysql
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- configure.args-append --with-mysql-libs=${prefix}/lib/mysql5/mysql
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- configure.env-append MYSQLD_CONFIG=${prefix}/lib/mysql5/bin/mysql_config
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ depends_lib-append path:bin/mysql_config5:mysql5
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ configure.args-append --with-mysql
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ configure.args-append --with-mysql-includes=${prefix}/include/mysql5/mysql
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ configure.args-append --with-mysql-libs=${prefix}/lib/mysql5/mysql
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ configure.env-append MYSQLD_CONFIG=${prefix}/lib/mysql5/bin/mysql_config
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+variant postgresql10 description {Add PostgreSQL 10 support} \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ conflicts postgresql95 postgresql96 {
</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-delete --without-postgres
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ configure.args-append --with-postgres
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ configure.args-append --with-postgres-includes=${prefix}/include/postgresql10
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ configure.args-append --with-postgres-libs=${prefix}/lib/postgresql10
</span> }
variant postgresql96 description {Add PostgreSQL 9.6 support} \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- conflicts postgresql95 {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ conflicts postgresql95 postgresql10 {
</span> depends_lib-append port:postgresql96
configure.args-delete --without-postgres
configure.args-append --with-postgres
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -118,7 +134,7 @@ variant postgresql96 description {Add PostgreSQL 9.6 support} \
</span> }
variant postgresql95 description {Add PostgreSQL 9.5 support} \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- conflicts postgresql96 {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ conflicts postgresql96 postgresql10 {
</span> depends_lib-append port:postgresql95
configure.args-delete --without-postgres
configure.args-append --with-postgres
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -126,6 +142,11 @@ variant postgresql95 description {Add PostgreSQL 9.5 support} \
</span> configure.args-append --with-postgres-libs=${prefix}/lib/postgresql95
}
<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;'>+ ![variant_isset postgresql95]} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ default_variants +postgresql10
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span> variant sqlite description {Add SQLite 3 support} {
depends_lib-append port:sqlite3
configure.args-append --with-sqlite
</pre><pre style='margin:0'>
</pre>