graphics/graphviz: update to 7.1.0

9 files changed, 19 insertions, 62 deletions

diff --git a/graphics/graphviz/files/patch-cmd_gvpr_gvpr.1 b/graphics/graphviz/files/patch-cmd_gvpr_gvpr.1
index 8cac53969034..9b6523c4311f 100644
--- a/graphics/graphviz/files/patch-cmd_gvpr_gvpr.1
+++ b/graphics/graphviz/files/patch-cmd_gvpr_gvpr.1
@@ -1,4 +1,4 @@
---- cmd/gvpr/gvpr.1.orig	2016-08-09 21:02:09 UTC
+--- cmd/gvpr/gvpr.1.orig	2023-01-21 19:59:25 UTC
 +++ cmd/gvpr/gvpr.1
 @@ -3,6 +3,15 @@
  .  ns
diff --git a/graphics/graphviz/files/patch-cmd_tools_gvpack.1 b/graphics/graphviz/files/patch-cmd_tools_gvpack.1
index 4fdc63b8cea7..f6b18a0fd2bd 100644
--- a/graphics/graphviz/files/patch-cmd_tools_gvpack.1
+++ b/graphics/graphviz/files/patch-cmd_tools_gvpack.1
@@ -1,4 +1,4 @@
---- cmd/tools/gvpack.1.orig	2016-08-09 21:02:10 UTC
+--- cmd/tools/gvpack.1.orig	2023-01-21 19:59:25 UTC
 +++ cmd/tools/gvpack.1
 @@ -1,3 +1,12 @@
 +.de EX
diff --git a/graphics/graphviz/files/patch-config_config_ruby.rb b/graphics/graphviz/files/patch-config_config_ruby.rb
deleted file mode 100644
index ed6368c99a27..000000000000
--- a/graphics/graphviz/files/patch-config_config_ruby.rb
+++ /dev/null
@@ -1,19 +0,0 @@
---- config/config_ruby.rb.orig	2019-09-12 02:11:30 UTC
-+++ config/config_ruby.rb
-@@ -5,11 +5,14 @@ CONFIG = RbConfig::MAKEFILE_CONFIG
- 
- case ARGV[0]
- when "archdir"
--    puts RbConfig::expand(CONFIG["archdir"])
-+    puts RbConfig::expand(CONFIG["rubyhdrdir"])
-+when "inc"
-+    print RbConfig::expand(CONFIG["rubyhdrdir"]) + '/'
-+    puts RbConfig::expand(CONFIG["sitearch"])
- when "lib"
-     puts RbConfig::expand(CONFIG["libdir"])
- when "vendorarchdir"
--    puts RbConfig::expand(CONFIG["vendorarchdir"])
-+    puts RbConfig::expand(CONFIG["sitearchdir"])
- when "sitearchdir"
-     puts RbConfig::expand(CONFIG["sitearchdir"])
- when "sitelib"
diff --git a/graphics/graphviz/files/patch-configure.ac b/graphics/graphviz/files/patch-configure.ac
index 53127279d68a..1386b9da5200 100644
--- a/graphics/graphviz/files/patch-configure.ac
+++ b/graphics/graphviz/files/patch-configure.ac
@@ -1,6 +1,6 @@
---- configure.ac.orig	2021-12-04 20:10:28 UTC
+--- configure.ac.orig	2023-01-21 19:59:25 UTC
 +++ configure.ac
-@@ -679,7 +679,7 @@ else
+@@ -642,7 +642,7 @@ else
        if test "x$GUILE_CONFIG" = "x"; then
          use_guile="No (guile not available)"
        else
@@ -9,15 +9,14 @@
          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)
-@@ -897,17 +897,17 @@ else
+@@ -853,16 +853,16 @@ else
              if test "x$PKG_CONFIG" != "x"; then
  	        AC_MSG_CHECKING(for Lua headers and libraries with pkg-config)
  	        echo
 -	        for l in "$lua_suffix" "" "53" "5.3" "52" "5.2" "51" "5.1" "50" "5.0" ; do
-+	        for l in "$lua_suffix" "" "53" "-5.3" "52" "-5.2" "51" "-5.1" "50" "5.0" ; do
++	        for l in "$lua_suffix" "" "54" "-5.4" "53" "-5.3" "52" "-5.2" "51" "5.1" "50" "5.0" ; do
  	            pkgconfig_lua_found=`$PKG_CONFIG --exists lua$l 2>/dev/null`
  	            if test "x$?" = "x0" ; then
- 		        LUA_VERSION=`$PKG_CONFIG --modversion lua$l`
 -                        LUA_INCLUDES="$LUA_CFLAGS "`$PKG_CONFIG --cflags lua$l`
 +                        LUA_INCLUDES="$LUA_CFLAGS "`$PKG_CONFIG --cflags-only-I lua$l`
                          LUA_LIBS="$LUA_LFLAGS "`$PKG_CONFIG --libs lua$l`
@@ -30,7 +29,7 @@
  		           LUA_LIBS="$LUA_LFLAGS "`$PKG_CONFIG --libs lualib$l`
  		        fi
                          break
-@@ -1324,6 +1324,7 @@ else
+@@ -1226,6 +1226,7 @@ else
  	    use_ruby="No (ruby not available)"
            else
              RUBY_CFLAGS="-I`$RUBY $srcdir/config/config_ruby.rb archdir`"
