From nobody Thu Aug 15 19:42:35 2024 X-Original-To: dev-commits-ports-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4WlFrr1HcJz5Sl9b; Thu, 15 Aug 2024 19:42:36 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4WlFrr0gKTz3xBm; Thu, 15 Aug 2024 19:42:36 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1723750956; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=I1tX2tRX9aBdWpTYIvN3IJD8cNhPvsklkmGLpLebrQ4=; b=ttPvX2aIO0suS4rRP/H44oZ1H/a345epomKCUcO7oMNr81ks6+dD+XsAjVEGT24hzsDHgx 0rtVnd9UrYxjQ4pByaDujOFYyg/seyzxk3q8QGuKq2zaYzBffOmbZ98jwUvrfnljE3AfJK rHRQb1Tu29U3Exi1XsGOqTkLGO556+iTTihvg+xBwv6kfuXxBIGG0auJPSljqiVvpj/tZh syyUz//C/3qxTwhp63j4r/Me21bDtyYZ822LzCjTgGdxL4DUirtCyWkhHSmK4VQTzafWag 8rtq88y645FVC9QuOhJyNvA1d2JxbdpLZmGlDrxIhAshZXMSS1LFxCMHcN0CXA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1723750956; a=rsa-sha256; cv=none; b=VC+q6Lk9MEfhjypeiHVYf1MxgNBb4cZKQ9hKeMCZm8xTLyCl2Z7ZT9FB0nIzhNus6RPSmh Z/eiMtyVeo9gwyQIg+AQY0H6SyM+Cl2xDfNlyYqEL7D6C75teICOVMgw8D5LkNuVT6hkgO Fmc4DZewmYq1mZO98wZ3IcuCm94UoD+GAZjCe3ftihyEc1wI1ZAbOZnRJqX8BEAIAjfq/H KJf+8eLdpWNqOJsFZ0yutq2OzrZTnaThTkdXPTEvSlvY2D88Ir6r2EuUhpkPe9GZ+A4AAo ahLgBcQY4Ex0g5NOrmDpYBBmjb3hASSmJYeS8WkpEFAjR4zqQM6PG/EEnaQUsA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1723750956; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=I1tX2tRX9aBdWpTYIvN3IJD8cNhPvsklkmGLpLebrQ4=; b=AugFu/w275kP9NYBY0K+HJFeuN8E8Xg4Z9aLQGfyW9GddtKaputxNv5hS1uJZErod3nFXq xsyDnE52SUgN+cgFrPo+xv/NNJED59LAMkQbfW1hCl2BqWogSb4vplCqNlj6pXlcKPWwcd Bc2O0zlhcOTGvSyHsIE/z+8H9bZIIouD/Up+yw3fqgq/aBSY/rp1GI2yfN+Jv6zn8domcO 3+KtYFXGxk1iJxZt31kvIX098MsX+HE50748DawS4fqtEuh3GgT5PsAVDhjECCOiydW3/6 GfPRN07F1hafpzQbPhzOP/7l+kRaShQTcBFXoiC9QWBnVD00HHSjxbAhZKTLfA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4WlFrr0G2SzcDK; Thu, 15 Aug 2024 19:42:36 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 47FJgZVF059227; Thu, 15 Aug 2024 19:42:35 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 47FJgZZJ059224; Thu, 15 Aug 2024 19:42:35 GMT (envelope-from git) Date: Thu, 15 Aug 2024 19:42:35 GMT Message-Id: <202408151942.47FJgZZJ059224@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Dirk Meyer Subject: git: 1649b6a9b7f9 - main - graphics/graphviz: update to 12.0.0 List-Id: Commits to the main branch of the FreeBSD ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-ports-main@freebsd.org Sender: owner-dev-commits-ports-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: dinoex X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 1649b6a9b7f956202e94db62962dc72401231efa Auto-Submitted: auto-generated The branch main has been updated by dinoex: URL: https://cgit.FreeBSD.org/ports/commit/?id=1649b6a9b7f956202e94db62962dc72401231efa commit 1649b6a9b7f956202e94db62962dc72401231efa Author: Dirk Meyer AuthorDate: 2024-08-15 19:42:13 +0000 Commit: Dirk Meyer CommitDate: 2024-08-15 19:42:13 +0000 graphics/graphviz: update to 12.0.0 fix PHP bindings (swig 4.2) --- graphics/graphviz/Makefile | 5 ++-- graphics/graphviz/distinfo | 6 ++-- graphics/graphviz/files/patch-configure.ac | 36 +++++++++++------------- graphics/graphviz/files/patch-lib_gvpr_actions.c | 11 -------- graphics/graphviz/files/patch-lib_gvpr_compile.c | 11 -------- graphics/graphviz/pkg-plist | 13 --------- 6 files changed, 21 insertions(+), 61 deletions(-) diff --git a/graphics/graphviz/Makefile b/graphics/graphviz/Makefile index 5c4a28756520..626cf45f6a05 100644 --- a/graphics/graphviz/Makefile +++ b/graphics/graphviz/Makefile @@ -1,6 +1,6 @@ PORTNAME= graphviz -PORTVERSION= 9.0.0 -PORTREVISION= 4 +PORTVERSION= 12.0.0 +PORTREVISION= 0 CATEGORIES= graphics tk MASTER_SITES= https://gitlab.com/api/v4/projects/4207231/packages/generic/graphviz-releases/${PORTVERSION}/ @@ -93,7 +93,6 @@ SMYRNA_USE= GNOME=libglade2,pangox-compat,gdkpixbuf2 GL=glut,glu,gl PERL_USES= perl5 PHP_USES= php:build gnome PHP_USE= GNOME=libxml2 -PHP_BROKEN= needs swig 4.2.0 PYTHON_USES= python:build RUBY_USES= ruby LUA_USES= lua diff --git a/graphics/graphviz/distinfo b/graphics/graphviz/distinfo index 0655b24ccb6b..dee19ed7aac6 100644 --- a/graphics/graphviz/distinfo +++ b/graphics/graphviz/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1696844972 -SHA256 (graphviz-9.0.0.tar.gz) = 3547d90dc80f0ac4cd900ec1a824c319a479c1e8f43883451de1aff293d7a07b -SIZE (graphviz-9.0.0.tar.gz) = 27479799 +TIMESTAMP = 1721045264 +SHA256 (graphviz-12.0.0.tar.gz) = 4f61f3097c0a7c518780d072dd358361fc555317b4599c1e561267f0d6eb3ac6 +SIZE (graphviz-12.0.0.tar.gz) = 27373201 diff --git a/graphics/graphviz/files/patch-configure.ac b/graphics/graphviz/files/patch-configure.ac index 7445520a6126..29408b73dfb5 100644 --- a/graphics/graphviz/files/patch-configure.ac +++ b/graphics/graphviz/files/patch-configure.ac @@ -1,7 +1,7 @@ ---- configure.ac.orig 2023-09-11 18:30:03 UTC +--- configure.ac.orig 2024-07-04 07:59:36 UTC +++ configure.ac -@@ -620,7 +620,7 @@ else - if test "x$GUILE_CONFIG" = "x"; then +@@ -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'`] @@ -9,31 +9,27 @@ 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) -@@ -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" ; do -+ for l in "$lua_suffix" "" "54" "5.4" "53" "5.3" "52" "5.2" "51" "5.1" ; do +@@ -759,13 +759,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 "x$?" = "x0" ; then + if test "$?" = "0" ; then - 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` - LUA_INSTALL_DIR="/usr/lib$LIBPOSTFIX/lua/`$PKG_CONFIG --variable=V lua`" + LUA_INSTALL_DIR="`$PKG_CONFIG --variable=libdir lua$l`/lua" pkgconfig_lualib_found=`$PKG_CONFIG --exists lualib$l 2>/dev/null` - if test "x$?" = "x0"; then + if test "$?" = "0"; then - LUA_INCLUDES="$LUA_CFLAGS "`$PKG_CONFIG --cflags lualib$l` -+ LUA_INCLUDES="$LUA_CFLAGS "`$PKG_CONFIG --cflags-only-I lualib$l` ++ LUA_INCLUDES="$LUA_CFLAGS "`$PKG_CONFIG --flags-only-I lualib$l` LUA_LIBS="$LUA_LFLAGS "`$PKG_CONFIG --libs lualib$l` fi break -@@ -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`" - RUBY_LIBS="-L`$RUBY $srcdir/config/config_ruby.rb lib` `$RUBY -rrbconfig -e \"puts RbConfig::CONFIG[['LIBRUBYARG_SHARED']]\"`" +@@ -1070,6 +1070,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`" ++ #RUBY_CFLAGS="${RUBY_CFLAGS} -I`$RUBY $srcdir/config/config_ruby.rb inc`" + RUBY_LIBS="-L`$RUBY $srcdir/config/config_ruby.rb libdir` `$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 + if test "$RUBY_INSTALL_DIR" = ""; then diff --git a/graphics/graphviz/files/patch-lib_gvpr_actions.c b/graphics/graphviz/files/patch-lib_gvpr_actions.c deleted file mode 100644 index a8ead9200f98..000000000000 --- a/graphics/graphviz/files/patch-lib_gvpr_actions.c +++ /dev/null @@ -1,11 +0,0 @@ ---- 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 deleted file mode 100644 index 24aa574db381..000000000000 --- a/graphics/graphviz/files/patch-lib_gvpr_compile.c +++ /dev/null @@ -1,11 +0,0 @@ ---- 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 index 61a75e892c0e..3be1d2476d80 100644 --- a/graphics/graphviz/pkg-plist +++ b/graphics/graphviz/pkg-plist @@ -45,8 +45,6 @@ include/graphviz/dthdr.h include/graphviz/geom.h include/graphviz/globals.h include/graphviz/graphviz_version.h -include/graphviz/gv.cpp -include/graphviz/gv.i include/graphviz/gvc.h include/graphviz/gvcext.h include/graphviz/gvcint.h @@ -102,10 +100,6 @@ lib/graphviz/libgvplugin_gd.so.6.0.0 %%GHOSTSCRIPT%%lib/graphviz/libgvplugin_gs.so %%GHOSTSCRIPT%%lib/graphviz/libgvplugin_gs.so.6 %%GHOSTSCRIPT%%lib/graphviz/libgvplugin_gs.so.6.0.0 -%%GTK2%%lib/graphviz/libgvplugin_gtk.la -%%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 @@ -141,7 +135,6 @@ lib/graphviz/libgvplugin_webp.so.6.0.0 %%PERL%%lib/graphviz/perl/gv.so %%PERL%%lib/graphviz/perl/libgv_perl.la %%PERL%%lib/graphviz/perl/libgv_perl.so -%%PHP%%lib/graphviz/php/gv.php %%PHP%%lib/graphviz/php/gv.so %%PHP%%lib/graphviz/php/libgv_php.la %%PHP%%lib/graphviz/php/libgv_php.so @@ -179,10 +172,6 @@ lib/libgvpr.la lib/libgvpr.so lib/libgvpr.so.2 lib/libgvpr.so.2.0.0 -lib/liblab_gamut.la -lib/liblab_gamut.so -lib/liblab_gamut.so.1 -lib/liblab_gamut.so.1.0.0 lib/libpathplan.la lib/libpathplan.so lib/libpathplan.so.4 @@ -215,7 +204,6 @@ libdata/pkgconfig/libcdt.pc libdata/pkgconfig/libcgraph.pc libdata/pkgconfig/libgvc.pc libdata/pkgconfig/libgvpr.pc -libdata/pkgconfig/liblab_gamut.pc libdata/pkgconfig/libpathplan.pc libdata/pkgconfig/libxdot.pc %%PORTDOCS%%%%DOCSDIR%%/AUTHORS @@ -519,4 +507,3 @@ 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%%share/php/gv.php