- udpate to 2.22.0

- unbreak options WITH_TCL, WITH_TK
- new option WITH_GHOSTSCRIPT

- drop bash dependecy
PR:		132162

- fix tred regression
PR:		130751

5 files changed, 200 insertions, 172 deletions

diff --git a/graphics/graphviz/Makefile b/graphics/graphviz/Makefile
index 0fc4b0f06e19..7aba2adbbbc8 100644
--- a/graphics/graphviz/Makefile
+++ b/graphics/graphviz/Makefile
@@ -6,8 +6,7 @@
 #
 
 PORTNAME=	graphviz
-PORTVERSION=	2.20.3
-PORTREVISION=	4
+PORTVERSION=	2.22.2
 CATEGORIES=	graphics tk
 MASTER_SITES=	http://www.graphviz.org/pub/graphviz/ARCHIVE/ \
 		http://mirror.inerd.com/FreeBSD/distfiles/${PORTNAME}/
@@ -15,7 +14,6 @@ MASTER_SITES=	http://www.graphviz.org/pub/graphviz/ARCHIVE/ \
 MAINTAINER=	dinoex@FreeBSD.org
 COMMENT=	Graph Visualization Software from AT&T and Bell Labs
 
-BUILD_DEPENDS=	bash:${PORTSDIR}/shells/bash
 LIB_DEPENDS+=	jpeg.9:${PORTSDIR}/graphics/jpeg \
 		png.5:${PORTSDIR}/graphics/png \
 		freetype.9:${PORTSDIR}/print/freetype2 \
@@ -34,23 +32,22 @@ 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 gvcolor.1 gvpack.1 gvpr.1 gxl2dot.1 \
-		lneato.1 nop.1 prune.1 sccmap.1 tred.1 unflatten.1
-MAN3=		agraph.3 cdt.3 cgraph.3 graph.3 gvc.3 pathplan.3
+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 prune.1 sccmap.1 tred.1 unflatten.1
+MAN3=		cdt.3 cgraph.3 graph.3 gvc.3 pathplan.3
 MAN7=		graphviz.7
 MLINKS=		dot.1 circo.1 \
-		gxl2dot.1 dot2gxl.1 \
 		dot.1 fdp.1 \
 		dot.1 neato.1 \
-		dot.1 twopi.1
+		dot.1 sfdp.1 \
+		dot.1 twopi.1 \
+		gv2gxl.1 gxl2gv.1
+
 FIX_INCLUDE=	ast_common.h \
 		lib/cdt/dthdr.h \
 		lib/graph/libgraph.h lib/graph/triefa.h \
 		lib/graph/parser.h lib/graph/agxbuf.h \
-		lib/agraph/aghdr.h lib/agraph/agraph.h \
-		lib/agraph/malloc.h lib/agraph/vmstub.h \
-		lib/agraph/grammar.h \
 		lib/pathplan/tri.h lib/pathplan/pathplan.h \
 		lib/pathplan/pathutil.h lib/pathplan/solvers.h \
 		lib/pathplan/vis.h lib/pathplan/vispath.h \
@@ -82,6 +79,7 @@ OPTIONS=	ICONV "Build with ICONV support" on \
 		GNOMEUI  "build with libgnomeui support" off \
 		MING "Build with ming plugin" off \
 		DEVIL "Build with devil plugin" off \
+		GHOSTSCRIPT "Build with ghostscript plugin" off \
 		PERL "Perl bindings (swig)" off \
 		PHP "PHP bindings (swig)" off \
 		PYTHON "Python bindings (swig)" off \
@@ -112,19 +110,18 @@ CPPFLAGS+=		-I${TK_INCLUDEDIR}
 USE_TK_BUILD=		84+
 CONFIGURE_ARGS+=	--with-wish=${WISH}
 CONFIGURE_ENV+=		TKCONFIG="${TK_LIBDIR}/tkConfig.sh"
-MANN+=			tkspline.n
+MAN3+=			tkspline.3tk
 PLIST_SUB+=		WITH_TK=""
 .else
 PLIST_SUB+=		WITH_TK="@comment "
 .endif
 .if defined(WITH_TCL) || defined(WITH_TK)
-BROKEN=			Swig cant build tcl code
 CPPFLAGS+=		-I${TCL_INCLUDEDIR}
 USE_TCL_BUILD=		84+
 .include "${PORTSDIR}/Mk/bsd.tcl.mk"
 CONFIGURE_ARGS+=	--with-tclsh=${TCLSH}
 CONFIGURE_ENV+=		TCLCONFIG="${TCL_LIBDIR}/tclConfig.sh"
-MANN+=			gdtclft.n tcldot.n
+MAN3+=			gdtclft.3tcl tcldot.3tcl
 PLIST_SUB+=		TCL_VER="${TCL_VER}"
 .endif
 
@@ -277,7 +274,7 @@ PLIST_SUB+=		WITH_MING="@comment "
 .if defined(WITH_DEVIL)
 CONFIGURE_ARGS+=	--with-devil
 PLIST_SUB+=		WITH_DEVIL=""
