git: 4c568e7c5e11 - main - graphics/graphviz: update to 12.2.0

The branch main has been updated by dinoex:

URL: https://cgit.FreeBSD.org/ports/commit/?id=4c568e7c5e119dbb1f96cb0f37a9b20bea1ba6f3

commit 4c568e7c5e119dbb1f96cb0f37a9b20bea1ba6f3
Author:     Dirk Meyer <dinoex@FreeBSD.org>
AuthorDate: 2024-11-06 04:42:09 +0000
Commit:     Dirk Meyer <dinoex@FreeBSD.org>
CommitDate: 2024-11-06 04:42:09 +0000

    graphics/graphviz: update to 12.2.0
    
    PR: 282534
    - fix option GUILE
---
 graphics/graphviz/Makefile                 |  5 +----
 graphics/graphviz/distinfo                 |  6 +++---
 graphics/graphviz/files/patch-configure.ac | 15 +++------------
 graphics/graphviz/pkg-descr                |  2 +-
 4 files changed, 8 insertions(+), 20 deletions(-)

diff --git a/graphics/graphviz/Makefile b/graphics/graphviz/Makefile
index 109f34d1549f..e16d8be6563c 100644
--- a/graphics/graphviz/Makefile
+++ b/graphics/graphviz/Makefile
@@ -1,5 +1,5 @@
 PORTNAME=	graphviz
-PORTVERSION=	12.1.2
+PORTVERSION=	12.2.0
 PORTREVISION=	0
 CATEGORIES=	graphics tk
 MASTER_SITES=	https://gitlab.com/api/v4/projects/4207231/packages/generic/graphviz-releases/${PORTVERSION}/
@@ -168,7 +168,6 @@ TK_CONFIGURE_ON=	--with-wish=${WISH}
 TK_CONFIGURE_ENV=	TKCONFIG="${TK_LIBDIR}/tkConfig.sh"
 TK_IMPLIES=	TCL
 GUILE_CONFIGURE_ENABLE=		guile
-GUILE_BROKEN=		guile3-3.0.10: guile-3.0, exited on signal 11
 GO_CONFIGURE_ENABLE=		go
 NVTHREADS_LDFLAGS=	-lpthread
 
@@ -247,8 +246,6 @@ post-patch:
 		${WRKSRC}/configure.ac
 	${REINPLACE_CMD} -e 's|#include "gui.h"|#include "gui/gui.h"|' \
 		${WRKSRC}/cmd/smyrna/tvnodes.h
-	${REINPLACE_CMD} -e 's|SF_FLAGS|SFIO_FLAGS|g' \
-		${WRKSRC}/lib/sfio/*.[ch]
 	cd ${WRKSRC} && ${REINPLACE_CMD} \
 		-e 's|exec tclsh |exec tclsh${TCL_VER} |' ${FIX_TCL_SCRIPT}
 	cd ${WRKSRC} && ${REINPLACE_CMD} \
diff --git a/graphics/graphviz/distinfo b/graphics/graphviz/distinfo
index 243a7390430e..37c809d8b2ed 100644
--- a/graphics/graphviz/distinfo
+++ b/graphics/graphviz/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1730579390
-SHA256 (graphviz-12.1.2.tar.gz) = f219ef266ffe68ba7d41eec8a716f1dfa1152e1987ff50f3b1dde6aa19f5d7de
-SIZE (graphviz-12.1.2.tar.gz) = 26817959
+TIMESTAMP = 1730789047
+SHA256 (graphviz-12.2.0.tar.gz) = bd56a15908567ae56f77fcad167f30416b12f4147f91467cbf27265ce11140ad
+SIZE (graphviz-12.2.0.tar.gz) = 26813735
diff --git a/graphics/graphviz/files/patch-configure.ac b/graphics/graphviz/files/patch-configure.ac
index 29408b73dfb5..d6cfd82392fe 100644
--- a/graphics/graphviz/files/patch-configure.ac
+++ b/graphics/graphviz/files/patch-configure.ac
@@ -1,15 +1,6 @@
---- configure.ac.orig	2024-07-04 07:59:36 UTC
+--- configure.ac.orig	2024-11-03 19:33:36 UTC
 +++ configure.ac
-@@ -576,7 +576,7 @@ else
-       if test "$GUILE_CONFIG" = ""; then
-         use_guile="No (guile not available)"
-       else
--        [GUILE_VERSION=`$GUILE_CONFIG --version 2>&1 | sed -n '1 s/^.* \+\([0-9\.]\+\)$/\1/ p'`]
-+        [GUILE_VERSION=`$GUILE_CONFIG --version 2>&1 | sed -n '1 s/^.* \([0-9\.]*\)$/\1/ p'`]
-         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)
-@@ -759,13 +759,13 @@ else
+@@ -731,13 +731,13 @@ else
  	        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 "$?" = "0" ; then
@@ -25,7 +16,7 @@
  		           LUA_LIBS="$LUA_LFLAGS "`$PKG_CONFIG --libs lualib$l`
  		        fi
                          break
-@@ -1070,6 +1070,7 @@ else
+@@ -1029,6 +1029,7 @@ else
              RUBY_CFLAGS="$RUBY_CFLAGS -I`$RUBY $srcdir/config/config_ruby.rb vendorhdrdir`"
              RUBY_CFLAGS="$RUBY_CFLAGS -I`$RUBY $srcdir/config/config_ruby.rb sitehdrdir`"
              RUBY_CFLAGS="$RUBY_CFLAGS -I`$RUBY $srcdir/config/config_ruby.rb rubyhdrdir`"
diff --git a/graphics/graphviz/pkg-descr b/graphics/graphviz/pkg-descr
index 73d7383a05e2..86ca60aed3fd 100644
--- a/graphics/graphviz/pkg-descr
+++ b/graphics/graphviz/pkg-descr
@@ -2,7 +2,7 @@ Graph Visualization Software from AT&T Laboratories and
 Bell Laboratories (Lucent Technologies)
 
 These programs licensed under the terms described in the web page at:
-http://www.graphviz.org/License.php
+https://www.graphviz.org/license/
 
 The package contains:
     dotty  - customizable X windows graph viewer written in the Lefty editor