7 files changed, 114 insertions, 154 deletions

diff --git a/graphics/graphviz/Makefile b/graphics/graphviz/Makefile
index 93e9cd73e838..f42a3a3877b6 100644
--- a/graphics/graphviz/Makefile
+++ b/graphics/graphviz/Makefile
@@ -2,14 +2,17 @@
 # $FreeBSD$
 
 PORTNAME=	graphviz
-PORTVERSION=	2.38.0
-PORTREVISION=	14
+PORTVERSION=	2.40.1
+PORTREVISION=	0
 CATEGORIES=	graphics tk
 MASTER_SITES=	http://www.graphviz.org/pub/graphviz/ARCHIVE/
 
 MAINTAINER=	dinoex@FreeBSD.org
 COMMENT=	Graph Visualization Software from AT&T and Bell Labs
 
+LICENSE=	EPL
+LICENSE_FILE=	${WRKSRC}/COPYING
+
 LIB_DEPENDS=	libltdl.so:devel/libltdl \
 		libpng.so:graphics/png \
 		libfreetype.so:print/freetype2 \
@@ -17,8 +20,6 @@ LIB_DEPENDS=	libltdl.so:devel/libltdl \
 		libexpat.so:textproc/expat2 \
 		libgd.so:${GD_PORT}
 
-ONLY_FOR_ARCHS=	aarch64 amd64 i386 sparc64
-
 USES=		bison cpe gmake jpeg libtool:keepla pkgconfig pathfix shebangfix
 GNU_CONFIGURE=	yes
 LDFLAGS+=	-L${LOCALBASE}/lib
@@ -31,7 +32,7 @@ SHEBANG_LANG=	tcl
 tcl_OLD_CMD=	/usr/bin/tclsh
 tcl_CMD=	${TCLSH}
 
-FIX_INCLUDE=	ast_common.h \
+FIX_INCLUDE=	\
 		lib/cdt/dthdr.h \
 		lib/pathplan/tri.h lib/pathplan/pathplan.h \
 		lib/pathplan/pathutil.h lib/pathplan/solvers.h \
@@ -41,8 +42,7 @@ FIX_INCLUDE=	ast_common.h \
 		lib/gvc/gvcint.h
 
 PATCH_TCL_SCRIPTS=	tclpkg/gv/Makefile.in tclpkg/tcldot/demo/doted.tcl \
-			tclpkg/tclpathplan/demo/pathplan.tcl \
-			tclpkg/tkspline/demo/spline.tcl
+			tclpkg/tclpathplan/demo/pathplan.tcl
 PATCH_TK_SCRIPTS=	${PATCH_TCL_SCRIPTS}
 
 PDOCS_TXT=	doc/Dot.ref doc/latex_suggestions.txt
@@ -85,11 +85,11 @@ NVTHREADS_DESC=	Link with threads (needed for nvidia)
 XPM_USE=	XORG=xaw,xpm,xmu,xt,sm,ice,xext,x11,xau,xdmcp,xp
 ICONV_USES=	iconv
 NLS_USES=	gettext
-PANGOCAIRO_USE=	GNOME=pango XORG=xrender,x11,xau,xdmcp
+PANGOCAIRO_USE=	GNOME=pango,cairo XORG=xrender,x11,xau,xdmcp
 LIBRSVG2_USE=	GNOME=librsvg2 GL=gl,glu,glut
 GTK2_USE=	XORG=sm,ice,xext,xinerama,xi,xrandr,xcursor,xfixes GNOME=gtk20
 GNOMEUI_USE=	GNOME=libgnomeui
-SMYRNA_USE=	GNOME=libglade2 GL=glut
+SMYRNA_USE=	GNOME=libglade2,pangox-compat GL=glut
 GVEDIT_USE=	qt4=qmake_build,moc_build,rcc_build,uic_build \
 		qt4=linguist_build,corelib,gui
 GHOSTSCRIPT_USES=ghostscript
@@ -107,7 +107,8 @@ SMYRNA_LIB_DEPENDS=	libgtkgl-2.0.so:x11-toolkits/gtkglarea2 \
 			libgtkglext-x11-1.0.so:x11-toolkits/gtkglext
 MING_LIB_DEPENDS=	libming.so:graphics/ming
 DEVIL_LIB_DEPENDS=	libIL.so:graphics/devil
