git: 9a0da7ee4ba7 - main - graphics/graphviz: update to 12.1.2

Go to: [ bottom of page ] [ top of archives ] [ this month ]
From: Dirk Meyer <dinoex_at_FreeBSD.org>
Date: Mon, 04 Nov 2024 15:31:36 UTC
The branch main has been updated by dinoex:

URL: https://cgit.FreeBSD.org/ports/commit/?id=9a0da7ee4ba7daad2427e99ced7e1fa5fa8139d2

commit 9a0da7ee4ba7daad2427e99ced7e1fa5fa8139d2
Author:     Dirk Meyer <dinoex@FreeBSD.org>
AuthorDate: 2024-11-04 15:29:58 +0000
Commit:     Dirk Meyer <dinoex@FreeBSD.org>
CommitDate: 2024-11-04 15:31:21 +0000

    graphics/graphviz: update to 12.1.2
    
    PR: 282489
    - reorder OPTIONS
    - new option GVEDIT graph viewer (QT6)
    - mark option GUILE broken
---
 graphics/graphviz/Makefile                      | 74 +++++++++++++------------
 graphics/graphviz/distinfo                      |  6 +-
 graphics/graphviz/files/patch-lib_expr_exgram.h |  8 +--
 graphics/graphviz/files/patch-lib_expr_expr.h   |  4 +-
 graphics/graphviz/pkg-plist                     | 46 ++++++++-------
 5 files changed, 74 insertions(+), 64 deletions(-)

diff --git a/graphics/graphviz/Makefile b/graphics/graphviz/Makefile
index 626cf45f6a05..109f34d1549f 100644
--- a/graphics/graphviz/Makefile
+++ b/graphics/graphviz/Makefile
@@ -1,5 +1,5 @@
 PORTNAME=	graphviz
-PORTVERSION=	12.0.0
+PORTVERSION=	12.1.2
 PORTREVISION=	0
 CATEGORIES=	graphics tk
 MASTER_SITES=	https://gitlab.com/api/v4/projects/4207231/packages/generic/graphviz-releases/${PORTVERSION}/
@@ -50,25 +50,25 @@ FIX_TCL_SCRIPT=	tclpkg/gdtclft/demo/entities.tcl \
 FIX_TK_SCRIPT=	tclpkg/tcldot/demo/doted.tcl \
 		tclpkg/tclpathplan/demo/pathplan.tcl
 
-OPTIONS_DEFINE=	XPM DIGCOLA IPSEPCOLA ICONV NLS PANGOCAIRO POPPLER \
-		ANN GTS GTK2 GDK GDK_PIXBUF SMYRNA DEVIL \
-		GHOSTSCRIPT PERL PHP PYTHON RUBY LUA TCL TK GUILE GO \
+OPTIONS_DEFINE=	XPM DIGCOLA IPSEPCOLA ICONV NLS ANN GTS \
+		PANGOCAIRO POPPLER GDK GHOSTSCRIPT DEVIL \
+		SMYRNA GVEDIT \
+		PERL PHP PYTHON RUBY LUA TCL TK GUILE GO \
 		NVTHREADS DOCS EXAMPLES
 OPTIONS_DEFAULT=XPM DIGCOLA IPSEPCOLA ICONV PANGOCAIRO NVTHREADS
 NO_OPTIONS_SORT=yes
 OPTIONS_SUB=	yes
 DIGCOLA_DESC=	neato layout engine with DIGCOLA features
 IPSEPCOLA_DESC=	neato layout engine with IPSEPCOLA features
-PANGOCAIRO_DESC=pangocairo support
-POPPLER_DESC=	PDF and PS file support via poppler (requires PANGOCAIRO)
 ANN_DESC=	ANN edge bundling support
 GTS_DESC=	GNU Triangulated Surface Library support
