3 files changed, 69 insertions, 30 deletions

diff --git a/graphics/graphviz/Makefile b/graphics/graphviz/Makefile
index ac509d3ab036..07d735eb6053 100644
--- a/graphics/graphviz/Makefile
+++ b/graphics/graphviz/Makefile
@@ -6,8 +6,7 @@
 #
 
 PORTNAME=	graphviz
-PORTVERSION=	2.26.3
-PORTREVISION=	3
+PORTVERSION=	2.28.0
 CATEGORIES=	graphics tk
 MASTER_SITES=	http://www.graphviz.org/pub/graphviz/ARCHIVE/
 
@@ -32,11 +31,12 @@ 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 \
-		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
+MAN1=		acyclic.1 bcomps.1 ccomps.1 cluster.1 diffimg.1 dijkstra.1 \
+		dot.1 dotty.1 gc.1 gml2gv.1 gv2gxl.1 gvedit.1 gvmap.1 \
+		gvmap.sh.1 gvgen.1 mm2gv.1 gvcolor.1 gvpack.1 gvpr.1 \
+		lneato.1 nop.1 osage.1 patchwork.1 prune.1 sccmap.1 smyrna.1 \
+		tred.1 unflatten.1 vimdot.1
+MAN3=		cdt.3 expr.3 cgraph.3 graph.3 gvc.3 pack.3 pathplan.3 xdot.3
 MAN7=		graphviz.7
 MLINKS=		dot.1 circo.1 \
 		dot.1 fdp.1 \
@@ -78,6 +78,7 @@ OPTIONS=	ICONV "Build with ICONV support" on \
 		GDK_PIXBUF  "build with gdk pixbuf support" off \
 		GNOMEUI  "build with libgnomeui support" off \
 		SMYRNA "SMYRNA large graph viewer (GTK is required)" off \
+		GVEDIT "gvedit (qt is required)" off \
 		MING "Build with ming plugin" off \
 		DEVIL "Build with devil plugin" off \
 		GHOSTSCRIPT "Build with ghostscript plugin" off \
@@ -89,6 +90,13 @@ OPTIONS=	ICONV "Build with ICONV support" on \
 		TCL "TCL bindings (swig)" off \
 		GUILE "Guile bindings (swig)" off
 
+.include <bsd.port.options.mk>
+
+.if defined(WITH_GVEDIT)
+USE_QT_VER=		4
+QT_COMPONENTS=		qmake_build moc_build rcc_build uic_build linguist_build
+.endif
+
 .include <bsd.port.pre.mk>
 
 CONFIGURE_ARGS+=	--program-transform-name="s/x/x/" \
@@ -266,6 +274,14 @@ PLIST_SUB+=		WITH_SMYRNA="@comment "
 CONFIGURE_ARGS+=	--without-smyrna
 .endif
 
+.if defined(WITH_GVEDIT)
+CONFIGURE_ARGS+=	--with-gvedit=yes
+PLIST_SUB+=		WITH_GVEDIT=""
+.else
+PLIST_SUB+=		WITH_GVEDIT="@comment "
+CONFIGURE_ARGS+=	--without-gvedit
+.endif
+
 .if defined(WITH_MING)
 CONFIGURE_ARGS+=	--with-ming
 PLIST_SUB+=		WITH_MING=""
@@ -410,8 +426,6 @@ post-patch:
 		-e "s|-lruby|-lruby${RUBY_SUFFIX}|g" ${WRKSRC}/configure
 	@${REINPLACE_CMD} -e 's|#include "gui.h"|#include "gui/gui.h"|' \
 		${WRKSRC}/cmd/smyrna/tvnodes.h
-	@${REINPLACE_CMD} -e 's|#include "regex_win32.h"|#include <regex.h>|' \
-		${WRKSRC}/cmd/smyrna/btree.c
 .if defined(NOPORTDOCS)
 	@${REINPLACE_CMD} -e 's| install-txtDATA$$||' \
 		${WRKSRC}/Makefile.in
