3 files changed, 70 insertions, 32 deletions

diff --git a/graphics/graphviz/Makefile b/graphics/graphviz/Makefile
index 1ac7570fdd0e..42491664a72f 100644
--- a/graphics/graphviz/Makefile
+++ b/graphics/graphviz/Makefile
@@ -6,8 +6,7 @@
 #
 
 PORTNAME=	graphviz
-PORTVERSION=	2.24.0
-PORTREVISION=	1
+PORTVERSION=	2.26.0
 CATEGORIES=	graphics tk
 MASTER_SITES=	http://www.graphviz.org/pub/graphviz/ARCHIVE/
 
@@ -33,9 +32,10 @@ PLIST_SUB=	PORTVERSION="${PORTVERSION}"
 MAKE_ENV=	EXPR_COMPAT=yes MISSING=${TRUE}
 
 MAN1=		acyclic.1 bcomps.1 ccomps.1 dijkstra.1 dot.1 dotty.1 gc.1 \
-		gv2gxl.1 gvgen.1 mm2gv.1 gvcolor.1 gvpack.1 gvpr.1 lneato.1 \
-		nop.1 osage.1 prune.1 sccmap.1 tred.1 unflatten.1
-MAN3=		cdt.3 cgraph.3 graph.3 gvc.3 pathplan.3
+		gml2gv.1 gv2gxl.1 gvgen.1 mm2gv.1 gvcolor.1 gvpack.1 gvpr.1 \
+		lneato.1 nop.1 osage.1 prune.1 sccmap.1 smyrna.1 tred.1 \
+		unflatten.1
+MAN3=		cdt.3 cgraph.3 graph.3 gvc.3 pathplan.3 xdot.3
 MAN7=		graphviz.7
 MLINKS=		dot.1 circo.1 \
 		dot.1 fdp.1 \
diff --git a/graphics/graphviz/distinfo b/graphics/graphviz/distinfo
index d9d88f7a90ca..ba32c7df9b7b 100644
--- a/graphics/graphviz/distinfo
+++ b/graphics/graphviz/distinfo
@@ -1,3 +1,3 @@
-MD5 (graphviz-2.24.0.tar.gz) = 806a30dbc3f8deb219216f35be0e7a40
-SHA256 (graphviz-2.24.0.tar.gz) = 01182be7851ef6d292a916b19ac25a33bce5dccbd4661bf3101abbd3dfb1ae00
-SIZE (graphviz-2.24.0.tar.gz) = 16746568
+MD5 (graphviz-2.26.0.tar.gz) = 0609b42cb9ef913b7af13e43c4d716c9
+SHA256 (graphviz-2.26.0.tar.gz) = 2f37344050de50e28dd04a625ae32f881542586ff20209e342ce17969f680691
+SIZE (graphviz-2.26.0.tar.gz) = 16946980
diff --git a/graphics/graphviz/pkg-plist b/graphics/graphviz/pkg-plist
index 1362afba4017..50a688037207 100644
--- a/graphics/graphviz/pkg-plist
+++ b/graphics/graphviz/pkg-plist
@@ -9,6 +9,7 @@ bin/dot2gxl
 bin/dotty
 bin/fdp
 bin/gc
+bin/gml2gv
 bin/gv2gxl
 bin/gvcolor
 bin/gvgen
@@ -24,51 +25,54 @@ bin/nop
 bin/osage
 bin/prune
 bin/sccmap
+bin/sfdp
 %%WITH_SMYRNA%%bin/smyrna
 bin/tred
 bin/twopi
 bin/unflatten
 %%WITH_PANGOCAIRO%%bin/vimdot
+include/graphviz/agxbuf.h
+include/graphviz/arith.h
 include/graphviz/ast_common.h
 include/graphviz/cdt.h
 include/graphviz/cgraph.h
+include/graphviz/color.h
 include/graphviz/dthdr.h
