graphics/graphviz: Update to 7.0.2

Remove patches for GUILE and PHP (options no longer supported by pkgsrc).

## [7.0.2] – 2022-11-18

### Added

- The `cluster`, `dot_builtins`, `dot2gxl`, `gv2gxl`, `gvedit`, and `prune`
  utilities are now included in the CMake build system. #1753, #1836

### Changed

- `gvedit` now uses a relative path from its own executable to discover its
  attributes file, `../share/graphviz/gvedit/attrs.txt`. This should make it
  more relocatable and make its behavior more consistent across operating
  systems.
- `alt` tags are no longer set in the cmap output. #265

### Fixed

- `gxl2gv`, when dealing with `name` attributes, may be less likely to crash. We
  say “may be less likely” because a bug remains that makes a crash still
  the most likely outcome. #2300
- Gradient URL references in SVG output once again align with their targets
  (linear or radial gradients) when `id` attributes are in use. This was
  arguably a regression in Graphviz 6.0.1. #2307
- The CMake build system’s interactions with a Zlib installed in a non-system
  location has been improved.
- Do not try to install `gv.php` if using SWIG-4.1.0. Graphviz 7.0.1 changes
  listed SWIG 4.1.0 as supported, but there was an oversight that is fixed in
  7.0.2. Complete #2277, #2303
- Several compilation errors when building Smyrna on macOS have been fixed. This
  was a regression in Graphviz 7.0.1.
- A crash when using neato layout with large inferred per-node edge counts was
  fixed. #42

## [7.0.1] – 2022-11-09

### Added

- SWIG 4.1.0 is now supported in the Autotools build system. #2277, #2303

### Changed

- When built with zlib support, Graphviz will unconditionally use
  `deflateBound`. The only user-visible effect should be slightly decreased
  memory usage when using a zlib-compressed output format.
- The test suite only detects Graphviz companion programs adjacent to the first
  `dot` found in `$PATH` #2201

### Fixed

