CVS commit: pkgsrc/graphics/graphviz

To: pkgsrc-changes%NetBSD.org@localhost
Subject: CVS commit: pkgsrc/graphics/graphviz
From: "Adam Ciarcinski" <adam%netbsd.org@localhost>
Date: Mon, 27 Jul 2020 20:44:16 +0000

Module Name:    pkgsrc
Committed By:   adam
Date:           Mon Jul 27 20:44:16 UTC 2020

Modified Files:
        pkgsrc/graphics/graphviz: Makefile PLIST distinfo options.mk
        pkgsrc/graphics/graphviz/patches: patch-configure
            patch-plugin_xlib_gvdevice__xlib.c
Added Files:
        pkgsrc/graphics/graphviz/patches: patch-tclpkg_gv_Makefile.in
Removed Files:
        pkgsrc/graphics/graphviz/patches: patch-configure.ac
            patch-tclpkg_gv_Makefile.in.patch

Log Message:
graphviz: updated to 2.44.1

2.44.1

Added

applied RH patches (from graphviz-2.42.2-8.fc32.src.rpm)

graphviz-2.42.2-coverity-scan-fixes.patch
graphviz-2.42.2-dotty-menu-fix.patch
graphviz-2.42.2-ocaml-allow-const-cast.patch

some allocation failures that could previously allow memory corruption now exit
lab_gamut.3.pdf is no longer included in release archives

Changed
Windows binaries available at https://www2.graphviz.org/Packages/ instead of
https://ci.appveyor.com/project/ellson/graphviz-pl238
Retarget Windows builds to Visual Studio 2019 and toolset v142

Fixed
Released Ubuntu packages does not contain language bindings for Python3
Neato's hier mode is broken since v2.44.0
Segmentation fault (core dumped)

2.44.0

Added
New SGD mode in neato
Add pkg-config files
tred: add feature to output removed edges to stderr upon request
Workaround: avoid creating a virtual edge loop.
Add riscv64 to host_cpu configure.ac
lib/cgraph: include empty malloc.h from subdir include
lib/gvpr: compile mkdefs with $(HOSTCC) rather than $(CC)
lib/vpsc: rename bcopy->b_copy

Fixed
MSB4018 The NativeCodeAnalysis task failed unexpectedly.


To generate a diff of this commit:
cvs rdiff -u -r1.214 -r1.215 pkgsrc/graphics/graphviz/Makefile
cvs rdiff -u -r1.50 -r1.51 pkgsrc/graphics/graphviz/PLIST
cvs rdiff -u -r1.63 -r1.64 pkgsrc/graphics/graphviz/distinfo
cvs rdiff -u -r1.27 -r1.28 pkgsrc/graphics/graphviz/options.mk
cvs rdiff -u -r1.7 -r1.8 pkgsrc/graphics/graphviz/patches/patch-configure
cvs rdiff -u -r1.4 -r0 pkgsrc/graphics/graphviz/patches/patch-configure.ac
cvs rdiff -u -r1.1 -r1.2 \
    pkgsrc/graphics/graphviz/patches/patch-plugin_xlib_gvdevice__xlib.c
cvs rdiff -u -r0 -r1.1 \
    pkgsrc/graphics/graphviz/patches/patch-tclpkg_gv_Makefile.in
cvs rdiff -u -r1.1 -r0 \
    pkgsrc/graphics/graphviz/patches/patch-tclpkg_gv_Makefile.in.patch

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: pkgsrc/graphics/graphviz/Makefile
diff -u pkgsrc/graphics/graphviz/Makefile:1.214 pkgsrc/graphics/graphviz/Makefile:1.215
--- pkgsrc/graphics/graphviz/Makefile:1.214     Fri May 15 06:02:55 2020
+++ pkgsrc/graphics/graphviz/Makefile   Mon Jul 27 20:44:15 2020
@@ -1,17 +1,16 @@
-# $NetBSD: Makefile,v 1.214 2020/05/15 06:02:55 rillig Exp $
+# $NetBSD: Makefile,v 1.215 2020/07/27 20:44:15 adam Exp $
 
-DISTNAME=      graphviz-2.40.1
-PKGREVISION=   47
+DISTNAME=      graphviz-2.44.1
 CATEGORIES=    graphics
