graphics/graphviz: update to 9.0.0

freebsd · Nov 26, 2023 · eea76fa · eea76fa
1 parent 50e1b66
commit eea76fa
Show file tree

Hide file tree

Showing 6 changed files with 44 additions and 18 deletions.
diff --git a/graphics/graphviz/Makefile b/graphics/graphviz/Makefile
@@ -1,6 +1,6 @@
 PORTNAME=	graphviz
-PORTVERSION=	8.1.0
-PORTREVISION=	2
+PORTVERSION=	9.0.0
+PORTREVISION=	0
 CATEGORIES=	graphics tk
 MASTER_SITES=	https://gitlab.com/api/v4/projects/4207231/packages/generic/graphviz-releases/${PORTVERSION}/
 

diff --git a/graphics/graphviz/distinfo b/graphics/graphviz/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1692155835
-SHA256 (graphviz-8.1.0.tar.gz) = 4abb401a5437d1ec07aee6b3d9213a4b5e060a428393ebfdedfa7baedf39eb32
-SIZE (graphviz-8.1.0.tar.gz) = 27473713
+TIMESTAMP = 1696844972
+SHA256 (graphviz-9.0.0.tar.gz) = 3547d90dc80f0ac4cd900ec1a824c319a479c1e8f43883451de1aff293d7a07b
+SIZE (graphviz-9.0.0.tar.gz) = 27479799
diff --git a/graphics/graphviz/files/patch-configure.ac b/graphics/graphviz/files/patch-configure.ac
@@ -1,6 +1,6 @@
---- configure.ac.orig	2023-07-07 07:42:32 UTC
+--- configure.ac.orig	2023-09-11 18:30:03 UTC
 +++ configure.ac
-@@ -634,7 +634,7 @@ else
+@@ -620,7 +620,7 @@ else
        if test "x$GUILE_CONFIG" = "x"; then
          use_guile="No (guile not available)"
        else
@@ -9,12 +9,12 @@
          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)
-@@ -814,16 +814,16 @@ else
+@@ -800,16 +800,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" "" "54" "-5.4" "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" ; do
++	        for l in "$lua_suffix" "" "54" "5.4" "53" "5.3" "52" "5.2" "51" "5.1" ; do
  	            pkgconfig_lua_found=`$PKG_CONFIG --exists lua$l 2>/dev/null`
  	            if test "x$?" = "x0" ; then
 -                        LUA_INCLUDES="$LUA_CFLAGS "`$PKG_CONFIG --cflags lua$l`
@@ -29,11 +29,11 @@
  		           LUA_LIBS="$LUA_LFLAGS "`$PKG_CONFIG --libs lualib$l`
  		        fi
                          break
-@@ -1187,6 +1187,7 @@ else
+@@ -1173,6 +1173,7 @@ else
  	    use_ruby="No (ruby not available)"
            else
              RUBY_CFLAGS="-I`$RUBY $srcdir/config/config_ruby.rb archdir`"
 +            RUBY_CFLAGS="${RUBY_CFLAGS} -I`$RUBY $srcdir/config/config_ruby.rb inc`"
- 	    # hack for powerpc-darwin8 (10.4)
- 	    if test "x$DARWIN" = "xyes"; then
- 	      RUBY_CFLAGS=`echo $RUBY_CFLAGS | sed 's/powerpc/universal/'`
+             RUBY_LIBS="-L`$RUBY $srcdir/config/config_ruby.rb lib` `$RUBY -rrbconfig -e \"puts RbConfig::CONFIG[['LIBRUBYARG_SHARED']]\"`"
+             RUBY_INSTALL_DIR="`$RUBY $srcdir/config/config_ruby.rb vendorarchdir`"
+ 	    if test "x$RUBY_INSTALL_DIR" = "x"; then
diff --git a/graphics/graphviz/files/patch-lib_gvpr_actions.c b/graphics/graphviz/files/patch-lib_gvpr_actions.c
@@ -0,0 +1,11 @@
+--- lib/gvpr/actions.c.orig	2023-09-11 18:30:04 UTC
++++ lib/gvpr/actions.c
+@@ -33,7 +33,7 @@
+ #define KINDS(p) ((AGTYPE(p) == AGRAPH) ? "graph" : (AGTYPE(p) == AGNODE) ? "node" : "edge")
+
+ static int iofread(void *chan, char *buf, int bufsize) {
+-  return (int)read(fileno(chan), buf, bufsize);
++  return (int)read(fileno((FILE *)chan), buf, bufsize);
+ }
+
+ static int ioputstr(void *chan, const char *str) {
diff --git a/graphics/graphviz/files/patch-lib_gvpr_compile.c b/graphics/graphviz/files/patch-lib_gvpr_compile.c
@@ -0,0 +1,11 @@
+--- lib/gvpr/compile.c.orig	2023-09-11 18:30:04 UTC
++++ lib/gvpr/compile.c
+@@ -56,7 +56,7 @@ static Sflong_t ptr2int(const void *p) {
+
+ static int iofread(void *chan, char *buf, int bufsize)
+ {
+-  return (int)read(fileno(chan), buf, bufsize);
++  return (int)read(fileno((FILE *)chan), buf, bufsize);
+ }
+
+ static int ioputstr(void *chan, const char *str)
diff --git a/graphics/graphviz/pkg-plist b/graphics/graphviz/pkg-plist
@@ -106,6 +106,10 @@ lib/graphviz/libgvplugin_gd.so.6.0.0
 %%GTK2%%lib/graphviz/libgvplugin_gtk.so
 %%GTK2%%lib/graphviz/libgvplugin_gtk.so.6
 %%GTK2%%lib/graphviz/libgvplugin_gtk.so.6.0.0
+lib/graphviz/libgvplugin_kitty.la
+lib/graphviz/libgvplugin_kitty.so
+lib/graphviz/libgvplugin_kitty.so.6
+lib/graphviz/libgvplugin_kitty.so.6.0.0
 lib/graphviz/libgvplugin_neato_layout.la
 lib/graphviz/libgvplugin_neato_layout.so
 lib/graphviz/libgvplugin_neato_layout.so.6
@@ -118,10 +122,10 @@ lib/graphviz/libgvplugin_neato_layout.so.6.0.0
 %%POPPLER%%lib/graphviz/libgvplugin_poppler.so
 %%POPPLER%%lib/graphviz/libgvplugin_poppler.so.6
 %%POPPLER%%lib/graphviz/libgvplugin_poppler.so.6.0.0
-lib/graphviz/libgvplugin_vt100.la
-lib/graphviz/libgvplugin_vt100.so
-lib/graphviz/libgvplugin_vt100.so.6
-lib/graphviz/libgvplugin_vt100.so.6.0.0
+lib/graphviz/libgvplugin_vt.la
+lib/graphviz/libgvplugin_vt.so
+lib/graphviz/libgvplugin_vt.so.6
+lib/graphviz/libgvplugin_vt.so.6.0.0
 lib/graphviz/libgvplugin_webp.la
 lib/graphviz/libgvplugin_webp.so
 lib/graphviz/libgvplugin_webp.so.6