-include/graphviz/graph.h
-include/graphviz/gvconfig.h
-include/graphviz/libgraph.h
-include/graphviz/triefa.h
-include/graphviz/parser.h
-include/graphviz/agxbuf.h
-include/graphviz/pathgeom.h
-include/graphviz/pathplan.h
-include/graphviz/pathutil.h
-include/graphviz/solvers.h
-include/graphviz/textpara.h
-include/graphviz/usershape.h
-include/graphviz/vis.h
-include/graphviz/vispath.h
-include/graphviz/logic.h
-include/graphviz/arith.h
-include/graphviz/tri.h
 include/graphviz/geom.h
-include/graphviz/color.h
-include/graphviz/types.h
 include/graphviz/globals.h
+include/graphviz/graph.h
+include/graphviz/graphviz_version.h
+include/graphviz/gv.i
+include/graphviz/gv.cpp
 include/graphviz/gvc.h
 include/graphviz/gvcext.h
 include/graphviz/gvcommon.h
-include/graphviz/gvplugin.h
-include/graphviz/gvcjob.h
+include/graphviz/gvconfig.h
 include/graphviz/gvcint.h
+include/graphviz/gvcjob.h
+include/graphviz/gvplugin.h
 include/graphviz/gvplugin_render.h
 include/graphviz/gvplugin_layout.h
 include/graphviz/gvplugin_loadimage.h
 include/graphviz/gvplugin_textlayout.h
 include/graphviz/gvplugin_device.h
+include/graphviz/gvpr.h
+include/graphviz/libgraph.h
+include/graphviz/logic.h
 include/graphviz/pack.h
-include/graphviz/gv.i
-include/graphviz/gv.cpp
-include/graphviz/graphviz_version.h
+include/graphviz/parser.h
+include/graphviz/pathgeom.h
+include/graphviz/pathplan.h
+include/graphviz/pathutil.h
+include/graphviz/solvers.h
+include/graphviz/textpara.h
+include/graphviz/tri.h
+include/graphviz/triefa.h
+include/graphviz/types.h
+include/graphviz/usershape.h
+include/graphviz/vis.h
+include/graphviz/vispath.h
+include/graphviz/xdot.h
 lib/graphviz/config6
 lib/graphviz/libcdt.so
 lib/graphviz/libcdt.so.4
@@ -126,6 +130,10 @@ lib/graphviz/libgvplugin_neato_layout.a
 %%WITH_PANGOCAIRO%%lib/graphviz/libgvplugin_xlib.la
 %%WITH_PANGOCAIRO%%lib/graphviz/libgvplugin_xlib.so
 %%WITH_PANGOCAIRO%%lib/graphviz/libgvplugin_xlib.so.6
+lib/graphviz/libgvpr.a
+lib/graphviz/libgvpr.la
+lib/graphviz/libgvpr.so
+lib/graphviz/libgvpr.so.1
 %%WITH_GUILE%%lib/graphviz/guile/libgv_guile.a
 %%WITH_GUILE%%lib/graphviz/guile/libgv_guile.la
 %%WITH_GUILE%%lib/graphviz/guile/libgv_guile.so
@@ -191,11 +199,17 @@ lib/graphviz/libgvplugin_neato_layout.a
 %%WITH_DEVIL%%lib/graphviz/libgvplugin_devil.la
 %%WITH_DEVIL%%lib/graphviz/libgvplugin_devil.so
 %%WITH_DEVIL%%lib/graphviz/libgvplugin_devil.so.6
+lib/graphviz/libxdot.a
+lib/graphviz/libxdot.la
+lib/graphviz/libxdot.so
+lib/graphviz/libxdot.so.4
 libdata/pkgconfig/libcdt.pc
 libdata/pkgconfig/libgraph.pc
 libdata/pkgconfig/libcgraph.pc
 libdata/pkgconfig/libpathplan.pc
 libdata/pkgconfig/libgvc.pc
