<pre style='margin:0'>
Frank Schima (mf2k) pushed a commit to branch master
in repository macports-ports.
</pre>
<p><a href="https://github.com/macports/macports-ports/commit/19ff530ec8db60472d37affce4cccaff70ce61c8">https://github.com/macports/macports-ports/commit/19ff530ec8db60472d37affce4cccaff70ce61c8</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 19ff530ec8d ncplot: Add gmt6 support
</span>19ff530ec8d is described below
<span style='display:block; white-space:pre;color:#808000;'>commit 19ff530ec8db60472d37affce4cccaff70ce61c8
</span>Author: Frank Schima <mf2k@macports.org>
AuthorDate: Wed Jul 29 14:07:43 2020 -0600
<span style='display:block; white-space:pre;color:#404040;'> ncplot: Add gmt6 support
</span>---
science/ncplot/Portfile | 8 +++++--
science/ncplot/files/patch-geopolmap.c.diff | 37 +++++++++++++++++++++++++++++
2 files changed, 43 insertions(+), 2 deletions(-)
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/science/ncplot/Portfile b/science/ncplot/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index f2be6e8fe4f..eb1705cdebd 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/science/ncplot/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/science/ncplot/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -5,7 +5,7 @@ PortGroup github 1.0
</span>
github.setup ncar ncplot 270652dcbcca56e8baad33177b3ebc9e171cee19
version 2020-07-28
<span style='display:block; white-space:pre;background:#ffe0e0;'>-revision 0
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+revision 1
</span>
platforms darwin
categories science
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -25,9 +25,11 @@ checksums rmd160 682b2eef5c910f1980924e0fb23ab7a9f29b9729 \
</span> sha256 c615cccccfb1ad9bfd5a9737a9ffe8662d8a36628634f90e0fdd70df3506832c \
size 131764
<span style='display:block; white-space:pre;background:#ffe0e0;'>-patchfiles patch-Makefile.diff
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+patchfiles patch-geopolmap.c.diff \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ patch-Makefile.diff
</span>
post-patch {
<span style='display:block; white-space:pre;background:#e0ffe0;'>+ reinplace "s|@@PREFIX@@|${prefix}|g" ${worksrcpath}/geopolmap.c
</span> reinplace "s|@@PREFIX@@|${prefix}|g" ${worksrcpath}/Makefile
}
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -45,6 +47,8 @@ depends_lib-append port:gsl \
</span> port:xorg-libX11 \
port:xorg-libXt
<span style='display:block; white-space:pre;background:#e0ffe0;'>+depends_run port:gmt6
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span> # Makefile does not support destroot
destroot {
xinstall -m 755 ${worksrcpath}/ncplot ${destroot}${prefix}/bin/ncplot
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/science/ncplot/files/patch-geopolmap.c.diff b/science/ncplot/files/patch-geopolmap.c.diff
</span>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 00000000000..4cb2ef36079
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--- /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/science/ncplot/files/patch-geopolmap.c.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -0,0 +1,37 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- geopolmap.c.orig 2020-07-28 10:26:38.000000000 -0600
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ geopolmap.c 2020-07-29 13:59:08.000000000 -0600
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -303,7 +303,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ char test_path[128];
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ strcpy(test_path, env);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- strcat(test_path, "/bin/gmt");
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ strcat(test_path, "/bin/gmt6");
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ stat(test_path, &sb);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if ((sb.st_mode & S_IFMT) == S_IFREG) {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -313,13 +313,13 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- stat("/usr/local/bin/gmt", &sb);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ stat("@@PREFIX@@/bin/gmt6", &sb);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if ((sb.st_mode & S_IFMT) == S_IFREG) {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- strcpy(gmt_path, "/usr/local");
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ strcpy(gmt_path, "@@PREFIX@@");
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ rc = true;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- stat("/bin/gmt", &sb);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ stat("/bin/gmt6", &sb);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if ((sb.st_mode & S_IFMT) == S_IFREG) {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ rc = true;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -356,7 +356,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ /* GMT5 only supports one of borders, shores, or rivers in in one command.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ * So now we have to string multiple pscoast commands together.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ */
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- sprintf(command, "%s/bin/gmt pscoast -R%d/%d/%d/%d -M -Jx1d %s",
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ sprintf(command, "%s/bin/gmt6 pscoast -R%d/%d/%d/%d -M -Jx1d %s",
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ gmt_path, xMin, xMax, yMin, yMax, scale_str);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ sprintf(buf, "(%s -Na; %s -W;", command, command);
</span></pre><pre style='margin:0'>
</pre>