- update to 2.20.0

3 files changed, 50 insertions, 48 deletions

diff --git a/graphics/graphviz/Makefile b/graphics/graphviz/Makefile
index 1df339f30f48..b0b0bfc6494a 100644
--- a/graphics/graphviz/Makefile
+++ b/graphics/graphviz/Makefile
@@ -6,8 +6,7 @@
 #
 
 PORTNAME=	graphviz
-PORTVERSION=	2.18
-PORTREVISION=	2
+PORTVERSION=	2.20.0
 CATEGORIES=	graphics tk
 MASTER_SITES=	http://www.graphviz.org/pub/graphviz/ARCHIVE/ \
 		http://mirror.inerd.com/FreeBSD/distfiles/${PORTNAME}/
@@ -233,6 +232,13 @@ LIB_DEPENDS+=		gtkglext-x11-1.0:${PORTSDIR}/x11-toolkits/gtkglext
 CONFIGURE_ARGS+=	--without-gtkglext
 .endif
 
+.if defined(WITH_SMYRNA)
+CONFIGURE_ARGS+=	 --with-gts=yes
+LIB_DEPENDS+=		gts.5:${PORTSDIR}/graphics/gts
+.else
+CONFIGURE_ARGS+=	--without-gts
+.endif
+
 .if !defined(WITHOUT_DIGCOLA)
 CONFIGURE_ARGS+=	--with-digcola
 .else
diff --git a/graphics/graphviz/distinfo b/graphics/graphviz/distinfo
index 17dfed8f0089..8f18b030fff5 100644
--- a/graphics/graphviz/distinfo
+++ b/graphics/graphviz/distinfo
@@ -1,3 +1,3 @@
-MD5 (graphviz-2.18.tar.gz) = 7df2705482c86fc7a9ee5f0446ed0b9e
-SHA256 (graphviz-2.18.tar.gz) = 6bc51969fa54c6ee3e64d8a4277c576931d50577b02114115668eeb5e515b42c
-SIZE (graphviz-2.18.tar.gz) = 13322519
+MD5 (graphviz-2.20.0.tar.gz) = 5b134ba53321caba3c9eaf51167b77ef
+SHA256 (graphviz-2.20.0.tar.gz) = 65190527185379b0dbd68d5873205ecfa68de59d24dae43cd3f871215cfc9115
+SIZE (graphviz-2.20.0.tar.gz) = 13334570
diff --git a/graphics/graphviz/pkg-plist b/graphics/graphviz/pkg-plist
index 9a7d27e4c8ca..38e9d255118b 100644
--- a/graphics/graphviz/pkg-plist
+++ b/graphics/graphviz/pkg-plist
@@ -94,10 +94,6 @@ lib/graphviz/libgvc.so
 lib/graphviz/libgvc.so.4
 lib/graphviz/libgvc.la
 lib/graphviz/libgvc.a
-lib/graphviz/libgvc_builtins.so
-lib/graphviz/libgvc_builtins.so.4
-lib/graphviz/libgvc_builtins.la
-lib/graphviz/libgvc_builtins.a
 lib/graphviz/libgvplugin_core.so
 lib/graphviz/libgvplugin_core.so.5
 lib/graphviz/libgvplugin_core.la
@@ -158,7 +154,7 @@ lib/graphviz/libgvplugin_neato_layout.a
 %%WITH_TCL%%lib/graphviz/tcl/libtclplan.so
 %%WITH_TCL%%lib/graphviz/tcl/libtclplan.so.0
 %%WITH_TCL%%lib/graphviz/tcl/pkgIndex.tcl
-%%WITH_TCL%%lib/tcl%%TCL_VER%%/graphviz-%%PORTVERSION%%
+%%WITH_TCL%%lib/tcl%%TCL_VER%%/graphviz
 %%WITH_TK%%lib/graphviz/tcl/libtkspline.a
 %%WITH_TK%%lib/graphviz/tcl/libtkspline.la
 %%WITH_TK%%lib/graphviz/tcl/libtkspline.so
@@ -200,7 +196,6 @@ libdata/pkgconfig/libagraph.pc
 libdata/pkgconfig/libcgraph.pc
 libdata/pkgconfig/libpathplan.pc
 libdata/pkgconfig/libgvc.pc
-libdata/pkgconfig/libgvc_builtins.pc
 %%PORTDOCS%%%%DOCSDIR%%/html/FAQ.html
 %%PORTDOCS%%%%DOCSDIR%%/html/build.html
 %%PORTDOCS%%%%DOCSDIR%%/html/index.html
@@ -388,39 +383,42 @@ libdata/pkgconfig/libgvc_builtins.pc
 %%WITH_TCL%%%%DATADIR%%/demo/modgraph.tcl
 %%WITH_SMYRNA%%%%DATADIR%%/examples/4elt.dot
 %%WITH_SMYRNA%%%%DATADIR%%/examples/world.dot