-GUILE_LIB_DEPENDS=	libguile-2.0.so:lang/guile2
+GUILE_LIB_DEPENDS=	libguile-2.0.so:lang/guile2 \
+			libgc-threaded.so:devel/boehm-gc-threaded
 
 XPM_CONFIGURE_WITH=		x
 DIGCOLA_CONFIGURE_WITH=		digcola
@@ -249,6 +250,7 @@ CONFIGURE_ENV+=		SWIG="/nonexistent"
 
 .if ${PORT_OPTIONS:MPHP}
 SHEBANG_FILES+=	tclpkg/gv/demo/modgraph.php
+PHP_VER=	70
 .endif
 
 .if ${PORT_OPTIONS:MRUBY}
@@ -289,7 +291,6 @@ post-patch:
 		-e "s|vendorarchdir|sitearchdir|g" \
 		-e "s|-lruby|-lruby${RUBY_SUFFIX}|g" \
 		-e "s|ruby-1[.]9|ruby-${RUBY_VER}|g" \
-		-e "s|Config::|RbConfig::|" \
 		-e 's|PHP_INSTALL_DIR=.*|PHP_INSTALL_DIR="${PREFIX}/lib/php/${PHP_EXT_DIR}"|' \
 		-e 's|PHP_INSTALL_DATADIR=.*|PHP_INSTALL_DATADIR="${PREFIX}/share/php"|' \
 		-e '/if test/ s| == | = |g' ${WRKSRC}/configure
@@ -307,6 +308,11 @@ post-patch:
 		${WRKSRC}/Makefile.in
 .endif
 
+.if ${PORT_OPTIONS:MPHP}
+pre-install:
+	${MKDIR} "${STAGEDIR}/${PREFIX}/share/php"
+.endif
+
 post-install: install-ldconfig-file
 	cd ${WRKSRC}/lib/expr && \
 		${MAKE_ENV} ${MAKE} ${MAKE_ARGS} ${INSTALL_TARGET}
@@ -329,14 +335,12 @@ post-install: install-ldconfig-file
 		${WRKSRC}/tclpkg/tcldot/demo/doted.tcl \
 		${WRKSRC}/tclpkg/tcldot/demo/gcat.tcl \
 		${WRKSRC}/tclpkg/tclpathplan/demo/pathplan.tcl \
-		${WRKSRC}/tclpkg/tkspline/demo/spline.tcl \
 		${STAGEDIR}${EXAMPLESDIR}/
 	${INSTALL_DATA} \
 		${WRKSRC}/tclpkg/gdtclft/demo/entities.tcl.README \
 		${WRKSRC}/tclpkg/tcldot/demo/doted.tcl.README \
 		${WRKSRC}/tclpkg/tcldot/demo/gcat.tcl.README \
 		${WRKSRC}/tclpkg/tclpathplan/demo/pathplan.tcl.README \
-		${WRKSRC}/tclpkg/tkspline/demo/spline.tcl.README \
 		${STAGEDIR}${EXAMPLESDIR}/
 	${MKDIR} ${STAGEDIR}${EXAMPLESDIR}/pathplan_data
 	${INSTALL_DATA} \