-MASTER_SITES=  http://www.graphviz.org/pub/graphviz/stable/SOURCES/
+MASTER_SITES=  https://www2.graphviz.org/Packages/stable/portable_source/
 
 MAINTAINER=    sno%NetBSD.org@localhost
 HOMEPAGE=      https://www.graphviz.org/
 COMMENT=       Graph Drawing Programs from AT&T Research and Lucent Bell Labs
 LICENSE=       epl-v1.0
 
-CHECK_FILES_SKIP+=     ${PREFIX}/lib/graphviz/config6
-CHECK_PORTABILITY_SKIP+=windows/*
+CHECK_FILES_SKIP+=             ${PREFIX}/lib/graphviz/config6
+CHECK_PORTABILITY_SKIP+=       windows/*
 
 PRIVILEGED_STAGES+=    clean
 
@@ -23,9 +22,12 @@ GNU_CONFIGURE_STRICT=        no # has sub-confi
 CONFIGURE_ARGS+=       --disable-java
 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+=       --disable-r
+CONFIGURE_ARGS+=       --enable-ltdl
 CONFIGURE_ARGS+=       --without-qt
 # build fails when PHP and/or Ruby are also installed
 CONFIGURE_ENV+=                ac_cv_prog_PHP=
@@ -53,8 +55,7 @@ REPLACE.tclsh.old=    .*tclsh
 REPLACE.tclsh.new=     ${PREFIX}/bin/tclsh
 REPLACE_FILES.tclsh=   tclpkg/gv/demo/modgraph.tcl
 
-REPLACE_PERL+=         config/config_perl.pl \
-                       tclpkg/gv/demo/modgraph.pl contrib/dotmcl.pl \
+REPLACE_PERL+=         tclpkg/gv/demo/modgraph.pl contrib/dotmcl.pl \
                        contrib/dirgraph/dirgraph.pl
 
 .include "../../mk/compiler.mk"
@@ -69,8 +70,8 @@ pre-build:
 # Remove temporary files and directories created by re-linking "libgv_lua.la".
 post-install:
        ${RM} -rf ${DESTDIR}${PREFIX}/lib/graphviz/lua/gv.so \
-         ${DESTDIR}${PREFIX}/lib/graphviz/tcl/tcl \
-         ${DESTDIR}${PREFIX}/lib/lua/5.1/gv.so
+               ${DESTDIR}${PREFIX}/lib/graphviz/tcl/tcl \
+               ${DESTDIR}${PREFIX}/lib/lua/5.1/gv.so
 
 .include "options.mk"
 
@@ -84,6 +85,7 @@ post-install:
 .include "../../fonts/fontconfig/buildlink3.mk"
 .include "../../graphics/cairo/buildlink3.mk"
 .include "../../graphics/gts/buildlink3.mk"
+.include "../../graphics/libwebp/buildlink3.mk"
 .include "../../textproc/expat/buildlink3.mk"
 .include "../../mk/pthread.buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"

Index: pkgsrc/graphics/graphviz/PLIST
diff -u pkgsrc/graphics/graphviz/PLIST:1.50 pkgsrc/graphics/graphviz/PLIST:1.51
--- pkgsrc/graphics/graphviz/PLIST:1.50 Mon Oct 28 08:43:33 2019
+++ pkgsrc/graphics/graphviz/PLIST      Mon Jul 27 20:44:15 2020
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.50 2019/10/28 08:43:33 kamil Exp $
+@comment $NetBSD: PLIST,v 1.51 2020/07/27 20:44:15 adam Exp $
 bin/acyclic
 bin/bcomps
 bin/ccomps
@@ -71,13 +71,15 @@ lib/graphviz/libgvplugin_core.la
 lib/graphviz/libgvplugin_dot_layout.la
 ${PLIST.gd}lib/graphviz/libgvplugin_gd.la
 ${PLIST.gtk}lib/graphviz/libgvplugin_gdk.la
-${PLIST.ghostscript}lib/graphviz/libgvplugin_gs.la
+${PLIST.ghostscript}${PLIST.x11}lib/graphviz/libgvplugin_gs.la
 ${PLIST.gtk}lib/graphviz/libgvplugin_gtk.la
 lib/graphviz/libgvplugin_neato_layout.la
 lib/graphviz/libgvplugin_pango.la
 ${PLIST.poppler}lib/graphviz/libgvplugin_poppler.la
 ${PLIST.quartz}lib/graphviz/libgvplugin_quartz.la
 ${PLIST.svg}lib/graphviz/libgvplugin_rsvg.la
+lib/graphviz/libgvplugin_visio.la
+lib/graphviz/libgvplugin_webp.la
 ${PLIST.x11}lib/graphviz/libgvplugin_xlib.la
 ${PLIST.lua}lib/graphviz/lua/libgv_lua.la
 ${PLIST.ocaml}lib/graphviz/ocaml/META.gv
@@ -129,6 +131,7 @@ man/man1/cluster.1
 man/man1/diffimg.1
 man/man1/dijkstra.1
 man/man1/dot.1
+man/man1/dot2gxl.1
 man/man1/dotty.1
 man/man1/edgepaint.1
 man/man1/fdp.1
@@ -143,6 +146,7 @@ man/man1/gvmap.1
 man/man1/gvmap.sh.1
 man/man1/gvpack.1
 man/man1/gvpr.1
+man/man1/gxl2dot.1
 man/man1/gxl2gv.1
 man/man1/lefty.1
 man/man1/lneato.1
@@ -155,7 +159,6 @@ man/man1/patchwork.1
 man/man1/prune.1
 man/man1/sccmap.1
 man/man1/sfdp.1
-man/man1/smyrna.1
 man/man1/tred.1
 man/man1/twopi.1
 man/man1/unflatten.1
@@ -168,10 +171,10 @@ ${PLIST.guile}man/man3/gv.3guile
 ${PLIST.lua}man/man3/gv.3lua
 ${PLIST.ocaml}man/man3/gv.3ocaml
 ${PLIST.perl}man/man3/gv.3perl
+${PLIST.lua}man/man3/gv.3python
 ${PLIST.tcl}man/man3/gv.3tcl
 man/man3/gvc.3
 man/man3/gvpr.3
-man/man3/lab_gamut.3
 man/man3/pack.3
 man/man3/pathplan.3
 ${PLIST.tcl}man/man3/tcldot.3tcl
@@ -202,8 +205,8 @@ ${PLIST.tcl}share/graphviz/demo/pathplan
 ${PLIST.tcl}share/graphviz/demo/pathplan_data/u.dat
 ${PLIST.tcl}share/graphviz/demo/pathplan_data/unknown.dat
 share/graphviz/doc/AUTHORS
+share/graphviz/doc/CHANGELOG.md
 share/graphviz/doc/COPYING
-share/graphviz/doc/ChangeLog
 share/graphviz/doc/Dot.ref
 share/graphviz/doc/NEWS
 share/graphviz/doc/addingLayout.txt
@@ -368,7 +371,6 @@ 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.jpg
 share/graphviz/doc/html/info/sdlshapes.png
 share/graphviz/doc/html/info/septagon.gif
 share/graphviz/doc/html/info/shapes.html
@@ -404,6 +406,7 @@ share/graphviz/doc/pdf/cluster.1.pdf
 share/graphviz/doc/pdf/diffimg.1.pdf
 share/graphviz/doc/pdf/dijkstra.1.pdf
 share/graphviz/doc/pdf/dot.1.pdf
+share/graphviz/doc/pdf/dot2gxl.1.pdf
 share/graphviz/doc/pdf/dotguide.pdf
 share/graphviz/doc/pdf/dotty.1.pdf
 share/graphviz/doc/pdf/dottyguide.pdf
@@ -418,6 +421,7 @@ ${PLIST.guile}share/graphviz/doc/pdf/gv.
 ${PLIST.lua}share/graphviz/doc/pdf/gv.3lua.pdf
 ${PLIST.ocaml}share/graphviz/doc/pdf/gv.3ocaml.pdf
 ${PLIST.perl}share/graphviz/doc/pdf/gv.3perl.pdf
+${PLIST.lua}share/graphviz/doc/pdf/gv.3python.pdf
 ${PLIST.tcl}share/graphviz/doc/pdf/gv.3tcl.pdf
 share/graphviz/doc/pdf/gv2gml.1.pdf
 share/graphviz/doc/pdf/gv2gxl.1.pdf
@@ -429,8 +433,8 @@ share/graphviz/doc/pdf/gvmap.sh.1.pdf
 share/graphviz/doc/pdf/gvpack.1.pdf
 share/graphviz/doc/pdf/gvpr.1.pdf
 share/graphviz/doc/pdf/gvpr.3.pdf
+share/graphviz/doc/pdf/gxl2dot.1.pdf
 share/graphviz/doc/pdf/gxl2gv.1.pdf
-share/graphviz/doc/pdf/lab_gamut.3.pdf
 share/graphviz/doc/pdf/lefty.1.pdf
 share/graphviz/doc/pdf/leftyguide.pdf
 share/graphviz/doc/pdf/libguide.pdf
@@ -444,10 +448,9 @@ share/graphviz/doc/pdf/osage.1.pdf
 share/graphviz/doc/pdf/pack.3.pdf
 share/graphviz/doc/pdf/patchwork.1.pdf
 share/graphviz/doc/pdf/pathplan.3.pdf
-share/graphviz/doc/pdf/prune.pdf
+share/graphviz/doc/pdf/prune.1.pdf
 share/graphviz/doc/pdf/sccmap.1.pdf
 share/graphviz/doc/pdf/sfdp.1.pdf
-share/graphviz/doc/pdf/smyrna.1.pdf
 share/graphviz/doc/pdf/smyrna.pdf
 ${PLIST.tcl}share/graphviz/doc/pdf/tcldot.3tcl.pdf
 share/graphviz/doc/pdf/tred.1.pdf

Index: pkgsrc/graphics/graphviz/distinfo
diff -u pkgsrc/graphics/graphviz/distinfo:1.63 pkgsrc/graphics/graphviz/distinfo:1.64
--- pkgsrc/graphics/graphviz/distinfo:1.63      Fri Mar 13 15:16:00 2020
+++ pkgsrc/graphics/graphviz/distinfo   Mon Jul 27 20:44:15 2020
@@ -1,17 +1,16 @@
-$NetBSD: distinfo,v 1.63 2020/03/13 15:16:00 tnn Exp $
+$NetBSD: distinfo,v 1.64 2020/07/27 20:44:15 adam Exp $
 
-SHA1 (graphviz-2.40.1.tar.gz) = 8a44d19bcdb50df1bd8e649de472ebf868468888
-RMD160 (graphviz-2.40.1.tar.gz) = 8fc103fc519e07e9db522ec2f748838571c71acf
-SHA512 (graphviz-2.40.1.tar.gz) = a3f358a7050523a39b91a259563a95925b37853ffec799e571211af5b686d3af42457c937882954482785745d90416b1abd945caf05f8abb52b3876e07aa70f5
-Size (graphviz-2.40.1.tar.gz) = 25633455 bytes
+SHA1 (graphviz-2.44.1.tar.gz) = 2cda62953bd84b945c4ae4fe7067da9cb26fc937
+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
 SHA1 (patch-cmd_lefty_os_unix_io.c) = 48f91c79b97928b54ae24af59a9fea173f34dfe5
 SHA1 (patch-config_config__perl.pl) = 85d535282a819c1055386244f7b520387d0ddbb1
-SHA1 (patch-configure) = 2e541e065a594093f54e47d5a24972367405bec1
-SHA1 (patch-configure.ac) = c02e7e2ab65cb5df8bcf15c1bbed0e673480bd3f
+SHA1 (patch-configure) = ce1f7daf5189dabd236e55c5302918b119a23946
 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-plugin_xlib_gvdevice__xlib.c) = 932c337dcf9cb53d52f24c6c20818038ed169cd0
-SHA1 (patch-tclpkg_gv_Makefile.in.patch) = d252866341f199e2d1fa0ba0ab67164aa6888c16
+SHA1 (patch-plugin_xlib_gvdevice__xlib.c) = 05d1549db3b9221f5bcb947173034775b0df7c6c
+SHA1 (patch-tclpkg_gv_Makefile.in) = d252866341f199e2d1fa0ba0ab67164aa6888c16

Index: pkgsrc/graphics/graphviz/options.mk
diff -u pkgsrc/graphics/graphviz/options.mk:1.27 pkgsrc/graphics/graphviz/options.mk:1.28
--- pkgsrc/graphics/graphviz/options.mk:1.27    Sun May 10 10:50:04 2020
+++ pkgsrc/graphics/graphviz/options.mk Mon Jul 27 20:44:15 2020
@@ -1,7 +1,7 @@
-# $NetBSD: options.mk,v 1.27 2020/05/10 10:50:04 rillig Exp $
+# $NetBSD: options.mk,v 1.28 2020/07/27 20:44:15 adam Exp $
 
 PKG_OPTIONS_VAR=       PKG_OPTIONS.graphviz
-PKG_SUPPORTED_OPTIONS= gd ghostscript gtk gts lua ocaml poppler svg tcl x11 perl # guile does not build with guile20
+PKG_SUPPORTED_OPTIONS= gd ghostscript gtk gts lua ocaml perl poppler svg tcl x11 # guile does not build with guile20
 .if exists(/System/Library/Frameworks/Quartz.framework)
 PKG_SUPPORTED_OPTIONS+=        quartz
 .endif
@@ -99,7 +99,7 @@ USING_SWIG=   yes
 .  include "../../x11/tk/buildlink3.mk"
 CONFIGURE_ENV+=                TCLCONFIG=${TCLCONFIG_SH:Q}
 CONFIGURE_ENV+=                TKCONFIG=${TKCONFIG_SH:Q}
-CONFIGURE_ARGS+=       --with-tclsh=${TCLSH}
+CONFIGURE_ARGS+=       --with-tclsh=${TCLSH:Q}
 PLIST.tcl=             yes
 PLIST_SUBST+=          TCL_BASEVER=${TCL_BASEVER}
 .else

Index: pkgsrc/graphics/graphviz/patches/patch-configure
diff -u pkgsrc/graphics/graphviz/patches/patch-configure:1.7 pkgsrc/graphics/graphviz/patches/patch-configure:1.8
--- pkgsrc/graphics/graphviz/patches/patch-configure:1.7        Wed Mar  8 14:51:56 2017
+++ pkgsrc/graphics/graphviz/patches/patch-configure    Mon Jul 27 20:44:15 2020
@@ -1,4 +1,4 @@
-$NetBSD: patch-configure,v 1.7 2017/03/08 14:51:56 wiz Exp $
+$NetBSD: patch-configure,v 1.8 2020/07/27 20:44:15 adam Exp $
 
 1. chunk: fix
 ./configure.lineno: 1: Syntax error: Bad substitution
@@ -10,9 +10,9 @@ last chunk: fix
 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.orig     2016-12-25 03:04:52.000000000 +0000
+--- configure.orig     2020-04-08 07:52:13.000000000 +0000
 +++ configure
-@@ -3527,8 +3527,15 @@ case "${host_os}" in
+@@ -3369,8 +3369,15 @@ case "${host_os}" in
        # For the build number: months since Jan 2000, day of month from the timestamp
        # For the revision number: hour, minute from the timestamp
        if test $GRAPHVIZ_VERSION_MICRO != "0"; then
@@ -30,15 +30,15 @@ last last chunk: fix sed expression not 
        fi
        ;;
  esac
-@@ -3544,7 +3551,6 @@ if test -z "$LIBPOSTFIX"; then
+@@ -3387,7 +3394,6 @@ if test -z "$LIBPOSTFIX"; then
      *linux* )
        case "${host_cpu}" in
-         aarch64 | powerpc64 | powerpc64le | s390x | x86_64 | sparc64 )
+         aarch64 | powerpc64 | powerpc64le | s390x | x86_64 | sparc64 | mips64* | riscv64 )
 -          LIBPOSTFIX="64"
            INTGOSIZE=64
            ;;
        esac
-@@ -3552,7 +3558,6 @@ if test -z "$LIBPOSTFIX"; then
+@@ -3395,7 +3401,6 @@ if test -z "$LIBPOSTFIX"; then
      *solaris* )
        case "${host_cpu}" in
          x86_64 | sparc64 )
@@ -46,7 +46,7 @@ last last chunk: fix sed expression not 
            INTGOSIZE=64
            ;;
        esac
-@@ -17920,7 +17925,7 @@ esac
+@@ -18350,7 +18355,7 @@ esac
  
  
  
@@ -55,7 +55,7 @@ last last chunk: fix sed expression not 
  then
    # Enable common warnings flags
    CFLAGS="${CFLAGS} -Wall"
-@@ -20954,7 +20959,7 @@ done
+@@ -21191,7 +21196,7 @@ done
        if test "x$GUILE" = "x"; then
          use_guile="No (guile not available)"
        else
@@ -64,16 +64,16 @@ last last chunk: fix sed expression not 
          GUILE_VERSION_MAJOR=`echo $GUILE_VERSION | cut -d '.' -f 1`
          GUILE_VERSION_MINOR=`echo $GUILE_VERSION | cut -d '.' -f 2`
          if test 0$GUILE_VERSION_MAJOR -lt 2; then
-@@ -21586,7 +21591,7 @@ $as_echo_n "checking for Lua headers and
-                       LUA_VERSION=`$PKGCONFIG --modversion lua$l`
-                         LUA_INCLUDES="$LUA_CFLAGS "`$PKGCONFIG --cflags lua$l`
-                         LUA_LIBS="$LUA_LFLAGS "`$PKGCONFIG --libs lua$l`
--                      LUA_INSTALL_DIR="/usr/lib$LIBPOSTFIX/lua/`$PKGCONFIG --variable=V lua`"
+@@ -21870,7 +21875,7 @@ $as_echo_n "checking for Lua headers and
+                       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/`$PKGCONFIG --variable=V lua`"
  
-                       pkgconfig_lualib_found=`$PKGCONFIG --exists lualib$l 2>/dev/null`
+                       pkgconfig_lualib_found=`$PKG_CONFIG --exists lualib$l 2>/dev/null`
                        if test  "x$?" = "x0"; then
-@@ -21650,7 +21655,7 @@ $as_echo_n "checking for Lua headers and
+@@ -21934,7 +21939,7 @@ $as_echo_n "checking for Lua headers and
                  LUA_INCLUDES=`$LUACONFIG --include`
                  LUA_LIBS=`$LUACONFIG --libs`
                LUA_VERSION="5.0.x"
@@ -82,7 +82,7 @@ last last chunk: fix sed expression not 
              fi
          fi
  
-@@ -21928,8 +21933,8 @@ $as_echo "no" >&6; }
+@@ -22212,8 +22217,8 @@ $as_echo "no" >&6; }
  fi
  
  
@@ -93,32 +93,16 @@ last last chunk: fix sed expression not 
          save_CPPFLAGS=$CPPFLAGS
          CPPFLAGS="$CPPFLAGS $OCAML_INCLUDES"
          ac_fn_c_check_header_mongrel "$LINENO" "caml/mlvalues.h" "ac_cv_header_caml_mlvalues_h" "$ac_includes_default"
-@@ -22149,17 +22154,17 @@ test -n "$PHP" || PHP="php"
-       if test "x$PHP" = "x"; then
-         use_php="No (php not available)"
-       else
--        if test -d /usr/include/php7; then
--          PHP_INCLUDES="-I/usr/include/php7 -I/usr/include/php7/main -I/usr/include/php7/Zend -I/usr/include/php7/TSRM"
-+        if test -d ${PREFIX}/include/php7; then
-+          PHP_INCLUDES="-I${PREFIX}/include/php7 -I${PREFIX}/include/php7/main -I${PREFIX}/include/php7/Zend -I${PREFIX}/include/php7/TSRM"
+@@ -22487,7 +22492,7 @@ test -n "$PHPCONFIG" || PHPCONFIG="php-c
          else
--          if test -d /usr/include/php5; then
--            PHP_INCLUDES="-I/usr/include/php5 -I/usr/include/php5/main -I/usr/include/php5/Zend -I/usr/include/php5/TSRM"
-+          if test -d ${PREFIX}/include/php5; then
-+            PHP_INCLUDES="-I${PREFIX}/include/php5 -I${PREFIX}/include/php5/main -I${PREFIX}/include/php5/Zend -I${PREFIX}/include/php5/TSRM"
-           else
--            PHP_INCLUDES="-I/usr/include/php -I/usr/include/php/main -I/usr/include/php/TSRM -I/usr/include/php/Zend -I/usr/include/php/ext -I/usr/include/php/ext/date/lib"
-+            PHP_INCLUDES="-I${PREFIX}/include/php -I${PREFIX}/include/php/main -I${PREFIX}/include/php/TSRM -I${PREFIX}/include/php/Zend -I${PREFIX}/include/php/ext 
-I${PREFIX}/include/php/ext/date/lib"
-           fi
-         fi
--        PHP_INSTALL_DIR="/usr/lib${LIBPOSTFIX}/php/modules"
--        PHP_INSTALL_DATADIR="/usr/share/php"
-+        PHP_INSTALL_DIR="${PREFIX}/lib${LIBPOSTFIX}/php/modules"
-+        PHP_INSTALL_DATADIR="${PREFIX}/share/php"
-         PHP_LIBS=
-         save_CPPFLAGS=$CPPFLAGS
-         CPPFLAGS="$CPPFLAGS $PHP_INCLUDES"
-@@ -27214,10 +27219,6 @@ fi
+           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"
+@@ -27143,10 +27148,6 @@ fi
  
  
  

Index: pkgsrc/graphics/graphviz/patches/patch-plugin_xlib_gvdevice__xlib.c
diff -u pkgsrc/graphics/graphviz/patches/patch-plugin_xlib_gvdevice__xlib.c:1.1 pkgsrc/graphics/graphviz/patches/patch-plugin_xlib_gvdevice__xlib.c:1.2
--- pkgsrc/graphics/graphviz/patches/patch-plugin_xlib_gvdevice__xlib.c:1.1     Sat Jan 31 23:25:26 2015
+++ pkgsrc/graphics/graphviz/patches/patch-plugin_xlib_gvdevice__xlib.c Mon Jul 27 20:44:15 2020
@@ -1,10 +1,10 @@
-$NetBSD: patch-plugin_xlib_gvdevice__xlib.c,v 1.1 2015/01/31 23:25:26 jperkin Exp $
+$NetBSD: patch-plugin_xlib_gvdevice__xlib.c,v 1.2 2020/07/27 20:44:15 adam Exp $
 
 SunOS inotify requires sys/filio.h for FIONREAD.
 
---- plugin/xlib/gvdevice_xlib.c.orig   2014-04-13 20:40:25.000000000 +0000
+--- plugin/xlib/gvdevice_xlib.c.orig   2020-04-08 07:51:58.000000000 +0000
 +++ plugin/xlib/gvdevice_xlib.c
-@@ -39,6 +39,9 @@
+@@ -32,6 +32,9 @@
  #endif
  #ifdef HAVE_SYS_INOTIFY_H
  #include <sys/inotify.h>
@@ -12,5 +12,5 @@ SunOS inotify requires sys/filio.h for F
 +#include <sys/filio.h>
 +#endif
  #endif
- #ifdef HAVE_ERRNO_H
  #include <errno.h>
+ #ifdef HAVE_FCNTL_H

Added files:

Index: pkgsrc/graphics/graphviz/patches/patch-tclpkg_gv_Makefile.in
diff -u /dev/null pkgsrc/graphics/graphviz/patches/patch-tclpkg_gv_Makefile.in:1.1
--- /dev/null   Mon Jul 27 20:44:16 2020
+++ pkgsrc/graphics/graphviz/patches/patch-tclpkg_gv_Makefile.in        Mon Jul 27 20:44:15 2020
@@ -0,0 +1,17 @@
+$NetBSD: patch-tclpkg_gv_Makefile.in,v 1.1 2020/07/27 20:44:15 adam Exp $
+
+Add missing -I flags to point to perl files.
+
+See https://gitlab.com/graphviz/graphviz/issues/1576.
+
+--- tclpkg/gv/Makefile.in.orig 2019-08-11 14:47:21.000000000 -0600
++++ tclpkg/gv/Makefile.in      2019-08-11 15:00:23.000000000 -0600
+@@ -1054,7 +1054,7 @@
+ 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)
+ pkgphpdir = $(pkglibdir)/php
+ PHP_data = gv.php
+ nodist_libgv_php_la_SOURCES = gv_php.cpp php_gv.h

Prev by Date: CVS commit: pkgsrc/mail/opendmarc
Next by Date: CVS commit: pkgsrc
Previous by Thread: CVS commit: pkgsrc/mail/opendmarc
Next by Thread: CVS commit: pkgsrc
Indexes:

Home | Main Index | Thread Index | Old Index