<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/32211a6fe4e628196a7c0b939bbb3b76f5d6f147">https://github.com/macports/macports-ports/commit/32211a6fe4e628196a7c0b939bbb3b76f5d6f147</a></p>
<pre style="white-space: pre; background: #F8F8F8"><span style='display:block; white-space:pre;color:#808000;'>commit 32211a6fe4e628196a7c0b939bbb3b76f5d6f147
</span>Author: Ryan Schmidt <ryandesign@macports.org>
AuthorDate: Sat Dec 25 14:24:26 2021 -0600
<span style='display:block; white-space:pre;color:#404040;'> graphviz: Update to 2.50.0
</span>---
graphics/graphviz/Portfile | 22 +++---------
graphics/graphviz/files/implicit.patch | 25 --------------
graphics/graphviz/files/libtool-tag.patch | 16 ---------
graphics/graphviz/files/patch-xib-target.diff | 48 ---------------------------
graphics/graphviz/files/super-dealloc.patch | 20 -----------
5 files changed, 5 insertions(+), 126 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 38e7e85b4a4..a4b17b829ef 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,11 @@ PortGroup compiler_blacklist_versions 1.0
</span>
name graphviz
set my_name graphviz
<span style='display:block; white-space:pre;background:#ffe0e0;'>-version 2.49.3
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+version 2.50.0
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+checksums rmd160 76cc0668568f6bca1ddaf13b44106718fba8b04e \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ sha256 e17021a510bbd2770d4ca4b4eb841138122aaa5948f9e617e6bc12b4bac62e8d \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ size 29761610
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</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;'>@@ -31,10 +35,6 @@ long_description Graphviz is ${description}. Graph visualization
</span> simple text language, and produce output in a \
variety of visual and text formats.
<span style='display:block; white-space:pre;background:#ffe0e0;'>-checksums rmd160 e05acd8e1387ddf270ac192d55af80170fd4eab2 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- sha256 f79b203ddc98e0f994d218acd6cb490b962003be7145f7e31de05b6ab0e2ccbf \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- size 29753688
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span> # graphviz needs Xcode 3.1+ to avoid the libGL error when building the smyrna variant
# graphviz-gui needs Xcode 3.1.2+; see #18811
minimum_xcodeversions {9 3.1.2}
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -128,18 +128,6 @@ platform macosx {
</span> if {${os.major} > 8} {
configure.args-replace --without-quartz --with-quartz
}
<span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # This fix no longer applicable, as of the latest releases
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-# post-patch {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-# if {[string match *clang* ${configure.cxx}] && ${configure.cxx_stdlib} eq "libc++"} {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-# reinplace "s:-lstdc\+\+:-lc++:" \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-# ${worksrcpath}/configure.ac \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-# ${worksrcpath}/cmd/dot/Makefile.am \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-# ${worksrcpath}/cmd/edgepaint/Makefile.am \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-# ${worksrcpath}/cmd/mingle/Makefile.am \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-# ${worksrcpath}/plugin/gdiplus/Makefile.am
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-# }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-# }
</span> }
variant guile description {Include Guile language bindings} {
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/graphics/graphviz/files/implicit.patch b/graphics/graphviz/files/implicit.patch
</span>deleted file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index dd174761a9a..00000000000
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/graphics/graphviz/files/implicit.patch
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,25 +0,0 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-Fix "error: implicit declaration of function 'makeTetrix'" and another
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-problem fixed by the same upstream commit.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-https://gitlab.com/graphviz/graphviz/-/commit/b4947d67a4ebd48ca0105d44f92e47f044e51600
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- cmd/lefty/dot2l/dotlex.c.orig 2016-08-09 16:02:09.000000000 -0500
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ cmd/lefty/dot2l/dotlex.c 2020-08-27 14:45:45.000000000 -0500
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -252,7 +252,7 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- char *q;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- q = lexbuf;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- if (p == '\0')
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ if (!p || *p == '\0')
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- return NULL;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- while (isalnum (*p) || (*p == '_') || (!isascii (*p)))
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- *q++ = *p++;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- cmd/tools/gvgen.c.orig 2016-11-22 23:43:56.000000000 -0600
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ cmd/tools/gvgen.c 2020-08-27 14:45:45.000000000 -0500
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -458,6 +458,8 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- fprintf(opts.outfile, "}\ngraph {\n");
</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;'>-+extern void makeTetrix(int depth, edgefn ef);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- int main(int argc, char *argv[])
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- GraphType graphType;
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/graphics/graphviz/files/libtool-tag.patch b/graphics/graphviz/files/libtool-tag.patch
</span>deleted file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index f780f3a0b70..00000000000
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/graphics/graphviz/files/libtool-tag.patch
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,16 +0,0 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-Fix:
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-libtool: compile: unable to infer tagged configuration
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-https://gitlab.com/graphviz/graphviz/-/issues/2065
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-https://gitlab.com/graphviz/graphviz/-/merge_requests/1951
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- plugin/quartz/Makefile.am.orig 2016-08-09 16:02:10.000000000 -0500
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ plugin/quartz/Makefile.am 2021-05-08 06:48:41.000000000 -0500
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -39,5 +39,6 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if WITH_DARWIN9
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- libgvplugin_quartz_la_LDFLAGS += -Wl,-exported_symbol,_gvplugin_quartz_LTX_library
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--AM_LIBTOOLSFLAGS = --tag=CC
</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;'>-+AM_LIBTOOLFLAGS = --tag=CC
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/graphics/graphviz/files/patch-xib-target.diff b/graphics/graphviz/files/patch-xib-target.diff
</span>deleted file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 30c36eb8032..00000000000
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/graphics/graphviz/files/patch-xib-target.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,48 +0,0 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-diff -Naur macosx.orig/English.lproj/Attributes.xib macosx/English.lproj/Attributes.xib
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- macosx.orig/English.lproj/Attributes.xib 2016-08-09 23:02:10.000000000 +0200
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ macosx/English.lproj/Attributes.xib 2019-02-18 13:44:23.000000000 +0100
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -1,7 +1,7 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- <?xml version="1.0" encoding="UTF-8"?>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- <archive type="com.apple.InterfaceBuilder3.Cocoa.XIB" version="7.01">
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- <data>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- <int key="IBDocument.SystemTarget">1050</int>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ <int key="IBDocument.SystemTarget">1060</int>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- <string key="IBDocument.SystemVersion">9B18</string>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- <string key="IBDocument.InterfaceBuilderVersion">629</string>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- <string key="IBDocument.AppKitVersion">949</string>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-diff -Naur macosx.orig/English.lproj/Document.xib macosx/English.lproj/Document.xib
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- macosx.orig/English.lproj/Document.xib 2016-08-09 23:02:10.000000000 +0200
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ macosx/English.lproj/Document.xib 2019-02-18 13:44:44.000000000 +0100
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -1,7 +1,7 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- <?xml version="1.0" encoding="UTF-8"?>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- <archive type="com.apple.InterfaceBuilder3.Cocoa.XIB" version="7.01">
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- <data>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- <int key="IBDocument.SystemTarget">1050</int>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ <int key="IBDocument.SystemTarget">1060</int>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- <string key="IBDocument.SystemVersion">9C7010</string>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- <string key="IBDocument.InterfaceBuilderVersion">629</string>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- <string key="IBDocument.AppKitVersion">949.26</string>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-diff -Naur macosx.orig/English.lproj/Export.xib macosx/English.lproj/Export.xib
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- macosx.orig/English.lproj/Export.xib 2016-08-09 23:02:10.000000000 +0200
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ macosx/English.lproj/Export.xib 2019-02-18 13:44:38.000000000 +0100
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -1,7 +1,7 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- <?xml version="1.0" encoding="UTF-8"?>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- <archive type="com.apple.InterfaceBuilder3.Cocoa.XIB" version="7.01">
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- <data>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- <int key="IBDocument.SystemTarget">1050</int>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ <int key="IBDocument.SystemTarget">1060</int>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- <string key="IBDocument.SystemVersion">9C7010</string>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- <string key="IBDocument.InterfaceBuilderVersion">629</string>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- <string key="IBDocument.AppKitVersion">949.26</string>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-diff -Naur macosx.orig/English.lproj/MainMenu.xib macosx/English.lproj/MainMenu.xib
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- macosx.orig/English.lproj/MainMenu.xib 2016-08-09 23:02:10.000000000 +0200
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ macosx/English.lproj/MainMenu.xib 2019-02-18 13:44:30.000000000 +0100
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -1,7 +1,7 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- <?xml version="1.0" encoding="UTF-8"?>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- <archive type="com.apple.InterfaceBuilder3.Cocoa.XIB" version="7.01">
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- <data>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- <int key="IBDocument.SystemTarget">1050</int>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ <int key="IBDocument.SystemTarget">1060</int>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- <string key="IBDocument.SystemVersion">9E17</string>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- <string key="IBDocument.InterfaceBuilderVersion">629</string>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- <string key="IBDocument.AppKitVersion">949.33</string>
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/graphics/graphviz/files/super-dealloc.patch b/graphics/graphviz/files/super-dealloc.patch
</span>deleted file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 12cdd055101..00000000000
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/graphics/graphviz/files/super-dealloc.patch
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,20 +0,0 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-Always call [super dealloc].
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-https://gitlab.com/graphviz/graphviz/-/commit/c170fab4197952b8cbeae5b4498ff13763da9b55
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- macosx/GVWindowController.m.orig
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ macosx/GVWindowController.m
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -116,14 +116,8 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- - (void)dealloc
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- char darwinStr[256];
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- size_t size = sizeof(darwinStr);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- [[NSNotificationCenter defaultCenter] removeObserver:self name:@"GVGraphDocumentDidChange" object:[self document]];
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- sysctlbyname("kern.osrelease", darwinStr, &size, NULL, 0);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- NSString *darwinVer = [NSString stringWithCString:darwinStr encoding:NSASCIIStringEncoding];
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- NSString *baseVer = @"11";
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- if ([darwinVer compare:baseVer] < 0)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- [super dealloc];
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ [super dealloc];
</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;'>-
</span></pre><pre style='margin:0'>
</pre>