Fri Jul 22 12:04:46 2022 UTC ()
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


(micha)
diff -r1.2 -r1.3 pkgsrc/graphics/graphviz/DESCR
diff -r1.250 -r1.251 pkgsrc/graphics/graphviz/Makefile
diff -r1.55 -r1.56 pkgsrc/graphics/graphviz/PLIST
diff -r1.28 -r1.29 pkgsrc/graphics/graphviz/buildlink3.mk
diff -r1.71 -r1.72 pkgsrc/graphics/graphviz/distinfo
diff -r1.33 -r1.34 pkgsrc/graphics/graphviz/options.mk
diff -r1.1 -r0 pkgsrc/graphics/graphviz/patches/patch-cmd_lefty_os_unix_io.c
diff -r1.1 -r0 pkgsrc/graphics/graphviz/patches/patch-version.m4
diff -r1.3 -r1.4 pkgsrc/graphics/graphviz/patches/patch-config_config__perl.pl
diff -r1.6 -r1.7 pkgsrc/graphics/graphviz/patches/patch-configure.ac
diff -r1.1 -r1.2 pkgsrc/graphics/graphviz/patches/patch-lib_gvc_Makefile.am
diff -r1.1 -r1.2 pkgsrc/graphics/graphviz/patches/patch-tclpkg_gv_Makefile.am
diff -r1.2 -r1.3 pkgsrc/graphics/graphviz/patches/patch-plugin_gs_gvloadimage__gs.c
diff -r1.2 -r1.3 pkgsrc/graphics/graphviz/patches/patch-plugin_xlib_gvdevice__xlib.c

cvs diff -r1.2 -r1.3 pkgsrc/graphics/graphviz/DESCR (expand / switch to unified diff)

--- pkgsrc/graphics/graphviz/DESCR 2003/05/06 17:41:27 1.2
+++ pkgsrc/graphics/graphviz/DESCR 2022/07/22 12:04:46 1.3
@@ -1,11 +1,10 @@ @@ -1,11 +1,10 @@
1Graphviz is a set of graph drawing tools from AT&T Research and Lucent Bell 1Graphviz is a set of graph drawing tools from AT&T Research and Lucent Bell
2Laboratories. 2Laboratories.
3 3
4It includes: 4It includes:
5- dot: makes hierarchical layouts of directed graphs 5- dot: makes hierarchical layouts of directed graphs
6- neato: makes "spring" model layouts of undirected graphs 6- neato: makes "spring" model layouts of undirected graphs
7- lefty: a programmable graphics editor 
8- dotty: a customizable interface written in LEFTY 
9- tcldot: a customizable graphical interface written in TCL 7- tcldot: a customizable graphical interface written in TCL
10- libgraph: the base library for graph tools 8 (part of "tcl" option)
 9- libcgraph: the base library for graph tools
11- various associated utilities 10- various associated utilities

cvs diff -r1.250 -r1.251 pkgsrc/graphics/graphviz/Makefile (expand / switch to unified diff)

