Content-Transfer-Encoding: 7bit
Content-Type: multipart/mixed; boundary="_----------=_1713176757287440"
MIME-Version: 1.0
Date: Mon, 15 Apr 2024 10:25:57 +0000
From: "Michael Baeuerle" <micha@netbsd.org>
Subject: CVS commit: pkgsrc/graphics/graphviz
To: pkgsrc-changes@NetBSD.org
Reply-To: micha@netbsd.org
Message-Id: <20240415102557.F2D6BFA2C@cvs.NetBSD.org>
Sender: pkgsrc-changes-owner@NetBSD.org
Precedence: bulk

This is a multi-part message in MIME format.

--_----------=_1713176757287440
Content-Disposition: inline
Content-Transfer-Encoding: 8bit
Content-Type: text/plain; charset="UTF-8"

Module Name:	pkgsrc
Committed By:	micha
Date:		Mon Apr 15 10:25:57 UTC 2024

Modified Files:
	pkgsrc/graphics/graphviz: Makefile PLIST buildlink3.mk distinfo
	    options.mk
	pkgsrc/graphics/graphviz/patches: patch-configure.ac
Removed Files:
	pkgsrc/graphics/graphviz/patches: patch-plugin_xlib_gvdevice__xlib.c

Log Message:
graphics/graphviz: Update to 10.0.1

Remove pkgsrc patches for LUA location.
Add pkgsrc patch for nonportable shell syntax in configure script.
Remove pkgsrc option "gtk".

## [10.0.1] - 2024-02-11

### Added