-LIB_DEPENDS+=		IL.2:${PORTSDIR}/graphics/devil
+LIB_DEPENDS+=		IL:${PORTSDIR}/graphics/devil
 .else
 CONFIGURE_ARGS+=	--without-devil
 PLIST_SUB+=		WITH_DEVIL="@comment "
@@ -298,7 +295,7 @@ CONFIGURE_ENV+=		SWIG="/nonexistent"
 CONFIGURE_ARGS+=	--enable-perl
 PLIST_SUB+=		WITH_PERL=""
 USE_PERL5=	yes
-MANN+=			gv_perl.n
+MAN3+=			gv.3perl
 .else
 CONFIGURE_ARGS+=	--disable-perl
 PLIST_SUB+=		WITH_PERL="@comment "
@@ -310,7 +307,7 @@ PLIST_SUB+=		WITH_PHP=""
 USE_PHP=	yes
 USE_PHP_BUILD=	yes
 CPPFLAGS+=		-I${LOCALBASE}/include/php/Zend
-MANN+=			gv_php.n
+MAN3+=			gv.3php
 .else
 CONFIGURE_ARGS+=	--disable-php
 PLIST_SUB+=		WITH_PHP="@comment "
@@ -322,7 +319,7 @@ PLIST_SUB+=		WITH_PYTHON=""
 USE_PYTHON_BUILD=	yes
 .include "${PORTSDIR}/Mk/bsd.python.mk"
 LDFLAGS+=		"-L${PYTHON_LIBDIR}"
-MANN+=			gv_python.n
+MAN3+=			gv.3python
 .else
 CONFIGURE_ARGS+=	--disable-python
 PLIST_SUB+=		WITH_PYTHON="@comment "
@@ -333,7 +330,7 @@ CONFIGURE_ARGS+=	--enable-ruby
 PLIST_SUB+=		WITH_RUBY=""
 USE_RUBY=		yes
 .include "${PORTSDIR}/Mk/bsd.ruby.mk"
-MANN+=			gv_ruby.n
+MAN3+=			gv.3ruby
 .else
 CONFIGURE_ARGS+=	--disable-ruby
 PLIST_SUB+=		WITH_RUBY="@comment "
@@ -348,7 +345,7 @@ CFLAGS+=		-I${LUA_INCDIR}
 LDFLAGS+=		-L${LUA_LIBDIR} -lm
 CONFIGURE_ENV+=		LUA="${LUA_BINDIR}/lua" \
 			LUA_INSTALL_DIR=${PREFIX}/lib/lua/${LUA_VER}
-MANN+=			gv_lua.n
+MAN3+=			gv.3lua
 .else
 CONFIGURE_ARGS+=	--disable-lua
 PLIST_SUB+=		WITH_LUA="@comment "
@@ -357,7 +354,7 @@ PLIST_SUB+=		WITH_LUA="@comment "
 .if defined(WITH_TCL)
 CONFIGURE_ARGS+=	--enable-tcl
 PLIST_SUB+=		WITH_TCL=""
-MANN+=			gv_tcl.n
+MAN3+=			gv.3tcl
 .else
 CONFIGURE_ARGS+=	--disable-tcl
 PLIST_SUB+=		WITH_TCL="@comment "
@@ -367,12 +364,19 @@ PLIST_SUB+=		WITH_TCL="@comment "
 CONFIGURE_ARGS+=	--enable-guile
 PLIST_SUB+=		WITH_GUILE=""
 LIB_DEPENDS+=		guile.20:${PORTSDIR}/lang/guile
-MANN+=			gv_guile.n
+MAN3+=			gv.3guile
 .else
 CONFIGURE_ARGS+=	--disable-guile
 PLIST_SUB+=		WITH_GUILE="@comment "
 .endif
 
+.if defined(WITH_GHOSTSCRIPT)
+USE_GHOSTSCRIPT=	yes
+PLIST_SUB+=		WITH_GHOSTSCRIPT=""
+.else
+PLIST_SUB+=		WITH_GHOSTSCRIPT="@comment "
+.endif
+
 post-patch:
 	@${FIND} ${WRKSRC} -name Makefile.in | \
 		${XARGS} ${REINPLACE_CMD} \
@@ -402,17 +406,6 @@ post-patch:
 		${WRKSRC}/cmd/smyrna/tvnodes.h
 	@${REINPLACE_CMD} -e 's|#include "regex_win32.h"|#include <regex.h>|' \
 		${WRKSRC}/cmd/smyrna/btree.c
-	@${REINPLACE_CMD} -e 's|#! /bin/sh|#! ${LOCALBASE}/bin/bash|g' \
-		${WRKSRC}/configure
-
-.if defined(WITH_TK)
-post-install-script:
-	${INSTALL_MAN} \
-		${WRKSRC}/tclpkg/gdtclft/gdtclft.n \
-		${WRKSRC}/tclpkg/tcldot/tcldot.n \
-		${WRKSRC}/tclpkg/tkspline/tkspline.n \
-		${MANNPREFIX}/man/mann/
-.endif
 
 post-install: install-ldconfig-file
 	cd ${WRKSRC}/lib/expr && \
