CVS commit: pkgsrc/graphics/graphviz

["Michael Baeuerle" <micha%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   micha
Date:           Thu Jan 12 11:28:27 UTC 2023

Modified Files:
        pkgsrc/graphics/graphviz: Makefile distinfo
        pkgsrc/graphics/graphviz/patches: patch-configure.ac

Log Message:
graphics/graphviz: Update to 7.0.6

Patch for configure.ac modified (nonportable syntax "==").

## [7.0.6] - 2023-01-06

### Changed

- The Autotools build system no longer looks for `python` binaries. The Python
  interpreter is unconditionally assumed to be `python3`. The configure option
  `--enable-python` is now an alias for `--enable-python3`.
- The Autotools and CMake build systems, when building `gvedit`, will now look
  for and use Qt6 in preference over Qt5. #2233
- Reserved stack size on Windows for the `dot.exe` binary has been increased
  from ~3.8MB to 32MB. #1710
- Reserved stack size on macOS for the `dot` binary when built with CMake has
  been increased from 8MB to 32MB. #1710
- The Autotools build system can now find libANN on Debian-based operating
  systems, enabling compilation of libmingle and `mingle`. #1835
- The `webdot` web server interface to Graphviz has been removed. For a modern
  replacement, see for example https://github.com/magjac/d3-graphviz. #1131

### Fixed

- The modgraph.php example no longer includes gv.php, which is no longer
  generated by SWIG 4.1.0. #2322


To generate a diff of this commit:
cvs rdiff -u -r1.262 -r1.263 pkgsrc/graphics/graphviz/Makefile
cvs rdiff -u -r1.77 -r1.78 pkgsrc/graphics/graphviz/distinfo
cvs rdiff -u -r1.9 -r1.10 pkgsrc/graphics/graphviz/patches/patch-configure.ac

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

Modified files:

Index: pkgsrc/graphics/graphviz/Makefile
diff -u pkgsrc/graphics/graphviz/Makefile:1.262 pkgsrc/graphics/graphviz/Makefile:1.263
--- pkgsrc/graphics/graphviz/Makefile:1.262     Tue Jan  3 17:37:23 2023
+++ pkgsrc/graphics/graphviz/Makefile   Thu Jan 12 11:28:27 2023
@@ -1,7 +1,6 @@
-# $NetBSD: Makefile,v 1.262 2023/01/03 17:37:23 wiz Exp $
+# $NetBSD: Makefile,v 1.263 2023/01/12 11:28:27 micha Exp $
 
-DISTNAME=      graphviz-7.0.5
-PKGREVISION=   1
+DISTNAME=      graphviz-7.0.6
 CATEGORIES=    graphics
 MASTER_SITES=  ${MASTER_SITE_GITLAB:=api/v4/projects/4207231/packages/generic/graphviz-releases/${PKGVERSION_NOREV}/}
 EXTRACT_SUFX=  .tar.xz

Index: pkgsrc/graphics/graphviz/distinfo
diff -u pkgsrc/graphics/graphviz/distinfo:1.77 pkgsrc/graphics/graphviz/distinfo:1.78
--- pkgsrc/graphics/graphviz/distinfo:1.77      Sat Dec 31 20:53:20 2022
+++ pkgsrc/graphics/graphviz/distinfo   Thu Jan 12 11:28:27 2023
@@ -1,10 +1,10 @@
-$NetBSD: distinfo,v 1.77 2022/12/31 20:53:20 adam Exp $
+$NetBSD: distinfo,v 1.78 2023/01/12 11:28:27 micha Exp $
 
-BLAKE2s (graphviz-7.0.5.tar.xz) = 81014ff5fd9e820d284621c2766249ddde4313b8661789c69b68b8be91357f3a
-SHA512 (graphviz-7.0.5.tar.xz) = 2e4b4d5847503403f1bba6967095c8a24f68eedc852ffc532d397437c45d2a77f9791a2fef82fdbc7e18fd0556088fe4c2f240f1b6c276e5f12a5b68c003f4d4
-Size (graphviz-7.0.5.tar.xz) = 21484456 bytes
+BLAKE2s (graphviz-7.0.6.tar.xz) = 85408dd60d02e3b04a2b3b8f5781c5ebcd96b963c0f07447274179649ffb9a42
+SHA512 (graphviz-7.0.6.tar.xz) = 3fbaa7449f288c6af15f6fc745ce8f96ecbe72865e6c14c5c4442008b3979bf89f9c7b75c959b2426a46afcc2f8060eeeb836d27409d866a729b9a6a9910f972
+Size (graphviz-7.0.6.tar.xz) = 21479248 bytes
 SHA1 (patch-config_config__perl.pl) = 430acb7d7ee3e149de0af9832c5a29602884f83e
-SHA1 (patch-configure.ac) = 1d7bcca3d97e1e77167fcbc57a6a82f1ac0b636c
+SHA1 (patch-configure.ac) = b8a46882b74d3639a91c64a658d2b0f06639ea23
 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.9 pkgsrc/graphics/graphviz/patches/patch-configure.ac:1.10
--- pkgsrc/graphics/graphviz/patches/patch-configure.ac:1.9     Wed Dec  7 09:35:13 2022
+++ pkgsrc/graphics/graphviz/patches/patch-configure.ac Thu Jan 12 11:28:27 2023
@@ -1,10 +1,10 @@
-$NetBSD: patch-configure.ac,v 1.9 2022/12/07 09:35:13 adam Exp $
+$NetBSD: patch-configure.ac,v 1.10 2023/01/12 11:28:27 micha Exp $
 
 Use the same path for all platforms in pkgsrc.
-
 Use lua from pkgsrc.
+Fix nonportable shell syntax.
 
---- configure.ac.orig  2022-12-03 16:34:35.000000000 +0000
+--- configure.ac.orig  2023-01-06 05:16:50.000000000 +0000
 +++ configure.ac
 @@ -92,8 +92,7 @@ if test -z "$LIBPOSTFIX"; then
    case "${host_os}" in
@@ -42,7 +42,16 @@ Use lua from pkgsrc.
              fi
          fi
  
-@@ -2055,43 +2053,6 @@ fi
+@@ -1972,7 +1970,7 @@ AS_IF([test "x$with_qt" != "xno"], [
+   # required for linking with QT
+   CXXFLAGS="${CXXFLAGS} -fPIE -fPIC"
+   AC_CHECK_PROGS([QMAKE], [qmake6 qmake-qt5 qmake5 qmake], [false])
+-  AS_IF([test "$QMAKE" == "qmake6"], [
++  AS_IF([test "$QMAKE" = "qmake6"], [
+     # Qt6
+     AC_CHECK_FILE($(${QMAKE} -query QT_INSTALL_HEADERS)/QtCore/QtCore, [
+       QTCORE_CFLAGS="-I$(${QMAKE} -query QT_INSTALL_HEADERS) -I$(${QMAKE} -query QT_INSTALL_HEADERS)/QtCore"
+@@ -2053,43 +2051,6 @@ fi
  AM_CONDITIONAL(WITH_QUARTZ, [test "x$use_quartz" = "xYes"])
  
  dnl -----------------------------------