From nobody Sun Nov 26 18:30:42 2023 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 4SdcjH1861z52f8d; Sun, 26 Nov 2023 18:30:43 +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 "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4SdcjH0hW9z4QCX; Sun, 26 Nov 2023 18:30:43 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1701023443; 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=myLfJN7QYprteadIzu8Mgcq+qZ5f+zLapSCYENENZyU=; b=wbdQlsRLq9O917nKNb8qTxzkhn2ZVfTPv3o3CwqdsSTMTYXyOTO9h6vgnY5JE6bSqCr4xi FPmAj2jRAohcmO8o7yWBa3bEa1N9EAxwWvLztknQl3mX88fLOXuMzyk6rw3zG6O6Spg/SP SM0jgFhWtIbBbdO750duFUSZFOvfhFWnsouKlhT7bAGZUF7OKdjZ5iUnaBsKhNBHRhtKY3 uhkhgLzJFRiHQ9nVPzrphEwcuEjVhdLRiFVG4Py0JOH5LssAfuyBRQlMigZXlmpLZT4xJA bqfc/r2qt0nGyvWPHUyFmuIvY6TzbwHkPC1/45W0dPFwWY+UdPHi/WuLmNydBg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1701023443; 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=myLfJN7QYprteadIzu8Mgcq+qZ5f+zLapSCYENENZyU=; b=kOyQ6W0muY5EqMUBEGfVhJit5o6J3rUTFcyEAv5gar2vS9pI3Ew1rHOHD7SJ3E87my3QMR 2JKEnlTllXoGTMKhSFi1x2IuRVrvVoI6N9STmDEO+BBtcoy4BXfth1ilayEKGDuqmHJOZa gRNtqQjBRgRdnZf2dLSZtnDu98cShz+nqYqDUult4StIR4/XmUsuYaZAOmyEB0IX9usRzu HFbP5jQWBkXd+2Ts2jsDCh5loZI1UoWEmkcuz1Ce2h+LohbpT5GxBf3mFPLTJdteFbxAPy a0svq4yUS+vuXu3LHfdzXxSo860co8bbNFPHscBn1OMcoOlyUBfN+K8C8PbwMw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1701023443; a=rsa-sha256; cv=none; b=myLsVu0grU2DC3N6SUms9MD390r9GdJyFnRAHfmA4d+rZpAfovIRIR3lRUTDfGgaltEHtl TfTgfvxhVOKC4LI3aYQifOrE1U0RQjj+EEA0Kl6e2pWwnrOaPRgJwSHEFJdNmrHNSnECTh z8i3cLF+7L45phafQZNFoB2ykb0cWz0GStqWu9XKx0ubuH9BbQUmnqCcYsB2Y4zdXRDSa6 FYT4wo4mZRRub1VUwiGVmU23G2ceqV9TVt7AIA+Z+AH/cfOvJEmd/f9ApbslgYk7u0tEcl QOP195LBc1F5hIaokR+HwppWpEDOr54vtt2GfzMjyT7Nk7ItV/yuDbeREnmcwA== 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 4SdcjG6qG2z15Zw; Sun, 26 Nov 2023 18:30:42 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 3AQIUgTM072669; Sun, 26 Nov 2023 18:30:42 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 3AQIUgbh072666; Sun, 26 Nov 2023 18:30:42 GMT (envelope-from git) Date: Sun, 26 Nov 2023 18:30:42 GMT Message-Id: <202311261830.3AQIUgbh072666@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: eea76fa4fa45 - main - graphics/graphviz: update to 9.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: Sender: owner-dev-commits-ports-main@freebsd.org X-BeenThere: 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: eea76fa4fa45ae161cebb6375831d30e46bc6bd7 Auto-Submitted: auto-generated The branch main has been updated by dinoex: URL: https://cgit.FreeBSD.org/ports/commit/?id=eea76fa4fa45ae161cebb6375831d30e46bc6bd7 commit eea76fa4fa45ae161cebb6375831d30e46bc6bd7 Author: Dirk Meyer AuthorDate: 2023-11-26 18:30:31 +0000 Commit: Dirk Meyer CommitDate: 2023-11-26 18:30:31 +0000 graphics/graphviz: update to 9.0.0 --- graphics/graphviz/Makefile | 4 ++-- graphics/graphviz/distinfo | 6 +++--- graphics/graphviz/files/patch-configure.ac | 18 +++++++++--------- graphics/graphviz/files/patch-lib_gvpr_actions.c | 11 +++++++++++ graphics/graphviz/files/patch-lib_gvpr_compile.c | 11 +++++++++++ graphics/graphviz/pkg-plist | 12 ++++++++---- 6 files changed, 44 insertions(+), 18 deletions(-) diff --git a/graphics/graphviz/Makefile b/graphics/graphviz/Makefile index bbd051fcbe76..b2600525dbcf 100644 --- 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 index 4d3422687fe1..0655b24ccb6b 100644 --- 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 index 44edaea55b2a..7445520a6126 100644 --- 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 new file mode 100644 index 000000000000..a8ead9200f98 --- /dev/null +++ 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 new file mode 100644 index 000000000000..24aa574db381 --- /dev/null +++ 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 index e1d04c2cd99d..0ab783745a0f 100644 --- 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