<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/aa5ac15e68c8482b21899ac05ab6fa1b1cc989b1">https://github.com/macports/macports-ports/commit/aa5ac15e68c8482b21899ac05ab6fa1b1cc989b1</a></p>
<pre style="white-space: pre; background: #F8F8F8"><span style='display:block; white-space:pre;color:#808000;'>commit aa5ac15e68c8482b21899ac05ab6fa1b1cc989b1
</span>Author: Ryan Schmidt <ryandesign@macports.org>
AuthorDate: Fri Jan 13 03:38:56 2023 -0600
<span style='display:block; white-space:pre;color:#404040;'> graphviz: Update to 7.0.6
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> Work around MacPorts base bug with symlinks to symlinks to manpages.
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> See: https://trac.macports.org/ticket/61288
</span>---
graphics/graphviz/Portfile | 11 ++++-----
.../files/patch-cmd-gvedit-Makefile.in.diff | 6 ++---
.../files/patch-cmd-tools-Makefile.am.diff | 16 +++++++++++++
graphics/graphviz/files/smyrna.patch | 26 ----------------------
4 files changed, 25 insertions(+), 34 deletions(-)
<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 b3fd0f83e90..fb032308657 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,10 +8,10 @@ PortGroup compiler_blacklist_versions 1.0
</span>
name graphviz
set my_name graphviz
<span style='display:block; white-space:pre;background:#ffe0e0;'>-version 7.0.1
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-checksums rmd160 32381de5a2e001c64ecc5517dfc70fcf80ab9ecc \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- sha256 f2b9fe880ff750f93b16777adacfebcef152760b29a3c3ad944c908896447b03 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- size 27582600
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+version 7.0.6
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+checksums rmd160 2c306aa3bfc87f59c516426fea7fdad9431b220c \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ sha256 8f979c23323c3e877f824dd1bd204de691c98d31cd3e7c507b693f1adea9f583 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ size 27564342
</span>
set thisbranch [strsed ${name} "g/^${my_name}//"]
set otherbranch [expr {${thisbranch} eq {} ? {-devel} : {}}]
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -88,7 +88,7 @@ depends_lib path:include/turbojpeg.h:libjpeg-turbo \
</span>
depends_run port:urw-fonts
<span style='display:block; white-space:pre;background:#ffe0e0;'>-patchfiles smyrna.patch
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+patchfiles patch-cmd-tools-Makefile.am.diff
</span>
configure.args --disable-silent-rules \
--with-codegens \
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -136,6 +136,7 @@ configure.args --disable-silent-rules \
</span> ac_cv_prog_AWK=/usr/bin/awk
# Teach glibtool about -stdlib=libc++
<span style='display:block; white-space:pre;background:#e0ffe0;'>+# Also we are patching Makefile.am.
</span> use_autoreconf yes
autoreconf.args -fvi
configure.checks.implicit_function_declaration.whitelist-append strchr
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/graphics/graphviz/files/patch-cmd-gvedit-Makefile.in.diff b/graphics/graphviz/files/patch-cmd-gvedit-Makefile.in.diff
</span><span style='display:block; white-space:pre;color:#808080;'>index 099845ad4e8..25ca9f971e2 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/graphics/graphviz/files/patch-cmd-gvedit-Makefile.in.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/graphics/graphviz/files/patch-cmd-gvedit-Makefile.in.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;'>---- cmd/gvedit/Makefile.in.orig 2022-10-11 13:31:41.000000000 -0500
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ cmd/gvedit/Makefile.in 2022-10-30 06:35:18.000000000 -0500
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -121,9 +121,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- cmd/gvedit/Makefile.in.orig 2023-01-05 23:17:02.000000000 -0600
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ cmd/gvedit/Makefile.in 2023-01-11 23:00:07.000000000 -0600
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -123,9 +123,7 @@
</span> gvedit-mdichild.$(OBJEXT) $(am__objects_1)
gvedit_OBJECTS = $(am_gvedit_OBJECTS)
am__DEPENDENCIES_1 =
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/graphics/graphviz/files/patch-cmd-tools-Makefile.am.diff b/graphics/graphviz/files/patch-cmd-tools-Makefile.am.diff
</span>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 00000000000..84cbbaaf6a9
</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/patch-cmd-tools-Makefile.am.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -0,0 +1,16 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+Work around MacPorts base bug with symlinks to symlinks to manpages.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+https://trac.macports.org/ticket/61288
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- cmd/tools/Makefile.am.orig 2022-12-03 10:34:35.000000000 -0600
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ cmd/tools/Makefile.am 2022-12-06 09:21:50.000000000 -0600
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -38,9 +38,9 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if ENABLE_MAN_PDFS
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ (cd $(DESTDIR)$(pdfdir); rm -f gxl2dot.1.pdf; $(LN_S) gxl2gv.1.pdf gxl2dot.1.pdf;)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ endif
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- (cd $(DESTDIR)$(man1dir); rm -f dot2gxl.1; $(LN_S) gv2gxl.1 dot2gxl.1;)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ (cd $(DESTDIR)$(man1dir); rm -f dot2gxl.1; $(LN_S) gxl2gv.1 dot2gxl.1;)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if ENABLE_MAN_PDFS
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- (cd $(DESTDIR)$(pdfdir); rm -f dot2gxl.1.pdf; $(LN_S) gv2gxl.1.pdf dot2gxl.1.pdf;)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ (cd $(DESTDIR)$(pdfdir); rm -f dot2gxl.1.pdf; $(LN_S) gxl2gv.1.pdf dot2gxl.1.pdf;)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ endif
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ (cd $(DESTDIR)$(man1dir); rm -f gv2gml.1; $(LN_S) gml2gv.1 gv2gml.1;)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if ENABLE_MAN_PDFS
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/graphics/graphviz/files/smyrna.patch b/graphics/graphviz/files/smyrna.patch
</span>deleted file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index ace8e69bacc..00000000000
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/graphics/graphviz/files/smyrna.patch
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,26 +0,0 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-smyrna: fix 'path' compilation error on macOS
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-https://gitlab.com/graphviz/graphviz/-/issues/2315
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-https://gitlab.com/graphviz/graphviz/-/commit/69732da019b906551399748c2ff8a4308a29fdf4
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-smyrna: fix 'readlink' compilation error on macOS
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-https://gitlab.com/graphviz/graphviz/-/commit/ac70917bd9494a32032988e8abc7094cc9a8fa3e
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- cmd/smyrna/main.c.orig
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ cmd/smyrna/main.c
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -50,7 +50,7 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #include <sys/types.h>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #endif
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--#if !defined(__APPLE__) && !defined(_WIN32)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#if !defined(_WIN32)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #include <unistd.h>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #endif
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -212,7 +212,7 @@ static char *find_me(void) {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- assert(rc != 0);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- assert(buf_size > 0);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- path = gv_alloc(buf_size);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ char *path = gv_alloc(buf_size);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- // retrieve the actual path
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if (_NSGetExecutablePath(path, &buf_size) < 0) {
</span></pre><pre style='margin:0'>
</pre>