Updated graphviz to 2.40.1.

December 21, 2016
	- Remove usage of ast_common.h
December 20, 2016
    - Release 2.40.0
        - network-simplex fixes and optimization (Stephen North)
	- built-in tred tool now available in the various swig generated
	language bindings (John Ellson)
	- number rounding added to SVG renderer (same as PS and TK rounding)
	to aid regression testing. (John Ellson)
	- additional regressson test framework, used in Travis CI builds. (Erwin Janssen)
	- PHP7 support (requires swig-3.0.11 or later). (John Ellson)
	- Allow user to specify clustering algorithm in gvmap. (Emden Gansner)
	- Add Sierpinski graph generator to gvgen. (Emden Gansner)
	- Extensive code cleanup (Erwin Janssen)
	- Removal of libgd source - use vanilla libgd from separate install
	- Windows builds (Erwin Janssen)
	- Appveyor CI for automated Windows build testing (Erwin Janssen)
	- Travis CI for Fedora/Centos builds (Erwin Janssen)
	- Added JSON output format, -Tjson  (Emden Gansner)
	- New curved arrowhead, cylinder node shape.
	- Resolves bugs: 2599, 1172
June 18, 2016
	- Experimenting with Travis CI
February 13, 2016
	- Add cylinder shape for databases.
	- Free installed plugins
	- Update makefile for dot so that the using libpanco_C in the static build include PANGOFT2
        as well as PANGOCAIRO_LIBS (needed for some versions of Ubuntu)
February 1, 2016
	- Add json output format
April 26, 2015
	- output class value in svg files
September 9, 2014
	- Add plain shape for use with HTML-like labels.
August 12, 2014
	- Add icurve arrowhead.
July 28, 2014
	- Revert to old, translate to origin semantics in neato, etc. Add flag notranslate if that is
          what the user desires.

8 files changed, 116 insertions, 109 deletions

diff --git a/graphics/graphviz/Makefile b/graphics/graphviz/Makefile
index dc785fbc066..816deddf8e4 100644
--- a/graphics/graphviz/Makefile
+++ b/graphics/graphviz/Makefile
@@ -1,7 +1,6 @@
-# $NetBSD: Makefile,v 1.164 2017/02/28 15:20:05 ryoon Exp $
+# $NetBSD: Makefile,v 1.165 2017/03/08 14:51:56 wiz Exp $
 
-DISTNAME=	graphviz-2.38.0
-PKGREVISION=	20
+DISTNAME=	graphviz-2.40.1
 CATEGORIES=	graphics
 MASTER_SITES=	http://www.graphviz.org/pub/graphviz/stable/SOURCES/
 
@@ -33,11 +32,12 @@ CONFIGURE_ENV+=		ac_cv_prog_RUBY=
 CPPFLAGS+=		-DNO_POSTSCRIPT_ALIAS=1
 PKGCONFIG_OVERRIDE+=	lib/cdt/libcdt.pc.in
 PKGCONFIG_OVERRIDE+=	lib/cgraph/libcgraph.pc.in
+PKGCONFIG_OVERRIDE+=	lib/edgepaint/liblab_gamut.pc.in
 PKGCONFIG_OVERRIDE+=	lib/expr/libexpr.pc.in
-PKGCONFIG_OVERRIDE+=	lib/graph/libgraph.pc.in
 PKGCONFIG_OVERRIDE+=	lib/gvc/libgvc.pc.in
 PKGCONFIG_OVERRIDE+=	lib/gvpr/libgvpr.pc.in
 PKGCONFIG_OVERRIDE+=	lib/pathplan/libpathplan.pc.in
+PKGCONFIG_OVERRIDE+=	lib/sfdpgen/libsfdp.pc.in
 PKGCONFIG_OVERRIDE+=	lib/xdot/libxdot.pc.in
 XAW_TYPE=		standard
 
