<pre style='margin:0'>
Marcus Calhoun-Lopez (MarcusCalhoun-Lopez) pushed a commit to branch master
in repository macports-ports.
</pre>
<p><a href="https://github.com/macports/macports-ports/commit/d0545de12a168ad3e2ba36a7fd3415ac7f5f518f">https://github.com/macports/macports-ports/commit/d0545de12a168ad3e2ba36a7fd3415ac7f5f518f</a></p>
<pre style="white-space: pre; background: #F8F8F8"><span style='display:block; white-space:pre;color:#808000;'>commit d0545de12a168ad3e2ba36a7fd3415ac7f5f518f
</span>Author: Marcus Calhoun-Lopez <mcalhoun@macports.org>
AuthorDate: Sat Sep 7 23:26:37 2019 -0700
<span style='display:block; white-space:pre;color:#404040;'> gdal: fix install location of bash-completion file
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> Fixes https://trac.macports.org/ticket/58948
</span>---
gis/gdal/Portfile | 5 ++++-
gis/gdal/files/patch-bash-completion-location.diff | 11 +++++++++++
2 files changed, 15 insertions(+), 1 deletion(-)
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/gis/gdal/Portfile b/gis/gdal/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index d7a2087..50bf2c1 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/gis/gdal/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/gis/gdal/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -11,7 +11,7 @@ PortGroup legacysupport 1.0
</span> mpi.setup
github.setup OSGeo gdal 3.0.1 v
<span style='display:block; white-space:pre;background:#ffe0e0;'>-revision 1
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+revision 2
</span> categories gis
license MIT BSD
platforms darwin
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -48,6 +48,9 @@ platform darwin {
</span> }
}
<span style='display:block; white-space:pre;background:#e0ffe0;'>+# see https://trac.macports.org/ticket/58948
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+patchfiles-append patch-bash-completion-location.diff
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span> # As suggested by Ryan in #56908
compiler.blacklist-append {clang < 800}
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/gis/gdal/files/patch-bash-completion-location.diff b/gis/gdal/files/patch-bash-completion-location.diff
</span>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 0000000..b3d4f5d
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--- /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/gis/gdal/files/patch-bash-completion-location.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -0,0 +1,11 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- scripts/GNUmakefile.orig 2019-06-28 02:38:47.000000000 -0700
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ scripts/GNUmakefile 2019-09-07 21:27:36.000000000 -0700
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -5,6 +5,6 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ install:
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if test "x`pkg-config --version 2>/dev/null`" != "x" -a "x`pkg-config --variable=compatdir bash-completion`" != "x"; then \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- $(INSTALL_DIR) $(DESTDIR)${prefix}`pkg-config --variable=compatdir bash-completion` ; \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- cp gdal-bash-completion.sh $(DESTDIR)${prefix}`pkg-config --variable=compatdir bash-completion`; \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ $(INSTALL_DIR) $(DESTDIR)`pkg-config --variable=compatdir bash-completion` ; \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ cp gdal-bash-completion.sh $(DESTDIR)`pkg-config --variable=compatdir bash-completion`; \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ fi
</span></pre><pre style='margin:0'>
</pre>