<pre style='margin:0'>
Takeshi Enomoto (tenomoto) pushed a commit to branch master
in repository macports-ports.
</pre>
<p><a href="https://github.com/macports/macports-ports/commit/f4582aa083a486351aaf1ffb80ede42196512dab">https://github.com/macports/macports-ports/commit/f4582aa083a486351aaf1ffb80ede42196512dab</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 f4582aa083a ncarg: Fix duplicate symbol errors with gcc10 (#9528)
</span>f4582aa083a is described below
<span style='display:block; white-space:pre;color:#808000;'>commit f4582aa083a486351aaf1ffb80ede42196512dab
</span>Author: Dave Allured <dave.allured@noaa.gov>
AuthorDate: Mon Dec 28 22:27:40 2020 -0700
<span style='display:block; white-space:pre;color:#404040;'> ncarg: Fix duplicate symbol errors with gcc10 (#9528)
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> * ncarg: fix duplicate symbols with gcc10
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> Fix multiple definitions of 4 global symbols. 3 source files changed.
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> * ncarg: add patch file to fix duplicate symbols
</span>---
science/ncarg/Portfile | 1 +
.../ncarg/files/patch-ni-src-ncl-global-vars.diff | 38 ++++++++++++++++++++++
2 files changed, 39 insertions(+)
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/science/ncarg/Portfile b/science/ncarg/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 9c674fd730a..47889d88b14 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/science/ncarg/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/science/ncarg/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -85,6 +85,7 @@ patchfiles patch-Configure.diff \
</span> patch-ncarg2d-src-bin-ezmapdemo-yMakefile.diff \
patch-ncarg2d-src-bin-tdpackdemo-yMakefile.diff \
patch-ngmath-src-bin-nnalg-yMakefile.diff \
<span style='display:block; white-space:pre;background:#e0ffe0;'>+ patch-ni-src-ncl-global-vars.diff \
</span> patch-ncarg2d-src-libncarg_gks-bwi-argb2ci.f.diff
if {$build_arch eq "x86_64"} {
patchfiles-append patch-config-ymake.diff
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/science/ncarg/files/patch-ni-src-ncl-global-vars.diff b/science/ncarg/files/patch-ni-src-ncl-global-vars.diff
</span>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 00000000000..c6f7bb4c728
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--- /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/science/ncarg/files/patch-ni-src-ncl-global-vars.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -0,0 +1,38 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- ni/src/ncl/NclApi.c.orig 2019-02-27 16:44:39.000000000 -0700
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ ni/src/ncl/NclApi.c 2020-12-10 17:35:44.000000000 -0700
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -140,9 +140,10 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ extern char *the_input_buffer_ptr;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ extern int the_input_buffer_size;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-FILE *thefptr;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-FILE *theoptr;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-int cmd_line;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++extern FILE *thefptr;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++extern FILE *theoptr;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++extern int cmd_line;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ extern int cur_line_number;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ extern char *cur_line_text;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ extern int cur_line_maxsize;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- ni/src/ncl/NclHDF5.c.orig 2019-02-27 16:44:39.000000000 -0700
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ ni/src/ncl/NclHDF5.c 2020-12-09 21:12:16.000000000 -0700
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -240,7 +240,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #define NUMPOSDIMNAMES 6
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-NclQuark possibleDimNames[NUMPOSDIMNAMES];
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++static NclQuark possibleDimNames[NUMPOSDIMNAMES];
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ static int _H5_initializeOptions
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #if NhlNeedProto
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- ni/src/ncl/NclNewHDF5.c.orig 2019-02-27 16:44:39.000000000 -0700
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ ni/src/ncl/NclNewHDF5.c 2020-12-09 21:13:25.000000000 -0700
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -82,7 +82,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #define NUMPOSDIMNAMES 6
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-NclQuark possibleDimNames[NUMPOSDIMNAMES];
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++static NclQuark possibleDimNames[NUMPOSDIMNAMES];
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #ifndef FALSE
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #define FALSE 0
</span></pre><pre style='margin:0'>
</pre>