diff --git a/graphics/graphviz/distinfo b/graphics/graphviz/distinfo
index 3be2a27de243..506fa01bdd8d 100644
--- a/graphics/graphviz/distinfo
+++ b/graphics/graphviz/distinfo
@@ -1,2 +1,3 @@
-SHA256 (graphviz-2.38.0.tar.gz) = 81aa238d9d4a010afa73a9d2a704fc3221c731e1e06577c2ab3496bdef67859e
-SIZE (graphviz-2.38.0.tar.gz) = 25848858
+TIMESTAMP = 1482692977
+SHA256 (graphviz-2.40.1.tar.gz) = ca5218fade0204d59947126c38439f432853543b0818d9d728c589dfe7f3a421
+SIZE (graphviz-2.40.1.tar.gz) = 25633455
diff --git a/graphics/graphviz/files/patch-Makefile.in b/graphics/graphviz/files/patch-Makefile.in
deleted file mode 100644
index aad90436897e..000000000000
--- a/graphics/graphviz/files/patch-Makefile.in
+++ /dev/null
@@ -1,15 +0,0 @@
-Backported from https://github.com/ellson/graphviz/pull/1179
-
-Use egrep so that the command works with base's BSD grep when it is built
-without compatibility with GNU grep.
---- Makefile.in.orig	2016-12-05 10:31:12.865899000 +0100
-+++ Makefile.in	        2016-12-05 10:31:32.065451000 +0100
-@@ -1246,7 +1246,7 @@
- 	find $(distdir) -name CVS -type d -prune -exec rm -rf {} \;
- 
- $(top_builddir)/graphviz_version.h: config.h
--	$(GREP) 'PACKAGE\|VERSION\|GVPLUGIN' config.h > $(top_builddir)/graphviz_version.h
-+	$(EGREP) 'PACKAGE|VERSION|GVPLUGIN' config.h > $(top_builddir)/graphviz_version.h
- 
- .PHONY: rpm
- rpm: dist
diff --git a/graphics/graphviz/files/patch-cmd-tools-gmlscan.l b/graphics/graphviz/files/patch-cmd-tools-gmlscan.l
deleted file mode 100644
index 75c7c5cc940d..000000000000
--- a/graphics/graphviz/files/patch-cmd-tools-gmlscan.l
+++ /dev/null
@@ -1,11 +0,0 @@
---- cmd/tools/gmlscan.l.orig	2014-04-13 22:40:25.000000000 +0200
-+++ cmd/tools/gmlscan.l	2015-07-29 14:51:42.000000000 +0200
-@@ -127,7 +127,7 @@
- 	return;
-     errors = 1;
-     sprintf(buf," %s in line %d near '%s'\n", str,line_num,yytext);
--    agerr(AGWARN,buf);
-+    agerr(AGWARN, "%s", buf);
- }
- 
- int gmlerrors()
diff --git a/graphics/graphviz/files/patch-lib-cgraph-scan.l b/graphics/graphviz/files/patch-lib-cgraph-scan.l
deleted file mode 100644
index 7d11037f02a9..000000000000
--- a/graphics/graphviz/files/patch-lib-cgraph-scan.l
+++ /dev/null
@@ -1,20 +0,0 @@
---- lib/cgraph/scan.l.orig	2014-04-13 22:40:25.000000000 +0200
-+++ lib/cgraph/scan.l	2015-07-29 14:51:27.000000000 +0200
-@@ -149,7 +149,7 @@
- 	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;
-@@ -225,7 +225,7 @@
- 	agxbput (&xb, buf);
- 	agxbput (&xb, yytext);
- 	agxbput (&xb,"'\n");
--	agerr(AGERR,agxbuse(&xb));
-+	agerr(AGERR, "%s", agxbuse(&xb));
- 	agxbfree(&xb);
- }
- /* must be here to see flex's macro defns */
diff --git a/graphics/graphviz/files/patch-plugin_xlib_vimdot.sh b/graphics/graphviz/files/patch-plugin_xlib_vimdot.sh
index 76d8843b6cde..44f41fc3433a 100644
--- a/graphics/graphviz/files/patch-plugin_xlib_vimdot.sh
+++ b/graphics/graphviz/files/patch-plugin_xlib_vimdot.sh
@@ -1,15 +1,15 @@
---- plugin/xlib/vimdot.sh.orig	2016-09-26 23:00:07 UTC
-+++ plugin/xlib/vimdot.sh
-@@ -3,7 +3,7 @@
+--- plugin/xlib/vimdot.sh.orig	2016-12-01 06:43:36.000000000 +0100
++++ plugin/xlib/vimdot.sh	2016-12-25 20:26:20.202321000 +0100
+@@ -5,7 +5,7 @@
  
- error() { echo "$0: $*" >&2; exit 1; }
+ # Try $EDITOR first, else try vim or vi
+ editor="$EDITOR"
+-[ -x "$editor" ] || editor="/usr/bin/vim"
++[ -x "$editor" ] || editor="/usr/local/bin/vim"
+ [ -x "$editor" ] || editor="/usr/bin/vi"
+ [ -x "$editor" ] || error "EDITOR not found or not executable";
  