diff --git a/graphics/graphviz/distinfo b/graphics/graphviz/distinfo
index 1521258b56bf..1cf929ff2f91 100644
--- a/graphics/graphviz/distinfo
+++ b/graphics/graphviz/distinfo
@@ -1,3 +1,3 @@
-MD5 (graphviz-2.20.3.tar.gz) = 4d94c4b809a5c095acfc973d8d207fa9
-SHA256 (graphviz-2.20.3.tar.gz) = 583676c2faf0d194838cf19bbe6d71ae5a6ccbed86228901b34cf93ca48c393f
-SIZE (graphviz-2.20.3.tar.gz) = 13381532
+MD5 (graphviz-2.22.2.tar.gz) = 34510a76ee176c6e0e64b773174e0fdc
+SHA256 (graphviz-2.22.2.tar.gz) = fb08b49592bb83d4e7659776033f4137753d908681f19e3d1f8a8a415550edfb
+SIZE (graphviz-2.22.2.tar.gz) = 16674049
diff --git a/graphics/graphviz/files/patch-config_perl.pl b/graphics/graphviz/files/patch-config_perl.pl
new file mode 100644
index 000000000000..bbbf65452e03
--- /dev/null
+++ b/graphics/graphviz/files/patch-config_perl.pl
@@ -0,0 +1,9 @@
+--- config/config_perl.pl.orig	2008-07-14 14:54:04.000000000 +0200
++++ config/config_perl.pl	2009-03-15 11:08:29.000000000 +0100
+@@ -11,5 +11,5 @@
+ 	print "-I$archlib/CORE";
+ }
+ if ($ARGV[0] eq "PERL_INSTALL_DIR") {
+-	print "$Config{vendorarch}"
++	print "$Config{sitearch}"
+ }
diff --git a/graphics/graphviz/files/patch-configure b/graphics/graphviz/files/patch-configure
index a8d4adca0061..7b1d02b10fdf 100644
--- a/graphics/graphviz/files/patch-configure
+++ b/graphics/graphviz/files/patch-configure
@@ -21,14 +21,3 @@
  
          if test -n "$lua_inc"; then
             CFLAGS="$CFLAGS -I$lua_inc"
-@@ -27376,8 +27381,8 @@
-   if test "x$use_swig" != "xYes"; then
-     use_php="No (swig not available)"
-   else
--    if test `$SWIG -help 2>&1 | $GREP -c '\-php5 *- Generate'` = 0; then
--      use_php="No (swig does not support -php5 option)"
-+    if test `$SWIG -help 2>&1 | $GREP -c '\-php *- Generate'` = 0; then
-+      use_php="No (swig does not support -php option)"
-     else
-       # Extract the first word of "php", so it can be a program name with args.
- set dummy php; ac_word=$2
diff --git a/graphics/graphviz/pkg-plist b/graphics/graphviz/pkg-plist
index feeaf1bf2908..673fe93a92d4 100644
--- a/graphics/graphviz/pkg-plist
+++ b/graphics/graphviz/pkg-plist
@@ -1,43 +1,43 @@
-bin/dot
-bin/dot2gxl
+bin/acyclic
+bin/bcomps
 bin/circo
+bin/ccomps
 bin/diffimg
+bin/dijkstra
+bin/dot
+bin/dot2gxl
+bin/dotty
 bin/fdp
 bin/gc
+bin/gv2gxl
 bin/gvcolor
+bin/gvgen
+bin/gvpack
+bin/gvpr
+bin/gxl2gv
 bin/gxl2dot
-bin/acyclic
+%%WITH_XPM%%bin/lefty
+bin/lneato
+bin/mm2gv
 bin/neato
 bin/nop
-bin/ccomps
+bin/prune
 bin/sccmap
+%%WITH_SMYRNA%%bin/smyrna
 bin/tred
 bin/twopi
 bin/unflatten
-bin/gvpack
-bin/dijkstra
-bin/bcomps
-bin/gvpr
-%%WITH_XPM%%bin/lefty
-bin/lneato
-bin/dotty
-bin/prune
-%%WITH_SMYRNA%%bin/smyrna
+%%WITH_PANGOCAIRO%%bin/vimdot
 include/graphviz/ast_common.h
 include/graphviz/cdt.h
 include/graphviz/cgraph.h
-include/graphviz/demand_loading.c
-include/graphviz/dot_builtins.c
 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/aghdr.h
-include/graphviz/agraph.h
-include/graphviz/malloc.h
-include/graphviz/no_demand_loading.c
 include/graphviz/pathgeom.h
 include/graphviz/pathplan.h
 include/graphviz/pathutil.h
@@ -48,8 +48,6 @@ include/graphviz/vis.h
 include/graphviz/vispath.h
 include/graphviz/logic.h
 include/graphviz/arith.h
-include/graphviz/vmstub.h
-include/graphviz/grammar.h
 include/graphviz/tri.h
 include/graphviz/geom.h
 include/graphviz/color.h