diff --git a/graphics/graphviz/PLIST b/graphics/graphviz/PLIST
index e1bd9277b13..ec466f03376 100644
--- a/graphics/graphviz/PLIST
+++ b/graphics/graphviz/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.47 2014/05/06 09:33:13 wiz Exp $
+@comment $NetBSD: PLIST,v 1.48 2017/03/08 14:51:56 wiz Exp $
 bin/acyclic
 bin/bcomps
 bin/ccomps
@@ -75,7 +75,7 @@ ${PLIST.gtk}lib/graphviz/libgvplugin_gtk.la
 ${PLIST.ghostscript}lib/graphviz/libgvplugin_gs.la
 lib/graphviz/libgvplugin_neato_layout.la
 ${PLIST.pangocairo}lib/graphviz/libgvplugin_pango.la
-${PLIST.rsvg}lib/graphviz/libgvplugin_rsvg.la
+${PLIST.svg}lib/graphviz/libgvplugin_rsvg.la
 ${PLIST.pangocairo}lib/graphviz/libgvplugin_xlib.la
 ${PLIST.lua}lib/graphviz/lua/libgv_lua.la
 ${PLIST.ocaml}lib/graphviz/ocaml/META.gv
@@ -95,12 +95,12 @@ ${PLIST.tcl}lib/graphviz/tcl/libgv_tcl.la
 ${PLIST.tcl}lib/graphviz/tcl/libtcldot.la
 ${PLIST.tcl}lib/graphviz/tcl/libtcldot_builtin.la
 ${PLIST.tcl}lib/graphviz/tcl/libtclplan.la
-${PLIST.tcl}lib/graphviz/tcl/libtkspline.la
 ${PLIST.tcl}lib/graphviz/tcl/pkgIndex.tcl
 lib/libcdt.la
 lib/libcgraph.la
 lib/libgvc.la
 lib/libgvpr.la
+lib/liblab_gamut.la
 lib/libpathplan.la
 lib/libxdot.la
 ${PLIST.lua}lib/lua/gv.so
@@ -110,6 +110,7 @@ lib/pkgconfig/libcdt.pc
 lib/pkgconfig/libcgraph.pc
 lib/pkgconfig/libgvc.pc
 lib/pkgconfig/libgvpr.pc
+lib/pkgconfig/liblab_gamut.pc
 lib/pkgconfig/libpathplan.pc
 lib/pkgconfig/libxdot.pc
 ${PLIST.tcl}lib/tcl${TCL_BASEVER}/graphviz/libgdtclft.la
@@ -117,7 +118,6 @@ ${PLIST.tcl}lib/tcl${TCL_BASEVER}/graphviz/libgv_tcl.la
 ${PLIST.tcl}lib/tcl${TCL_BASEVER}/graphviz/libtcldot.la
 ${PLIST.tcl}lib/tcl${TCL_BASEVER}/graphviz/libtcldot_builtin.la
 ${PLIST.tcl}lib/tcl${TCL_BASEVER}/graphviz/libtclplan.la
-${PLIST.tcl}lib/tcl${TCL_BASEVER}/graphviz/libtkspline.la
 ${PLIST.tcl}lib/tcl${TCL_BASEVER}/graphviz/pkgIndex.tcl
 man/man1/acyclic.1
 man/man1/bcomps.1
@@ -127,7 +127,7 @@ man/man1/cluster.1
 man/man1/diffimg.1
 man/man1/dijkstra.1
 man/man1/dot.1
-${PLIST.x11}man/man1/dotty.1
+man/man1/dotty.1
 man/man1/edgepaint.1
 man/man1/fdp.1
 man/man1/gc.1
@@ -142,8 +142,9 @@ man/man1/gvmap.sh.1
 man/man1/gvpack.1
 man/man1/gvpr.1
 man/man1/gxl2gv.1
-${PLIST.x11}man/man1/lefty.1
-${PLIST.x11}man/man1/lneato.1
+man/man1/lefty.1
+man/man1/lneato.1
+man/man1/mingle.1
 man/man1/mm2gv.1
 man/man1/neato.1
 man/man1/nop.1