- Failure of arrowhead and arrowtail to respect penwidth #372 \
  Fixed also for the `diamond` and `tee`
  [edge arrow shapes](https://graphviz.org/doc/info/arrows.html#primitive-shapes).
- The CMake build system no longer uses the final install location as the
  staging area for example graphs and templates during `cpack`. This bug was
  introduced in Graphviz 4.0.0. #2232
- The CMake build system uses corrected paths to DevIL and FreeType headers and
  libraries when discovered.
- The CMake build system under MinGW no longer attempts to install third party
  Expat and Getopt libraries.

## [7.0.0] – 2022-10-22

### Changed

- **Breaking**: An `outline_width` field has been added to the `Agnodeinfo_t`
  struct.
- **Breaking**: An `outline_height` field has been added to the `Agnodeinfo_t`
  struct.
- When using the CMake build system, the minimum requirement has been increased
  from CMake 3.9 to CMake 3.13.0.
- When compiling Graphviz with the Intel C Compiler, the Autotools build system
  no longer suppresses `-ffast-math`. Users relying on this are encouraged to
  investigate what in their build environment is appending a flag their C
  compiler does not support.
- The `-ffast-math` compiler flag is no longer enabled by the Autotools build
  system.
- Reserved stack size on Windows for the `dot.exe` binary has been increased
  from the default 1MB to ~3.8MB.

### Fixed

- Issues with GCC 8, `-O3` and `-ffast-math` #1412
- Problem building Graphviz-5.0.1: undefined symbols `__*_finite` #2296
- Failure of arrowhead and arrowtail to respect penwidth #372 \
  Fixed for all
  [polygon-based node shapes](https://graphviz.org/doc/info/shapes.html#polygon)
  (except for the `cylinder` node shape) and for the
  [edge arrow shapes](https://graphviz.org/doc/info/arrows.html)
  `normal`, `inv`, `box` and `dot`

### Removed

- Support for the MOSEK commercial solver has been removed. The `MOSEK`
  build-time macro no longer does anything.

5 files changed, 29 insertions, 53 deletions

diff --git a/graphics/graphviz/Makefile b/graphics/graphviz/Makefile
index 0326bedd24c..a03e903c022 100644
--- a/graphics/graphviz/Makefile
+++ b/graphics/graphviz/Makefile
@@ -1,7 +1,6 @@
-# $NetBSD: Makefile,v 1.258 2022/10/26 10:31:31 wiz Exp $
+# $NetBSD: Makefile,v 1.259 2022/11/23 13:10:00 micha Exp $
 
-DISTNAME=	graphviz-6.0.2
-PKGREVISION=	1
+DISTNAME=	graphviz-7.0.2
 CATEGORIES=	graphics
 MASTER_SITES=	${MASTER_SITE_GITLAB:=api/v4/projects/4207231/packages/generic/graphviz-releases/${PKGVERSION_NOREV}/}
 EXTRACT_SUFX=	.tar.xz
diff --git a/graphics/graphviz/buildlink3.mk b/graphics/graphviz/buildlink3.mk
index d460c8d17a5..d43ce47df15 100644
--- a/graphics/graphviz/buildlink3.mk
+++ b/graphics/graphviz/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.32 2022/09/30 16:08:52 micha Exp $
+# $NetBSD: buildlink3.mk,v 1.33 2022/11/23 13:10:00 micha Exp $
 
 BUILDLINK_TREE+=	graphviz
 
@@ -6,7 +6,7 @@ BUILDLINK_TREE+=	graphviz
 GRAPHVIZ_BUILDLINK3_MK:=
 
 BUILDLINK_API_DEPENDS.graphviz+=	graphviz>=2.26.3
-BUILDLINK_ABI_DEPENDS.graphviz+=	graphviz>=6.0.1
+BUILDLINK_ABI_DEPENDS.graphviz+=	graphviz>=7.0.2
 BUILDLINK_PKGSRCDIR.graphviz?=		../../graphics/graphviz
 
 .include "../../converters/libiconv/buildlink3.mk"
diff --git a/graphics/graphviz/distinfo b/graphics/graphviz/distinfo
index 113a7079b1e..b9c641a4cba 100644
--- a/graphics/graphviz/distinfo
+++ b/graphics/graphviz/distinfo
@@ -1,10 +1,10 @@
-$NetBSD: distinfo,v 1.74 2022/10/17 09:12:53 adam Exp $
+$NetBSD: distinfo,v 1.75 2022/11/23 13:10:00 micha Exp $
 
-BLAKE2s (graphviz-6.0.2.tar.xz) = 2c294dc4846f92a0b59b11ac5f7743c3cef5865fb3276a5b045347a518b9c6e8
-SHA512 (graphviz-6.0.2.tar.xz) = 447c4cb957a48a3e682998010cf7661e5da346bb4fcaa7ab78869173f31ae144c34d829a1999e1e7bc5329024792705ac6fd0fd63fa359134351a994aa4ea6ec
-Size (graphviz-6.0.2.tar.xz) = 21485596 bytes
+BLAKE2s (graphviz-7.0.2.tar.xz) = c1aaff4f2383b9400493e04deee672b224c2968090794d2c8d2cee659b9d6d8d
+SHA512 (graphviz-7.0.2.tar.xz) = cff40066f80d29a8ca19f8c12410c293b58ef4abf03f2c3b36472a856bc39e6a2bf6badfad4f036e45e430b7d2fec40d5d1fdb0b47778b1857a46b2b07700d98
+Size (graphviz-7.0.2.tar.xz) = 21485860 bytes
 SHA1 (patch-config_config__perl.pl) = 430acb7d7ee3e149de0af9832c5a29602884f83e
-SHA1 (patch-configure.ac) = 1c39f0b25cfc995de10a07492656c2f12a24686f
-SHA1 (patch-lib_gvc_Makefile.am) = b5d793ec0a676c5d4b257c6fec1eb182ee93718b
+SHA1 (patch-configure.ac) = 471884500676d2d5ec11c6de917bd07dd99bccda
+SHA1 (patch-lib_gvc_Makefile.am) = 180b45f810e5bb3948509d50b5be3b159b38a78f
 SHA1 (patch-plugin_gs_gvloadimage__gs.c) = 982ac1db252e3224633069db956c5dc803cd5ea9
 SHA1 (patch-plugin_xlib_gvdevice__xlib.c) = 05d1549db3b9221f5bcb947173034775b0df7c6c
diff --git a/graphics/graphviz/patches/patch-configure.ac b/graphics/graphviz/patches/patch-configure.ac
index 6e26a104588..7aeab2b9de7 100644
--- a/graphics/graphviz/patches/patch-configure.ac
+++ b/graphics/graphviz/patches/patch-configure.ac
@@ -1,18 +1,14 @@
-$NetBSD: patch-configure.ac,v 1.7 2022/07/22 12:04:46 micha Exp $
+$NetBSD: patch-configure.ac,v 1.8 2022/11/23 13:10:00 micha Exp $
 
-1. chunk: fix
-./configure.lineno: 1: Syntax error: Bad substitution
-http://www.graphviz.org/mantisbt/view.php?id=2362
+Patch for Issue 370:
 https://gitlab.com/graphviz/graphviz/-/issues/370
-2. chunk: use the same path for all platforms in pkgsrc
-other chunks: use lua/php/... from pkgsrc
-last chunk: fix
-./configure.lineno: 27203: Syntax error: ")" unexpected (expecting "fi")
-http://www.graphviz.org/mantisbt/view.php?id=2362
-https://gitlab.com/graphviz/graphviz/-/issues/370
-last last chunk: fix sed expression not to use + which is not in BRE (guile)
+https://gitlab.com/graphviz/graphviz/-/issues/2317
+
+Use the same path for all platforms in pkgsrc.
 
---- configure.ac.orig	2022-07-07 15:43:58.000000000 +0000
+Use lua from pkgsrc.
+
+--- configure.ac.orig	2022-11-19 01:13:27.000000000 +0000
 +++ configure.ac
 @@ -101,8 +101,15 @@ case "${host_os}" in
  	# For the build number: months since Jan 2000, day of month from the timestamp
@@ -21,7 +17,7 @@ last last chunk: fix sed expression not to use + which is not in BRE (guile)
 -		GRAPHVIZ_VERSION_BUILD=`expr \( ${GRAPHVIZ_VERSION_MICRO:0:4} - 2000 \) \* 12 + ${GRAPHVIZ_VERSION_MICRO:4:2}`${GRAPHVIZ_VERSION_MICRO:6:2}
 -		GRAPHVIZ_VERSION_REVISION=${GRAPHVIZ_VERSION_MICRO:9:4}
 +		# JR: patch from Michael van Elst:
-+		#     if we have a shellm we should have a working awk, too
++		#     if we have a shell, we should have a working awk, too
 +		eval `echo "$GRAPHVIZ_VERSION_MICRO" | awk '{
 +			print "GRAPHVIZ_VERSION_BUILD=" \
 +				(substr($1,1,4)-2000)*12+substr($1,5,2) \
@@ -50,17 +46,8 @@ last last chunk: fix sed expression not to use + which is not in BRE (guile)
            INTGOSIZE=64
            ;;
        esac
-@@ -694,7 +699,7 @@ else
-       if test "x$GUILE_CONFIG" = "x"; then
-         use_guile="No (guile not available)"
-       else
--        [GUILE_VERSION=`$GUILE_CONFIG --version 2>&1 | sed -n '1 s/^.* \+\([0-9\.]\+\)$/\1/ p'`]
-+        [GUILE_VERSION=`$GUILE_CONFIG --version 2>&1 | sed -n '1 s/^.* \([0-9\.]*\)$/\1/ p'`]
-         GUILE_VERSION_MAJOR=`echo $GUILE_VERSION | cut -d '.' -f 1`
-         GUILE_VERSION_MINOR=`echo $GUILE_VERSION | cut -d '.' -f 2`
-         AC_CHECK_PROGS(GUILE,guile$GUILE_VERSION_MAJOR.$GUILE_VERSION_MINOR guile$GUILE_VERSION_MAJOR guile)
-@@ -918,7 +923,7 @@ else
- 		        LUA_VERSION=`$PKG_CONFIG --modversion lua$l`
+@@ -899,7 +904,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`"
@@ -68,29 +55,19 @@ last last chunk: fix sed expression not to use + which is not in BRE (guile)
  
  		        pkgconfig_lualib_found=`$PKG_CONFIG --exists lualib$l 2>/dev/null`
  		        if test  "x$?" = "x0"; then
-@@ -940,7 +945,7 @@ else
+@@ -920,7 +925,7 @@ else
+ 	        echo
                  LUA_INCLUDES=`$LUACONFIG --include`
                  LUA_LIBS=`$LUACONFIG --libs`
- 	        LUA_VERSION="5.0.x"
 -	        LUA_INSTALL_DIR="/usr/lib$LIBPOSTFIX/lua/5.0"
 +	        LUA_INSTALL_DIR="${PREFIX}/lib$LIBPOSTFIX/lua/5.0"
              fi
          fi
  
-@@ -1137,7 +1142,7 @@ else
-         else
-           PHP_INCLUDES="`$PHPCONFIG --includes`"
-           PHP_INSTALL_DIR="`$PHPCONFIG --extension-dir`"
--          PHP_INSTALL_DATADIR="/usr/share/php"
-+          PHP_INSTALL_DATADIR="${PREFIX}/share/php"
-           PHP_LIBS="`$PHPCONFIG --ldflags` `$PHPCONFIG --libs`"
-           save_CPPFLAGS=$CPPFLAGS
-           CPPFLAGS="$CPPFLAGS $PHP_INCLUDES"
-@@ -2130,45 +2135,6 @@ else
- fi
+@@ -2096,44 +2101,8 @@ fi
  AM_CONDITIONAL(WITH_QUARTZ, [test "x$use_quartz" = "xYes"])
  
--dnl -----------------------------------
+ dnl -----------------------------------
 -dnl INCLUDES and LIBS for PLATFORMSDK
 -
 -AC_ARG_WITH(platformsdkincludedir,
@@ -106,8 +83,8 @@ last last chunk: fix sed expression not to use + which is not in BRE (guile)
 -AC_SUBST([PLATFORMSDKLIB])
 -
 -dnl -----------------------------------
--dnl INCLUDES and LIBS for GDI+
--
+ dnl INCLUDES and LIBS for GDI+
+ 
 -AC_ARG_WITH(gdiplus,
 -  [AS_HELP_STRING([--with-gdiplus=no],[GDI+ framework (Windows)])],
 -  [], [with_gdiplus=no])
diff --git a/graphics/graphviz/patches/patch-lib_gvc_Makefile.am b/graphics/graphviz/patches/patch-lib_gvc_Makefile.am
index 062ceb636fc..1d0559792cf 100644
--- a/graphics/graphviz/patches/patch-lib_gvc_Makefile.am
+++ b/graphics/graphviz/patches/patch-lib_gvc_Makefile.am
@@ -1,10 +1,10 @@
-$NetBSD: patch-lib_gvc_Makefile.am,v 1.2 2022/07/22 12:04:46 micha Exp $
+$NetBSD: patch-lib_gvc_Makefile.am,v 1.3 2022/11/23 13:10:00 micha Exp $
 
 Link with pthread library, if needed.
 
 --- lib/gvc/Makefile.am.orig	2022-07-07 15:43:58.000000000 +0000
 +++ lib/gvc/Makefile.am
-@@ -55,7 +55,7 @@ libgvc_la_LIBADD = $(libgvc_C_la_LIBADD)
+@@ -54,7 +54,7 @@ libgvc_la_LIBADD = $(libgvc_C_la_LIBADD)
  	$(top_builddir)/lib/cdt/libcdt.la \
  	$(top_builddir)/lib/cgraph/libcgraph.la \
  	$(top_builddir)/lib/pathplan/libpathplan.la \