<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/1bdaea3bb4c8f81f82426bf04a885fef876e0ff0">https://github.com/macports/macports-ports/commit/1bdaea3bb4c8f81f82426bf04a885fef876e0ff0</a></p>
<pre style="white-space: pre; background: #F8F8F8"><span style='display:block; white-space:pre;color:#808000;'>commit 1bdaea3bb4c8f81f82426bf04a885fef876e0ff0
</span>Author: Veence <vince@macports.org>
AuthorDate: Fri Mar 15 13:33:37 2019 +0100
<span style='display:block; white-space:pre;color:#404040;'> grass7: bumps to 7.6.0
</span>---
gis/grass7/Portfile | 11 +++++------
gis/grass7/files/patch-libraster_gdal_c.diff | 11 ++++++-----
2 files changed, 11 insertions(+), 11 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 e1155b8..99fdb61 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,8 +4,7 @@ PortSystem 1.0
</span> PortGroup wxWidgets 1.0
name grass7
<span style='display:block; white-space:pre;background:#ffe0e0;'>-version 7.4.3
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-revision 1
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+version 7.6.0
</span> set realVersion ${version}
#distname grass-${version}
distname grass-${realVersion}
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -21,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 5c6949d2430f84df5444fd02c32dab34887e6881 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- sha256 004e65693ee97fd4d5dc7ad244e3286a115dccd88964d04be61c07db6574b399 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- size 58415691
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+checksums rmd160 579ee4668e61254f139e5ee0e3b22bf74711be5e \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ sha256 07628f83ad59ba6d9d097cdc91c490efaf5b1d57bc7ee1fc2709183162741b6a \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ size 60605953
</span>
depends_build port:pkgconfig
depends_lib port:bzip2 \
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -197,7 +196,7 @@ post-configure {
</span> reinplace -E "s|\\\$\\\(CPPFLAGS)|-I${worksrcpath}/lib/python/ctypes \$(CPPFLAGS)\
\\\\\"-DLL=\\\\\" \\\\\"-Drestrict=\\\\\" \\\\\"-D__attribute__(x)=\\\\\" \
\\\\\"-D_Nullable=\\\\\" \\\\\"-D_Nonnull=\\\\\" \\\\\"-D__compar=\\\\\" \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- \\\\\"-Dint8_t=char\\\\\" \\\\\"-DCF_INLINE=\\\\\"|" \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ \\\\\"-Dint8_t=char\\\\\" \\\\\"-DCF_INLINE=\\\\\" \\\\\"-Duint16_t=short\\\\\"|" \
</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 d968ace..43b7bd5 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,11 +1,11 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- lib/raster/gdal.c.orig 2017-08-04 07:36:01.000000000 +0200
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ lib/raster/gdal.c 2017-09-23 12:06:33.000000000 +0200
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- lib/raster/gdal.c.orig 2019-03-15 11:03:57.000000000 +0100
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ lib/raster/gdal.c 2019-03-15 11:06:03.000000000 +0100
</span> @@ -30,7 +30,7 @@
#ifdef GDAL_LINK
#ifdef GDAL_DYNAMIC
-# if defined(__unix) || defined(__unix__)
<span style='display:block; white-space:pre;background:#ffe0e0;'>-+# if defined(__unix) || defined(__unix__) || defined (__APPLE__)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++# if defined(__unix) || defined(__unix__) || defined(__APPLE__)
</span> # include <dlfcn.h>
# endif
# ifdef _WIN32
<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;'>-@@ -93,44 +88,13 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -93,45 +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;'>+- "gdal204.dll",
</span> - "gdal203.dll",
- "gdal202.dll",
- "gdal201.dll",
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -64,7 +65,7 @@
</span> - "libgdal-1.dll",
- "gdal.dll",
-# endif
<span style='display:block; white-space:pre;background:#ffe0e0;'>-+ "@PREFIX@/lib/libgdal.20.dylib",
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ "@PREFIX@/lib/libgdal.dylib",
</span> NULL
};
int i;
</pre><pre style='margin:0'>
</pre>