-GTK2_DESC=	gtk2 plugin (requires PANGOCAIRO)
-GDK_DESC=	gdk library support (requires GTK2)
-GDK_PIXBUF_DESC=gdk pixbuf support (requires GDK)
-SMYRNA_DESC=	SMYRNA graph viewer (requires GTK2)
-DEVIL_DESC=	devil plugin
+PANGOCAIRO_DESC=pangocairo support
+POPPLER_DESC=	PDF and PS file support via poppler (requires PANGOCAIRO)
+GDK_DESC=	gdk plugin support (requires PANGOCAIRO)
 GHOSTSCRIPT_DESC=ghostscript plugin (requires PANGOCAIRO)
+DEVIL_DESC=	devil plugin
+SMYRNA_DESC=	SMYRNA graph viewer (GTK2)
+GVEDIT_DESC=	GVEDIT graph viewer (QT6)
 PERL_DESC=	Perl bindings (swig)
 PHP_DESC=	PHP bindings (swig)
 PYTHON_DESC=	Python bindings (swig)
@@ -86,28 +86,33 @@ ICONV_USES=	iconv
 NLS_USES=	gettext
 PANGOCAIRO_USES=gnome xorg
 PANGOCAIRO_USE=	GNOME=pango,cairo XORG=xrender,x11,xau,xdmcp
-GTK2_USES=	gnome xorg
-GTK2_USE=	XORG=sm,ice,xext,xinerama,xi,xrandr,xcursor,xfixes GNOME=gtk20
-SMYRNA_USES=	gnome gl
-SMYRNA_USE=	GNOME=libglade2,pangox-compat,gdkpixbuf2 GL=glut,glu,gl
+GDK_USES=	gnome xorg
+GDK_USE=	GNOME=gtk30
+SMYRNA_USES=	gnome gl xorg
+SMYRNA_USE=	GNOME=libglade2,pangox-compat,gdkpixbuf2,gtk20 \
+		GL=glut,glu,gl
+GVEDIT_USES=	qt:6
+GVEDIT_USE=	QT=tools:build,base
 PERL_USES=	perl5
-PHP_USES=	php:build gnome
+PHP_USES=	php:build gnome ssl
 PHP_USE=	GNOME=libxml2
 PYTHON_USES=	python:build
 RUBY_USES=	ruby
 LUA_USES=	lua
+TCL_USES=	python:build
 TK_USES=	tk:build
+GUILE_USES=	guile:3.0
 GO_USES=	go:no_targets
 DOCS_USES=	groff
 
-POPPLER_LIB_DEPENDS=	libpoppler-glib.so:graphics/poppler-glib
 ANN_LIB_DEPENDS=	libann.so:math/ann
 GTS_LIB_DEPENDS=	libgts.so:graphics/gts
-SMYRNA_LIB_DEPENDS=	libgtkgl-2.0.so:x11-toolkits/gtkglarea2 \
-			libgtkglext-x11-1.0.so:x11-toolkits/gtkglext
+POPPLER_LIB_DEPENDS=	libpoppler-glib.so:graphics/poppler-glib
 DEVIL_LIB_DEPENDS=	libIL.so:graphics/devil
-GUILE_USES=		guile:3.0
-PHP_LIB_DEPENDS=	libpcre.so:devel/pcre \
+SMYRNA_LIB_DEPENDS=	libgtkgl-2.0.so:x11-toolkits/gtkglarea2 \
+			libgtkglext-x11-1.0.so:x11-toolkits/gtkglext \
+			libgts.so:graphics/gts
+PHP_LIB_DEPENDS=	libpcre2-8.so:devel/pcre2 \
 			libargon2.so:security/libargon2
 
 XPM_CONFIGURE_WITH=		x
@@ -116,23 +121,22 @@ DIGCOLA_CONFIGURE_WITH=		digcola
 IPSEPCOLA_CONFIGURE_WITH=	ipsepcola
 IPSEPCOLA_IMPLIES=		DIGCOLA
 NLS_CONFIGURE_ENABLE=		nls
-PANGOCAIRO_CONFIGURE_WITH=	pangocairo
-POPPLER_CONFIGURE_WITH=		poppler
-POPPLER_IMPLIES=		PANGOCAIRO
 ANN_CONFIGURE_WITH=		ann
 ANN_CONFIGURE_ENV=	ANN_CFLAGS=-I${LOCALBASE}/include ANN_LIBS=-lann
 GTS_CONFIGURE_WITH=		gts