diff --git a/graphics/graphviz/distinfo b/graphics/graphviz/distinfo
index 5082b588ce91..c661c3c2160e 100644
--- a/graphics/graphviz/distinfo
+++ b/graphics/graphviz/distinfo
@@ -1,3 +1,2 @@
-MD5 (graphviz-2.26.3.tar.gz) = 6f45946fa622770c45609778c0a982ee
-SHA256 (graphviz-2.26.3.tar.gz) = f410996e69b1095237c2128deae5fc7b6ce99055b095271abb14447bc2f37fa1
-SIZE (graphviz-2.26.3.tar.gz) = 17092429
+SHA256 (graphviz-2.28.0.tar.gz) = d3aa7973c578cae4cc26d9d6498c57ed06680cab9a4e940d0357a3c6527afc76
+SIZE (graphviz-2.28.0.tar.gz) = 19620087
diff --git a/graphics/graphviz/pkg-plist b/graphics/graphviz/pkg-plist
index b8dea6ef6fe7..c31d7da94840 100644
--- a/graphics/graphviz/pkg-plist
+++ b/graphics/graphviz/pkg-plist
@@ -1,18 +1,23 @@
 bin/acyclic
 bin/bcomps
 bin/circo
+bin/cluster
 bin/ccomps
 bin/diffimg
 bin/dijkstra
 bin/dot
 bin/dot2gxl
 bin/dotty
+bin/dot_builtins
 bin/fdp
 bin/gc
 bin/gml2gv
 bin/gv2gxl
 bin/gvcolor
+%%WITH_GVEDIT%%bin/gvedit
 bin/gvgen
+bin/gvmap
+bin/gvmap.sh
 bin/gvpack
 bin/gvpr
 bin/gxl2gv
@@ -23,6 +28,7 @@ bin/mm2gv
 bin/neato
 bin/nop
 bin/osage
+bin/patchwork
 bin/prune
 bin/sccmap
 bin/sfdp
@@ -75,15 +81,15 @@ include/graphviz/vispath.h
 include/graphviz/xdot.h
 lib/graphviz/config6
 lib/graphviz/libcdt.so
-lib/graphviz/libcdt.so.4
+lib/graphviz/libcdt.so.5
 lib/graphviz/libcdt.la
 lib/graphviz/libcdt.a
 lib/graphviz/libgraph.so
-lib/graphviz/libgraph.so.4
+lib/graphviz/libgraph.so.5
 lib/graphviz/libgraph.la
 lib/graphviz/libgraph.a
 lib/graphviz/libcgraph.so
-lib/graphviz/libcgraph.so.5
+lib/graphviz/libcgraph.so.6
 lib/graphviz/libcgraph.la
 lib/graphviz/libcgraph.a
 lib/graphviz/libpathplan.so
@@ -91,7 +97,7 @@ lib/graphviz/libpathplan.so.4
 lib/graphviz/libpathplan.la
 lib/graphviz/libpathplan.a
 lib/graphviz/libgvc.so
-lib/graphviz/libgvc.so.5
+lib/graphviz/libgvc.so.6
 lib/graphviz/libgvc.la
 lib/graphviz/libgvc.a
 lib/graphviz/libgvplugin_core.so
@@ -133,7 +139,7 @@ lib/graphviz/libgvplugin_neato_layout.a
 lib/graphviz/libgvpr.a
 lib/graphviz/libgvpr.la
 lib/graphviz/libgvpr.so
-lib/graphviz/libgvpr.so.1
+lib/graphviz/libgvpr.so.2
 %%WITH_GUILE%%lib/graphviz/guile/libgv_guile.a
 %%WITH_GUILE%%lib/graphviz/guile/libgv_guile.la
 %%WITH_GUILE%%lib/graphviz/guile/libgv_guile.so
@@ -322,6 +328,7 @@ libdata/pkgconfig/libxdot.pc
 %%PORTDOCS%%%%DOCSDIR%%/html/rectangle.gif
 %%PORTDOCS%%%%DOCSDIR%%/html/round.gif
 %%PORTDOCS%%%%DOCSDIR%%/html/septagon.gif
+%%PORTDOCS%%%%DOCSDIR%%/html/square.gif
 %%PORTDOCS%%%%DOCSDIR%%/html/tab.gif
 %%PORTDOCS%%%%DOCSDIR%%/html/todo.html
 %%PORTDOCS%%%%DOCSDIR%%/html/trapezium.gif