+libdata/pkgconfig/libgvpr.pc
+libdata/pkgconfig/libxdot.pc
 %%PORTDOCS%%%%DOCSDIR%%/AUTHORS
 %%PORTDOCS%%%%DOCSDIR%%/COPYING
 %%PORTDOCS%%%%DOCSDIR%%/ChangeLog
@@ -328,6 +342,7 @@ libdata/pkgconfig/libgvc.pc
 %%PORTDOCS%%%%DOCSDIR%%/pdf/fdp.1.pdf
 %%PORTDOCS%%%%DOCSDIR%%/pdf/gc.1.pdf
 %%PORTDOCS%%%%DOCSDIR%%/pdf/gdtclft.3tcl.pdf
+%%PORTDOCS%%%%DOCSDIR%%/pdf/gml2gv.1.pdf
 %%PORTDOCS%%%%DOCSDIR%%/pdf/graph.3.pdf
 %%PORTDOCS%%%%DOCSDIR%%/pdf/gv.3guile.pdf
 %%PORTDOCS%%%%DOCSDIR%%/pdf/gv.3io.pdf
@@ -360,11 +375,14 @@ libdata/pkgconfig/libgvc.pc
 %%PORTDOCS%%%%DOCSDIR%%/pdf/pathplan.3.pdf
 %%PORTDOCS%%%%DOCSDIR%%/pdf/prune.pdf
 %%PORTDOCS%%%%DOCSDIR%%/pdf/sccmap.1.pdf
+%%PORTDOCS%%%%DOCSDIR%%/pdf/sfdp.1.pdf
+%%PORTDOCS%%%%DOCSDIR%%/pdf/smyrna.1.pdf
 %%PORTDOCS%%%%DOCSDIR%%/pdf/tcldot.3tcl.pdf
 %%PORTDOCS%%%%DOCSDIR%%/pdf/tkspline.3tk.pdf
 %%PORTDOCS%%%%DOCSDIR%%/pdf/tred.1.pdf
 %%PORTDOCS%%%%DOCSDIR%%/pdf/twopi.1.pdf
 %%PORTDOCS%%%%DOCSDIR%%/pdf/unflatten.1.pdf
+%%PORTDOCS%%%%DOCSDIR%%/pdf/xdot.3.pdf
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/entities.tcl
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/entities.tcl.README
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/doted.tcl
@@ -398,31 +416,49 @@ libdata/pkgconfig/libgvc.pc
 %%DATADIR%%/doc/html/schema/attributes.xslt
 %%WITH_SMYRNA%%%%DATADIR%%/examples/4elt.dot
 %%WITH_SMYRNA%%%%DATADIR%%/examples/world.dot
+%%WITH_SMYRNA%%%%DATADIR%%/smyrna/2D.png
+%%WITH_SMYRNA%%%%DATADIR%%/smyrna/3D.png
 %%WITH_SMYRNA%%%%DATADIR%%/smyrna/AntiselectRect.png
 %%WITH_SMYRNA%%%%DATADIR%%/smyrna/AntiselectRectX.png
 %%WITH_SMYRNA%%%%DATADIR%%/smyrna/add_edge.png
 %%WITH_SMYRNA%%%%DATADIR%%/smyrna/arial.tga
 %%WITH_SMYRNA%%%%DATADIR%%/smyrna/attrs.txt
+%%WITH_SMYRNA%%%%DATADIR%%/smyrna/attr_widgets.dot
+%%WITH_SMYRNA%%%%DATADIR%%/smyrna/center.png
 %%WITH_SMYRNA%%%%DATADIR%%/smyrna/cursor.png
 %%WITH_SMYRNA%%%%DATADIR%%/smyrna/deletE_edge.png
 %%WITH_SMYRNA%%%%DATADIR%%/smyrna/delete_node.png