-GTK2_CONFIGURE_WITH=		gtk
-GTK2_IMPLIES=			PANGOCAIRO
-GDK_CONFIGURE_WITH=		gdk
-GDK_PIXBUF_CONFIGURE_WITH=	gdk-pixbuf
-GDK_PIXBUF_IMPLIES=		GTK2 GDK
-SMYRNA_CONFIGURE_OFF=		--with-glut=no
-SMYRNA_CONFIGURE_WITH=		smyrna glade gtkgl gtkglext
-SMYRNA_IMPLIES=			GTK2 GTS
-DEVIL_CONFIGURE_WITH=		devil
+PANGOCAIRO_CONFIGURE_WITH=	pangocairo
+POPPLER_CONFIGURE_WITH=		poppler
+POPPLER_IMPLIES=		PANGOCAIRO
+GTK3_CONFIGURE_WITH=		gtk
+GDK_CONFIGURE_WITH=		gdk gdk-pixbuf 
+GDK_IMPLIES=			PANGOCAIRO
 GHOSTSCRIPT_CONFIGURE_OFF=	--with-ghostscript=no
 GHOSTSCRIPT_IMPLIES=		PANGOCAIRO
+DEVIL_CONFIGURE_WITH=		devil
+GVEDIT_CONFIGURE_WITH=		qt
+SMYRNA_CONFIGURE_OFF=		--with-glut=no
+SMYRNA_CONFIGURE_WITH=		smyrna glade gtkgl gtkglext gtk
+SMYRNA_IMPLIES=			GTS
 PERL_CONFIGURE_ENABLE=		perl
 PERL_VARS=		SHEBANG_FILES+=tclpkg/gv/demo/modgraph.pl
 PHP_CONFIGURE_ENABLE=		php
@@ -164,6 +168,7 @@ 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
 
@@ -183,12 +188,11 @@ CONFIGURE_ARGS+=	--program-transform-name="s/x/x/" \
 		--with-fontconfiglibdir=${LOCALBASE}/lib \
 		--with-tclsh=${TCLSH} \
 		--without-rsvg \
-		--with-qt=no \
 		--disable-io --disable-ocaml --disable-java \
 		--disable-python2 \
 		--disable-sharp
 
-.if ${PORT_OPTIONS:MPYTHON}
+.if ${PORT_OPTIONS:MPYTHON} || ${PORT_OPTIONS:MTCL}
 BINARY_ALIAS+=	python3=${PYTHON_CMD}
 .endif
 
diff --git a/graphics/graphviz/distinfo b/graphics/graphviz/distinfo
index dee19ed7aac6..243a7390430e 100644
--- a/graphics/graphviz/distinfo
+++ b/graphics/graphviz/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1721045264
-SHA256 (graphviz-12.0.0.tar.gz) = 4f61f3097c0a7c518780d072dd358361fc555317b4599c1e561267f0d6eb3ac6
-SIZE (graphviz-12.0.0.tar.gz) = 27373201
+TIMESTAMP = 1730579390
+SHA256 (graphviz-12.1.2.tar.gz) = f219ef266ffe68ba7d41eec8a716f1dfa1152e1987ff50f3b1dde6aa19f5d7de
+SIZE (graphviz-12.1.2.tar.gz) = 26817959
diff --git a/graphics/graphviz/files/patch-lib_expr_exgram.h b/graphics/graphviz/files/patch-lib_expr_exgram.h
index f8ce2aa8f153..a355a4e0da0f 100644
--- a/graphics/graphviz/files/patch-lib_expr_exgram.h
+++ b/graphics/graphviz/files/patch-lib_expr_exgram.h
@@ -1,11 +1,11 @@
---- lib/expr/exgram.h.orig	2023-01-21 19:59:25 UTC
+--- lib/expr/exgram.h.orig	2024-09-28 08:34:49 UTC
 +++ lib/expr/exgram.h