@@ -334,16 +341,20 @@ libdata/pkgconfig/libxdot.pc
 %%PORTDOCS%%%%DOCSDIR%%/pdf/cdt.3.pdf
 %%PORTDOCS%%%%DOCSDIR%%/pdf/cgraph.3.pdf
 %%PORTDOCS%%%%DOCSDIR%%/pdf/circo.1.pdf
+%%PORTDOCS%%%%DOCSDIR%%/pdf/cluster.1.pdf
 %%PORTDOCS%%%%DOCSDIR%%/pdf/dijkstra.1.pdf
+%%PORTDOCS%%%%DOCSDIR%%/pdf/diffimg.1.pdf
 %%PORTDOCS%%%%DOCSDIR%%/pdf/dot.1.pdf
 %%PORTDOCS%%%%DOCSDIR%%/pdf/dotguide.pdf
 %%PORTDOCS%%%%DOCSDIR%%/pdf/dotty.1.pdf
 %%PORTDOCS%%%%DOCSDIR%%/pdf/dottyguide.pdf
+%%PORTDOCS%%%%DOCSDIR%%/pdf/expr.3.pdf
 %%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.3go.pdf
 %%PORTDOCS%%%%DOCSDIR%%/pdf/gv.3guile.pdf
 %%PORTDOCS%%%%DOCSDIR%%/pdf/gv.3io.pdf
 %%PORTDOCS%%%%DOCSDIR%%/pdf/gv.3java.pdf
@@ -359,7 +370,10 @@ libdata/pkgconfig/libxdot.pc
 %%PORTDOCS%%%%DOCSDIR%%/pdf/gv2gxl.1.pdf
 %%PORTDOCS%%%%DOCSDIR%%/pdf/gvc.3.pdf
 %%PORTDOCS%%%%DOCSDIR%%/pdf/gvcolor.1.pdf
+%%PORTDOCS%%%%DOCSDIR%%/pdf/gvedit.1.pdf
 %%PORTDOCS%%%%DOCSDIR%%/pdf/gvgen.1.pdf
+%%PORTDOCS%%%%DOCSDIR%%/pdf/gvmap.1.pdf
+%%PORTDOCS%%%%DOCSDIR%%/pdf/gvmap.sh.1.pdf
 %%PORTDOCS%%%%DOCSDIR%%/pdf/gvpack.1.pdf
 %%PORTDOCS%%%%DOCSDIR%%/pdf/gvpr.1.pdf
 %%PORTDOCS%%%%DOCSDIR%%/pdf/gxl2gv.1.pdf
@@ -372,17 +386,21 @@ libdata/pkgconfig/libxdot.pc
 %%PORTDOCS%%%%DOCSDIR%%/pdf/neatoguide.pdf
 %%PORTDOCS%%%%DOCSDIR%%/pdf/nop.1.pdf
 %%PORTDOCS%%%%DOCSDIR%%/pdf/osage.1.pdf
+%%PORTDOCS%%%%DOCSDIR%%/pdf/pack.3.pdf
+%%PORTDOCS%%%%DOCSDIR%%/pdf/patchwork.1.pdf
 %%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/smyrna.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
+%%PORTDOCS%%%%DOCSDIR%%/pdf/vimdot.1.pdf
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/entities.tcl
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/entities.tcl.README
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/doted.tcl
@@ -414,8 +432,8 @@ libdata/pkgconfig/libxdot.pc
 %%DATADIR%%/doc/html/schema/arguments.xml
 %%DATADIR%%/doc/html/schema/attributes.xml
 %%DATADIR%%/doc/html/schema/attributes.xslt
-%%WITH_SMYRNA%%%%DATADIR%%/examples/4elt.dot
-%%WITH_SMYRNA%%%%DATADIR%%/examples/world.dot
+%%WITH_SMYRNA%%%%DATADIR%%/examples/4elt.gv
+%%WITH_SMYRNA%%%%DATADIR%%/examples/world.gv
 %%WITH_SMYRNA%%%%DATADIR%%/smyrna/2D.png
 %%WITH_SMYRNA%%%%DATADIR%%/smyrna/3D.png
 %%WITH_SMYRNA%%%%DATADIR%%/smyrna/AntiselectRect.png
@@ -472,6 +490,7 @@ libdata/pkgconfig/libxdot.pc
 %%WITH_SMYRNA%%%%DATADIR%%/smyrna/zoom_out.png
 %%WITH_SMYRNA%%%%DATADIR%%/smyrna/zoomminus.raw
 %%WITH_SMYRNA%%%%DATADIR%%/smyrna/zoomplus.raw
