Received: from mail.netbsd.org (mail.netbsd.org [199.233.217.200]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) (Client CN "mail.NetBSD.org", Issuer "mail.NetBSD.org CA" (not verified)) by mollari.NetBSD.org (Postfix) with ESMTPS id ED2771A9239 for ; Thu, 21 Oct 2021 19:44:35 +0000 (UTC) Received: by mail.netbsd.org (Postfix, from userid 605) id 7F9AF84F42; Thu, 21 Oct 2021 19:44:35 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by mail.netbsd.org (Postfix) with ESMTP id B71E484F40 for ; Thu, 21 Oct 2021 19:44:34 +0000 (UTC) X-Virus-Scanned: amavisd-new at netbsd.org Received: from mail.netbsd.org ([IPv6:::1]) by localhost (mail.netbsd.org [IPv6:::1]) (amavisd-new, port 10025) with ESMTP id u1l1M7rI9uC5 for ; Thu, 21 Oct 2021 19:44:31 +0000 (UTC) Received: from cvs.NetBSD.org (ivanova.netbsd.org [199.233.217.197]) by mail.netbsd.org (Postfix) with ESMTP id 5830584C13 for ; Thu, 21 Oct 2021 19:44:31 +0000 (UTC) Received: by cvs.NetBSD.org (Postfix, from userid 500) id 4C93FFA97; Thu, 21 Oct 2021 19:44:31 +0000 (UTC) Content-Transfer-Encoding: 7bit Content-Type: multipart/mixed; boundary="_----------=_163484547143610" MIME-Version: 1.0 Date: Thu, 21 Oct 2021 19:44:31 +0000 From: "Amitai Schleier" Subject: CVS commit: pkgsrc/graphics/graphviz To: pkgsrc-changes@NetBSD.org Reply-To: schmonz@netbsd.org X-Mailer: log_accum Message-Id: <20211021194431.4C93FFA97@cvs.NetBSD.org> Sender: pkgsrc-changes-owner@NetBSD.org List-Id: Precedence: bulk List-Unsubscribe: This is a multi-part message in MIME format. --_----------=_163484547143610 Content-Disposition: inline Content-Transfer-Encoding: 8bit Content-Type: text/plain; charset="UTF-8" Module Name: pkgsrc Committed By: schmonz Date: Thu Oct 21 19:44:31 UTC 2021 Modified Files: pkgsrc/graphics/graphviz: Makefile PLIST distinfo options.mk pkgsrc/graphics/graphviz/patches: patch-plugin_gs_gvloadimage__gs.c Added Files: pkgsrc/graphics/graphviz/patches: patch-configure.ac patch-lib_gvc_Makefile.am patch-tclpkg_gv_Makefile.am patch-version.m4 Removed Files: pkgsrc/graphics/graphviz/patches: patch-cmd_gvmap_gvmap.sh patch-configure patch-iffe patch-lib_gvc_Makefile.in patch-plugin_quartz_Makefile.in patch-tclpkg_gv_Makefile.in Log Message: Update to 2.49.2. From the changelog: ## [2.49.2] – 2021-10-16 ### Changed - Lefty is disabled by default in the Autotools build system. To re-enable it, pass `--enable-lefty` to `./configure`. In a future release, Lefty will be removed. - remove PHP5 support in SWIG bindings ### Fixed - Msys experimental packages are included in release artifacts #2130 - CMake build system incorrectly aliases gv2gml to gml2gv #2131 - Gv2gml Doesn't escape quotes in attributes #1276 - GVPR incorrectly understands color schemes #1956 ## [2.49.1] – 2021-09-22 ### Changed - the CMake build system installs gzipped man pages if `gzip` is available #1883 - CMake projects using Graphviz as a subproject (`add_subdirectory`) can now link against and use `gvc`. ### Fixed - various problems in the generation of Javascript bindings - 2.48.0: test suite is failing #2112 - Ensure correct file-level dependency for generated file in cmake generated projects #2119 - compile failures with a C++20-compatible toolchain #2122 - compile errors on macOS when using Bison 3.8 #2127 - Make Graphviz buildable as a cmake subproject/subdirectory #1477 - Header not found in Cmake project #2109 ## [2.49.0] – 2021-08-28 ### Added - a very basic C++ API for a subset of the functions in lib/cgraph and lib/gvc, allowing a graph to be rendered from DOT source to a specified format. The new API is available through two new libraries: lib/cgraph++ and lib/gvc++. It is experimental, meaning that it might have breaking changes also in upcoming patch or minor releases (towards #2001) - CMake builds now support an `with_expat` option that allows the support for using HTML-like labels through the optional expat library to be explicitly enabled (default) or disabled - CMake builds now support an with_zlib option that allows the support for raster image compression through the optional zlib library to be explicitly enabled (default) or disabled ### Changed - the CMake build system now enables `-Wextra` when building C++ - some Cgraph functions that take `char*` arguments that they do not modify have been updated to take `const char*` arguments #634 - incorrectly using the `layout` attribute on anything other than a graph now results in a warning about this being invalid #2078 - `edgepaint` accepts more standard `--` prefixed command line arguments and rejects invalid options #1971 - improved detection of Lefty dependencies in the Autotools build system - libexpr rejects printing the time (`%t`) if no format is provided - `-DDATE=…` option in the CMake build system has been removed - the Autotools build system no longer writes the DATE file and the portable source tarball no longer includes this ### Fixed - The attached dot file causes a segfault when processed #2095 - fix typos and update URLs in `edgepaint` usage text and man page - Fix clang's undefined behavior warning in dotLayout - gvpr doesn't build on macOS but MKDEFS_EXECUTABLE points to wrong directory #2101 - the generated gdefs.h header is no longer installed - `ccomps` out-of-memory message no longer incorrectly refers to `gc` - do not abort when `calloc(0, x)` or `calloc(x, 0)` in `gcalloc` return `NULL` - failed Exshort_t type discrimination #1799 - dot manpage is in wrong directory on Windows #1936 - CMake builds fail when when the ltdl library is not available even if the `enable_ltdl` option is `ON` - CMake builds fail when when the optional `zlib` library is not available - fix graph rotation in quartz plugin ## [2.48.0] - 2021-07-17 ### Added - a new C++ test infrastructure based on ctest and Catch2 towards #2002 - support for test coverage analysis with [lcov](http://ltp.sourceforge.net/coverage/lcov.php) and [test coverage visualization in GitLab MRs](https://docs.gitlab.com/ee/user/project/merge_requests/test_coverage_visualization.html) ### Changed - updated Graphviz bug report URL in the Autotools build system - Fix `WIN32` path of `gvc.def` specified in `libgvc_la_LDFLAGS` - the CMake build system now not only checks for Bison, but also ensures the found version is recent enough #1916 ### Fixed - ortho's eqEndSeg incorrectly modifies its arguments #2047 - Autotools enables -Wtrampolines and -Wlogical-op for Clang #2066 - node_distinct_coloring failure due to out-of-memory now reported correctly instead of referring to a failure to open lab_gamut - Fix a typo `GD_LIBS` to `GDLIB_LIBS` in `tclpkg/tcldot/Makefile.am` !2022 - Autotools build system sets libgd variables now instead of incorrectly setting GTK variables - HTML strings used as labels are distinguishable in GXL output by `kind="HTML-like string"` - a Bashism removed from the Autotools build system - when Criterion is available, the `command_line` test binary is no longer built and installed by default, but rather during `make check` - round-tripping a file through ``gv2gxl`` and then ``gxl2gv`` no longer causes HTML-like labels to become non-HTML like labels #517 - fix ODR violation by including the ortho object files in the gvc lib also for CMake and MSbuild #2096 ## [2.47.3] - 2021-06-19 ### Changed - marginally more accurate computations in Smyrna sphere projection - Perl is no longer required to build Graphviz #2067 - nop more reliably returns success and failure exit statuses - implicit 63 character limit on plugin names is removed in GVC - the packaging work flow on CentOS 7 now selects the Python 3 bindings, instead of Python 2 bindings - remove Python 2 bindings #1992 - improved thread-safety in Graphviz bindings Makefile ### Fixed - no longer pass libcommon to the linker twice in mm2gv when building with CMake - Quartz plugin is now compiled with explicit `--tag=CC` to libtool #2065 - out of bounds read when attempting to load a plugin whose name is ≥63 characters - out of bounds read when examining a registered plugin whose name is ≥63 characters - do not `fclose(NULL)` in gvmap - Assertion error when using `dot` in `ortho.c` in `convertSPtoRoute` in graphviz 2.47.2 #2082. This was a regression introduced in 2.47.2. ## [2.47.2] - 2021-05-26 ### Added - CMake option `use_sanitizers` which enables building with address and undefined behavior sanitizer ### Changed - $PATH is no longer assumed to be "/bin:/usr/bin:/usr/local/bin" if unset - test suite no longer assumes `python3` exists #2049 - CMake build system locates Python 3 before calling it - diff and grep are no longer required to build Graphviz on Windows ### Fixed - Uninitialized variable read in delaunay_tri - potentially mismatched format string in tclpkg - `gvToolTred` is now exported from gvc.dll on Windows mirroring the behavior on Unix platforms. ## [2.47.1] - 2021-04-17 ### Changed - More detailed error messages when opening input file fails ### Fixed - Windows build thinks xdg-open can be used to open a web browser #1954 - lab_gamut_data misses a value #1974 - xdot man page does not document some functions #1957 - Superfluous empty `@param` in documentation #1977 - PIC renderer does not work and probably never has #131 - dot conversion to dia format #689 - memory leak of reference-counted HTML strings - Align rank from bottom in dot graph #1339 - Fix for TBbalance attribute code #1980 - HTML parser error with single closing square bracket in table row #1893 - reference counted strings put the HTML bit in the middle of the reference count #1984 - &amp; escape disappearing #797 - miscalculation of minimum rank on large graphs - AddressSanitizer: strcpy-param-overlap in gvconfig_libdir when running dot -c #1994 - fix reuse of va_list in pov rendering ## [2.47.0] - 2021-03-15 ### Changed - The edges in JSON output are ordered now !1728 - remove regex usage #1919 - RxSpencer is no longer a dependency on Windows - gvmap.sh is compatible with POSIX shells in addition to ksh - sed is no longer a build dependency on Windows - SHA256 checksum generation? #1955 ### Fixed - Fix gvpr -? to actually print usage and exit non-zero - gvpr is not built by CMake #1878 - typos in gpcanvas.c #1927 - memory leak in libmingle - private inheritance in IncVPSC #1874 - broken sorting in nearest_neighbor_graph_ann.cpp #1938 - memory leak in ANN bridge - gvpr on Windows does not support absolute paths #1780 - buffer overflow in unflatten - agxbputc macro does not bracket its arguments #1814 ## [2.46.1] - 2021-02-13 ### Added - Support for building against Guile 2.2 - Portable source is now also offered as a .tar.xz ### Changed - CentOS/RHEL 6 is no longer supported - Vestiges of Qt4 support have been removed - C++11 support is now required of the C++ compiler used to build Graphviz - C99 support is now required of the C compiler used to build Graphviz - Question about userout() function in agerror.c #1924 - The minimum version of Python required to run the test suite is 3.6 ### Fixed - memory leak in label construction - gvedit compilation errors out, but works if manually compiled with qt5 #1862 - incorrect HTML BR attribute parsing code #1913 - broken overflow checks in RectArea #1906 - various memory leaks !1699 - Fix bad free in lefty !1709 - typo in pathcross #1926 - Out-of-bounds write caused by incorrect error handling of malloc in genUserdata #1928 - Offer .tar.xz files too #454 - Header file graphviz_version.h has no include guards #1929 - regression: newlines embedded in quoted labels / node names are not preserved in 2.46.0 #1931 - Properly fill graphviz_version.h !1706 ## [2.46.0] - 2021-01-18 ### Added - Cgraph's agxbuf API gained a new function agxbdisown(), for dissociating backing memory from the managed buffer - Build system support for the Elbrus 2000 CPU, thanks to Michael Shigorin ### Changed - Cgraph's agheap() API has been removed - Autotools build system support for eFence has been removed - Building Graphviz with ICC defaults to -O2 instead of -O0 - Build system work arounds for GCC 3 have been removed - Incomplete support for running the test suite under CMake has been removed - Portable source tarballs now use the “ustar” POSIX format - Minimum version of Flex required to build Graphviz is now 2.5.2 - Minimum version of Bison required to build Graphviz is now 3.0 - Minimum version of CMake required to build Graphviz using CMake is now 3.1 ### Fixed - gvpr: line numbers in gvpr errors/warnings are incorrect #1594 - URL typo in patchwork man page - Escaped backslashes are not correctly handled when producing xdot with dot #165 - heap-over-flow(off-by-null) in lib/common/shapes.c #1700 - Windows MSBuild executables have the wrong version #1745 - Cast Overflow at pango_textlayout #1314 - x11 back end segfaults if display is unavailable #1776 - typo in cmd/gvpr/lib/clustg #1781 - Segfault in dot #1783 - Incorrect 'Arrow type "s" unknown' error #1444 - segfault on reading 0x10 #1724 - Null-dereference READ (144736912) #1676 - "Warning! PATH too long installer unable to modify PATH!" using CMake Windows installer and PATH length > 1024 #1770 - gvedit -? gives "option - unrecognized - ignored" instead of showing usage #1813 - lefty is not built for Windows (fixed for MSBuild builds only) #1818 - a failure to detect OpenGL glGenTextures() errors has been corrected - sfio does compile time benchmarknig #1422 - iffe "lib" check always succeeds when compiler optimises #1521 - syntax error near text who is not present #1411 - Explicitly links with libstdc++; should allow libc++ if appropriate #163 - A macOS file that was erroneously excluded from portable source tarballs has been restored - Add option -? for usage to diffimg - Add option -? for usage to dotty - Add option -? for usage to lneato - Add option -? for usage to vimdot - Fix smyrna -? to actually print usage instead of error - Fix edgepaint -? to actually print usage instead of error - Remove '"' from usage text in non-Windows version of dotty - Correct misspelled 'smyrna' in usage - Fix edgepaint -o option - Correct shebang of gvmap.sh to use ksh - Fix gvmap.sh -? option to exit with zero exit status - Graphviz doesn't build on MacOS with the latest libc++ #1785 - make fails if ps2pdf is not installed (using autotools) #1763 - multiple graphs to file output causes a segfault #1845 - lefty PTY functionality relies on file descriptor implementation details #1823 - buffer overflow in fdpgen - Crashes by VRML output when current directory is not writable #793 - Segmentation fault when newrank=true #1221 - sfdp craches #236 - fdp segmentation fault with GK=0 #1290 - fdp crash #1865 - Graphviz always crash with this simple dot file #167 - Seg fault in dot #1771 - gml2gv doesn't handle some attributes correctly #1869 - Add missing circo, fdp, neato, osage, patchwork, sfdp & twopi tools to Windows builds (copies of dot) - Add gv2gml tool to CMake (copy of gml2gv on Windows, symlink to gml2gv otherwise) - Regression: fdp generates internal names in the output #1876 - Regression: fdp assertion error on cluster in edge #1877 - Regression in id / <title> in svg for twopi #1907 To generate a diff of this commit: cvs rdiff -u -r1.237 -r1.238 pkgsrc/graphics/graphviz/Makefile cvs rdiff -u -r1.53 -r1.54 pkgsrc/graphics/graphviz/PLIST cvs rdiff -u -r1.66 -r1.67 pkgsrc/graphics/graphviz/distinfo cvs rdiff -u -r1.31 -r1.32 pkgsrc/graphics/graphviz/options.mk cvs rdiff -u -r1.1 -r0 \ pkgsrc/graphics/graphviz/patches/patch-cmd_gvmap_gvmap.sh \ pkgsrc/graphics/graphviz/patches/patch-iffe \ pkgsrc/graphics/graphviz/patches/patch-plugin_quartz_Makefile.in \ pkgsrc/graphics/graphviz/patches/patch-tclpkg_gv_Makefile.in cvs rdiff -u -r1.9 -r0 pkgsrc/graphics/graphviz/patches/patch-configure cvs rdiff -u -r0 -r1.6 pkgsrc/graphics/graphviz/patches/patch-configure.ac cvs rdiff -u -r0 -r1.1 \ pkgsrc/graphics/graphviz/patches/patch-lib_gvc_Makefile.am \ pkgsrc/graphics/graphviz/patches/patch-tclpkg_gv_Makefile.am \ pkgsrc/graphics/graphviz/patches/patch-version.m4 cvs rdiff -u -r1.4 -r0 \ pkgsrc/graphics/graphviz/patches/patch-lib_gvc_Makefile.in cvs rdiff -u -r1.1 -r1.2 \ pkgsrc/graphics/graphviz/patches/patch-plugin_gs_gvloadimage__gs.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. --_----------=_163484547143610 Content-Disposition: inline Content-Length: 29959 Content-Transfer-Encoding: binary Content-Type: text/x-diff; charset=us-ascii Modified files: Index: pkgsrc/graphics/graphviz/Makefile diff -u pkgsrc/graphics/graphviz/Makefile:1.237 pkgsrc/graphics/graphviz/Makefile:1.238 --- pkgsrc/graphics/graphviz/Makefile:1.237 Wed Sep 29 19:00:45 2021 +++ pkgsrc/graphics/graphviz/Makefile Thu Oct 21 19:44:30 2021 @@ -1,9 +1,9 @@ -# $NetBSD: Makefile,v 1.237 2021/09/29 19:00:45 adam Exp $ +# $NetBSD: Makefile,v 1.238 2021/10/21 19:44:30 schmonz Exp $ -DISTNAME= graphviz-2.44.1 -PKGREVISION= 17 +DISTNAME= graphviz-2.49.2 CATEGORIES= graphics -MASTER_SITES= https://www2.graphviz.org/Packages/stable/portable_source/ +MASTER_SITES= https://gitlab.com/graphviz/graphviz/-/archive/${PKGVERSION_NOREV}/ +EXTRACT_SUFX= .tar.bz2 MAINTAINER= sno@NetBSD.org HOMEPAGE= https://www.graphviz.org/ @@ -15,24 +15,52 @@ TOOL_DEPENDS+= ghostscript-[0-9]*:../../ CHECK_FILES_SKIP+= ${PREFIX}/lib/graphviz/config6 CHECK_PORTABILITY_SKIP+= windows/* -USE_LANGUAGES= c c++ +USE_LANGUAGES= c99 c++11 USE_LIBTOOL= yes -USE_TOOLS+= automake bison flex groff pkg-config +USE_TOOLS+= automake autoreconf makeinfo bison flex groff pkg-config # GNU make is needed since BSD Make does not know $< in explicit rules, # such as used by lib/cdt/Makefile.am. USE_TOOLS+= gmake GNU_CONFIGURE= yes GNU_CONFIGURE_STRICT= no # has sub-configures +CONFIGURE_ARGS+= --disable-d +CONFIGURE_ARGS+= --disable-debug +CONFIGURE_ARGS+= --disable-go +CONFIGURE_ARGS+= --disable-io CONFIGURE_ARGS+= --disable-java +CONFIGURE_ARGS+= --disable-javascript CONFIGURE_ARGS+= --disable-php CONFIGURE_ARGS+= --disable-python -CONFIGURE_ARGS+= --disable-python2 CONFIGURE_ARGS+= --disable-python3 CONFIGURE_ARGS+= --disable-r CONFIGURE_ARGS+= --disable-ruby CONFIGURE_ARGS+= --disable-sharp CONFIGURE_ARGS+= --enable-ltdl +CONFIGURE_ARGS+= --enable-man-pdfs +CONFIGURE_ARGS+= --enable-rpath +CONFIGURE_ARGS+= --without-ann +CONFIGURE_ARGS+= --without-devil +CONFIGURE_ARGS+= --without-glut +CONFIGURE_ARGS+= --without-lasi +CONFIGURE_ARGS+= --without-gdiplus +CONFIGURE_ARGS+= --without-glade +CONFIGURE_ARGS+= --without-glitz +CONFIGURE_ARGS+= --without-gtkgl +CONFIGURE_ARGS+= --without-gtkglext +CONFIGURE_ARGS+= --without-ming CONFIGURE_ARGS+= --without-qt +CONFIGURE_ARGS+= --without-smyrna +CONFIGURE_ARGS+= --with-digcola +CONFIGURE_ARGS+= --with-expat +CONFIGURE_ARGS+= --with-fontconfig +CONFIGURE_ARGS+= --with-freetype2 +CONFIGURE_ARGS+= --with-gts +CONFIGURE_ARGS+= --with-ipsepcola +CONFIGURE_ARGS+= --with-ortho +CONFIGURE_ARGS+= --with-pangocairo +CONFIGURE_ARGS+= --with-sfdp +CONFIGURE_ARGS+= --with-visio +CONFIGURE_ARGS+= --with-webp # build fails when PHP and/or Ruby are also installed CONFIGURE_ENV+= ac_cv_prog_PHP= CONFIGURE_ENV+= ac_cv_prog_RUBY= @@ -44,6 +72,7 @@ PKGCONFIG_OVERRIDE+= lib/edgepaint/libla PKGCONFIG_OVERRIDE+= lib/expr/libexpr.pc.in PKGCONFIG_OVERRIDE+= lib/gvc/libgvc.pc.in PKGCONFIG_OVERRIDE+= lib/gvpr/libgvpr.pc.in +PKGCONFIG_OVERRIDE+= lib/pack/libpack.pc.in PKGCONFIG_OVERRIDE+= lib/pathplan/libpathplan.pc.in PKGCONFIG_OVERRIDE+= lib/sfdpgen/libsfdp.pc.in PKGCONFIG_OVERRIDE+= lib/xdot/libxdot.pc.in @@ -79,9 +108,8 @@ SUBST_FILES.sfflags+= lib/sfio/sfnew.c l SUBST_SED.sfflags= -e 's|SF_FLAGS|SFIO_FLAGS|g' .endif -# Prevent another config.status run. -pre-build: - touch ${WRKSRC}/Makefile ${WRKSRC}/graphviz_version.h +pre-configure: + cd ${WRKSRC} && autoreconf -fiv # Remove temporary files and directories created by re-linking "libgv_lua.la". post-install: @@ -100,6 +128,7 @@ post-install: .include "../../devel/pango/buildlink3.mk" .include "../../fonts/fontconfig/buildlink3.mk" .include "../../graphics/cairo/buildlink3.mk" +.include "../../graphics/freetype2/buildlink3.mk" .include "../../graphics/gts/buildlink3.mk" .include "../../graphics/libwebp/buildlink3.mk" .include "../../textproc/expat/buildlink3.mk" Index: pkgsrc/graphics/graphviz/PLIST diff -u pkgsrc/graphics/graphviz/PLIST:1.53 pkgsrc/graphics/graphviz/PLIST:1.54 --- pkgsrc/graphics/graphviz/PLIST:1.53 Tue Aug 11 10:03:57 2020 +++ pkgsrc/graphics/graphviz/PLIST Thu Oct 21 19:44:30 2021 @@ -1,4 +1,4 @@ -@comment $NetBSD: PLIST,v 1.53 2020/08/11 10:03:57 wiz Exp $ +@comment $NetBSD: PLIST,v 1.54 2021/10/21 19:44:30 schmonz Exp $ bin/acyclic bin/bcomps bin/ccomps @@ -217,175 +217,14 @@ share/graphviz/doc/html/build.html share/graphviz/doc/html/char.html share/graphviz/doc/html/gdtclft.entities.example.png share/graphviz/doc/html/index.html -share/graphviz/doc/html/info/Mcircle.gif -share/graphviz/doc/html/info/Mdiamond.gif -share/graphviz/doc/html/info/Msquare.gif -share/graphviz/doc/html/info/a_box.gif -share/graphviz/doc/html/info/a_crow.gif -share/graphviz/doc/html/info/a_diamond.gif -share/graphviz/doc/html/info/a_dot.gif -share/graphviz/doc/html/info/a_ediamond.gif -share/graphviz/doc/html/info/a_empty.gif -share/graphviz/doc/html/info/a_forward.gif -share/graphviz/doc/html/info/a_halfopen.gif -share/graphviz/doc/html/info/a_inv.gif -share/graphviz/doc/html/info/a_invdot.gif -share/graphviz/doc/html/info/a_invempty.gif -share/graphviz/doc/html/info/a_invodot.gif -share/graphviz/doc/html/info/a_lteeoldiamond.gif -share/graphviz/doc/html/info/a_nohead.gif -share/graphviz/doc/html/info/a_none.gif -share/graphviz/doc/html/info/a_normal.gif -share/graphviz/doc/html/info/a_obox.gif -share/graphviz/doc/html/info/a_odiamond.gif -share/graphviz/doc/html/info/a_odot.gif -share/graphviz/doc/html/info/a_open.gif -share/graphviz/doc/html/info/a_tee.gif -share/graphviz/doc/html/info/aa_box.gif -share/graphviz/doc/html/info/aa_crow.gif -share/graphviz/doc/html/info/aa_diamond.gif -share/graphviz/doc/html/info/aa_dot.gif -share/graphviz/doc/html/info/aa_inv.gif -share/graphviz/doc/html/info/aa_lbox.gif -share/graphviz/doc/html/info/aa_lcrow.gif -share/graphviz/doc/html/info/aa_ldiamond.gif -share/graphviz/doc/html/info/aa_linv.gif -share/graphviz/doc/html/info/aa_lnormal.gif -share/graphviz/doc/html/info/aa_ltee.gif -share/graphviz/doc/html/info/aa_lvee.gif -share/graphviz/doc/html/info/aa_none.gif -share/graphviz/doc/html/info/aa_normal.gif -share/graphviz/doc/html/info/aa_obox.gif -share/graphviz/doc/html/info/aa_odiamond.gif -share/graphviz/doc/html/info/aa_odot.gif -share/graphviz/doc/html/info/aa_oinv.gif -share/graphviz/doc/html/info/aa_olbox.gif -share/graphviz/doc/html/info/aa_oldiamond.gif -share/graphviz/doc/html/info/aa_olinv.gif -share/graphviz/doc/html/info/aa_olnormal.gif -share/graphviz/doc/html/info/aa_onormal.gif -share/graphviz/doc/html/info/aa_orbox.gif -share/graphviz/doc/html/info/aa_ordiamond.gif -share/graphviz/doc/html/info/aa_orinv.gif -share/graphviz/doc/html/info/aa_ornormal.gif -share/graphviz/doc/html/info/aa_rbox.gif -share/graphviz/doc/html/info/aa_rcrow.gif -share/graphviz/doc/html/info/aa_rdiamond.gif -share/graphviz/doc/html/info/aa_rinv.gif -share/graphviz/doc/html/info/aa_rnormal.gif -share/graphviz/doc/html/info/aa_rtee.gif -share/graphviz/doc/html/info/aa_rvee.gif -share/graphviz/doc/html/info/aa_tee.gif -share/graphviz/doc/html/info/aa_vee.gif share/graphviz/doc/html/info/arrows.html share/graphviz/doc/html/info/attrs.html -share/graphviz/doc/html/info/back.gif -share/graphviz/doc/html/info/both.gif -share/graphviz/doc/html/info/box.gif -share/graphviz/doc/html/info/box3d.gif -share/graphviz/doc/html/info/c_bold.png -share/graphviz/doc/html/info/c_dashed.png -share/graphviz/doc/html/info/c_dotted.png -share/graphviz/doc/html/info/c_filled.png -share/graphviz/doc/html/info/c_rounded.png -share/graphviz/doc/html/info/c_solid.png -share/graphviz/doc/html/info/c_striped.png -share/graphviz/doc/html/info/circle.gif -share/graphviz/doc/html/info/colorlist.gif share/graphviz/doc/html/info/colors.html share/graphviz/doc/html/info/command.html -share/graphviz/doc/html/info/component.gif -share/graphviz/doc/html/info/constraint.gif -share/graphviz/doc/html/info/cylinder.gif -share/graphviz/doc/html/info/diamond.gif -share/graphviz/doc/html/info/doublecircle.gif -share/graphviz/doc/html/info/doubleoctagon.gif -share/graphviz/doc/html/info/e_bold.png -share/graphviz/doc/html/info/e_dashed.png -share/graphviz/doc/html/info/e_dotted.png -share/graphviz/doc/html/info/e_solid.png -share/graphviz/doc/html/info/egg.gif -share/graphviz/doc/html/info/ellipse.gif -share/graphviz/doc/html/info/fill.gif -share/graphviz/doc/html/info/folder.gif -share/graphviz/doc/html/info/forward.gif -share/graphviz/doc/html/info/g_lin0.png -share/graphviz/doc/html/info/g_lin180.png -share/graphviz/doc/html/info/g_lin270.png -share/graphviz/doc/html/info/g_lin360.png -share/graphviz/doc/html/info/g_lin45.png -share/graphviz/doc/html/info/g_lin90.png -share/graphviz/doc/html/info/g_rad0.png -share/graphviz/doc/html/info/g_rad180.png -share/graphviz/doc/html/info/g_rad270.png -share/graphviz/doc/html/info/g_rad360.png -share/graphviz/doc/html/info/g_rad45.png -share/graphviz/doc/html/info/g_rad90.png -share/graphviz/doc/html/info/hexagon.gif -share/graphviz/doc/html/info/house.gif -share/graphviz/doc/html/info/html1.gif -share/graphviz/doc/html/info/html2.gif -share/graphviz/doc/html/info/html2.gv -share/graphviz/doc/html/info/html3.gif -share/graphviz/doc/html/info/html3.gv -share/graphviz/doc/html/info/html4.gif -share/graphviz/doc/html/info/html4.gv share/graphviz/doc/html/info/index.html -share/graphviz/doc/html/info/invhouse.gif -share/graphviz/doc/html/info/invtrapezium.gif -share/graphviz/doc/html/info/invtriangle.gif share/graphviz/doc/html/info/lang.html -share/graphviz/doc/html/info/mrecord.gif -share/graphviz/doc/html/info/n_bold.png -share/graphviz/doc/html/info/n_dashed.png -share/graphviz/doc/html/info/n_diagonals.png -share/graphviz/doc/html/info/n_dotted.png -share/graphviz/doc/html/info/n_filled.png -share/graphviz/doc/html/info/n_rounded.png -share/graphviz/doc/html/info/n_solid.png -share/graphviz/doc/html/info/n_striped.png -share/graphviz/doc/html/info/n_wedged.png -share/graphviz/doc/html/info/nohead.gif -share/graphviz/doc/html/info/none.gif -share/graphviz/doc/html/info/none_back.png -share/graphviz/doc/html/info/none_both.png -share/graphviz/doc/html/info/none_forward.png -share/graphviz/doc/html/info/none_none.png -share/graphviz/doc/html/info/normal_back.png -share/graphviz/doc/html/info/normal_both.png -share/graphviz/doc/html/info/normal_forward.png -share/graphviz/doc/html/info/normal_none.png -share/graphviz/doc/html/info/note.gif -share/graphviz/doc/html/info/octagon.gif share/graphviz/doc/html/info/output.html -share/graphviz/doc/html/info/oval.gif -share/graphviz/doc/html/info/parallelogram.gif -share/graphviz/doc/html/info/pentagon.gif -share/graphviz/doc/html/info/plain.gif -share/graphviz/doc/html/info/plaintext.gif -share/graphviz/doc/html/info/plugins.png -share/graphviz/doc/html/info/point.gif -share/graphviz/doc/html/info/polygon.gif -share/graphviz/doc/html/info/record.gif -share/graphviz/doc/html/info/record2.gif -share/graphviz/doc/html/info/rect.gif -share/graphviz/doc/html/info/rectangle.gif -share/graphviz/doc/html/info/round.gif -share/graphviz/doc/html/info/sdlshapes.png -share/graphviz/doc/html/info/septagon.gif share/graphviz/doc/html/info/shapes.html -share/graphviz/doc/html/info/spline_curved.png -share/graphviz/doc/html/info/spline_line.png -share/graphviz/doc/html/info/spline_none.png -share/graphviz/doc/html/info/spline_ortho.png -share/graphviz/doc/html/info/spline_polyline.png -share/graphviz/doc/html/info/spline_spline.png -share/graphviz/doc/html/info/square.gif -share/graphviz/doc/html/info/tab.gif -share/graphviz/doc/html/info/trapezium.gif -share/graphviz/doc/html/info/triangle.gif -share/graphviz/doc/html/info/tripleoctagon.gif -share/graphviz/doc/html/info/underline.gif share/graphviz/doc/html/internal_todo.html share/graphviz/doc/html/pspdf.png share/graphviz/doc/html/schema/arguments.xml @@ -555,15 +394,15 @@ share/graphviz/gvpr/scalexy share/graphviz/gvpr/span share/graphviz/gvpr/topon share/graphviz/gvpr/treetoclust -share/graphviz/lefty/box.lefty -share/graphviz/lefty/def.lefty +${PLIST.x11}share/graphviz/lefty/box.lefty +${PLIST.x11}share/graphviz/lefty/def.lefty ${PLIST.x11}share/graphviz/lefty/dotty.lefty ${PLIST.x11}share/graphviz/lefty/dotty_draw.lefty ${PLIST.x11}share/graphviz/lefty/dotty_edit.lefty ${PLIST.x11}share/graphviz/lefty/dotty_layout.lefty ${PLIST.x11}share/graphviz/lefty/dotty_ui.lefty -share/graphviz/lefty/fractal.lefty -share/graphviz/lefty/fractal2.lefty +${PLIST.x11}share/graphviz/lefty/fractal.lefty +${PLIST.x11}share/graphviz/lefty/fractal2.lefty share/graphviz/lefty/lefty.psp -share/graphviz/lefty/slides.lefty -share/graphviz/lefty/tree.lefty +${PLIST.x11}share/graphviz/lefty/slides.lefty +${PLIST.x11}share/graphviz/lefty/tree.lefty Index: pkgsrc/graphics/graphviz/distinfo diff -u pkgsrc/graphics/graphviz/distinfo:1.66 pkgsrc/graphics/graphviz/distinfo:1.67 --- pkgsrc/graphics/graphviz/distinfo:1.66 Thu Oct 7 14:12:18 2021 +++ pkgsrc/graphics/graphviz/distinfo Thu Oct 21 19:44:30 2021 @@ -1,15 +1,13 @@ -$NetBSD: distinfo,v 1.66 2021/10/07 14:12:18 nia Exp $ +$NetBSD: distinfo,v 1.67 2021/10/21 19:44:30 schmonz Exp $ -RMD160 (graphviz-2.44.1.tar.gz) = 936275110c362ca17239d8084c452f6d1731cacf -SHA512 (graphviz-2.44.1.tar.gz) = 42e6137c7cce18daf6f17e6fcbbdfe8e0a531de1bdd3ac7b8751445214aa0d85713b65ba896a234a02670827b0d608bd64b758ef60a4d0384ffa3355ee0dbc42 -Size (graphviz-2.44.1.tar.gz) = 34079677 bytes -SHA1 (patch-cmd_gvmap_gvmap.sh) = a6047ffe825cf13271b556ba8c4f3c866d04f5c3 +RMD160 (graphviz-2.49.2.tar.bz2) = 647b340ab50e68574ce3f77bbc2feda92305b818 +SHA512 (graphviz-2.49.2.tar.bz2) = 7e40c6b0e59b49c9b63e1be09a49fd591846075a3957ecb1d79a01e088932da980454ab52248af4e1e0fd3ef112b6b92f2db37b8ce152598aa16d4e6555847ea +Size (graphviz-2.49.2.tar.bz2) = 27415158 bytes SHA1 (patch-cmd_lefty_os_unix_io.c) = 48f91c79b97928b54ae24af59a9fea173f34dfe5 SHA1 (patch-config_config__perl.pl) = 85d535282a819c1055386244f7b520387d0ddbb1 -SHA1 (patch-configure) = cbe042e0c92b5db69b565be9a3a4147b65c9590c -SHA1 (patch-iffe) = f32c6be65209e57a92c215dee25c5c8334142c03 -SHA1 (patch-lib_gvc_Makefile.in) = f469c2dc53cf9af5b1e86f5da04bf9575685bd41 -SHA1 (patch-plugin_gs_gvloadimage__gs.c) = b5b46a1e7dc52f163526c5b8b7e1b893d5500e3c -SHA1 (patch-plugin_quartz_Makefile.in) = 1712a43849137c23e94f3eeb2ae9b86938bd4980 +SHA1 (patch-configure.ac) = 250105b7d21e16e0ad6ff77b291a969f4be86711 +SHA1 (patch-lib_gvc_Makefile.am) = 8a3f79363cc0a98ea51d4241e67b0fc65b3eca0e +SHA1 (patch-plugin_gs_gvloadimage__gs.c) = 56cbf9bb7b5bf96188ad21a00924e92df74b480d SHA1 (patch-plugin_xlib_gvdevice__xlib.c) = 05d1549db3b9221f5bcb947173034775b0df7c6c -SHA1 (patch-tclpkg_gv_Makefile.in) = d252866341f199e2d1fa0ba0ab67164aa6888c16 +SHA1 (patch-tclpkg_gv_Makefile.am) = 6cee06e06daca71a11299c9c4405002028d7e4a0 +SHA1 (patch-version.m4) = 859ce621758fd042be834ed828137bea780fa284 Index: pkgsrc/graphics/graphviz/options.mk diff -u pkgsrc/graphics/graphviz/options.mk:1.31 pkgsrc/graphics/graphviz/options.mk:1.32 --- pkgsrc/graphics/graphviz/options.mk:1.31 Fri Aug 28 17:09:13 2020 +++ pkgsrc/graphics/graphviz/options.mk Thu Oct 21 19:44:30 2021 @@ -1,4 +1,4 @@ -# $NetBSD: options.mk,v 1.31 2020/08/28 17:09:13 wiz Exp $ +# $NetBSD: options.mk,v 1.32 2021/10/21 19:44:30 schmonz Exp $ PKG_OPTIONS_VAR= PKG_OPTIONS.graphviz PKG_SUPPORTED_OPTIONS= gd ghostscript gtk lua ocaml perl poppler svg tcl x11 # guile does not build with guile20 @@ -24,14 +24,15 @@ PLIST_VARS+= gd ghostscript gtk guile l .if !empty(PKG_OPTIONS:Mgd) . include "../../graphics/gd/buildlink3.mk" PLIST.gd= yes +CONFIGURE_ARGS+= --with-libgd .else CONFIGURE_ARGS+= --without-libgd -CONFIGURE_ARGS+= --without-mylibgd .endif .if !empty(PKG_OPTIONS:Mghostscript) . include "../../print/ghostscript/buildlink3.mk" PLIST.ghostscript= yes +CONFIGURE_ARGS+= --with-ghostscript .else CONFIGURE_ARGS+= --without-ghostscript .endif @@ -39,7 +40,12 @@ CONFIGURE_ARGS+= --without-ghostscript .if !empty(PKG_OPTIONS:Mgtk) . include "../../x11/gtk2/buildlink3.mk" PLIST.gtk= yes +CONFIGURE_ARGS+= --with-gdk +CONFIGURE_ARGS+= --with-gdk-pixbuf +CONFIGURE_ARGS+= --with-gtk +CONFIGURE_ARGS+= --with-gnomeui .else +CONFIGURE_ARGS+= --without-gdk CONFIGURE_ARGS+= --without-gdk-pixbuf CONFIGURE_ARGS+= --without-gtk CONFIGURE_ARGS+= --without-gnomeui @@ -48,6 +54,7 @@ CONFIGURE_ARGS+= --without-gnomeui .if !empty(PKG_OPTIONS:Mpoppler) . include "../../print/poppler-glib/buildlink3.mk" PLIST.poppler= yes +CONFIGURE_ARGS+= --with-poppler .else CONFIGURE_ARGS+= --without-poppler .endif @@ -62,15 +69,19 @@ CONFIGURE_ARGS+= --without-quartz .if !empty(PKG_OPTIONS:Msvg) . include "../../graphics/librsvg/buildlink3.mk" PLIST.svg= yes +CONFIGURE_ARGS+= --with-rsvg .else CONFIGURE_ARGS+= --without-rsvg .endif .if !empty(PKG_OPTIONS:Mx11) . include "../../mk/xaw.buildlink3.mk" -CONFIGURE_ENV+= X11BASE=${X11BASE} PLIST.x11= yes +CONFIGURE_ENV+= X11BASE=${X11BASE} +CONFIGURE_ARGS+= --enable-lefty +CONFIGURE_ARGS+= --with-x .else +CONFIGURE_ARGS+= --disable-lefty CONFIGURE_ARGS+= --without-x .endif @@ -81,6 +92,7 @@ USING_SWIG= yes . include "../../lang/lua/tool.mk" . include "../../lang/lua/buildlink3.mk" PLIST.lua= yes +CONFIGURE_ARGS+= --enable-lua .else CONFIGURE_ARGS+= --disable-lua .endif @@ -89,6 +101,7 @@ CONFIGURE_ARGS+= --disable-lua USING_SWIG= yes . include "../../lang/ocaml/buildlink3.mk" PLIST.ocaml= yes +CONFIGURE_ARGS+= --enable-ocaml .else CONFIGURE_ARGS+= --disable-ocaml .endif @@ -97,11 +110,12 @@ CONFIGURE_ARGS+= --disable-ocaml USING_SWIG= yes . include "../../lang/tcl/Makefile.version" . include "../../x11/tk/buildlink3.mk" +PLIST.tcl= yes +PLIST_SUBST+= TCL_BASEVER=${TCL_BASEVER} CONFIGURE_ENV+= TCLCONFIG=${TCLCONFIG_SH:Q} CONFIGURE_ENV+= TKCONFIG=${TKCONFIG_SH:Q} CONFIGURE_ARGS+= --with-tclsh=${TCLSH:Q} -PLIST.tcl= yes -PLIST_SUBST+= TCL_BASEVER=${TCL_BASEVER} +CONFIGURE_ARGS+= --enable-tcl .else CONFIGURE_ARGS+= --disable-tcl .endif @@ -109,8 +123,8 @@ CONFIGURE_ARGS+= --disable-tcl .if !empty(PKG_OPTIONS:Mguile) USING_SWIG= yes . include "../../lang/guile20/buildlink3.mk" -CONFIGURE_ARGS+= --enable-guile PLIST.guile= yes +CONFIGURE_ARGS+= --enable-guile .else CONFIGURE_ARGS+= --disable-guile .endif @@ -118,9 +132,9 @@ CONFIGURE_ARGS+= --disable-guile .if !empty(PKG_OPTIONS:Mperl) USING_SWIG= yes . include "../../lang/perl5/buildlink3.mk" -CONFIGURE_ARGS+= --enable-perl PLIST.perl= yes -USE_TOOLS+=perl +USE_TOOLS+= perl +CONFIGURE_ARGS+= --enable-perl .else CONFIGURE_ARGS+= --disable-perl .endif @@ -128,6 +142,7 @@ CONFIGURE_ARGS+= --disable-perl .if !empty(USING_SWIG:Myes) PLIST.swig= yes . include "../../devel/swig/buildlink3.mk" +CONFIGURE_ARGS+= --enable-swig .else CONFIGURE_ARGS+= --disable-swig .endif Index: pkgsrc/graphics/graphviz/patches/patch-plugin_gs_gvloadimage__gs.c diff -u pkgsrc/graphics/graphviz/patches/patch-plugin_gs_gvloadimage__gs.c:1.1 pkgsrc/graphics/graphviz/patches/patch-plugin_gs_gvloadimage__gs.c:1.2 --- pkgsrc/graphics/graphviz/patches/patch-plugin_gs_gvloadimage__gs.c:1.1 Sun Dec 13 17:44:45 2015 +++ pkgsrc/graphics/graphviz/patches/patch-plugin_gs_gvloadimage__gs.c Thu Oct 21 19:44:31 2021 @@ -1,16 +1,16 @@ -$NetBSD: patch-plugin_gs_gvloadimage__gs.c,v 1.1 2015/12/13 17:44:45 richard Exp $ +$NetBSD: patch-plugin_gs_gvloadimage__gs.c,v 1.2 2021/10/21 19:44:31 schmonz Exp $ ghostscript-agpl enforces using gserrors.h which is not included by default in ghostscript-gpl, so conditionalise based upon which one is being used. ---- plugin/gs/gvloadimage_gs.c.orig 2014-04-13 20:40:25.000000000 +0000 +--- plugin/gs/gvloadimage_gs.c.orig 2021-10-16 16:39:12.000000000 +0000 +++ plugin/gs/gvloadimage_gs.c -@@ -72,6 +72,16 @@ static void gs_error(GVJ_t * job, const +@@ -74,6 +74,16 @@ static void gs_error(GVJ_t * job, const assert (err < 0); -+#ifdef gserrors_INCLUDED /* ghostscript-agpl uses gserrors.h */ ++#ifdef gserrors_INCLUDED /* ghostscript-agpl uses gserrors.h */ + if (err >= gs_error_VMerror) + errsrc = "PostScript Level 1"; + else if (err >= gs_error_unregistered) @@ -23,12 +23,11 @@ one is being used. if (err >= e_VMerror) errsrc = "PostScript Level 1"; else if (err >= e_unregistered) -@@ -80,7 +90,7 @@ static void gs_error(GVJ_t * job, const +@@ -82,6 +92,7 @@ static void gs_error(GVJ_t * job, const errsrc = "DPS error"; else errsrc = "Ghostscript internal error"; -- +#endif + job->common->errorfn("%s: %s() returned: %d \"%s\" (%s)\n", name, funstr, err, gs_error_names[-err - 1], errsrc); - } Added files: Index: pkgsrc/graphics/graphviz/patches/patch-configure.ac diff -u /dev/null pkgsrc/graphics/graphviz/patches/patch-configure.ac:1.6 --- /dev/null Thu Oct 21 19:44:31 2021 +++ pkgsrc/graphics/graphviz/patches/patch-configure.ac Thu Oct 21 19:44:31 2021 @@ -0,0 +1,143 @@ +$NetBSD: patch-configure.ac,v 1.6 2021/10/21 19:44:31 schmonz Exp $ + +1. chunk: fix +./configure.lineno: 1: Syntax error: Bad substitution +http://www.graphviz.org/mantisbt/view.php?id=2362 +2. chunk: use the same path for all platforms in pkgsrc +other chunks: use lua/php/... from pkgsrc +last chunk: fix +./configure.lineno: 27203: Syntax error: ")" unexpected (expecting "fi") +http://www.graphviz.org/mantisbt/view.php?id=2362 +last last chunk: fix sed expression not to use + which is not in BRE (guile) + +--- configure.ac.orig 2021-10-16 16:39:12.000000000 +0000 ++++ configure.ac +@@ -106,8 +106,15 @@ case "${host_os}" in + # For the build number: months since Jan 2000, day of month from the timestamp + # For the revision number: hour, minute from the timestamp + if test $GRAPHVIZ_VERSION_MICRO != "0"; then +- GRAPHVIZ_VERSION_BUILD=`expr \( ${GRAPHVIZ_VERSION_MICRO:0:4} - 2000 \) \* 12 + ${GRAPHVIZ_VERSION_MICRO:4:2}`${GRAPHVIZ_VERSION_MICRO:6:2} +- GRAPHVIZ_VERSION_REVISION=${GRAPHVIZ_VERSION_MICRO:9:4} ++ # JR: patch from Michael van Elst: ++ # if we have a shellm we should have a working awk, too ++ eval `echo "$GRAPHVIZ_VERSION_MICRO" | awk '{ ++ print "GRAPHVIZ_VERSION_BUILD=" \ ++ (substr($1,1,4)-2000)*12+substr($1,5,2) \ ++ substr($1,7,2) ++ print "GRAPHVIZ_VERSION_REVISION=" \ ++ substr($1,10,4) ++ }'` + fi + ;; + esac +@@ -123,8 +130,7 @@ if test -z "$LIBPOSTFIX"; then + case "${host_os}" in + *linux* ) + case "${host_cpu}" in +- aarch64 | powerpc64 | powerpc64le | s390x | x86_64 | sparc64 | mips64* | riscv64 | e2k ) +- LIBPOSTFIX="64" ++ aarch64* | powerpc64 | powerpc64le | s390x | x86_64 | sparc64 | mips64* | riscv64 | e2k ) + INTGOSIZE=64 + ;; + esac +@@ -132,7 +138,6 @@ if test -z "$LIBPOSTFIX"; then + *solaris* ) + case "${host_cpu}" in + x86_64 | sparc64 ) +- LIBPOSTFIX="/64" + INTGOSIZE=64 + ;; + esac +@@ -684,7 +689,7 @@ else + if test "x$GUILE_CONFIG" = "x"; then + use_guile="No (guile not available)" + else +- [GUILE_VERSION=`$GUILE_CONFIG --version 2>&1 | sed -n '1 s/^.* \+\([0-9\.]\+\)$/\1/ p'`] ++ [GUILE_VERSION=`$GUILE_CONFIG --version 2>&1 | sed -n '1 s/^.* \([0-9\.]*\)$/\1/ p'`] + GUILE_VERSION_MAJOR=`echo $GUILE_VERSION | cut -d '.' -f 1` + GUILE_VERSION_MINOR=`echo $GUILE_VERSION | cut -d '.' -f 2` + AC_CHECK_PROGS(GUILE,guile$GUILE_VERSION_MAJOR.$GUILE_VERSION_MINOR guile$GUILE_VERSION_MAJOR guile) +@@ -908,7 +913,7 @@ else + LUA_VERSION=`$PKG_CONFIG --modversion lua$l` + LUA_INCLUDES="$LUA_CFLAGS "`$PKG_CONFIG --cflags lua$l` + LUA_LIBS="$LUA_LFLAGS "`$PKG_CONFIG --libs lua$l` +- LUA_INSTALL_DIR="/usr/lib$LIBPOSTFIX/lua/`$PKG_CONFIG --variable=V lua`" ++ LUA_INSTALL_DIR="${PREFIX}/lib$LIBPOSTFIX/lua/`$PKG_CONFIG --variable=V lua`" + + pkgconfig_lualib_found=`$PKG_CONFIG --exists lualib$l 2>/dev/null` + if test "x$?" = "x0"; then +@@ -930,7 +935,7 @@ else + LUA_INCLUDES=`$LUACONFIG --include` + LUA_LIBS=`$LUACONFIG --libs` + LUA_VERSION="5.0.x" +- LUA_INSTALL_DIR="/usr/lib$LIBPOSTFIX/lua/5.0" ++ LUA_INSTALL_DIR="${PREFIX}/lib$LIBPOSTFIX/lua/5.0" + fi + fi + +@@ -1020,8 +1025,8 @@ else + use_ocaml="No (ocaml not available)" + else + AC_CHECK_PROG(OCAML_OPT,ocamlopt,ocamlopt) +- OCAML_INCLUDES=-I/usr/lib$LIBPOSTFIX/ocaml +- OCAML_LIBS=-L/usr/lib$LIBPOSTFIX/ocaml ++ OCAML_INCLUDES=-I${PREFIX}/lib$LIBPOSTFIX/ocaml ++ OCAML_LIBS=-L${PREFIX}/lib$LIBPOSTFIX/ocaml + save_CPPFLAGS=$CPPFLAGS + CPPFLAGS="$CPPFLAGS $OCAML_INCLUDES" + AC_CHECK_HEADER(caml/mlvalues.h,[ +@@ -1124,7 +1129,7 @@ else + else + PHP_INCLUDES="`$PHPCONFIG --includes`" + PHP_INSTALL_DIR="`$PHPCONFIG --extension-dir`" +- PHP_INSTALL_DATADIR="/usr/share/php" ++ PHP_INSTALL_DATADIR="${PREFIX}/share/php" + PHP_LIBS="`$PHPCONFIG --ldflags` `$PHPCONFIG --libs`" + save_CPPFLAGS=$CPPFLAGS + CPPFLAGS="$CPPFLAGS $PHP_INCLUDES" +@@ -2191,45 +2196,6 @@ else + fi + AM_CONDITIONAL(WITH_QUARTZ, [test "x$use_quartz" = "xYes"]) + +-dnl ----------------------------------- +-dnl INCLUDES and LIBS for PLATFORMSDK +- +-AC_ARG_WITH(platformsdkincludedir, +- [AS_HELP_STRING([--with-platformsdkincludedir=DIR],[use Platform SDK (Windows) includes from DIR])], +- [PLATFORMSDKINCLUDE=$withval; PLATFORMSDKINCLUDE_ESCAPED=${PLATFORMSDKINCLUDE//'\\'/\\\\}; PLATFORMSDKINCLUDE_ESCAPED=${PLATFORMSDKINCLUDE_ESCAPED// /\\ }]) +- +-AC_ARG_WITH(platformsdklibdir, +- [AS_HELP_STRING([--with-platformsdklibdir=DIR],[use Platform SDK (Windows) libraries from DIR])], +- [PLATFORMSDKLIB=$withval]) +- +-AC_SUBST([PLATFORMSDKINCLUDE]) +-AC_SUBST([PLATFORMSDKINCLUDE_ESCAPED]) +-AC_SUBST([PLATFORMSDKLIB]) +- +-dnl ----------------------------------- +-dnl INCLUDES and LIBS for GDI+ +- +-AC_ARG_WITH(gdiplus, +- [AS_HELP_STRING([--with-gdiplus=no],[GDI+ framework (Windows)])], +- [], [with_gdiplus=no]) +- +-if test "x$with_gdiplus" != "xyes"; then +- use_gdiplus="No (disabled by default - Windows only)" +-else +- if test -f "$PLATFORMSDKINCLUDE\GdiPlus.h" -a -f "$PLATFORMSDKLIB\GdiPlus.lib"; then +- use_gdiplus="Yes" +- AC_DEFINE_UNQUOTED(HAVE_GDIPLUS,1,[Define if you have the GDI+ framework for Windows]) +- GDIPLUS_HEADS=`cd "$PLATFORMSDKINCLUDE" && echo GdiPlus*.h` +- GDIPLUS_CFLAGS='' +- GDIPLUS_LIBS='' +- AC_SUBST([GDIPLUS_HEADS]) +- AC_SUBST([GDIPLUS_CFLAGS]) +- AC_SUBST([GDIPLUS_LIBS]) +- else +- use_gdiplus="No (missing headers)" +- AC_MSG_WARN(--with-gdiplus requires valid --with-platformsdkincludedir and --with-platformsdklibdir.) +- fi +-fi + AM_CONDITIONAL(WITH_GDIPLUS, [test "x$use_gdiplus" = "xYes"]) + + dnl ----------------------------------- Index: pkgsrc/graphics/graphviz/patches/patch-lib_gvc_Makefile.am diff -u /dev/null pkgsrc/graphics/graphviz/patches/patch-lib_gvc_Makefile.am:1.1 --- /dev/null Thu Oct 21 19:44:31 2021 +++ pkgsrc/graphics/graphviz/patches/patch-lib_gvc_Makefile.am Thu Oct 21 19:44:31 2021 @@ -0,0 +1,15 @@ +$NetBSD: patch-lib_gvc_Makefile.am,v 1.1 2021/10/21 19:44:31 schmonz Exp $ + +Link with pthread library, if needed. + +--- lib/gvc/Makefile.am.orig 2021-10-16 16:39:12.000000000 +0000 ++++ lib/gvc/Makefile.am +@@ -71,7 +71,7 @@ libgvc_la_LIBADD = $(libgvc_C_la_LIBADD) + $(top_builddir)/lib/cdt/libcdt.la \ + $(top_builddir)/lib/cgraph/libcgraph.la \ + $(top_builddir)/lib/pathplan/libpathplan.la \ +- $(EXPAT_LIBS) $(Z_LIBS) $(MATH_LIBS) ++ $(EXPAT_LIBS) $(Z_LIBS) $(MATH_LIBS) ${PTHREAD_LDFLAGS} ${PTHREAD_LIBS} + libgvc_la_DEPENDENCIES = $(libgvc_C_la_DEPENDENCIES) + + if WITH_WIN32 Index: pkgsrc/graphics/graphviz/patches/patch-tclpkg_gv_Makefile.am diff -u /dev/null pkgsrc/graphics/graphviz/patches/patch-tclpkg_gv_Makefile.am:1.1 --- /dev/null Thu Oct 21 19:44:31 2021 +++ pkgsrc/graphics/graphviz/patches/patch-tclpkg_gv_Makefile.am Thu Oct 21 19:44:31 2021 @@ -0,0 +1,17 @@ +$NetBSD: patch-tclpkg_gv_Makefile.am,v 1.1 2021/10/21 19:44:31 schmonz Exp $ + +Add missing -I flags to point to perl files. + +See https://gitlab.com/graphviz/graphviz/issues/1576. + +--- tclpkg/gv/Makefile.am.orig 2021-10-16 16:39:12.000000000 +0000 ++++ tclpkg/gv/Makefile.am +@@ -184,7 +184,7 @@ nodist_libgv_perl_la_SOURCES = gv_perl.c + libgv_perl_la_SOURCES = $(BASESOURCES) gv_dummy_init.c + libgv_perl_la_LIBADD = $(BASELIBS) $(PERL_LIBS) + libgv_perl_la_LDFLAGS = -module -avoid-version $(PERL_LD) +-libgv_perl_la_CPPFLAGS = $(BASECPPFLAGS) $(PERL_CC) ++libgv_perl_la_CPPFLAGS = $(BASECPPFLAGS) $(PERL_INCLUDES) $(PERL_CC) + $(PERL_data): gv_perl.cpp + gv_perl.cpp: gv.i + $(SWIG) -c++ $(SWIG_PERL_OPT) -o $@ $(srcdir)/gv.i Index: pkgsrc/graphics/graphviz/patches/patch-version.m4 diff -u /dev/null pkgsrc/graphics/graphviz/patches/patch-version.m4:1.1 --- /dev/null Thu Oct 21 19:44:31 2021 +++ pkgsrc/graphics/graphviz/patches/patch-version.m4 Thu Oct 21 19:44:31 2021 @@ -0,0 +1,21 @@ +$NetBSD: patch-version.m4,v 1.1 2021/10/21 19:44:31 schmonz Exp $ + +Taken from the .tar.xz. + +--- version.m4.orig 2021-10-21 14:41:40.000000000 +0000 ++++ version.m4 +@@ -0,0 +1,14 @@ ++dnl Graphviz package version number, (as distinct from shared library version) ++ ++m4_define([graphviz_version_major],[2]) ++m4_define([graphviz_version_minor],[49]) ++m4_define([graphviz_version_micro],[2]) ++m4_define([graphviz_collection],[stable]) ++ ++m4_define([graphviz_version_date],[20211016.1639]) ++m4_define([graphviz_change_date],["Sat Oct 16 2021"]) ++m4_define([graphviz_git_date],["2021-10-16 16:39:12"]) ++m4_define([graphviz_author_name],["Matthew Fernandez"]) ++m4_define([graphviz_author_email],[matthew.fernandez@gmail.com]) ++m4_define([graphviz_version_commit],[cf96d5173]) ++ --_----------=_163484547143610--