-@@ -20,7 +20,7 @@ extern "C" {
-  * sometimes free stuff can cost a lot
+@@ -19,7 +19,7 @@ extern "C" {
+  * with both yacc and bison
   */
  
 -#if !defined(_EXGRAM_H) && ( defined(MINTOKEN) || defined(YYTOKENTYPE) )
 +#if !defined(_EXGRAM_H)
  #define _EXGRAM_H
  
- #if !defined(_EXPARSE_H)
+ #include <cgraph/agxbuf.h>
diff --git a/graphics/graphviz/files/patch-lib_expr_expr.h b/graphics/graphviz/files/patch-lib_expr_expr.h
index 5bfad3b40d05..2e5682511918 100644
--- a/graphics/graphviz/files/patch-lib_expr_expr.h
+++ b/graphics/graphviz/files/patch-lib_expr_expr.h
@@ -1,6 +1,6 @@
---- lib/expr/expr.h.orig	2023-01-21 19:59:25 UTC
+--- lib/expr/expr.h.orig	2024-09-28 08:34:49 UTC
 +++ lib/expr/expr.h
-@@ -24,6 +24,7 @@ extern "C" {
+@@ -23,6 +23,7 @@ extern "C" {
  
  #include <ast/ast.h>
  #include <inttypes.h>
diff --git a/graphics/graphviz/pkg-plist b/graphics/graphviz/pkg-plist
index 3be1d2476d80..bd66ef390e90 100644
--- a/graphics/graphviz/pkg-plist
+++ b/graphics/graphviz/pkg-plist
@@ -16,6 +16,7 @@ bin/graphml2gv
 bin/gv2gml
 bin/gv2gxl
 bin/gvcolor
+%%GVEDIT%%bin/gvedit
 bin/gvgen
 bin/gvmap
 bin/gvmap.sh
@@ -240,6 +241,7 @@ libdata/pkgconfig/libxdot.pc
 %%GUILE%%%%PORTDOCS%%%%DOCSDIR%%/gv.3guile.pdf
 %%LUA%%%%PORTDOCS%%%%DOCSDIR%%/gv.3lua.pdf
 %%PERL%%%%PORTDOCS%%%%DOCSDIR%%/gv.3perl.pdf
+%%PHP%%%%PORTDOCS%%%%DOCSDIR%%/gv.3php.pdf
 %%PORTDOCS%%%%DOCSDIR%%/gv.3python.pdf
 %%RUBY%%%%PORTDOCS%%%%DOCSDIR%%/gv.3ruby.pdf
 %%TCL%%%%PORTDOCS%%%%DOCSDIR%%/gv.3tcl.pdf
@@ -248,26 +250,7 @@ libdata/pkgconfig/libxdot.pc
 %%PORTDOCS%%%%DOCSDIR%%/gvc.3.pdf
 %%PORTDOCS%%%%DOCSDIR%%/gvcolor.1.pdf
 %%PORTDOCS%%%%DOCSDIR%%/gvgen.1.pdf
-%%PORTDOCS%%%%DOCSDIR%%/gvmap.1.pdf
-%%PORTDOCS%%%%DOCSDIR%%/gvmap.sh.1.pdf
-%%PORTDOCS%%%%DOCSDIR%%/gvpack.1.pdf
-%%PORTDOCS%%%%DOCSDIR%%/gvpr.1.pdf
-%%PORTDOCS%%%%DOCSDIR%%/gvpr.3.pdf
-%%PORTDOCS%%%%DOCSDIR%%/gxl2dot.1.pdf
-%%PORTDOCS%%%%DOCSDIR%%/gxl2gv.1.pdf
-%%PORTDOCS%%%%DOCSDIR%%/index.html
-%%PORTDOCS%%%%DOCSDIR%%/info/arrows.html
-%%PORTDOCS%%%%DOCSDIR%%/info/attrs.html
-%%PORTDOCS%%%%DOCSDIR%%/info/colors.html
-%%PORTDOCS%%%%DOCSDIR%%/info/command.html
-%%PORTDOCS%%%%DOCSDIR%%/info/index.html
-%%PORTDOCS%%%%DOCSDIR%%/info/lang.html
-%%PORTDOCS%%%%DOCSDIR%%/info/output.html
-%%PORTDOCS%%%%DOCSDIR%%/info/shapes.html
-%%PORTDOCS%%%%DOCSDIR%%/internal_todo.html
-%%PORTDOCS%%%%DOCSDIR%%/latex_suggestions.txt
-%%PORTDOCS%%%%DOCSDIR%%/libguide.pdf
-%%ANN%%%%PORTDOCS%%%%DOCSDIR%%/mingle.1.pdf
+%%GVEDIT%%%%PORTDOCS%%%%DOCSDIR%%/gvedit.1.pdf
 %%PORTDOCS%%%%DOCSDIR%%/mm2gv.1.pdf
 %%PORTDOCS%%%%DOCSDIR%%/neato.1.pdf
 %%PORTDOCS%%%%DOCSDIR%%/neatoguide.pdf
@@ -383,6 +366,7 @@ libdata/pkgconfig/libxdot.pc
 %%DATADIR%%/graphs/undirected/Petersen.gv
 %%DATADIR%%/graphs/undirected/ngk10_4.gv
 %%DATADIR%%/graphs/undirected/process.gv
+%%GVEDIT%%%%DATADIR%%/gvedit/attrs.txt
 %%DATADIR%%/gvpr/addedges
 %%DATADIR%%/gvpr/addranks
 %%DATADIR%%/gvpr/addrings
@@ -450,6 +434,26 @@ libdata/pkgconfig/libxdot.pc
 %%SMYRNA%%%%DATADIR%%/smyrna/zoom_out.png
 %%SMYRNA%%%%DATADIR%%/smyrna/zoomin.png
 %%SMYRNA%%%%DATADIR%%/smyrna/zoomout.png
+%%PORTDOCS%%%%DOCSDIR%%/gvmap.1.pdf
+%%PORTDOCS%%%%DOCSDIR%%/gvmap.sh.1.pdf
+%%PORTDOCS%%%%DOCSDIR%%/gvpack.1.pdf
+%%PORTDOCS%%%%DOCSDIR%%/gvpr.1.pdf
+%%PORTDOCS%%%%DOCSDIR%%/gvpr.3.pdf
+%%PORTDOCS%%%%DOCSDIR%%/gxl2dot.1.pdf
+%%PORTDOCS%%%%DOCSDIR%%/gxl2gv.1.pdf
+%%PORTDOCS%%%%DOCSDIR%%/index.html
+%%PORTDOCS%%%%DOCSDIR%%/info/arrows.html
+%%PORTDOCS%%%%DOCSDIR%%/info/attrs.html
+%%PORTDOCS%%%%DOCSDIR%%/info/colors.html
+%%PORTDOCS%%%%DOCSDIR%%/info/command.html
+%%PORTDOCS%%%%DOCSDIR%%/info/index.html
+%%PORTDOCS%%%%DOCSDIR%%/info/lang.html
+%%PORTDOCS%%%%DOCSDIR%%/info/output.html
+%%PORTDOCS%%%%DOCSDIR%%/info/shapes.html
+%%PORTDOCS%%%%DOCSDIR%%/internal_todo.html
+%%PORTDOCS%%%%DOCSDIR%%/latex_suggestions.txt
+%%PORTDOCS%%%%DOCSDIR%%/libguide.pdf
+%%ANN%%%%PORTDOCS%%%%DOCSDIR%%/mingle.1.pdf
 share/man/man1/acyclic.1.gz
 share/man/man1/bcomps.1.gz
 share/man/man1/ccomps.1.gz
@@ -467,6 +471,7 @@ share/man/man1/graphml2gv.1.gz
 share/man/man1/gv2gml.1.gz
 share/man/man1/gv2gxl.1.gz
 share/man/man1/gvcolor.1.gz
+%%GVEDIT%%share/man/man1/gvedit.1.gz
 share/man/man1/gvgen.1.gz
 share/man/man1/gvmap.1.gz
 share/man/man1/gvmap.sh.1.gz
@@ -507,3 +512,4 @@ share/man/man3/pathplan.3.gz
 %%TCL%%share/man/man3/tcldot.3tcl.gz
 share/man/man3/xdot.3.gz
 share/man/man7/graphviz.7.gz
+%%PHP%%@dir share/php