CVS commit: pkgsrc/graphics/graphviz

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

Module Name:    pkgsrc
Committed By:   micha
Date:           Mon Jan 23 13:44:02 UTC 2023

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

Log Message:
graphics/graphviz: Update to 7.1.0

## [7.1.0] – 2023-01-21

### Added

- The command line option `--help` has been added as an alias for `-?`. #1618
- The command line option `--version` has been added as an alias for `-V`. #1618

### Fixed

- The Autotools build system no longer errors when attempting libANN discovery
  during cross-compilation. This was a regression in Graphviz 7.0.6. #2335
- Graphs with more than 46341 (⌈√INT_MAX⌉) nodes no longer crash `twopi`. #1999
- Compatibility with `/bin/sh` has been restored in the Autotools build system.
  This was a regression in Graphviz 7.0.6. This restores the ability to compile
  on NetBSD which was fixed in 7.0.4 but regressed in 7.0.6. #2340
- `ccomps` no longer crashes when failing to open files.


To generate a diff of this commit:
cvs rdiff -u -r1.263 -r1.264 pkgsrc/graphics/graphviz/Makefile
cvs rdiff -u -r1.79 -r1.80 pkgsrc/graphics/graphviz/distinfo
cvs rdiff -u -r1.11 -r1.12 \
    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.263 pkgsrc/graphics/graphviz/Makefile:1.264
--- pkgsrc/graphics/graphviz/Makefile:1.263     Thu Jan 12 11:28:27 2023
+++ pkgsrc/graphics/graphviz/Makefile   Mon Jan 23 13:44:01 2023
@@ -1,6 +1,6 @@
-# $NetBSD: Makefile,v 1.263 2023/01/12 11:28:27 micha Exp $
+# $NetBSD: Makefile,v 1.264 2023/01/23 13:44:01 micha Exp $
 
-DISTNAME=      graphviz-7.0.6
+DISTNAME=      graphviz-7.1.0
 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.79 pkgsrc/graphics/graphviz/distinfo:1.80
--- pkgsrc/graphics/graphviz/distinfo:1.79      Mon Jan 16 09:26:45 2023
+++ pkgsrc/graphics/graphviz/distinfo   Mon Jan 23 13:44:01 2023
@@ -1,10 +1,10 @@
-$NetBSD: distinfo,v 1.79 2023/01/16 09:26:45 micha Exp $
+$NetBSD: distinfo,v 1.80 2023/01/23 13:44:01 micha Exp $
 
-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
+BLAKE2s (graphviz-7.1.0.tar.xz) = 860ec5031566314d7508084bcf6580205c8cdc5dd0f53d47715047d90be06c12
+SHA512 (graphviz-7.1.0.tar.xz) = 9ff5facadd923300f47f569c568620371e75b7518661bb0f375ada9b0b82189033cec6c124d5691c875e292cef28c51230c6d6c44365c6e4a9e3dcf5b4dd1ee9
+Size (graphviz-7.1.0.tar.xz) = 21477976 bytes
 SHA1 (patch-config_config__perl.pl) = 430acb7d7ee3e149de0af9832c5a29602884f83e
-SHA1 (patch-configure.ac) = 02ad6ef98c568ad4d8be4fb57969b49f4de142ba
+SHA1 (patch-configure.ac) = 80e303d6a9b95c5bb732677a0f1f63d209b39856
 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.11 pkgsrc/graphics/graphviz/patches/patch-configure.ac:1.12
--- pkgsrc/graphics/graphviz/patches/patch-configure.ac:1.11    Mon Jan 16 09:26:45 2023
+++ pkgsrc/graphics/graphviz/patches/patch-configure.ac Mon Jan 23 13:44:02 2023
@@ -1,8 +1,7 @@
-$NetBSD: patch-configure.ac,v 1.11 2023/01/16 09:26:45 micha Exp $
+$NetBSD: patch-configure.ac,v 1.12 2023/01/23 13:44:02 micha Exp $
 
 Use the same path for all platforms in pkgsrc.
 Use lua from pkgsrc.
-Fix nonportable shell syntax (this is fixed upstream, remove for next release).
 
 --- configure.ac.orig  2023-01-06 05:16:50.000000000 +0000
 +++ configure.ac
@@ -42,15 +41,6 @@ Fix nonportable shell syntax (this is fi
              fi
          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"])