Mon Apr 15 10:25:57 2024 UTC (42d)
graphics/graphviz: Update to 10.0.1

Remove pkgsrc patches for LUA location.
Add pkgsrc patch for nonportable shell syntax in configure script.
Remove pkgsrc option "gtk".

## [10.0.1] - 2024-02-11

### Added

- Releases now include packages for [Rocky Linux](https://rockylinux.org/) 8
  and 9.
- A new output format, `-Tsvg_inline`, has been added to generate a header-less
  SVG suitable for inlining into HTML. #2285
- The functionality of the `acyclic`, `tred` and `unflatten` command line tools
  are now exposed via the `graphviz_acyclic`, `graphviz_tred` and
  `graphviz_unflatten` API functions in libcgraph. #2194
- `graphviz_node_induce` is available as a new API function in cgraph.h.
- `tred` gained a `-o` command line option to redirect its output to a file.

### Changed

- The Criterion unit tests have been removed and migrated to Pytest. This is
  primarily relevant to downstream packagers of Graphviz. #2443
- **Breaking**: `Dtdisc_t.memoryf` and its associated macros has been removed.
- **Breaking**: The `Dt_t.type` field has been removed.
- **Breaking**: The `dtfound`, `DT_FOUND`, `dtleast`, and `dtmost` macros have
  been removed.
- The nrtmain.c test program has been removed from the portable tarball.
- The TCL Graphviz packages for inter-release versions/snapshots report
  themselves as `<next release>b<internal number>` instead of
  `<next release>~dev.<internal number>`. This fixes a problem wherein TCL would
  see `~dev` as being invalid characters to appear in a version. #2370
- Support for discovering Lua via `lua-config*` has been removed from the
  Autotools build system.
- Lua discovery in the Autotools build system should now respect the location of
  your Lua installation and not unconditionally attempt installation into
  `/usr`. #2152
- The GTK plugin is no longer built or distributed. This plugin relies on GTK 2
  and X11. If you use this plugin, please contact the maintainers to let
  them know it is worthwhile re-enabling this and forward porting it to GTK 3/4
  and Wayland. #1848
- In the Autotools build system, `LIBPOSTFIX=` can now be used to suppress `64`
  being appended to the library installation path.
- The `-m` command line option, whose functionality was disabled in Graphviz
  3.0.0, has been removed.
- Man page typography has been slightly improved.
- macOS release artifacts no longer include `vimdot`. This may be restored in
  future. #2423
- macOS release artifacts no longer include `smyrna`. This may be restored in
  future. #2422
- The PDF output format, `-Tpdf`, respects the environment variable
  `$SOURCE_DATE_EPOCH` for overriding `CreationDate` when built against Cairo
  >= 1.16.0. #2473
- The legacy C# viewer app is no longer distributed in the portable source
  tarball.
- Graphviz headers no longer define the `FALSE` and `TRUE` constants.
- The Autotools build system no longer supports Darwin 9 (Mac OSX Leopard).
- **Breaking**: `Agraph_t.link` has been split into `Agraph_t.id_link` and
  `Agraph_t.seq_link`. `Agraph_t.g_dict` has been split into `Agraph_t.g_id`
  and `Agraph_t.g_seq`.
- **Breaking**: `gvpropts.n_outgraphs` is now a `size_t`.
- The OCaml bindings have been removed. If you use these bindings, please contact
  the maintainers to notify them of the existence of users.
- **Breaking**: `polygon_t.sides` and `polygon_t.peripheries` are now `size_t`s.
- **Breaking**: liblab_gamut is no longer included in a Graphviz installation.
  This library had no accompanying header, so using it was not easy. If you are
  using this library, please contact the maintainers to notify them of the
  existence of users. #2489
- **Breaking**: `bezier.size` and `splines.size` are now `size_t`s.
- **Breaking**: the gv.i and gv.cpp SWIG inputs are no longer included in a
  Graphviz installation. #2491
- **Breaking**: the `gvrender_engine_t.beziercurve`,
  `gvrender_engine_t.library_shape`, `gvrender_engine_t.polygon`,  and
  `gvrender_engine_t.polyline` callbacks now take the number of points, `n`, as
  a `size_t`.
- **Breaking**: the `AVG` macro has been removed.
- **Breaking**: the `inside_t.s` union member gained members `lastn`, `radius`,
  `last_poly`, `last`, `outp`, `scalex`, `scaley`, `box_URx`, and `box_URy`.
  Zero initialize these when you construct instances of this type. #2498

### Fixed

- The paper size for Doxygen docs generation in the Autotools build system has
  been corrected to `a4`.
- References to `eventf` and `hashf` data structures in the libcdt man page
  have been removed. These data structures were removed in Graphviz 9.0.0.
- References to `DTOFFSET` in the libcdt man page have been removed. This macro
  was removed in Graphviz 2.40.0.
- A number of further updates to the libcdt man page have been made to reflect
  other changes that happened in Graphviz 9.0.0.
- Use of the non-portable `PATH_MAX` constant has been removed. This was a
  regression in Graphviz 7.0.1. In addition to fixing the regression, code has
  been adjusted to remove assumptions on the maximum path length and treat it as
  unbounded. #2452
- Compilation on NetBSD has been repaired. This was a regression in Graphviz
  9.0.0.
- Compilation on SunOS has been repaired. This appears to have been broken since
  the xlib plugin was added some time prior to Graphviz 2.38.0.
- gvpr programs that attempt to close out of range file descriptors no longer
  cause out of bounds memory accesses.
- When large edge weights are used that cause an integer overflow when summing
  them up, Graphviz now gracefully exits with an error message instead of
  crashing. #2450
- Support for the `%n` specifier in `scanf` in gvpr has been restored. This was
  a regression in Graphviz 9.0.0. #2454
- In the Autotools build system, `make dist` now processes cmd/gvedit correctly
  when Qt is not installed. Generating Qt "mocables" is postponed from configure
  time to build time. #2463
- The Autotools build system correctly detects Ruby headers, even when
  pkg-config support is unavailable. #2464
- Escaped characters in xdot fields no longer lead to the containing text being
  truncated. #2460
- When building against a libgd that is configured with `!gif && (jpeg || png)`,
  the GD plugin is once again compilable. This was a regression in Graphviz
  2.46.0.
- edgepaint spline intersection code would previously incorrectly use the second
  spline in one instance where it should have used the first. #1464
- In the Autotools build, libexpat discovery on macOS has been improved. #2477
- A bug that caused compound edges to sometimes be drawn in the wrong direction
  has been corrected. This was a regression in Graphviz 8.0.3. #2478
- When operating on multiple graphs, `unflatten` no longer retains chain node
  and size internal state across graphs.
- Repeated runs of a graph with subgraphs now produce a stable subgraph
  ordering. #2242
- The `dot` and `gml2gv` tools are now built with case-insensitive parsing
  by the CMake and MSBuild systems, as they always were by autotools, and
  in accordance with the graphviz specification. #2481
- Putting nodes in a subgraph no longer causes their layout order to be
  reversed. #1585
- Edges are no longer lost when using subgraphs and record shapes in
  combination. #1624
- A malformed config6 file that leads to plugin search failing no longer causes
  out-of-bounds memory reads. This now causes an error message and graceful
  failure. #2441
- Discovery of `php` in the Autotools build system has been improved.
- Text in the PIC output format is no longer forced to font size 1. This was a
  regression in Graphviz 8.0.2. Even with this fix, the PIC output format is
  limited in its utility. #2487
- When encountering a syntactically invalid HTML-like label, Graphviz.app no
  longer aborts. The abort was an intentional change in Graphviz 8.0.1 to avoid
  invalid memory reads in `dot`, but had the undesirable side effect of the
  graphical Graphviz.app exiting with no obvious cause. #2488
- Use of an uninitialized variable in `poly_inside` has been corrected. #2498
- Input containing UTF-8 data that is destined to appear as-is in the output
  (e.g. UTF-8 characters in a label when using the `-Tdot` output format) is
  once again processed correctly. On platforms with a signed `char` this could
  previously crash. This was a regression in Graphviz 2.49.0. #2502

## 9.0.0 - 2023-09-11

### Added

- On non-Windows platforms, new -Tkitty and -Tkittyz output formats are
  available that render to the Kitty terminal emulator窶冱 graphvics
  protocol.
- HTML/CSS-style 3 letter hex colors are supported. Each R/G/B letter
  is duplicated to form a 6 letter hex color. E.g. #09c is equivalent
  to #0099cc. #2377

### Changed

- Breaking: The definition of adjmatrix_t is no longer exposed in public
  headers.
- Breaking: The upper limit for minimum edge length
  (Agedgeinfo_t.minlen) has been expanded from USHRT_MAX to INT_MAX.
  #2413
- Breaking: The libcdt macros DTTREEMATCH, DTTREESEARCH, dtvnext,
  dtvcount, dtvhere, and dtcharhash have been removed.
- Breaking: The libcgraph macros AGHEADPOINTER, AGRIGHTPOINTER,
  AGLEFTPOINTER, FIRSTNREF, NEXTNREF, PREVNREF, LASTNREF, NODEOF,
  FIRSTOUTREF, LASTOUTREF, FIRSTINREF, NEXTEREF, and PREVEREF have been
  removed.
- Breaking: The libcgraph types Agnoderef_t and Agedgeref_t have been
  removed.
- Breaking: The libcgraph function agflatten has been removed.
- Breaking: The Agdesc_s.flatlock field has been removed.
- Breaking: The str parameter from gvPluginList has been removed.
- Breaking: The definition of the elist_append and alloc_elist macros
  have been changed to use newer allocation functions. Users were/are
  not expected to call these macros.
- The functions ageqedge, agtail, aghead, agopp, agmkout, and agmkin
  have been reintroduced. These were previously removed in Graphviz
  3.0.0. #2433
- Breaking: The first parameter dt to the makef and freef callbacks
  defined in cdt.h has been removed.
- Gvedit now identifies itself with organization name 窶廨raphviz窶� and
  application name 窶徃vedit窶� when reading and writing Qt-based settings.
  It would previously use organization name 窶弋rolltech窶� and application
  name 窶廴DI Example窶�. If you have existing settings under the old
  identification, Gvedit will attempt to migrate them to the new
  identification the first time it reads then writes settings. #2383
- Breaking: gvprintf is now tagged with
  __attribute__((format(printf, 窶ヲ))) when compiling with Clang or GCC.
  This enables the compiler to spot more misuses of this function. #2373
- Breaking: The hashf and eventf members of Dtdisc_t have been removed.
  Correspondingly, the hshf and evf parameters to the DTDISC macro have
  been removed. Also the _DTHSH macro has been removed.
- Breaking: The Dtdata_t.minp field has been removed.
- The print functionality of the macOS Graphviz app scales the graph to
  fit the output page size.
- Breaking: The libcdt containers Dtbag, Dthash, Dtlist, Dtorder,
  Dtdeque, and Dtstack have been removed.
- Breaking: The libcdt dtappend and dtattach macros have been removed.
- Support for Lua 5.0 has been removed. Building the Graphviz Lua
  bindings now requires Lua 竕・ 5.1.
- Breaking: The Dt_t* parameter to the callback for dtwalk has been
  removed.
- Breaking: The POINTS_PER_PC macro has been removed.
- Breaking: The INITIAL_XDOT_CAPACITY macro has been removed.
- Breaking: The type parameter to dtdisc has been removed.
- Breaking: The h parameter to dtstrhash has been removed.
- In addition to Guile 2.0 and Guile 2.2, Guile 3.0 is now supported by
  the Graphviz Guile bindings.
- Breaking: The concept of 窶徇emory allocator discipline窶� has been
  removed, along with the type Agmemdisc_t and fields Agdisc_t.mem and
  Agdstate_t.mem.
- Breaking: The agcallbacks function and Agclos_t.callbacks_enabled have
  been removed.
- Breaking: pack_info.doSplines is now a C99 bool. Correspondingly, the
  doSplines parameter to shiftGraphs is now a C99 bool.

### Fixed

- Processing large graphs that induce ranks containing more than 46340
  (floor(竏唔NT_MAX)) nodes no longer results in an integer overflow
  during crossing matrix allocation. Ranks of up to floor(竏售IZE_MAX)
  nodes are now supported.
- Double arrow head types like invdot and onormalonormal once again
  display correctly. This was a regression in Graphviz 8.0.1. #2406
- The lvee and rvee edge arrow shapes are slighty incorrect for
  penwidths > 1. #2399
- Small gap between lcurve or rcurve arrow shaft and node. #2426
- Failure of arrowhead and arrowtail to respect penwidth #372
- Fixed also for the normal and inv edge arrow shapes when using the l
  or r arrow shape modifiers.
- Slightly improved for the normal and inv edge arrow shapes when not
  using any arrow shape modifier.
- Fixed also for the crow and vee edge arrow shapes and record based
  nodes.
- Various incorrect calls to gvprintf have been corrected. On some
  platforms like x86-64, these problems were benign thanks to
  coincidences in the Application Binary Interface (ABI).
  On other platforms, these problems may have caused stack corruption
  and crashes. #2373
- The font dictionary is now initialized even if a configuration file is
  not found. Previously this situation could lead to a crash when using
  Graphviz programmatically. This problem was present as least as far
  back as Graphviz 2.38.0. #1520
- Breaking: The vt100 output format has been renamed to vt. This fixes
  a problem where it was not discoverable on macOS. #2429
- Escape sequences like \" are recognized in strings and double
  escaping (producing \\") is avoided. #2397
- The Autotools build system no longer uses headers and libraries from
  the --prefix path given on the command line. This previously caused
  cross-compilation to incorrectly pick up host headers and libraries.
  #2442


(micha)
diff -r1.283 -r1.284 pkgsrc/graphics/graphviz/Makefile
diff -r1.60 -r1.61 pkgsrc/graphics/graphviz/PLIST
diff -r1.37 -r1.38 pkgsrc/graphics/graphviz/buildlink3.mk
diff -r1.37 -r1.38 pkgsrc/graphics/graphviz/options.mk
diff -r1.82 -r1.83 pkgsrc/graphics/graphviz/distinfo
diff -r1.12 -r1.13 pkgsrc/graphics/graphviz/patches/patch-configure.ac
diff -r1.3 -r0 pkgsrc/graphics/graphviz/patches/patch-plugin_xlib_gvdevice__xlib.c
Mon Apr 15 19:25:57 2024
Mon Jun 26 19:38:43 2023
pkgsrc/graphics/graphviz/patches/patch-plugin_xlib_gvdevice__xlib.c,v

anoncvs not yet been updated

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

--- pkgsrc/graphics/graphviz/Makefile 2024/04/07 07:34:14 1.283
+++ pkgsrc/graphics/graphviz/Makefile 2024/04/15 10:25:57 1.284
@@ -1,30 +1,32 @@ @@ -1,30 +1,32 @@
1# $NetBSD: Makefile,v 1.283 2024/04/07 07:34:14 wiz Exp $ 1# $NetBSD: Makefile,v 1.284 2024/04/15 10:25:57 micha Exp $
2 2
3DISTNAME= graphviz-8.1.0 3DISTNAME= graphviz-10.0.1
4PKGREVISION= 10 
5CATEGORIES= graphics 4CATEGORIES= graphics
6MASTER_SITES= ${MASTER_SITE_GITLAB:=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.xz 6#EXTRACT_SUFX= .tar.xz
8 7
9MAINTAINER= micha@NetBSD.org 8MAINTAINER= micha@NetBSD.org
10HOMEPAGE= https://www.graphviz.org/ 9HOMEPAGE= https://www.graphviz.org/
11COMMENT= Graph Drawing Programs from AT&T Research and Lucent Bell Labs 10COMMENT= Graph Drawing Programs from AT&T Research and Lucent Bell Labs
12LICENSE= epl-v1.0 11LICENSE= epl-v1.0
13 12
14CHECK_FILES_SKIP+= ${PREFIX}/lib/graphviz/config6 13CHECK_FILES_SKIP+= ${PREFIX}/lib/graphviz/config6
15CHECK_PORTABILITY_SKIP+= windows/* 14CHECK_PORTABILITY_SKIP+= windows/*
16 15
17USE_LANGUAGES= c99 c++11 16USE_LANGUAGES= c c++
 17USE_CC_FEATURES+= c99
 18USE_CXX_FEATURES+= c++11 unique_ptr
 19
18USE_TOOLS+= automake autoreconf makeinfo bison flex gmake groff pkg-config 20USE_TOOLS+= automake autoreconf makeinfo bison flex gmake groff pkg-config
19USE_LIBTOOL= yes 21USE_LIBTOOL= yes
20GNU_CONFIGURE= yes 22GNU_CONFIGURE= yes
21GNU_CONFIGURE_STRICT= no # has sub-configures 23GNU_CONFIGURE_STRICT= no # has sub-configures
22CONFIGURE_ARGS+= --disable-d 24CONFIGURE_ARGS+= --disable-d
23CONFIGURE_ARGS+= --disable-debug 25CONFIGURE_ARGS+= --disable-debug
24CONFIGURE_ARGS+= --disable-go 26CONFIGURE_ARGS+= --disable-go
25CONFIGURE_ARGS+= --disable-guile 27CONFIGURE_ARGS+= --disable-guile
26CONFIGURE_ARGS+= --disable-io 28CONFIGURE_ARGS+= --disable-io
27CONFIGURE_ARGS+= --disable-java 29CONFIGURE_ARGS+= --disable-java
28CONFIGURE_ARGS+= --disable-javascript 30CONFIGURE_ARGS+= --disable-javascript
29CONFIGURE_ARGS+= --disable-man-pdfs 31CONFIGURE_ARGS+= --disable-man-pdfs
30CONFIGURE_ARGS+= --disable-ocaml 32CONFIGURE_ARGS+= --disable-ocaml
@@ -86,27 +88,27 @@ REPLACE_LUA+= tclpkg/gv/demo/modgraph.l @@ -86,27 +88,27 @@ REPLACE_LUA+= tclpkg/gv/demo/modgraph.l
86REPLACE_INTERPRETER+= tclsh 88REPLACE_INTERPRETER+= tclsh
87REPLACE.tclsh.old= .*tclsh 89REPLACE.tclsh.old= .*tclsh
88REPLACE.tclsh.new= ${PREFIX}/bin/tclsh 90REPLACE.tclsh.new= ${PREFIX}/bin/tclsh
89REPLACE_FILES.tclsh= tclpkg/gv/demo/modgraph.tcl 91REPLACE_FILES.tclsh= tclpkg/gv/demo/modgraph.tcl
90 92
91REPLACE_PERL+= tclpkg/gv/demo/modgraph.pl contrib/dotmcl.pl \ 93REPLACE_PERL+= tclpkg/gv/demo/modgraph.pl contrib/dotmcl.pl \
92 contrib/dirgraph/dirgraph.pl 94 contrib/dirgraph/dirgraph.pl
93 95
94.include "../../mk/bsd.prefs.mk" 96.include "../../mk/bsd.prefs.mk"
95 97
96# Override Xaw type configured by user 98# Override Xaw type configured by user
97XAW_TYPE= standard 99XAW_TYPE= standard
98 100
99.if (${OPSYS} == "NetBSD" && ${MACHINE_ARCH} == "powerpc") 101.if ${OPSYS} == "NetBSD" && ${MACHINE_ARCH} == "powerpc"
100# Forces link with -lgomp directly instead of via dlopen() 102# Forces link with -lgomp directly instead of via dlopen()
101# so we don't overflow thread-local storage in ld.elf_so 103# so we don't overflow thread-local storage in ld.elf_so
102CFLAGS+= -fopenmp 104CFLAGS+= -fopenmp
103CONFIGURE_ARGS+= CFLAGS="${CFLAGS}" 105CONFIGURE_ARGS+= CFLAGS="${CFLAGS}"
104.endif 106.endif
105 107
106.if ${OPSYS} == "FreeBSD" 108.if ${OPSYS} == "FreeBSD"
107SUBST_CLASSES+= sfflags 109SUBST_CLASSES+= sfflags
108SUBST_STAGE.sfflags= pre-configure 110SUBST_STAGE.sfflags= pre-configure
109SUBST_MESSAGE.sfflags= Fixing SF_FLAGS identifier for FreeBSD. 111SUBST_MESSAGE.sfflags= Fixing SF_FLAGS identifier for FreeBSD.
110SUBST_FILES.sfflags= lib/sfio/sfclrlock.c lib/sfio/sfio_t.h lib/sfio/sfio.h 112SUBST_FILES.sfflags= lib/sfio/sfclrlock.c lib/sfio/sfio_t.h lib/sfio/sfio.h
111SUBST_FILES.sfflags+= lib/sfio/sfnew.c lib/sfio/sfopen.c lib/sfio/sfset.c 113SUBST_FILES.sfflags+= lib/sfio/sfnew.c lib/sfio/sfopen.c lib/sfio/sfset.c
112SUBST_SED.sfflags= -e 's|SF_FLAGS|SFIO_FLAGS|g' 114SUBST_SED.sfflags= -e 's|SF_FLAGS|SFIO_FLAGS|g'
@@ -120,21 +122,22 @@ post-install: @@ -120,21 +122,22 @@ post-install:
120 ${RM} -rf ${DESTDIR}${PREFIX}/lib/graphviz/lua/gv.so \ 122 ${RM} -rf ${DESTDIR}${PREFIX}/lib/graphviz/lua/gv.so \
121 ${DESTDIR}${PREFIX}/lib/graphviz/tcl/tcl \ 123 ${DESTDIR}${PREFIX}/lib/graphviz/tcl/tcl \
122 ${DESTDIR}${PREFIX}/lib/lua/5.1/gv.so 124 ${DESTDIR}${PREFIX}/lib/lua/5.1/gv.so
123 125
124.include "options.mk" 126.include "options.mk"
125 127
126DEPENDS+= urw-fonts-[0-9]*:../../fonts/urw-fonts 128DEPENDS+= urw-fonts-[0-9]*:../../fonts/urw-fonts
127 129
128.include "../../converters/libiconv/buildlink3.mk" 130.include "../../converters/libiconv/buildlink3.mk"
129.include "../../devel/gettext-lib/buildlink3.mk" 131.include "../../devel/gettext-lib/buildlink3.mk"
130.include "../../devel/libltdl/buildlink3.mk" 132.include "../../devel/libltdl/buildlink3.mk"
131BUILDLINK_API_DEPENDS.pango+= pango>=1.22.0 133BUILDLINK_API_DEPENDS.pango+= pango>=1.22.0
132.include "../../devel/pango/buildlink3.mk" 134.include "../../devel/pango/buildlink3.mk"
 135.include "../../devel/zlib/buildlink3.mk"
133.include "../../fonts/fontconfig/buildlink3.mk" 136.include "../../fonts/fontconfig/buildlink3.mk"
134.include "../../graphics/freetype2/buildlink3.mk" 137.include "../../graphics/freetype2/buildlink3.mk"
135.include "../../graphics/gts/buildlink3.mk" 138.include "../../graphics/gts/buildlink3.mk"
136.include "../../graphics/libwebp/buildlink3.mk" 139.include "../../graphics/libwebp/buildlink3.mk"
137.include "../../mk/pthread.buildlink3.mk" 140.include "../../mk/pthread.buildlink3.mk"
138.include "../../textproc/expat/buildlink3.mk" 141.include "../../textproc/expat/buildlink3.mk"
139 142
140.include "../../mk/bsd.pkg.mk" 143.include "../../mk/bsd.pkg.mk"

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

--- pkgsrc/graphics/graphviz/PLIST 2023/07/07 13:38:11 1.60
+++ pkgsrc/graphics/graphviz/PLIST 2024/04/15 10:25:57 1.61
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1@comment $NetBSD: PLIST,v 1.60 2023/07/07 13:38:11 micha Exp $ 1@comment $NetBSD: PLIST,v 1.61 2024/04/15 10:25:57 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
12bin/edgepaint 12bin/edgepaint
13bin/fdp 13bin/fdp
14bin/gc 14bin/gc
@@ -32,86 +32,81 @@ bin/patchwork @@ -32,86 +32,81 @@ bin/patchwork
32bin/prune 32bin/prune
33bin/sccmap 33bin/sccmap
34bin/sfdp 34bin/sfdp
35bin/tred 35bin/tred
36bin/twopi 36bin/twopi
37bin/unflatten 37bin/unflatten
38${PLIST.x11}bin/vimdot 38${PLIST.x11}bin/vimdot
39include/graphviz/arith.h 39include/graphviz/arith.h
40include/graphviz/cdt.h 40include/graphviz/cdt.h
41include/graphviz/cgraph.h 41include/graphviz/cgraph.h
42include/graphviz/color.h 42include/graphviz/color.h
43include/graphviz/geom.h 43include/graphviz/geom.h
44include/graphviz/graphviz_version.h 44include/graphviz/graphviz_version.h
45include/graphviz/gv.cpp 
46include/graphviz/gv.i 
47include/graphviz/gvc.h 45include/graphviz/gvc.h
48include/graphviz/gvcext.h 46include/graphviz/gvcext.h
49include/graphviz/gvcjob.h 47include/graphviz/gvcjob.h
50include/graphviz/gvcommon.h 48include/graphviz/gvcommon.h
51include/graphviz/gvconfig.h 49include/graphviz/gvconfig.h
52include/graphviz/gvplugin.h 50include/graphviz/gvplugin.h
53include/graphviz/gvplugin_device.h 51include/graphviz/gvplugin_device.h
54include/graphviz/gvplugin_layout.h 52include/graphviz/gvplugin_layout.h
55include/graphviz/gvplugin_loadimage.h 53include/graphviz/gvplugin_loadimage.h
56include/graphviz/gvplugin_render.h 54include/graphviz/gvplugin_render.h
57include/graphviz/gvplugin_textlayout.h 55include/graphviz/gvplugin_textlayout.h
58include/graphviz/gvpr.h 56include/graphviz/gvpr.h
59include/graphviz/pack.h 57include/graphviz/pack.h
60include/graphviz/pathgeom.h 58include/graphviz/pathgeom.h
61include/graphviz/pathplan.h 59include/graphviz/pathplan.h
62include/graphviz/textspan.h 60include/graphviz/textspan.h
63include/graphviz/types.h 61include/graphviz/types.h
64include/graphviz/usershape.h 62include/graphviz/usershape.h
65include/graphviz/xdot.h 63include/graphviz/xdot.h
66lib/graphviz/libgvplugin_core.la 64lib/graphviz/libgvplugin_core.la
67lib/graphviz/libgvplugin_dot_layout.la 65lib/graphviz/libgvplugin_dot_layout.la
68${PLIST.gd}lib/graphviz/libgvplugin_gd.la 66${PLIST.gd}lib/graphviz/libgvplugin_gd.la
69${PLIST.gtk}lib/graphviz/libgvplugin_gdk.la 
70${PLIST.ghostscript}${PLIST.x11}lib/graphviz/libgvplugin_gs.la 67${PLIST.ghostscript}${PLIST.x11}lib/graphviz/libgvplugin_gs.la
71${PLIST.gtk}lib/graphviz/libgvplugin_gtk.la 68lib/graphviz/libgvplugin_kitty.la
72lib/graphviz/libgvplugin_neato_layout.la 69lib/graphviz/libgvplugin_neato_layout.la
73lib/graphviz/libgvplugin_pango.la 70lib/graphviz/libgvplugin_pango.la
74${PLIST.poppler}lib/graphviz/libgvplugin_poppler.la 71${PLIST.poppler}lib/graphviz/libgvplugin_poppler.la
75${PLIST.quartz}lib/graphviz/libgvplugin_quartz.la 72${PLIST.quartz}lib/graphviz/libgvplugin_quartz.la
76${PLIST.svg}lib/graphviz/libgvplugin_rsvg.la 73${PLIST.svg}lib/graphviz/libgvplugin_rsvg.la
77lib/graphviz/libgvplugin_vt100.la 74lib/graphviz/libgvplugin_vt.la
78lib/graphviz/libgvplugin_webp.la 75lib/graphviz/libgvplugin_webp.la
79${PLIST.x11}lib/graphviz/libgvplugin_xlib.la 76${PLIST.x11}lib/graphviz/libgvplugin_xlib.la
80${PLIST.lua}lib/graphviz/lua/libgv_lua.la 77${PLIST.lua}lib/graphviz/lua/libgv_lua.la
81${PLIST.perl}lib/graphviz/perl/gv.pm 78${PLIST.perl}lib/graphviz/perl/gv.pm
82${PLIST.perl}lib/graphviz/perl/gv.so 79${PLIST.perl}lib/graphviz/perl/gv.so
83${PLIST.perl}lib/graphviz/perl/libgv_perl.la 80${PLIST.perl}lib/graphviz/perl/libgv_perl.la
84${PLIST.tcl}${PLIST.x11}lib/graphviz/tcl/libgdtclft.la 81${PLIST.tcl}${PLIST.x11}lib/graphviz/tcl/libgdtclft.la
85${PLIST.tcl}lib/graphviz/tcl/libgv_tcl.la 82${PLIST.tcl}lib/graphviz/tcl/libgv_tcl.la
86${PLIST.tcl}lib/graphviz/tcl/libtcldot.la 83${PLIST.tcl}lib/graphviz/tcl/libtcldot.la
87${PLIST.tcl}lib/graphviz/tcl/libtcldot_builtin.la 84${PLIST.tcl}lib/graphviz/tcl/libtcldot_builtin.la
88${PLIST.tcl}lib/graphviz/tcl/libtclplan.la 85${PLIST.tcl}lib/graphviz/tcl/libtclplan.la
89${PLIST.tcl}lib/graphviz/tcl/pkgIndex.tcl 86${PLIST.tcl}lib/graphviz/tcl/pkgIndex.tcl
90lib/libcdt.la 87lib/libcdt.la
91lib/libcgraph.la 88lib/libcgraph.la
92lib/libgvc.la 89lib/libgvc.la
93lib/libgvpr.la 90lib/libgvpr.la
94lib/liblab_gamut.la 
95lib/libpathplan.la 91lib/libpathplan.la
96lib/libxdot.la 92lib/libxdot.la
97${PLIST.lua}lib/lua/gv.so 93${PLIST.lua}lib/lua/gv.so
98${PLIST.perl}${PERL5_SUB_INSTALLVENDORARCH}/gv.pm 94${PLIST.perl}${PERL5_SUB_INSTALLVENDORARCH}/gv.pm
99${PLIST.perl}${PERL5_SUB_INSTALLVENDORARCH}/gv.so 95${PLIST.perl}${PERL5_SUB_INSTALLVENDORARCH}/gv.so
100lib/pkgconfig/libcdt.pc 96lib/pkgconfig/libcdt.pc
101lib/pkgconfig/libcgraph.pc 97lib/pkgconfig/libcgraph.pc
102lib/pkgconfig/libgvc.pc 98lib/pkgconfig/libgvc.pc
103lib/pkgconfig/libgvpr.pc 99lib/pkgconfig/libgvpr.pc
104lib/pkgconfig/liblab_gamut.pc 
105lib/pkgconfig/libpathplan.pc 100lib/pkgconfig/libpathplan.pc
106lib/pkgconfig/libxdot.pc 101lib/pkgconfig/libxdot.pc
107${PLIST.tcl}${PLIST.x11}lib/tcl${TCL_BASEVER}/graphviz/libgdtclft.la 102${PLIST.tcl}${PLIST.x11}lib/tcl${TCL_BASEVER}/graphviz/libgdtclft.la
108${PLIST.tcl}lib/tcl${TCL_BASEVER}/graphviz/libgv_tcl.la 103${PLIST.tcl}lib/tcl${TCL_BASEVER}/graphviz/libgv_tcl.la
109${PLIST.tcl}lib/tcl${TCL_BASEVER}/graphviz/libtcldot.la 104${PLIST.tcl}lib/tcl${TCL_BASEVER}/graphviz/libtcldot.la
110${PLIST.tcl}lib/tcl${TCL_BASEVER}/graphviz/libtcldot_builtin.la 105${PLIST.tcl}lib/tcl${TCL_BASEVER}/graphviz/libtcldot_builtin.la
111${PLIST.tcl}lib/tcl${TCL_BASEVER}/graphviz/libtclplan.la 106${PLIST.tcl}lib/tcl${TCL_BASEVER}/graphviz/libtclplan.la
112${PLIST.tcl}lib/tcl${TCL_BASEVER}/graphviz/pkgIndex.tcl 107${PLIST.tcl}lib/tcl${TCL_BASEVER}/graphviz/pkgIndex.tcl
113man/man1/acyclic.1 108man/man1/acyclic.1
114man/man1/bcomps.1 109man/man1/bcomps.1
115man/man1/ccomps.1 110man/man1/ccomps.1
116man/man1/circo.1 111man/man1/circo.1
117man/man1/cluster.1 112man/man1/cluster.1

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

--- pkgsrc/graphics/graphviz/buildlink3.mk 2023/11/12 13:22:01 1.37
+++ pkgsrc/graphics/graphviz/buildlink3.mk 2024/04/15 10:25:57 1.38
@@ -1,17 +1,22 @@ @@ -1,17 +1,22 @@
1# $NetBSD: buildlink3.mk,v 1.37 2023/11/12 13:22:01 wiz Exp $ 1# $NetBSD: buildlink3.mk,v 1.38 2024/04/15 10:25:57 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
 8USE_CC_FEATURES+= c99
 9USE_CXX_FEATURES+= c++11 unique_ptr
 10
8BUILDLINK_API_DEPENDS.graphviz+= graphviz>=2.26.3 11BUILDLINK_API_DEPENDS.graphviz+= graphviz>=2.26.3
9BUILDLINK_ABI_DEPENDS.graphviz+= graphviz>=8.1.0nb5 12BUILDLINK_ABI_DEPENDS.graphviz+= graphviz>=10.0.1
10BUILDLINK_PKGSRCDIR.graphviz?= ../../graphics/graphviz 13BUILDLINK_PKGSRCDIR.graphviz?= ../../graphics/graphviz
11 14
12.include "../../converters/libiconv/buildlink3.mk" 15.include "../../converters/libiconv/buildlink3.mk"
13.include "../../fonts/fontconfig/buildlink3.mk" 16.include "../../devel/libltdl/buildlink3.mk"
 17.include "../../devel/zlib/buildlink3.mk"
 18.include "../../mk/pthread.buildlink3.mk"
14.include "../../textproc/expat/buildlink3.mk" 19.include "../../textproc/expat/buildlink3.mk"
15.endif # GRAPHVIZ_BUILDLINK3_MK 20.endif # GRAPHVIZ_BUILDLINK3_MK
16 21
17BUILDLINK_TREE+= -graphviz 22BUILDLINK_TREE+= -graphviz

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

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

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

--- pkgsrc/graphics/graphviz/distinfo 2023/07/07 13:38:11 1.82
+++ pkgsrc/graphics/graphviz/distinfo 2024/04/15 10:25:57 1.83
@@ -1,10 +1,9 @@ @@ -1,10 +1,9 @@
1$NetBSD: distinfo,v 1.82 2023/07/07 13:38:11 micha Exp $ 1$NetBSD: distinfo,v 1.83 2024/04/15 10:25:57 micha Exp $
2 2
3BLAKE2s (graphviz-8.1.0.tar.xz) = e02cfc4c1e0d572f20fb5f57ceb8cae680d5258b8c2e0ece2d27ac0623d21f77 3BLAKE2s (graphviz-10.0.1.tar.gz) = 2aaa4a0d7f7a408cd9df96893f51864e4d6a9ea385dc98fdf3c70566b20159cc
4SHA512 (graphviz-8.1.0.tar.xz) = 56ce357999b7e7c623ec410eb772a98a23be2d7e871c5e6f500ea000d217714b8f6114d35844dac576e2dcb059f74037833e7728b85fc2c8fa67589e716a39e1 4SHA512 (graphviz-10.0.1.tar.gz) = c8d3653fa8aa5748e7efda1c417c9b35221aa2fefb7b872b4b103b9140423803a5945e55743a336d4c11677428d0a7a74fdb9e533a3b4357bd35656d7c9d15a3
5Size (graphviz-8.1.0.tar.xz) = 21429292 bytes 5Size (graphviz-10.0.1.tar.gz) = 27286181 bytes
6SHA1 (patch-config_config__perl.pl) = 430acb7d7ee3e149de0af9832c5a29602884f83e 6SHA1 (patch-config_config__perl.pl) = 430acb7d7ee3e149de0af9832c5a29602884f83e
7SHA1 (patch-configure.ac) = 80e303d6a9b95c5bb732677a0f1f63d209b39856 7SHA1 (patch-configure.ac) = e76919fc4705194e2ebe0f71f2d19d95c692b9f4
8SHA1 (patch-lib_gvc_Makefile.am) = 180b45f810e5bb3948509d50b5be3b159b38a78f 8SHA1 (patch-lib_gvc_Makefile.am) = 180b45f810e5bb3948509d50b5be3b159b38a78f
9SHA1 (patch-plugin_gs_gvloadimage__gs.c) = 982ac1db252e3224633069db956c5dc803cd5ea9 9SHA1 (patch-plugin_gs_gvloadimage__gs.c) = 982ac1db252e3224633069db956c5dc803cd5ea9
10SHA1 (patch-plugin_xlib_gvdevice__xlib.c) = 05d1549db3b9221f5bcb947173034775b0df7c6c 

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

--- pkgsrc/graphics/graphviz/patches/patch-configure.ac 2023/01/23 13:44:02 1.12
+++ pkgsrc/graphics/graphviz/patches/patch-configure.ac 2024/04/15 10:25:57 1.13
@@ -1,87 +1,51 @@ @@ -1,87 +1,51 @@
1$NetBSD: patch-configure.ac,v 1.12 2023/01/23 13:44:02 micha Exp $ 1$NetBSD: patch-configure.ac,v 1.13 2024/04/15 10:25:57 micha Exp $
2 2
3Use the same path for all platforms in pkgsrc. 3Use the same path for all platforms in pkgsrc.
4Use lua from pkgsrc. 4Fix nonportable shell syntax.
5 5
6--- configure.ac.orig 2023-01-06 05:16:50.000000000 +0000 6--- configure.ac.orig 2024-02-10 22:00:40.000000000 +0000
7+++ configure.ac 7+++ configure.ac
8@@ -92,8 +92,7 @@ if test -z "$LIBPOSTFIX"; then 8@@ -92,8 +92,7 @@ if test -z "${LIBPOSTFIX++}"; then
9 case "${host_os}" in 9 case "${host_os}" in
10 *linux* ) 10 *linux* )
11 case "${host_cpu}" in 11 case "${host_cpu}" in
12- aarch64 | powerpc64 | powerpc64le | s390x | x86_64 | sparc64 | mips64* | riscv64 | e2k ) 12- aarch64 | powerpc64 | powerpc64le | s390x | x86_64 | sparc64 | mips64* | riscv64 | e2k )
13- LIBPOSTFIX="64" 13- LIBPOSTFIX="64"
14+ aarch64* | powerpc64 | powerpc64le | s390x | x86_64 | sparc64 | mips64* | riscv64 | e2k ) 14+ aarch64* | powerpc64 | powerpc64le | s390x | x86_64 | sparc64 | mips64* | riscv64 | e2k )
15 INTGOSIZE=64 15 INTGOSIZE=64
16 ;; 16 ;;
17 esac 17 esac
18@@ -101,7 +100,6 @@ if test -z "$LIBPOSTFIX"; then 18@@ -101,7 +100,6 @@ if test -z "${LIBPOSTFIX++}"; then
19 *solaris* ) 19 *solaris* )
20 case "${host_cpu}" in 20 case "${host_cpu}" in
21 x86_64 | sparc64 ) 21 x86_64 | sparc64 )
22- LIBPOSTFIX="/64" 22- LIBPOSTFIX="/64"
23 INTGOSIZE=64 23 INTGOSIZE=64
24 ;; 24 ;;
25 esac 25 esac
26@@ -858,7 +856,7 @@ else 26@@ -1760,7 +1758,10 @@ AM_CONDITIONAL([WITH_QT], [test "$use_qt
27 if test "x$?" = "x0" ; then 
28 LUA_INCLUDES="$LUA_CFLAGS "`$PKG_CONFIG --cflags lua$l` 
29 LUA_LIBS="$LUA_LFLAGS "`$PKG_CONFIG --libs lua$l` 
30- LUA_INSTALL_DIR="/usr/lib$LIBPOSTFIX/lua/`$PKG_CONFIG --variable=V lua`" 
31+ LUA_INSTALL_DIR="${PREFIX}/lib$LIBPOSTFIX/lua/`$PKG_CONFIG --variable=V lua`" 
32  
33 pkgconfig_lualib_found=`$PKG_CONFIG --exists lualib$l 2>/dev/null` 
34 if test "x$?" = "x0"; then 
35@@ -879,7 +877,7 @@ else 
36 echo 
37 LUA_INCLUDES=`$LUACONFIG --include` 
38 LUA_LIBS=`$LUACONFIG --libs` 
39- LUA_INSTALL_DIR="/usr/lib$LIBPOSTFIX/lua/5.0" 
40+ LUA_INSTALL_DIR="${PREFIX}/lib$LIBPOSTFIX/lua/5.0" 
41 fi 
42 fi 
43  
44@@ -2053,43 +2051,6 @@ fi 
45 AM_CONDITIONAL(WITH_QUARTZ, [test "x$use_quartz" = "xYes"]) 
46  
47 dnl ----------------------------------- 27 dnl -----------------------------------
48-dnl INCLUDES and LIBS for PLATFORMSDK 28 dnl INCLUDES and LIBS for QUARTZ
49- 29
50-AC_ARG_WITH(platformsdkincludedir, 30-if test "${host_os::6}" = "darwin"; then
51- [AS_HELP_STRING([--with-platformsdkincludedir=DIR],[use Platform SDK (Windows) includes from DIR])], 31+dnl Not suitable for a POSIX shell
52- [PLATFORMSDKINCLUDE=$withval]) 32+dnl if test "${host_os::6}" = "darwin"; then
53- 33+case ${host_os} in
54-AC_ARG_WITH(platformsdklibdir, 34+darwin*)
55- [AS_HELP_STRING([--with-platformsdklibdir=DIR],[use Platform SDK (Windows) libraries from DIR])], 35 AC_ARG_WITH(quartz,
56- [PLATFORMSDKLIB=$withval]) 36 [AS_HELP_STRING([--with-quartz=yes],[Quartz framework (Mac OS X)])],
57- 37 [],[with_quartz=yes])
58-AC_SUBST([PLATFORMSDKINCLUDE]) 38@@ -1777,10 +1778,11 @@ if test "${host_os::6}" = "darwin"; then
59-AC_SUBST([PLATFORMSDKLIB]) 39 use_quartz="No (missing ApplicationServices.framework)"
60- 40 fi
61-dnl ----------------------------------- 41 fi
62-dnl INCLUDES and LIBS for GDI+ 
63- 
64-AC_ARG_WITH(gdiplus, 
65- [AS_HELP_STRING([--with-gdiplus=no],[GDI+ framework (Windows)])], 
66- [], [with_gdiplus=no]) 
67- 
68-if test "x$with_gdiplus" != "xyes"; then 
69- use_gdiplus="No (disabled by default - Windows only)" 
70-else 42-else
71- if test -f "$PLATFORMSDKINCLUDE\GdiPlus.h" -a -f "$PLATFORMSDKLIB\GdiPlus.lib"; then 43+ ;;
72- use_gdiplus="Yes" 44+*)
73- AC_DEFINE_UNQUOTED(HAVE_GDIPLUS,1,[Define if you have the GDI+ framework for Windows]) 45 with_quartz=no
74- GDIPLUS_HEADS=`cd "$PLATFORMSDKINCLUDE" && echo GdiPlus*.h` 46 use_quartz="No (disabled by default - Mac only)"
75- GDIPLUS_CFLAGS='' 
76- GDIPLUS_LIBS='' 
77- AC_SUBST([GDIPLUS_HEADS]) 
78- AC_SUBST([GDIPLUS_CFLAGS]) 
79- AC_SUBST([GDIPLUS_LIBS]) 
80- else 
81- use_gdiplus="No (missing headers)" 
82- AC_MSG_WARN(--with-gdiplus requires valid --with-platformsdkincludedir and --with-platformsdklibdir.) 
83- fi 
84-fi 47-fi
85 AM_CONDITIONAL(WITH_GDIPLUS, [test "x$use_gdiplus" = "xYes"]) 48+esac
 49 AM_CONDITIONAL(WITH_QUARTZ, [test "$use_quartz" = "Yes"])
86  50
87 dnl ----------------------------------- 51 dnl -----------------------------------

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