<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/067700bcf704a767cfcbb431507f7842110396ac">https://github.com/macports/macports-ports/commit/067700bcf704a767cfcbb431507f7842110396ac</a></p>
<pre style="white-space: pre; background: #F8F8F8"><span style='display:block; white-space:pre;color:#808000;'>commit 067700bcf704a767cfcbb431507f7842110396ac
</span>Author: Frank Schima <macsforever2000@gmail.com>
AuthorDate: Fri Nov 25 12:12:16 2022 -0700
<span style='display:block; white-space:pre;color:#404040;'> ncplot: Update to version 4.11.0
</span><span style='display:block; white-space:pre;color:#404040;'> - Re-create patchfiles
</span><span style='display:block; white-space:pre;color:#404040;'> - add platforms
</span>---
science/ncplot/Portfile | 9 +++---
science/ncplot/files/patch-Makefile.diff | 48 +++--------------------------
science/ncplot/files/patch-geopolmap.c.diff | 14 ++++++---
3 files changed, 19 insertions(+), 52 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 ff0ad74f7a3..2de55caa96e 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;'>@@ -3,13 +3,14 @@
</span> PortSystem 1.0
PortGroup github 1.0
<span style='display:block; white-space:pre;background:#ffe0e0;'>-github.setup ncar ncplot 4.9.14 v
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+github.setup ncar ncplot 4.11.0 v
</span> revision 0
epoch 1
categories science
license permissive
maintainers {mf2k @mf2k} openmaintainer
<span style='display:block; white-space:pre;background:#e0ffe0;'>+platforms any
</span>
description ncplot is an interactive plotting tool
long_description ncplot is an interactive plotting tool that allows the user to \
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -20,9 +21,9 @@ long_description ncplot is an interactive plotting tool that allows the user
</span>
homepage https://archive.eol.ucar.edu/raf/Software/ncplot.html
<span style='display:block; white-space:pre;background:#ffe0e0;'>-checksums rmd160 1338536335a881915fd9757120e69815fd4079ce \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- sha256 b223ca5fb5c14c56ce1d2b51534d6b13e2bb5c559dea815578cbef55130975aa \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- size 132225
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+checksums rmd160 f5b49b5b7f4c75422950d875d44a15cf2d29d330 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ sha256 c2ec218031e87f71f1f2d6769fd567bb1b2e94ef91acca0db42ba18af1b44b52 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ size 133649
</span>
patchfiles patch-geopolmap.c.diff \
patch-Makefile.diff
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/science/ncplot/files/patch-Makefile.diff b/science/ncplot/files/patch-Makefile.diff
</span><span style='display:block; white-space:pre;color:#808080;'>index 34324dc34f4..89807ba065a 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/science/ncplot/files/patch-Makefile.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/science/ncplot/files/patch-Makefile.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,41 +1,7 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- Makefile.orig 2022-02-02 12:46:06.000000000 -0700
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ Makefile 2022-02-02 12:47:09.000000000 -0700
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -11,13 +11,13 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # yum install flex-devel netcdf-devel motif-devel gsl-devel \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # xorg-x11-fonts-ISO8859-1-75dpi xorg-x11-fonts-ISO8859-1-100dpi
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--DEFINES = -DPNG
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--INCLUDES=
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--LIB_DIRS=
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--NCH_DEP = /usr/include/netcdf.h
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--LIBS = -lXm -lXt -lX11 -lnetcdf -lhdf5 -lhdf5_hl -lfl -lgsl -lgslcblas -lpng -lpthread
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--BIN = ${JLOCAL}/bin
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--WWW = /net/www/docs/raf/Software
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#DEFINES = -DPNG
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#INCLUDES=
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#LIB_DIRS=
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#NCH_DEP = /usr/include/netcdf.h
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#LIBS = -lXm -lXt -lX11 -lnetcdf -lhdf5 -lhdf5_hl -lfl -lgsl -lgslcblas -lpng -lpthread
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#BIN = ${JLOCAL}/bin
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#WWW = /net/www/docs/raf/Software
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # Linux Ubuntu
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -41,9 +41,9 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # brew install gmt ; for geo-politcal maps.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # brew install whatever else
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--#DEFINES = -DPNG
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--#LIBS = -lXm -lXt -lX11 -lnetcdf -ll -lgsl -lpng -lpthread
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--#BIN = /usr/local/bin
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+DEFINES = -DPNG
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+LIBS = -lXm -lXt -lX11 -lnetcdf -ll -lgsl -lpng -lpthread
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+BIN = @@PREFIX@@/bin
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # Homebrew
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #INCLUDES=
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -51,12 +51,12 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #NCH_DEP = /usr/local/include/netcdf.h
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- Makefile.orig 2022-11-25 11:51:24
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ Makefile 2022-11-25 11:51:15
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -56,9 +56,9 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #NCH_DEP = /opt/homebrew/include/netcdf.h
</span>
# MacPorts
-#INCLUDES= -I/opt/local/include
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -46,8 +12,4 @@
</span> +NCH_DEP = @@PREFIX@@/include/netcdf.h
<span style='display:block; white-space:pre;background:#ffe0e0;'>--CXXFLAGS = -Wall -g -O2 ${INCLUDES} ${DEFINES} -Wno-write-strings -Wno-overflow
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+CXXFLAGS = -Wall -g -Os ${INCLUDES} ${DEFINES} -Wno-write-strings -Wno-overflow
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- PROG = ncplot
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- HDRS = define.h extern.h
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ CXXFLAGS = -Wall -g -O2 ${INCLUDES} ${DEFINES} -Wno-write-strings -Wno-overflow
</span><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><span style='display:block; white-space:pre;color:#808080;'>index 4cb2ef36079..6a311620ab8 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/science/ncplot/files/patch-geopolmap.c.diff
</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;'>@@ -1,5 +1,5 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- geopolmap.c.orig 2020-07-28 10:26:38.000000000 -0600
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ geopolmap.c 2020-07-29 13:59:08.000000000 -0600
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- geopolmap.c.orig 2022-11-25 12:07:10
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ geopolmap.c 2022-11-25 12:09:23
</span> @@ -303,7 +303,7 @@
char test_path[128];
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -9,10 +9,10 @@
</span>
stat(test_path, &sb);
if ((sb.st_mode & S_IFMT) == S_IFREG) {
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -313,13 +313,13 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -312,9 +312,9 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span> }
<span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span> - stat("/usr/local/bin/gmt", &sb);
+ stat("@@PREFIX@@/bin/gmt6", &sb);
if ((sb.st_mode & S_IFMT) == S_IFREG) {
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -21,12 +21,16 @@
</span> rc = true;
}
<span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -324,7 +324,7 @@
</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> - stat("/bin/gmt", &sb);
+ stat("/bin/gmt6", &sb);
if ((sb.st_mode & S_IFMT) == S_IFREG) {
rc = true;
}
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -356,7 +356,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -361,7 +361,7 @@
</span> /* GMT5 only supports one of borders, shores, or rivers in in one command.
* So now we have to string multiple pscoast commands together.
*/
</pre><pre style='margin:0'>
</pre>