Thu Jan 12 11:28:27 2023 UTC ()
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


(micha)
diff -r1.262 -r1.263 pkgsrc/graphics/graphviz/Makefile
diff -r1.77 -r1.78 pkgsrc/graphics/graphviz/distinfo
diff -r1.9 -r1.10 pkgsrc/graphics/graphviz/patches/patch-configure.ac
cvs diff -r1.262 -r1.263 pkgsrc/graphics/graphviz/Makefile (expand / switch to unified diff)

--- pkgsrc/graphics/graphviz/Makefile 2023/01/03 17:37:23 1.262
+++ pkgsrc/graphics/graphviz/Makefile 2023/01/12 11:28:27 1.263
@@ -1,17 +1,16 @@ @@ -1,17 +1,16 @@
1# $NetBSD: Makefile,v 1.262 2023/01/03 17:37:23 wiz Exp $ 1# $NetBSD: Makefile,v 1.263 2023/01/12 11:28:27 micha Exp $
2 2
3DISTNAME= graphviz-7.0.5 3DISTNAME= graphviz-7.0.6
4PKGREVISION= 1 
5CATEGORIES= graphics 4CATEGORIES= graphics
6MASTER_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}/}
7EXTRACT_SUFX= .tar.xz 6EXTRACT_SUFX= .tar.xz
8 7
9MAINTAINER= micha@NetBSD.org 8MAINTAINER= micha@NetBSD.org
10HOMEPAGE= https://www.graphviz.org/ 9HOMEPAGE= https://www.graphviz.org/
11COMMENT= Graph Drawing Programs from AT&T Research and Lucent Bell Labs 10COMMENT= Graph Drawing Programs from AT&T Research and Lucent Bell Labs
12LICENSE= epl-v1.0 11LICENSE= epl-v1.0
13 12
14CHECK_FILES_SKIP+= ${PREFIX}/lib/graphviz/config6 13CHECK_FILES_SKIP+= ${PREFIX}/lib/graphviz/config6
15CHECK_PORTABILITY_SKIP+= windows/* 14CHECK_PORTABILITY_SKIP+= windows/*
16 15
17USE_LANGUAGES= c99 c++11 16USE_LANGUAGES= c99 c++11
cvs diff -r1.77 -r1.78 pkgsrc/graphics/graphviz/distinfo (expand / switch to unified diff)

--- pkgsrc/graphics/graphviz/distinfo 2022/12/31 20:53:20 1.77
+++ pkgsrc/graphics/graphviz/distinfo 2023/01/12 11:28:27 1.78
@@ -1,10 +1,10 @@ @@ -1,10 +1,10 @@
1$NetBSD: distinfo,v 1.77 2022/12/31 20:53:20 adam Exp $ 1$NetBSD: distinfo,v 1.78 2023/01/12 11:28:27 micha Exp $
2 2
3BLAKE2s (graphviz-7.0.5.tar.xz) = 81014ff5fd9e820d284621c2766249ddde4313b8661789c69b68b8be91357f3a 3BLAKE2s (graphviz-7.0.6.tar.xz) = 85408dd60d02e3b04a2b3b8f5781c5ebcd96b963c0f07447274179649ffb9a42
4SHA512 (graphviz-7.0.5.tar.xz) = 2e4b4d5847503403f1bba6967095c8a24f68eedc852ffc532d397437c45d2a77f9791a2fef82fdbc7e18fd0556088fe4c2f240f1b6c276e5f12a5b68c003f4d4 4SHA512 (graphviz-7.0.6.tar.xz) = 3fbaa7449f288c6af15f6fc745ce8f96ecbe72865e6c14c5c4442008b3979bf89f9c7b75c959b2426a46afcc2f8060eeeb836d27409d866a729b9a6a9910f972
5Size (graphviz-7.0.5.tar.xz) = 21484456 bytes 5Size (graphviz-7.0.6.tar.xz) = 21479248 bytes
6SHA1 (patch-config_config__perl.pl) = 430acb7d7ee3e149de0af9832c5a29602884f83e 6SHA1 (patch-config_config__perl.pl) = 430acb7d7ee3e149de0af9832c5a29602884f83e
7SHA1 (patch-configure.ac) = 1d7bcca3d97e1e77167fcbc57a6a82f1ac0b636c 7SHA1 (patch-configure.ac) = b8a46882b74d3639a91c64a658d2b0f06639ea23
8SHA1 (patch-lib_gvc_Makefile.am) = 180b45f810e5bb3948509d50b5be3b159b38a78f 8SHA1 (patch-lib_gvc_Makefile.am) = 180b45f810e5bb3948509d50b5be3b159b38a78f
9SHA1 (patch-plugin_gs_gvloadimage__gs.c) = 982ac1db252e3224633069db956c5dc803cd5ea9 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.9 -r1.10 pkgsrc/graphics/graphviz/patches/patch-configure.ac (expand / switch to unified diff)

--- pkgsrc/graphics/graphviz/patches/patch-configure.ac 2022/12/07 09:35:13 1.9
+++ pkgsrc/graphics/graphviz/patches/patch-configure.ac 2023/01/12 11:28:27 1.10
@@ -1,20 +1,20 @@ @@ -1,20 +1,20 @@
1$NetBSD: patch-configure.ac,v 1.9 2022/12/07 09:35:13 adam Exp $ 1$NetBSD: patch-configure.ac,v 1.10 2023/01/12 11:28:27 micha Exp $
2 2
3Use the same path for all platforms in pkgsrc. 3Use the same path for all platforms in pkgsrc.
4 
5Use lua from pkgsrc. 4Use lua from pkgsrc.
 5Fix nonportable shell syntax.
6 6
7--- configure.ac.orig 2022-12-03 16:34:35.000000000 +0000 7--- configure.ac.orig 2023-01-06 05:16:50.000000000 +0000
8+++ configure.ac 8+++ configure.ac
9@@ -92,8 +92,7 @@ if test -z "$LIBPOSTFIX"; then 9@@ -92,8 +92,7 @@ if test -z "$LIBPOSTFIX"; then
10 case "${host_os}" in 10 case "${host_os}" in
11 *linux* ) 11 *linux* )
12 case "${host_cpu}" in 12 case "${host_cpu}" in
13- aarch64 | powerpc64 | powerpc64le | s390x | x86_64 | sparc64 | mips64* | riscv64 | e2k ) 13- aarch64 | powerpc64 | powerpc64le | s390x | x86_64 | sparc64 | mips64* | riscv64 | e2k )
14- LIBPOSTFIX="64" 14- LIBPOSTFIX="64"
15+ aarch64* | powerpc64 | powerpc64le | s390x | x86_64 | sparc64 | mips64* | riscv64 | e2k ) 15+ aarch64* | powerpc64 | powerpc64le | s390x | x86_64 | sparc64 | mips64* | riscv64 | e2k )
16 INTGOSIZE=64 16 INTGOSIZE=64
17 ;; 17 ;;
18 esac 18 esac
19@@ -101,7 +100,6 @@ if test -z "$LIBPOSTFIX"; then 19@@ -101,7 +100,6 @@ if test -z "$LIBPOSTFIX"; then
20 *solaris* ) 20 *solaris* )
@@ -32,27 +32,36 @@ Use lua from pkgsrc. @@ -32,27 +32,36 @@ Use lua from pkgsrc.
32+ LUA_INSTALL_DIR="${PREFIX}/lib$LIBPOSTFIX/lua/`$PKG_CONFIG --variable=V lua`" 32+ LUA_INSTALL_DIR="${PREFIX}/lib$LIBPOSTFIX/lua/`$PKG_CONFIG --variable=V lua`"
33  33
34 pkgconfig_lualib_found=`$PKG_CONFIG --exists lualib$l 2>/dev/null` 34 pkgconfig_lualib_found=`$PKG_CONFIG --exists lualib$l 2>/dev/null`
35 if test "x$?" = "x0"; then 35 if test "x$?" = "x0"; then
36@@ -879,7 +877,7 @@ else 36@@ -879,7 +877,7 @@ else
37 echo 37 echo
38 LUA_INCLUDES=`$LUACONFIG --include` 38 LUA_INCLUDES=`$LUACONFIG --include`
39 LUA_LIBS=`$LUACONFIG --libs` 39 LUA_LIBS=`$LUACONFIG --libs`
40- LUA_INSTALL_DIR="/usr/lib$LIBPOSTFIX/lua/5.0" 40- LUA_INSTALL_DIR="/usr/lib$LIBPOSTFIX/lua/5.0"
41+ LUA_INSTALL_DIR="${PREFIX}/lib$LIBPOSTFIX/lua/5.0" 41+ LUA_INSTALL_DIR="${PREFIX}/lib$LIBPOSTFIX/lua/5.0"
42 fi 42 fi
43 fi 43 fi
44  44
45@@ -2055,43 +2053,6 @@ fi 45@@ -1972,7 +1970,7 @@ AS_IF([test "x$with_qt" != "xno"], [
 46 # required for linking with QT
 47 CXXFLAGS="${CXXFLAGS} -fPIE -fPIC"
 48 AC_CHECK_PROGS([QMAKE], [qmake6 qmake-qt5 qmake5 qmake], [false])
 49- AS_IF([test "$QMAKE" == "qmake6"], [
 50+ AS_IF([test "$QMAKE" = "qmake6"], [
 51 # Qt6
 52 AC_CHECK_FILE($(${QMAKE} -query QT_INSTALL_HEADERS)/QtCore/QtCore, [
 53 QTCORE_CFLAGS="-I$(${QMAKE} -query QT_INSTALL_HEADERS) -I$(${QMAKE} -query QT_INSTALL_HEADERS)/QtCore"
 54@@ -2053,43 +2051,6 @@ fi
46 AM_CONDITIONAL(WITH_QUARTZ, [test "x$use_quartz" = "xYes"]) 55 AM_CONDITIONAL(WITH_QUARTZ, [test "x$use_quartz" = "xYes"])
47  56
48 dnl ----------------------------------- 57 dnl -----------------------------------
49-dnl INCLUDES and LIBS for PLATFORMSDK 58-dnl INCLUDES and LIBS for PLATFORMSDK
50- 59-
51-AC_ARG_WITH(platformsdkincludedir, 60-AC_ARG_WITH(platformsdkincludedir,
52- [AS_HELP_STRING([--with-platformsdkincludedir=DIR],[use Platform SDK (Windows) includes from DIR])], 61- [AS_HELP_STRING([--with-platformsdkincludedir=DIR],[use Platform SDK (Windows) includes from DIR])],
53- [PLATFORMSDKINCLUDE=$withval]) 62- [PLATFORMSDKINCLUDE=$withval])
54- 63-
55-AC_ARG_WITH(platformsdklibdir, 64-AC_ARG_WITH(platformsdklibdir,
56- [AS_HELP_STRING([--with-platformsdklibdir=DIR],[use Platform SDK (Windows) libraries from DIR])], 65- [AS_HELP_STRING([--with-platformsdklibdir=DIR],[use Platform SDK (Windows) libraries from DIR])],
57- [PLATFORMSDKLIB=$withval]) 66- [PLATFORMSDKLIB=$withval])
58- 67-