<pre style='margin:0'>
Christopher Nielsen (mascguy) pushed a commit to branch master
in repository macports-ports.
</pre>
<p><a href="https://github.com/macports/macports-ports/commit/564fd38ea3598b80f10c97146e28809313c22d70">https://github.com/macports/macports-ports/commit/564fd38ea3598b80f10c97146e28809313c22d70</a></p>
<pre style="white-space: pre; background: #F8F8F8"><span style='display:block; white-space:pre;color:#808000;'>commit 564fd38ea3598b80f10c97146e28809313c22d70
</span>Author: Jonathan Stickel <jjstickel@gmail.com>
AuthorDate: Tue Apr 6 12:12:10 2021 -0600
<span style='display:block; white-space:pre;color:#404040;'> graphviz: update to 2.48.0
</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/63169
</span><span style='display:block; white-space:pre;color:#404040;'> Closes: https://trac.macports.org/ticket/62165
</span><span style='display:block; white-space:pre;color:#404040;'> Closes: https://trac.macports.org/ticket/61800
</span><span style='display:block; white-space:pre;color:#404040;'> Closes: https://trac.macports.org/ticket/59026
</span><span style='display:block; white-space:pre;color:#404040;'> Closes: https://trac.macports.org/ticket/58457
</span>---
graphics/graphviz/Portfile | 46 +++++++++++++---------
graphics/graphviz/files/patch-project.pbxproj.diff | 25 +++++-------
2 files changed, 37 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 67a0cc89e45..c00278bb2a6 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;'>@@ -2,19 +2,20 @@
</span>
PortSystem 1.0
PortGroup xcodeversion 1.0
<span style='display:block; white-space:pre;background:#e0ffe0;'>+PortGroup compiler_blacklist_versions 1.0
</span>
# Please keep the graphviz and graphviz-devel ports as similar as possible.
name graphviz
set my_name graphviz
<span style='display:block; white-space:pre;background:#ffe0e0;'>-version 2.40.1
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+version 2.48.0
</span> set thisbranch [strsed ${name} "g/^${my_name}//"]
set otherbranch [expr {${thisbranch} eq {} ? {-devel} : {}}]
categories graphics
maintainers {ryandesign @ryandesign} {mascguy @mascguy}
license EPL-1
homepage https://www.graphviz.org/
<span style='display:block; white-space:pre;background:#ffe0e0;'>-master_sites ${homepage}pub/graphviz/stable/SOURCES/
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+master_sites https://gitlab.com/api/v4/projects/4207231/packages/generic/graphviz-releases/${version}/
</span> platforms darwin
use_parallel_build yes
dist_subdir ${my_name}
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -30,15 +31,28 @@ 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 8fc103fc519e07e9db522ec2f748838571c71acf \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- sha256 ca5218fade0204d59947126c38439f432853543b0818d9d728c589dfe7f3a421
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+checksums rmd160 c2c0486f8896a9ae04a5cae90f540f3f2591fe9c \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ sha256 264987fb7927afa07a745e14584be401164a4cdf9ddc9e0334bb5c7b01682186 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ size 29882711
</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:#e0ffe0;'>+# Fix compilation errors:
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# ../../lib/cgraph/sprint.h:54:15: error: expected ';' after top level declarator
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# char *NULLABLE gv_sprint(const char *NONNULL format, ...);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# ../../lib/cgraph/sprint.h:67:14: error: expected ';' after top level declarator
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# char *NONNULL gv_sprint_or_exit(const char *NONNULL format, ...);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# sprint.c:15:14: error: static declaration of '_Nullable' follows non-static declaration
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# static char *NULLABLE print(const char *NONNULL format, va_list ap) {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# sprint.c:15:22: error: expected ';' after top level declarator
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# static char *NULLABLE print(const char *NONNULL format, va_list ap) {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+compiler.blacklist-append \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ {clang < 900}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span> if {${name} eq ${subport}} {
<span style='display:block; white-space:pre;background:#ffe0e0;'>-revision 4
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+revision 0
</span>
conflicts graphviz${otherbranch}
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -58,9 +72,6 @@ depends_lib path:include/turbojpeg.h:libjpeg-turbo \
</span>
depends_run port:urw-fonts
<span style='display:block; white-space:pre;background:#ffe0e0;'>-patchfiles implicit.patch \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- libtool-tag.patch
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span> configure.args --disable-silent-rules \
--with-codegens \
--without-x \
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -290,8 +301,8 @@ post-destroot {
</span> }
livecheck.type regex
<span style='display:block; white-space:pre;background:#ffe0e0;'>-livecheck.url https://www2.graphviz.org/Packages/stable/portable_source/
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-livecheck.regex ${my_name}-(\[0-9\]+\\.\[0-9\]*\[02468\](\\.\[0-9\]+)*)\\.tar
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+livecheck.url https://gitlab.com/api/v4/projects/4207231/releases
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+livecheck.regex \"name\":\s*\"(\[0-9\]+\\.\[0-9\]*\[02468\](\\.\[0-9\]+)*)\"
</span> } else {
livecheck.type none
}
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -299,7 +310,7 @@ livecheck.regex ${my_name}-(\[0-9\]+\\.\[0-9\]*\[02468\](\\.\[0-
</span> subport graphviz-gui${thisbranch} {
PortGroup xcode 1.0
<span style='display:block; white-space:pre;background:#ffe0e0;'>- revision 2
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ revision 0
</span>
conflicts graphviz-gui${otherbranch} graphviz-oldgui
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -323,12 +334,8 @@ subport graphviz-gui${thisbranch} {
</span> extract.post_args-append ${worksrcdir}/macosx ${worksrcdir}/doc
patchfiles patch-project.pbxproj.diff
<span style='display:block; white-space:pre;background:#ffe0e0;'>- patchfiles-append super-dealloc.patch
</span>
if {[vercmp ${xcodeversion} 10.0] >= 0} {
<span style='display:block; white-space:pre;background:#ffe0e0;'>- # Xcode 10+ will not build against an IBDocument.SystemTarget of 10.5
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- patchfiles-append patch-xib-target.diff
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span> # This port does not build with the new Xcode build system at present
build.pre_args -UseNewBuildSystem=NO
destroot.pre_args -UseNewBuildSystem=NO
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -344,9 +351,9 @@ subport graphviz-gui${thisbranch} {
</span>
subport gvedit${thisbranch} {
PortGroup app 1.0
<span style='display:block; white-space:pre;background:#ffe0e0;'>- PortGroup qt4 1.0
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ PortGroup qt5 1.0
</span>
<span style='display:block; white-space:pre;background:#ffe0e0;'>- revision 1
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ revision 0
</span>
conflicts gvedit${otherbranch}
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -370,7 +377,8 @@ subport gvedit${thisbranch} {
</span>
configure.args --disable-silent-rules \
--with-qt \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- ac_cv_prog_AWK=/usr/bin/awk
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ac_cv_prog_AWK=/usr/bin/awk \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ac_cv_prog_QMAKE=${prefix}/libexec/qt5/bin/qmake
</span>
build.dir ${worksrcpath}/cmd/gvedit
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -384,6 +392,6 @@ subport gvedit${thisbranch} {
</span>
proc get_short_version_string {} {
global build.dir
<span style='display:block; white-space:pre;background:#ffe0e0;'>- return [exec /usr/bin/sed -E -n s/^\[\[:space:\]\]*"\[Vv\]ersion:\[\[:space:\]\]*(\[0-9.\]+).*/\\1/p ${build.dir}/mainwindow.cpp]
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ return [exec /usr/bin/sed -E -n s/^\[\[:space:\]\]*\"\[\[:space:\]\]*\[Vv\]ersion:\[\[:space:\]\]*(\[0-9.\]+).*/\\1/p ${build.dir}/mainwindow.cpp]
</span> }
}
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/graphics/graphviz/files/patch-project.pbxproj.diff b/graphics/graphviz/files/patch-project.pbxproj.diff
</span><span style='display:block; white-space:pre;color:#808080;'>index 7b84753ed5d..7a622177692 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/graphics/graphviz/files/patch-project.pbxproj.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/graphics/graphviz/files/patch-project.pbxproj.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -31,25 +31,20 @@
</span> WRAPPER_EXTENSION = app;
};
name = Release;
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -420,21 +415,15 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- GCC_WARN_ABOUT_RETURN_TYPE = YES;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- GCC_WARN_UNUSED_VARIABLE = YES;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- PREBINDING = NO;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- SDKROOT = "$(DEVELOPER_SDK_DIR)/MacOSX10.5.sdk";
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- };
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- name = Debug;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- };
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -443,7 +443,6 @@
</span> C05733CD08A9546B00998B17 /* Release */ = {
isa = XCBuildConfiguration;
buildSettings = {
<span style='display:block; white-space:pre;background:#ffe0e0;'>-- ARCHS = (
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- ppc,
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- i386,
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- );
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- GCC_WARN_ABOUT_RETURN_TYPE = YES;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- ARCHS = "$(ARCHS_STANDARD_64_BIT)";
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ CLANG_WARN_BLOCK_CAPTURE_AUTORELEASING = YES;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ CLANG_WARN_BOOL_CONVERSION = YES;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ CLANG_WARN_COMMA = YES;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -469,8 +468,6 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ GCC_WARN_UNINITIALIZED_AUTOS = YES;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ GCC_WARN_UNUSED_FUNCTION = YES;
</span> GCC_WARN_UNUSED_VARIABLE = YES;
<span style='display:block; white-space:pre;background:#ffe0e0;'>- PREBINDING = NO;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- SDKROOT = "$(DEVELOPER_SDK_DIR)/MacOSX10.5.sdk";
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- MACOSX_DEPLOYMENT_TARGET = 10.6;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- SDKROOT = macosx;
</span> };
name = Release;
};
</pre><pre style='margin:0'>
</pre>