<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/368722d3cfc08f8bb213ac835a2557f39cf22f2d">https://github.com/macports/macports-ports/commit/368722d3cfc08f8bb213ac835a2557f39cf22f2d</a></p>
<pre style="white-space: pre; background: #F8F8F8"><span style='display:block; white-space:pre;color:#808000;'>commit 368722d3cfc08f8bb213ac835a2557f39cf22f2d
</span>Author: Ryan Schmidt <git@ryandesign.com>
AuthorDate: Sat Mar 3 18:06:24 2018 -0600
<span style='display:block; white-space:pre;color:#404040;'> qgis: Introduce grass_version variable
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> See: https://trac.macports.org/ticket/55905
</span>---
gis/qgis/Portfile | 9 +++++++--
gis/qgis/files/patch-app_info_plist_in.diff | 4 ++--
2 files changed, 9 insertions(+), 4 deletions(-)
<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 01083f3..46458ab 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;'>@@ -170,10 +170,15 @@ eval ${pgd}
</span> variant grass description "Build Grass 7 plugin" {
depends_lib-append port:grass7
<span style='display:block; white-space:pre;background:#e0ffe0;'>+ global grass_version
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ set grass_version 7.2.2
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ post-patch {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ reinplace "s|@GRASS_VERSION@|${grass_version}|g" \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ${worksrcpath}/mac/app.info.plist.in
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span> configure.args-delete "-DWITH_GRASS7=OFF"
configure.args-append "-DWITH_GRASS7=ON"
<span style='display:block; white-space:pre;background:#ffe0e0;'>- configure.args-append \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- "-DGRASS_PREFIX7=${prefix}/share/grass-7.2.2"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ configure.args-append -DGRASS_PREFIX7=${prefix}/share/grass-${grass_version}
</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 4a9be79..f7265ac 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;'>@@ -13,9 +13,9 @@
</span> + <key>GRASS_PROJSHARE</key>
+ <string>@@@/lib/proj47/share/proj</string>
+ <key>GRASS_VERSION</key>
<span style='display:block; white-space:pre;background:#ffe0e0;'>-+ <string>7.2.2</string>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ <string>@GRASS_VERSION@</string>
</span> + <key>GRASS_LD_LIBRARY_PATH</key>
<span style='display:block; white-space:pre;background:#ffe0e0;'>-+ <string>@@@/share/grass-7.2.2/lib</string>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ <string>@@@/share/grass-@GRASS_VERSION@/lib</string>
</span> + <key>GRASS_PERL</key>
+ <string>@@@/bin/perl</string>
+ </dict>
</pre><pre style='margin:0'>
</pre>