<pre style='margin:0'>
Ryan Schmidt (ryandesign) pushed a commit to branch master
in repository macports-ports.

</pre>
<p><a href="https://github.com/macports/macports-ports/commit/5a8136c0ba4e66f6d9df68e8482def00e34c9a17">https://github.com/macports/macports-ports/commit/5a8136c0ba4e66f6d9df68e8482def00e34c9a17</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 5a8136c  grass7: Fix patchfile name
</span>5a8136c is described below

<span style='display:block; white-space:pre;color:#808000;'>commit 5a8136c0ba4e66f6d9df68e8482def00e34c9a17
</span>Author: Ryan Schmidt <ryandesign@macports.org>
AuthorDate: Wed Jan 4 03:36:57 2017 -0600

<span style='display:block; white-space:pre;color:#404040;'>    grass7: Fix patchfile name
</span><span style='display:block; white-space:pre;color:#404040;'>    
</span><span style='display:block; white-space:pre;color:#404040;'>    Also use a normal post-patch reinplace to put the prefix into the code,
</span><span style='display:block; white-space:pre;color:#404040;'>    rather than the unusual pre-patch procedure the port was using.
</span>---
 gis/grass7/Portfile                                         | 13 ++++---------
 ...braster-gdal_c.diff.tplt => patch-libraster_gdal_c.diff} |  9 +++++----
 2 files changed, 9 insertions(+), 13 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 efb8b5b..3180212 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;'>@@ -40,17 +40,11 @@ depends_lib       port:freetype \
</span>                   port:py27-pillow \
                   port:py27-numpy \
                   port:${wxWidgets.port} \
<span style='display:block; white-space:pre;background:#ffe0e0;'>-                  port:py27-${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:#ffe0e0;'>-pre-patch      {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-    exec sed -e s#&&&#${prefix}# \
</span><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:#ffe0e0;'>-}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- 
</span> patchfiles        patch-configure.diff \
<span style='display:block; white-space:pre;background:#ffe0e0;'>-                  patch-Install_make.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;'>@@ -60,6 +54,7 @@ post-patch {
</span>     }
     reinplace "s|PYVER.*|PYVER = 2.7|" ${worksrcpath}/macosx/Makefile
     reinplace "s|^PYTHON.*|PYTHON = ${python_bin}|" ${worksrcpath}/include/Make/Platform.make.in
<span style='display:block; white-space:pre;background:#e0ffe0;'>+    reinplace "s|@PREFIX@|${prefix}|g" ${worksrcpath}/lib/raster/gdal.c
</span> 
     ui_warn "WARNING! Experimental build. Report any problems."
 }
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/gis/grass7/files/patch_libraster-gdal_c.diff.tplt b/gis/grass7/files/patch-libraster_gdal_c.diff
</span>similarity index 85%
rename from gis/grass7/files/patch_libraster-gdal_c.diff.tplt
rename to gis/grass7/files/patch-libraster_gdal_c.diff
<span style='display:block; white-space:pre;color:#808080;'>index 22ac3d5..6c67bf1 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/gis/grass7/files/patch_libraster-gdal_c.diff.tplt
</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,5 +1,5 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- lib/raster/gdal.c.orig 2016-12-22 08:43:18.000000000 +0100
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ lib/raster/gdal.c      2016-12-22 08:45:47.000000000 +0100
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- lib/raster/gdal.c.orig 2016-12-22 14:13:45.000000000 -0600
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ lib/raster/gdal.c      2017-01-04 03:30:45.000000000 -0600
</span> @@ -29,7 +29,7 @@
  #ifdef GDAL_LINK
  
<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,41 +87,13 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -92,42 +87,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;'>+-       "gdal201.dll",
</span> - "gdal200.dll",
 -      "gdal111.dll",
 -      "gdal110.dll",
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -61,7 +62,7 @@
</span> - "libgdal-1.dll",
 -      "gdal.dll",
 -# endif
<span style='display:block; white-space:pre;background:#ffe0e0;'>-+    "&&&/lib/libgdal.20.dylib",
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++    "@PREFIX@/lib/libgdal.20.dylib",
</span>   NULL
      };
      int i;
</pre><pre style='margin:0'>

</pre>