@@ -152,6 +153,7 @@ 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
@@ -167,10 +169,10 @@ ${PLIST.perl}man/man3/gv.3perl
 ${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
-${PLIST.tcl}man/man3/tkspline.3tk
 man/man3/xdot.3
 man/man7/graphviz.7
 ${PLIST.tcl}share/graphviz/demo/doted.tcl
@@ -197,8 +199,6 @@ ${PLIST.tcl}share/graphviz/demo/pathplan_data/paths.dat
 ${PLIST.tcl}share/graphviz/demo/pathplan_data/rotor.dat
 ${PLIST.tcl}share/graphviz/demo/pathplan_data/u.dat
 ${PLIST.tcl}share/graphviz/demo/pathplan_data/unknown.dat
-${PLIST.tcl}share/graphviz/demo/spline.tcl
-${PLIST.tcl}share/graphviz/demo/spline.tcl.README
 share/graphviz/doc/AUTHORS
 share/graphviz/doc/COPYING
 share/graphviz/doc/ChangeLog
@@ -291,6 +291,7 @@ 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
@@ -355,6 +356,7 @@ 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
@@ -401,7 +403,7 @@ 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/dotguide.pdf
-${PLIST.x11}share/graphviz/doc/pdf/dotty.1.pdf
+share/graphviz/doc/pdf/dotty.1.pdf
 share/graphviz/doc/pdf/dottyguide.pdf
 share/graphviz/doc/pdf/edgepaint.1.pdf
 share/graphviz/doc/pdf/expr.3.pdf
@@ -426,10 +428,12 @@ 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/gxl2gv.1.pdf
-${PLIST.x11}share/graphviz/doc/pdf/lefty.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
-${PLIST.x11}share/graphviz/doc/pdf/lneato.1.pdf
+share/graphviz/doc/pdf/lneato.1.pdf
+share/graphviz/doc/pdf/mingle.1.pdf
 share/graphviz/doc/pdf/mm2gv.1.pdf
 share/graphviz/doc/pdf/neato.1.pdf
 share/graphviz/doc/pdf/neatoguide.pdf
@@ -442,8 +446,8 @@ share/graphviz/doc/pdf/prune.pdf
 share/graphviz/doc/pdf/sccmap.1.pdf
 share/graphviz/doc/pdf/sfdp.1.pdf
 share/graphviz/doc/pdf/smyrna.pdf
+share/graphviz/doc/pdf/smyrna.1.pdf
 ${PLIST.tcl}share/graphviz/doc/pdf/tcldot.3tcl.pdf
-${PLIST.tcl}share/graphviz/doc/pdf/tkspline.3tk.pdf
 share/graphviz/doc/pdf/tred.1.pdf
 share/graphviz/doc/pdf/twopi.1.pdf
 share/graphviz/doc/pdf/unflatten.1.pdf
@@ -509,13 +513,17 @@ share/graphviz/graphs/undirected/Heawood.gv
 share/graphviz/graphs/undirected/Petersen.gv
 share/graphviz/graphs/undirected/ngk10_4.gv
 share/graphviz/graphs/undirected/process.gv
+share/graphviz/gvpr/addedges
 share/graphviz/gvpr/addranks
 share/graphviz/gvpr/addrings
 share/graphviz/gvpr/anon
 share/graphviz/gvpr/attr
 share/graphviz/gvpr/bb
 share/graphviz/gvpr/bbox
+share/graphviz/gvpr/binduce
+share/graphviz/gvpr/bipart
 share/graphviz/gvpr/chkclusters
+share/graphviz/gvpr/chkedges
 share/graphviz/gvpr/cliptree
 share/graphviz/gvpr/col
 share/graphviz/gvpr/collapse
@@ -531,6 +539,7 @@ share/graphviz/gvpr/dijkstra
 share/graphviz/gvpr/flatten
 share/graphviz/gvpr/get-layers-list
 share/graphviz/gvpr/group
+share/graphviz/gvpr/histogram
 share/graphviz/gvpr/indent
 share/graphviz/gvpr/knbhd
 share/graphviz/gvpr/maxdeg
@@ -553,20 +562,3 @@ share/graphviz/lefty/fractal2.lefty
 share/graphviz/lefty/lefty.psp
 share/graphviz/lefty/slides.lefty
 share/graphviz/lefty/tree.lefty
-@pkgdir share/graphviz/smyrna
-@pkgdir share/graphviz/examples
-@pkgdir share/graphviz/demo/pathplan_data
-@pkgdir lib/graphviz/sharp
-@pkgdir lib/graphviz/ruby
-@pkgdir lib/graphviz/python25
-@pkgdir lib/graphviz/python24
-@pkgdir lib/graphviz/python23
-@pkgdir lib/graphviz/python
-@pkgdir lib/graphviz/php
-@pkgdir lib/graphviz/perl
-@pkgdir lib/graphviz/ocaml
-@pkgdir lib/graphviz/lua
-@pkgdir lib/graphviz/java
-@pkgdir lib/graphviz/io
-@pkgdir lib/graphviz/guile
-@pkgdir lib/graphviz/R
diff --git a/graphics/graphviz/distinfo b/graphics/graphviz/distinfo
index 7703e962d36..eaffe5b3f02 100644
--- a/graphics/graphviz/distinfo
+++ b/graphics/graphviz/distinfo
@@ -1,14 +1,13 @@
-$NetBSD: distinfo,v 1.56 2015/12/13 17:44:45 richard Exp $
+$NetBSD: distinfo,v 1.57 2017/03/08 14:51:56 wiz Exp $
 
-SHA1 (graphviz-2.38.0.tar.gz) = 053c771278909160916ca5464a0a98ebf034c6ef
-RMD160 (graphviz-2.38.0.tar.gz) = a80c2fa6b9955444b2103a99167d7020b23e4c4e
-SHA512 (graphviz-2.38.0.tar.gz) = 0e51a97dae595f4e80bc9e4a12ba3c48485fab19941a28d522f5a0624b6a767e0ba720e9e55bff8efe8308dd1cd3793e2c99cb5fdfceb2d5cafb0cbee907e531
-Size (graphviz-2.38.0.tar.gz) = 25848858 bytes
+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 (patch-cmd_lefty_os_unix_io.c) = 48f91c79b97928b54ae24af59a9fea173f34dfe5
 SHA1 (patch-config_config__perl.pl) = 85d535282a819c1055386244f7b520387d0ddbb1
-SHA1 (patch-configure) = f772bedfac63c3b473ebae1621b72982a13fe5a3
-SHA1 (patch-configure.ac) = ec844ae85b6be9cf095ec800df6983b061d62b5d
-SHA1 (patch-lib_cgraph_scan.l) = 72cc178acb369007a4a672d20af196bb6b6df35b
-SHA1 (patch-lib_gvc_Makefile.in) = 985ffe3efb0e7f876ece14dc0d2a719ec06357e2
+SHA1 (patch-configure) = 2e541e065a594093f54e47d5a24972367405bec1
+SHA1 (patch-configure.ac) = c02e7e2ab65cb5df8bcf15c1bbed0e673480bd3f
+SHA1 (patch-lib_gvc_Makefile.in) = f469c2dc53cf9af5b1e86f5da04bf9575685bd41
 SHA1 (patch-plugin_gs_gvloadimage__gs.c) = b5b46a1e7dc52f163526c5b8b7e1b893d5500e3c
 SHA1 (patch-plugin_xlib_gvdevice__xlib.c) = 932c337dcf9cb53d52f24c6c20818038ed169cd0
diff --git a/graphics/graphviz/options.mk b/graphics/graphviz/options.mk
index 844aaba6b87..10fd9104906 100644
--- a/graphics/graphviz/options.mk
+++ b/graphics/graphviz/options.mk
@@ -1,7 +1,7 @@
-# $NetBSD: options.mk,v 1.22 2016/09/16 10:53:14 wiz Exp $
+# $NetBSD: options.mk,v 1.23 2017/03/08 14:51:56 wiz Exp $
 
 PKG_OPTIONS_VAR=	PKG_OPTIONS.graphviz
-PKG_SUPPORTED_OPTIONS=	gd ghostscript gtk lua ocaml pangocairo rsvg tcl x11 perl # guile does not build with guile20
+PKG_SUPPORTED_OPTIONS=	gd ghostscript gtk lua ocaml pangocairo svg tcl x11 perl # guile does not build with guile20
 PKG_SUGGESTED_OPTIONS=	gd gtk lua pangocairo perl tcl x11
 # Explanation of consequence of options, to help those trying to slim down:
 #   guile ocaml lua tcl perl: extension language support
@@ -10,14 +10,14 @@ PKG_SUGGESTED_OPTIONS=	gd gtk lua pangocairo perl tcl x11
 #   pangocairo: basic ps/pdf support.
 #   gtk: basic graphic format support (in addition to gd, which isn't
 #     maintained anymore)
-#   rsvg: Omitting loses svg support. librsvg has large dependencies
+#   svg: Omitting loses svg support. librsvg has large dependencies
 #     including some GNOME libs.
 #   gd: basic graphic format support, especially gif
 #   ghostscript: provides better ps/pdf-support, plus eps
 
 .include "../../mk/bsd.options.mk"
 
-PLIST_VARS+=		gd ghostscript gtk guile lua ocaml pangocairo perl rsvg tcl x11
+PLIST_VARS+=		gd ghostscript gtk guile lua ocaml pangocairo perl svg tcl x11
 
 .if !empty(PKG_OPTIONS:Mx11)
 .include "../../mk/xaw.buildlink3.mk"
@@ -45,9 +45,9 @@ CONFIGURE_ARGS+=	--without-gtk
 CONFIGURE_ARGS+=	--without-gnomeui
 .    endif
 
-.    if !empty(PKG_OPTIONS:Mrsvg)
+.    if !empty(PKG_OPTIONS:Msvg)
 .    include "../../graphics/librsvg/buildlink3.mk"
-PLIST.rsvg=		yes
+PLIST.svg=		yes
 .    else
 CONFIGURE_ARGS+=	--without-rsvg
 .    endif
@@ -68,8 +68,8 @@ CONFIGURE_ARGS+=	--without-gdk-pixbuf
 CONFIGURE_ARGS+=	--without-gtk
 CONFIGURE_ARGS+=	--without-gnomeui
 
-.    if !empty(PKG_OPTIONS:Mrsvg)
-PKG_FAIL_REASON+=	"option rsvg needs option pangocairo"
+.    if !empty(PKG_OPTIONS:Msvg)
+PKG_FAIL_REASON+=	"option svg needs option pangocairo"
 .    endif
 CONFIGURE_ARGS+=	--without-rsvg
 .  endif
@@ -95,8 +95,8 @@ CONFIGURE_ARGS+=	--without-gdk-pixbuf
 CONFIGURE_ARGS+=	--without-gtk
 CONFIGURE_ARGS+=	--without-gnomeui
 
-.  if !empty(PKG_OPTIONS:Mrsvg)
-PKG_FAIL_REASON+=	"option rsvg needs option pangocairo and x11"
+.  if !empty(PKG_OPTIONS:Msvg)
+PKG_FAIL_REASON+=	"option svg needs option pangocairo and x11"
 .  endif
 CONFIGURE_ARGS+=	--without-rsvg
 .endif
diff --git a/graphics/graphviz/patches/patch-configure b/graphics/graphviz/patches/patch-configure
index 7b0a1967ee4..eb9a95fa15c 100644
--- a/graphics/graphviz/patches/patch-configure
+++ b/graphics/graphviz/patches/patch-configure
@@ -1,4 +1,4 @@
-$NetBSD: patch-configure,v 1.6 2014/05/06 09:33:13 wiz Exp $
+$NetBSD: patch-configure,v 1.7 2017/03/08 14:51:56 wiz 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	2014-04-13 20:41:48.000000000 +0000
+--- configure.orig	2016-12-25 03:04:52.000000000 +0000
 +++ configure
-@@ -3521,8 +3521,15 @@ case "${host_os}" in
+@@ -3527,8 +3527,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,22 +30,32 @@ last last chunk: fix sed expression not to use + which is not in BRE (guile)
  	fi
  	;;
  esac
-@@ -3536,14 +3543,12 @@ if test -z "$LIBPOSTFIX"; then
+@@ -3544,7 +3551,6 @@ if test -z "$LIBPOSTFIX"; then
      *linux* )
        case "${host_cpu}" in
          aarch64 | powerpc64 | powerpc64le | s390x | x86_64 | sparc64 )
 -          LIBPOSTFIX="64"