diff --git a/graphics/graphviz/files/patch-lib_expr_exgram.h b/graphics/graphviz/files/patch-lib_expr_exgram.h
index 518f196ede8d..f8ce2aa8f153 100644
--- a/graphics/graphviz/files/patch-lib_expr_exgram.h
+++ b/graphics/graphviz/files/patch-lib_expr_exgram.h
@@ -1,6 +1,6 @@
---- lib/expr/exgram.h.orig	2019-09-12 02:11:30 UTC
+--- lib/expr/exgram.h.orig	2023-01-21 19:59:25 UTC
 +++ lib/expr/exgram.h
-@@ -23,7 +23,7 @@ extern "C" {
+@@ -20,7 +20,7 @@ extern "C" {
   * sometimes free stuff can cost a lot
   */
  
diff --git a/graphics/graphviz/files/patch-lib_expr_expr.h b/graphics/graphviz/files/patch-lib_expr_expr.h
index 8c80866a3fb0..5bfad3b40d05 100644
--- a/graphics/graphviz/files/patch-lib_expr_expr.h
+++ b/graphics/graphviz/files/patch-lib_expr_expr.h
@@ -1,10 +1,10 @@
---- lib/expr/expr.h.orig	2019-09-12 02:11:30 UTC
+--- lib/expr/expr.h.orig	2023-01-21 19:59:25 UTC
 +++ lib/expr/expr.h
-@@ -27,6 +27,7 @@ extern "C" {
+@@ -24,6 +24,7 @@ extern "C" {
  
- #include <ast.h>
+ #include <ast/ast.h>
  #include <inttypes.h>
 +#include <limits.h>
  
- #undef	RS	/* hp.pa <signal.h> grabs this!! */
+ #include <expr/exparse.h>
  
diff --git a/graphics/graphviz/files/patch-lib_ortho_trapezoid.c b/graphics/graphviz/files/patch-lib_ortho_trapezoid.c
deleted file mode 100644
index 6449519e0e96..000000000000
--- a/graphics/graphviz/files/patch-lib_ortho_trapezoid.c
+++ /dev/null
@@ -1,14 +0,0 @@
---- lib/ortho/trapezoid.c.orig	2016-09-20 04:45:02 UTC
-+++ lib/ortho/trapezoid.c
-@@ -30,6 +30,11 @@
- #define log2(x)  (log(x)/log(2))
- #endif
- 
-+#include <sys/param.h>
-+#if __FreeBSD_version <= 704101 || (__FreeBSD_version >= 800000 && __FreeBSD_version < 802502) || (__FreeBSD_version >= 900000 && __FreeBSD_version < 900027)
-+#define log2(x)  (log(x)/log(2))
-+#endif
-+
- /* Node types */
- 
- #define T_X     1
diff --git a/graphics/graphviz/files/patch-plugin_xlib_vimdot.sh b/graphics/graphviz/files/patch-plugin_xlib_vimdot.sh
index b37b7a4d334d..0fe2a1c4f4f0 100644
--- a/graphics/graphviz/files/patch-plugin_xlib_vimdot.sh
+++ b/graphics/graphviz/files/patch-plugin_xlib_vimdot.sh
@@ -1,15 +1,15 @@
---- plugin/xlib/vimdot.sh.orig	2016-12-01 05:43:36 UTC
+--- plugin/xlib/vimdot.sh.orig	2023-01-21 19:59:25 UTC
 +++ plugin/xlib/vimdot.sh
-@@ -5,7 +5,7 @@ error() { echo "$0: $*" >&2; exit 1; }
+@@ -9,7 +9,7 @@ fi
+ error() { echo "$0: $*" >&2; exit 1; }
  
  # Try $EDITOR first, else try vim or vi
- editor="$EDITOR"
--[ -x "$editor" ] || editor="/usr/bin/vim"
-+[ -x "$editor" ] || editor="/usr/local/bin/vim"
+-editor="$(which $EDITOR)" || editor="/usr/bin/vim"
++editor="$(which $EDITOR)" || editor="/usr/local/bin/vim"
  [ -x "$editor" ] || editor="/usr/bin/vi"
  [ -x "$editor" ] || error "EDITOR not found or not executable";
  
-@@ -25,7 +25,7 @@ digraph G {
+@@ -29,7 +29,7 @@ digraph G {
  
  	vim [href="http://www.vim.org/"]
  	dot [href="http://www.graphviz.org/"]
diff --git a/graphics/graphviz/files/version.m4 b/graphics/graphviz/files/version.m4
deleted file mode 100644
index 04a4ec85170f..000000000000
--- a/graphics/graphviz/files/version.m4
+++ /dev/null
@@ -1,9 +0,0 @@
-dnl Graphviz package version number, (as distinct from shared library version)
-dnl For the minor number: odd => unstable series
-dnl                       even => stable series
-dnl For the micro number: 0 => in-progress development
-dnl                       timestamp => tar-file snapshot or release
-m4_define(graphviz_version_major, 2)
-m4_define(graphviz_version_minor, 42)
-m4_define(graphviz_version_micro, 2)
-m4_define(graphviz_collection, development)