@@ -69,7 +67,7 @@ include/graphviz/gvplugin_device.h
 include/graphviz/pack.h
 include/graphviz/gv.i
 include/graphviz/gv.cpp
-lib/graphviz/config
+lib/graphviz/config6
 lib/graphviz/libcdt.so
 lib/graphviz/libcdt.so.4
 lib/graphviz/libcdt.la
@@ -78,10 +76,6 @@ lib/graphviz/libgraph.so
 lib/graphviz/libgraph.so.4
 lib/graphviz/libgraph.la
 lib/graphviz/libgraph.a
-lib/graphviz/libagraph.so
-lib/graphviz/libagraph.so.4
-lib/graphviz/libagraph.la
-lib/graphviz/libagraph.a
 lib/graphviz/libcgraph.so
 lib/graphviz/libcgraph.so.4
 lib/graphviz/libcgraph.la
@@ -91,41 +85,45 @@ lib/graphviz/libpathplan.so.4
 lib/graphviz/libpathplan.la
 lib/graphviz/libpathplan.a
 lib/graphviz/libgvc.so
-lib/graphviz/libgvc.so.4
+lib/graphviz/libgvc.so.5
 lib/graphviz/libgvc.la
 lib/graphviz/libgvc.a
 lib/graphviz/libgvplugin_core.so
-lib/graphviz/libgvplugin_core.so.5
+lib/graphviz/libgvplugin_core.so.6
 lib/graphviz/libgvplugin_core.la
 lib/graphviz/libgvplugin_core.a
 lib/graphviz/libgvplugin_dot_layout.so
-lib/graphviz/libgvplugin_dot_layout.so.5
+lib/graphviz/libgvplugin_dot_layout.so.6
 lib/graphviz/libgvplugin_dot_layout.la
 lib/graphviz/libgvplugin_dot_layout.a
 lib/graphviz/libgvplugin_gd.so
-lib/graphviz/libgvplugin_gd.so.5
+lib/graphviz/libgvplugin_gd.so.6
 lib/graphviz/libgvplugin_gd.la
 lib/graphviz/libgvplugin_gd.a
+%%WITH_GHOSTSCRIPT%%lib/graphviz/libgvplugin_gs.a
+%%WITH_GHOSTSCRIPT%%lib/graphviz/libgvplugin_gs.la
+%%WITH_GHOSTSCRIPT%%lib/graphviz/libgvplugin_gs.so
+%%WITH_GHOSTSCRIPT%%lib/graphviz/libgvplugin_gs.so.6
 %%WITH_GTK%%lib/graphviz/libgvplugin_gtk.a
 %%WITH_GTK%%lib/graphviz/libgvplugin_gtk.la
 %%WITH_GTK%%lib/graphviz/libgvplugin_gtk.so
-%%WITH_GTK%%lib/graphviz/libgvplugin_gtk.so.5
+%%WITH_GTK%%lib/graphviz/libgvplugin_gtk.so.6
 %%WITH_PIXBUF%%lib/graphviz/libgvplugin_gdk_pixbuf.a
 %%WITH_PIXBUF%%lib/graphviz/libgvplugin_gdk_pixbuf.la
 %%WITH_PIXBUF%%lib/graphviz/libgvplugin_gdk_pixbuf.so
-%%WITH_PIXBUF%%lib/graphviz/libgvplugin_gdk_pixbuf.so.5
+%%WITH_PIXBUF%%lib/graphviz/libgvplugin_gdk_pixbuf.so.6
 lib/graphviz/libgvplugin_neato_layout.so
-lib/graphviz/libgvplugin_neato_layout.so.5
+lib/graphviz/libgvplugin_neato_layout.so.6
 lib/graphviz/libgvplugin_neato_layout.la
 lib/graphviz/libgvplugin_neato_layout.a
 %%WITH_PANGOCAIRO%%lib/graphviz/libgvplugin_pango.so
-%%WITH_PANGOCAIRO%%lib/graphviz/libgvplugin_pango.so.5
+%%WITH_PANGOCAIRO%%lib/graphviz/libgvplugin_pango.so.6
 %%WITH_PANGOCAIRO%%lib/graphviz/libgvplugin_pango.la
 %%WITH_PANGOCAIRO%%lib/graphviz/libgvplugin_pango.a
 %%WITH_PANGOCAIRO%%lib/graphviz/libgvplugin_xlib.a
 %%WITH_PANGOCAIRO%%lib/graphviz/libgvplugin_xlib.la
 %%WITH_PANGOCAIRO%%lib/graphviz/libgvplugin_xlib.so
-%%WITH_PANGOCAIRO%%lib/graphviz/libgvplugin_xlib.so.5
+%%WITH_PANGOCAIRO%%lib/graphviz/libgvplugin_xlib.so.6
 %%WITH_GUILE%%lib/graphviz/guile/libgv_guile.a
 %%WITH_GUILE%%lib/graphviz/guile/libgv_guile.la
 %%WITH_GUILE%%lib/graphviz/guile/libgv_guile.so
