<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/fdc80cd761af072aa4ec52f0a5082f8c0c5135de">https://github.com/macports/macports-ports/commit/fdc80cd761af072aa4ec52f0a5082f8c0c5135de</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 fdc80cd761a ncplot: Update to latest git commit - Use proper build args - Update dependencies
</span>fdc80cd761a is described below
<span style='display:block; white-space:pre;color:#808000;'>commit fdc80cd761af072aa4ec52f0a5082f8c0c5135de
</span>Author: Frank Schima <mf2k@macports.org>
AuthorDate: Wed Feb 2 13:52:06 2022 -0700
<span style='display:block; white-space:pre;color:#404040;'> ncplot: Update to latest git commit
</span><span style='display:block; white-space:pre;color:#404040;'> - Use proper build args
</span><span style='display:block; white-space:pre;color:#404040;'> - Update dependencies
</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/64559
</span>---
science/ncplot/Portfile | 16 +++++++++------
science/ncplot/files/patch-Makefile.diff | 34 +++++++++++++++++++++-----------
2 files changed, 32 insertions(+), 18 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 10998c6fd76..4e6e6695b5b 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,7 +3,8 @@
</span> PortSystem 1.0
PortGroup github 1.0
<span style='display:block; white-space:pre;background:#ffe0e0;'>-github.setup ncar ncplot 4.9.12 v
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+github.setup ncar ncplot 5302748
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+version 4.9.12-5302748
</span> revision 0
epoch 1
<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 5ee75427ebc524706920c2801129d64db6811f8f \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- sha256 27916e8e90f3e8d166375ab6fc9acc66b3a14f44d257e9bd4d7f1a42f191e372 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- size 132468
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+checksums rmd160 0a1bb01a0c5c990ea08cb60a0581bf0fe10c8a2c \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ sha256 92aee3b9c620a86f9cd49cf7289b90fbf99d88ca3b6207f37a990bcbcdacc8fe \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ size 132497
</span>
patchfiles patch-geopolmap.c.diff \
patch-Makefile.diff
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -35,16 +36,19 @@ post-patch {
</span> use_configure no
build.target
<span style='display:block; white-space:pre;background:#ffe0e0;'>-build.args CC="${configure.cxx} [get_canonical_archflags cxx]" \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+build.args CC="${configure.cc} [get_canonical_archflags cc]" \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ CXX="${configure.cxx} [get_canonical_archflags cxx]" \
</span> INCL="${configure.cppflags}" \
LIB="${configure.ldflags}"
depends_lib-append port:gsl \
port:libpng \
port:netcdf \
<span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:netcdf-cxx \
</span> port:openmotif \
port:xorg-libX11 \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- port:xorg-libXt
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:xorg-libXt \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:zlib
</span>
depends_run port:gmt6
<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 2a6d8876022..34324dc34f4 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,6 +1,6 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- Makefile.orig 2021-05-30 09:38:27.000000000 -0600
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ Makefile 2022-01-29 08:48:02.000000000 -0700
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -14,12 +14,12 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- Makefile.orig 2022-02-02 12:46:06.000000000 -0700
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ Makefile 2022-02-02 12:47:09.000000000 -0700
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -11,13 +11,13 @@
</span> # yum install flex-devel netcdf-devel motif-devel gsl-devel \
# xorg-x11-fonts-ISO8859-1-75dpi xorg-x11-fonts-ISO8859-1-100dpi
#
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -10,34 +10,44 @@
</span> -NCH_DEP = /usr/include/netcdf.h
-LIBS = -lXm -lXt -lX11 -lnetcdf -lhdf5 -lhdf5_hl -lfl -lgsl -lgslcblas -lpng -lpthread
-BIN = ${JLOCAL}/bin
<span style='display:block; white-space:pre;background:#e0ffe0;'>+-WWW = /net/www/docs/raf/Software
</span> +#DEFINES = -DPNG
+#INCLUDES=
+#LIB_DIRS=
+#NCH_DEP = /usr/include/netcdf.h
+#LIBS = -lXm -lXt -lX11 -lnetcdf -lhdf5 -lhdf5_hl -lfl -lgsl -lgslcblas -lpng -lpthread
+#BIN = ${JLOCAL}/bin
<span style='display:block; white-space:pre;background:#e0ffe0;'>++#WWW = /net/www/docs/raf/Software
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span>
# Linux Ubuntu
<span style='display:block; white-space:pre;background:#ffe0e0;'>- #
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -42,14 +42,14 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -41,9 +41,9 @@
</span> # brew install gmt ; for geo-politcal maps.
# brew install whatever else
#
-#DEFINES = -DPNG
<span style='display:block; white-space:pre;background:#ffe0e0;'>--#INCLUDES= -I/opt/X11/include
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--#LIB_DIRS= -L/opt/X11/lib
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--#NCH_DEP = /usr/local/include/netcdf.h
</span> -#LIBS = -lXm -lXt -lX11 -lnetcdf -ll -lgsl -lpng -lpthread
-#BIN = /usr/local/bin
+DEFINES = -DPNG
<span style='display:block; white-space:pre;background:#e0ffe0;'>++LIBS = -lXm -lXt -lX11 -lnetcdf -ll -lgsl -lpng -lpthread
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++BIN = @@PREFIX@@/bin
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # Homebrew
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #INCLUDES=
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -51,12 +51,12 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #NCH_DEP = /usr/local/include/netcdf.h
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # MacPorts
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-#INCLUDES= -I/opt/local/include
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-#LIB_DIRS= -L/opt/local/lib
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-#NCH_DEP = /opt/local/include/netcdf.h
</span> +INCLUDES= -I@@PREFIX@@/include
+LIB_DIRS= -L@@PREFIX@@/lib
+NCH_DEP = @@PREFIX@@/include/netcdf.h
<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;'>--CFLAGS = -Wall -g -O2 ${INCLUDES} ${DEFINES} -Wno-write-strings -Wno-overflow
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+CFLAGS = -Wall -g -Os ${INCLUDES} ${DEFINES} -Wno-write-strings -Wno-overflow
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</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;background:#e0ffe0;'>++CXXFLAGS = -Wall -g -Os ${INCLUDES} ${DEFINES} -Wno-write-strings -Wno-overflow
</span>
PROG = ncplot
HDRS = define.h extern.h
</pre><pre style='margin:0'>
</pre>