+%%WITH_SMYRNA%%%%DATADIR%%/smyrna/details.png
+%%WITH_SMYRNA%%%%DATADIR%%/smyrna/edge.png
 %%WITH_SMYRNA%%%%DATADIR%%/smyrna/find_edge.png
 %%WITH_SMYRNA%%%%DATADIR%%/smyrna/find_node.png
+%%WITH_SMYRNA%%%%DATADIR%%/smyrna/fish.PNG
+%%WITH_SMYRNA%%%%DATADIR%%/smyrna/fisheye.png
 %%WITH_SMYRNA%%%%DATADIR%%/smyrna/fisheye.raw
+%%WITH_SMYRNA%%%%DATADIR%%/smyrna/fit.png
 %%WITH_SMYRNA%%%%DATADIR%%/smyrna/fit_to_screen.png
 %%WITH_SMYRNA%%%%DATADIR%%/smyrna/hourglass.png
 %%WITH_SMYRNA%%%%DATADIR%%/smyrna/magifier_zoom_out.png
 %%WITH_SMYRNA%%%%DATADIR%%/smyrna/magnifier.png
 %%WITH_SMYRNA%%%%DATADIR%%/smyrna/magnifier_zoom_in.png
+%%WITH_SMYRNA%%%%DATADIR%%/smyrna/mod_3D.png
+%%WITH_SMYRNA%%%%DATADIR%%/smyrna/mod_fisheye.png
+%%WITH_SMYRNA%%%%DATADIR%%/smyrna/mouse_actions.txt
 %%WITH_SMYRNA%%%%DATADIR%%/smyrna/move.png
 %%WITH_SMYRNA%%%%DATADIR%%/smyrna/new_delete.png
 %%WITH_SMYRNA%%%%DATADIR%%/smyrna/new_node.png
 %%WITH_SMYRNA%%%%DATADIR%%/smyrna/newzoom.png
+%%WITH_SMYRNA%%%%DATADIR%%/smyrna/no_fisheye.png
+%%WITH_SMYRNA%%%%DATADIR%%/smyrna/node.png
 %%WITH_SMYRNA%%%%DATADIR%%/smyrna/ok.raw
 %%WITH_SMYRNA%%%%DATADIR%%/smyrna/ok2.raw
 %%WITH_SMYRNA%%%%DATADIR%%/smyrna/ok3.raw
 %%WITH_SMYRNA%%%%DATADIR%%/smyrna/pan.png
 %%WITH_SMYRNA%%%%DATADIR%%/smyrna/pan.raw
+%%WITH_SMYRNA%%%%DATADIR%%/smyrna/preview.png
+%%WITH_SMYRNA%%%%DATADIR%%/smyrna/rect_select.png
+%%WITH_SMYRNA%%%%DATADIR%%/smyrna/rect_select2.png
+%%WITH_SMYRNA%%%%DATADIR%%/smyrna/rotate.png
 %%WITH_SMYRNA%%%%DATADIR%%/smyrna/rotate.raw
 %%WITH_SMYRNA%%%%DATADIR%%/smyrna/select.png
 %%WITH_SMYRNA%%%%DATADIR%%/smyrna/selectx.png
@@ -430,6 +466,8 @@ libdata/pkgconfig/libgvc.pc
 %%WITH_SMYRNA%%%%DATADIR%%/smyrna/template.dot
 %%WITH_SMYRNA%%%%DATADIR%%/smyrna/zoom.png
 %%WITH_SMYRNA%%%%DATADIR%%/smyrna/zoom.raw
+%%WITH_SMYRNA%%%%DATADIR%%/smyrna/zoomin.png
+%%WITH_SMYRNA%%%%DATADIR%%/smyrna/zoomout.png
 %%WITH_SMYRNA%%%%DATADIR%%/smyrna/zoom_in.png
 %%WITH_SMYRNA%%%%DATADIR%%/smyrna/zoom_out.png
 %%WITH_SMYRNA%%%%DATADIR%%/smyrna/zoomminus.raw