@@ -186,19 +184,20 @@ lib/graphviz/libgvplugin_neato_layout.a
 %%WITH_RSVG%%lib/graphviz/libgvplugin_rsvg.a
 %%WITH_RSVG%%lib/graphviz/libgvplugin_rsvg.la
 %%WITH_RSVG%%lib/graphviz/libgvplugin_rsvg.so
-%%WITH_RSVG%%lib/graphviz/libgvplugin_rsvg.so.5
+%%WITH_RSVG%%lib/graphviz/libgvplugin_rsvg.so.6
 %%WITH_DEVIL%%lib/graphviz/libgvplugin_devil.a
 %%WITH_DEVIL%%lib/graphviz/libgvplugin_devil.la
 %%WITH_DEVIL%%lib/graphviz/libgvplugin_devil.so
-%%WITH_DEVIL%%lib/graphviz/libgvplugin_devil.so.5
+%%WITH_DEVIL%%lib/graphviz/libgvplugin_devil.so.6
 libdata/pkgconfig/libcdt.pc
 libdata/pkgconfig/libgraph.pc
-libdata/pkgconfig/libagraph.pc
 libdata/pkgconfig/libcgraph.pc
 libdata/pkgconfig/libpathplan.pc
 libdata/pkgconfig/libgvc.pc
 %%PORTDOCS%%%%DOCSDIR%%/html/FAQ.html
+%%PORTDOCS%%%%DOCSDIR%%/html/arrows.html
 %%PORTDOCS%%%%DOCSDIR%%/html/build.html
+%%PORTDOCS%%%%DOCSDIR%%/html/char.html
 %%PORTDOCS%%%%DOCSDIR%%/html/index.html
 %%PORTDOCS%%%%DOCSDIR%%/html/winbuild.html
 %%PORTDOCS%%%%DOCSDIR%%/html/attrs.html
@@ -304,50 +303,71 @@ libdata/pkgconfig/libgvc.pc
 %%PORTDOCS%%%%DOCSDIR%%/html/point.gif
 %%PORTDOCS%%%%DOCSDIR%%/html/polygon.gif
 %%PORTDOCS%%%%DOCSDIR%%/html/record.gif
+%%PORTDOCS%%%%DOCSDIR%%/html/record2.gif
 %%PORTDOCS%%%%DOCSDIR%%/html/rect.gif
 %%PORTDOCS%%%%DOCSDIR%%/html/rectangle.gif
 %%PORTDOCS%%%%DOCSDIR%%/html/round.gif
 %%PORTDOCS%%%%DOCSDIR%%/html/septagon.gif
 %%PORTDOCS%%%%DOCSDIR%%/html/tab.gif
+%%PORTDOCS%%%%DOCSDIR%%/html/todo.html
 %%PORTDOCS%%%%DOCSDIR%%/html/trapezium.gif
 %%PORTDOCS%%%%DOCSDIR%%/html/triangle.gif
 %%PORTDOCS%%%%DOCSDIR%%/html/tripleoctagon.gif
+%%PORTDOCS%%%%DOCSDIR%%/pdf/acyclic.1.pdf
+%%PORTDOCS%%%%DOCSDIR%%/pdf/bcomps.1.pdf
+%%PORTDOCS%%%%DOCSDIR%%/pdf/ccomps.1.pdf
+%%PORTDOCS%%%%DOCSDIR%%/pdf/cdt.3.pdf
+%%PORTDOCS%%%%DOCSDIR%%/pdf/cgraph.3.pdf
+%%PORTDOCS%%%%DOCSDIR%%/pdf/circo.1.pdf
+%%PORTDOCS%%%%DOCSDIR%%/pdf/circo.pdf
+%%PORTDOCS%%%%DOCSDIR%%/pdf/dijkstra.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/fdp.1.pdf
+%%PORTDOCS%%%%DOCSDIR%%/pdf/fdp.pdf
+%%PORTDOCS%%%%DOCSDIR%%/pdf/gc.1.pdf
+%%PORTDOCS%%%%DOCSDIR%%/pdf/gdtclft.3tcl.pdf
+%%PORTDOCS%%%%DOCSDIR%%/pdf/graph.3.pdf
+%%PORTDOCS%%%%DOCSDIR%%/pdf/gv.3guile.pdf
+%%PORTDOCS%%%%DOCSDIR%%/pdf/gv.3io.pdf
+%%PORTDOCS%%%%DOCSDIR%%/pdf/gv.3java.pdf
+%%PORTDOCS%%%%DOCSDIR%%/pdf/gv.3lua.pdf
+%%PORTDOCS%%%%DOCSDIR%%/pdf/gv.3ocaml.pdf
+%%PORTDOCS%%%%DOCSDIR%%/pdf/gv.3perl.pdf
+%%PORTDOCS%%%%DOCSDIR%%/pdf/gv.3php.pdf
+%%PORTDOCS%%%%DOCSDIR%%/pdf/gv.3python.pdf
+%%PORTDOCS%%%%DOCSDIR%%/pdf/gv.3r.pdf
+%%PORTDOCS%%%%DOCSDIR%%/pdf/gv.3ruby.pdf
+%%PORTDOCS%%%%DOCSDIR%%/pdf/gv.3sharp.pdf
+%%PORTDOCS%%%%DOCSDIR%%/pdf/gv.3tcl.pdf
+%%PORTDOCS%%%%DOCSDIR%%/pdf/gv2gxl.1.pdf
+%%PORTDOCS%%%%DOCSDIR%%/pdf/gvc.3.pdf
+%%PORTDOCS%%%%DOCSDIR%%/pdf/gvcolor.1.pdf
+%%PORTDOCS%%%%DOCSDIR%%/pdf/gvgen.1.pdf
+%%PORTDOCS%%%%DOCSDIR%%/pdf/gvpack.1.pdf
+%%PORTDOCS%%%%DOCSDIR%%/pdf/gvpr.1.pdf
+%%PORTDOCS%%%%DOCSDIR%%/pdf/gxl2gv.1.pdf
+%%PORTDOCS%%%%DOCSDIR%%/pdf/dot2gxl.pdf
+%%PORTDOCS%%%%DOCSDIR%%/pdf/lefty.1.pdf
 %%PORTDOCS%%%%DOCSDIR%%/pdf/leftyguide.pdf