--editor="/usr/bin/vim"
-+editor="/usr/local/bin/vim"
- 
- if ! test -x "$editor"; then error "the \"$editor\" editor not found or not executable"; fi
- 
-@@ -23,7 +23,7 @@ digraph G {
+@@ -25,7 +25,7 @@
  
  	vim [href="http://www.vim.org/"]
  	dot [href="http://www.graphviz.org/"]
diff --git a/graphics/graphviz/pkg-plist b/graphics/graphviz/pkg-plist
index 23485535c81e..04293861bd1c 100644
--- a/graphics/graphviz/pkg-plist
+++ b/graphics/graphviz/pkg-plist
@@ -42,7 +42,6 @@ bin/twopi
 bin/unflatten
 %%PANGOCAIRO%%%%XPM%%bin/vimdot
 include/graphviz/arith.h
-include/graphviz/ast_common.h
 include/graphviz/cdt.h
 include/graphviz/cgraph.h
 include/graphviz/color.h
@@ -143,6 +142,10 @@ lib/graphviz/libgvpr.so.2
 lib/graphviz/libgvpr.so.2.0.0
 %%GUILE%%lib/graphviz/guile/libgv_guile.la
 %%GUILE%%lib/graphviz/guile/libgv_guile.so
+lib/graphviz/liblab_gamut.la
+lib/graphviz/liblab_gamut.so
+lib/graphviz/liblab_gamut.so.1
+lib/graphviz/liblab_gamut.so.1.0.0
 %%PHP%%lib/graphviz/php/gv.php
 %%PHP%%lib/graphviz/php/gv.so
 %%PHP%%lib/graphviz/php/libgv_php.la
@@ -166,10 +169,6 @@ lib/graphviz/libgvpr.so.2.0.0
 %%TCL%%lib/graphviz/tcl/libtclplan.so
 %%TCL%%lib/graphviz/tcl/libtclplan.so.0
 %%TCL%%lib/graphviz/tcl/libtclplan.so.0.0.0
-%%TK%%lib/graphviz/tcl/libtkspline.la
-%%TK%%lib/graphviz/tcl/libtkspline.so
-%%TK%%lib/graphviz/tcl/libtkspline.so.0
-%%TK%%lib/graphviz/tcl/libtkspline.so.0.0.0
 %%TCL%%lib/graphviz/tcl/pkgIndex.tcl
 %%TCL%%lib/tcl%%TCL_VER%%/graphviz/libgdtclft.la
 %%TCL%%lib/tcl%%TCL_VER%%/graphviz/libgdtclft.so
@@ -189,10 +188,6 @@ lib/graphviz/libgvpr.so.2.0.0
 %%TCL%%lib/tcl%%TCL_VER%%/graphviz/libtclplan.so
 %%TCL%%lib/tcl%%TCL_VER%%/graphviz/libtclplan.so.0
 %%TCL%%lib/tcl%%TCL_VER%%/graphviz/libtclplan.so.0.0.0
-%%TK%%lib/tcl%%TCL_VER%%/graphviz/libtkspline.la
-%%TK%%lib/tcl%%TCL_VER%%/graphviz/libtkspline.so
-%%TK%%lib/tcl%%TCL_VER%%/graphviz/libtkspline.so.0
-%%TK%%lib/tcl%%TCL_VER%%/graphviz/libtkspline.so.0.0.0
 %%TCL%%lib/tcl%%TCL_VER%%/graphviz/pkgIndex.tcl
 %%LUA%%lib/graphviz/lua/gv.so
 %%LUA%%lib/graphviz/lua/libgv_lua.la
@@ -226,13 +221,14 @@ lib/graphviz/libxdot.la
 lib/graphviz/libxdot.so
 lib/graphviz/libxdot.so.4
 lib/graphviz/libxdot.so.4.0.0
-@exec %D/bin/dot -c
-@unexec rm -f %D/lib/graphviz/config6
+@postexec %D/bin/dot -c
+@postunexec rm -f %D/lib/graphviz/config6
 libdata/pkgconfig/libcdt.pc
 libdata/pkgconfig/libcgraph.pc
 libdata/pkgconfig/libpathplan.pc
 libdata/pkgconfig/libgvc.pc
 libdata/pkgconfig/libgvpr.pc
+libdata/pkgconfig/liblab_gamut.pc
 libdata/pkgconfig/libxdot.pc
 man/man1/acyclic.1.gz
 man/man1/bcomps.1.gz
@@ -287,10 +283,10 @@ man/man3/expr.3.gz
 %%TCL%%man/man3/gv.3tcl.gz
 man/man3/gvc.3.gz
 man/man3/gvpr.3.gz
+man/man3/lab_gamut.3.gz
 man/man3/pack.3.gz
 man/man3/pathplan.3.gz
 %%TCL%%man/man3/tcldot.3tcl.gz
-%%TK%%man/man3/tkspline.3tk.gz
 man/man3/xdot.3.gz
 man/man7/graphviz.7.gz
 %%PORTDOCS%%%%DOCSDIR%%/AUTHORS
@@ -372,6 +368,7 @@ man/man7/graphviz.7.gz
 %%PORTDOCS%%%%DOCSDIR%%/html/colorlist.gif
 %%PORTDOCS%%%%DOCSDIR%%/html/component.gif
 %%PORTDOCS%%%%DOCSDIR%%/html/constraint.gif
+%%PORTDOCS%%%%DOCSDIR%%/html/cylinder.gif
 %%PORTDOCS%%%%DOCSDIR%%/html/diamond.gif
 %%PORTDOCS%%%%DOCSDIR%%/html/doublecircle.gif
 %%PORTDOCS%%%%DOCSDIR%%/html/doubleoctagon.gif
@@ -398,6 +395,7 @@ man/man7/graphviz.7.gz
 %%PORTDOCS%%%%DOCSDIR%%/html/oval.gif
 %%PORTDOCS%%%%DOCSDIR%%/html/parallelogram.gif
 %%PORTDOCS%%%%DOCSDIR%%/html/pentagon.gif
+%%PORTDOCS%%%%DOCSDIR%%/html/plain.gif
 %%PORTDOCS%%%%DOCSDIR%%/html/plaintext.gif
 %%PORTDOCS%%%%DOCSDIR%%/html/point.gif
 %%PORTDOCS%%%%DOCSDIR%%/html/polygon.gif
@@ -461,6 +459,7 @@ man/man7/graphviz.7.gz
 %%PORTDOCS%%%%DOCSDIR%%/pdf/gvpr.1.pdf
 %%PORTDOCS%%%%DOCSDIR%%/pdf/gvpr.3.pdf
 %%PORTDOCS%%%%DOCSDIR%%/pdf/gxl2gv.1.pdf
+%%PORTDOCS%%%%DOCSDIR%%/pdf/lab_gamut.3.pdf
 %%PORTDOCS%%%%DOCSDIR%%/pdf/lefty.1.pdf
 %%PORTDOCS%%%%DOCSDIR%%/pdf/leftyguide.pdf
 %%PORTDOCS%%%%DOCSDIR%%/pdf/libguide.pdf
@@ -480,7 +479,6 @@ man/man7/graphviz.7.gz
 %%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
@@ -506,8 +504,6 @@ man/man7/graphviz.7.gz
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/pathplan_data/unknown.dat
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/pathplan.tcl
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/pathplan.tcl.README
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/spline.tcl
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/spline.tcl.README
 %%PHP%%share/php/gv.php
 %%LUA%%%%DATADIR%%/demo/modgraph.lua
 %%PERL%%%%DATADIR%%/demo/modgraph.pl
@@ -522,75 +518,7 @@ man/man7/graphviz.7.gz
 %%SMYRNA%%%%DATADIR%%/examples/world.gv
 %%MING%%%%DATADIR%%/font/Bitstream_Vera_Sans.fdb
 %%MING%%%%DATADIR%%/font/Bitstream_Vera_Serif.fdb
-%%SMYRNA%%%%DATADIR%%/smyrna/2D.png
-%%SMYRNA%%%%DATADIR%%/smyrna/3D.png
-%%SMYRNA%%%%DATADIR%%/smyrna/AntiselectRect.png
-%%SMYRNA%%%%DATADIR%%/smyrna/AntiselectRectX.png
-%%SMYRNA%%%%DATADIR%%/smyrna/add_edge.png
-%%SMYRNA%%%%DATADIR%%/smyrna/arial.tga
-%%SMYRNA%%%%DATADIR%%/smyrna/attrs.txt
-%%SMYRNA%%%%DATADIR%%/smyrna/attr_widgets.dot
-%%SMYRNA%%%%DATADIR%%/smyrna/center.png
-%%SMYRNA%%%%DATADIR%%/smyrna/cursor.png
-%%SMYRNA%%%%DATADIR%%/smyrna/deletE_edge.png
-%%SMYRNA%%%%DATADIR%%/smyrna/delete_node.png
-%%SMYRNA%%%%DATADIR%%/smyrna/details.png
-%%SMYRNA%%%%DATADIR%%/smyrna/edge.png
-%%SMYRNA%%%%DATADIR%%/smyrna/find_edge.png
-%%SMYRNA%%%%DATADIR%%/smyrna/find_node.png
-%%SMYRNA%%%%DATADIR%%/smyrna/fish.PNG
-%%SMYRNA%%%%DATADIR%%/smyrna/fisheye.png
-%%SMYRNA%%%%DATADIR%%/smyrna/fisheye.raw
-%%SMYRNA%%%%DATADIR%%/smyrna/fit.png
-%%SMYRNA%%%%DATADIR%%/smyrna/fit_to_screen.png
-%%SMYRNA%%%%DATADIR%%/smyrna/hourglass.png
-%%SMYRNA%%%%DATADIR%%/smyrna/magifier_zoom_out.png
-%%SMYRNA%%%%DATADIR%%/smyrna/magnifier.png
-%%SMYRNA%%%%DATADIR%%/smyrna/magnifier_zoom_in.png
-%%SMYRNA%%%%DATADIR%%/smyrna/mod_3D.png
-%%SMYRNA%%%%DATADIR%%/smyrna/mod_fisheye.png
-%%SMYRNA%%%%DATADIR%%/smyrna/mouse_actions.txt
-%%SMYRNA%%%%DATADIR%%/smyrna/move.png
-%%SMYRNA%%%%DATADIR%%/smyrna/new_delete.png
-%%SMYRNA%%%%DATADIR%%/smyrna/new_node.png
-%%SMYRNA%%%%DATADIR%%/smyrna/newzoom.png
-%%SMYRNA%%%%DATADIR%%/smyrna/no_fisheye.png
-%%SMYRNA%%%%DATADIR%%/smyrna/node.png
-%%SMYRNA%%%%DATADIR%%/smyrna/ok.raw
-%%SMYRNA%%%%DATADIR%%/smyrna/ok2.raw
-%%SMYRNA%%%%DATADIR%%/smyrna/ok3.raw
-%%SMYRNA%%%%DATADIR%%/smyrna/pan.png
-%%SMYRNA%%%%DATADIR%%/smyrna/pan.raw
-%%SMYRNA%%%%DATADIR%%/smyrna/preview.png
-%%SMYRNA%%%%DATADIR%%/smyrna/rect_select.png
-%%SMYRNA%%%%DATADIR%%/smyrna/rect_select2.png
-%%SMYRNA%%%%DATADIR%%/smyrna/rotate.png
-%%SMYRNA%%%%DATADIR%%/smyrna/rotate.raw
-%%SMYRNA%%%%DATADIR%%/smyrna/select.png
-%%SMYRNA%%%%DATADIR%%/smyrna/selectx.png
-%%SMYRNA%%%%DATADIR%%/smyrna/smyrna.glade
-%%SMYRNA%%%%DATADIR%%/smyrna/template.dot
-%%SMYRNA%%%%DATADIR%%/smyrna/zoom.png
-%%SMYRNA%%%%DATADIR%%/smyrna/zoom.raw
-%%SMYRNA%%%%DATADIR%%/smyrna/zoomin.png
-%%SMYRNA%%%%DATADIR%%/smyrna/zoomout.png
-%%SMYRNA%%%%DATADIR%%/smyrna/zoom_in.png
-%%SMYRNA%%%%DATADIR%%/smyrna/zoom_out.png
-%%SMYRNA%%%%DATADIR%%/smyrna/zoomminus.raw
-%%SMYRNA%%%%DATADIR%%/smyrna/zoomplus.raw
 %%GVEDIT%%%%DATADIR%%/gvedit/attrs.txt
-%%DATADIR%%/lefty/box.lefty
-%%DATADIR%%/lefty/def.lefty
-%%DATADIR%%/lefty/fractal.lefty
-%%DATADIR%%/lefty/fractal2.lefty
-%%DATADIR%%/lefty/slides.lefty
-%%DATADIR%%/lefty/tree.lefty
-%%DATADIR%%/lefty/lefty.psp
-%%XPM%%%%DATADIR%%/lefty/dotty.lefty
-%%XPM%%%%DATADIR%%/lefty/dotty_draw.lefty
-%%XPM%%%%DATADIR%%/lefty/dotty_edit.lefty
-%%XPM%%%%DATADIR%%/lefty/dotty_layout.lefty
-%%XPM%%%%DATADIR%%/lefty/dotty_ui.lefty
 %%DATADIR%%/graphs/directed/KW91.gv
 %%DATADIR%%/graphs/directed/Latin1.gv
 %%DATADIR%%/graphs/directed/NaN.gv
@@ -651,13 +579,17 @@ man/man7/graphviz.7.gz
 %%DATADIR%%/graphs/undirected/Petersen.gv
 %%DATADIR%%/graphs/undirected/ngk10_4.gv
 %%DATADIR%%/graphs/undirected/process.gv
+%%DATADIR%%/gvpr/addedges
 %%DATADIR%%/gvpr/addranks
 %%DATADIR%%/gvpr/addrings
 %%DATADIR%%/gvpr/anon
 %%DATADIR%%/gvpr/attr
 %%DATADIR%%/gvpr/bb
 %%DATADIR%%/gvpr/bbox
+%%DATADIR%%/gvpr/binduce
+%%DATADIR%%/gvpr/bipart
 %%DATADIR%%/gvpr/chkclusters
+%%DATADIR%%/gvpr/chkedges
 %%DATADIR%%/gvpr/cliptree
 %%DATADIR%%/gvpr/col
 %%DATADIR%%/gvpr/collapse
@@ -673,6 +605,7 @@ man/man7/graphviz.7.gz
 %%DATADIR%%/gvpr/flatten
 %%DATADIR%%/gvpr/get-layers-list
 %%DATADIR%%/gvpr/group
+%%DATADIR%%/gvpr/histogram
 %%DATADIR%%/gvpr/indent
 %%DATADIR%%/gvpr/knbhd
 %%DATADIR%%/gvpr/maxdeg
@@ -683,12 +616,80 @@ man/man7/graphviz.7.gz
 %%DATADIR%%/gvpr/span
 %%DATADIR%%/gvpr/topon
 %%DATADIR%%/gvpr/treetoclust
+%%DATADIR%%/lefty/box.lefty
+%%DATADIR%%/lefty/def.lefty
+%%DATADIR%%/lefty/fractal.lefty
+%%DATADIR%%/lefty/fractal2.lefty
+%%DATADIR%%/lefty/slides.lefty
+%%DATADIR%%/lefty/tree.lefty
+%%DATADIR%%/lefty/lefty.psp
+%%XPM%%%%DATADIR%%/lefty/dotty.lefty
+%%XPM%%%%DATADIR%%/lefty/dotty_draw.lefty
+%%XPM%%%%DATADIR%%/lefty/dotty_edit.lefty
+%%XPM%%%%DATADIR%%/lefty/dotty_layout.lefty
+%%XPM%%%%DATADIR%%/lefty/dotty_ui.lefty
+%%SMYRNA%%%%DATADIR%%/smyrna/2D.png
+%%SMYRNA%%%%DATADIR%%/smyrna/3D.png
+%%SMYRNA%%%%DATADIR%%/smyrna/AntiselectRect.png
+%%SMYRNA%%%%DATADIR%%/smyrna/AntiselectRectX.png
+%%SMYRNA%%%%DATADIR%%/smyrna/add_edge.png
+%%SMYRNA%%%%DATADIR%%/smyrna/arial.tga
+%%SMYRNA%%%%DATADIR%%/smyrna/attrs.txt
+%%SMYRNA%%%%DATADIR%%/smyrna/attr_widgets.dot
+%%SMYRNA%%%%DATADIR%%/smyrna/center.png
+%%SMYRNA%%%%DATADIR%%/smyrna/cursor.png
+%%SMYRNA%%%%DATADIR%%/smyrna/deletE_edge.png
+%%SMYRNA%%%%DATADIR%%/smyrna/delete_node.png
+%%SMYRNA%%%%DATADIR%%/smyrna/details.png
 %%SMYRNA%%%%DATADIR%%/smyrna/dot.PNG
+%%SMYRNA%%%%DATADIR%%/smyrna/edge.png
+%%SMYRNA%%%%DATADIR%%/smyrna/find_edge.png
+%%SMYRNA%%%%DATADIR%%/smyrna/find_node.png
+%%SMYRNA%%%%DATADIR%%/smyrna/fish.PNG
+%%SMYRNA%%%%DATADIR%%/smyrna/fisheye.png
+%%SMYRNA%%%%DATADIR%%/smyrna/fisheye.raw
+%%SMYRNA%%%%DATADIR%%/smyrna/fit.png
+%%SMYRNA%%%%DATADIR%%/smyrna/fit_to_screen.png
 %%SMYRNA%%%%DATADIR%%/smyrna/glade-3.png
+%%SMYRNA%%%%DATADIR%%/smyrna/hourglass.png
 %%SMYRNA%%%%DATADIR%%/smyrna/lcirco.png
 %%SMYRNA%%%%DATADIR%%/smyrna/ldot.png
 %%SMYRNA%%%%DATADIR%%/smyrna/lfdp.png
 %%SMYRNA%%%%DATADIR%%/smyrna/lneato.png
 %%SMYRNA%%%%DATADIR%%/smyrna/ltwopi.png
+%%SMYRNA%%%%DATADIR%%/smyrna/magifier_zoom_out.png
+%%SMYRNA%%%%DATADIR%%/smyrna/magnifier.png
+%%SMYRNA%%%%DATADIR%%/smyrna/magnifier_zoom_in.png
+%%SMYRNA%%%%DATADIR%%/smyrna/mod_3D.png
+%%SMYRNA%%%%DATADIR%%/smyrna/mod_fisheye.png
+%%SMYRNA%%%%DATADIR%%/smyrna/mouse_actions.txt
+%%SMYRNA%%%%DATADIR%%/smyrna/move.png
+%%SMYRNA%%%%DATADIR%%/smyrna/new_delete.png
+%%SMYRNA%%%%DATADIR%%/smyrna/new_node.png
+%%SMYRNA%%%%DATADIR%%/smyrna/newzoom.png
+%%SMYRNA%%%%DATADIR%%/smyrna/no_fisheye.png
+%%SMYRNA%%%%DATADIR%%/smyrna/node.png
+%%SMYRNA%%%%DATADIR%%/smyrna/ok.raw
+%%SMYRNA%%%%DATADIR%%/smyrna/ok2.raw
+%%SMYRNA%%%%DATADIR%%/smyrna/ok3.raw
+%%SMYRNA%%%%DATADIR%%/smyrna/pan.png
+%%SMYRNA%%%%DATADIR%%/smyrna/pan.raw
+%%SMYRNA%%%%DATADIR%%/smyrna/preview.png
+%%SMYRNA%%%%DATADIR%%/smyrna/rect_select.png
+%%SMYRNA%%%%DATADIR%%/smyrna/rect_select2.png
+%%SMYRNA%%%%DATADIR%%/smyrna/rotate.png
+%%SMYRNA%%%%DATADIR%%/smyrna/rotate.raw
+%%SMYRNA%%%%DATADIR%%/smyrna/select.png
 %%SMYRNA%%%%DATADIR%%/smyrna/selectr.png
+%%SMYRNA%%%%DATADIR%%/smyrna/selectx.png
 %%SMYRNA%%%%DATADIR%%/smyrna/single_select.png
+%%SMYRNA%%%%DATADIR%%/smyrna/smyrna.glade
+%%SMYRNA%%%%DATADIR%%/smyrna/template.dot
+%%SMYRNA%%%%DATADIR%%/smyrna/zoom.png
+%%SMYRNA%%%%DATADIR%%/smyrna/zoom.raw
+%%SMYRNA%%%%DATADIR%%/smyrna/zoomin.png
+%%SMYRNA%%%%DATADIR%%/smyrna/zoomout.png
+%%SMYRNA%%%%DATADIR%%/smyrna/zoom_in.png
+%%SMYRNA%%%%DATADIR%%/smyrna/zoom_out.png
+%%SMYRNA%%%%DATADIR%%/smyrna/zoomminus.raw
+%%SMYRNA%%%%DATADIR%%/smyrna/zoomplus.raw