Mon Oct 17 09:12:53 2022 UTC ()
graphviz: updated to 6.0.2

6.0.2

Fixed

- Using `aspect` with a custom value in the `packmode` attribute is no longer
  misparsed.
- Smyrna bounding box computation has been corrected. There was a regression in
  4.0.0 that resulted in a degenerate bounding box being computed for any input
  graph.
- Smyrna warnings about the `on_attrRB0_clicked` and `on_attrSearchBtn_clicked`
  handlers being not found have been fixed and the buttons to which they are
  wired should be functional again. This was a regression in 2.50.0
- Smyrna warnings about the `mAttributesSlot` handler being not found have been
  fixed and the button to which it is wired should be functional again. This was
  a regression in 2.49.2
- Graphviz no longer fails to load private Ghostscript symbols ("Could not load
  `libgvplugin_gs.so.6`)
- trailing commas issue with fdp layout
- Missing `-S` in `sccmap` man page usage summary.
- In `sccmap`, a `-v` option following a `-S` option now re-enables strongly
  connected component output that the man page implied.


(adam)
diff -r1.256 -r1.257 pkgsrc/graphics/graphviz/Makefile
diff -r1.57 -r1.58 pkgsrc/graphics/graphviz/PLIST
diff -r1.73 -r1.74 pkgsrc/graphics/graphviz/distinfo
diff -r1.3 -r1.4 pkgsrc/graphics/graphviz/patches/patch-plugin_gs_gvloadimage__gs.c
cvs diff -r1.256 -r1.257 pkgsrc/graphics/graphviz/Makefile (expand / switch to unified diff)

--- pkgsrc/graphics/graphviz/Makefile 2022/09/30 16:08:52 1.256
+++ pkgsrc/graphics/graphviz/Makefile 2022/10/17 09:12:53 1.257
@@ -1,18 +1,19 @@ @@ -1,18 +1,19 @@
1# $NetBSD: Makefile,v 1.256 2022/09/30 16:08:52 micha Exp $ 1# $NetBSD: Makefile,v 1.257 2022/10/17 09:12:53 adam Exp $
2 2
3DISTNAME= graphviz-6.0.1 3DISTNAME= graphviz-6.0.2
4CATEGORIES= graphics 4CATEGORIES= graphics
5MASTER_SITES= ${MASTER_SITE_GITLAB:=api/v4/projects/4207231/packages/generic/graphviz-releases/${PKGVERSION_NOREV}/} 5MASTER_SITES= ${MASTER_SITE_GITLAB:=api/v4/projects/4207231/packages/generic/graphviz-releases/${PKGVERSION_NOREV}/}
 6EXTRACT_SUFX= .tar.xz
