pkgsrc-Changes archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
CVS commit: pkgsrc/graphics/graphviz
Module Name: pkgsrc
Committed By: micha
Date: Fri Jul 22 12:04:46 UTC 2022
Modified Files:
pkgsrc/graphics/graphviz: DESCR Makefile PLIST buildlink3.mk distinfo
options.mk
pkgsrc/graphics/graphviz/patches: patch-config_config__perl.pl
patch-configure.ac patch-lib_gvc_Makefile.am
patch-plugin_gs_gvloadimage__gs.c
patch-plugin_xlib_gvdevice__xlib.c patch-tclpkg_gv_Makefile.am
Removed Files:
pkgsrc/graphics/graphviz/patches: patch-cmd_lefty_os_unix_io.c
patch-version.m4
Log Message:
graphics/graphviz: Update to 5.0.0
- Patch for lefty on OpenBSD removed (lefty is not installed anymore).
- Patch for configure.ac modified (list Github Issue #370 and remove hunk for
OCaml that does no longer work).
- Patch for version.m4 removed (no longer required).
- Explicit dependency for urw-fonts added.
- Warning suppression for GCC 2 removed.
- swig is now a tool dependency (as documented by upstream).
- Guile option removed (already broken with older package versions).
- OCaml option removed (already broken with older package versions).
- Lua, Perl and Tcl language extension options are now disabled by default
(to reduce expensive dependencies).
5.0.0 - 2022-07-07
==================
Changed
-------
- `use_sanitizers` option has been removed from the CMake build system.
Fixed
-----
- *Breaking*: The 4.0.0 change replacing the `Agiodisc_t` struct member
`putstr` by `printf` has been reverted
- graphviz-4.0.0: build error: cmd/tools/gvcolor.c:159: undefined reference to
`fmax` #2246
- Failed assertion in `chkSgraph` for twopi layout and ortho splines. #14
- Failed assertion in `chkSgraph` for dot layout and ortho splines. #1408
- Failed assertion in `chkSgraph` for circo layout and ortho splines. #1990
- Segmentation Fault with splines="ortho". #1658
- Transparent Label appear in SVG output #146
- Binary tcl modules should compile with -module #1285
- b15.gv crashes dot #827
- heap overflow in function startElementHandler in gxl2gv.c #2093
- Crash on assertion #121
- `xdotversion` attribute is no longer misparsed. This was a regression in
Graphviz 2.47.2. #358
4.0.0 - 2022-05-29
==================
Changed
-------
- *Breaking*: The `mark` field of the `Agnodeinfo_t` struct is now a
`size_t` instead of a `char`.
- *Breaking*: The unused `shape_t` struct has been removed from the public
header `types.h`
- *Breaking*: The `Agiodisc_t` struct member `putstr` that was previously an
`fputs` analog is replaced by `printf` that is required to behave similar to
`fprintf`.
- the `mingle`, `diffimg`, `gvmap`, and `edgepaint` binaries are now included in
the CMake build system
- the `gvmap.sh` and `vimdot` scripts are now installed by the CMake build
system on operating systems other than Windows
- a brief note about the (previously undocumented) behavior of Graphviz when
sent `SIGUSR1` is now mentioned in the man page
- build system support for `dotty`, `lefty`, and `lneato` has been removed
- the CMake build system now includes the DevIL, GDK, GhostScript, GTK, LASi,
Poppler, Quartz, Rsvg, Visio, WebP, and Xlib plugins
- `awk` is no longer a build-time dependency #2118
Fixed
-----
- `agcanon`, `agcanonStr`, and `agwrite` now return error values on memory
allocation failures instead of crashing or corrupting data
- `gvpr` programs can now pass dynamically allocated arguments to user-defined
functions without corrupting their content. Some cases of this were a
regression in Graphviz 2.46.0. Other cases have existed since the first
release of `gvpr`. #2185
- spurious "no hard-coded metrics" warnings on labels with empty lines #2179
- fixed corruption of user shape characteristics during EPSF initialization
- output formats canon, dot, and xdot are not completely faithful to input #2184
- gvpr index function produces wrong results #2211. This was a regression in
Graphviz 2.47.0.
- Error on more than 128 cluster subgraphs #2080
- `dot2gxl` no longer crashes on input `<node id="">` #2092
- remove itos #2229
- `sfdp` no longer crashes on certain graphs with cycles. #2225
- `gml2gv` does not handle integer penwidth correctly #1871
Removed
-------
- the glitz plugin has been removed. The plugin was never complete and
distributions no longer ship glitz.
3.0.0 - 2022-02-26
==================
Changed
-------
- *Breaking*: Using Graphviz as a library on Windows now requires the `GVDLL`
symbol to be set to ensure correct linking.
- *Breaking*: Graphviz headers no longer define the `boolean` type. A
replacement is C99 `bool` in the C standard library's stdbool.h.
- *Breaking*: The `insidefn` member of the `shape_functions` struct must now
be a pointer to a function returning a C99 `bool` instead of a
Graphviz-specific `boolean`.
- *Breaking*: The `swapEnds` and `splineMerge` members of the `splineInfo`
struct must now be pointers to functions returning a C99 `bool`s instead of
Graphviz-specific `boolean`s. Similarly the `ignoreSwap` and `isOrtho` members
of this struct must now be C99 `bool`s instead of a Graphviz-specific
`boolean`s.
- *Breaking*: The `defined`, `constrained`, `clip`, and `dyna` fields of the
`port` struct are now C99 `bool`s instead of Graphviz-specific `boolean`s.
- *Breaking*: The `set` and `html` fields of the `textlabel_t` struct are now
C99 `bool`s instead of Graphviz-specific `boolean`s.
- *Breaking*: The `usershape` field of the `shape_desc` struct is now a C99
`bool` instead of a Graphviz-specific `boolean`.
- *Breaking*: The `candidate` and `valid` fields of the `rank_t` struct are
now C99 `bool`s instead of Graphviz-specific `boolean`s.
- *Breaking*: The `filled`, `landscape`, and `centered` fields of the
`layout_t` struct are now C99 `bool`s instead of Graphviz-specific `boolean`s.
- *Breaking*: The `has_images`, `has_flat_edges`, `has_sourcerank`,
`has_sinkrank`, `expanded`, and `exact_ranksep` fields of the `Agraphinfo_t`
struct are now C99 `bool`s instead of Graphviz-specific `boolean`s.
- *Breaking*: The `clustnode` and `has_port` fields of the `Agnodeinfo_t`
struct are now C99 `bool`s instead of Graphviz-specific `boolean`s.
- *Breaking*: The `conc_opp_flag` field of the `Agedgeinfo_t` struct is now a
C99 `bool` instead of a Graphviz-specific `boolean`.
- *Breaking*: The `must_inline` and `nocache` fields of the `usershape_t`
struct are now C99 `bool`s instead of Graphviz-specific `boolean`s.
- *Breaking*: The `device_sets_dpi`, `external_context`, `fit_mode`,
`needs_refresh`, `click`, `has_grown`, and `has_been_rendered` fields of the
`GVJ_t` struct are now C99 `bool`s instead of Graphviz-specific `boolean`s.
- *Breaking*: The `loadimage` member of the `gvloadimage_engine_t` struct must
now accept a C99 `bool` parameter instead of a former Graphviz-specific
`boolean` parameter.
- *Breaking*: The `textlayout` member of the `gvtextlayout_engine_t` struct
must now return a C99 `bool` instead of a Graphviz-specific `boolean`.
- *Breaking*: The `config` and `auto_outfile_names` members of the
`GVC_common_s` struct are now C99 `bool`s instead of Graphviz-specific
`boolean`s.
- *Breaking*: The `fixed` member of the `pack_info` struct is now an array of
C99 `bool`s instead of an array of Graphviz-specific `boolean`s. Similarly,
`pack_graph` now takes a `bool` array instead of a `boolean` array.
- *Breaking*: `pccomps` now takes a C99 `bool` instead of a `boolean` output
parameter.
- *Breaking*: `gvusershape_file_access` now returns a C99 `bool` instead of a
Graphviz-specific `boolean`.
- *Breaking*: 1-bit fields of the `obj_state_s` struct are now unsigned
instead of signed.
- *Breaking*: Graphviz headers no longer define the constant `MAXSHORT`. A
drop-in replacement is `SHRT_MAX` in the C standard library's limits.h.
- *Breaking*: Graphviz headers no lnger define `NIL` macros. A drop-in
replacement is `NULL` in the C standard library's stddef.h.
- *Breaking*: Graphviz headers no longer define the `NOT` macro. A drop-in
replacement is the C/C++ operator `!`.
- *Breaking*: Graphviz headers no longer (re-)define the C constants `INT_MIN`
and `INT_MAX`. Replacements can be found in the C standard library's limits.h.
- *Breaking*: Graphviz headers no longer define the constant `_DUMMY_ELEM`.
- *Breaking*: The `-m` memory test option to Graphviz command-line programs
has been deprecated. Tools such as
[Leak Sanitizer](https://clang.llvm.org/docs/LeakSanitizer.html) are a more
effective modern way of diagnosing memory safety issues.
- *Breaking*: Graphviz headers no longer define the constant `MAXFLOAT`. A
replacement is `FLT_MAX` in the C standard library's float.h.
- The Ming plugin that produced Shockwave files has been removed. This format
was EOLed by Adobe in April 2019. #2160
- CentOS 7 packages now include libmingle and the `mingle` program.
- The tclpkg Makefile no longer suppresses `-fstack-clash-protection` nor
other compiler options containing `-x`
- Lefty is no longer enabled in the portable source tarball.
- on Linux, the CMake build system uses the standard `GNUInstallDirs` to locate
target installation paths
Fixed
-----
- *Breaking*: GVPR now typedefs `ssize_t` as `SSIZE_T` on Windows instead of
`int` #1804
- *Breaking*: `vgpanecmd` in the TCL tclpathplan library no longer accepts
abbreviated commands (e.g. `r` for `rotate`) and commands must be given in
full #1961
- fix detection of unavailable output format
- SVG layout doesn't always respect requested size #1855
- mismatched format string in `mingle`
- Building from scratch with Visual Studio fails #2175
- Plugins are not configured on MinGW #2176
- gvpr on MinGW does not support absolute paths #1780
- PNG format not available in CMake builds with MinGW
- tclpkg Makefile corrupts CFLAGS #2177
- lneato -? sometimes fails with STATUS_STACK_BUFFER_OVERRUN on Windows #1934
- expr misinterprets `<<` and `>>` #2103
- stdout and stderr are not flushed at exit on MinGW #2178
- Gvedit on macOS now understands the `-?` help command line argument
- CMAKE_LIBRARY_PATH is not honored #1973
- assert failure with `nslimit1=0` #1902
- `gvpr` usage output has been restored. This was a regression in Graphviz
2.46.0.
- C++ API not usable after install #2196
To generate a diff of this commit:
cvs rdiff -u -r1.2 -r1.3 pkgsrc/graphics/graphviz/DESCR
cvs rdiff -u -r1.250 -r1.251 pkgsrc/graphics/graphviz/Makefile
cvs rdiff -u -r1.55 -r1.56 pkgsrc/graphics/graphviz/PLIST
cvs rdiff -u -r1.28 -r1.29 pkgsrc/graphics/graphviz/buildlink3.mk
cvs rdiff -u -r1.71 -r1.72 pkgsrc/graphics/graphviz/distinfo
cvs rdiff -u -r1.33 -r1.34 pkgsrc/graphics/graphviz/options.mk
cvs rdiff -u -r1.1 -r0 \
pkgsrc/graphics/graphviz/patches/patch-cmd_lefty_os_unix_io.c \
pkgsrc/graphics/graphviz/patches/patch-version.m4
cvs rdiff -u -r1.3 -r1.4 \
pkgsrc/graphics/graphviz/patches/patch-config_config__perl.pl
cvs rdiff -u -r1.6 -r1.7 pkgsrc/graphics/graphviz/patches/patch-configure.ac
cvs rdiff -u -r1.1 -r1.2 \
pkgsrc/graphics/graphviz/patches/patch-lib_gvc_Makefile.am \
pkgsrc/graphics/graphviz/patches/patch-tclpkg_gv_Makefile.am
cvs rdiff -u -r1.2 -r1.3 \
pkgsrc/graphics/graphviz/patches/patch-plugin_gs_gvloadimage__gs.c \
pkgsrc/graphics/graphviz/patches/patch-plugin_xlib_gvdevice__xlib.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: pkgsrc/graphics/graphviz/DESCR
diff -u pkgsrc/graphics/graphviz/DESCR:1.2 pkgsrc/graphics/graphviz/DESCR:1.3
--- pkgsrc/graphics/graphviz/DESCR:1.2 Tue May 6 17:41:27 2003
+++ pkgsrc/graphics/graphviz/DESCR Fri Jul 22 12:04:46 2022
@@ -4,8 +4,7 @@ Laboratories.
It includes:
- dot: makes hierarchical layouts of directed graphs
- neato: makes "spring" model layouts of undirected graphs
-- lefty: a programmable graphics editor
-- dotty: a customizable interface written in LEFTY
- tcldot: a customizable graphical interface written in TCL
-- libgraph: the base library for graph tools
+ (part of "tcl" option)
+- libcgraph: the base library for graph tools
- various associated utilities
Index: pkgsrc/graphics/graphviz/Makefile
diff -u pkgsrc/graphics/graphviz/Makefile:1.250 pkgsrc/graphics/graphviz/Makefile:1.251
--- pkgsrc/graphics/graphviz/Makefile:1.250 Mon Jul 11 17:25:00 2022
+++ pkgsrc/graphics/graphviz/Makefile Fri Jul 22 12:04:46 2022
@@ -1,27 +1,20 @@
-# $NetBSD: Makefile,v 1.250 2022/07/11 17:25:00 micha Exp $
+# $NetBSD: Makefile,v 1.251 2022/07/22 12:04:46 micha Exp $
-DISTNAME= graphviz-2.50.0
-PKGREVISION= 6
+DISTNAME= graphviz-5.0.0
CATEGORIES= graphics
-MASTER_SITES= https://gitlab.com/api/v4/projects/4207231/packages/generic/graphviz-releases/${PKGVERSION_NOREV}/
-EXTRACT_SUFX= .tar.gz
+MASTER_SITES= ${MASTER_SITE_GITLAB:=api/v4/projects/4207231/packages/generic/graphviz-releases/${PKGVERSION_NOREV}/}
MAINTAINER= micha%NetBSD.org@localhost
HOMEPAGE= https://www.graphviz.org/
COMMENT= Graph Drawing Programs from AT&T Research and Lucent Bell Labs
LICENSE= epl-v1.0
-TOOL_DEPENDS+= ghostscript-[0-9]*:../../print/ghostscript
-
CHECK_FILES_SKIP+= ${PREFIX}/lib/graphviz/config6
CHECK_PORTABILITY_SKIP+= windows/*
USE_LANGUAGES= c99 c++11
+USE_TOOLS+= automake autoreconf makeinfo bison flex gmake groff pkg-config
USE_LIBTOOL= yes
-USE_TOOLS+= automake autoreconf makeinfo bison flex groff pkg-config
-# GNU make is needed since BSD Make does not know $< in explicit rules,
-# such as used by lib/cdt/Makefile.am.
-USE_TOOLS+= gmake
GNU_CONFIGURE= yes
GNU_CONFIGURE_STRICT= no # has sub-configures
CONFIGURE_ARGS+= --disable-d
@@ -33,6 +26,8 @@ CONFIGURE_ARGS+= --disable-javascript
CONFIGURE_ARGS+= --disable-php
CONFIGURE_ARGS+= --disable-python
CONFIGURE_ARGS+= --disable-python3
+CONFIGURE_ARGS+= --disable-guile
+CONFIGURE_ARGS+= --disable-ocaml
CONFIGURE_ARGS+= --disable-r
CONFIGURE_ARGS+= --disable-ruby
CONFIGURE_ARGS+= --disable-sharp
@@ -65,8 +60,8 @@ CONFIGURE_ARGS+= --with-webp
# build fails when PHP and/or Ruby are also installed
CONFIGURE_ENV+= ac_cv_prog_PHP=
CONFIGURE_ENV+= ac_cv_prog_RUBY=
-CPPFLAGS+= -DNO_POSTSCRIPT_ALIAS=1
+CPPFLAGS+= -DNO_POSTSCRIPT_ALIAS=1
LDFLAGS.SunOS+= -lsocket -lnsl
PKGCONFIG_OVERRIDE+= lib/cdt/libcdt.pc.in
@@ -96,13 +91,9 @@ REPLACE_PERL+= tclpkg/gv/demo/modgraph.
.include "../../mk/bsd.prefs.mk"
+# Override Xaw type configured by user
XAW_TYPE= standard
-.include "../../mk/compiler.mk"
-.if !empty(CC_VERSION:Mgcc-2*)
-BUILDLINK_TRANSFORM+= rm:-Wno-unused-parameter
-.endif
-
.if (${OPSYS} == "NetBSD" && ${MACHINE_ARCH} == "powerpc")
# Forces link with -lgomp directly instead of via dlopen()
# so we don't overflow thread-local storage in ld.elf_so
@@ -130,18 +121,17 @@ post-install:
.include "options.mk"
-.include "../../lang/lua/application.mk"
+DEPENDS+= urw-fonts-[0-9]*:../../fonts/urw-fonts
.include "../../converters/libiconv/buildlink3.mk"
.include "../../devel/gettext-lib/buildlink3.mk"
.include "../../devel/libltdl/buildlink3.mk"
-#.include "../../devel/libltdl/convenience.mk"
.include "../../devel/pango/buildlink3.mk"
.include "../../fonts/fontconfig/buildlink3.mk"
-.include "../../graphics/cairo/buildlink3.mk"
.include "../../graphics/freetype2/buildlink3.mk"
.include "../../graphics/gts/buildlink3.mk"
.include "../../graphics/libwebp/buildlink3.mk"
-.include "../../textproc/expat/buildlink3.mk"
.include "../../mk/pthread.buildlink3.mk"
+.include "../../textproc/expat/buildlink3.mk"
+
.include "../../mk/bsd.pkg.mk"
Index: pkgsrc/graphics/graphviz/PLIST
diff -u pkgsrc/graphics/graphviz/PLIST:1.55 pkgsrc/graphics/graphviz/PLIST:1.56
--- pkgsrc/graphics/graphviz/PLIST:1.55 Wed Dec 29 16:19:18 2021
+++ pkgsrc/graphics/graphviz/PLIST Fri Jul 22 12:04:46 2022
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.55 2021/12/29 16:19:18 adam Exp $
+@comment $NetBSD: PLIST,v 1.56 2022/07/22 12:04:46 micha Exp $
bin/acyclic
bin/bcomps
bin/ccomps
@@ -9,7 +9,6 @@ bin/dijkstra
bin/dot
bin/dot2gxl
bin/dot_builtins
-${PLIST.x11}bin/dotty
bin/edgepaint
bin/fdp
bin/gc
@@ -25,8 +24,6 @@ bin/gvpack
bin/gvpr
bin/gxl2dot
bin/gxl2gv
-${PLIST.x11}bin/lefty
-${PLIST.x11}bin/lneato
bin/mm2gv
bin/neato
bin/nop
@@ -66,7 +63,6 @@ include/graphviz/textspan.h
include/graphviz/types.h
include/graphviz/usershape.h
include/graphviz/xdot.h
-${PLIST.guile}lib/graphviz/guile/libgv_guile.la
lib/graphviz/libgvplugin_core.la
lib/graphviz/libgvplugin_dot_layout.la
${PLIST.gd}lib/graphviz/libgvplugin_gd.la
@@ -82,19 +78,10 @@ lib/graphviz/libgvplugin_visio.la
lib/graphviz/libgvplugin_webp.la
${PLIST.x11}lib/graphviz/libgvplugin_xlib.la
${PLIST.lua}lib/graphviz/lua/libgv_lua.la
-${PLIST.ocaml}lib/graphviz/ocaml/META.gv
-${PLIST.ocaml}lib/graphviz/ocaml/gv.a
-${PLIST.ocaml}lib/graphviz/ocaml/gv.cma
-${PLIST.ocaml}lib/graphviz/ocaml/gv.cmi
-${PLIST.ocaml}lib/graphviz/ocaml/gv.cmo
-${PLIST.ocaml}lib/graphviz/ocaml/gv.cmx
-${PLIST.ocaml}lib/graphviz/ocaml/gv.cmxa
-${PLIST.ocaml}lib/graphviz/ocaml/gv.mli
-${PLIST.ocaml}lib/graphviz/ocaml/libgv_ocaml.la
${PLIST.perl}lib/graphviz/perl/gv.pm
${PLIST.perl}lib/graphviz/perl/gv.so
${PLIST.perl}lib/graphviz/perl/libgv_perl.la
-${PLIST.tcl}${PLIST.gd}lib/graphviz/tcl/libgdtclft.la
+${PLIST.tcl}${PLIST.x11}lib/graphviz/tcl/libgdtclft.la
${PLIST.tcl}lib/graphviz/tcl/libgv_tcl.la
${PLIST.tcl}lib/graphviz/tcl/libtcldot.la
${PLIST.tcl}lib/graphviz/tcl/libtcldot_builtin.la
@@ -117,7 +104,7 @@ lib/pkgconfig/libgvpr.pc
lib/pkgconfig/liblab_gamut.pc
lib/pkgconfig/libpathplan.pc
lib/pkgconfig/libxdot.pc
-${PLIST.tcl}lib/tcl${TCL_BASEVER}/graphviz/libgdtclft.la
+${PLIST.tcl}${PLIST.x11}lib/tcl${TCL_BASEVER}/graphviz/libgdtclft.la
${PLIST.tcl}lib/tcl${TCL_BASEVER}/graphviz/libgv_tcl.la
${PLIST.tcl}lib/tcl${TCL_BASEVER}/graphviz/libtcldot.la
${PLIST.tcl}lib/tcl${TCL_BASEVER}/graphviz/libtcldot_builtin.la
@@ -128,11 +115,10 @@ man/man1/bcomps.1
man/man1/ccomps.1
man/man1/circo.1
man/man1/cluster.1
-man/man1/diffimg.1
+${PLIST.gd}man/man1/diffimg.1
man/man1/dijkstra.1
man/man1/dot.1
man/man1/dot2gxl.1
-man/man1/dotty.1
man/man1/edgepaint.1
man/man1/fdp.1
man/man1/gc.1
@@ -148,9 +134,6 @@ man/man1/gvpack.1
man/man1/gvpr.1
man/man1/gxl2dot.1
man/man1/gxl2gv.1
-${PLIST.x11}man/man1/lefty.1
-man/man1/lneato.1
-man/man1/mingle.1
man/man1/mm2gv.1
man/man1/neato.1
man/man1/nop.1
@@ -162,14 +145,12 @@ man/man1/sfdp.1
man/man1/tred.1
man/man1/twopi.1
man/man1/unflatten.1
-man/man1/vimdot.1
+${PLIST.x11}man/man1/vimdot.1
man/man3/cdt.3
man/man3/cgraph.3
man/man3/expr.3
${PLIST.tcl}${PLIST.gd}man/man3/gdtclft.3tcl
-${PLIST.guile}man/man3/gv.3guile
${PLIST.lua}man/man3/gv.3lua
-${PLIST.ocaml}man/man3/gv.3ocaml
${PLIST.perl}man/man3/gv.3perl
${PLIST.swig}man/man3/gv.3python
${PLIST.tcl}man/man3/gv.3tcl
@@ -180,6 +161,90 @@ man/man3/pathplan.3
${PLIST.tcl}man/man3/tcldot.3tcl
man/man3/xdot.3
man/man7/graphviz.7
+share/doc/graphviz/AUTHORS
+share/doc/graphviz/Agraph.pdf
+share/doc/graphviz/CHANGELOG.md
+share/doc/graphviz/COPYING
+share/doc/graphviz/Dot.ref
+share/doc/graphviz/FAQ.html
+share/doc/graphviz/NEWS
+share/doc/graphviz/acyclic.1.pdf
+share/doc/graphviz/addingLayout.txt
+share/doc/graphviz/bcomps.1.pdf
+share/doc/graphviz/build.html
+share/doc/graphviz/ccomps.1.pdf
+share/doc/graphviz/cdt.3.pdf
+share/doc/graphviz/cgraph.3.pdf
+share/doc/graphviz/char.html
+share/doc/graphviz/circo.1.pdf
+share/doc/graphviz/cluster.1.pdf
+share/doc/graphviz/cpl1.0.txt
+${PLIST.gd}share/doc/graphviz/diffimg.1.pdf
+share/doc/graphviz/dijkstra.1.pdf
+share/doc/graphviz/dot.1.pdf
+share/doc/graphviz/dot2gxl.1.pdf
+share/doc/graphviz/dotguide.pdf
+share/doc/graphviz/edgepaint.1.pdf
+share/doc/graphviz/expr.3.pdf
+share/doc/graphviz/fdp.1.pdf
+share/doc/graphviz/fontfaq.txt
+share/doc/graphviz/gc.1.pdf
+${PLIST.tcl}${PLIST.gd}share/doc/graphviz/gdtclft.3tcl.pdf
+share/doc/graphviz/gdtclft.entities.example.png
+share/doc/graphviz/gml2gv.1.pdf
+share/doc/graphviz/graphml2gv.1.pdf
+${PLIST.lua}share/doc/graphviz/gv.3lua.pdf
+${PLIST.perl}share/doc/graphviz/gv.3perl.pdf
+${PLIST.swig}share/doc/graphviz/gv.3python.pdf
+${PLIST.tcl}share/doc/graphviz/gv.3tcl.pdf
+share/doc/graphviz/gv2gml.1.pdf
+share/doc/graphviz/gv2gxl.1.pdf
+share/doc/graphviz/gvc.3.pdf
+share/doc/graphviz/gvcolor.1.pdf
+share/doc/graphviz/gvgen.1.pdf
+share/doc/graphviz/gvmap.1.pdf
+share/doc/graphviz/gvmap.sh.1.pdf
+share/doc/graphviz/gvpack.1.pdf
+share/doc/graphviz/gvpr.1.pdf
+share/doc/graphviz/gvpr.3.pdf
+share/doc/graphviz/gxl2dot.1.pdf
+share/doc/graphviz/gxl2gv.1.pdf
+share/doc/graphviz/index.html
+share/doc/graphviz/info/arrows.html
+share/doc/graphviz/info/attrs.html
+share/doc/graphviz/info/colors.html
+share/doc/graphviz/info/command.html
+share/doc/graphviz/info/index.html
+share/doc/graphviz/info/lang.html
+share/doc/graphviz/info/output.html
+share/doc/graphviz/info/shapes.html
+share/doc/graphviz/internal_todo.html
+share/doc/graphviz/latex_suggestions.txt
+share/doc/graphviz/libguide.pdf
+share/doc/graphviz/mm2gv.1.pdf
+share/doc/graphviz/neato.1.pdf
+share/doc/graphviz/neatoguide.pdf
+share/doc/graphviz/nop.1.pdf
+share/doc/graphviz/osage.1.pdf
+share/doc/graphviz/pack.3.pdf
+share/doc/graphviz/patchwork.1.pdf
+share/doc/graphviz/pathplan.3.pdf
+share/doc/graphviz/prune.1.pdf
+share/doc/graphviz/pspdf.png
+share/doc/graphviz/sccmap.1.pdf
+share/doc/graphviz/schema/arguments.xml
+share/doc/graphviz/schema/attributes.xml
+share/doc/graphviz/schema/attributes.xslt
+share/doc/graphviz/sfdp.1.pdf
+${PLIST.tcl}share/doc/graphviz/tcldot.3tcl.pdf
+${PLIST.tcl}share/doc/graphviz/tcldot.html
+share/doc/graphviz/todo.html
+share/doc/graphviz/tred.1.pdf
+share/doc/graphviz/twopi.1.pdf
+share/doc/graphviz/unflatten.1.pdf
+${PLIST.x11}share/doc/graphviz/vimdot.1.pdf
+share/doc/graphviz/winbuild.html
+share/doc/graphviz/xdot.3.pdf
${PLIST.tcl}share/graphviz/demo/doted.tcl
${PLIST.tcl}share/graphviz/demo/doted.tcl.README
${PLIST.tcl}share/graphviz/demo/entities.html
@@ -204,98 +269,6 @@ ${PLIST.tcl}share/graphviz/demo/pathplan
${PLIST.tcl}share/graphviz/demo/pathplan_data/rotor.dat
${PLIST.tcl}share/graphviz/demo/pathplan_data/u.dat
${PLIST.tcl}share/graphviz/demo/pathplan_data/unknown.dat
-share/graphviz/doc/AUTHORS
-share/graphviz/doc/CHANGELOG.md
-share/graphviz/doc/COPYING
-share/graphviz/doc/Dot.ref
-share/graphviz/doc/NEWS
-share/graphviz/doc/addingLayout.txt
-share/graphviz/doc/cpl1.0.txt
-share/graphviz/doc/fontfaq.txt
-share/graphviz/doc/html/FAQ.html
-share/graphviz/doc/html/build.html
-share/graphviz/doc/html/char.html
-share/graphviz/doc/html/gdtclft.entities.example.png
-share/graphviz/doc/html/index.html
-share/graphviz/doc/html/info/arrows.html
-share/graphviz/doc/html/info/attrs.html
-share/graphviz/doc/html/info/colors.html
-share/graphviz/doc/html/info/command.html
-share/graphviz/doc/html/info/index.html
-share/graphviz/doc/html/info/lang.html
-share/graphviz/doc/html/info/output.html
-share/graphviz/doc/html/info/shapes.html
-share/graphviz/doc/html/internal_todo.html
-share/graphviz/doc/html/pspdf.png
-share/graphviz/doc/html/schema/arguments.xml
-share/graphviz/doc/html/schema/attributes.xml
-share/graphviz/doc/html/schema/attributes.xslt
-${PLIST.tcl}share/graphviz/doc/html/tcldot.html
-share/graphviz/doc/html/todo.html
-share/graphviz/doc/html/winbuild.html
-share/graphviz/doc/latex_suggestions.txt
-share/graphviz/doc/pdf/Agraph.pdf
-share/graphviz/doc/pdf/acyclic.1.pdf
-share/graphviz/doc/pdf/bcomps.1.pdf
-share/graphviz/doc/pdf/ccomps.1.pdf
-share/graphviz/doc/pdf/cdt.3.pdf
-share/graphviz/doc/pdf/cgraph.3.pdf
-share/graphviz/doc/pdf/circo.1.pdf
-share/graphviz/doc/pdf/cluster.1.pdf
-share/graphviz/doc/pdf/diffimg.1.pdf
-share/graphviz/doc/pdf/dijkstra.1.pdf
-share/graphviz/doc/pdf/dot.1.pdf
-share/graphviz/doc/pdf/dot2gxl.1.pdf
-share/graphviz/doc/pdf/dotguide.pdf
-share/graphviz/doc/pdf/dotty.1.pdf
-share/graphviz/doc/pdf/dottyguide.pdf
-share/graphviz/doc/pdf/edgepaint.1.pdf
-share/graphviz/doc/pdf/expr.3.pdf
-share/graphviz/doc/pdf/fdp.1.pdf
-share/graphviz/doc/pdf/gc.1.pdf
-${PLIST.tcl}${PLIST.gd}share/graphviz/doc/pdf/gdtclft.3tcl.pdf
-share/graphviz/doc/pdf/gml2gv.1.pdf
-share/graphviz/doc/pdf/graphml2gv.1.pdf
-${PLIST.guile}share/graphviz/doc/pdf/gv.3guile.pdf
-${PLIST.lua}share/graphviz/doc/pdf/gv.3lua.pdf
-${PLIST.ocaml}share/graphviz/doc/pdf/gv.3ocaml.pdf
-${PLIST.perl}share/graphviz/doc/pdf/gv.3perl.pdf
-${PLIST.swig}share/graphviz/doc/pdf/gv.3python.pdf
-${PLIST.tcl}share/graphviz/doc/pdf/gv.3tcl.pdf
-share/graphviz/doc/pdf/gv2gml.1.pdf
-share/graphviz/doc/pdf/gv2gxl.1.pdf
-share/graphviz/doc/pdf/gvc.3.pdf
-share/graphviz/doc/pdf/gvcolor.1.pdf
-share/graphviz/doc/pdf/gvgen.1.pdf
-share/graphviz/doc/pdf/gvmap.1.pdf
-share/graphviz/doc/pdf/gvmap.sh.1.pdf
-share/graphviz/doc/pdf/gvpack.1.pdf
-share/graphviz/doc/pdf/gvpr.1.pdf
-share/graphviz/doc/pdf/gvpr.3.pdf
-share/graphviz/doc/pdf/gxl2dot.1.pdf
-share/graphviz/doc/pdf/gxl2gv.1.pdf
-${PLIST.x11}share/graphviz/doc/pdf/lefty.1.pdf
-${PLIST.x11}share/graphviz/doc/pdf/leftyguide.pdf
-share/graphviz/doc/pdf/libguide.pdf
-share/graphviz/doc/pdf/lneato.1.pdf
-share/graphviz/doc/pdf/mingle.1.pdf
-share/graphviz/doc/pdf/mm2gv.1.pdf
-share/graphviz/doc/pdf/neato.1.pdf
-share/graphviz/doc/pdf/neatoguide.pdf
-share/graphviz/doc/pdf/nop.1.pdf
-share/graphviz/doc/pdf/osage.1.pdf
-share/graphviz/doc/pdf/pack.3.pdf
-share/graphviz/doc/pdf/patchwork.1.pdf
-share/graphviz/doc/pdf/pathplan.3.pdf
-share/graphviz/doc/pdf/prune.1.pdf
-share/graphviz/doc/pdf/sccmap.1.pdf
-share/graphviz/doc/pdf/sfdp.1.pdf
-${PLIST.tcl}share/graphviz/doc/pdf/tcldot.3tcl.pdf
-share/graphviz/doc/pdf/tred.1.pdf
-share/graphviz/doc/pdf/twopi.1.pdf
-share/graphviz/doc/pdf/unflatten.1.pdf
-share/graphviz/doc/pdf/vimdot.1.pdf
-share/graphviz/doc/pdf/xdot.3.pdf
share/graphviz/graphs/directed/KW91.gv
share/graphviz/graphs/directed/Latin1.gv
share/graphviz/graphs/directed/NaN.gv
@@ -393,15 +366,3 @@ share/graphviz/gvpr/scalexy
share/graphviz/gvpr/span
share/graphviz/gvpr/topon
share/graphviz/gvpr/treetoclust
-${PLIST.x11}share/graphviz/lefty/box.lefty
-${PLIST.x11}share/graphviz/lefty/def.lefty
-${PLIST.x11}share/graphviz/lefty/dotty.lefty
-${PLIST.x11}share/graphviz/lefty/dotty_draw.lefty
-${PLIST.x11}share/graphviz/lefty/dotty_edit.lefty
-${PLIST.x11}share/graphviz/lefty/dotty_layout.lefty
-${PLIST.x11}share/graphviz/lefty/dotty_ui.lefty
-${PLIST.x11}share/graphviz/lefty/fractal.lefty
-${PLIST.x11}share/graphviz/lefty/fractal2.lefty
-${PLIST.x11}share/graphviz/lefty/lefty.psp
-${PLIST.x11}share/graphviz/lefty/slides.lefty
-${PLIST.x11}share/graphviz/lefty/tree.lefty
Index: pkgsrc/graphics/graphviz/buildlink3.mk
diff -u pkgsrc/graphics/graphviz/buildlink3.mk:1.28 pkgsrc/graphics/graphviz/buildlink3.mk:1.29
--- pkgsrc/graphics/graphviz/buildlink3.mk:1.28 Tue Jun 28 11:34:01 2022
+++ pkgsrc/graphics/graphviz/buildlink3.mk Fri Jul 22 12:04:46 2022
@@ -1,17 +1,14 @@
-# $NetBSD: buildlink3.mk,v 1.28 2022/06/28 11:34:01 wiz Exp $
+# $NetBSD: buildlink3.mk,v 1.29 2022/07/22 12:04:46 micha Exp $
BUILDLINK_TREE+= graphviz
.if !defined(GRAPHVIZ_BUILDLINK3_MK)
GRAPHVIZ_BUILDLINK3_MK:=
-BUILDLINK_API_DEPENDS.graphviz+= graphviz>=2.26.3
-BUILDLINK_ABI_DEPENDS.graphviz+= graphviz>=2.50.0nb6
+BUILDLINK_API_DEPENDS.graphviz+= graphviz>=5.0.0
BUILDLINK_PKGSRCDIR.graphviz?= ../../graphics/graphviz
-# doxygen PLIST varies with pangocairo of PKG_OPTIONS
-pkgbase := graphviz
-.include "../../mk/pkg-build-options.mk"
+DEPENDS+= urw-fonts-[0-9]*:../../fonts/urw-fonts
.include "../../converters/libiconv/buildlink3.mk"
.include "../../fonts/fontconfig/buildlink3.mk"
Index: pkgsrc/graphics/graphviz/distinfo
diff -u pkgsrc/graphics/graphviz/distinfo:1.71 pkgsrc/graphics/graphviz/distinfo:1.72
--- pkgsrc/graphics/graphviz/distinfo:1.71 Tue Feb 15 16:16:53 2022
+++ pkgsrc/graphics/graphviz/distinfo Fri Jul 22 12:04:46 2022
@@ -1,13 +1,11 @@
-$NetBSD: distinfo,v 1.71 2022/02/15 16:16:53 sborrill Exp $
+$NetBSD: distinfo,v 1.72 2022/07/22 12:04:46 micha Exp $
-BLAKE2s (graphviz-2.50.0.tar.gz) = 68f87db4ac9cc88af469f084c17bb5d95807f5bd535575672e9fbb8febc007b4
-SHA512 (graphviz-2.50.0.tar.gz) = cc19bb830773c6fcf2d166503e8a199cc521d7068d5dd8aa8e86e0137415936e70a1e0b1788b2f6b8afedab9ed8a9cc330f89d156c4be791d4d75ea9465aa2b7
-Size (graphviz-2.50.0.tar.gz) = 29761610 bytes
-SHA1 (patch-cmd_lefty_os_unix_io.c) = 48f91c79b97928b54ae24af59a9fea173f34dfe5
-SHA1 (patch-config_config__perl.pl) = 85d535282a819c1055386244f7b520387d0ddbb1
-SHA1 (patch-configure.ac) = 250105b7d21e16e0ad6ff77b291a969f4be86711
-SHA1 (patch-lib_gvc_Makefile.am) = 8a3f79363cc0a98ea51d4241e67b0fc65b3eca0e
-SHA1 (patch-plugin_gs_gvloadimage__gs.c) = 56cbf9bb7b5bf96188ad21a00924e92df74b480d
+BLAKE2s (graphviz-5.0.0.tar.gz) = 6755b14a2b5fed1365c5dbfe1d72406e8bb6707f29c7955c4372afcc32aa09f1
+SHA512 (graphviz-5.0.0.tar.gz) = ea21c39b8735215073972af94affae20f76ee04e7f6c8833c9018d6b1fdcb763cec48cde8972f7443f08b2febd1a04ecb7d07ec48ea74ae785f0af98cc5e136a
+Size (graphviz-5.0.0.tar.gz) = 27590532 bytes
+SHA1 (patch-config_config__perl.pl) = 430acb7d7ee3e149de0af9832c5a29602884f83e
+SHA1 (patch-configure.ac) = 1c39f0b25cfc995de10a07492656c2f12a24686f
+SHA1 (patch-lib_gvc_Makefile.am) = b5d793ec0a676c5d4b257c6fec1eb182ee93718b
+SHA1 (patch-plugin_gs_gvloadimage__gs.c) = d777c822ef11b15eff992f36a9f4073c02cd4ca6
SHA1 (patch-plugin_xlib_gvdevice__xlib.c) = 05d1549db3b9221f5bcb947173034775b0df7c6c
-SHA1 (patch-tclpkg_gv_Makefile.am) = 6cee06e06daca71a11299c9c4405002028d7e4a0
-SHA1 (patch-version.m4) = 859ce621758fd042be834ed828137bea780fa284
+SHA1 (patch-tclpkg_gv_Makefile.am) = 47e15ae0342d39db7ef88e414491495c18e2c45c
Index: pkgsrc/graphics/graphviz/options.mk
diff -u pkgsrc/graphics/graphviz/options.mk:1.33 pkgsrc/graphics/graphviz/options.mk:1.34
--- pkgsrc/graphics/graphviz/options.mk:1.33 Fri May 13 21:33:16 2022
+++ pkgsrc/graphics/graphviz/options.mk Fri Jul 22 12:04:46 2022
@@ -1,13 +1,13 @@
-# $NetBSD: options.mk,v 1.33 2022/05/13 21:33:16 tnn Exp $
+# $NetBSD: options.mk,v 1.34 2022/07/22 12:04:46 micha Exp $
PKG_OPTIONS_VAR= PKG_OPTIONS.graphviz
-PKG_SUPPORTED_OPTIONS= gd ghostscript gtk lua ocaml perl poppler svg tcl x11 # guile does not build with guile20
+PKG_SUPPORTED_OPTIONS= gd ghostscript gtk lua perl poppler svg tcl x11
.if exists(/System/Library/Frameworks/Quartz.framework)
PKG_SUPPORTED_OPTIONS+= quartz
.endif
-PKG_SUGGESTED_OPTIONS= gd lua perl tcl x11
+PKG_SUGGESTED_OPTIONS= gd x11
# Explanation of consequence of options, to help those trying to slim down:
-# guile ocaml lua tcl perl: extension language support
+# lua tcl perl: extension language support
# x11: Omits all linking with x11, which means x11 graphics supports as
# well as x11 frontend support.
# gtk: basic graphic format support (in addition to gd, which isn't
@@ -19,7 +19,7 @@ PKG_SUGGESTED_OPTIONS= gd lua perl tcl x
.include "../../mk/bsd.options.mk"
-PLIST_VARS+= gd ghostscript gtk guile lua ocaml perl poppler quartz svg swig tcl x11
+PLIST_VARS+= gd ghostscript gtk lua perl poppler quartz svg swig tcl x11
.if !empty(PKG_OPTIONS:Mgd)
. include "../../graphics/gd/buildlink3.mk"
@@ -31,6 +31,8 @@ CONFIGURE_ARGS+= --without-libgd
.if !empty(PKG_OPTIONS:Mghostscript)
. include "../../print/ghostscript/buildlink3.mk"
+# Also required as tool dependency according to documentation
+TOOL_DEPENDS+= ghostscript-[0-9]*:../../print/ghostscript
PLIST.ghostscript= yes
CONFIGURE_ARGS+= --with-ghostscript
.else
@@ -79,10 +81,8 @@ CONFIGURE_ARGS+= --without-rsvg
. include "../../x11/libXrender/buildlink3.mk"
PLIST.x11= yes
CONFIGURE_ENV+= X11BASE=${X11BASE}
-CONFIGURE_ARGS+= --enable-lefty
CONFIGURE_ARGS+= --with-x
.else
-CONFIGURE_ARGS+= --disable-lefty
CONFIGURE_ARGS+= --without-x
.endif
@@ -92,22 +92,17 @@ USING_SWIG= no
USING_SWIG= yes
. include "../../lang/lua/tool.mk"
. include "../../lang/lua/buildlink3.mk"
+. include "../../lang/lua/application.mk"
PLIST.lua= yes
CONFIGURE_ARGS+= --enable-lua
.else
CONFIGURE_ARGS+= --disable-lua
.endif
-.if !empty(PKG_OPTIONS:Mocaml)
-USING_SWIG= yes
-. include "../../lang/ocaml/buildlink3.mk"
-PLIST.ocaml= yes
-CONFIGURE_ARGS+= --enable-ocaml
-.else
-CONFIGURE_ARGS+= --disable-ocaml
-.endif
-
.if !empty(PKG_OPTIONS:Mtcl)
+. if empty(PKG_OPTIONS:Mx11)
+PKG_FAIL_REASON= "tcl option requires x11 option"
+. endif
USING_SWIG= yes
. include "../../lang/tcl/Makefile.version"
. include "../../x11/tk/buildlink3.mk"
@@ -121,15 +116,6 @@ CONFIGURE_ARGS+= --enable-tcl
CONFIGURE_ARGS+= --disable-tcl
.endif
-.if !empty(PKG_OPTIONS:Mguile)
-USING_SWIG= yes
-. include "../../lang/guile20/buildlink3.mk"
-PLIST.guile= yes
-CONFIGURE_ARGS+= --enable-guile
-.else
-CONFIGURE_ARGS+= --disable-guile
-.endif
-
.if !empty(PKG_OPTIONS:Mperl)
USING_SWIG= yes
. include "../../lang/perl5/buildlink3.mk"
@@ -142,7 +128,8 @@ CONFIGURE_ARGS+= --disable-perl
.if !empty(USING_SWIG:Myes)
PLIST.swig= yes
-. include "../../devel/swig/buildlink3.mk"
+# Tool dependency according to documentation
+TOOL_DEPENDS+= swig>=1.3.29:../../devel/swig
CONFIGURE_ARGS+= --enable-swig
.else
CONFIGURE_ARGS+= --disable-swig
Index: pkgsrc/graphics/graphviz/patches/patch-config_config__perl.pl
diff -u pkgsrc/graphics/graphviz/patches/patch-config_config__perl.pl:1.3 pkgsrc/graphics/graphviz/patches/patch-config_config__perl.pl:1.4
--- pkgsrc/graphics/graphviz/patches/patch-config_config__perl.pl:1.3 Mon Sep 9 20:35:07 2013
+++ pkgsrc/graphics/graphviz/patches/patch-config_config__perl.pl Fri Jul 22 12:04:46 2022
@@ -1,6 +1,6 @@
-$NetBSD: patch-config_config__perl.pl,v 1.3 2013/09/09 20:35:07 wiz Exp $
+$NetBSD: patch-config_config__perl.pl,v 1.4 2022/07/22 12:04:46 micha Exp $
-add rpath for pkgsrc
+Add rpath for pkgsrc
--- config/config_perl.pl.orig 2013-08-01 17:35:15.000000000 +0000
+++ config/config_perl.pl
Index: pkgsrc/graphics/graphviz/patches/patch-configure.ac
diff -u pkgsrc/graphics/graphviz/patches/patch-configure.ac:1.6 pkgsrc/graphics/graphviz/patches/patch-configure.ac:1.7
--- pkgsrc/graphics/graphviz/patches/patch-configure.ac:1.6 Thu Oct 21 19:44:31 2021
+++ pkgsrc/graphics/graphviz/patches/patch-configure.ac Fri Jul 22 12:04:46 2022
@@ -1,18 +1,20 @@
-$NetBSD: patch-configure.ac,v 1.6 2021/10/21 19:44:31 schmonz Exp $
+$NetBSD: patch-configure.ac,v 1.7 2022/07/22 12:04:46 micha Exp $
1. chunk: fix
./configure.lineno: 1: Syntax error: Bad substitution
http://www.graphviz.org/mantisbt/view.php?id=2362
+https://gitlab.com/graphviz/graphviz/-/issues/370
2. chunk: use the same path for all platforms in pkgsrc
other chunks: use lua/php/... from pkgsrc
last chunk: fix
./configure.lineno: 27203: Syntax error: ")" unexpected (expecting "fi")
http://www.graphviz.org/mantisbt/view.php?id=2362
+https://gitlab.com/graphviz/graphviz/-/issues/370
last last chunk: fix sed expression not to use + which is not in BRE (guile)
---- configure.ac.orig 2021-10-16 16:39:12.000000000 +0000
+--- configure.ac.orig 2022-07-07 15:43:58.000000000 +0000
+++ configure.ac
-@@ -106,8 +106,15 @@ case "${host_os}" in
+@@ -101,8 +101,15 @@ case "${host_os}" in
# For the build number: months since Jan 2000, day of month from the timestamp
# For the revision number: hour, minute from the timestamp
if test $GRAPHVIZ_VERSION_MICRO != "0"; then
@@ -30,7 +32,7 @@ last last chunk: fix sed expression not
fi
;;
esac
-@@ -123,8 +130,7 @@ if test -z "$LIBPOSTFIX"; then
+@@ -118,8 +125,7 @@ if test -z "$LIBPOSTFIX"; then
case "${host_os}" in
*linux* )
case "${host_cpu}" in
@@ -40,7 +42,7 @@ last last chunk: fix sed expression not
INTGOSIZE=64
;;
esac
-@@ -132,7 +138,6 @@ if test -z "$LIBPOSTFIX"; then
+@@ -127,7 +133,6 @@ if test -z "$LIBPOSTFIX"; then
*solaris* )
case "${host_cpu}" in
x86_64 | sparc64 )
@@ -48,7 +50,7 @@ last last chunk: fix sed expression not
INTGOSIZE=64
;;
esac
-@@ -684,7 +689,7 @@ else
+@@ -694,7 +699,7 @@ else
if test "x$GUILE_CONFIG" = "x"; then
use_guile="No (guile not available)"
else
@@ -57,7 +59,7 @@ last last chunk: fix sed expression not
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)
-@@ -908,7 +913,7 @@ else
+@@ -918,7 +923,7 @@ else
LUA_VERSION=`$PKG_CONFIG --modversion lua$l`
LUA_INCLUDES="$LUA_CFLAGS "`$PKG_CONFIG --cflags lua$l`
LUA_LIBS="$LUA_LFLAGS "`$PKG_CONFIG --libs lua$l`
@@ -66,7 +68,7 @@ last last chunk: fix sed expression not
pkgconfig_lualib_found=`$PKG_CONFIG --exists lualib$l 2>/dev/null`
if test "x$?" = "x0"; then
-@@ -930,7 +935,7 @@ else
+@@ -940,7 +945,7 @@ else
LUA_INCLUDES=`$LUACONFIG --include`
LUA_LIBS=`$LUACONFIG --libs`
LUA_VERSION="5.0.x"
@@ -75,18 +77,7 @@ last last chunk: fix sed expression not
fi
fi
-@@ -1020,8 +1025,8 @@ else
- use_ocaml="No (ocaml not available)"
- else
- AC_CHECK_PROG(OCAML_OPT,ocamlopt,ocamlopt)
-- OCAML_INCLUDES=-I/usr/lib$LIBPOSTFIX/ocaml
-- OCAML_LIBS=-L/usr/lib$LIBPOSTFIX/ocaml
-+ OCAML_INCLUDES=-I${PREFIX}/lib$LIBPOSTFIX/ocaml
-+ OCAML_LIBS=-L${PREFIX}/lib$LIBPOSTFIX/ocaml
- save_CPPFLAGS=$CPPFLAGS
- CPPFLAGS="$CPPFLAGS $OCAML_INCLUDES"
- AC_CHECK_HEADER(caml/mlvalues.h,[
-@@ -1124,7 +1129,7 @@ else
+@@ -1137,7 +1142,7 @@ else
else
PHP_INCLUDES="`$PHPCONFIG --includes`"
PHP_INSTALL_DIR="`$PHPCONFIG --extension-dir`"
@@ -95,7 +86,7 @@ last last chunk: fix sed expression not
PHP_LIBS="`$PHPCONFIG --ldflags` `$PHPCONFIG --libs`"
save_CPPFLAGS=$CPPFLAGS
CPPFLAGS="$CPPFLAGS $PHP_INCLUDES"
-@@ -2191,45 +2196,6 @@ else
+@@ -2130,45 +2135,6 @@ else
fi
AM_CONDITIONAL(WITH_QUARTZ, [test "x$use_quartz" = "xYes"])
Index: pkgsrc/graphics/graphviz/patches/patch-lib_gvc_Makefile.am
diff -u pkgsrc/graphics/graphviz/patches/patch-lib_gvc_Makefile.am:1.1 pkgsrc/graphics/graphviz/patches/patch-lib_gvc_Makefile.am:1.2
--- pkgsrc/graphics/graphviz/patches/patch-lib_gvc_Makefile.am:1.1 Thu Oct 21 19:44:31 2021
+++ pkgsrc/graphics/graphviz/patches/patch-lib_gvc_Makefile.am Fri Jul 22 12:04:46 2022
@@ -1,10 +1,10 @@
-$NetBSD: patch-lib_gvc_Makefile.am,v 1.1 2021/10/21 19:44:31 schmonz Exp $
+$NetBSD: patch-lib_gvc_Makefile.am,v 1.2 2022/07/22 12:04:46 micha Exp $
Link with pthread library, if needed.
---- lib/gvc/Makefile.am.orig 2021-10-16 16:39:12.000000000 +0000
+--- lib/gvc/Makefile.am.orig 2022-07-07 15:43:58.000000000 +0000
+++ lib/gvc/Makefile.am
-@@ -71,7 +71,7 @@ libgvc_la_LIBADD = $(libgvc_C_la_LIBADD)
+@@ -55,7 +55,7 @@ libgvc_la_LIBADD = $(libgvc_C_la_LIBADD)
$(top_builddir)/lib/cdt/libcdt.la \
$(top_builddir)/lib/cgraph/libcgraph.la \
$(top_builddir)/lib/pathplan/libpathplan.la \
@@ -12,4 +12,4 @@ Link with pthread library, if needed.
+ $(EXPAT_LIBS) $(Z_LIBS) $(MATH_LIBS) ${PTHREAD_LDFLAGS} ${PTHREAD_LIBS}
libgvc_la_DEPENDENCIES = $(libgvc_C_la_DEPENDENCIES)
- if WITH_WIN32
+ .3.3.pdf:
Index: pkgsrc/graphics/graphviz/patches/patch-tclpkg_gv_Makefile.am
diff -u pkgsrc/graphics/graphviz/patches/patch-tclpkg_gv_Makefile.am:1.1 pkgsrc/graphics/graphviz/patches/patch-tclpkg_gv_Makefile.am:1.2
--- pkgsrc/graphics/graphviz/patches/patch-tclpkg_gv_Makefile.am:1.1 Thu Oct 21 19:44:31 2021
+++ pkgsrc/graphics/graphviz/patches/patch-tclpkg_gv_Makefile.am Fri Jul 22 12:04:46 2022
@@ -1,12 +1,15 @@
-$NetBSD: patch-tclpkg_gv_Makefile.am,v 1.1 2021/10/21 19:44:31 schmonz Exp $
+$NetBSD: patch-tclpkg_gv_Makefile.am,v 1.2 2022/07/22 12:04:46 micha Exp $
Add missing -I flags to point to perl files.
See https://gitlab.com/graphviz/graphviz/issues/1576.
+Issue was closed, but patch is still missing. Regression?
+
+https://gitlab.com/graphviz/graphviz/-/merge_requests/2758
--- tclpkg/gv/Makefile.am.orig 2021-10-16 16:39:12.000000000 +0000
+++ tclpkg/gv/Makefile.am
-@@ -184,7 +184,7 @@ nodist_libgv_perl_la_SOURCES = gv_perl.c
+@@ -180,7 +180,7 @@ nodist_libgv_perl_la_SOURCES = gv_perl.c
libgv_perl_la_SOURCES = $(BASESOURCES) gv_dummy_init.c
libgv_perl_la_LIBADD = $(BASELIBS) $(PERL_LIBS)
libgv_perl_la_LDFLAGS = -module -avoid-version $(PERL_LD)
Index: pkgsrc/graphics/graphviz/patches/patch-plugin_gs_gvloadimage__gs.c
diff -u pkgsrc/graphics/graphviz/patches/patch-plugin_gs_gvloadimage__gs.c:1.2 pkgsrc/graphics/graphviz/patches/patch-plugin_gs_gvloadimage__gs.c:1.3
--- pkgsrc/graphics/graphviz/patches/patch-plugin_gs_gvloadimage__gs.c:1.2 Thu Oct 21 19:44:31 2021
+++ pkgsrc/graphics/graphviz/patches/patch-plugin_gs_gvloadimage__gs.c Fri Jul 22 12:04:46 2022
@@ -1,4 +1,4 @@
-$NetBSD: patch-plugin_gs_gvloadimage__gs.c,v 1.2 2021/10/21 19:44:31 schmonz Exp $
+$NetBSD: patch-plugin_gs_gvloadimage__gs.c,v 1.3 2022/07/22 12:04:46 micha Exp $
ghostscript-agpl enforces using gserrors.h which is not included
by default in ghostscript-gpl, so conditionalise based upon which
@@ -6,7 +6,7 @@ one is being used.
--- plugin/gs/gvloadimage_gs.c.orig 2021-10-16 16:39:12.000000000 +0000
+++ plugin/gs/gvloadimage_gs.c
-@@ -74,6 +74,16 @@ static void gs_error(GVJ_t * job, const
+@@ -77,6 +77,16 @@ static void gs_error(GVJ_t * job, const
assert (err < 0);
@@ -23,7 +23,7 @@ one is being used.
if (err >= e_VMerror)
errsrc = "PostScript Level 1";
else if (err >= e_unregistered)
-@@ -82,6 +92,7 @@ static void gs_error(GVJ_t * job, const
+@@ -85,6 +95,7 @@ static void gs_error(GVJ_t * job, const
errsrc = "DPS error";
else
errsrc = "Ghostscript internal error";
Index: pkgsrc/graphics/graphviz/patches/patch-plugin_xlib_gvdevice__xlib.c
diff -u pkgsrc/graphics/graphviz/patches/patch-plugin_xlib_gvdevice__xlib.c:1.2 pkgsrc/graphics/graphviz/patches/patch-plugin_xlib_gvdevice__xlib.c:1.3
--- pkgsrc/graphics/graphviz/patches/patch-plugin_xlib_gvdevice__xlib.c:1.2 Mon Jul 27 20:44:15 2020
+++ pkgsrc/graphics/graphviz/patches/patch-plugin_xlib_gvdevice__xlib.c Fri Jul 22 12:04:46 2022
@@ -1,4 +1,4 @@
-$NetBSD: patch-plugin_xlib_gvdevice__xlib.c,v 1.2 2020/07/27 20:44:15 adam Exp $
+$NetBSD: patch-plugin_xlib_gvdevice__xlib.c,v 1.3 2022/07/22 12:04:46 micha Exp $
SunOS inotify requires sys/filio.h for FIONREAD.
Home |
Main Index |
Thread Index |
Old Index