+%%PORTDOCS%%%%DOCSDIR%%/pdf/libguide.pdf
+%%PORTDOCS%%%%DOCSDIR%%/pdf/lneato.1.pdf
+%%PORTDOCS%%%%DOCSDIR%%/pdf/mm2gv.1.pdf
+%%PORTDOCS%%%%DOCSDIR%%/pdf/neato.1.pdf
+%%PORTDOCS%%%%DOCSDIR%%/pdf/neato.pdf
 %%PORTDOCS%%%%DOCSDIR%%/pdf/neatoguide.pdf
-%%PORTDOCS%%%%DOCSDIR%%/pdf/dot.pdf
-%%PORTDOCS%%%%DOCSDIR%%/pdf/dotty.pdf
-%%PORTDOCS%%%%DOCSDIR%%/pdf/gvpr.pdf
-%%PORTDOCS%%%%DOCSDIR%%/pdf/lefty.pdf
-%%PORTDOCS%%%%DOCSDIR%%/pdf/lneato.pdf
-%%PORTDOCS%%%%DOCSDIR%%/pdf/acyclic.pdf
-%%PORTDOCS%%%%DOCSDIR%%/pdf/bcomps.pdf
-%%PORTDOCS%%%%DOCSDIR%%/pdf/ccomps.pdf
-%%PORTDOCS%%%%DOCSDIR%%/pdf/dijkstra.pdf
-%%PORTDOCS%%%%DOCSDIR%%/pdf/gc.pdf
-%%PORTDOCS%%%%DOCSDIR%%/pdf/gvc.pdf
-%%PORTDOCS%%%%DOCSDIR%%/pdf/gvcolor.pdf
-%%PORTDOCS%%%%DOCSDIR%%/pdf/gvpack.pdf
-%%PORTDOCS%%%%DOCSDIR%%/pdf/gxl2dot.pdf
-%%PORTDOCS%%%%DOCSDIR%%/pdf/nop.pdf
-%%PORTDOCS%%%%DOCSDIR%%/pdf/sccmap.pdf
-%%PORTDOCS%%%%DOCSDIR%%/pdf/tred.pdf
-%%PORTDOCS%%%%DOCSDIR%%/pdf/unflatten.pdf
+%%PORTDOCS%%%%DOCSDIR%%/pdf/nop.1.pdf
+%%PORTDOCS%%%%DOCSDIR%%/pdf/pathplan.3.pdf
 %%PORTDOCS%%%%DOCSDIR%%/pdf/prune.pdf
-%%PORTDOCS%%%%DOCSDIR%%/pdf/agraph.pdf
-%%PORTDOCS%%%%DOCSDIR%%/pdf/cdt.pdf
-%%PORTDOCS%%%%DOCSDIR%%/pdf/graph.pdf
-%%PORTDOCS%%%%DOCSDIR%%/pdf/pathplan.pdf
-%%PORTDOCS%%%%DOCSDIR%%/pdf/gdtclft.pdf
-%%PORTDOCS%%%%DOCSDIR%%/pdf/tcldot.pdf
-%%PORTDOCS%%%%DOCSDIR%%/pdf/tkspline.pdf
-%%PORTDOCS%%%%DOCSDIR%%/pdf/dot2gxl.pdf
-%%PORTDOCS%%%%DOCSDIR%%/pdf/neato.pdf
+%%PORTDOCS%%%%DOCSDIR%%/pdf/sccmap.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/twopi.pdf
-%%PORTDOCS%%%%DOCSDIR%%/pdf/fdp.pdf
-%%PORTDOCS%%%%DOCSDIR%%/pdf/circo.pdf
-%%PORTDOCS%%%%DOCSDIR%%/pdf/cgraph.pdf
+%%PORTDOCS%%%%DOCSDIR%%/pdf/unflatten.1.pdf
 %%PORTDOCS%%%%DOCSDIR%%/AUTHORS
 %%PORTDOCS%%%%DOCSDIR%%/NEWS
 %%PORTDOCS%%%%DOCSDIR%%/ChangeLog