6 7
7MAINTAINER= micha@NetBSD.org 8MAINTAINER= micha@NetBSD.org
8HOMEPAGE= https://www.graphviz.org/ 9HOMEPAGE= https://www.graphviz.org/
9COMMENT= Graph Drawing Programs from AT&T Research and Lucent Bell Labs 10COMMENT= Graph Drawing Programs from AT&T Research and Lucent Bell Labs
10LICENSE= epl-v1.0 11LICENSE= epl-v1.0
11 12
12CHECK_FILES_SKIP+= ${PREFIX}/lib/graphviz/config6 13CHECK_FILES_SKIP+= ${PREFIX}/lib/graphviz/config6
13CHECK_PORTABILITY_SKIP+= windows/* 14CHECK_PORTABILITY_SKIP+= windows/*
14 15
15USE_LANGUAGES= c99 c++11 16USE_LANGUAGES= c99 c++11
16USE_TOOLS+= automake autoreconf makeinfo bison flex gmake groff pkg-config 17USE_TOOLS+= automake autoreconf makeinfo bison flex gmake groff pkg-config
17USE_LIBTOOL= yes 18USE_LIBTOOL= yes
18GNU_CONFIGURE= yes 19GNU_CONFIGURE= yes
cvs diff -r1.57 -r1.58 pkgsrc/graphics/graphviz/PLIST (expand / switch to unified diff)

--- pkgsrc/graphics/graphviz/PLIST 2022/07/27 12:29:08 1.57
+++ pkgsrc/graphics/graphviz/PLIST 2022/10/17 09:12:53 1.58
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1@comment $NetBSD: PLIST,v 1.57 2022/07/27 12:29:08 micha Exp $ 1@comment $NetBSD: PLIST,v 1.58 2022/10/17 09:12:53 adam Exp $
2bin/acyclic 2bin/acyclic
3bin/bcomps 3bin/bcomps
4bin/ccomps 4bin/ccomps
5bin/circo 5bin/circo
6bin/cluster 6bin/cluster
7${PLIST.gd}bin/diffimg 7${PLIST.gd}bin/diffimg
8bin/dijkstra 8bin/dijkstra
9bin/dot 9bin/dot
10bin/dot2gxl 10bin/dot2gxl
11bin/dot_builtins 11bin/dot_builtins
12bin/edgepaint 12bin/edgepaint
13bin/fdp 13bin/fdp
14bin/gc 14bin/gc
@@ -158,32 +158,30 @@ man/man3/gvc.3 @@ -158,32 +158,30 @@ man/man3/gvc.3
158man/man3/gvpr.3 158man/man3/gvpr.3
159man/man3/pack.3 159man/man3/pack.3
160man/man3/pathplan.3 160man/man3/pathplan.3
161${PLIST.tcl}man/man3/tcldot.3tcl 161${PLIST.tcl}man/man3/tcldot.3tcl
162man/man3/xdot.3 162man/man3/xdot.3
163man/man7/graphviz.7 163man/man7/graphviz.7
164share/doc/graphviz/AUTHORS 164share/doc/graphviz/AUTHORS
165share/doc/graphviz/Agraph.pdf 165share/doc/graphviz/Agraph.pdf
166share/doc/graphviz/CHANGELOG.md 166share/doc/graphviz/CHANGELOG.md
167share/doc/graphviz/COPYING 167share/doc/graphviz/COPYING
168share/doc/graphviz/Dot.ref 168share/doc/graphviz/Dot.ref
169share/doc/graphviz/FAQ.html 169share/doc/graphviz/FAQ.html
170share/doc/graphviz/NEWS 170share/doc/graphviz/NEWS
171share/doc/graphviz/addingLayout.txt 
172share/doc/graphviz/build.html 171share/doc/graphviz/build.html
173share/doc/graphviz/char.html 172share/doc/graphviz/char.html
174share/doc/graphviz/cpl1.0.txt 173share/doc/graphviz/cpl1.0.txt
175share/doc/graphviz/dotguide.pdf 174share/doc/graphviz/dotguide.pdf
176share/doc/graphviz/fontfaq.txt 
177share/doc/graphviz/gdtclft.entities.example.png 175share/doc/graphviz/gdtclft.entities.example.png
178share/doc/graphviz/index.html 176share/doc/graphviz/index.html
179share/doc/graphviz/info/arrows.html 177share/doc/graphviz/info/arrows.html
180share/doc/graphviz/info/attrs.html 178share/doc/graphviz/info/attrs.html
181share/doc/graphviz/info/colors.html 179share/doc/graphviz/info/colors.html
182share/doc/graphviz/info/command.html 180share/doc/graphviz/info/command.html
183share/doc/graphviz/info/index.html 181share/doc/graphviz/info/index.html
184share/doc/graphviz/info/lang.html 182share/doc/graphviz/info/lang.html
185share/doc/graphviz/info/output.html 183share/doc/graphviz/info/output.html
186share/doc/graphviz/info/shapes.html 184share/doc/graphviz/info/shapes.html
187share/doc/graphviz/internal_todo.html 185share/doc/graphviz/internal_todo.html
188share/doc/graphviz/latex_suggestions.txt 186share/doc/graphviz/latex_suggestions.txt
189share/doc/graphviz/libguide.pdf 187share/doc/graphviz/libguide.pdf
cvs diff -r1.73 -r1.74 pkgsrc/graphics/graphviz/distinfo (expand / switch to unified diff)

--- pkgsrc/graphics/graphviz/distinfo 2022/09/30 16:08:52 1.73
+++ pkgsrc/graphics/graphviz/distinfo 2022/10/17 09:12:53 1.74
@@ -1,10 +1,10 @@ @@ -1,10 +1,10 @@
1$NetBSD: distinfo,v 1.73 2022/09/30 16:08:52 micha Exp $ 1$NetBSD: distinfo,v 1.74 2022/10/17 09:12:53 adam Exp $
2 2
3BLAKE2s (graphviz-6.0.1.tar.gz) = c6e9a24e3652ac5e4f533b7ed0e6616655b806ebc496c2e8de24c8896370dedc 3BLAKE2s (graphviz-6.0.2.tar.xz) = 2c294dc4846f92a0b59b11ac5f7743c3cef5865fb3276a5b045347a518b9c6e8
4SHA512 (graphviz-6.0.1.tar.gz) = 5d48eab092097f892c62e006e25041b6ab9ddf08d380488d0a8a0b69dd78f5111ad5e52c843b25ce6a46165c3840e6b87175af58aab87dfbc1425195e7a4e045 4SHA512 (graphviz-6.0.2.tar.xz) = 447c4cb957a48a3e682998010cf7661e5da346bb4fcaa7ab78869173f31ae144c34d829a1999e1e7bc5329024792705ac6fd0fd63fa359134351a994aa4ea6ec
5Size (graphviz-6.0.1.tar.gz) = 27587111 bytes 5Size (graphviz-6.0.2.tar.xz) = 21485596 bytes
6SHA1 (patch-config_config__perl.pl) = 430acb7d7ee3e149de0af9832c5a29602884f83e 6SHA1 (patch-config_config__perl.pl) = 430acb7d7ee3e149de0af9832c5a29602884f83e
7SHA1 (patch-configure.ac) = 1c39f0b25cfc995de10a07492656c2f12a24686f 7SHA1 (patch-configure.ac) = 1c39f0b25cfc995de10a07492656c2f12a24686f
8SHA1 (patch-lib_gvc_Makefile.am) = b5d793ec0a676c5d4b257c6fec1eb182ee93718b 8SHA1 (patch-lib_gvc_Makefile.am) = b5d793ec0a676c5d4b257c6fec1eb182ee93718b
9SHA1 (patch-plugin_gs_gvloadimage__gs.c) = d777c822ef11b15eff992f36a9f4073c02cd4ca6 9SHA1 (patch-plugin_gs_gvloadimage__gs.c) = 982ac1db252e3224633069db956c5dc803cd5ea9
10SHA1 (patch-plugin_xlib_gvdevice__xlib.c) = 05d1549db3b9221f5bcb947173034775b0df7c6c 10SHA1 (patch-plugin_xlib_gvdevice__xlib.c) = 05d1549db3b9221f5bcb947173034775b0df7c6c
cvs diff -r1.3 -r1.4 pkgsrc/graphics/graphviz/patches/patch-plugin_gs_gvloadimage__gs.c (expand / switch to unified diff)

--- pkgsrc/graphics/graphviz/patches/patch-plugin_gs_gvloadimage__gs.c 2022/07/22 12:04:46 1.3
+++ pkgsrc/graphics/graphviz/patches/patch-plugin_gs_gvloadimage__gs.c 2022/10/17 09:12:53 1.4
@@ -1,33 +1,33 @@ @@ -1,33 +1,33 @@
1$NetBSD: patch-plugin_gs_gvloadimage__gs.c,v 1.3 2022/07/22 12:04:46 micha Exp $ 1$NetBSD: patch-plugin_gs_gvloadimage__gs.c,v 1.4 2022/10/17 09:12:53 adam Exp $
2 2
3ghostscript-agpl enforces using gserrors.h which is not included 3ghostscript-agpl enforces using gserrors.h which is not included
4by default in ghostscript-gpl, so conditionalise based upon which 4by default in ghostscript-gpl, so conditionalise based upon which
5one is being used. 5one is being used.
6 6
7--- plugin/gs/gvloadimage_gs.c.orig 2021-10-16 16:39:12.000000000 +0000 7--- plugin/gs/gvloadimage_gs.c.orig 2022-10-11 18:31:29.000000000 +0000
8+++ plugin/gs/gvloadimage_gs.c 8+++ plugin/gs/gvloadimage_gs.c
9@@ -77,6 +77,16 @@ static void gs_error(GVJ_t * job, const  9@@ -77,6 +77,16 @@ static void gs_error(GVJ_t * job, const
10  10
11 assert (err < 0); 11 assert (err < 0);
12  12
13+#ifdef gserrors_INCLUDED /* ghostscript-agpl uses gserrors.h */ 13+#ifdef gserrors_INCLUDED /* ghostscript-agpl uses gserrors.h */
14+ if (err >= gs_error_VMerror)  14+ if (err >= gs_error_VMerror)
15+ errsrc = "PostScript Level 1";  15+ errsrc = "PostScript Level 1";
16+ else if (err >= gs_error_unregistered) 16+ else if (err >= gs_error_unregistered)
17+ errsrc = "PostScript Level 2"; 17+ errsrc = "PostScript Level 2";
18+ else if (err >= gs_error_invalidid) 18+ else if (err >= gs_error_invalidid)
19+ errsrc = "DPS error"; 19+ errsrc = "DPS error";
20+ else 20+ else
21+ errsrc = "Ghostscript internal error"; 21+ errsrc = "Ghostscript internal error";
22+#else 22+#else
23 if (err >= e_VMerror)  23 if (err >= e_VMerror)
24 errsrc = "PostScript Level 1";  24 errsrc = "PostScript Level 1";
25 else if (err >= e_unregistered) 25 else if (err >= e_unregistered)
26@@ -85,6 +95,7 @@ static void gs_error(GVJ_t * job, const  26@@ -85,6 +95,7 @@ static void gs_error(GVJ_t * job, const
27 errsrc = "DPS error"; 27 errsrc = "DPS error";
28 else 28 else
29 errsrc = "Ghostscript internal error"; 29 errsrc = "Ghostscript internal error";
30+#endif 30+#endif
31  31
32 job->common->errorfn("%s: %s() returned: %d \"%s\" (%s)\n", 32 job->common->errorfn("%s: %s() returned: %d (%s)\n",
33 name, funstr, err, gs_error_names[-err - 1], errsrc); 33 name, funstr, err, errsrc);