<pre style='margin:0'>
Ryan Schmidt (ryandesign) pushed a commit to branch master
in repository macports-ports.
</pre>
<p><a href="https://github.com/macports/macports-ports/commit/8138ed33fa6ece86f87fd90d470daf6e28b406d8">https://github.com/macports/macports-ports/commit/8138ed33fa6ece86f87fd90d470daf6e28b406d8</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 8138ed33fa6 graphviz, graphviz-devel: Fix implicit declaration
</span>8138ed33fa6 is described below
<span style='display:block; white-space:pre;color:#808000;'>commit 8138ed33fa6ece86f87fd90d470daf6e28b406d8
</span>Author: Ryan Schmidt <ryandesign@macports.org>
AuthorDate: Thu Aug 27 15:27:28 2020 -0500
<span style='display:block; white-space:pre;color:#404040;'> graphviz, graphviz-devel: Fix implicit declaration
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> Closes: https://trac.macports.org/ticket/61036
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> Also fix an incorrect pointer comparison in lefty.
</span>---
graphics/graphviz-devel/Portfile | 4 +++-
graphics/graphviz-devel/files/implicit.patch | 25 +++++++++++++++++++++++++
graphics/graphviz/Portfile | 5 +++--
graphics/graphviz/files/implicit.patch | 25 +++++++++++++++++++++++++
4 files changed, 56 insertions(+), 3 deletions(-)
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/graphics/graphviz-devel/Portfile b/graphics/graphviz-devel/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 4a43d8ffce4..fbe215cd5bb 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/graphics/graphviz-devel/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/graphics/graphviz-devel/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -39,7 +39,7 @@ checksums rmd160 f5680f1d6b1e67af9e874732cd0c60465b23d587
</span> minimum_xcodeversions {9 3.1.2}
if {${name} eq ${subport}} {
<span style='display:block; white-space:pre;background:#ffe0e0;'>-revision 1
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+revision 2
</span>
conflicts graphviz${otherbranch}
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -59,6 +59,8 @@ depends_lib port:jpeg \
</span>
depends_run port:urw-fonts
<span style='display:block; white-space:pre;background:#e0ffe0;'>+patchfiles implicit.patch
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span> configure.args --disable-silent-rules \
--with-codegens \
--without-x \
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/graphics/graphviz-devel/files/implicit.patch b/graphics/graphviz-devel/files/implicit.patch
</span>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 00000000000..18c609fd509
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--- /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/graphics/graphviz-devel/files/implicit.patch
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -0,0 +1,25 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+Fix "error: implicit declaration of function 'makeTetrix'" and another
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+problem fixed by the same upstream commit.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+https://gitlab.com/graphviz/graphviz/-/commit/b4947d67a4ebd48ca0105d44f92e47f044e51600
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- cmd/lefty/dot2l/dotlex.c.orig 2016-08-09 16:02:09.000000000 -0500
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ cmd/lefty/dot2l/dotlex.c 2020-08-27 14:52:49.000000000 -0500
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -252,7 +252,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ char *q;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ q = lexbuf;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- if (p == '\0')
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ if (!p || *p == '\0')
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ return NULL;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ while (isalnum (*p) || (*p == '_') || (!isascii (*p)))
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ *q++ = *p++;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- cmd/tools/gvgen.c.orig 2017-01-18 23:43:35.000000000 -0600
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ cmd/tools/gvgen.c 2020-08-27 14:52:49.000000000 -0500
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -453,6 +453,8 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ fprintf(opts.outfile, "}\ngraph {\n");
</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;'>++extern void makeTetrix(int depth, edgefn ef);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ int main(int argc, char *argv[])
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ GraphType graphType;
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/graphics/graphviz/Portfile b/graphics/graphviz/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index b42c5c25773..b0204d919e3 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/graphics/graphviz/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/graphics/graphviz/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -8,7 +8,6 @@ PortGroup xcodeversion 1.0
</span> name graphviz
set my_name graphviz
version 2.40.1
<span style='display:block; white-space:pre;background:#ffe0e0;'>-revision 2
</span> set thisbranch [strsed ${name} "g/^${my_name}//"]
set otherbranch [expr {${thisbranch} eq {} ? {-devel} : {}}]
categories graphics
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -39,7 +38,7 @@ checksums rmd160 8fc103fc519e07e9db522ec2f748838571c71acf
</span> minimum_xcodeversions {9 3.1.2}
if {${name} eq ${subport}} {
<span style='display:block; white-space:pre;background:#ffe0e0;'>-revision 2
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+revision 3
</span>
conflicts graphviz${otherbranch}
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -59,6 +58,8 @@ depends_lib port:jpeg \
</span>
depends_run port:urw-fonts
<span style='display:block; white-space:pre;background:#e0ffe0;'>+patchfiles implicit.patch
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span> configure.args --disable-silent-rules \
--with-codegens \
--without-x \
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/graphics/graphviz/files/implicit.patch b/graphics/graphviz/files/implicit.patch
</span>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 00000000000..dd174761a9a
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--- /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/graphics/graphviz/files/implicit.patch
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -0,0 +1,25 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+Fix "error: implicit declaration of function 'makeTetrix'" and another
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+problem fixed by the same upstream commit.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+https://gitlab.com/graphviz/graphviz/-/commit/b4947d67a4ebd48ca0105d44f92e47f044e51600
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- cmd/lefty/dot2l/dotlex.c.orig 2016-08-09 16:02:09.000000000 -0500
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ cmd/lefty/dot2l/dotlex.c 2020-08-27 14:45:45.000000000 -0500
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -252,7 +252,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ char *q;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ q = lexbuf;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- if (p == '\0')
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ if (!p || *p == '\0')
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ return NULL;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ while (isalnum (*p) || (*p == '_') || (!isascii (*p)))
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ *q++ = *p++;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- cmd/tools/gvgen.c.orig 2016-11-22 23:43:56.000000000 -0600
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ cmd/tools/gvgen.c 2020-08-27 14:45:45.000000000 -0500
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -458,6 +458,8 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ fprintf(opts.outfile, "}\ngraph {\n");
</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;'>++extern void makeTetrix(int depth, edgefn ef);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ int main(int argc, char *argv[])
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ GraphType graphType;
</span></pre><pre style='margin:0'>
</pre>