-%%WITH_SMYRNA%%%%DATADIR%%/gui/arial.tga
-%%WITH_SMYRNA%%%%DATADIR%%/gui/attrs.txt
-%%WITH_SMYRNA%%%%DATADIR%%/gui/smyrna.glade
-%%WITH_SMYRNA%%%%DATADIR%%/icons/AntiselectRect.png
-%%WITH_SMYRNA%%%%DATADIR%%/icons/AntiselectRectX.png
-%%WITH_SMYRNA%%%%DATADIR%%/icons/add_edge.png
-%%WITH_SMYRNA%%%%DATADIR%%/icons/cursor.png
-%%WITH_SMYRNA%%%%DATADIR%%/icons/deletE_edge.png
-%%WITH_SMYRNA%%%%DATADIR%%/icons/delete_node.png
-%%WITH_SMYRNA%%%%DATADIR%%/icons/find_edge.png
-%%WITH_SMYRNA%%%%DATADIR%%/icons/find_node.png
-%%WITH_SMYRNA%%%%DATADIR%%/icons/fisheye.raw
-%%WITH_SMYRNA%%%%DATADIR%%/icons/fit_to_screen.png
-%%WITH_SMYRNA%%%%DATADIR%%/icons/magifier_zoom_out.png
-%%WITH_SMYRNA%%%%DATADIR%%/icons/magnifier.png
-%%WITH_SMYRNA%%%%DATADIR%%/icons/magnifier_zoom_in.png
-%%WITH_SMYRNA%%%%DATADIR%%/icons/move.png
-%%WITH_SMYRNA%%%%DATADIR%%/icons/new_delete.png
-%%WITH_SMYRNA%%%%DATADIR%%/icons/new_node.png
-%%WITH_SMYRNA%%%%DATADIR%%/icons/newzoom.png
-%%WITH_SMYRNA%%%%DATADIR%%/icons/ok.raw
-%%WITH_SMYRNA%%%%DATADIR%%/icons/ok2.raw
-%%WITH_SMYRNA%%%%DATADIR%%/icons/ok3.raw
-%%WITH_SMYRNA%%%%DATADIR%%/icons/pan.png
-%%WITH_SMYRNA%%%%DATADIR%%/icons/pan.raw
-%%WITH_SMYRNA%%%%DATADIR%%/icons/select.png
-%%WITH_SMYRNA%%%%DATADIR%%/icons/selectx.png
-%%WITH_SMYRNA%%%%DATADIR%%/icons/zoom.png
-%%WITH_SMYRNA%%%%DATADIR%%/icons/zoom.raw
-%%WITH_SMYRNA%%%%DATADIR%%/icons/zoom_in.png
-%%WITH_SMYRNA%%%%DATADIR%%/icons/zoom_out.png
-%%WITH_SMYRNA%%%%DATADIR%%/icons/zoomminus.raw
-%%WITH_SMYRNA%%%%DATADIR%%/icons/zoomplus.raw
+%%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/cursor.png
+%%WITH_SMYRNA%%%%DATADIR%%/smyrna/deletE_edge.png
+%%WITH_SMYRNA%%%%DATADIR%%/smyrna/delete_node.png
+%%WITH_SMYRNA%%%%DATADIR%%/smyrna/find_edge.png
+%%WITH_SMYRNA%%%%DATADIR%%/smyrna/find_node.png
+%%WITH_SMYRNA%%%%DATADIR%%/smyrna/fisheye.raw
+%%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/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/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/rotate.raw
+%%WITH_SMYRNA%%%%DATADIR%%/smyrna/select.png
+%%WITH_SMYRNA%%%%DATADIR%%/smyrna/selectx.png
+%%WITH_SMYRNA%%%%DATADIR%%/smyrna/smyrna.glade
+%%WITH_SMYRNA%%%%DATADIR%%/smyrna/template.dot
+%%WITH_SMYRNA%%%%DATADIR%%/smyrna/zoom.png
+%%WITH_SMYRNA%%%%DATADIR%%/smyrna/zoom.raw
+%%WITH_SMYRNA%%%%DATADIR%%/smyrna/zoom_in.png
+%%WITH_SMYRNA%%%%DATADIR%%/smyrna/zoom_out.png
+%%WITH_SMYRNA%%%%DATADIR%%/smyrna/zoomminus.raw
+%%WITH_SMYRNA%%%%DATADIR%%/smyrna/zoomplus.raw
 %%DATADIR%%/lefty/box.lefty
 %%DATADIR%%/lefty/def.lefty
 %%DATADIR%%/lefty/fractal.lefty
@@ -506,8 +504,7 @@ libdata/pkgconfig/libgvc_builtins.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%%/gui
-@exec mkdir -p %D/%%DATADIR%%/icons
+@exec mkdir -p %D/%%DATADIR%%/smyrna
 @dirrm lib/graphviz/R
 @dirrm lib/graphviz/guile
 @dirrm lib/graphviz/io
@@ -527,12 +524,11 @@ libdata/pkgconfig/libgvc_builtins.pc
 @dirrm include/graphviz
 @dirrm %%DATADIR%%/demo
 @dirrm %%DATADIR%%/examples
-@dirrm %%DATADIR%%/gui
-@dirrm %%DATADIR%%/icons
 @dirrm %%DATADIR%%/graphs/directed
 @dirrm %%DATADIR%%/graphs/undirected
 @dirrm %%DATADIR%%/graphs
 @dirrm %%DATADIR%%/lefty
+@dirrm %%DATADIR%%/smyrna
 @dirrm %%DATADIR%%
 @dirrm %%EXAMPLESDIR%%/pathplan_data
 @dirrm %%EXAMPLESDIR%%