@@ -382,6 +402,9 @@ libdata/pkgconfig/libgvc.pc
 %%WITH_PYTHON%%%%DATADIR%%/demo/modgraph.py
 %%WITH_RUBY%%%%DATADIR%%/demo/modgraph.rb
 %%WITH_TCL%%%%DATADIR%%/demo/modgraph.tcl
+%%PORTDOCS%%%%DATADIR%%/doc/html/schema/arguments.xml
+%%PORTDOCS%%%%DATADIR%%/doc/html/schema/attributes.xml
+%%PORTDOCS%%%%DATADIR%%/doc/html/schema/attributes.xslt
 %%WITH_SMYRNA%%%%DATADIR%%/examples/4elt.dot
 %%WITH_SMYRNA%%%%DATADIR%%/examples/world.dot
 %%WITH_SMYRNA%%%%DATADIR%%/smyrna/AntiselectRect.png
@@ -432,62 +455,73 @@ libdata/pkgconfig/libgvc.pc
 %%DATADIR%%/lefty/dotty_edit.lefty
 %%DATADIR%%/lefty/dotty_layout.lefty
 %%DATADIR%%/lefty/dotty_ui.lefty
-%%DATADIR%%/graphs/directed/KW91.dot
-%%DATADIR%%/graphs/directed/Latin1.dot
-%%DATADIR%%/graphs/directed/NaN.dot
-%%DATADIR%%/graphs/directed/abstract.dot
-%%DATADIR%%/graphs/directed/alf.dot
-%%DATADIR%%/graphs/directed/arrows.dot
-%%DATADIR%%/graphs/directed/awilliams.dot
-%%DATADIR%%/graphs/directed/clust.dot
-%%DATADIR%%/graphs/directed/clust1.dot
-%%DATADIR%%/graphs/directed/clust2.dot
-%%DATADIR%%/graphs/directed/clust3.dot
-%%DATADIR%%/graphs/directed/clust4.dot
-%%DATADIR%%/graphs/directed/clust5.dot
-%%DATADIR%%/graphs/directed/crazy.dot
-%%DATADIR%%/graphs/directed/ctext.dot
-%%DATADIR%%/graphs/directed/dfa.dot
-%%DATADIR%%/graphs/directed/fig6.dot
-%%DATADIR%%/graphs/directed/fsm.dot
-%%DATADIR%%/graphs/directed/grammar.dot
-%%DATADIR%%/graphs/directed/hashtable.dot
-%%DATADIR%%/graphs/directed/honda-tokoro.dot
-%%DATADIR%%/graphs/directed/jcctree.dot
-%%DATADIR%%/graphs/directed/jsort.dot
-%%DATADIR%%/graphs/directed/ldbxtried.dot
-%%DATADIR%%/graphs/directed/longflat.dot
-%%DATADIR%%/graphs/directed/mike.dot
-%%DATADIR%%/graphs/directed/nhg.dot
-%%DATADIR%%/graphs/directed/oldarrows.dot
-%%DATADIR%%/graphs/directed/pgram.dot
-%%DATADIR%%/graphs/directed/pm2way.dot
-%%DATADIR%%/graphs/directed/pmpipe.dot
-%%DATADIR%%/graphs/directed/polypoly.dot
-%%DATADIR%%/graphs/directed/proc3d.dot
-%%DATADIR%%/graphs/directed/record2.dot
-%%DATADIR%%/graphs/directed/records.dot
-%%DATADIR%%/graphs/directed/rowe.dot
-%%DATADIR%%/graphs/directed/sdh.dot
-%%DATADIR%%/graphs/directed/shells.dot
-%%DATADIR%%/graphs/directed/states.dot
-%%DATADIR%%/graphs/directed/structs.dot
-%%DATADIR%%/graphs/directed/table.dot
-%%DATADIR%%/graphs/directed/train11.dot
-%%DATADIR%%/graphs/directed/trapeziumlr.dot
-%%DATADIR%%/graphs/directed/tree.dot
-%%DATADIR%%/graphs/directed/triedds.dot
-%%DATADIR%%/graphs/directed/try.dot
-%%DATADIR%%/graphs/directed/unix.dot
-%%DATADIR%%/graphs/directed/unix2.dot
-%%DATADIR%%/graphs/directed/viewfile.dot
-%%DATADIR%%/graphs/directed/world.dot
-%%DATADIR%%/graphs/directed/switch.dot
-%%DATADIR%%/graphs/undirected/ER.dot
-%%DATADIR%%/graphs/undirected/ngk10_4.dot
-%%DATADIR%%/graphs/undirected/process.dot
-%%DATADIR%%/graphs/undirected/Heawood.dot
-%%DATADIR%%/graphs/undirected/Petersen.dot
+%%DATADIR%%/graphs/directed/KW91.gv
+%%DATADIR%%/graphs/directed/Latin1.gv
+%%DATADIR%%/graphs/directed/NaN.gv
+%%DATADIR%%/graphs/directed/abstract.gv
+%%DATADIR%%/graphs/directed/alf.gv
+%%DATADIR%%/graphs/directed/arrows.gv
+%%DATADIR%%/graphs/directed/awilliams.gv
+%%DATADIR%%/graphs/directed/clust.gv
+%%DATADIR%%/graphs/directed/clust1.gv
+%%DATADIR%%/graphs/directed/clust2.gv
+%%DATADIR%%/graphs/directed/clust3.gv
+%%DATADIR%%/graphs/directed/clust4.gv
+%%DATADIR%%/graphs/directed/clust5.gv
+%%DATADIR%%/graphs/directed/crazy.gv
+%%DATADIR%%/graphs/directed/ctext.gv
+%%DATADIR%%/graphs/directed/dfa.gv
+%%DATADIR%%/graphs/directed/fig6.gv
+%%DATADIR%%/graphs/directed/fsm.gv
+%%DATADIR%%/graphs/directed/grammar.gv
+%%DATADIR%%/graphs/directed/hashtable.gv
+%%DATADIR%%/graphs/directed/honda-tokoro.gv
+%%DATADIR%%/graphs/directed/jcctree.gv
+%%DATADIR%%/graphs/directed/jsort.gv
+%%DATADIR%%/graphs/directed/ldbxtried.gv
+%%DATADIR%%/graphs/directed/longflat.gv
+%%DATADIR%%/graphs/directed/mike.gv
+%%DATADIR%%/graphs/directed/nhg.gv
+%%DATADIR%%/graphs/directed/oldarrows.gv
+%%DATADIR%%/graphs/directed/pgram.gv
+%%DATADIR%%/graphs/directed/pm2way.gv
+%%DATADIR%%/graphs/directed/pmpipe.gv
+%%DATADIR%%/graphs/directed/polypoly.gv
+%%DATADIR%%/graphs/directed/proc3d.gv
+%%DATADIR%%/graphs/directed/psfonttest.gv
+%%DATADIR%%/graphs/directed/record2.gv
+%%DATADIR%%/graphs/directed/records.gv
+%%DATADIR%%/graphs/directed/rowe.gv
+%%DATADIR%%/graphs/directed/russian.gv
+%%DATADIR%%/graphs/directed/sdh.gv
+%%DATADIR%%/graphs/directed/shells.gv
+%%DATADIR%%/graphs/directed/states.gv
+%%DATADIR%%/graphs/directed/structs.gv
+%%DATADIR%%/graphs/directed/switch.gv
+%%DATADIR%%/graphs/directed/table.gv
+%%DATADIR%%/graphs/directed/train11.gv
+%%DATADIR%%/graphs/directed/trapeziumlr.gv
+%%DATADIR%%/graphs/directed/tree.gv
+%%DATADIR%%/graphs/directed/triedds.gv
+%%DATADIR%%/graphs/directed/try.gv
+%%DATADIR%%/graphs/directed/unix.gv
+%%DATADIR%%/graphs/directed/unix2.gv
+%%DATADIR%%/graphs/directed/viewfile.gv
+%%DATADIR%%/graphs/directed/world.gv
+%%DATADIR%%/graphs/undirected/ER.gv
+%%DATADIR%%/graphs/undirected/Heawood.gv
+%%DATADIR%%/graphs/undirected/Petersen.gv
+%%DATADIR%%/graphs/undirected/ngk10_4.gv
+%%DATADIR%%/graphs/undirected/process.gv
+%%WITH_SMYRNA%%%%DATADIR%%/smyrna/dot.PNG
+%%WITH_SMYRNA%%%%DATADIR%%/smyrna/glade-3.png
+%%WITH_SMYRNA%%%%DATADIR%%/smyrna/lcirco.png
+%%WITH_SMYRNA%%%%DATADIR%%/smyrna/ldot.png
+%%WITH_SMYRNA%%%%DATADIR%%/smyrna/lfdp.png
+%%WITH_SMYRNA%%%%DATADIR%%/smyrna/lneato.png
+%%WITH_SMYRNA%%%%DATADIR%%/smyrna/ltwopi.png
+%%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/guile
 @exec mkdir -p %D/lib/graphviz/io
@@ -524,6 +558,9 @@ libdata/pkgconfig/libgvc.pc
 @dirrm lib/graphviz
 @dirrm include/graphviz
 @dirrm %%DATADIR%%/demo
+%%PORTDOCS%%@dirrm %%DATADIR%%/doc/html/schema
+%%PORTDOCS%%@dirrm %%DATADIR%%/doc/html
+%%PORTDOCS%%@dirrm %%DATADIR%%/doc
 @dirrm %%DATADIR%%/examples
 @dirrm %%DATADIR%%/graphs/directed
 @dirrm %%DATADIR%%/graphs/undirected