<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/55fa56a801d69a5c7b6c6bcb73857c76488d545b">https://github.com/macports/macports-ports/commit/55fa56a801d69a5c7b6c6bcb73857c76488d545b</a></p>
<pre style="white-space: pre; background: #F8F8F8"><span style='display:block; white-space:pre;color:#808000;'>commit 55fa56a801d69a5c7b6c6bcb73857c76488d545b
</span>Author: Veence <vince@macports.org>
AuthorDate: Thu Nov 29 13:37:14 2018 +0100

<span style='display:block; white-space:pre;color:#404040;'>    grass7: bump to 7.4.3
</span>---
 gis/grass7/Portfile                          | 64 +++++++++++++++-------------
 gis/grass7/files/patch-libraster_gdal_c.diff |  7 +--
 2 files changed, 38 insertions(+), 33 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 a3022f4..047a2c6 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;'>@@ -4,7 +4,7 @@ PortSystem          1.0
</span> PortGroup           wxWidgets 1.0
 
 name                grass7
<span style='display:block; white-space:pre;background:#ffe0e0;'>-version             7.4.1
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+version             7.4.3
</span> set realVersion     ${version}
 #distname           grass-${version}
 distname            grass-${realVersion}
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -20,9 +20,9 @@ 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  a5e92cfc97308b41098da45fa48a065c41965514 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-                    sha256  560b8669caaafa9e8dbd4bbf2b4b4bbab7dca1cc46ee828eaf26c744fe0635fc \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-                    size    57969640
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+checksums           rmd160  5c6949d2430f84df5444fd02c32dab34887e6881 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+                    sha256  004e65693ee97fd4d5dc7ad244e3286a115dccd88964d04be61c07db6574b399 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+                    size    58415691
</span> 
 depends_build       port:pkgconfig
 depends_lib         port:bzip2 \
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -127,38 +127,41 @@ variant mysql5 description {Add MySQL 5 support} {
</span>     configure.env-append    MYSQLD_CONFIG=${prefix}/lib/mysql5/bin/mysql_config
 }
 
<span style='display:block; white-space:pre;background:#ffe0e0;'>-variant postgresql10 description {Add PostgreSQL 10 support} \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-    conflicts postgresql95 postgresql96 {
</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-delete --without-postgres
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-    configure.args-append --with-postgres
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-    configure.args-append --with-postgres-includes=${prefix}/include/postgresql10
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-    configure.args-append --with-postgres-libs=${prefix}/lib/postgresql10
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# PostGreSQL variants (from the GDAL port)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+set postgresql_suffixes {11 10 95 96}
</span> 
<span style='display:block; white-space:pre;background:#ffe0e0;'>-variant postgresql96 description {Add PostgreSQL 9.6 support} \
</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-delete --without-postgres
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-    configure.args-append --with-postgres
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-    configure.args-append --with-postgres-includes=${prefix}/include/postgresql96
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-    configure.args-append --with-postgres-libs=${prefix}/lib/postgresql96
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+set postgresql_variants {}
</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 postgresql95 description {Add PostgreSQL 9.5 support} \
</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-delete --without-postgres
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-    configure.args-append --with-postgres
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-    configure.args-append --with-postgres-includes=${prefix}/include/postgresql95
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-    configure.args-append --with-postgres-libs=${prefix}/lib/postgresql95
</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} description "Use PostgreSQL ${pgversion}" conflicts {*}${conf} "
</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   --with-postgres-includes=${prefix}/include/${vrt}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+        configure.args-append   --with-postgres-libs=${prefix}/lib/${vrt}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+        configure.args-delete   --with-postgres=no
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+        configure.args-append   --with-postgres=yes
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+    "
</span> }
 
<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;'>-    ![variant_isset postgresql95]} {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-    default_variants    +postgresql10
</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 sqlite description {Add SQLite 3 support} {
     depends_lib-append    port:sqlite3
     configure.args-append --with-sqlite
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -192,7 +195,8 @@ post-configure {
</span>         ${worksrcpath}/lib/python/ctypes/cpl_port.h
     reinplace -E "s|\\\$\\\(CPPFLAGS)|-I${worksrcpath}/lib/python/ctypes \$(CPPFLAGS)\
         \\\\\"-DLL=\\\\\" \\\\\"-Drestrict=\\\\\" \\\\\"-D__attribute__(x)=\\\\\" \
<span style='display:block; white-space:pre;background:#ffe0e0;'>-        \\\\\"-D_Nullable=\\\\\" \\\\\"-D_Nonnull=\\\\\" \\\\\"-D__compar=\\\\\"|" \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+        \\\\\"-D_Nullable=\\\\\" \\\\\"-D_Nonnull=\\\\\" \\\\\"-D__compar=\\\\\" \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+        \\\\\"-Dint8_t=char\\\\\" \\\\\"-DCF_INLINE=\\\\\"|" \
</span>         ${worksrcpath}/lib/python/ctypes/Makefile
 }
 
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/gis/grass7/files/patch-libraster_gdal_c.diff b/gis/grass7/files/patch-libraster_gdal_c.diff
</span><span style='display:block; white-space:pre;color:#808080;'>index 0876ffe..d968ace 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/gis/grass7/files/patch-libraster_gdal_c.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/gis/grass7/files/patch-libraster_gdal_c.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,6 +1,6 @@
</span> --- lib/raster/gdal.c.orig        2017-08-04 07:36:01.000000000 +0200
 +++ lib/raster/gdal.c  2017-09-23 12:06:33.000000000 +0200
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -29,7 +29,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -30,7 +30,7 @@
</span>  #ifdef GDAL_LINK
  
  #ifdef GDAL_DYNAMIC
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -9,7 +9,7 @@
</span>  #  include <dlfcn.h>
  # endif
  # ifdef _WIN32
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -77,12 +77,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -78,12 +78,7 @@
</span>  {
      void *sym;
  
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -22,7 +22,7 @@
</span>  
      if (!sym)
        G_fatal_error(_("Unable to locate symbol <%s>"), name);
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -92,43 +87,13 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -93,44 +88,13 @@
</span>  
  static void try_load_library(const char *name)
  {
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -48,6 +48,7 @@
</span> - "libgdal1.7.0.so",
 -# endif
 -# ifdef _WIN32
<span style='display:block; white-space:pre;background:#e0ffe0;'>+-       "gdal203.dll",        
</span> - "gdal202.dll",        
 -      "gdal201.dll",
 -      "gdal200.dll",
</pre><pre style='margin:0'>

</pre>