--- pkgsrc/graphics/graphviz/Makefile 2022/07/11 17:25:00 1.250
+++ pkgsrc/graphics/graphviz/Makefile 2022/07/22 12:04:46 1.251
@@ -1,48 +1,43 @@ @@ -1,48 +1,43 @@
1# $NetBSD: Makefile,v 1.250 2022/07/11 17:25:00 micha Exp $ 1# $NetBSD: Makefile,v 1.251 2022/07/22 12:04:46 micha Exp $
2 2
3DISTNAME= graphviz-2.50.0 3DISTNAME= graphviz-5.0.0
4PKGREVISION= 6 
5CATEGORIES= graphics 4CATEGORIES= graphics
6MASTER_SITES= https://gitlab.com/api/v4/projects/4207231/packages/generic/graphviz-releases/${PKGVERSION_NOREV}/ 5MASTER_SITES= ${MASTER_SITE_GITLAB:=api/v4/projects/4207231/packages/generic/graphviz-releases/${PKGVERSION_NOREV}/}
7EXTRACT_SUFX= .tar.gz 
8 6
9MAINTAINER= micha@NetBSD.org 7MAINTAINER= micha@NetBSD.org
10HOMEPAGE= https://www.graphviz.org/ 8HOMEPAGE= https://www.graphviz.org/
11COMMENT= Graph Drawing Programs from AT&T Research and Lucent Bell Labs 9COMMENT= Graph Drawing Programs from AT&T Research and Lucent Bell Labs
12LICENSE= epl-v1.0 10LICENSE= epl-v1.0
13 11
14TOOL_DEPENDS+= ghostscript-[0-9]*:../../print/ghostscript 
15 
16CHECK_FILES_SKIP+= ${PREFIX}/lib/graphviz/config6 12CHECK_FILES_SKIP+= ${PREFIX}/lib/graphviz/config6
17CHECK_PORTABILITY_SKIP+= windows/* 13CHECK_PORTABILITY_SKIP+= windows/*
18 14
19USE_LANGUAGES= c99 c++11 15USE_LANGUAGES= c99 c++11
 16USE_TOOLS+= automake autoreconf makeinfo bison flex gmake groff pkg-config
20USE_LIBTOOL= yes 17USE_LIBTOOL= yes
21USE_TOOLS+= automake autoreconf makeinfo bison flex groff pkg-config 
22# GNU make is needed since BSD Make does not know $< in explicit rules, 
23# such as used by lib/cdt/Makefile.am. 
24USE_TOOLS+= gmake 
25GNU_CONFIGURE= yes 18GNU_CONFIGURE= yes
26GNU_CONFIGURE_STRICT= no # has sub-configures 19GNU_CONFIGURE_STRICT= no # has sub-configures
27CONFIGURE_ARGS+= --disable-d 20CONFIGURE_ARGS+= --disable-d
28CONFIGURE_ARGS+= --disable-debug 21CONFIGURE_ARGS+= --disable-debug
29CONFIGURE_ARGS+= --disable-go 22CONFIGURE_ARGS+= --disable-go
30CONFIGURE_ARGS+= --disable-io 23CONFIGURE_ARGS+= --disable-io
31CONFIGURE_ARGS+= --disable-java 24CONFIGURE_ARGS+= --disable-java
32CONFIGURE_ARGS+= --disable-javascript 25CONFIGURE_ARGS+= --disable-javascript
33CONFIGURE_ARGS+= --disable-php 26CONFIGURE_ARGS+= --disable-php
34CONFIGURE_ARGS+= --disable-python 27CONFIGURE_ARGS+= --disable-python
35CONFIGURE_ARGS+= --disable-python3 28CONFIGURE_ARGS+= --disable-python3
 29CONFIGURE_ARGS+= --disable-guile
 30CONFIGURE_ARGS+= --disable-ocaml
36CONFIGURE_ARGS+= --disable-r 31CONFIGURE_ARGS+= --disable-r
37CONFIGURE_ARGS+= --disable-ruby 32CONFIGURE_ARGS+= --disable-ruby
38CONFIGURE_ARGS+= --disable-sharp 33CONFIGURE_ARGS+= --disable-sharp
39CONFIGURE_ARGS+= --enable-ltdl 34CONFIGURE_ARGS+= --enable-ltdl
40CONFIGURE_ARGS+= --enable-man-pdfs 35CONFIGURE_ARGS+= --enable-man-pdfs
41CONFIGURE_ARGS+= --enable-rpath 36CONFIGURE_ARGS+= --enable-rpath
42CONFIGURE_ARGS+= --without-ann 37CONFIGURE_ARGS+= --without-ann
43CONFIGURE_ARGS+= --without-devil 38CONFIGURE_ARGS+= --without-devil
44CONFIGURE_ARGS+= --without-glut 39CONFIGURE_ARGS+= --without-glut
45CONFIGURE_ARGS+= --without-lasi 40CONFIGURE_ARGS+= --without-lasi
46CONFIGURE_ARGS+= --without-gdiplus 41CONFIGURE_ARGS+= --without-gdiplus
47CONFIGURE_ARGS+= --without-glade 42CONFIGURE_ARGS+= --without-glade
48CONFIGURE_ARGS+= --without-glitz 43CONFIGURE_ARGS+= --without-glitz
@@ -55,28 +50,28 @@ CONFIGURE_ARGS+= --with-digcola @@ -55,28 +50,28 @@ CONFIGURE_ARGS+= --with-digcola
55CONFIGURE_ARGS+= --with-expat 50CONFIGURE_ARGS+= --with-expat
56CONFIGURE_ARGS+= --with-fontconfig 51CONFIGURE_ARGS+= --with-fontconfig
57CONFIGURE_ARGS+= --with-freetype2 52CONFIGURE_ARGS+= --with-freetype2
58CONFIGURE_ARGS+= --with-gts 53CONFIGURE_ARGS+= --with-gts
59CONFIGURE_ARGS+= --with-ipsepcola 54CONFIGURE_ARGS+= --with-ipsepcola
60CONFIGURE_ARGS+= --with-ortho 55CONFIGURE_ARGS+= --with-ortho
61CONFIGURE_ARGS+= --with-pangocairo 56CONFIGURE_ARGS+= --with-pangocairo
62CONFIGURE_ARGS+= --with-sfdp 57CONFIGURE_ARGS+= --with-sfdp
63CONFIGURE_ARGS+= --with-visio 58CONFIGURE_ARGS+= --with-visio
64CONFIGURE_ARGS+= --with-webp 59CONFIGURE_ARGS+= --with-webp
65# build fails when PHP and/or Ruby are also installed 60# build fails when PHP and/or Ruby are also installed
66CONFIGURE_ENV+= ac_cv_prog_PHP= 61CONFIGURE_ENV+= ac_cv_prog_PHP=
67CONFIGURE_ENV+= ac_cv_prog_RUBY= 62CONFIGURE_ENV+= ac_cv_prog_RUBY=
68CPPFLAGS+= -DNO_POSTSCRIPT_ALIAS=1 
69 63
 64CPPFLAGS+= -DNO_POSTSCRIPT_ALIAS=1
70LDFLAGS.SunOS+= -lsocket -lnsl 65LDFLAGS.SunOS+= -lsocket -lnsl
71 66
72PKGCONFIG_OVERRIDE+= lib/cdt/libcdt.pc.in 67PKGCONFIG_OVERRIDE+= lib/cdt/libcdt.pc.in
73PKGCONFIG_OVERRIDE+= lib/cgraph/libcgraph.pc.in 68PKGCONFIG_OVERRIDE+= lib/cgraph/libcgraph.pc.in
74PKGCONFIG_OVERRIDE+= lib/edgepaint/liblab_gamut.pc.in 69PKGCONFIG_OVERRIDE+= lib/edgepaint/liblab_gamut.pc.in
75PKGCONFIG_OVERRIDE+= lib/expr/libexpr.pc.in 70PKGCONFIG_OVERRIDE+= lib/expr/libexpr.pc.in
76PKGCONFIG_OVERRIDE+= lib/gvc/libgvc.pc.in 71PKGCONFIG_OVERRIDE+= lib/gvc/libgvc.pc.in
77PKGCONFIG_OVERRIDE+= lib/gvpr/libgvpr.pc.in 72PKGCONFIG_OVERRIDE+= lib/gvpr/libgvpr.pc.in
78PKGCONFIG_OVERRIDE+= lib/pack/libpack.pc.in 73PKGCONFIG_OVERRIDE+= lib/pack/libpack.pc.in
79PKGCONFIG_OVERRIDE+= lib/pathplan/libpathplan.pc.in 74PKGCONFIG_OVERRIDE+= lib/pathplan/libpathplan.pc.in
80PKGCONFIG_OVERRIDE+= lib/sfdpgen/libsfdp.pc.in 75PKGCONFIG_OVERRIDE+= lib/sfdpgen/libsfdp.pc.in
81PKGCONFIG_OVERRIDE+= lib/xdot/libxdot.pc.in 76PKGCONFIG_OVERRIDE+= lib/xdot/libxdot.pc.in
82 77
@@ -86,33 +81,29 @@ LUA_VERSIONS_INCOMPATIBLE= 51 @@ -86,33 +81,29 @@ LUA_VERSIONS_INCOMPATIBLE= 51
86 81
87REPLACE_LUA+= tclpkg/gv/demo/modgraph.lua 82REPLACE_LUA+= tclpkg/gv/demo/modgraph.lua
88 83
89REPLACE_INTERPRETER+= tclsh 84REPLACE_INTERPRETER+= tclsh
90REPLACE.tclsh.old= .*tclsh 85REPLACE.tclsh.old= .*tclsh
91REPLACE.tclsh.new= ${PREFIX}/bin/tclsh 86REPLACE.tclsh.new= ${PREFIX}/bin/tclsh
92REPLACE_FILES.tclsh= tclpkg/gv/demo/modgraph.tcl 87REPLACE_FILES.tclsh= tclpkg/gv/demo/modgraph.tcl
93 88
94REPLACE_PERL+= tclpkg/gv/demo/modgraph.pl contrib/dotmcl.pl \ 89REPLACE_PERL+= tclpkg/gv/demo/modgraph.pl contrib/dotmcl.pl \
95 contrib/dirgraph/dirgraph.pl 90 contrib/dirgraph/dirgraph.pl
96 91
97.include "../../mk/bsd.prefs.mk" 92.include "../../mk/bsd.prefs.mk"
98 93
 94# Override Xaw type configured by user
99XAW_TYPE= standard 95XAW_TYPE= standard
100 96
101.include "../../mk/compiler.mk" 
102.if !empty(CC_VERSION:Mgcc-2*) 
103BUILDLINK_TRANSFORM+= rm:-Wno-unused-parameter 
104.endif 
105 
106.if (${OPSYS} == "NetBSD" && ${MACHINE_ARCH} == "powerpc") 97.if (${OPSYS} == "NetBSD" && ${MACHINE_ARCH} == "powerpc")
107# Forces link with -lgomp directly instead of via dlopen() 98# Forces link with -lgomp directly instead of via dlopen()
108# so we don't overflow thread-local storage in ld.elf_so 99# so we don't overflow thread-local storage in ld.elf_so
109CFLAGS+= -fopenmp 100CFLAGS+= -fopenmp
110CONFIGURE_ARGS+= CFLAGS="${CFLAGS}" 101CONFIGURE_ARGS+= CFLAGS="${CFLAGS}"
111.endif 102.endif
112 103
113.if ${OPSYS} == "FreeBSD" 104.if ${OPSYS} == "FreeBSD"
114SUBST_CLASSES+= sfflags 105SUBST_CLASSES+= sfflags
115SUBST_STAGE.sfflags= pre-configure 106SUBST_STAGE.sfflags= pre-configure
116SUBST_MESSAGE.sfflags= Fixing SF_FLAGS identifier for FreeBSD. 107SUBST_MESSAGE.sfflags= Fixing SF_FLAGS identifier for FreeBSD.
117SUBST_FILES.sfflags= lib/sfio/sfclrlock.c lib/sfio/sfio_t.h lib/sfio/sfio.h 108SUBST_FILES.sfflags= lib/sfio/sfclrlock.c lib/sfio/sfio_t.h lib/sfio/sfio.h
118SUBST_FILES.sfflags+= lib/sfio/sfnew.c lib/sfio/sfopen.c lib/sfio/sfset.c 109SUBST_FILES.sfflags+= lib/sfio/sfnew.c lib/sfio/sfopen.c lib/sfio/sfset.c
@@ -120,28 +111,27 @@ SUBST_SED.sfflags= -e 's|SF_FLAGS|SFIO_F @@ -120,28 +111,27 @@ SUBST_SED.sfflags= -e 's|SF_FLAGS|SFIO_F
120.endif 111.endif
121 112
122pre-configure: 113pre-configure:
123 cd ${WRKSRC} && autoreconf -fiv 114 cd ${WRKSRC} && autoreconf -fiv
124 115
125# Remove temporary files and directories created by re-linking "libgv_lua.la". 116# Remove temporary files and directories created by re-linking "libgv_lua.la".
126post-install: 117post-install:
127 ${RM} -rf ${DESTDIR}${PREFIX}/lib/graphviz/lua/gv.so \ 118 ${RM} -rf ${DESTDIR}${PREFIX}/lib/graphviz/lua/gv.so \
128 ${DESTDIR}${PREFIX}/lib/graphviz/tcl/tcl \ 119 ${DESTDIR}${PREFIX}/lib/graphviz/tcl/tcl \
129 ${DESTDIR}${PREFIX}/lib/lua/5.1/gv.so 120 ${DESTDIR}${PREFIX}/lib/lua/5.1/gv.so
130 121
131.include "options.mk" 122.include "options.mk"
132 123
133.include "../../lang/lua/application.mk" 124DEPENDS+= urw-fonts-[0-9]*:../../fonts/urw-fonts
134 125
135.include "../../converters/libiconv/buildlink3.mk" 126.include "../../converters/libiconv/buildlink3.mk"
136.include "../../devel/gettext-lib/buildlink3.mk" 127.include "../../devel/gettext-lib/buildlink3.mk"
137.include "../../devel/libltdl/buildlink3.mk" 128.include "../../devel/libltdl/buildlink3.mk"
138#.include "../../devel/libltdl/convenience.mk" 
139.include "../../devel/pango/buildlink3.mk" 129.include "../../devel/pango/buildlink3.mk"
140.include "../../fonts/fontconfig/buildlink3.mk" 130.include "../../fonts/fontconfig/buildlink3.mk"
141.include "../../graphics/cairo/buildlink3.mk" 
142.include "../../graphics/freetype2/buildlink3.mk" 131.include "../../graphics/freetype2/buildlink3.mk"
143.include "../../graphics/gts/buildlink3.mk" 132.include "../../graphics/gts/buildlink3.mk"
144.include "../../graphics/libwebp/buildlink3.mk" 133.include "../../graphics/libwebp/buildlink3.mk"
145.include "../../textproc/expat/buildlink3.mk" 
146.include "../../mk/pthread.buildlink3.mk" 134.include "../../mk/pthread.buildlink3.mk"
 135.include "../../textproc/expat/buildlink3.mk"
 136
147.include "../../mk/bsd.pkg.mk" 137.include "../../mk/bsd.pkg.mk"

cvs diff -r1.55 -r1.56 pkgsrc/graphics/graphviz/PLIST (expand / switch to unified diff)

--- pkgsrc/graphics/graphviz/PLIST 2021/12/29 16:19:18 1.55
+++ pkgsrc/graphics/graphviz/PLIST 2022/07/22 12:04:46 1.56
@@ -1,42 +1,39 @@ @@ -1,42 +1,39 @@
1@comment $NetBSD: PLIST,v 1.55 2021/12/29 16:19:18 adam Exp $ 1@comment $NetBSD: PLIST,v 1.56 2022/07/22 12:04:46 micha Exp $
2bin/acyclic 2bin/acyclic
3bin/bcomps 3bin/bcomps
4bin/ccomps 4bin/ccomps
5bin/circo 5bin/circo
6bin/cluster 6bin/cluster
7${PLIST.gd}bin/diffimg 7${PLIST.gd}bin/diffimg
8bin/dijkstra 8bin/dijkstra
9bin/dot 9bin/dot
10bin/dot2gxl 10bin/dot2gxl
11bin/dot_builtins 11bin/dot_builtins
12${PLIST.x11}bin/dotty 
13bin/edgepaint 12bin/edgepaint
14bin/fdp 13bin/fdp
15bin/gc 14bin/gc
16bin/gml2gv 15bin/gml2gv
17bin/graphml2gv 16bin/graphml2gv
18bin/gv2gml 17bin/gv2gml
19bin/gv2gxl 18bin/gv2gxl
20bin/gvcolor 19bin/gvcolor
21bin/gvgen 20bin/gvgen
22bin/gvmap 21bin/gvmap
23bin/gvmap.sh 22bin/gvmap.sh
24bin/gvpack 23bin/gvpack
25bin/gvpr 24bin/gvpr
26bin/gxl2dot 25bin/gxl2dot
27bin/gxl2gv 26bin/gxl2gv
28${PLIST.x11}bin/lefty 
29${PLIST.x11}bin/lneato 
30bin/mm2gv 27bin/mm2gv
31bin/neato 28bin/neato
32bin/nop 29bin/nop
33bin/osage 30bin/osage
34bin/patchwork 31bin/patchwork
35bin/prune 32bin/prune
36bin/sccmap 33bin/sccmap
37bin/sfdp 34bin/sfdp
38bin/tred 35bin/tred
39bin/twopi 36bin/twopi
40bin/unflatten 37bin/unflatten
41${PLIST.x11}bin/vimdot 38${PLIST.x11}bin/vimdot
42include/graphviz/arith.h 39include/graphviz/arith.h
@@ -56,256 +53,232 @@ include/graphviz/gvplugin.h @@ -56,256 +53,232 @@ include/graphviz/gvplugin.h
56include/graphviz/gvplugin_device.h 53include/graphviz/gvplugin_device.h
57include/graphviz/gvplugin_layout.h 54include/graphviz/gvplugin_layout.h
58include/graphviz/gvplugin_loadimage.h 55include/graphviz/gvplugin_loadimage.h
59include/graphviz/gvplugin_render.h 56include/graphviz/gvplugin_render.h
60include/graphviz/gvplugin_textlayout.h 57include/graphviz/gvplugin_textlayout.h
61include/graphviz/gvpr.h 58include/graphviz/gvpr.h
62include/graphviz/pack.h 59include/graphviz/pack.h
63include/graphviz/pathgeom.h 60include/graphviz/pathgeom.h
64include/graphviz/pathplan.h 61include/graphviz/pathplan.h
65include/graphviz/textspan.h 62include/graphviz/textspan.h
66include/graphviz/types.h 63include/graphviz/types.h
67include/graphviz/usershape.h 64include/graphviz/usershape.h
68include/graphviz/xdot.h 65include/graphviz/xdot.h
69${PLIST.guile}lib/graphviz/guile/libgv_guile.la 
70lib/graphviz/libgvplugin_core.la 66lib/graphviz/libgvplugin_core.la
71lib/graphviz/libgvplugin_dot_layout.la 67lib/graphviz/libgvplugin_dot_layout.la
72${PLIST.gd}lib/graphviz/libgvplugin_gd.la 68${PLIST.gd}lib/graphviz/libgvplugin_gd.la
73${PLIST.gtk}lib/graphviz/libgvplugin_gdk.la 69${PLIST.gtk}lib/graphviz/libgvplugin_gdk.la
74${PLIST.ghostscript}${PLIST.x11}lib/graphviz/libgvplugin_gs.la 70${PLIST.ghostscript}${PLIST.x11}lib/graphviz/libgvplugin_gs.la
75${PLIST.gtk}lib/graphviz/libgvplugin_gtk.la 71${PLIST.gtk}lib/graphviz/libgvplugin_gtk.la
76lib/graphviz/libgvplugin_neato_layout.la 72lib/graphviz/libgvplugin_neato_layout.la
77lib/graphviz/libgvplugin_pango.la 73lib/graphviz/libgvplugin_pango.la
78${PLIST.poppler}lib/graphviz/libgvplugin_poppler.la 74${PLIST.poppler}lib/graphviz/libgvplugin_poppler.la
79${PLIST.quartz}lib/graphviz/libgvplugin_quartz.la 75${PLIST.quartz}lib/graphviz/libgvplugin_quartz.la
80${PLIST.svg}lib/graphviz/libgvplugin_rsvg.la 76${PLIST.svg}lib/graphviz/libgvplugin_rsvg.la
81lib/graphviz/libgvplugin_visio.la 77lib/graphviz/libgvplugin_visio.la
82lib/graphviz/libgvplugin_webp.la 78lib/graphviz/libgvplugin_webp.la
83${PLIST.x11}lib/graphviz/libgvplugin_xlib.la 79${PLIST.x11}lib/graphviz/libgvplugin_xlib.la
84${PLIST.lua}lib/graphviz/lua/libgv_lua.la 80${PLIST.lua}lib/graphviz/lua/libgv_lua.la
85${PLIST.ocaml}lib/graphviz/ocaml/META.gv 
86${PLIST.ocaml}lib/graphviz/ocaml/gv.a 
87${PLIST.ocaml}lib/graphviz/ocaml/gv.cma 
88${PLIST.ocaml}lib/graphviz/ocaml/gv.cmi 
89${PLIST.ocaml}lib/graphviz/ocaml/gv.cmo 
90${PLIST.ocaml}lib/graphviz/ocaml/gv.cmx 
91${PLIST.ocaml}lib/graphviz/ocaml/gv.cmxa 
92${PLIST.ocaml}lib/graphviz/ocaml/gv.mli 
93${PLIST.ocaml}lib/graphviz/ocaml/libgv_ocaml.la 
94${PLIST.perl}lib/graphviz/perl/gv.pm 81${PLIST.perl}lib/graphviz/perl/gv.pm
95${PLIST.perl}lib/graphviz/perl/gv.so 82${PLIST.perl}lib/graphviz/perl/gv.so
96${PLIST.perl}lib/graphviz/perl/libgv_perl.la 83${PLIST.perl}lib/graphviz/perl/libgv_perl.la
97${PLIST.tcl}${PLIST.gd}lib/graphviz/tcl/libgdtclft.la 84${PLIST.tcl}${PLIST.x11}lib/graphviz/tcl/libgdtclft.la
98${PLIST.tcl}lib/graphviz/tcl/libgv_tcl.la 85${PLIST.tcl}lib/graphviz/tcl/libgv_tcl.la
99${PLIST.tcl}lib/graphviz/tcl/libtcldot.la 86${PLIST.tcl}lib/graphviz/tcl/libtcldot.la
100${PLIST.tcl}lib/graphviz/tcl/libtcldot_builtin.la 87${PLIST.tcl}lib/graphviz/tcl/libtcldot_builtin.la
101${PLIST.tcl}lib/graphviz/tcl/libtclplan.la 88${PLIST.tcl}lib/graphviz/tcl/libtclplan.la
102${PLIST.tcl}lib/graphviz/tcl/pkgIndex.tcl 89${PLIST.tcl}lib/graphviz/tcl/pkgIndex.tcl
103lib/libcdt.la 90lib/libcdt.la
104lib/libcgraph.la 91lib/libcgraph.la
105lib/libgvc.la 92lib/libgvc.la
106lib/libgvpr.la 93lib/libgvpr.la
107lib/liblab_gamut.la 94lib/liblab_gamut.la
108lib/libpathplan.la 95lib/libpathplan.la
109lib/libxdot.la 96lib/libxdot.la
110${PLIST.lua}lib/lua/gv.so 97${PLIST.lua}lib/lua/gv.so
111${PLIST.perl}${PERL5_SUB_INSTALLVENDORARCH}/gv.pm 98${PLIST.perl}${PERL5_SUB_INSTALLVENDORARCH}/gv.pm
112${PLIST.perl}${PERL5_SUB_INSTALLVENDORARCH}/gv.so 99${PLIST.perl}${PERL5_SUB_INSTALLVENDORARCH}/gv.so
113lib/pkgconfig/libcdt.pc 100lib/pkgconfig/libcdt.pc
114lib/pkgconfig/libcgraph.pc 101lib/pkgconfig/libcgraph.pc
115lib/pkgconfig/libgvc.pc 102lib/pkgconfig/libgvc.pc
116lib/pkgconfig/libgvpr.pc 103lib/pkgconfig/libgvpr.pc
117lib/pkgconfig/liblab_gamut.pc 104lib/pkgconfig/liblab_gamut.pc
118lib/pkgconfig/libpathplan.pc 105lib/pkgconfig/libpathplan.pc
119lib/pkgconfig/libxdot.pc 106lib/pkgconfig/libxdot.pc
120${PLIST.tcl}lib/tcl${TCL_BASEVER}/graphviz/libgdtclft.la 107${PLIST.tcl}${PLIST.x11}lib/tcl${TCL_BASEVER}/graphviz/libgdtclft.la
121${PLIST.tcl}lib/tcl${TCL_BASEVER}/graphviz/libgv_tcl.la 108${PLIST.tcl}lib/tcl${TCL_BASEVER}/graphviz/libgv_tcl.la
122${PLIST.tcl}lib/tcl${TCL_BASEVER}/graphviz/libtcldot.la 109${PLIST.tcl}lib/tcl${TCL_BASEVER}/graphviz/libtcldot.la
123${PLIST.tcl}lib/tcl${TCL_BASEVER}/graphviz/libtcldot_builtin.la 110${PLIST.tcl}lib/tcl${TCL_BASEVER}/graphviz/libtcldot_builtin.la
124${PLIST.tcl}lib/tcl${TCL_BASEVER}/graphviz/libtclplan.la 111${PLIST.tcl}lib/tcl${TCL_BASEVER}/graphviz/libtclplan.la
125${PLIST.tcl}lib/tcl${TCL_BASEVER}/graphviz/pkgIndex.tcl 112${PLIST.tcl}lib/tcl${TCL_BASEVER}/graphviz/pkgIndex.tcl
126man/man1/acyclic.1 113man/man1/acyclic.1
127man/man1/bcomps.1 114man/man1/bcomps.1
128man/man1/ccomps.1 115man/man1/ccomps.1
129man/man1/circo.1 116man/man1/circo.1
130man/man1/cluster.1 117man/man1/cluster.1
131man/man1/diffimg.1 118${PLIST.gd}man/man1/diffimg.1
132man/man1/dijkstra.1 119man/man1/dijkstra.1
133man/man1/dot.1 120man/man1/dot.1
134man/man1/dot2gxl.1 121man/man1/dot2gxl.1
135man/man1/dotty.1 
136man/man1/edgepaint.1 122man/man1/edgepaint.1
137man/man1/fdp.1 123man/man1/fdp.1
138man/man1/gc.1 124man/man1/gc.1
139man/man1/gml2gv.1 125man/man1/gml2gv.1
140man/man1/graphml2gv.1 126man/man1/graphml2gv.1
141man/man1/gv2gml.1 127man/man1/gv2gml.1
142man/man1/gv2gxl.1 128man/man1/gv2gxl.1
143man/man1/gvcolor.1 129man/man1/gvcolor.1
144man/man1/gvgen.1 130man/man1/gvgen.1
145man/man1/gvmap.1 131man/man1/gvmap.1
146man/man1/gvmap.sh.1 132man/man1/gvmap.sh.1
147man/man1/gvpack.1 133man/man1/gvpack.1
148man/man1/gvpr.1 134man/man1/gvpr.1
149man/man1/gxl2dot.1 135man/man1/gxl2dot.1
150man/man1/gxl2gv.1 136man/man1/gxl2gv.1
151${PLIST.x11}man/man1/lefty.1 
152man/man1/lneato.1 
153man/man1/mingle.1 
154man/man1/mm2gv.1 137man/man1/mm2gv.1
155man/man1/neato.1 138man/man1/neato.1
156man/man1/nop.1 139man/man1/nop.1
157man/man1/osage.1 140man/man1/osage.1
158man/man1/patchwork.1 141man/man1/patchwork.1
159man/man1/prune.1 142man/man1/prune.1
160man/man1/sccmap.1 143man/man1/sccmap.1
161man/man1/sfdp.1 144man/man1/sfdp.1
162man/man1/tred.1 145man/man1/tred.1
163man/man1/twopi.1 146man/man1/twopi.1
164man/man1/unflatten.1 147man/man1/unflatten.1
165man/man1/vimdot.1 148${PLIST.x11}man/man1/vimdot.1
166man/man3/cdt.3 149man/man3/cdt.3
167man/man3/cgraph.3 150man/man3/cgraph.3
168man/man3/expr.3 151man/man3/expr.3
169${PLIST.tcl}${PLIST.gd}man/man3/gdtclft.3tcl 152${PLIST.tcl}${PLIST.gd}man/man3/gdtclft.3tcl
170${PLIST.guile}man/man3/gv.3guile 
171${PLIST.lua}man/man3/gv.3lua 153${PLIST.lua}man/man3/gv.3lua
172${PLIST.ocaml}man/man3/gv.3ocaml 
173${PLIST.perl}man/man3/gv.3perl 154${PLIST.perl}man/man3/gv.3perl
174${PLIST.swig}man/man3/gv.3python 155${PLIST.swig}man/man3/gv.3python
175${PLIST.tcl}man/man3/gv.3tcl 156${PLIST.tcl}man/man3/gv.3tcl
176man/man3/gvc.3 157man/man3/gvc.3
177man/man3/gvpr.3 158man/man3/gvpr.3
178man/man3/pack.3 159man/man3/pack.3
179man/man3/pathplan.3 160man/man3/pathplan.3
180${PLIST.tcl}man/man3/tcldot.3tcl 161${PLIST.tcl}man/man3/tcldot.3tcl
181man/man3/xdot.3 162man/man3/xdot.3
182man/man7/graphviz.7 163man/man7/graphviz.7
 164share/doc/graphviz/AUTHORS
 165share/doc/graphviz/Agraph.pdf
 166share/doc/graphviz/CHANGELOG.md
 167share/doc/graphviz/COPYING
 168share/doc/graphviz/Dot.ref
 169share/doc/graphviz/FAQ.html
 170share/doc/graphviz/NEWS
 171share/doc/graphviz/acyclic.1.pdf
 172share/doc/graphviz/addingLayout.txt
 173share/doc/graphviz/bcomps.1.pdf
 174share/doc/graphviz/build.html
 175share/doc/graphviz/ccomps.1.pdf
 176share/doc/graphviz/cdt.3.pdf
 177share/doc/graphviz/cgraph.3.pdf
 178share/doc/graphviz/char.html
 179share/doc/graphviz/circo.1.pdf
 180share/doc/graphviz/cluster.1.pdf
 181share/doc/graphviz/cpl1.0.txt
 182${PLIST.gd}share/doc/graphviz/diffimg.1.pdf
 183share/doc/graphviz/dijkstra.1.pdf
 184share/doc/graphviz/dot.1.pdf
 185share/doc/graphviz/dot2gxl.1.pdf
 186share/doc/graphviz/dotguide.pdf
 187share/doc/graphviz/edgepaint.1.pdf
 188share/doc/graphviz/expr.3.pdf
 189share/doc/graphviz/fdp.1.pdf
 190share/doc/graphviz/fontfaq.txt
 191share/doc/graphviz/gc.1.pdf
 192${PLIST.tcl}${PLIST.gd}share/doc/graphviz/gdtclft.3tcl.pdf
 193share/doc/graphviz/gdtclft.entities.example.png
 194share/doc/graphviz/gml2gv.1.pdf
 195share/doc/graphviz/graphml2gv.1.pdf
 196${PLIST.lua}share/doc/graphviz/gv.3lua.pdf
 197${PLIST.perl}share/doc/graphviz/gv.3perl.pdf
 198${PLIST.swig}share/doc/graphviz/gv.3python.pdf
 199${PLIST.tcl}share/doc/graphviz/gv.3tcl.pdf
 200share/doc/graphviz/gv2gml.1.pdf
 201share/doc/graphviz/gv2gxl.1.pdf
 202share/doc/graphviz/gvc.3.pdf
 203share/doc/graphviz/gvcolor.1.pdf
 204share/doc/graphviz/gvgen.1.pdf
 205share/doc/graphviz/gvmap.1.pdf
 206share/doc/graphviz/gvmap.sh.1.pdf
 207share/doc/graphviz/gvpack.1.pdf
 208share/doc/graphviz/gvpr.1.pdf
 209share/doc/graphviz/gvpr.3.pdf
 210share/doc/graphviz/gxl2dot.1.pdf
 211share/doc/graphviz/gxl2gv.1.pdf
 212share/doc/graphviz/index.html
 213share/doc/graphviz/info/arrows.html
 214share/doc/graphviz/info/attrs.html
 215share/doc/graphviz/info/colors.html
 216share/doc/graphviz/info/command.html
 217share/doc/graphviz/info/index.html
 218share/doc/graphviz/info/lang.html
 219share/doc/graphviz/info/output.html
 220share/doc/graphviz/info/shapes.html
 221share/doc/graphviz/internal_todo.html
 222share/doc/graphviz/latex_suggestions.txt
 223share/doc/graphviz/libguide.pdf
 224share/doc/graphviz/mm2gv.1.pdf
 225share/doc/graphviz/neato.1.pdf
 226share/doc/graphviz/neatoguide.pdf
 227share/doc/graphviz/nop.1.pdf
 228share/doc/graphviz/osage.1.pdf
 229share/doc/graphviz/pack.3.pdf
 230share/doc/graphviz/patchwork.1.pdf
 231share/doc/graphviz/pathplan.3.pdf
 232share/doc/graphviz/prune.1.pdf
 233share/doc/graphviz/pspdf.png
 234share/doc/graphviz/sccmap.1.pdf
 235share/doc/graphviz/schema/arguments.xml
 236share/doc/graphviz/schema/attributes.xml
 237share/doc/graphviz/schema/attributes.xslt
 238share/doc/graphviz/sfdp.1.pdf
 239${PLIST.tcl}share/doc/graphviz/tcldot.3tcl.pdf
 240${PLIST.tcl}share/doc/graphviz/tcldot.html
 241share/doc/graphviz/todo.html
 242share/doc/graphviz/tred.1.pdf
 243share/doc/graphviz/twopi.1.pdf
 244share/doc/graphviz/unflatten.1.pdf
 245${PLIST.x11}share/doc/graphviz/vimdot.1.pdf
 246share/doc/graphviz/winbuild.html
 247share/doc/graphviz/xdot.3.pdf
183${PLIST.tcl}share/graphviz/demo/doted.tcl 248${PLIST.tcl}share/graphviz/demo/doted.tcl
184${PLIST.tcl}share/graphviz/demo/doted.tcl.README 249${PLIST.tcl}share/graphviz/demo/doted.tcl.README
185${PLIST.tcl}share/graphviz/demo/entities.html 250${PLIST.tcl}share/graphviz/demo/entities.html
186${PLIST.tcl}share/graphviz/demo/entities.tcl 251${PLIST.tcl}share/graphviz/demo/entities.tcl
187${PLIST.tcl}share/graphviz/demo/entities.tcl.README 252${PLIST.tcl}share/graphviz/demo/entities.tcl.README
188${PLIST.tcl}share/graphviz/demo/gcat.tcl 253${PLIST.tcl}share/graphviz/demo/gcat.tcl
189${PLIST.tcl}share/graphviz/demo/gcat.tcl.README 254${PLIST.tcl}share/graphviz/demo/gcat.tcl.README
190${PLIST.lua}share/graphviz/demo/modgraph.lua 255${PLIST.lua}share/graphviz/demo/modgraph.lua
191${PLIST.perl}share/graphviz/demo/modgraph.pl 256${PLIST.perl}share/graphviz/demo/modgraph.pl
192${PLIST.tcl}share/graphviz/demo/modgraph.tcl 257${PLIST.tcl}share/graphviz/demo/modgraph.tcl
193${PLIST.tcl}share/graphviz/demo/pathplan.tcl 258${PLIST.tcl}share/graphviz/demo/pathplan.tcl
194${PLIST.tcl}share/graphviz/demo/pathplan.tcl.README 259${PLIST.tcl}share/graphviz/demo/pathplan.tcl.README
195${PLIST.tcl}share/graphviz/demo/pathplan_data/boxes.dat 260${PLIST.tcl}share/graphviz/demo/pathplan_data/boxes.dat
196${PLIST.tcl}share/graphviz/demo/pathplan_data/dpd.dat 261${PLIST.tcl}share/graphviz/demo/pathplan_data/dpd.dat
197${PLIST.tcl}share/graphviz/demo/pathplan_data/funny.dat 262${PLIST.tcl}share/graphviz/demo/pathplan_data/funny.dat
198${PLIST.tcl}share/graphviz/demo/pathplan_data/maze.dat 263${PLIST.tcl}share/graphviz/demo/pathplan_data/maze.dat
199${PLIST.tcl}share/graphviz/demo/pathplan_data/nested.dat 264${PLIST.tcl}share/graphviz/demo/pathplan_data/nested.dat
200${PLIST.tcl}share/graphviz/demo/pathplan_data/northo.dat 265${PLIST.tcl}share/graphviz/demo/pathplan_data/northo.dat
201${PLIST.tcl}share/graphviz/demo/pathplan_data/obs.dat 266${PLIST.tcl}share/graphviz/demo/pathplan_data/obs.dat
202${PLIST.tcl}share/graphviz/demo/pathplan_data/other.dat 267${PLIST.tcl}share/graphviz/demo/pathplan_data/other.dat
203${PLIST.tcl}share/graphviz/demo/pathplan_data/paths.dat 268${PLIST.tcl}share/graphviz/demo/pathplan_data/paths.dat
204${PLIST.tcl}share/graphviz/demo/pathplan_data/rotor.dat 269${PLIST.tcl}share/graphviz/demo/pathplan_data/rotor.dat
205${PLIST.tcl}share/graphviz/demo/pathplan_data/u.dat 270${PLIST.tcl}share/graphviz/demo/pathplan_data/u.dat
206${PLIST.tcl}share/graphviz/demo/pathplan_data/unknown.dat 271${PLIST.tcl}share/graphviz/demo/pathplan_data/unknown.dat
207share/graphviz/doc/AUTHORS 
208share/graphviz/doc/CHANGELOG.md 
209share/graphviz/doc/COPYING 
210share/graphviz/doc/Dot.ref 
211share/graphviz/doc/NEWS 
212share/graphviz/doc/addingLayout.txt 
213share/graphviz/doc/cpl1.0.txt 
214share/graphviz/doc/fontfaq.txt 
215share/graphviz/doc/html/FAQ.html 
216share/graphviz/doc/html/build.html 
217share/graphviz/doc/html/char.html 
218share/graphviz/doc/html/gdtclft.entities.example.png 
219share/graphviz/doc/html/index.html 
220share/graphviz/doc/html/info/arrows.html 
221share/graphviz/doc/html/info/attrs.html 
222share/graphviz/doc/html/info/colors.html 
223share/graphviz/doc/html/info/command.html 
224share/graphviz/doc/html/info/index.html 
225share/graphviz/doc/html/info/lang.html 
226share/graphviz/doc/html/info/output.html 
227share/graphviz/doc/html/info/shapes.html 
228share/graphviz/doc/html/internal_todo.html 
229share/graphviz/doc/html/pspdf.png 
230share/graphviz/doc/html/schema/arguments.xml 
231share/graphviz/doc/html/schema/attributes.xml 
232share/graphviz/doc/html/schema/attributes.xslt 
233${PLIST.tcl}share/graphviz/doc/html/tcldot.html 
234share/graphviz/doc/html/todo.html 
235share/graphviz/doc/html/winbuild.html 
236share/graphviz/doc/latex_suggestions.txt 
237share/graphviz/doc/pdf/Agraph.pdf 
238share/graphviz/doc/pdf/acyclic.1.pdf 
239share/graphviz/doc/pdf/bcomps.1.pdf 
240share/graphviz/doc/pdf/ccomps.1.pdf 
241share/graphviz/doc/pdf/cdt.3.pdf 
242share/graphviz/doc/pdf/cgraph.3.pdf 
243share/graphviz/doc/pdf/circo.1.pdf 
244share/graphviz/doc/pdf/cluster.1.pdf 
245share/graphviz/doc/pdf/diffimg.1.pdf 
246share/graphviz/doc/pdf/dijkstra.1.pdf 
247share/graphviz/doc/pdf/dot.1.pdf 
248share/graphviz/doc/pdf/dot2gxl.1.pdf 
249share/graphviz/doc/pdf/dotguide.pdf 
250share/graphviz/doc/pdf/dotty.1.pdf 
251share/graphviz/doc/pdf/dottyguide.pdf 
252share/graphviz/doc/pdf/edgepaint.1.pdf 
253share/graphviz/doc/pdf/expr.3.pdf 
254share/graphviz/doc/pdf/fdp.1.pdf 
255share/graphviz/doc/pdf/gc.1.pdf 
256${PLIST.tcl}${PLIST.gd}share/graphviz/doc/pdf/gdtclft.3tcl.pdf 
257share/graphviz/doc/pdf/gml2gv.1.pdf 
258share/graphviz/doc/pdf/graphml2gv.1.pdf 
259${PLIST.guile}share/graphviz/doc/pdf/gv.3guile.pdf 
260${PLIST.lua}share/graphviz/doc/pdf/gv.3lua.pdf 
261${PLIST.ocaml}share/graphviz/doc/pdf/gv.3ocaml.pdf 
262${PLIST.perl}share/graphviz/doc/pdf/gv.3perl.pdf 
263${PLIST.swig}share/graphviz/doc/pdf/gv.3python.pdf 
264${PLIST.tcl}share/graphviz/doc/pdf/gv.3tcl.pdf 
265share/graphviz/doc/pdf/gv2gml.1.pdf 
266share/graphviz/doc/pdf/gv2gxl.1.pdf 
267share/graphviz/doc/pdf/gvc.3.pdf 
268share/graphviz/doc/pdf/gvcolor.1.pdf 
269share/graphviz/doc/pdf/gvgen.1.pdf 
270share/graphviz/doc/pdf/gvmap.1.pdf 
271share/graphviz/doc/pdf/gvmap.sh.1.pdf 
272share/graphviz/doc/pdf/gvpack.1.pdf 
273share/graphviz/doc/pdf/gvpr.1.pdf 
274share/graphviz/doc/pdf/gvpr.3.pdf 
275share/graphviz/doc/pdf/gxl2dot.1.pdf 
276share/graphviz/doc/pdf/gxl2gv.1.pdf 
277${PLIST.x11}share/graphviz/doc/pdf/lefty.1.pdf 
278${PLIST.x11}share/graphviz/doc/pdf/leftyguide.pdf 
279share/graphviz/doc/pdf/libguide.pdf 
280share/graphviz/doc/pdf/lneato.1.pdf 
281share/graphviz/doc/pdf/mingle.1.pdf 
282share/graphviz/doc/pdf/mm2gv.1.pdf 
283share/graphviz/doc/pdf/neato.1.pdf 
284share/graphviz/doc/pdf/neatoguide.pdf 
285share/graphviz/doc/pdf/nop.1.pdf 
286share/graphviz/doc/pdf/osage.1.pdf 
287share/graphviz/doc/pdf/pack.3.pdf 
288share/graphviz/doc/pdf/patchwork.1.pdf 
289share/graphviz/doc/pdf/pathplan.3.pdf 
290share/graphviz/doc/pdf/prune.1.pdf 
291share/graphviz/doc/pdf/sccmap.1.pdf 
292share/graphviz/doc/pdf/sfdp.1.pdf 
293${PLIST.tcl}share/graphviz/doc/pdf/tcldot.3tcl.pdf 
294share/graphviz/doc/pdf/tred.1.pdf 
295share/graphviz/doc/pdf/twopi.1.pdf 
296share/graphviz/doc/pdf/unflatten.1.pdf 
297share/graphviz/doc/pdf/vimdot.1.pdf 
298share/graphviz/doc/pdf/xdot.3.pdf 
299share/graphviz/graphs/directed/KW91.gv 272share/graphviz/graphs/directed/KW91.gv
300share/graphviz/graphs/directed/Latin1.gv 273share/graphviz/graphs/directed/Latin1.gv
301share/graphviz/graphs/directed/NaN.gv 274share/graphviz/graphs/directed/NaN.gv
302share/graphviz/graphs/directed/abstract.gv 275share/graphviz/graphs/directed/abstract.gv
303share/graphviz/graphs/directed/alf.gv 276share/graphviz/graphs/directed/alf.gv
304share/graphviz/graphs/directed/arrows.gv 277share/graphviz/graphs/directed/arrows.gv
305share/graphviz/graphs/directed/awilliams.gv 278share/graphviz/graphs/directed/awilliams.gv
306share/graphviz/graphs/directed/biological.gv 279share/graphviz/graphs/directed/biological.gv
307share/graphviz/graphs/directed/clust.gv 280share/graphviz/graphs/directed/clust.gv
308share/graphviz/graphs/directed/clust1.gv 281share/graphviz/graphs/directed/clust1.gv
309share/graphviz/graphs/directed/clust2.gv 282share/graphviz/graphs/directed/clust2.gv
310share/graphviz/graphs/directed/clust3.gv 283share/graphviz/graphs/directed/clust3.gv
311share/graphviz/graphs/directed/clust4.gv 284share/graphviz/graphs/directed/clust4.gv
@@ -383,25 +356,13 @@ share/graphviz/gvpr/flatten @@ -383,25 +356,13 @@ share/graphviz/gvpr/flatten
383share/graphviz/gvpr/get-layers-list 356share/graphviz/gvpr/get-layers-list
384share/graphviz/gvpr/group 357share/graphviz/gvpr/group
385share/graphviz/gvpr/histogram 358share/graphviz/gvpr/histogram
386share/graphviz/gvpr/indent 359share/graphviz/gvpr/indent
387share/graphviz/gvpr/knbhd 360share/graphviz/gvpr/knbhd
388share/graphviz/gvpr/maxdeg 361share/graphviz/gvpr/maxdeg
389share/graphviz/gvpr/path 362share/graphviz/gvpr/path
390share/graphviz/gvpr/rotate 363share/graphviz/gvpr/rotate
391share/graphviz/gvpr/scale 364share/graphviz/gvpr/scale
392share/graphviz/gvpr/scalexy 365share/graphviz/gvpr/scalexy
393share/graphviz/gvpr/span 366share/graphviz/gvpr/span
394share/graphviz/gvpr/topon 367share/graphviz/gvpr/topon
395share/graphviz/gvpr/treetoclust 368share/graphviz/gvpr/treetoclust
396${PLIST.x11}share/graphviz/lefty/box.lefty 
397${PLIST.x11}share/graphviz/lefty/def.lefty 
398${PLIST.x11}share/graphviz/lefty/dotty.lefty 
399${PLIST.x11}share/graphviz/lefty/dotty_draw.lefty 
400${PLIST.x11}share/graphviz/lefty/dotty_edit.lefty 
401${PLIST.x11}share/graphviz/lefty/dotty_layout.lefty 
402${PLIST.x11}share/graphviz/lefty/dotty_ui.lefty 
403${PLIST.x11}share/graphviz/lefty/fractal.lefty 
404${PLIST.x11}share/graphviz/lefty/fractal2.lefty 
405${PLIST.x11}share/graphviz/lefty/lefty.psp 
406${PLIST.x11}share/graphviz/lefty/slides.lefty 
407${PLIST.x11}share/graphviz/lefty/tree.lefty 

cvs diff -r1.28 -r1.29 pkgsrc/graphics/graphviz/buildlink3.mk (expand / switch to unified diff)

--- pkgsrc/graphics/graphviz/buildlink3.mk 2022/06/28 11:34:01 1.28
+++ pkgsrc/graphics/graphviz/buildlink3.mk 2022/07/22 12:04:46 1.29
@@ -1,21 +1,18 @@ @@ -1,21 +1,18 @@
1# $NetBSD: buildlink3.mk,v 1.28 2022/06/28 11:34:01 wiz Exp $ 1# $NetBSD: buildlink3.mk,v 1.29 2022/07/22 12:04:46 micha Exp $
2 2
3BUILDLINK_TREE+= graphviz 3BUILDLINK_TREE+= graphviz
4 4
5.if !defined(GRAPHVIZ_BUILDLINK3_MK) 5.if !defined(GRAPHVIZ_BUILDLINK3_MK)
6GRAPHVIZ_BUILDLINK3_MK:= 6GRAPHVIZ_BUILDLINK3_MK:=
7 7
8BUILDLINK_API_DEPENDS.graphviz+= graphviz>=2.26.3 8BUILDLINK_API_DEPENDS.graphviz+= graphviz>=5.0.0
9BUILDLINK_ABI_DEPENDS.graphviz+= graphviz>=2.50.0nb6 
10BUILDLINK_PKGSRCDIR.graphviz?= ../../graphics/graphviz 9BUILDLINK_PKGSRCDIR.graphviz?= ../../graphics/graphviz
11 10
12# doxygen PLIST varies with pangocairo of PKG_OPTIONS 11DEPENDS+= urw-fonts-[0-9]*:../../fonts/urw-fonts
13pkgbase := graphviz 
14.include "../../mk/pkg-build-options.mk" 
15 12
16.include "../../converters/libiconv/buildlink3.mk" 13.include "../../converters/libiconv/buildlink3.mk"
17.include "../../fonts/fontconfig/buildlink3.mk" 14.include "../../fonts/fontconfig/buildlink3.mk"
18.include "../../textproc/expat/buildlink3.mk" 15.include "../../textproc/expat/buildlink3.mk"
19.endif # GRAPHVIZ_BUILDLINK3_MK 16.endif # GRAPHVIZ_BUILDLINK3_MK
20 17
21BUILDLINK_TREE+= -graphviz 18BUILDLINK_TREE+= -graphviz

cvs diff -r1.71 -r1.72 pkgsrc/graphics/graphviz/distinfo (expand / switch to unified diff)

--- pkgsrc/graphics/graphviz/distinfo 2022/02/15 16:16:53 1.71
+++ pkgsrc/graphics/graphviz/distinfo 2022/07/22 12:04:46 1.72
@@ -1,13 +1,11 @@ @@ -1,13 +1,11 @@
1$NetBSD: distinfo,v 1.71 2022/02/15 16:16:53 sborrill Exp $ 1$NetBSD: distinfo,v 1.72 2022/07/22 12:04:46 micha Exp $
2 2
3BLAKE2s (graphviz-2.50.0.tar.gz) = 68f87db4ac9cc88af469f084c17bb5d95807f5bd535575672e9fbb8febc007b4 3BLAKE2s (graphviz-5.0.0.tar.gz) = 6755b14a2b5fed1365c5dbfe1d72406e8bb6707f29c7955c4372afcc32aa09f1
4SHA512 (graphviz-2.50.0.tar.gz) = cc19bb830773c6fcf2d166503e8a199cc521d7068d5dd8aa8e86e0137415936e70a1e0b1788b2f6b8afedab9ed8a9cc330f89d156c4be791d4d75ea9465aa2b7 4SHA512 (graphviz-5.0.0.tar.gz) = ea21c39b8735215073972af94affae20f76ee04e7f6c8833c9018d6b1fdcb763cec48cde8972f7443f08b2febd1a04ecb7d07ec48ea74ae785f0af98cc5e136a
5Size (graphviz-2.50.0.tar.gz) = 29761610 bytes 5Size (graphviz-5.0.0.tar.gz) = 27590532 bytes
6SHA1 (patch-cmd_lefty_os_unix_io.c) = 48f91c79b97928b54ae24af59a9fea173f34dfe5 6SHA1 (patch-config_config__perl.pl) = 430acb7d7ee3e149de0af9832c5a29602884f83e
7SHA1 (patch-config_config__perl.pl) = 85d535282a819c1055386244f7b520387d0ddbb1 7SHA1 (patch-configure.ac) = 1c39f0b25cfc995de10a07492656c2f12a24686f
8SHA1 (patch-configure.ac) = 250105b7d21e16e0ad6ff77b291a969f4be86711 8SHA1 (patch-lib_gvc_Makefile.am) = b5d793ec0a676c5d4b257c6fec1eb182ee93718b
9SHA1 (patch-lib_gvc_Makefile.am) = 8a3f79363cc0a98ea51d4241e67b0fc65b3eca0e 9SHA1 (patch-plugin_gs_gvloadimage__gs.c) = d777c822ef11b15eff992f36a9f4073c02cd4ca6
10SHA1 (patch-plugin_gs_gvloadimage__gs.c) = 56cbf9bb7b5bf96188ad21a00924e92df74b480d 
11SHA1 (patch-plugin_xlib_gvdevice__xlib.c) = 05d1549db3b9221f5bcb947173034775b0df7c6c 10SHA1 (patch-plugin_xlib_gvdevice__xlib.c) = 05d1549db3b9221f5bcb947173034775b0df7c6c
12SHA1 (patch-tclpkg_gv_Makefile.am) = 6cee06e06daca71a11299c9c4405002028d7e4a0 11SHA1 (patch-tclpkg_gv_Makefile.am) = 47e15ae0342d39db7ef88e414491495c18e2c45c
13SHA1 (patch-version.m4) = 859ce621758fd042be834ed828137bea780fa284 

cvs diff -r1.33 -r1.34 pkgsrc/graphics/graphviz/options.mk (expand / switch to unified diff)

--- pkgsrc/graphics/graphviz/options.mk 2022/05/13 21:33:16 1.33
+++ pkgsrc/graphics/graphviz/options.mk 2022/07/22 12:04:46 1.34
@@ -1,46 +1,48 @@ @@ -1,46 +1,48 @@
1# $NetBSD: options.mk,v 1.33 2022/05/13 21:33:16 tnn Exp $ 1# $NetBSD: options.mk,v 1.34 2022/07/22 12:04:46 micha Exp $
2 2
3PKG_OPTIONS_VAR= PKG_OPTIONS.graphviz 3PKG_OPTIONS_VAR= PKG_OPTIONS.graphviz
4PKG_SUPPORTED_OPTIONS= gd ghostscript gtk lua ocaml perl poppler svg tcl x11 # guile does not build with guile20 4PKG_SUPPORTED_OPTIONS= gd ghostscript gtk lua perl poppler svg tcl x11
5.if exists(/System/Library/Frameworks/Quartz.framework) 5.if exists(/System/Library/Frameworks/Quartz.framework)
6PKG_SUPPORTED_OPTIONS+= quartz 6PKG_SUPPORTED_OPTIONS+= quartz
7.endif 7.endif
8PKG_SUGGESTED_OPTIONS= gd lua perl tcl x11 8PKG_SUGGESTED_OPTIONS= gd x11
9# Explanation of consequence of options, to help those trying to slim down: 9# Explanation of consequence of options, to help those trying to slim down:
10# guile ocaml lua tcl perl: extension language support 10# lua tcl perl: extension language support
11# x11: Omits all linking with x11, which means x11 graphics supports as 11# x11: Omits all linking with x11, which means x11 graphics supports as
12# well as x11 frontend support. 12# well as x11 frontend support.
13# gtk: basic graphic format support (in addition to gd, which isn't 13# gtk: basic graphic format support (in addition to gd, which isn't
14# maintained anymore) 14# maintained anymore)
15# svg: Omitting loses svg support. librsvg has large dependencies 15# svg: Omitting loses svg support. librsvg has large dependencies
16# including some GNOME libs. 16# including some GNOME libs.
17# gd: basic graphic format support, especially gif 17# gd: basic graphic format support, especially gif
18# ghostscript: provides better ps/pdf-support, plus eps 18# ghostscript: provides better ps/pdf-support, plus eps
19 19
20.include "../../mk/bsd.options.mk" 20.include "../../mk/bsd.options.mk"
21 21
22PLIST_VARS+= gd ghostscript gtk guile lua ocaml perl poppler quartz svg swig tcl x11 22PLIST_VARS+= gd ghostscript gtk lua perl poppler quartz svg swig tcl x11
23 23
24.if !empty(PKG_OPTIONS:Mgd) 24.if !empty(PKG_OPTIONS:Mgd)
25. include "../../graphics/gd/buildlink3.mk" 25. include "../../graphics/gd/buildlink3.mk"
26PLIST.gd= yes 26PLIST.gd= yes
27CONFIGURE_ARGS+= --with-libgd 27CONFIGURE_ARGS+= --with-libgd
28.else 28.else
29CONFIGURE_ARGS+= --without-libgd 29CONFIGURE_ARGS+= --without-libgd
30.endif 30.endif
31 31
32.if !empty(PKG_OPTIONS:Mghostscript) 32.if !empty(PKG_OPTIONS:Mghostscript)
33. include "../../print/ghostscript/buildlink3.mk" 33. include "../../print/ghostscript/buildlink3.mk"
 34# Also required as tool dependency according to documentation
 35TOOL_DEPENDS+= ghostscript-[0-9]*:../../print/ghostscript
34PLIST.ghostscript= yes 36PLIST.ghostscript= yes
35CONFIGURE_ARGS+= --with-ghostscript 37CONFIGURE_ARGS+= --with-ghostscript
36.else 38.else
37CONFIGURE_ARGS+= --without-ghostscript 39CONFIGURE_ARGS+= --without-ghostscript
38.endif 40.endif
39 41
40.if !empty(PKG_OPTIONS:Mgtk) 42.if !empty(PKG_OPTIONS:Mgtk)
41. include "../../x11/gtk2/buildlink3.mk" 43. include "../../x11/gtk2/buildlink3.mk"
42PLIST.gtk= yes 44PLIST.gtk= yes
43CONFIGURE_ARGS+= --with-gdk 45CONFIGURE_ARGS+= --with-gdk
44CONFIGURE_ARGS+= --with-gdk-pixbuf 46CONFIGURE_ARGS+= --with-gdk-pixbuf
45CONFIGURE_ARGS+= --with-gtk 47CONFIGURE_ARGS+= --with-gtk
46CONFIGURE_ARGS+= --with-gnomeui 48CONFIGURE_ARGS+= --with-gnomeui
@@ -69,81 +71,66 @@ CONFIGURE_ARGS+= --without-quartz @@ -69,81 +71,66 @@ CONFIGURE_ARGS+= --without-quartz
69.if !empty(PKG_OPTIONS:Msvg) 71.if !empty(PKG_OPTIONS:Msvg)
70. include "../../graphics/librsvg/buildlink3.mk" 72. include "../../graphics/librsvg/buildlink3.mk"
71PLIST.svg= yes 73PLIST.svg= yes
72CONFIGURE_ARGS+= --with-rsvg 74CONFIGURE_ARGS+= --with-rsvg
73.else 75.else
74CONFIGURE_ARGS+= --without-rsvg 76CONFIGURE_ARGS+= --without-rsvg
75.endif 77.endif
76 78
77.if !empty(PKG_OPTIONS:Mx11) 79.if !empty(PKG_OPTIONS:Mx11)
78. include "../../mk/xaw.buildlink3.mk" 80. include "../../mk/xaw.buildlink3.mk"
79. include "../../x11/libXrender/buildlink3.mk" 81. include "../../x11/libXrender/buildlink3.mk"
80PLIST.x11= yes 82PLIST.x11= yes
81CONFIGURE_ENV+= X11BASE=${X11BASE} 83CONFIGURE_ENV+= X11BASE=${X11BASE}
82CONFIGURE_ARGS+= --enable-lefty 
83CONFIGURE_ARGS+= --with-x 84CONFIGURE_ARGS+= --with-x
84.else 85.else
85CONFIGURE_ARGS+= --disable-lefty 
86CONFIGURE_ARGS+= --without-x 86CONFIGURE_ARGS+= --without-x
87.endif 87.endif
88 88
89USING_SWIG= no 89USING_SWIG= no
90 90
91.if !empty(PKG_OPTIONS:Mlua) 91.if !empty(PKG_OPTIONS:Mlua)
92USING_SWIG= yes 92USING_SWIG= yes
93. include "../../lang/lua/tool.mk" 93. include "../../lang/lua/tool.mk"
94. include "../../lang/lua/buildlink3.mk" 94. include "../../lang/lua/buildlink3.mk"
 95. include "../../lang/lua/application.mk"
95PLIST.lua= yes 96PLIST.lua= yes
96CONFIGURE_ARGS+= --enable-lua 97CONFIGURE_ARGS+= --enable-lua
97.else 98.else
98CONFIGURE_ARGS+= --disable-lua 99CONFIGURE_ARGS+= --disable-lua
99.endif 100.endif
100 101
101.if !empty(PKG_OPTIONS:Mocaml) 
102USING_SWIG= yes 
103. include "../../lang/ocaml/buildlink3.mk" 
104PLIST.ocaml= yes 
105CONFIGURE_ARGS+= --enable-ocaml 
106.else 
107CONFIGURE_ARGS+= --disable-ocaml 
108.endif 
109 
110.if !empty(PKG_OPTIONS:Mtcl) 102.if !empty(PKG_OPTIONS:Mtcl)
 103. if empty(PKG_OPTIONS:Mx11)
 104PKG_FAIL_REASON= "tcl option requires x11 option"
 105. endif
111USING_SWIG= yes 106USING_SWIG= yes
112. include "../../lang/tcl/Makefile.version" 107. include "../../lang/tcl/Makefile.version"
113. include "../../x11/tk/buildlink3.mk" 108. include "../../x11/tk/buildlink3.mk"
114PLIST.tcl= yes 109PLIST.tcl= yes
115PLIST_SUBST+= TCL_BASEVER=${TCL_BASEVER} 110PLIST_SUBST+= TCL_BASEVER=${TCL_BASEVER}
116CONFIGURE_ENV+= TCLCONFIG=${TCLCONFIG_SH:Q} 111CONFIGURE_ENV+= TCLCONFIG=${TCLCONFIG_SH:Q}
117CONFIGURE_ENV+= TKCONFIG=${TKCONFIG_SH:Q} 112CONFIGURE_ENV+= TKCONFIG=${TKCONFIG_SH:Q}
118CONFIGURE_ARGS+= --with-tclsh=${TCLSH:Q} 113CONFIGURE_ARGS+= --with-tclsh=${TCLSH:Q}
119CONFIGURE_ARGS+= --enable-tcl 114CONFIGURE_ARGS+= --enable-tcl
120.else 115.else
121CONFIGURE_ARGS+= --disable-tcl 116CONFIGURE_ARGS+= --disable-tcl
122.endif 117.endif
123 118
124.if !empty(PKG_OPTIONS:Mguile) 
125USING_SWIG= yes 
126. include "../../lang/guile20/buildlink3.mk" 
127PLIST.guile= yes 
128CONFIGURE_ARGS+= --enable-guile 
129.else 
130CONFIGURE_ARGS+= --disable-guile 
131.endif 
132 
133.if !empty(PKG_OPTIONS:Mperl) 119.if !empty(PKG_OPTIONS:Mperl)
134USING_SWIG= yes 120USING_SWIG= yes
135. include "../../lang/perl5/buildlink3.mk" 121. include "../../lang/perl5/buildlink3.mk"
136PLIST.perl= yes 122PLIST.perl= yes
137USE_TOOLS+= perl 123USE_TOOLS+= perl
138CONFIGURE_ARGS+= --enable-perl 124CONFIGURE_ARGS+= --enable-perl
139.else 125.else
140CONFIGURE_ARGS+= --disable-perl 126CONFIGURE_ARGS+= --disable-perl
141.endif 127.endif
142 128
143.if !empty(USING_SWIG:Myes) 129.if !empty(USING_SWIG:Myes)
144PLIST.swig= yes 130PLIST.swig= yes
145. include "../../devel/swig/buildlink3.mk" 131# Tool dependency according to documentation
 132TOOL_DEPENDS+= swig>=1.3.29:../../devel/swig
146CONFIGURE_ARGS+= --enable-swig 133CONFIGURE_ARGS+= --enable-swig
147.else 134.else
148CONFIGURE_ARGS+= --disable-swig 135CONFIGURE_ARGS+= --disable-swig
149.endif 136.endif

File Deleted: pkgsrc/graphics/graphviz/patches/Attic/patch-cmd_lefty_os_unix_io.c

File Deleted: pkgsrc/graphics/graphviz/patches/Attic/patch-version.m4

cvs diff -r1.3 -r1.4 pkgsrc/graphics/graphviz/patches/patch-config_config__perl.pl (expand / switch to unified diff)

--- pkgsrc/graphics/graphviz/patches/patch-config_config__perl.pl 2013/09/09 20:35:07 1.3
+++ pkgsrc/graphics/graphviz/patches/patch-config_config__perl.pl 2022/07/22 12:04:46 1.4
@@ -1,15 +1,15 @@ @@ -1,15 +1,15 @@
1$NetBSD: patch-config_config__perl.pl,v 1.3 2013/09/09 20:35:07 wiz Exp $ 1$NetBSD: patch-config_config__perl.pl,v 1.4 2022/07/22 12:04:46 micha Exp $
2 2
3add rpath for pkgsrc 3Add rpath for pkgsrc
4 4
5--- config/config_perl.pl.orig 2013-08-01 17:35:15.000000000 +0000 5--- config/config_perl.pl.orig 2013-08-01 17:35:15.000000000 +0000
6+++ config/config_perl.pl 6+++ config/config_perl.pl
7@@ -4,7 +4,7 @@ if ($ARGV[0] eq "PERL_LIBS") { 7@@ -4,7 +4,7 @@ if ($ARGV[0] eq "PERL_LIBS") {
8 $archlib = $Config{archlib}; 8 $archlib = $Config{archlib};
9 $libperl = $Config{libperl}; 9 $libperl = $Config{libperl};
10 $libperl =~ s/lib([^\.]+).*/$1/; 10 $libperl =~ s/lib([^\.]+).*/$1/;
11- print "-L$archlib/CORE -l$libperl"; 11- print "-L$archlib/CORE -l$libperl";
12+ print "-Wl,-rpath,$archlib/CORE -L$archlib/CORE -l$libperl"; 12+ print "-Wl,-rpath,$archlib/CORE -L$archlib/CORE -l$libperl";
13 } 13 }
14 if ($ARGV[0] eq "PERL_INCLUDES") { 14 if ($ARGV[0] eq "PERL_INCLUDES") {
15 $archlib = $Config{archlib}; 15 $archlib = $Config{archlib};

cvs diff -r1.6 -r1.7 pkgsrc/graphics/graphviz/patches/patch-configure.ac (expand / switch to unified diff)

--- pkgsrc/graphics/graphviz/patches/patch-configure.ac 2021/10/21 19:44:31 1.6
+++ pkgsrc/graphics/graphviz/patches/patch-configure.ac 2022/07/22 12:04:46 1.7
@@ -1,111 +1,102 @@ @@ -1,111 +1,102 @@
1$NetBSD: patch-configure.ac,v 1.6 2021/10/21 19:44:31 schmonz Exp $ 1$NetBSD: patch-configure.ac,v 1.7 2022/07/22 12:04:46 micha Exp $
2 2
31. chunk: fix 31. chunk: fix
4./configure.lineno: 1: Syntax error: Bad substitution 4./configure.lineno: 1: Syntax error: Bad substitution
5http://www.graphviz.org/mantisbt/view.php?id=2362 5http://www.graphviz.org/mantisbt/view.php?id=2362
 6https://gitlab.com/graphviz/graphviz/-/issues/370
62. chunk: use the same path for all platforms in pkgsrc 72. chunk: use the same path for all platforms in pkgsrc
7other chunks: use lua/php/... from pkgsrc 8other chunks: use lua/php/... from pkgsrc
8last chunk: fix 9last chunk: fix
9./configure.lineno: 27203: Syntax error: ")" unexpected (expecting "fi") 10./configure.lineno: 27203: Syntax error: ")" unexpected (expecting "fi")
10http://www.graphviz.org/mantisbt/view.php?id=2362 11http://www.graphviz.org/mantisbt/view.php?id=2362
 12https://gitlab.com/graphviz/graphviz/-/issues/370
11last last chunk: fix sed expression not to use + which is not in BRE (guile) 13last last chunk: fix sed expression not to use + which is not in BRE (guile)
12 14
13--- configure.ac.orig 2021-10-16 16:39:12.000000000 +0000 15--- configure.ac.orig 2022-07-07 15:43:58.000000000 +0000
14+++ configure.ac 16+++ configure.ac
15@@ -106,8 +106,15 @@ case "${host_os}" in 17@@ -101,8 +101,15 @@ case "${host_os}" in
16 # For the build number: months since Jan 2000, day of month from the timestamp 18 # For the build number: months since Jan 2000, day of month from the timestamp
17 # For the revision number: hour, minute from the timestamp 19 # For the revision number: hour, minute from the timestamp
18 if test $GRAPHVIZ_VERSION_MICRO != "0"; then 20 if test $GRAPHVIZ_VERSION_MICRO != "0"; then
19- GRAPHVIZ_VERSION_BUILD=`expr \( ${GRAPHVIZ_VERSION_MICRO:0:4} - 2000 \) \* 12 + ${GRAPHVIZ_VERSION_MICRO:4:2}`${GRAPHVIZ_VERSION_MICRO:6:2} 21- GRAPHVIZ_VERSION_BUILD=`expr \( ${GRAPHVIZ_VERSION_MICRO:0:4} - 2000 \) \* 12 + ${GRAPHVIZ_VERSION_MICRO:4:2}`${GRAPHVIZ_VERSION_MICRO:6:2}
20- GRAPHVIZ_VERSION_REVISION=${GRAPHVIZ_VERSION_MICRO:9:4} 22- GRAPHVIZ_VERSION_REVISION=${GRAPHVIZ_VERSION_MICRO:9:4}
21+ # JR: patch from Michael van Elst: 23+ # JR: patch from Michael van Elst:
22+ # if we have a shellm we should have a working awk, too 24+ # if we have a shellm we should have a working awk, too
23+ eval `echo "$GRAPHVIZ_VERSION_MICRO" | awk '{ 25+ eval `echo "$GRAPHVIZ_VERSION_MICRO" | awk '{
24+ print "GRAPHVIZ_VERSION_BUILD=" \ 26+ print "GRAPHVIZ_VERSION_BUILD=" \
25+ (substr($1,1,4)-2000)*12+substr($1,5,2) \ 27+ (substr($1,1,4)-2000)*12+substr($1,5,2) \
26+ substr($1,7,2) 28+ substr($1,7,2)
27+ print "GRAPHVIZ_VERSION_REVISION=" \ 29+ print "GRAPHVIZ_VERSION_REVISION=" \
28+ substr($1,10,4) 30+ substr($1,10,4)
29+ }'` 31+ }'`
30 fi 32 fi
31 ;; 33 ;;
32 esac 34 esac
33@@ -123,8 +130,7 @@ if test -z "$LIBPOSTFIX"; then 35@@ -118,8 +125,7 @@ if test -z "$LIBPOSTFIX"; then
34 case "${host_os}" in 36 case "${host_os}" in
35 *linux* ) 37 *linux* )
36 case "${host_cpu}" in 38 case "${host_cpu}" in
37- aarch64 | powerpc64 | powerpc64le | s390x | x86_64 | sparc64 | mips64* | riscv64 | e2k ) 39- aarch64 | powerpc64 | powerpc64le | s390x | x86_64 | sparc64 | mips64* | riscv64 | e2k )
38- LIBPOSTFIX="64" 40- LIBPOSTFIX="64"
39+ aarch64* | powerpc64 | powerpc64le | s390x | x86_64 | sparc64 | mips64* | riscv64 | e2k ) 41+ aarch64* | powerpc64 | powerpc64le | s390x | x86_64 | sparc64 | mips64* | riscv64 | e2k )
40 INTGOSIZE=64 42 INTGOSIZE=64
41 ;; 43 ;;
42 esac 44 esac
43@@ -132,7 +138,6 @@ if test -z "$LIBPOSTFIX"; then 45@@ -127,7 +133,6 @@ if test -z "$LIBPOSTFIX"; then
44 *solaris* ) 46 *solaris* )
45 case "${host_cpu}" in 47 case "${host_cpu}" in
46 x86_64 | sparc64 ) 48 x86_64 | sparc64 )
47- LIBPOSTFIX="/64" 49- LIBPOSTFIX="/64"
48 INTGOSIZE=64 50 INTGOSIZE=64
49 ;; 51 ;;
50 esac 52 esac
51@@ -684,7 +689,7 @@ else 53@@ -694,7 +699,7 @@ else
52 if test "x$GUILE_CONFIG" = "x"; then 54 if test "x$GUILE_CONFIG" = "x"; then
53 use_guile="No (guile not available)" 55 use_guile="No (guile not available)"
54 else 56 else
55- [GUILE_VERSION=`$GUILE_CONFIG --version 2>&1 | sed -n '1 s/^.* \+\([0-9\.]\+\)$/\1/ p'`] 57- [GUILE_VERSION=`$GUILE_CONFIG --version 2>&1 | sed -n '1 s/^.* \+\([0-9\.]\+\)$/\1/ p'`]
56+ [GUILE_VERSION=`$GUILE_CONFIG --version 2>&1 | sed -n '1 s/^.* \([0-9\.]*\)$/\1/ p'`] 58+ [GUILE_VERSION=`$GUILE_CONFIG --version 2>&1 | sed -n '1 s/^.* \([0-9\.]*\)$/\1/ p'`]
57 GUILE_VERSION_MAJOR=`echo $GUILE_VERSION | cut -d '.' -f 1` 59 GUILE_VERSION_MAJOR=`echo $GUILE_VERSION | cut -d '.' -f 1`
58 GUILE_VERSION_MINOR=`echo $GUILE_VERSION | cut -d '.' -f 2` 60 GUILE_VERSION_MINOR=`echo $GUILE_VERSION | cut -d '.' -f 2`
59 AC_CHECK_PROGS(GUILE,guile$GUILE_VERSION_MAJOR.$GUILE_VERSION_MINOR guile$GUILE_VERSION_MAJOR guile) 61 AC_CHECK_PROGS(GUILE,guile$GUILE_VERSION_MAJOR.$GUILE_VERSION_MINOR guile$GUILE_VERSION_MAJOR guile)
60@@ -908,7 +913,7 @@ else 62@@ -918,7 +923,7 @@ else
61 LUA_VERSION=`$PKG_CONFIG --modversion lua$l` 63 LUA_VERSION=`$PKG_CONFIG --modversion lua$l`
62 LUA_INCLUDES="$LUA_CFLAGS "`$PKG_CONFIG --cflags lua$l` 64 LUA_INCLUDES="$LUA_CFLAGS "`$PKG_CONFIG --cflags lua$l`
63 LUA_LIBS="$LUA_LFLAGS "`$PKG_CONFIG --libs lua$l` 65 LUA_LIBS="$LUA_LFLAGS "`$PKG_CONFIG --libs lua$l`
64- LUA_INSTALL_DIR="/usr/lib$LIBPOSTFIX/lua/`$PKG_CONFIG --variable=V lua`" 66- LUA_INSTALL_DIR="/usr/lib$LIBPOSTFIX/lua/`$PKG_CONFIG --variable=V lua`"
65+ LUA_INSTALL_DIR="${PREFIX}/lib$LIBPOSTFIX/lua/`$PKG_CONFIG --variable=V lua`" 67+ LUA_INSTALL_DIR="${PREFIX}/lib$LIBPOSTFIX/lua/`$PKG_CONFIG --variable=V lua`"
66  68
67 pkgconfig_lualib_found=`$PKG_CONFIG --exists lualib$l 2>/dev/null` 69 pkgconfig_lualib_found=`$PKG_CONFIG --exists lualib$l 2>/dev/null`
68 if test "x$?" = "x0"; then 70 if test "x$?" = "x0"; then
69@@ -930,7 +935,7 @@ else 71@@ -940,7 +945,7 @@ else
70 LUA_INCLUDES=`$LUACONFIG --include` 72 LUA_INCLUDES=`$LUACONFIG --include`
71 LUA_LIBS=`$LUACONFIG --libs` 73 LUA_LIBS=`$LUACONFIG --libs`
72 LUA_VERSION="5.0.x" 74 LUA_VERSION="5.0.x"
73- LUA_INSTALL_DIR="/usr/lib$LIBPOSTFIX/lua/5.0" 75- LUA_INSTALL_DIR="/usr/lib$LIBPOSTFIX/lua/5.0"
74+ LUA_INSTALL_DIR="${PREFIX}/lib$LIBPOSTFIX/lua/5.0" 76+ LUA_INSTALL_DIR="${PREFIX}/lib$LIBPOSTFIX/lua/5.0"
75 fi 77 fi
76 fi 78 fi
77  79
78@@ -1020,8 +1025,8 @@ else 80@@ -1137,7 +1142,7 @@ else
79 use_ocaml="No (ocaml not available)" 
80 else 
81 AC_CHECK_PROG(OCAML_OPT,ocamlopt,ocamlopt) 
82- OCAML_INCLUDES=-I/usr/lib$LIBPOSTFIX/ocaml 
83- OCAML_LIBS=-L/usr/lib$LIBPOSTFIX/ocaml 
84+ OCAML_INCLUDES=-I${PREFIX}/lib$LIBPOSTFIX/ocaml 
85+ OCAML_LIBS=-L${PREFIX}/lib$LIBPOSTFIX/ocaml 
86 save_CPPFLAGS=$CPPFLAGS 
87 CPPFLAGS="$CPPFLAGS $OCAML_INCLUDES" 
88 AC_CHECK_HEADER(caml/mlvalues.h,[ 
89@@ -1124,7 +1129,7 @@ else 
90 else 81 else
91 PHP_INCLUDES="`$PHPCONFIG --includes`" 82 PHP_INCLUDES="`$PHPCONFIG --includes`"
92 PHP_INSTALL_DIR="`$PHPCONFIG --extension-dir`" 83 PHP_INSTALL_DIR="`$PHPCONFIG --extension-dir`"
93- PHP_INSTALL_DATADIR="/usr/share/php" 84- PHP_INSTALL_DATADIR="/usr/share/php"
94+ PHP_INSTALL_DATADIR="${PREFIX}/share/php" 85+ PHP_INSTALL_DATADIR="${PREFIX}/share/php"
95 PHP_LIBS="`$PHPCONFIG --ldflags` `$PHPCONFIG --libs`" 86 PHP_LIBS="`$PHPCONFIG --ldflags` `$PHPCONFIG --libs`"
96 save_CPPFLAGS=$CPPFLAGS 87 save_CPPFLAGS=$CPPFLAGS
97 CPPFLAGS="$CPPFLAGS $PHP_INCLUDES" 88 CPPFLAGS="$CPPFLAGS $PHP_INCLUDES"
98@@ -2191,45 +2196,6 @@ else 89@@ -2130,45 +2135,6 @@ else
99 fi 90 fi
100 AM_CONDITIONAL(WITH_QUARTZ, [test "x$use_quartz" = "xYes"]) 91 AM_CONDITIONAL(WITH_QUARTZ, [test "x$use_quartz" = "xYes"])
101  92
102-dnl ----------------------------------- 93-dnl -----------------------------------
103-dnl INCLUDES and LIBS for PLATFORMSDK 94-dnl INCLUDES and LIBS for PLATFORMSDK
104- 95-
105-AC_ARG_WITH(platformsdkincludedir, 96-AC_ARG_WITH(platformsdkincludedir,
106- [AS_HELP_STRING([--with-platformsdkincludedir=DIR],[use Platform SDK (Windows) includes from DIR])], 97- [AS_HELP_STRING([--with-platformsdkincludedir=DIR],[use Platform SDK (Windows) includes from DIR])],
107- [PLATFORMSDKINCLUDE=$withval; PLATFORMSDKINCLUDE_ESCAPED=${PLATFORMSDKINCLUDE//'\\'/\\\\}; PLATFORMSDKINCLUDE_ESCAPED=${PLATFORMSDKINCLUDE_ESCAPED// /\\ }]) 98- [PLATFORMSDKINCLUDE=$withval; PLATFORMSDKINCLUDE_ESCAPED=${PLATFORMSDKINCLUDE//'\\'/\\\\}; PLATFORMSDKINCLUDE_ESCAPED=${PLATFORMSDKINCLUDE_ESCAPED// /\\ }])
108- 99-
109-AC_ARG_WITH(platformsdklibdir, 100-AC_ARG_WITH(platformsdklibdir,
110- [AS_HELP_STRING([--with-platformsdklibdir=DIR],[use Platform SDK (Windows) libraries from DIR])], 101- [AS_HELP_STRING([--with-platformsdklibdir=DIR],[use Platform SDK (Windows) libraries from DIR])],
111- [PLATFORMSDKLIB=$withval]) 102- [PLATFORMSDKLIB=$withval])

cvs diff -r1.1 -r1.2 pkgsrc/graphics/graphviz/patches/patch-lib_gvc_Makefile.am (expand / switch to unified diff)

--- pkgsrc/graphics/graphviz/patches/patch-lib_gvc_Makefile.am 2021/10/21 19:44:31 1.1
+++ pkgsrc/graphics/graphviz/patches/patch-lib_gvc_Makefile.am 2022/07/22 12:04:46 1.2
@@ -1,15 +1,15 @@ @@ -1,15 +1,15 @@
1$NetBSD: patch-lib_gvc_Makefile.am,v 1.1 2021/10/21 19:44:31 schmonz Exp $ 1$NetBSD: patch-lib_gvc_Makefile.am,v 1.2 2022/07/22 12:04:46 micha Exp $
2 2
3Link with pthread library, if needed. 3Link with pthread library, if needed.
4 4
5--- lib/gvc/Makefile.am.orig 2021-10-16 16:39:12.000000000 +0000 5--- lib/gvc/Makefile.am.orig 2022-07-07 15:43:58.000000000 +0000
6+++ lib/gvc/Makefile.am 6+++ lib/gvc/Makefile.am
7@@ -71,7 +71,7 @@ libgvc_la_LIBADD = $(libgvc_C_la_LIBADD) 7@@ -55,7 +55,7 @@ libgvc_la_LIBADD = $(libgvc_C_la_LIBADD)
8 $(top_builddir)/lib/cdt/libcdt.la \ 8 $(top_builddir)/lib/cdt/libcdt.la \
9 $(top_builddir)/lib/cgraph/libcgraph.la \ 9 $(top_builddir)/lib/cgraph/libcgraph.la \
10 $(top_builddir)/lib/pathplan/libpathplan.la \ 10 $(top_builddir)/lib/pathplan/libpathplan.la \
11- $(EXPAT_LIBS) $(Z_LIBS) $(MATH_LIBS) 11- $(EXPAT_LIBS) $(Z_LIBS) $(MATH_LIBS)
12+ $(EXPAT_LIBS) $(Z_LIBS) $(MATH_LIBS) ${PTHREAD_LDFLAGS} ${PTHREAD_LIBS} 12+ $(EXPAT_LIBS) $(Z_LIBS) $(MATH_LIBS) ${PTHREAD_LDFLAGS} ${PTHREAD_LIBS}
13 libgvc_la_DEPENDENCIES = $(libgvc_C_la_DEPENDENCIES) 13 libgvc_la_DEPENDENCIES = $(libgvc_C_la_DEPENDENCIES)
14  14
15 if WITH_WIN32 15 .3.3.pdf:

cvs diff -r1.1 -r1.2 pkgsrc/graphics/graphviz/patches/Attic/patch-tclpkg_gv_Makefile.am (expand / switch to unified diff)

--- pkgsrc/graphics/graphviz/patches/Attic/patch-tclpkg_gv_Makefile.am 2021/10/21 19:44:31 1.1
+++ pkgsrc/graphics/graphviz/patches/Attic/patch-tclpkg_gv_Makefile.am 2022/07/22 12:04:46 1.2
@@ -1,17 +1,20 @@ @@ -1,17 +1,20 @@
1$NetBSD: patch-tclpkg_gv_Makefile.am,v 1.1 2021/10/21 19:44:31 schmonz Exp $ 1$NetBSD: patch-tclpkg_gv_Makefile.am,v 1.2 2022/07/22 12:04:46 micha Exp $
2 2
3Add missing -I flags to point to perl files. 3Add missing -I flags to point to perl files.
4 4
5See https://gitlab.com/graphviz/graphviz/issues/1576. 5See https://gitlab.com/graphviz/graphviz/issues/1576.
 6Issue was closed, but patch is still missing. Regression?
 7
 8https://gitlab.com/graphviz/graphviz/-/merge_requests/2758
6 9
7--- tclpkg/gv/Makefile.am.orig 2021-10-16 16:39:12.000000000 +0000 10--- tclpkg/gv/Makefile.am.orig 2021-10-16 16:39:12.000000000 +0000
8+++ tclpkg/gv/Makefile.am 11+++ tclpkg/gv/Makefile.am
9@@ -184,7 +184,7 @@ nodist_libgv_perl_la_SOURCES = gv_perl.c 12@@ -180,7 +180,7 @@ nodist_libgv_perl_la_SOURCES = gv_perl.c
10 libgv_perl_la_SOURCES = $(BASESOURCES) gv_dummy_init.c 13 libgv_perl_la_SOURCES = $(BASESOURCES) gv_dummy_init.c
11 libgv_perl_la_LIBADD = $(BASELIBS) $(PERL_LIBS) 14 libgv_perl_la_LIBADD = $(BASELIBS) $(PERL_LIBS)
12 libgv_perl_la_LDFLAGS = -module -avoid-version $(PERL_LD) 15 libgv_perl_la_LDFLAGS = -module -avoid-version $(PERL_LD)
13-libgv_perl_la_CPPFLAGS = $(BASECPPFLAGS) $(PERL_CC) 16-libgv_perl_la_CPPFLAGS = $(BASECPPFLAGS) $(PERL_CC)
14+libgv_perl_la_CPPFLAGS = $(BASECPPFLAGS) $(PERL_INCLUDES) $(PERL_CC) 17+libgv_perl_la_CPPFLAGS = $(BASECPPFLAGS) $(PERL_INCLUDES) $(PERL_CC)
15 $(PERL_data): gv_perl.cpp 18 $(PERL_data): gv_perl.cpp
16 gv_perl.cpp: gv.i 19 gv_perl.cpp: gv.i
17 $(SWIG) -c++ $(SWIG_PERL_OPT) -o $@ $(srcdir)/gv.i 20 $(SWIG) -c++ $(SWIG_PERL_OPT) -o $@ $(srcdir)/gv.i

cvs diff -r1.2 -r1.3 pkgsrc/graphics/graphviz/patches/patch-plugin_gs_gvloadimage__gs.c (expand / switch to unified diff)

--- pkgsrc/graphics/graphviz/patches/patch-plugin_gs_gvloadimage__gs.c 2021/10/21 19:44:31 1.2
+++ pkgsrc/graphics/graphviz/patches/patch-plugin_gs_gvloadimage__gs.c 2022/07/22 12:04:46 1.3
@@ -1,33 +1,33 @@ @@ -1,33 +1,33 @@
1$NetBSD: patch-plugin_gs_gvloadimage__gs.c,v 1.2 2021/10/21 19:44:31 schmonz Exp $ 1$NetBSD: patch-plugin_gs_gvloadimage__gs.c,v 1.3 2022/07/22 12:04:46 micha Exp $
2 2
3ghostscript-agpl enforces using gserrors.h which is not included 3ghostscript-agpl enforces using gserrors.h which is not included
4by default in ghostscript-gpl, so conditionalise based upon which 4by default in ghostscript-gpl, so conditionalise based upon which
5one is being used. 5one is being used.
6 6
7--- plugin/gs/gvloadimage_gs.c.orig 2021-10-16 16:39:12.000000000 +0000 7--- plugin/gs/gvloadimage_gs.c.orig 2021-10-16 16:39:12.000000000 +0000
8+++ plugin/gs/gvloadimage_gs.c 8+++ plugin/gs/gvloadimage_gs.c
9@@ -74,6 +74,16 @@ static void gs_error(GVJ_t * job, const  9@@ -77,6 +77,16 @@ static void gs_error(GVJ_t * job, const
10  10
11 assert (err < 0); 11 assert (err < 0);
12  12
13+#ifdef gserrors_INCLUDED /* ghostscript-agpl uses gserrors.h */ 13+#ifdef gserrors_INCLUDED /* ghostscript-agpl uses gserrors.h */
14+ if (err >= gs_error_VMerror)  14+ if (err >= gs_error_VMerror)
15+ errsrc = "PostScript Level 1";  15+ errsrc = "PostScript Level 1";
16+ else if (err >= gs_error_unregistered) 16+ else if (err >= gs_error_unregistered)
17+ errsrc = "PostScript Level 2"; 17+ errsrc = "PostScript Level 2";
18+ else if (err >= gs_error_invalidid) 18+ else if (err >= gs_error_invalidid)
19+ errsrc = "DPS error"; 19+ errsrc = "DPS error";
20+ else 20+ else
21+ errsrc = "Ghostscript internal error"; 21+ errsrc = "Ghostscript internal error";
22+#else 22+#else
23 if (err >= e_VMerror)  23 if (err >= e_VMerror)
24 errsrc = "PostScript Level 1";  24 errsrc = "PostScript Level 1";
25 else if (err >= e_unregistered) 25 else if (err >= e_unregistered)
26@@ -82,6 +92,7 @@ static void gs_error(GVJ_t * job, const  26@@ -85,6 +95,7 @@ static void gs_error(GVJ_t * job, const
27 errsrc = "DPS error"; 27 errsrc = "DPS error";
28 else 28 else
29 errsrc = "Ghostscript internal error"; 29 errsrc = "Ghostscript internal error";
30+#endif 30+#endif
31  31
32 job->common->errorfn("%s: %s() returned: %d \"%s\" (%s)\n", 32 job->common->errorfn("%s: %s() returned: %d \"%s\" (%s)\n",
33 name, funstr, err, gs_error_names[-err - 1], errsrc); 33 name, funstr, err, gs_error_names[-err - 1], errsrc);

cvs diff -r1.2 -r1.3 pkgsrc/graphics/graphviz/patches/patch-plugin_xlib_gvdevice__xlib.c (expand / switch to unified diff)

--- pkgsrc/graphics/graphviz/patches/patch-plugin_xlib_gvdevice__xlib.c 2020/07/27 20:44:15 1.2
+++ pkgsrc/graphics/graphviz/patches/patch-plugin_xlib_gvdevice__xlib.c 2022/07/22 12:04:46 1.3
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1$NetBSD: patch-plugin_xlib_gvdevice__xlib.c,v 1.2 2020/07/27 20:44:15 adam Exp $ 1$NetBSD: patch-plugin_xlib_gvdevice__xlib.c,v 1.3 2022/07/22 12:04:46 micha Exp $
2 2
3SunOS inotify requires sys/filio.h for FIONREAD. 3SunOS inotify requires sys/filio.h for FIONREAD.
4 4
5--- plugin/xlib/gvdevice_xlib.c.orig 2020-04-08 07:51:58.000000000 +0000 5--- plugin/xlib/gvdevice_xlib.c.orig 2020-04-08 07:51:58.000000000 +0000
6+++ plugin/xlib/gvdevice_xlib.c 6+++ plugin/xlib/gvdevice_xlib.c
7@@ -32,6 +32,9 @@ 7@@ -32,6 +32,9 @@
8 #endif 8 #endif
9 #ifdef HAVE_SYS_INOTIFY_H 9 #ifdef HAVE_SYS_INOTIFY_H
10 #include <sys/inotify.h> 10 #include <sys/inotify.h>
11+#ifdef __sun 11+#ifdef __sun
12+#include <sys/filio.h> 12+#include <sys/filio.h>
13+#endif 13+#endif
14 #endif 14 #endif