- Releases now include packages for [Rocky Linux](https://rockylinux.org/) 8
  and 9.
- A new output format, `-Tsvg_inline`, has been added to generate a header-less
  SVG suitable for inlining into HTML. #2285
- The functionality of the `acyclic`, `tred` and `unflatten` command line tools
  are now exposed via the `graphviz_acyclic`, `graphviz_tred` and
  `graphviz_unflatten` API functions in libcgraph. #2194
- `graphviz_node_induce` is available as a new API function in cgraph.h.
- `tred` gained a `-o` command line option to redirect its output to a file.

### Changed

- The Criterion unit tests have been removed and migrated to Pytest. This is
  primarily relevant to downstream packagers of Graphviz. #2443
- **Breaking**: `Dtdisc_t.memoryf` and its associated macros has been removed.
- **Breaking**: The `Dt_t.type` field has been removed.
- **Breaking**: The `dtfound`, `DT_FOUND`, `dtleast`, and `dtmost` macros have
  been removed.
- The nrtmain.c test program has been removed from the portable tarball.
- The TCL Graphviz packages for inter-release versions/snapshots report
  themselves as `<next release>b<internal number>` instead of
  `<next release>~dev.<internal number>`. This fixes a problem wherein TCL would
  see `~dev` as being invalid characters to appear in a version. #2370
- Support for discovering Lua via `lua-config*` has been removed from the
  Autotools build system.
- Lua discovery in the Autotools build system should now respect the location of
  your Lua installation and not unconditionally attempt installation into
  `/usr`. #2152
- The GTK plugin is no longer built or distributed. This plugin relies on GTK 2
  and X11. If you use this plugin, please contact the maintainers to let
  them know it is worthwhile re-enabling this and forward porting it to GTK 3/4
  and Wayland. #1848
- In the Autotools build system, `LIBPOSTFIX=` can now be used to suppress `64`
  being appended to the library installation path.
- The `-m` command line option, whose functionality was disabled in Graphviz
  3.0.0, has been removed.
- Man page typography has been slightly improved.
- macOS release artifacts no longer include `vimdot`. This may be restored in
  future. #2423
- macOS release artifacts no longer include `smyrna`. This may be restored in
  future. #2422
- The PDF output format, `-Tpdf`, respects the environment variable
  `$SOURCE_DATE_EPOCH` for overriding `CreationDate` when built against Cairo
  >= 1.16.0. #2473
- The legacy C# viewer app is no longer distributed in the portable source
  tarball.
- Graphviz headers no longer define the `FALSE` and `TRUE` constants.
- The Autotools build system no longer supports Darwin 9 (Mac OSX Leopard).
- **Breaking**: `Agraph_t.link` has been split into `Agraph_t.id_link` and
  `Agraph_t.seq_link`. `Agraph_t.g_dict` has been split into `Agraph_t.g_id`
  and `Agraph_t.g_seq`.
- **Breaking**: `gvpropts.n_outgraphs` is now a `size_t`.
- The OCaml bindings have been removed. If you use these bindings, please contact
  the maintainers to notify them of the existence of users.
- **Breaking**: `polygon_t.sides` and `polygon_t.peripheries` are now `size_t`s.
- **Breaking**: liblab_gamut is no longer included in a Graphviz installation.
  This library had no accompanying header, so using it was not easy. If you are
  using this library, please contact the maintainers to notify them of the
  existence of users. #2489
- **Breaking**: `bezier.size` and `splines.size` are now `size_t`s.
- **Breaking**: the gv.i and gv.cpp SWIG inputs are no longer included in a
  Graphviz installation. #2491
- **Breaking**: the `gvrender_engine_t.beziercurve`,
  `gvrender_engine_t.library_shape`, `gvrender_engine_t.polygon`,  and
  `gvrender_engine_t.polyline` callbacks now take the number of points, `n`, as
  a `size_t`.
- **Breaking**: the `AVG` macro has been removed.
- **Breaking**: the `inside_t.s` union member gained members `lastn`, `radius`,
  `last_poly`, `last`, `outp`, `scalex`, `scaley`, `box_URx`, and `box_URy`.
  Zero initialize these when you construct instances of this type. #2498

### Fixed

- The paper size for Doxygen docs generation in the Autotools build system has
  been corrected to `a4`.
- References to `eventf` and `hashf` data structures in the libcdt man page
  have been removed. These data structures were removed in Graphviz 9.0.0.
- References to `DTOFFSET` in the libcdt man page have been removed. This macro
  was removed in Graphviz 2.40.0.
- A number of further updates to the libcdt man page have been made to reflect
  other changes that happened in Graphviz 9.0.0.
- Use of the non-portable `PATH_MAX` constant has been removed. This was a
  regression in Graphviz 7.0.1. In addition to fixing the regression, code has
  been adjusted to remove assumptions on the maximum path length and treat it as
  unbounded. #2452
- Compilation on NetBSD has been repaired. This was a regression in Graphviz
  9.0.0.
- Compilation on SunOS has been repaired. This appears to have been broken since
  the xlib plugin was added some time prior to Graphviz 2.38.0.
- gvpr programs that attempt to close out of range file descriptors no longer
  cause out of bounds memory accesses.
- When large edge weights are used that cause an integer overflow when summing
  them up, Graphviz now gracefully exits with an error message instead of
  crashing. #2450
- Support for the `%n` specifier in `scanf` in gvpr has been restored. This was
  a regression in Graphviz 9.0.0. #2454
- In the Autotools build system, `make dist` now processes cmd/gvedit correctly
  when Qt is not installed. Generating Qt "mocables" is postponed from configure
  time to build time. #2463
- The Autotools build system correctly detects Ruby headers, even when
  pkg-config support is unavailable. #2464
- Escaped characters in xdot fields no longer lead to the containing text being
  truncated. #2460
- When building against a libgd that is configured with `!gif && (jpeg || png)`,
  the GD plugin is once again compilable. This was a regression in Graphviz
  2.46.0.
- edgepaint spline intersection code would previously incorrectly use the second
  spline in one instance where it should have used the first. #1464
- In the Autotools build, libexpat discovery on macOS has been improved. #2477
- A bug that caused compound edges to sometimes be drawn in the wrong direction
  has been corrected. This was a regression in Graphviz 8.0.3. #2478
- When operating on multiple graphs, `unflatten` no longer retains chain node
  and size internal state across graphs.
- Repeated runs of a graph with subgraphs now produce a stable subgraph
  ordering. #2242
- The `dot` and `gml2gv` tools are now built with case-insensitive parsing
  by the CMake and MSBuild systems, as they always were by autotools, and
  in accordance with the graphviz specification. #2481
- Putting nodes in a subgraph no longer causes their layout order to be
  reversed. #1585
- Edges are no longer lost when using subgraphs and record shapes in
  combination. #1624
- A malformed config6 file that leads to plugin search failing no longer causes
  out-of-bounds memory reads. This now causes an error message and graceful
  failure. #2441
- Discovery of `php` in the Autotools build system has been improved.
- Text in the PIC output format is no longer forced to font size 1. This was a
  regression in Graphviz 8.0.2. Even with this fix, the PIC output format is
  limited in its utility. #2487
- When encountering a syntactically invalid HTML-like label, Graphviz.app no
  longer aborts. The abort was an intentional change in Graphviz 8.0.1 to avoid
  invalid memory reads in `dot`, but had the undesirable side effect of the
  graphical Graphviz.app exiting with no obvious cause. #2488
- Use of an uninitialized variable in `poly_inside` has been corrected. #2498
- Input containing UTF-8 data that is destined to appear as-is in the output
  (e.g. UTF-8 characters in a label when using the `-Tdot` output format) is
  once again processed correctly. On platforms with a signed `char` this could
  previously crash. This was a regression in Graphviz 2.49.0. #2502

## 9.0.0 - 2023-09-11

### Added

- On non-Windows platforms, new -Tkitty and -Tkittyz output formats are
  available that render to the Kitty terminal emulator’s graphvics
  protocol.
- HTML/CSS-style 3 letter hex colors are supported. Each R/G/B letter
  is duplicated to form a 6 letter hex color. E.g. #09c is equivalent
  to #0099cc. #2377

### Changed

- Breaking: The definition of adjmatrix_t is no longer exposed in public
  headers.
- Breaking: The upper limit for minimum edge length
  (Agedgeinfo_t.minlen) has been expanded from USHRT_MAX to INT_MAX.
  #2413
- Breaking: The libcdt macros DTTREEMATCH, DTTREESEARCH, dtvnext,
  dtvcount, dtvhere, and dtcharhash have been removed.
- Breaking: The libcgraph macros AGHEADPOINTER, AGRIGHTPOINTER,
  AGLEFTPOINTER, FIRSTNREF, NEXTNREF, PREVNREF, LASTNREF, NODEOF,
  FIRSTOUTREF, LASTOUTREF, FIRSTINREF, NEXTEREF, and PREVEREF have been
  removed.
- Breaking: The libcgraph types Agnoderef_t and Agedgeref_t have been
  removed.
- Breaking: The libcgraph function agflatten has been removed.
- Breaking: The Agdesc_s.flatlock field has been removed.
- Breaking: The str parameter from gvPluginList has been removed.
- Breaking: The definition of the elist_append and alloc_elist macros
  have been changed to use newer allocation functions. Users were/are
  not expected to call these macros.
- The functions ageqedge, agtail, aghead, agopp, agmkout, and agmkin
  have been reintroduced. These were previously removed in Graphviz
  3.0.0. #2433
- Breaking: The first parameter dt to the makef and freef callbacks
  defined in cdt.h has been removed.
- Gvedit now identifies itself with organization name “Graphviz” and
  application name “gvedit” when reading and writing Qt-based settings.
  It would previously use organization name “Trolltech” and application
  name “MDI Example”. If you have existing settings under the old
  identification, Gvedit will attempt to migrate them to the new
  identification the first time it reads then writes settings. #2383
- Breaking: gvprintf is now tagged with
  __attribute__((format(printf, …))) when compiling with Clang or GCC.
  This enables the compiler to spot more misuses of this function. #2373
- Breaking: The hashf and eventf members of Dtdisc_t have been removed.
  Correspondingly, the hshf and evf parameters to the DTDISC macro have
  been removed. Also the _DTHSH macro has been removed.
- Breaking: The Dtdata_t.minp field has been removed.
- The print functionality of the macOS Graphviz app scales the graph to
  fit the output page size.
- Breaking: The libcdt containers Dtbag, Dthash, Dtlist, Dtorder,
  Dtdeque, and Dtstack have been removed.
- Breaking: The libcdt dtappend and dtattach macros have been removed.
- Support for Lua 5.0 has been removed. Building the Graphviz Lua
  bindings now requires Lua ≥ 5.1.
- Breaking: The Dt_t* parameter to the callback for dtwalk has been
  removed.
- Breaking: The POINTS_PER_PC macro has been removed.
- Breaking: The INITIAL_XDOT_CAPACITY macro has been removed.
- Breaking: The type parameter to dtdisc has been removed.
- Breaking: The h parameter to dtstrhash has been removed.
- In addition to Guile 2.0 and Guile 2.2, Guile 3.0 is now supported by
  the Graphviz Guile bindings.
- Breaking: The concept of “memory allocator discipline” has been
  removed, along with the type Agmemdisc_t and fields Agdisc_t.mem and
  Agdstate_t.mem.
- Breaking: The agcallbacks function and Agclos_t.callbacks_enabled have
  been removed.
- Breaking: pack_info.doSplines is now a C99 bool. Correspondingly, the
  doSplines parameter to shiftGraphs is now a C99 bool.

### Fixed

- Processing large graphs that induce ranks containing more than 46340
  (floor(√INT_MAX)) nodes no longer results in an integer overflow
  during crossing matrix allocation. Ranks of up to floor(√SIZE_MAX)
  nodes are now supported.
- Double arrow head types like invdot and onormalonormal once again
  display correctly. This was a regression in Graphviz 8.0.1. #2406
- The lvee and rvee edge arrow shapes are slighty incorrect for
  penwidths > 1. #2399
- Small gap between lcurve or rcurve arrow shaft and node. #2426
- Failure of arrowhead and arrowtail to respect penwidth #372
- Fixed also for the normal and inv edge arrow shapes when using the l
  or r arrow shape modifiers.
- Slightly improved for the normal and inv edge arrow shapes when not
  using any arrow shape modifier.
- Fixed also for the crow and vee edge arrow shapes and record based
  nodes.
- Various incorrect calls to gvprintf have been corrected. On some
  platforms like x86-64, these problems were benign thanks to
  coincidences in the Application Binary Interface (ABI).
  On other platforms, these problems may have caused stack corruption
  and crashes. #2373
- The font dictionary is now initialized even if a configuration file is
  not found. Previously this situation could lead to a crash when using
  Graphviz programmatically. This problem was present as least as far
  back as Graphviz 2.38.0. #1520
- Breaking: The vt100 output format has been renamed to vt. This fixes
  a problem where it was not discoverable on macOS. #2429
- Escape sequences like \" are recognized in strings and double
  escaping (producing \\") is avoided. #2397
- The Autotools build system no longer uses headers and libraries from
  the --prefix path given on the command line. This previously caused
  cross-compilation to incorrectly pick up host headers and libraries.
  #2442


To generate a diff of this commit:
cvs rdiff -u -r1.283 -r1.284 pkgsrc/graphics/graphviz/Makefile
cvs rdiff -u -r1.60 -r1.61 pkgsrc/graphics/graphviz/PLIST
cvs rdiff -u -r1.37 -r1.38 pkgsrc/graphics/graphviz/buildlink3.mk \
    pkgsrc/graphics/graphviz/options.mk
cvs rdiff -u -r1.82 -r1.83 pkgsrc/graphics/graphviz/distinfo
cvs rdiff -u -r1.12 -r1.13 \
    pkgsrc/graphics/graphviz/patches/patch-configure.ac
cvs rdiff -u -r1.3 -r0 \
    pkgsrc/graphics/graphviz/patches/patch-plugin_xlib_gvdevice__xlib.c

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.


--_----------=_1713176757287440
Content-Disposition: inline
Content-Length: 14989
Content-Transfer-Encoding: binary
Content-Type: text/x-diff; charset=us-ascii

Modified files:

Index: pkgsrc/graphics/graphviz/Makefile
diff -u pkgsrc/graphics/graphviz/Makefile:1.283 pkgsrc/graphics/graphviz/Makefile:1.284
--- pkgsrc/graphics/graphviz/Makefile:1.283	Sun Apr  7 07:34:14 2024
+++ pkgsrc/graphics/graphviz/Makefile	Mon Apr 15 10:25:57 2024
@@ -1,10 +1,9 @@
-# $NetBSD: Makefile,v 1.283 2024/04/07 07:34:14 wiz Exp $
+# $NetBSD: Makefile,v 1.284 2024/04/15 10:25:57 micha Exp $
 
-DISTNAME=	graphviz-8.1.0
-PKGREVISION=	10
+DISTNAME=	graphviz-10.0.1
 CATEGORIES=	graphics
 MASTER_SITES=	${MASTER_SITE_GITLAB:=api/v4/projects/4207231/packages/generic/graphviz-releases/${PKGVERSION_NOREV}/}
-EXTRACT_SUFX=	.tar.xz
+#EXTRACT_SUFX=	.tar.xz
 
 MAINTAINER=	micha@NetBSD.org
 HOMEPAGE=	https://www.graphviz.org/
@@ -14,7 +13,10 @@ LICENSE=	epl-v1.0
 CHECK_FILES_SKIP+=		${PREFIX}/lib/graphviz/config6
 CHECK_PORTABILITY_SKIP+=	windows/*
 
-USE_LANGUAGES=		c99 c++11
+USE_LANGUAGES=		c c++
+USE_CC_FEATURES+=	c99
+USE_CXX_FEATURES+=	c++11 unique_ptr
+
 USE_TOOLS+=		automake autoreconf makeinfo bison flex gmake groff pkg-config
 USE_LIBTOOL=		yes
 GNU_CONFIGURE=		yes
@@ -96,7 +98,7 @@ REPLACE_PERL+=		tclpkg/gv/demo/modgraph.
 # Override Xaw type configured by user
 XAW_TYPE=		standard
 
-.if (${OPSYS} == "NetBSD" && ${MACHINE_ARCH} == "powerpc")
+.if ${OPSYS} == "NetBSD" && ${MACHINE_ARCH} == "powerpc"
 # Forces link with -lgomp directly instead of via dlopen()
 # so we don't overflow thread-local storage in ld.elf_so
 CFLAGS+=		-fopenmp
@@ -130,6 +132,7 @@ DEPENDS+=	urw-fonts-[0-9]*:../../fonts/u
 .include "../../devel/libltdl/buildlink3.mk"
 BUILDLINK_API_DEPENDS.pango+=	pango>=1.22.0
 .include "../../devel/pango/buildlink3.mk"
+.include "../../devel/zlib/buildlink3.mk"
 .include "../../fonts/fontconfig/buildlink3.mk"
 .include "../../graphics/freetype2/buildlink3.mk"
 .include "../../graphics/gts/buildlink3.mk"

Index: pkgsrc/graphics/graphviz/PLIST
diff -u pkgsrc/graphics/graphviz/PLIST:1.60 pkgsrc/graphics/graphviz/PLIST:1.61
--- pkgsrc/graphics/graphviz/PLIST:1.60	Fri Jul  7 13:38:11 2023
+++ pkgsrc/graphics/graphviz/PLIST	Mon Apr 15 10:25:57 2024
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.60 2023/07/07 13:38:11 micha Exp $
+@comment $NetBSD: PLIST,v 1.61 2024/04/15 10:25:57 micha Exp $
 bin/acyclic
 bin/bcomps
 bin/ccomps
@@ -42,8 +42,6 @@ include/graphviz/cgraph.h
 include/graphviz/color.h
 include/graphviz/geom.h
 include/graphviz/graphviz_version.h
-include/graphviz/gv.cpp
-include/graphviz/gv.i
 include/graphviz/gvc.h
 include/graphviz/gvcext.h
 include/graphviz/gvcjob.h
@@ -66,15 +64,14 @@ include/graphviz/xdot.h
 lib/graphviz/libgvplugin_core.la
 lib/graphviz/libgvplugin_dot_layout.la
 ${PLIST.gd}lib/graphviz/libgvplugin_gd.la
-${PLIST.gtk}lib/graphviz/libgvplugin_gdk.la
 ${PLIST.ghostscript}${PLIST.x11}lib/graphviz/libgvplugin_gs.la
-${PLIST.gtk}lib/graphviz/libgvplugin_gtk.la
+lib/graphviz/libgvplugin_kitty.la
 lib/graphviz/libgvplugin_neato_layout.la
 lib/graphviz/libgvplugin_pango.la
 ${PLIST.poppler}lib/graphviz/libgvplugin_poppler.la
 ${PLIST.quartz}lib/graphviz/libgvplugin_quartz.la
 ${PLIST.svg}lib/graphviz/libgvplugin_rsvg.la
-lib/graphviz/libgvplugin_vt100.la
+lib/graphviz/libgvplugin_vt.la
 lib/graphviz/libgvplugin_webp.la
 ${PLIST.x11}lib/graphviz/libgvplugin_xlib.la
 ${PLIST.lua}lib/graphviz/lua/libgv_lua.la
@@ -91,7 +88,6 @@ lib/libcdt.la
 lib/libcgraph.la
 lib/libgvc.la
 lib/libgvpr.la
-lib/liblab_gamut.la
 lib/libpathplan.la
 lib/libxdot.la
 ${PLIST.lua}lib/lua/gv.so
@@ -101,7 +97,6 @@ lib/pkgconfig/libcdt.pc
 lib/pkgconfig/libcgraph.pc
 lib/pkgconfig/libgvc.pc
 lib/pkgconfig/libgvpr.pc
-lib/pkgconfig/liblab_gamut.pc
 lib/pkgconfig/libpathplan.pc
 lib/pkgconfig/libxdot.pc
 ${PLIST.tcl}${PLIST.x11}lib/tcl${TCL_BASEVER}/graphviz/libgdtclft.la

Index: pkgsrc/graphics/graphviz/buildlink3.mk
diff -u pkgsrc/graphics/graphviz/buildlink3.mk:1.37 pkgsrc/graphics/graphviz/buildlink3.mk:1.38
--- pkgsrc/graphics/graphviz/buildlink3.mk:1.37	Sun Nov 12 13:22:01 2023
+++ pkgsrc/graphics/graphviz/buildlink3.mk	Mon Apr 15 10:25:57 2024
@@ -1,16 +1,21 @@
-# $NetBSD: buildlink3.mk,v 1.37 2023/11/12 13:22:01 wiz Exp $
+# $NetBSD: buildlink3.mk,v 1.38 2024/04/15 10:25:57 micha Exp $
 
 BUILDLINK_TREE+=	graphviz
 
 .if !defined(GRAPHVIZ_BUILDLINK3_MK)
 GRAPHVIZ_BUILDLINK3_MK:=
 
+USE_CC_FEATURES+=	c99
+USE_CXX_FEATURES+=	c++11 unique_ptr
+
 BUILDLINK_API_DEPENDS.graphviz+=	graphviz>=2.26.3
-BUILDLINK_ABI_DEPENDS.graphviz+=	graphviz>=8.1.0nb5
+BUILDLINK_ABI_DEPENDS.graphviz+=	graphviz>=10.0.1
 BUILDLINK_PKGSRCDIR.graphviz?=		../../graphics/graphviz
 
 .include "../../converters/libiconv/buildlink3.mk"
-.include "../../fonts/fontconfig/buildlink3.mk"
+.include "../../devel/libltdl/buildlink3.mk"
+.include "../../devel/zlib/buildlink3.mk"
+.include "../../mk/pthread.buildlink3.mk"
 .include "../../textproc/expat/buildlink3.mk"
 .endif # GRAPHVIZ_BUILDLINK3_MK
 
Index: pkgsrc/graphics/graphviz/options.mk
diff -u pkgsrc/graphics/graphviz/options.mk:1.37 pkgsrc/graphics/graphviz/options.mk:1.38
--- pkgsrc/graphics/graphviz/options.mk:1.37	Sat Dec 30 12:57:52 2023
+++ pkgsrc/graphics/graphviz/options.mk	Mon Apr 15 10:25:57 2024
@@ -1,29 +1,20 @@
-# $NetBSD: options.mk,v 1.37 2023/12/30 12:57:52 wiz Exp $
+# $NetBSD: options.mk,v 1.38 2024/04/15 10:25:57 micha Exp $
 
 PKG_OPTIONS_VAR=	PKG_OPTIONS.graphviz
-PKG_SUPPORTED_OPTIONS=	gd ghostscript gtk lua perl poppler svg tcl x11
+PKG_SUPPORTED_OPTIONS=	gd ghostscript lua perl poppler svg tcl x11
+PKG_SUGGESTED_OPTIONS=	gd
 .if exists(/System/Library/Frameworks/Quartz.framework)
 PKG_SUPPORTED_OPTIONS+=	quartz
 PKG_SUGGESTED_OPTIONS+=	quartz
 .else
 PKG_SUGGESTED_OPTIONS+=	x11
 .endif
-PKG_SUGGESTED_OPTIONS=	gd
-# Explanation of consequence of options, to help those trying to slim down:
-#   lua tcl perl: extension language support
-#   x11: Omits all linking with x11, which means x11 graphics supports as
-#     well as x11 frontend support.
-#   gtk: basic graphic format support (in addition to gd, which isn't
-#     maintained anymore)
-#   svg: Omitting loses svg support. librsvg has large dependencies
-#     including some GNOME libs.
-#   gd: basic graphic format support, especially gif
-#   ghostscript: provides better ps/pdf-support, plus eps
 
 .include "../../mk/bsd.options.mk"
 
-PLIST_VARS+=		gd ghostscript gtk lua perl poppler quartz svg swig tcl x11
+PLIST_VARS+=		gd ghostscript lua perl poppler quartz svg swig tcl x11
 
+# Basic graphic format support, especially GIF
 .if !empty(PKG_OPTIONS:Mgd)
 .  include "../../graphics/gd/buildlink3.mk"
 PLIST.gd=		yes
@@ -32,6 +23,7 @@ CONFIGURE_ARGS+=	--with-libgd
 CONFIGURE_ARGS+=	--without-libgd
 .endif
 
+# Better support for PS/PDF, plus EPS
 .if !empty(PKG_OPTIONS:Mghostscript)
 .  include "../../print/ghostscript/buildlink3.mk"
 # Also required as tool dependency according to documentation
@@ -42,20 +34,7 @@ CONFIGURE_ARGS+=	--with-ghostscript
 CONFIGURE_ARGS+=	--without-ghostscript
 .endif
 
-.if !empty(PKG_OPTIONS:Mgtk)
-.  include "../../x11/gtk2/buildlink3.mk"
-PLIST.gtk=		yes
-CONFIGURE_ARGS+=	--with-gdk
-CONFIGURE_ARGS+=	--with-gdk-pixbuf
-CONFIGURE_ARGS+=	--with-gtk
-CONFIGURE_ARGS+=	--with-gnomeui
-.else
-CONFIGURE_ARGS+=	--without-gdk
-CONFIGURE_ARGS+=	--without-gdk-pixbuf
-CONFIGURE_ARGS+=	--without-gtk
-CONFIGURE_ARGS+=	--without-gnomeui
-.endif
-
+# Support for reading PDF images
 .if !empty(PKG_OPTIONS:Mpoppler)
 BUILDLINK_API_DEPENDS.poppler+=	poppler>=23.12.0
 .  include "../../print/poppler/buildlink3.mk"
@@ -65,6 +44,7 @@ CONFIGURE_ARGS+=	--with-poppler
 CONFIGURE_ARGS+=	--without-poppler
 .endif
 
+# Support for Quartz on macOS
 .if !empty(PKG_OPTIONS:Mquartz)
 PLIST.quartz=		yes
 CONFIGURE_ARGS+=	--with-quartz
@@ -72,6 +52,7 @@ CONFIGURE_ARGS+=	--with-quartz
 CONFIGURE_ARGS+=	--without-quartz
 .endif
 
+# Support for SVG images. Attention: librsvg has large dependencies!
 .if !empty(PKG_OPTIONS:Msvg)
 BUILDLINK_API_DEPENDS.librsvg+=	librsvg>=2.36.0
 .  include "../../graphics/librsvg/buildlink3.mk"
@@ -81,6 +62,7 @@ CONFIGURE_ARGS+=	--with-rsvg
 CONFIGURE_ARGS+=	--without-rsvg
 .endif
 
+# X11 graphics supports as well as X11 frontend support
 .if !empty(PKG_OPTIONS:Mx11)
 .  include "../../mk/xaw.buildlink3.mk"
 .  include "../../x11/libXrender/buildlink3.mk"
@@ -93,6 +75,7 @@ CONFIGURE_ARGS+=	--without-x
 
 USING_SWIG=	no
 
+# Extension language support
 .if !empty(PKG_OPTIONS:Mlua)
 USING_SWIG=	yes
 .  include "../../lang/lua/tool.mk"
@@ -104,6 +87,7 @@ CONFIGURE_ARGS+=	--enable-lua
 CONFIGURE_ARGS+=	--disable-lua
 .endif
 
+# Extension language support
 .if !empty(PKG_OPTIONS:Mtcl)
 .  if empty(PKG_OPTIONS:Mx11)
 PKG_FAIL_REASON=	"tcl option requires x11 option"
@@ -121,6 +105,7 @@ CONFIGURE_ARGS+=	--enable-tcl
 CONFIGURE_ARGS+=	--disable-tcl
 .endif
 
+# Extension language support
 .if !empty(PKG_OPTIONS:Mperl)
 USING_SWIG=	yes
 .  include "../../lang/perl5/buildlink3.mk"
@@ -131,6 +116,7 @@ CONFIGURE_ARGS+=	--enable-perl
 CONFIGURE_ARGS+=	--disable-perl
 .endif
 
+# Required by some of the other options
 .if !empty(USING_SWIG:Myes)
 PLIST.swig=		yes
 # Tool dependency according to documentation

Index: pkgsrc/graphics/graphviz/distinfo
diff -u pkgsrc/graphics/graphviz/distinfo:1.82 pkgsrc/graphics/graphviz/distinfo:1.83
--- pkgsrc/graphics/graphviz/distinfo:1.82	Fri Jul  7 13:38:11 2023
+++ pkgsrc/graphics/graphviz/distinfo	Mon Apr 15 10:25:57 2024
@@ -1,10 +1,9 @@
-$NetBSD: distinfo,v 1.82 2023/07/07 13:38:11 micha Exp $
+$NetBSD: distinfo,v 1.83 2024/04/15 10:25:57 micha Exp $
 
-BLAKE2s (graphviz-8.1.0.tar.xz) = e02cfc4c1e0d572f20fb5f57ceb8cae680d5258b8c2e0ece2d27ac0623d21f77
-SHA512 (graphviz-8.1.0.tar.xz) = 56ce357999b7e7c623ec410eb772a98a23be2d7e871c5e6f500ea000d217714b8f6114d35844dac576e2dcb059f74037833e7728b85fc2c8fa67589e716a39e1
-Size (graphviz-8.1.0.tar.xz) = 21429292 bytes
+BLAKE2s (graphviz-10.0.1.tar.gz) = 2aaa4a0d7f7a408cd9df96893f51864e4d6a9ea385dc98fdf3c70566b20159cc
+SHA512 (graphviz-10.0.1.tar.gz) = c8d3653fa8aa5748e7efda1c417c9b35221aa2fefb7b872b4b103b9140423803a5945e55743a336d4c11677428d0a7a74fdb9e533a3b4357bd35656d7c9d15a3
+Size (graphviz-10.0.1.tar.gz) = 27286181 bytes
 SHA1 (patch-config_config__perl.pl) = 430acb7d7ee3e149de0af9832c5a29602884f83e
-SHA1 (patch-configure.ac) = 80e303d6a9b95c5bb732677a0f1f63d209b39856
+SHA1 (patch-configure.ac) = e76919fc4705194e2ebe0f71f2d19d95c692b9f4
 SHA1 (patch-lib_gvc_Makefile.am) = 180b45f810e5bb3948509d50b5be3b159b38a78f
 SHA1 (patch-plugin_gs_gvloadimage__gs.c) = 982ac1db252e3224633069db956c5dc803cd5ea9
-SHA1 (patch-plugin_xlib_gvdevice__xlib.c) = 05d1549db3b9221f5bcb947173034775b0df7c6c

Index: pkgsrc/graphics/graphviz/patches/patch-configure.ac
diff -u pkgsrc/graphics/graphviz/patches/patch-configure.ac:1.12 pkgsrc/graphics/graphviz/patches/patch-configure.ac:1.13
--- pkgsrc/graphics/graphviz/patches/patch-configure.ac:1.12	Mon Jan 23 13:44:02 2023
+++ pkgsrc/graphics/graphviz/patches/patch-configure.ac	Mon Apr 15 10:25:57 2024
@@ -1,11 +1,11 @@
-$NetBSD: patch-configure.ac,v 1.12 2023/01/23 13:44:02 micha Exp $
+$NetBSD: patch-configure.ac,v 1.13 2024/04/15 10:25:57 micha Exp $
 
 Use the same path for all platforms in pkgsrc.
-Use lua from pkgsrc.
+Fix nonportable shell syntax.
 
---- configure.ac.orig	2023-01-06 05:16:50.000000000 +0000
+--- configure.ac.orig	2024-02-10 22:00:40.000000000 +0000
 +++ configure.ac
-@@ -92,8 +92,7 @@ if test -z "$LIBPOSTFIX"; then
+@@ -92,8 +92,7 @@ if test -z "${LIBPOSTFIX++}"; then
    case "${host_os}" in
      *linux* )
        case "${host_cpu}" in
@@ -15,7 +15,7 @@ Use lua from pkgsrc.
            INTGOSIZE=64
            ;;
        esac
-@@ -101,7 +100,6 @@ if test -z "$LIBPOSTFIX"; then
+@@ -101,7 +100,6 @@ if test -z "${LIBPOSTFIX++}"; then
      *solaris* )
        case "${host_cpu}" in
          x86_64 | sparc64 )
@@ -23,65 +23,29 @@ Use lua from pkgsrc.
            INTGOSIZE=64
            ;;
        esac
-@@ -858,7 +856,7 @@ else
- 	            if test "x$?" = "x0" ; then
-                         LUA_INCLUDES="$LUA_CFLAGS "`$PKG_CONFIG --cflags lua$l`
-                         LUA_LIBS="$LUA_LFLAGS "`$PKG_CONFIG --libs lua$l`
--		        LUA_INSTALL_DIR="/usr/lib$LIBPOSTFIX/lua/`$PKG_CONFIG --variable=V lua`"
-+		        LUA_INSTALL_DIR="${PREFIX}/lib$LIBPOSTFIX/lua/`$PKG_CONFIG --variable=V lua`"
- 
- 		        pkgconfig_lualib_found=`$PKG_CONFIG --exists lualib$l 2>/dev/null`
- 		        if test  "x$?" = "x0"; then
-@@ -879,7 +877,7 @@ else
- 	        echo
-                 LUA_INCLUDES=`$LUACONFIG --include`
-                 LUA_LIBS=`$LUACONFIG --libs`
--	        LUA_INSTALL_DIR="/usr/lib$LIBPOSTFIX/lua/5.0"
-+	        LUA_INSTALL_DIR="${PREFIX}/lib$LIBPOSTFIX/lua/5.0"
-             fi
-         fi
- 
-@@ -2053,43 +2051,6 @@ fi
- AM_CONDITIONAL(WITH_QUARTZ, [test "x$use_quartz" = "xYes"])
- 
+@@ -1760,7 +1758,10 @@ AM_CONDITIONAL([WITH_QT], [test "$use_qt
  dnl -----------------------------------
--dnl INCLUDES and LIBS for PLATFORMSDK
--
--AC_ARG_WITH(platformsdkincludedir,
--  [AS_HELP_STRING([--with-platformsdkincludedir=DIR],[use Platform SDK (Windows) includes from DIR])],
--  [PLATFORMSDKINCLUDE=$withval])
--
--AC_ARG_WITH(platformsdklibdir,
--  [AS_HELP_STRING([--with-platformsdklibdir=DIR],[use Platform SDK (Windows) libraries from DIR])],
--  [PLATFORMSDKLIB=$withval])
--
--AC_SUBST([PLATFORMSDKINCLUDE])
--AC_SUBST([PLATFORMSDKLIB])
--
--dnl -----------------------------------
--dnl INCLUDES and LIBS for GDI+
--
--AC_ARG_WITH(gdiplus,
--  [AS_HELP_STRING([--with-gdiplus=no],[GDI+ framework (Windows)])],
--  [], [with_gdiplus=no])
--
--if test "x$with_gdiplus" != "xyes"; then
--  use_gdiplus="No (disabled by default - Windows only)"
+ dnl INCLUDES and LIBS for QUARTZ
+ 
+-if test "${host_os::6}" = "darwin"; then
++dnl Not suitable for a POSIX shell
++dnl if test "${host_os::6}" = "darwin"; then
++case ${host_os} in
++darwin*)
+   AC_ARG_WITH(quartz,
+     [AS_HELP_STRING([--with-quartz=yes],[Quartz framework (Mac OS X)])],
+     [],[with_quartz=yes])
+@@ -1777,10 +1778,11 @@ if test "${host_os::6}" = "darwin"; then
+       use_quartz="No (missing ApplicationServices.framework)"
+     fi
+   fi
 -else
--  if test -f "$PLATFORMSDKINCLUDE\GdiPlus.h" -a -f "$PLATFORMSDKLIB\GdiPlus.lib"; then
--    use_gdiplus="Yes"
--    AC_DEFINE_UNQUOTED(HAVE_GDIPLUS,1,[Define if you have the GDI+ framework for Windows])
--    GDIPLUS_HEADS=`cd "$PLATFORMSDKINCLUDE" && echo GdiPlus*.h`
--    GDIPLUS_CFLAGS=''
--    GDIPLUS_LIBS=''
--    AC_SUBST([GDIPLUS_HEADS])
--    AC_SUBST([GDIPLUS_CFLAGS])
--    AC_SUBST([GDIPLUS_LIBS])
--  else
--    use_gdiplus="No (missing headers)"
--    AC_MSG_WARN(--with-gdiplus requires valid --with-platformsdkincludedir and --with-platformsdklibdir.)
--  fi
++  ;;
++*)
+   with_quartz=no
+   use_quartz="No (disabled by default - Mac only)"
 -fi
- AM_CONDITIONAL(WITH_GDIPLUS, [test "x$use_gdiplus" = "xYes"])
++esac
+ AM_CONDITIONAL(WITH_QUARTZ, [test "$use_quartz" = "Yes"])
  
  dnl -----------------------------------


--_----------=_1713176757287440--