+           INTGOSIZE=64
            ;;
        esac
-       ;;
+@@ -3552,7 +3558,6 @@ if test -z "$LIBPOSTFIX"; then
      *solaris* )
        case "${host_cpu}" in
          x86_64 | sparc64 )
 -          LIBPOSTFIX="/64"
+           INTGOSIZE=64
            ;;
        esac
-       ;;
-@@ -21101,7 +21106,7 @@ done
+@@ -17920,7 +17925,7 @@ esac
+ 
+ 
+ 
+-if test "${GCC}" == "yes"
++if test "${GCC}" = "yes"
+ then
+   # Enable common warnings flags
+   CFLAGS="${CFLAGS} -Wall"
+@@ -20954,7 +20959,7 @@ done
        if test "x$GUILE" = "x"; then
          use_guile="No (guile not available)"
        else
@@ -54,7 +64,7 @@ last last chunk: fix sed expression not to use + which is not in BRE (guile)
          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
-@@ -21733,7 +21738,7 @@ $as_echo_n "checking for Lua headers and
+@@ -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`
@@ -63,7 +73,7 @@ last last chunk: fix sed expression not to use + which is not in BRE (guile)
  
  		        pkgconfig_lualib_found=`$PKGCONFIG --exists lualib$l 2>/dev/null`
  		        if test  "x$?" = "x0"; then
-@@ -21797,7 +21802,7 @@ $as_echo_n "checking for Lua headers and
+@@ -21650,7 +21655,7 @@ $as_echo_n "checking for Lua headers and
                  LUA_INCLUDES=`$LUACONFIG --include`
                  LUA_LIBS=`$LUACONFIG --libs`
  	        LUA_VERSION="5.0.x"
@@ -72,7 +82,7 @@ last last chunk: fix sed expression not to use + which is not in BRE (guile)
              fi
          fi
  
-@@ -22075,8 +22080,8 @@ $as_echo "no" >&6; }
+@@ -21928,8 +21933,8 @@ $as_echo "no" >&6; }
  fi
  
  
@@ -83,17 +93,23 @@ last last chunk: fix sed expression not to use + which is not in BRE (guile)
          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"
-@@ -22291,13 +22296,13 @@ done
+@@ -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/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"
+-        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"
          else
--          PHP_INCLUDES="-I/usr/include/php -I/usr/include/php/main -I/usr/include/php/Zend -I/usr/include/php/TSRM"
-+          PHP_INCLUDES="-I${PREFIX}/include/php -I${PREFIX}/include/php/main -I${PREFIX}/include/php/Zend -I${PREFIX}/include/php/TSRM"
+-          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"
@@ -102,7 +118,7 @@ last last chunk: fix sed expression not to use + which is not in BRE (guile)
          PHP_LIBS=
          save_CPPFLAGS=$CPPFLAGS
          CPPFLAGS="$CPPFLAGS $PHP_INCLUDES"
-@@ -27347,10 +27352,6 @@ fi
+@@ -27214,10 +27219,6 @@ fi
  
  
  
diff --git a/graphics/graphviz/patches/patch-configure.ac b/graphics/graphviz/patches/patch-configure.ac
index 88d751d086d..e3941aa16f3 100644
--- a/graphics/graphviz/patches/patch-configure.ac
+++ b/graphics/graphviz/patches/patch-configure.ac
@@ -1,8 +1,8 @@
-$NetBSD: patch-configure.ac,v 1.3 2014/05/06 09:33:13 wiz Exp $
+$NetBSD: patch-configure.ac,v 1.4 2017/03/08 14:51:56 wiz Exp $
 
---- configure.ac.orig	2014-04-13 20:40:25.000000000 +0000
+--- configure.ac.orig	2016-12-22 05:44:41.000000000 +0000
 +++ configure.ac
-@@ -92,9 +92,20 @@ case "${host_os}" in
+@@ -95,9 +95,20 @@ case "${host_os}" in
  	# Windows version numbers
  	# For the build number: months since Jan 2000, day of month from the timestamp
  	# For the revision number: hour, minute from the timestamp
@@ -26,22 +26,32 @@ $NetBSD: patch-configure.ac,v 1.3 2014/05/06 09:33:13 wiz Exp $
  	fi
  	;;
  esac
-@@ -108,14 +119,12 @@ if test -z "$LIBPOSTFIX"; then
+@@ -113,7 +124,6 @@ if test -z "$LIBPOSTFIX"; then
      *linux* )
        case "${host_cpu}" in
          aarch64 | powerpc64 | powerpc64le | s390x | x86_64 | sparc64 )
 -          LIBPOSTFIX="64"
+           INTGOSIZE=64
            ;;
        esac
-       ;;
+@@ -121,7 +131,6 @@ if test -z "$LIBPOSTFIX"; then
      *solaris* )
        case "${host_cpu}" in
          x86_64 | sparc64 )
 -          LIBPOSTFIX="/64"
+           INTGOSIZE=64
            ;;
        esac
-       ;;
-@@ -894,7 +903,7 @@ else
+@@ -313,7 +322,7 @@ AC_C_INLINE
+ dnl ===========================================================================
+ dnl Set GCC compiler flags
+ 
+-if [test "${GCC}" == "yes"]
++if [test "${GCC}" = "yes"]
+ then
+   # Enable common warnings flags
+   CFLAGS="${CFLAGS} -Wall"
+@@ -878,7 +887,7 @@ else
  		        LUA_VERSION=`$PKGCONFIG --modversion lua$l`
                          LUA_INCLUDES="$LUA_CFLAGS "`$PKGCONFIG --cflags lua$l`
                          LUA_LIBS="$LUA_LFLAGS "`$PKGCONFIG --libs lua$l`
@@ -50,7 +60,7 @@ $NetBSD: patch-configure.ac,v 1.3 2014/05/06 09:33:13 wiz Exp $
      
  		        pkgconfig_lualib_found=`$PKGCONFIG --exists lualib$l 2>/dev/null`
  		        if test  "x$?" = "x0"; then
-@@ -916,7 +925,7 @@ else
+@@ -900,7 +909,7 @@ else
                  LUA_INCLUDES=`$LUACONFIG --include`
                  LUA_LIBS=`$LUACONFIG --libs`
  	        LUA_VERSION="5.0.x"
@@ -59,7 +69,7 @@ $NetBSD: patch-configure.ac,v 1.3 2014/05/06 09:33:13 wiz Exp $
              fi
          fi
      
-@@ -1006,8 +1015,8 @@ else
+@@ -990,8 +999,8 @@ else
          use_ocaml="No (ocaml not available)"
        else
          AC_CHECK_PROG(OCAML_OPT,ocamlopt,ocamlopt)
@@ -70,17 +80,23 @@ $NetBSD: patch-configure.ac,v 1.3 2014/05/06 09:33:13 wiz Exp $
          save_CPPFLAGS=$CPPFLAGS
          CPPFLAGS="$CPPFLAGS $OCAML_INCLUDES"
          AC_CHECK_HEADER(caml/mlvalues.h,[
-@@ -1105,13 +1114,13 @@ else
+@@ -1093,17 +1102,17 @@ else
        if test "x$PHP" = "x"; then
          use_php="No (php not available)"
        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"
+-        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"
          else
--          PHP_INCLUDES="-I/usr/include/php -I/usr/include/php/main -I/usr/include/php/Zend -I/usr/include/php/TSRM"
-+          PHP_INCLUDES="-I${PREFIX}/include/php -I${PREFIX}/include/php/main -I${PREFIX}/include/php/Zend -I${PREFIX}/include/php/TSRM"
+-          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"
@@ -89,7 +105,7 @@ $NetBSD: patch-configure.ac,v 1.3 2014/05/06 09:33:13 wiz Exp $
          PHP_LIBS=
          save_CPPFLAGS=$CPPFLAGS
          CPPFLAGS="$CPPFLAGS $PHP_INCLUDES"
-@@ -2658,7 +2667,7 @@ dnl INCLUDES and LIBS for PLATFORMSDK
+@@ -2606,7 +2615,7 @@ dnl INCLUDES and LIBS for PLATFORMSDK
  
  AC_ARG_WITH(platformsdkincludedir,
    [AS_HELP_STRING([--with-platformsdkincludedir=DIR],[use Platform SDK (Windows) includes from DIR])],
diff --git a/graphics/graphviz/patches/patch-lib_cgraph_scan.l b/graphics/graphviz/patches/patch-lib_cgraph_scan.l
deleted file mode 100644
index a97628fe8bb..00000000000
--- a/graphics/graphviz/patches/patch-lib_cgraph_scan.l
+++ /dev/null
@@ -1,16 +0,0 @@
-$NetBSD: patch-lib_cgraph_scan.l,v 1.4 2014/12/01 08:45:04 wiz Exp $
-
-Add format string.
-https://github.com/ellson/graphviz/commit/99eda421f7ddc27b14e4ac1d2126e5fe41719081
-
---- lib/cgraph/scan.l.orig	2014-04-13 20:40:25.000000000 +0000
-+++ lib/cgraph/scan.l
-@@ -149,7 +149,7 @@ static int chkNum(void) {
- 	agxbput(&xb,buf);
- 	agxbput(&xb,fname);
- 	agxbput(&xb, " splits into two tokens\n");
--	agerr(AGWARN,agxbuse(&xb));
-+	agerr(AGWARN,"%s", agxbuse(&xb));
- 
- 	agxbfree(&xb);
- 	return 1;
diff --git a/graphics/graphviz/patches/patch-lib_gvc_Makefile.in b/graphics/graphviz/patches/patch-lib_gvc_Makefile.in
index 3a9da3af7d8..4a1672355ef 100644
--- a/graphics/graphviz/patches/patch-lib_gvc_Makefile.in
+++ b/graphics/graphviz/patches/patch-lib_gvc_Makefile.in
@@ -1,8 +1,8 @@
-$NetBSD: patch-lib_gvc_Makefile.in,v 1.3 2014/05/06 09:33:13 wiz Exp $
+$NetBSD: patch-lib_gvc_Makefile.in,v 1.4 2017/03/08 14:51:56 wiz Exp $
 
---- lib/gvc/Makefile.in.orig	2014-04-13 20:41:55.000000000 +0000
+--- lib/gvc/Makefile.in.orig	2016-12-25 03:04:59.000000000 +0000
 +++ lib/gvc/Makefile.in
-@@ -570,7 +570,7 @@ libgvc_la_LIBADD = $(libgvc_C_la_LIBADD)
+@@ -613,7 +613,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 \
@@ -10,4 +10,4 @@ $NetBSD: patch-lib_gvc_Makefile.in,v 1.3 2014/05/06 09:33:13 wiz Exp $
 +	$(EXPAT_LIBS) $(Z_LIBS) $(MATH_LIBS) ${PTHREAD_LDFLAGS} ${PTHREAD_LIBS}
  
  libgvc_la_DEPENDENCIES = $(libgvc_C_la_DEPENDENCIES)
- EXTRA_DIST = $(man_MANS) $(pdf_DATA) regex_win32.h regex_win32.c gvc.vcproj
+ EXTRA_DIST = $(man_MANS) $(pdf_DATA)