+%%WITH_GVEDIT%%%%DATADIR%%/gvedit/attrs.txt
 %%DATADIR%%/lefty/box.lefty
 %%DATADIR%%/lefty/def.lefty
 %%DATADIR%%/lefty/fractal.lefty
@@ -505,6 +524,7 @@ libdata/pkgconfig/libxdot.pc
 %%DATADIR%%/graphs/directed/grammar.gv
 %%DATADIR%%/graphs/directed/hashtable.gv
 %%DATADIR%%/graphs/directed/honda-tokoro.gv
+%%DATADIR%%/graphs/directed/japanese.gv
 %%DATADIR%%/graphs/directed/jcctree.gv
 %%DATADIR%%/graphs/directed/jsort.gv
 %%DATADIR%%/graphs/directed/ldbxtried.gv
@@ -552,6 +572,7 @@ libdata/pkgconfig/libxdot.pc
 %%WITH_SMYRNA%%%%DATADIR%%/smyrna/selectr.png
 %%WITH_SMYRNA%%%%DATADIR%%/smyrna/single_select.png
 @exec mkdir -p %D/lib/graphviz/R
+@exec mkdir -p %D/lib/graphviz/go
 @exec mkdir -p %D/lib/graphviz/guile
 @exec mkdir -p %D/lib/graphviz/io
 @exec mkdir -p %D/lib/graphviz/lua
@@ -559,6 +580,7 @@ libdata/pkgconfig/libxdot.pc
 @exec mkdir -p %D/lib/graphviz/ocaml
 @exec mkdir -p %D/lib/graphviz/perl
 @exec mkdir -p %D/lib/graphviz/php
+@exec mkdir -p %D/lib/graphviz/python27
 @exec mkdir -p %D/lib/graphviz/python26
 @exec mkdir -p %D/lib/graphviz/python25
 @exec mkdir -p %D/lib/graphviz/python24
@@ -569,23 +591,26 @@ libdata/pkgconfig/libxdot.pc
 @exec mkdir -p %D/lib/graphviz/tcl
 @exec mkdir -p %D/%%DATADIR%%/demo
 @exec mkdir -p %D/%%DATADIR%%/examples
+@exec mkdir -p %D/%%DATADIR%%/gvedit
 @exec mkdir -p %D/%%DATADIR%%/smyrna
-@dirrm lib/graphviz/R
-@dirrm lib/graphviz/guile
-@dirrm lib/graphviz/io
-@dirrm lib/graphviz/java
-@dirrm lib/graphviz/lua
-@dirrm lib/graphviz/ocaml
-@dirrm lib/graphviz/perl
-@dirrm lib/graphviz/php
+@dirrm lib/graphviz/tcl
+@dirrm lib/graphviz/sharp
+@dirrm lib/graphviz/ruby
+@dirrm lib/graphviz/python27
 @dirrm lib/graphviz/python26
 @dirrm lib/graphviz/python25
 @dirrm lib/graphviz/python24
 @dirrm lib/graphviz/python23
 @dirrm lib/graphviz/python
-@dirrm lib/graphviz/ruby
-@dirrm lib/graphviz/sharp
-@dirrm lib/graphviz/tcl
+@dirrm lib/graphviz/php
+@dirrm lib/graphviz/perl
+@dirrm lib/graphviz/ocaml
+@dirrm lib/graphviz/lua
+@dirrm lib/graphviz/java
+@dirrm lib/graphviz/io
+@dirrm lib/graphviz/guile
+@dirrm lib/graphviz/go
+@dirrm lib/graphviz/R
 @dirrm lib/graphviz
 @dirrm include/graphviz
 @dirrm %%DATADIR%%/demo
@@ -593,6 +618,7 @@ libdata/pkgconfig/libxdot.pc
 @dirrm %%DATADIR%%/doc/html
 @dirrm %%DATADIR%%/doc
 @dirrm %%DATADIR%%/examples
+@dirrm %%DATADIR%%/gvedit
 @dirrm %%DATADIR%%/graphs/directed
 @dirrm %%DATADIR%%/graphs/undirected
 @dirrm %%DATADIR%%/graphs