8 files changed, 422 insertions, 657 deletions

diff --git a/graphics/graphviz/Makefile b/graphics/graphviz/Makefile
index 363b658cc567..a38974e2746d 100644
--- a/graphics/graphviz/Makefile
+++ b/graphics/graphviz/Makefile
@@ -6,8 +6,7 @@
 #
 
 PORTNAME=	graphviz
-PORTVERSION=	2.6
-PORTREVISION=	4
+PORTVERSION=	2.8
 CATEGORIES=	graphics tk84
 MASTER_SITES=	http://www.graphviz.org/pub/graphviz/ARCHIVE/ \
 		http://mirror.inerd.com/FreeBSD/distfiles/${PORTNAME}/
@@ -15,12 +14,12 @@ MASTER_SITES=	http://www.graphviz.org/pub/graphviz/ARCHIVE/ \
 MAINTAINER=	shaun@inerd.com
 COMMENT=	Graph Visualization Software from AT&T and Bell Labs
 
-LIB_DEPENDS=	jpeg.9:${PORTSDIR}/graphics/jpeg \
-		png.5:${PORTSDIR}/graphics/png \
-		freetype.9:${PORTSDIR}/print/freetype2 \
-		fontconfig.1:${PORTSDIR}/x11-fonts/fontconfig \
-		tk84.1:${PORTSDIR}/x11-toolkits/tk84 \
-		expat.6:${PORTSDIR}/textproc/expat2 \
+LIB_DEPENDS=	jpeg.9:${PORTSDIR}/graphics/jpeg		\
+		png.5:${PORTSDIR}/graphics/png			\
+		freetype.9:${PORTSDIR}/print/freetype2		\
+		fontconfig.1:${PORTSDIR}/x11-fonts/fontconfig	\
+		tk84.1:${PORTSDIR}/x11-toolkits/tk84		\
+		expat.6:${PORTSDIR}/textproc/expat2		\
 		gd.4:${PORTSDIR}/graphics/gd
 
 USE_BISON=	yes
@@ -30,32 +29,37 @@ USE_XPM=	yes
 USE_AUTOTOOLS=	libltdl:15
 GNU_CONFIGURE=	yes
 CONFIGURE_ENV=	CPPFLAGS="-I${X11BASE}/include -I${LOCALBASE}/include -I${LOCALBASE}/include/tcl8.4 -I${LOCALBASE}/include/tk8.4" \
-		LDFLAGS="-L${LOCALBASE}/lib -L${X11BASE}/lib" \
-		TCLCONFIG=${LOCALBASE}/lib/tcl8.4/tclConfig.sh \
-		TKCONFIG=${LOCALBASE}/lib/tk8.4/tkConfig.sh \
+		LDFLAGS="-L${LOCALBASE}/lib -L${X11BASE}/lib"	\
+		TCLCONFIG=${LOCALBASE}/lib/tcl8.4/tclConfig.sh	\
+		TKCONFIG=${LOCALBASE}/lib/tk8.4/tkConfig.sh	\
 		MISSING=${TRUE}
-CONFIGURE_ARGS=	--program-transform-name="s/x/x/" \
-		--enable-dependency-tracking \
-		--with-iconvlibdir=${LOCALBASE}/lib \
-		--with-tclsh=${LOCALBASE}/tcl8.4 \
-		--with-wish=${LOCALBASE}/wish8.4 \
-		--with-fontconfigincludedir=${X11BASE}/include \
-		--with-fontconfiglibdir=${X11BASE}/lib
+CONFIGURE_ARGS=	--program-transform-name="s/x/x/"		\
+		--enable-dependency-tracking			\
+		--with-iconvlibdir=${LOCALBASE}/lib		\
+		--with-tclsh=${LOCALBASE}/tcl8.4		\
+		--with-wish=${LOCALBASE}/wish8.4		\
+		--with-fontconfigincludedir=${X11BASE}/include	\
+		--with-fontconfiglibdir=${X11BASE}/lib		\
+		--disable-swig --disable-sharp --disable-guile	\
+		--disable-io --disable-lua --disable-ocaml	\
+		--disable-perl --disable-php --disable-python	\
+		--disable-ruby
 MAKE_ENV=	EXPR_COMPAT=yes MISSING=${TRUE}
 
-MAN1=		acyclic.1 bcomps.1 ccomps.1 dijkstra.1 dot.1 \
+MAN1=		acyclic.1 bcomps.1 ccomps.1 dijkstra.1 dot.1		 \
 		dotty.1 gc.1 gvcolor.1 gvpack.1 gvpr.1 gxl2dot.1 lefty.1 \
 		lneato.1 nop.1 prune.1 sccmap.1 tred.1 unflatten.1
 MAN3=		agraph.3 cdt.3 expr.3 graph.3 pack.3 pathplan.3
 MANN=		gdtclft.n tcldot.n tkspline.n
-MLINKS=		dot.1 circo.1 \
-		gxl2dot.1 dot2gxl.1 \
-		dot.1 fdp.1 \
-		dot.1 neato.1 \
+MLINKS=		dot.1 circo.1		\
+		gxl2dot.1 dot2gxl.1	\
+		dot.1 fdp.1		\
+		dot.1 neato.1		\
 		dot.1 twopi.1
 
-MYPORTDOCS=	dotguide.pdf dottyguide.pdf leftyguide.pdf \
-		neatoguide.pdf Dot.ref FAQ.html
+PDOCS_TXT=	AUTHORS NEWS ChangeLog cpl1.0.txt doc/Dot.ref doc/latex_suggestions.txt
+PDOCS_PDF=	doc/*.pdf */*/*.pdf
+PDOCS_HTML=	doc/*.html doc/info/*.html doc/info/*.gif
 
 INSTALLS_SHLIB=	yes
 LDCONFIG_DIRS=	%%PREFIX%%/lib/${PORTNAME}
@@ -65,17 +69,67 @@ USE_LDCONFIG=	${PREFIX}/lib/${PORTNAME}
 .include "${PORTSDIR}/misc/ldconfig_compat/bsd.ldconfig.mk"
 
 post-patch:
-	@${FIND} ${WRKSRC} -name Makefile.in | ${XARGS} ${REINPLACE_CMD} -e 's|(libdir)/pkgconfig|(prefix)/libdata/pkgconfig|'
+	@${FIND} ${WRKSRC} -name Makefile.in | ${XARGS}					\
+	  ${REINPLACE_CMD} -e 's|(libdir)/pkgconfig|(prefix)/libdata/pkgconfig|'	\
+	                   -e "s|\([^:]*:.*\) install-pdfDATA\(.*\)|\1\2|g"		\
+	                   -e "s|\([^:]*:.*\) install-htmlDATA\(.*\)|\1\2|g"		\
+	                   -e "s|\([^:]*:.*\) install-txtDATA\(.*\)|\1\2|g"		\
+	                   -e "s|\([^:]*:.*\) install-demoDATA\(.*\)|\1\2|g"		\
+	                   -e "s|\([^:]*:.*\) install-demoSCRIPTS\(.*\)|\1\2|g"		\
+	                   -e "s|\([^:]*:.*\) install-pathplanexampleDATA\(.*\)|\1\2|g" \
+	                   -e 's|demodir = $$(pkgdatadir)/demo|demodir = ${EXAMPLESDIR}|';
+
+	@${REINPLACE_CMD} -e 's|^\.SUFFIXES: \(.*\)\.1\(.*\)|.SUFFIXES: \1 \2|'	\
+	                  ${WRKSRC}/cmd/tools/Makefile.in			\
+	                  ${WRKSRC}/cmd/gvpr/Makefile.in
+
 .if ${OSVERSION} < 500000
 	@${REINPLACE_CMD} 's|-Wno-unused-parameter||g' ${WRKSRC}/configure
 .endif
+	@${REINPLACE_CMD} -e 's|tclsh|tclsh8.4|g' ${WRKSRC}/tclpkg/gv/Makefile.in
+	@${REINPLACE_CMD} -e 's|tclsh|tclsh8.4|g'			\
+	                  -e 's|wish|wish8.4|g'				\
+	                  ${WRKSRC}/tclpkg/tcldot/demo/doted		\
+	                  ${WRKSRC}/tclpkg/tclpathplan/demo/pathplan	\
+	                  ${WRKSRC}/tclpkg/tkspline/demo/spline
+
+post-install-script:
+	${INSTALL_MAN} ${WRKSRC}/tclpkg/gdtclft/gdtclft.n   ${MANNPREFIX}/man/mann
+	${INSTALL_MAN} ${WRKSRC}/tclpkg/tcldot/tcldot.n     ${MANNPREFIX}/man/mann
+	${INSTALL_MAN} ${WRKSRC}/tclpkg/tkspline/tkspline.n ${MANNPREFIX}/man/mann
 
 post-install: install-ldconfig-file
 .if !defined(NOPORTDOCS)
-	@${MKDIR} ${DOCSDIR}
-.for file in ${MYPORTDOCS}
-	${INSTALL_DATA} ${WRKSRC}/doc/${file} ${DOCSDIR}
-.endfor
+	@${MKDIR} ${DOCSDIR}/html
+	@${MKDIR} ${DOCSDIR}/pdf
+	cd ${WRKSRC} && ${INSTALL_DATA} ${PDOCS_TXT} ${DOCSDIR}		\
+	             && ${INSTALL_DATA} ${PDOCS_PDF} ${DOCSDIR}/pdf	\
+	             && ${INSTALL_DATA} ${PDOCS_HTML} ${DOCSDIR}/html
+
+.	for i in neato.pdf twopi.pdf fdp.pdf circo.pdf
+		cd ${DOCSDIR}/pdf && ${LN} -fs dot.pdf ${i}
+.	endfor
+	cd ${DOCSDIR}/pdf && ${LN} -fs gxl2dot.pdf dot2gxl.pdf
 .endif
 
+	@${ECHO_MSG} "Installing demo data..."
+	@${MKDIR} ${EXAMPLESDIR}
+	${INSTALL_SCRIPT}  ${WRKSRC}/tclpkg/gdtclft/demo/entities        ${EXAMPLESDIR}
+	${INSTALL_DATA}    ${WRKSRC}/tclpkg/gdtclft/demo/entities.README ${EXAMPLESDIR}
+
+	${INSTALL_SCRIPT}  ${WRKSRC}/tclpkg/tcldot/demo/doted            ${EXAMPLESDIR}
+	${INSTALL_DATA}    ${WRKSRC}/tclpkg/tcldot/demo/doted.README     ${EXAMPLESDIR}
+
+	${INSTALL_SCRIPT}  ${WRKSRC}/tclpkg/tcldot/demo/gcat             ${EXAMPLESDIR}
+	${INSTALL_DATA}    ${WRKSRC}/tclpkg/tcldot/demo/gcat.README      ${EXAMPLESDIR}
+
+	@${MKDIR} ${EXAMPLESDIR}/pathplan_data
+	${INSTALL_SCRIPT}  ${WRKSRC}/tclpkg/tclpathplan/demo/pathplan	 ${EXAMPLESDIR}
+	${INSTALL_DATA}    ${WRKSRC}/tclpkg/tclpathplan/demo/pathplan.README ${EXAMPLESDIR}
+	${INSTALL_DATA}    ${WRKSRC}/tclpkg/tclpathplan/demo/pathplan_data/*.dat \
+	                   ${EXAMPLESDIR}/pathplan_data
+
+	${INSTALL_SCRIPT}  ${WRKSRC}/tclpkg/tkspline/demo/spline	 ${EXAMPLESDIR}
+	${INSTALL_DATA}    ${WRKSRC}/tclpkg/tkspline/demo/spline.README	 ${EXAMPLESDIR}
+
 .include <bsd.port.post.mk>
diff --git a/graphics/graphviz/distinfo b/graphics/graphviz/distinfo
index 1ed505eca579..7d85e215d561 100644
--- a/graphics/graphviz/distinfo
+++ b/graphics/graphviz/distinfo
@@ -1,3 +1,3 @@
-MD5 (graphviz-2.6.tar.gz) = 0d61fc4f8660be31503d4f9ab6f26bf0
-SHA256 (graphviz-2.6.tar.gz) = 5208949dd8702205a5d65dfee4439870e36681aa076220cb159d28536fa2cca9
-SIZE (graphviz-2.6.tar.gz) = 4109848
+MD5 (graphviz-2.8.tar.gz) = ca921b4a9bcd86da4a1092bb17a57d83
+SHA256 (graphviz-2.8.tar.gz) = be0c4b7e49f7c226c68d54bb47018f3b3bfb51bb992f5ad71da875cad13367ca
+SIZE (graphviz-2.8.tar.gz) = 4243130
diff --git a/graphics/graphviz/files/patch-cmd-gvpr-gvpr.1 b/graphics/graphviz/files/patch-cmd-gvpr-gvpr.1
new file mode 100644
index 000000000000..03be2fea2d50
--- /dev/null
+++ b/graphics/graphviz/files/patch-cmd-gvpr-gvpr.1
@@ -0,0 +1,15 @@
+--- cmd/gvpr/gvpr.1.orig	Fri Mar 10 09:04:33 2006
++++ cmd/gvpr/gvpr.1	Fri Mar 10 09:04:52 2006
+@@ -1,3 +1,12 @@
++.de EX
++.fam C
++.nf
++..
++.de EE
++.fam
++.fi
++..
++
+ .TH GVPR 1 "14 November 2003"
+ .SH NAME
+ gvpr \- graph pattern scanning and processing language
diff --git a/graphics/graphviz/files/patch-cmd-tools-gvpack.1 b/graphics/graphviz/files/patch-cmd-tools-gvpack.1
new file mode 100644
index 000000000000..ef7d149885e8
--- /dev/null
+++ b/graphics/graphviz/files/patch-cmd-tools-gvpack.1
@@ -0,0 +1,15 @@
+--- cmd/tools/gvpack.1.orig	Fri Mar 10 09:02:53 2006
++++ cmd/tools/gvpack.1	Fri Mar 10 09:01:31 2006
+@@ -1,3 +1,12 @@
++.de EX
++.fam C
++.nf
++..
++.de EE
++.fam
++.fi
++..
++
+ .TH GVPACK 1 "8 April 2003"
+ .SH NAME
+ gvpack \- merge and pack disjoint graphs
diff --git a/graphics/graphviz/files/patch-configure b/graphics/graphviz/files/patch-configure
index 4ce4505490eb..5898e7d8f0d0 100644
--- a/graphics/graphviz/files/patch-configure
+++ b/graphics/graphviz/files/patch-configure
@@ -1,6 +1,6 @@
---- configure.orig	Sun Aug 28 15:09:28 2005
-+++ configure	Sat Jan 28 22:36:22 2006
-@@ -4690,7 +4690,7 @@
+--- configure.orig	Fri Feb  3 22:33:33 2006
++++ configure	Fri Feb 24 15:36:12 2006
+@@ -4724,7 +4724,7 @@
  	        *-dec-osf* )
  	            CFLAGS="${CFLAGS} -mieee -Wall"
  	            ;;
@@ -9,295 +9,3 @@
                      CFLAGS="${CFLAGS} -mieee -Wall"
                      ;;
  	        *-apple-darwin* )
-@@ -23372,21 +23372,21 @@
- fi
- fi
- CSHARP=$ac_cv_prog_CSHARP
--if test -n "$CSHARP"; then
--  echo "$as_me:$LINENO: result: $CSHARP" >&5
--echo "${ECHO_T}$CSHARP" >&6
--else
-+#if test -n "$CSHARP"; then
-+#  echo "$as_me:$LINENO: result: $CSHARP" >&5
-+#echo "${ECHO_T}$CSHARP" >&6
-+#else
-   echo "$as_me:$LINENO: result: no" >&5
- echo "${ECHO_T}no" >&6
--fi
-+#fi
- 
--if test "x$CSHARP" = "x"; then
-+#if test "x$CSHARP" = "x"; then
-   HAVE_CSHARP=0
--else
--  HAVE_CSHARP=1
--  CSHARP_INCLUDES=
--  CSHARP_LIBS=
--fi
-+#else
-+#  HAVE_CSHARP=1
-+#  CSHARP_INCLUDES=
-+#  CSHARP_LIBS=
-+#fi
- 
- 
- if test "x$HAVE_CSHARP" = "x1"; then
-@@ -23429,21 +23429,21 @@
- fi
- fi
- GUILE=$ac_cv_prog_GUILE
--if test -n "$GUILE"; then
--  echo "$as_me:$LINENO: result: $GUILE" >&5
--echo "${ECHO_T}$GUILE" >&6
--else
-+#if test -n "$GUILE"; then
-+#  echo "$as_me:$LINENO: result: $GUILE" >&5
-+#echo "${ECHO_T}$GUILE" >&6
-+#else
-   echo "$as_me:$LINENO: result: no" >&5
- echo "${ECHO_T}no" >&6
--fi
-+#fi
- 
--if test "x$GUILE" = "x"; then
-+#if test "x$GUILE" = "x"; then
-   HAVE_GUILE=0
--else
--  HAVE_GUILE=1
--  GUILE_INCLUDES=
--  GUILE_LIBS=
--fi
-+#else
-+#  HAVE_GUILE=1
-+#  GUILE_INCLUDES=
-+#  GUILE_LIBS=
-+#fi
- if test "${ac_cv_header_libguile_h+set}" = set; then
-   echo "$as_me:$LINENO: checking for libguile.h" >&5
- echo $ECHO_N "checking for libguile.h... $ECHO_C" >&6
-@@ -23633,21 +23633,21 @@
- fi
- fi
- IO=$ac_cv_prog_IO
--if test -n "$IO"; then
--  echo "$as_me:$LINENO: result: $IO" >&5
--echo "${ECHO_T}$IO" >&6
--else
-+#if test -n "$IO"; then
-+#  echo "$as_me:$LINENO: result: $IO" >&5
-+#echo "${ECHO_T}$IO" >&6
-+#else
-   echo "$as_me:$LINENO: result: no" >&5
- echo "${ECHO_T}no" >&6
--fi
-+#fi
- 
--if test "x$IO" = "x"; then
-+#if test "x$IO" = "x"; then
-   HAVE_IO=0
--else
--  HAVE_IO=1
--  IO_INCLUDES=
--  IO_LIBS=
--fi
-+#else
-+#  HAVE_IO=1
-+#  IO_INCLUDES=
-+#  IO_LIBS=
-+#fi
- 
- 
- if test "x$HAVE_IO" = "x1"; then
-@@ -23690,21 +23690,21 @@
- fi
- fi
- JAVA=$ac_cv_prog_JAVA
--if test -n "$JAVA"; then
--  echo "$as_me:$LINENO: result: $JAVA" >&5
--echo "${ECHO_T}$JAVA" >&6
--else
-+#if test -n "$JAVA"; then
-+#  echo "$as_me:$LINENO: result: $JAVA" >&5
-+#echo "${ECHO_T}$JAVA" >&6
-+#else
-   echo "$as_me:$LINENO: result: no" >&5
- echo "${ECHO_T}no" >&6
--fi
-+#fi
- 
--if test "x$JAVA" = "x"; then
-+#if test "x$JAVA" = "x"; then
-   HAVE_JAVA=0
--else
--  HAVE_JAVA=1
--  JAVA_INCLUDES=
--  JAVA_LIBS=
--fi
-+#else
-+#  HAVE_JAVA=1
-+#  JAVA_INCLUDES=
-+#  JAVA_LIBS=
-+#fi
- if test "${ac_cv_header_jni_h+set}" = set; then
-   echo "$as_me:$LINENO: checking for jni.h" >&5
- echo $ECHO_N "checking for jni.h... $ECHO_C" >&6
-@@ -23894,21 +23894,21 @@
- fi
- fi
- OCAML=$ac_cv_prog_OCAML
--if test -n "$OCAML"; then
--  echo "$as_me:$LINENO: result: $OCAML" >&5
--echo "${ECHO_T}$OCAML" >&6
--else
-+#if test -n "$OCAML"; then
-+#  echo "$as_me:$LINENO: result: $OCAML" >&5
-+#echo "${ECHO_T}$OCAML" >&6
-+#else
-   echo "$as_me:$LINENO: result: no" >&5
- echo "${ECHO_T}no" >&6
--fi
-+#fi
- 
--if test "x$OCAML" = "x"; then
-+#if test "x$OCAML" = "x"; then
-   HAVE_OCAML=0
--else
--  HAVE_OCAML=1
--  OCAML_INCLUDES=
--  OCAML_LIBS=
--fi
-+#else
-+#  HAVE_OCAML=1
-+#  OCAML_INCLUDES=
-+#  OCAML_LIBS=
-+#fi
- 
- 
- if test "x$HAVE_OCAML" = "x1"; then
-@@ -23951,22 +23951,22 @@
- fi
- fi
- PERL=$ac_cv_prog_PERL
--if test -n "$PERL"; then
--  echo "$as_me:$LINENO: result: $PERL" >&5
--echo "${ECHO_T}$PERL" >&6
--else
-+#if test -n "$PERL"; then
-+#  echo "$as_me:$LINENO: result: $PERL" >&5
-+#echo "${ECHO_T}$PERL" >&6
-+#else
-   echo "$as_me:$LINENO: result: no" >&5
- echo "${ECHO_T}no" >&6
--fi
-+#fi
- 
--if test "x$PERL" = "x"; then
-+#if test "x$PERL" = "x"; then
-   HAVE_PERL=0
--else
--  HAVE_PERL=1
--  PERL_ARCHLIB=`perl -e 'use Config; print $Config{archlib};'`
--  PERL_INCLUDES=-I$PERL_ARCHLIB/CORE
--  PERL_LIBS="-L$PERL_ARCHLIB/CORE -lperl"
--fi
-+#else
-+#  HAVE_PERL=1
-+#  PERL_ARCHLIB=`perl -e 'use Config; print $Config{archlib};'`
-+#  PERL_INCLUDES=-I$PERL_ARCHLIB/CORE
-+#  PERL_LIBS="-L$PERL_ARCHLIB/CORE -lperl"
-+#fi
- save_CPPFLAGS=$CPPFLAGS
- CPPFLAGS="$CPPFLAGS $PERL_INCLUDES"
- if test "${ac_cv_header_EXTERN_h+set}" = set; then
-@@ -24160,21 +24160,21 @@
- fi
- fi
- PHP=$ac_cv_prog_PHP
--if test -n "$PHP"; then
--  echo "$as_me:$LINENO: result: $PHP" >&5
--echo "${ECHO_T}$PHP" >&6
--else
-+#if test -n "$PHP"; then
-+#  echo "$as_me:$LINENO: result: $PHP" >&5
-+#echo "${ECHO_T}$PHP" >&6
-+#else
-   echo "$as_me:$LINENO: result: no" >&5
- echo "${ECHO_T}no" >&6
--fi
-+#fi
- 
--if test "x$PHP" = "x"; then
-+#if test "x$PHP" = "x"; then
-   HAVE_PHP=0
--else
--  HAVE_PHP=1
--  PHP_INCLUDES="-I/usr/include/php -I/usr/include/php/main -I/usr/include/php/Zend -I/usr/include/php/TSRM"
--  PHP_LIBS=
--fi
-+#else
-+#  HAVE_PHP=1
-+#  PHP_INCLUDES="-I/usr/include/php -I/usr/include/php/main -I/usr/include/php/Zend -I/usr/include/php/TSRM"
-+#  PHP_LIBS=
-+#fi
- save_CPPFLAGS=$CPPFLAGS
- CPPFLAGS="$CPPFLAGS $PHP_INCLUDES"
- if test "${ac_cv_header_zend_h+set}" = set; then
-@@ -24367,17 +24367,18 @@
- fi
- fi
- PYTHON=$ac_cv_prog_PYTHON
--if test -n "$PYTHON"; then
--  echo "$as_me:$LINENO: result: $PYTHON" >&5
--echo "${ECHO_T}$PYTHON" >&6
--else
-+#if test -n "$PYTHON"; then
-+#  echo "$as_me:$LINENO: result: $PYTHON" >&5
-+#echo "${ECHO_T}$PYTHON" >&6
-+#else
-   echo "$as_me:$LINENO: result: no" >&5
- echo "${ECHO_T}no" >&6
--fi
-+#fi
- 
--if test "x$PYTHON" = "x"; then
-+#if test "x$PYTHON" = "x"; then
-   HAVE_PYTHON=0
--else
-+#else
-+if false; then
-   HAVE_PYTHON=1
-   PYTHON_VERSION=`python -V 2>&1 | grep Python | cut -d ' ' -f 2`
-   if test "x$PYTHON_VERSION" = "x"; then
-@@ -24591,21 +24592,21 @@
- fi
- fi
- RUBY=$ac_cv_prog_RUBY
--if test -n "$RUBY"; then
--  echo "$as_me:$LINENO: result: $RUBY" >&5
--echo "${ECHO_T}$RUBY" >&6
--else
-+#if test -n "$RUBY"; then
-+#  echo "$as_me:$LINENO: result: $RUBY" >&5
-+#echo "${ECHO_T}$RUBY" >&6
-+#else
-   echo "$as_me:$LINENO: result: no" >&5
- echo "${ECHO_T}no" >&6
--fi
-+#fi
- 
--if test "x$RUBY" = "x"; then
-+#if test "x$RUBY" = "x"; then
-   HAVE_RUBY=0
--else
--  HAVE_RUBY=1
--  RUBY_INCLUDES="-I`ruby $TOP_DIR/config/config_ruby.rb INCLUDES`"
--  RUBY_LIBS="-L`ruby $TOP_DIR/config/config_ruby.rb lib` -lruby"
--fi
-+#else
-+#  HAVE_RUBY=1
-+#  RUBY_INCLUDES="-I`ruby $TOP_DIR/config/config_ruby.rb INCLUDES`"
-+#  RUBY_LIBS="-L`ruby $TOP_DIR/config/config_ruby.rb lib` -lruby"
-+#fi
- 
- 
- if test "x$HAVE_RUBY" = "x1"; then
diff --git a/graphics/graphviz/files/patch-lib-gvc-gvconfig.c b/graphics/graphviz/files/patch-lib-gvc-gvconfig.c
deleted file mode 100644
index 1b89d143d344..000000000000
--- a/graphics/graphviz/files/patch-lib-gvc-gvconfig.c
+++ /dev/null
@@ -1,10 +0,0 @@
---- lib/gvc/gvconfig.c.orig	Thu Dec 29 12:33:58 2005
-+++ lib/gvc/gvconfig.c	Thu Dec 29 11:02:51 2005
-@@ -21,6 +21,7 @@
- #include	<string.h>
- 
- #ifndef DISABLE_LTDL
-+#include	<sys/types.h>
- #include	<regex.h>
- #include	<sys/stat.h>
- #include	<unistd.h>
diff --git a/graphics/graphviz/pkg-descr b/graphics/graphviz/pkg-descr
index 28d03565cec9..20bbf1836e8b 100644
--- a/graphics/graphviz/pkg-descr
+++ b/graphics/graphviz/pkg-descr
@@ -5,10 +5,10 @@ These programs licensed under the terms described in the
 Web page http://www.research.att.com/sw/tools/graphviz/license/.
 
 The package contains:
-    dotty - customizable X windows graph viewer written in the Lefty editor
+    dotty  - customizable X windows graph viewer written in the Lefty editor
     tcldot - customizable TCL/tk graph viewer written by John Ellson
-    dot - batch program for drawing directed graphs as hierarchies
-    neato - batch program for drawing undirected graphs using Kamada-Kawai
-        spring models
+    dot    - batch program for drawing directed graphs as hierarchies
+    neato  - batch program for drawing undirected graphs using Kamada-Kawai
+             spring models
 
 WWW: http://www.research.att.com/sw/tools/graphviz/
diff --git a/graphics/graphviz/pkg-plist b/graphics/graphviz/pkg-plist
index 5c56786ed90f..a408721172c2 100644
--- a/graphics/graphviz/pkg-plist
+++ b/graphics/graphviz/pkg-plist
@@ -1,39 +1,40 @@
-bin/acyclic
-bin/bcomps
-bin/ccomps
-bin/circo
-bin/dijkstra
 bin/dot
-bin/dot_static
 bin/dot2gxl
-bin/dotty
+bin/dot_static
+bin/circo
 bin/fdp
 bin/gc
 bin/gvcolor
-bin/gvpack
-bin/gvpr
 bin/gxl2dot
-bin/lefty
-bin/lneato
+bin/acyclic
 bin/neato
 bin/nop
-bin/prune
+bin/ccomps
 bin/sccmap
 bin/tred
 bin/twopi
 bin/unflatten
-include/graphviz/aghdr.h
-include/graphviz/agraph.h
-include/graphviz/agxbuf.h
-include/graphviz/arith.h
+bin/gvpack
+bin/dijkstra
+bin/bcomps
+bin/gvpr
+bin/lefty
+bin/lneato
+bin/dotty
+bin/prune
 include/graphviz/ast_common.h
 include/graphviz/cdt.h
-include/graphviz/color.h
 include/graphviz/dthdr.h
-include/graphviz/entities.h
-include/graphviz/exgram.h
-include/graphviz/exlib.h
-include/graphviz/expr.h
+include/graphviz/graph.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/vmstub.h
+include/graphviz/grammar.h
 include/graphviz/gd.h
 include/graphviz/gd_io.h
 include/graphviz/gdcache.h
@@ -42,296 +43,282 @@ include/graphviz/gdfontl.h
 include/graphviz/gdfontmb.h
 include/graphviz/gdfonts.h
 include/graphviz/gdfontt.h
-include/graphviz/gdfx.h
 include/graphviz/gdhelpers.h
+include/graphviz/jisx0208.h
+include/graphviz/wbmp.h
+include/graphviz/gdfx.h
+include/graphviz/tri.h
+include/graphviz/entities.h
+include/graphviz/pathgeom.h
+include/graphviz/pathplan.h
+include/graphviz/pathutil.h
+include/graphviz/solvers.h
+include/graphviz/vis.h
+include/graphviz/vispath.h
+include/graphviz/logic.h
+include/graphviz/arith.h
 include/graphviz/geom.h
+include/graphviz/color.h
+include/graphviz/types.h
 include/graphviz/globals.h
-include/graphviz/grammar.h
-include/graphviz/graph.h
-include/graphviz/gv.cpp
-include/graphviz/gv.i
 include/graphviz/gvc.h
 include/graphviz/gvcext.h
-include/graphviz/gvcint.h
-include/graphviz/gvcjob.h
 include/graphviz/gvplugin.h
-include/graphviz/gvplugin_device.h
-include/graphviz/gvplugin_layout.h
+include/graphviz/gvcjob.h
+include/graphviz/gvcint.h
 include/graphviz/gvplugin_render.h
+include/graphviz/gvplugin_layout.h
 include/graphviz/gvplugin_textlayout.h
+include/graphviz/gvplugin_device.h
 include/graphviz/gvplugin_usershape.h
-include/graphviz/jisx0208.h
-include/graphviz/libgraph.h
-include/graphviz/logic.h
-include/graphviz/malloc.h
 include/graphviz/pack.h
-include/graphviz/parser.h
-include/graphviz/pathgeom.h
-include/graphviz/pathplan.h
-include/graphviz/pathutil.h
-include/graphviz/solvers.h
-include/graphviz/tri.h
-include/graphviz/triefa.h
-include/graphviz/types.h
-include/graphviz/vis.h
-include/graphviz/vispath.h
-include/graphviz/vmstub.h
-include/graphviz/wbmp.h
-lib/graphviz/config
-lib/graphviz/libagraph.a
-lib/graphviz/libagraph.la
-lib/graphviz/libagraph.so
-lib/graphviz/libagraph.so.1
-lib/graphviz/libcdt.a
-lib/graphviz/libcdt.la
+include/graphviz/exlib.h
+include/graphviz/exgram.h
+include/graphviz/expr.h
+include/graphviz/gv.i
+include/graphviz/gv.cpp
 lib/graphviz/libcdt.so
-lib/graphviz/libcdt.so.1
-lib/graphviz/libexpr.a
-lib/graphviz/libexpr.la
-lib/graphviz/libexpr.so
-lib/graphviz/libexpr.so.1
-lib/graphviz/libgdtclft.a
-lib/graphviz/libgdtclft.la
-lib/graphviz/libgdtclft.so
-lib/graphviz/libgdtclft.so.0
-lib/graphviz/libgraph.a
-lib/graphviz/libgraph.la
+lib/graphviz/libcdt.so.2
+lib/graphviz/libcdt.la
+lib/graphviz/libcdt.a
 lib/graphviz/libgraph.so
-lib/graphviz/libgraph.so.1
-lib/graphviz/libgv_tcl.a
-lib/graphviz/libgv_tcl.la
-lib/graphviz/libgv_tcl.so
-lib/graphviz/libgv_tcl.so.0
-lib/graphviz/libgvc.a
-lib/graphviz/libgvc.la
-lib/graphviz/libgvc.so
-lib/graphviz/libgvc.so.1
-lib/graphviz/libgvc_builtins.a
-lib/graphviz/libgvc_builtins.la
-lib/graphviz/libgvc_builtins.so
-lib/graphviz/libgvc_builtins.so.1
-lib/graphviz/libgvgd.a
-lib/graphviz/libgvgd.la
+lib/graphviz/libgraph.so.2
+lib/graphviz/libgraph.la
+lib/graphviz/libgraph.a
+lib/graphviz/libagraph.so
+lib/graphviz/libagraph.so.2
+lib/graphviz/libagraph.la
+lib/graphviz/libagraph.a
 lib/graphviz/libgvgd.so
 lib/graphviz/libgvgd.so.2
-lib/graphviz/libgvplugin_dot_layout.a
-lib/graphviz/libgvplugin_dot_layout.la
-lib/graphviz/libgvplugin_dot_layout.so
-lib/graphviz/libgvplugin_dot_layout.so.1
-lib/graphviz/libgvplugin_neato_layout.a
-lib/graphviz/libgvplugin_neato_layout.la
+lib/graphviz/libgvgd.la
+lib/graphviz/libgvgd.a
+lib/graphviz/libpathplan.so
+lib/graphviz/libpathplan.so.2
+lib/graphviz/libpathplan.la
+lib/graphviz/libpathplan.a
+lib/graphviz/libgvc.so
+lib/graphviz/libgvc.so.2
+lib/graphviz/libgvc.la
+lib/graphviz/libgvc.a
+lib/graphviz/libgvc_builtins.so
+lib/graphviz/libgvc_builtins.so.2
+lib/graphviz/libgvc_builtins.la
+lib/graphviz/libgvc_builtins.a
+lib/graphviz/libpack.so
+lib/graphviz/libpack.so.2
+lib/graphviz/libpack.la
+lib/graphviz/libpack.a
+lib/graphviz/libexpr.so
+lib/graphviz/libexpr.so.2
+lib/graphviz/libexpr.la
+lib/graphviz/libexpr.a
 lib/graphviz/libgvplugin_neato_layout.so
-lib/graphviz/libgvplugin_neato_layout.so.1
-lib/graphviz/libgvplugin_usershape_gd.a
-lib/graphviz/libgvplugin_usershape_gd.la
+lib/graphviz/libgvplugin_neato_layout.so.2
+lib/graphviz/libgvplugin_neato_layout.la
+lib/graphviz/libgvplugin_neato_layout.a
+lib/graphviz/libgvplugin_dot_layout.so
+lib/graphviz/libgvplugin_dot_layout.so.2
+lib/graphviz/libgvplugin_dot_layout.la
+lib/graphviz/libgvplugin_dot_layout.a
 lib/graphviz/libgvplugin_usershape_gd.so
-lib/graphviz/libgvplugin_usershape_gd.so.1
-lib/graphviz/libpack.a
-lib/graphviz/libpack.la
-lib/graphviz/libpack.so
-lib/graphviz/libpack.so.1
-lib/graphviz/libpathplan.a
-lib/graphviz/libpathplan.la
-lib/graphviz/libpathplan.so
-lib/graphviz/libpathplan.so.1
-lib/graphviz/libtcldot.a
-lib/graphviz/libtcldot.la
-lib/graphviz/libtcldot.so
-lib/graphviz/libtcldot.so.0
-lib/graphviz/libtclplan.a
-lib/graphviz/libtclplan.la
-lib/graphviz/libtclplan.so
-lib/graphviz/libtclplan.so.0
-lib/graphviz/libtkspline.a
-lib/graphviz/libtkspline.la
-lib/graphviz/libtkspline.so
-lib/graphviz/libtkspline.so.0
+lib/graphviz/libgvplugin_usershape_gd.so.2
+lib/graphviz/libgvplugin_usershape_gd.la
+lib/graphviz/libgvplugin_usershape_gd.a
+lib/graphviz/tcl/gv.so
+lib/graphviz/lua/gv.so
+lib/graphviz/perl/gv.so
+lib/graphviz/python/_gv.so
+lib/graphviz/ruby/gv.so
+lib/graphviz/config
 lib/graphviz/pkgIndex.tcl
-%%PORTDOCS%%%%DOCSDIR%%/Dot.ref
-%%PORTDOCS%%%%DOCSDIR%%/FAQ.html
-%%PORTDOCS%%%%DOCSDIR%%/dotguide.pdf
-%%PORTDOCS%%%%DOCSDIR%%/dottyguide.pdf
-%%PORTDOCS%%%%DOCSDIR%%/leftyguide.pdf
-%%PORTDOCS%%%%DOCSDIR%%/neatoguide.pdf
-libdata/pkgconfig/libagraph.pc
 libdata/pkgconfig/libcdt.pc
 libdata/pkgconfig/libgraph.pc
-libdata/pkgconfig/libgvc.pc
+libdata/pkgconfig/libagraph.pc
 libdata/pkgconfig/libpathplan.pc
-%%DATADIR%%/demo/doted
-%%DATADIR%%/demo/doted.README
-%%DATADIR%%/demo/entities
-%%DATADIR%%/demo/entities.README
-%%DATADIR%%/demo/entities.html
-%%DATADIR%%/demo/gcat
-%%DATADIR%%/demo/gcat.README
-%%DATADIR%%/demo/pathplan
-%%DATADIR%%/demo/pathplan.README
-%%DATADIR%%/demo/pathplan_data/boxes.dat
-%%DATADIR%%/demo/pathplan_data/dpd.dat
-%%DATADIR%%/demo/pathplan_data/funny.dat
-%%DATADIR%%/demo/pathplan_data/maze.dat
-%%DATADIR%%/demo/pathplan_data/nested.dat
-%%DATADIR%%/demo/pathplan_data/northo.dat
-%%DATADIR%%/demo/pathplan_data/obs.dat
-%%DATADIR%%/demo/pathplan_data/other.dat
-%%DATADIR%%/demo/pathplan_data/paths.dat
-%%DATADIR%%/demo/pathplan_data/rotor.dat
-%%DATADIR%%/demo/pathplan_data/u.dat
-%%DATADIR%%/demo/pathplan_data/unknown.dat
-%%DATADIR%%/demo/spline.README
-%%DATADIR%%/demo/spline
-%%DATADIR%%/doc/AUTHORS
-%%DATADIR%%/doc/COPYING
-%%DATADIR%%/doc/ChangeLog
-%%DATADIR%%/doc/Dot.ref
-%%DATADIR%%/doc/NEWS
-%%DATADIR%%/doc/cpl1.0.txt
-%%DATADIR%%/doc/html/FAQ.html
-%%DATADIR%%/doc/html/build.html
-%%DATADIR%%/doc/html/gd.html
-%%DATADIR%%/doc/html/index.html
-%%DATADIR%%/doc/html/info/Mcircle.gif
-%%DATADIR%%/doc/html/info/Mdiamond.gif
-%%DATADIR%%/doc/html/info/Msquare.gif
-%%DATADIR%%/doc/html/info/a_box.gif
-%%DATADIR%%/doc/html/info/a_crow.gif
-%%DATADIR%%/doc/html/info/a_diamond.gif
-%%DATADIR%%/doc/html/info/a_dot.gif
-%%DATADIR%%/doc/html/info/a_ediamond.gif
-%%DATADIR%%/doc/html/info/a_empty.gif
-%%DATADIR%%/doc/html/info/a_forward.gif
-%%DATADIR%%/doc/html/info/a_halfopen.gif
-%%DATADIR%%/doc/html/info/a_inv.gif
-%%DATADIR%%/doc/html/info/a_invdot.gif
-%%DATADIR%%/doc/html/info/a_invempty.gif
-%%DATADIR%%/doc/html/info/a_invodot.gif
-%%DATADIR%%/doc/html/info/a_lteeoldiamond.gif
-%%DATADIR%%/doc/html/info/a_nohead.gif
-%%DATADIR%%/doc/html/info/a_none.gif
-%%DATADIR%%/doc/html/info/a_normal.gif
-%%DATADIR%%/doc/html/info/a_obox.gif
-%%DATADIR%%/doc/html/info/a_odiamond.gif
-%%DATADIR%%/doc/html/info/a_odot.gif
-%%DATADIR%%/doc/html/info/a_open.gif
-%%DATADIR%%/doc/html/info/a_tee.gif
-%%DATADIR%%/doc/html/info/aa_box.gif
-%%DATADIR%%/doc/html/info/aa_crow.gif
-%%DATADIR%%/doc/html/info/aa_diamond.gif
-%%DATADIR%%/doc/html/info/aa_dot.gif
-%%DATADIR%%/doc/html/info/aa_inv.gif
-%%DATADIR%%/doc/html/info/aa_lbox.gif
-%%DATADIR%%/doc/html/info/aa_lcrow.gif
-%%DATADIR%%/doc/html/info/aa_ldiamond.gif
-%%DATADIR%%/doc/html/info/aa_linv.gif
-%%DATADIR%%/doc/html/info/aa_lnormal.gif
-%%DATADIR%%/doc/html/info/aa_ltee.gif
-%%DATADIR%%/doc/html/info/aa_lvee.gif
-%%DATADIR%%/doc/html/info/aa_none.gif
-%%DATADIR%%/doc/html/info/aa_normal.gif
-%%DATADIR%%/doc/html/info/aa_obox.gif
-%%DATADIR%%/doc/html/info/aa_odiamond.gif
-%%DATADIR%%/doc/html/info/aa_odot.gif
-%%DATADIR%%/doc/html/info/aa_oinv.gif
-%%DATADIR%%/doc/html/info/aa_olbox.gif
-%%DATADIR%%/doc/html/info/aa_oldiamond.gif
-%%DATADIR%%/doc/html/info/aa_olinv.gif
-%%DATADIR%%/doc/html/info/aa_olnormal.gif
-%%DATADIR%%/doc/html/info/aa_onormal.gif
-%%DATADIR%%/doc/html/info/aa_orbox.gif
-%%DATADIR%%/doc/html/info/aa_ordiamond.gif
-%%DATADIR%%/doc/html/info/aa_orinv.gif
-%%DATADIR%%/doc/html/info/aa_ornormal.gif
-%%DATADIR%%/doc/html/info/aa_rbox.gif
-%%DATADIR%%/doc/html/info/aa_rcrow.gif
-%%DATADIR%%/doc/html/info/aa_rdiamond.gif
-%%DATADIR%%/doc/html/info/aa_rinv.gif
-%%DATADIR%%/doc/html/info/aa_rnormal.gif
-%%DATADIR%%/doc/html/info/aa_rtee.gif
-%%DATADIR%%/doc/html/info/aa_rvee.gif
-%%DATADIR%%/doc/html/info/aa_tee.gif
-%%DATADIR%%/doc/html/info/aa_vee.gif
-%%DATADIR%%/doc/html/info/attrs.html
-%%DATADIR%%/doc/html/info/back.gif
-%%DATADIR%%/doc/html/info/both.gif
-%%DATADIR%%/doc/html/info/box.gif
-%%DATADIR%%/doc/html/info/circle.gif
-%%DATADIR%%/doc/html/info/colors.html
-%%DATADIR%%/doc/html/info/command.html
-%%DATADIR%%/doc/html/info/constraint.gif
-%%DATADIR%%/doc/html/info/diamond.gif
-%%DATADIR%%/doc/html/info/doublecircle.gif
-%%DATADIR%%/doc/html/info/doubleoctagon.gif
-%%DATADIR%%/doc/html/info/egg.gif
-%%DATADIR%%/doc/html/info/ellipse.gif
-%%DATADIR%%/doc/html/info/fill.gif
-%%DATADIR%%/doc/html/info/forward.gif
-%%DATADIR%%/doc/html/info/grammar.html
-%%DATADIR%%/doc/html/info/hexagon.gif
-%%DATADIR%%/doc/html/info/house.gif
-%%DATADIR%%/doc/html/info/html1.gif
-%%DATADIR%%/doc/html/info/html2.gif
-%%DATADIR%%/doc/html/info/index.html
-%%DATADIR%%/doc/html/info/invhouse.gif
-%%DATADIR%%/doc/html/info/invtrapezium.gif
-%%DATADIR%%/doc/html/info/invtriangle.gif
-%%DATADIR%%/doc/html/info/lang.html
-%%DATADIR%%/doc/html/info/mrecord.gif
-%%DATADIR%%/doc/html/info/nohead.gif
-%%DATADIR%%/doc/html/info/octagon.gif
-%%DATADIR%%/doc/html/info/output.html
-%%DATADIR%%/doc/html/info/parallelogram.gif
-%%DATADIR%%/doc/html/info/pentagon.gif
-%%DATADIR%%/doc/html/info/plaintext.gif
-%%DATADIR%%/doc/html/info/point.gif
-%%DATADIR%%/doc/html/info/polygon.gif
-%%DATADIR%%/doc/html/info/record.gif
-%%DATADIR%%/doc/html/info/rect.gif
-%%DATADIR%%/doc/html/info/rectangle.gif
-%%DATADIR%%/doc/html/info/round.gif
-%%DATADIR%%/doc/html/info/septagon.gif
-%%DATADIR%%/doc/html/info/shapes.html
-%%DATADIR%%/doc/html/info/trapezium.gif
-%%DATADIR%%/doc/html/info/triangle.gif
-%%DATADIR%%/doc/html/info/tripleoctagon.gif
-%%DATADIR%%/doc/html/tcldot.html
-%%DATADIR%%/doc/latex_suggestions.txt
-%%DATADIR%%/doc/pdf/acyclic.pdf
-%%DATADIR%%/doc/pdf/agraph.pdf
-%%DATADIR%%/doc/pdf/bcomps.pdf
-%%DATADIR%%/doc/pdf/ccomps.pdf
-%%DATADIR%%/doc/pdf/cdt.pdf
-%%DATADIR%%/doc/pdf/circo.pdf
-%%DATADIR%%/doc/pdf/dijkstra.pdf
-%%DATADIR%%/doc/pdf/dot.pdf
-%%DATADIR%%/doc/pdf/dot2gxl.pdf
-%%DATADIR%%/doc/pdf/dotguide.pdf
-%%DATADIR%%/doc/pdf/dotty.pdf
-%%DATADIR%%/doc/pdf/dottyguide.pdf
-%%DATADIR%%/doc/pdf/expr.pdf
-%%DATADIR%%/doc/pdf/fdp.pdf
-%%DATADIR%%/doc/pdf/gc.pdf
-%%DATADIR%%/doc/pdf/gdtclft.pdf
-%%DATADIR%%/doc/pdf/graph.pdf
-%%DATADIR%%/doc/pdf/gvcolor.pdf
-%%DATADIR%%/doc/pdf/gvpack.pdf
-%%DATADIR%%/doc/pdf/gvpr.pdf
-%%DATADIR%%/doc/pdf/gxl2dot.pdf
-%%DATADIR%%/doc/pdf/lefty.pdf
-%%DATADIR%%/doc/pdf/leftyguide.pdf
-%%DATADIR%%/doc/pdf/lneato.pdf
-%%DATADIR%%/doc/pdf/neato.pdf
-%%DATADIR%%/doc/pdf/neatoguide.pdf
-%%DATADIR%%/doc/pdf/nop.pdf
-%%DATADIR%%/doc/pdf/pack.pdf
-%%DATADIR%%/doc/pdf/pathplan.pdf
-%%DATADIR%%/doc/pdf/prune.pdf
-%%DATADIR%%/doc/pdf/sccmap.pdf
-%%DATADIR%%/doc/pdf/tcldot.pdf
-%%DATADIR%%/doc/pdf/tkspline.pdf
-%%DATADIR%%/doc/pdf/tred.pdf
-%%DATADIR%%/doc/pdf/twopi.pdf
-%%DATADIR%%/doc/pdf/unflatten.pdf
+libdata/pkgconfig/libgvc.pc
+%%PORTDOCS%%%%DOCSDIR%%/html/FAQ.html
+%%PORTDOCS%%%%DOCSDIR%%/html/build.html
+%%PORTDOCS%%%%DOCSDIR%%/html/index.html
+%%PORTDOCS%%%%DOCSDIR%%/html/winbuild.html
+%%PORTDOCS%%%%DOCSDIR%%/html/attrs.html
+%%PORTDOCS%%%%DOCSDIR%%/html/colors.html
+%%PORTDOCS%%%%DOCSDIR%%/html/command.html
+%%PORTDOCS%%%%DOCSDIR%%/html/grammar.html
+%%PORTDOCS%%%%DOCSDIR%%/html/lang.html
+%%PORTDOCS%%%%DOCSDIR%%/html/output.html
+%%PORTDOCS%%%%DOCSDIR%%/html/shapes.html
+%%PORTDOCS%%%%DOCSDIR%%/html/Mcircle.gif
+%%PORTDOCS%%%%DOCSDIR%%/html/Mdiamond.gif
+%%PORTDOCS%%%%DOCSDIR%%/html/Msquare.gif
+%%PORTDOCS%%%%DOCSDIR%%/html/a_box.gif
+%%PORTDOCS%%%%DOCSDIR%%/html/a_crow.gif
+%%PORTDOCS%%%%DOCSDIR%%/html/a_diamond.gif
+%%PORTDOCS%%%%DOCSDIR%%/html/a_dot.gif
+%%PORTDOCS%%%%DOCSDIR%%/html/a_ediamond.gif
+%%PORTDOCS%%%%DOCSDIR%%/html/a_empty.gif
+%%PORTDOCS%%%%DOCSDIR%%/html/a_forward.gif
+%%PORTDOCS%%%%DOCSDIR%%/html/a_halfopen.gif
+%%PORTDOCS%%%%DOCSDIR%%/html/box.gif
+%%PORTDOCS%%%%DOCSDIR%%/html/a_inv.gif
+%%PORTDOCS%%%%DOCSDIR%%/html/a_invdot.gif
+%%PORTDOCS%%%%DOCSDIR%%/html/a_invempty.gif
+%%PORTDOCS%%%%DOCSDIR%%/html/a_invodot.gif
+%%PORTDOCS%%%%DOCSDIR%%/html/a_lteeoldiamond.gif
+%%PORTDOCS%%%%DOCSDIR%%/html/a_nohead.gif
+%%PORTDOCS%%%%DOCSDIR%%/html/a_none.gif
+%%PORTDOCS%%%%DOCSDIR%%/html/a_normal.gif
+%%PORTDOCS%%%%DOCSDIR%%/html/a_obox.gif
+%%PORTDOCS%%%%DOCSDIR%%/html/a_odiamond.gif
+%%PORTDOCS%%%%DOCSDIR%%/html/a_odot.gif
+%%PORTDOCS%%%%DOCSDIR%%/html/a_open.gif
+%%PORTDOCS%%%%DOCSDIR%%/html/a_tee.gif
+%%PORTDOCS%%%%DOCSDIR%%/html/aa_box.gif
+%%PORTDOCS%%%%DOCSDIR%%/html/aa_crow.gif
+%%PORTDOCS%%%%DOCSDIR%%/html/aa_diamond.gif
+%%PORTDOCS%%%%DOCSDIR%%/html/aa_dot.gif
+%%PORTDOCS%%%%DOCSDIR%%/html/aa_inv.gif
+%%PORTDOCS%%%%DOCSDIR%%/html/aa_lbox.gif
+%%PORTDOCS%%%%DOCSDIR%%/html/aa_lcrow.gif
+%%PORTDOCS%%%%DOCSDIR%%/html/aa_ldiamond.gif
+%%PORTDOCS%%%%DOCSDIR%%/html/aa_linv.gif
+%%PORTDOCS%%%%DOCSDIR%%/html/aa_lnormal.gif
+%%PORTDOCS%%%%DOCSDIR%%/html/aa_ltee.gif
+%%PORTDOCS%%%%DOCSDIR%%/html/aa_lvee.gif
+%%PORTDOCS%%%%DOCSDIR%%/html/aa_none.gif
+%%PORTDOCS%%%%DOCSDIR%%/html/aa_normal.gif
+%%PORTDOCS%%%%DOCSDIR%%/html/aa_obox.gif
+%%PORTDOCS%%%%DOCSDIR%%/html/aa_odiamond.gif
+%%PORTDOCS%%%%DOCSDIR%%/html/aa_odot.gif
+%%PORTDOCS%%%%DOCSDIR%%/html/aa_oinv.gif
+%%PORTDOCS%%%%DOCSDIR%%/html/aa_olbox.gif
+%%PORTDOCS%%%%DOCSDIR%%/html/aa_oldiamond.gif
+%%PORTDOCS%%%%DOCSDIR%%/html/aa_olinv.gif
+%%PORTDOCS%%%%DOCSDIR%%/html/aa_olnormal.gif
+%%PORTDOCS%%%%DOCSDIR%%/html/aa_onormal.gif
+%%PORTDOCS%%%%DOCSDIR%%/html/aa_orbox.gif
+%%PORTDOCS%%%%DOCSDIR%%/html/aa_ordiamond.gif
+%%PORTDOCS%%%%DOCSDIR%%/html/aa_orinv.gif
+%%PORTDOCS%%%%DOCSDIR%%/html/aa_ornormal.gif
+%%PORTDOCS%%%%DOCSDIR%%/html/aa_rbox.gif
+%%PORTDOCS%%%%DOCSDIR%%/html/aa_rcrow.gif
+%%PORTDOCS%%%%DOCSDIR%%/html/aa_rdiamond.gif
+%%PORTDOCS%%%%DOCSDIR%%/html/aa_rinv.gif
+%%PORTDOCS%%%%DOCSDIR%%/html/aa_rnormal.gif
+%%PORTDOCS%%%%DOCSDIR%%/html/aa_rtee.gif
+%%PORTDOCS%%%%DOCSDIR%%/html/aa_rvee.gif
+%%PORTDOCS%%%%DOCSDIR%%/html/aa_tee.gif
+%%PORTDOCS%%%%DOCSDIR%%/html/aa_vee.gif
+%%PORTDOCS%%%%DOCSDIR%%/html/back.gif
+%%PORTDOCS%%%%DOCSDIR%%/html/both.gif
+%%PORTDOCS%%%%DOCSDIR%%/html/circle.gif
+%%PORTDOCS%%%%DOCSDIR%%/html/constraint.gif
+%%PORTDOCS%%%%DOCSDIR%%/html/diamond.gif
+%%PORTDOCS%%%%DOCSDIR%%/html/doublecircle.gif
+%%PORTDOCS%%%%DOCSDIR%%/html/doubleoctagon.gif
+%%PORTDOCS%%%%DOCSDIR%%/html/egg.gif
+%%PORTDOCS%%%%DOCSDIR%%/html/ellipse.gif
+%%PORTDOCS%%%%DOCSDIR%%/html/fill.gif
+%%PORTDOCS%%%%DOCSDIR%%/html/forward.gif
+%%PORTDOCS%%%%DOCSDIR%%/html/hexagon.gif
+%%PORTDOCS%%%%DOCSDIR%%/html/house.gif
+%%PORTDOCS%%%%DOCSDIR%%/html/html1.gif
+%%PORTDOCS%%%%DOCSDIR%%/html/html2.gif
+%%PORTDOCS%%%%DOCSDIR%%/html/invhouse.gif
+%%PORTDOCS%%%%DOCSDIR%%/html/invtrapezium.gif
+%%PORTDOCS%%%%DOCSDIR%%/html/invtriangle.gif
+%%PORTDOCS%%%%DOCSDIR%%/html/mrecord.gif
+%%PORTDOCS%%%%DOCSDIR%%/html/nohead.gif
+%%PORTDOCS%%%%DOCSDIR%%/html/octagon.gif
+%%PORTDOCS%%%%DOCSDIR%%/html/parallelogram.gif
+%%PORTDOCS%%%%DOCSDIR%%/html/pentagon.gif
+%%PORTDOCS%%%%DOCSDIR%%/html/plaintext.gif
+%%PORTDOCS%%%%DOCSDIR%%/html/point.gif
+%%PORTDOCS%%%%DOCSDIR%%/html/polygon.gif
+%%PORTDOCS%%%%DOCSDIR%%/html/record.gif
+%%PORTDOCS%%%%DOCSDIR%%/html/rect.gif
+%%PORTDOCS%%%%DOCSDIR%%/html/rectangle.gif
+%%PORTDOCS%%%%DOCSDIR%%/html/round.gif
+%%PORTDOCS%%%%DOCSDIR%%/html/septagon.gif
+%%PORTDOCS%%%%DOCSDIR%%/html/trapezium.gif
+%%PORTDOCS%%%%DOCSDIR%%/html/triangle.gif
+%%PORTDOCS%%%%DOCSDIR%%/html/tripleoctagon.gif
+%%PORTDOCS%%%%DOCSDIR%%/pdf/dotguide.pdf
+%%PORTDOCS%%%%DOCSDIR%%/pdf/dottyguide.pdf
+%%PORTDOCS%%%%DOCSDIR%%/pdf/leftyguide.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/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/prune.pdf
+%%PORTDOCS%%%%DOCSDIR%%/pdf/agraph.pdf
+%%PORTDOCS%%%%DOCSDIR%%/pdf/cdt.pdf
+%%PORTDOCS%%%%DOCSDIR%%/pdf/expr.pdf
+%%PORTDOCS%%%%DOCSDIR%%/pdf/graph.pdf
+%%PORTDOCS%%%%DOCSDIR%%/pdf/pack.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/twopi.pdf
+%%PORTDOCS%%%%DOCSDIR%%/pdf/fdp.pdf
+%%PORTDOCS%%%%DOCSDIR%%/pdf/circo.pdf
+%%PORTDOCS%%%%DOCSDIR%%/AUTHORS
+%%PORTDOCS%%%%DOCSDIR%%/NEWS
+%%PORTDOCS%%%%DOCSDIR%%/ChangeLog
+%%PORTDOCS%%%%DOCSDIR%%/cpl1.0.txt
+%%PORTDOCS%%%%DOCSDIR%%/Dot.ref
+%%PORTDOCS%%%%DOCSDIR%%/latex_suggestions.txt
+%%EXAMPLESDIR%%/entities
+%%EXAMPLESDIR%%/entities.README
+%%EXAMPLESDIR%%/doted
+%%EXAMPLESDIR%%/doted.README
+%%EXAMPLESDIR%%/gcat
+%%EXAMPLESDIR%%/gcat.README
+%%EXAMPLESDIR%%/pathplan_data/boxes.dat
+%%EXAMPLESDIR%%/pathplan_data/dpd.dat
+%%EXAMPLESDIR%%/pathplan_data/funny.dat
+%%EXAMPLESDIR%%/pathplan_data/maze.dat
+%%EXAMPLESDIR%%/pathplan_data/nested.dat
+%%EXAMPLESDIR%%/pathplan_data/northo.dat
+%%EXAMPLESDIR%%/pathplan_data/obs.dat
+%%EXAMPLESDIR%%/pathplan_data/other.dat
+%%EXAMPLESDIR%%/pathplan_data/paths.dat
+%%EXAMPLESDIR%%/pathplan_data/rotor.dat
+%%EXAMPLESDIR%%/pathplan_data/u.dat
+%%EXAMPLESDIR%%/pathplan_data/unknown.dat
+%%EXAMPLESDIR%%/pathplan
+%%EXAMPLESDIR%%/pathplan.README
+%%EXAMPLESDIR%%/spline
+%%EXAMPLESDIR%%/spline.README
+%%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
+%%DATADIR%%/lefty/dotty.lefty
+%%DATADIR%%/lefty/dotty_draw.lefty
+%%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
@@ -372,7 +359,6 @@ libdata/pkgconfig/libpathplan.pc
 %%DATADIR%%/graphs/directed/shells.dot
 %%DATADIR%%/graphs/directed/states.dot
 %%DATADIR%%/graphs/directed/structs.dot
-%%DATADIR%%/graphs/directed/switch.dot
 %%DATADIR%%/graphs/directed/table.dot
 %%DATADIR%%/graphs/directed/train11.dot
 %%DATADIR%%/graphs/directed/trapeziumlr.dot
@@ -383,34 +369,31 @@ libdata/pkgconfig/libpathplan.pc
 %%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/Heawood.dot
-%%DATADIR%%/graphs/undirected/Petersen.dot
 %%DATADIR%%/graphs/undirected/ngk10_4.dot
 %%DATADIR%%/graphs/undirected/process.dot
-%%DATADIR%%/lefty/box.lefty
-%%DATADIR%%/lefty/def.lefty
-%%DATADIR%%/lefty/dotty.lefty
-%%DATADIR%%/lefty/dotty_draw.lefty
-%%DATADIR%%/lefty/dotty_edit.lefty
-%%DATADIR%%/lefty/dotty_layout.lefty
-%%DATADIR%%/lefty/dotty_ui.lefty
-%%DATADIR%%/lefty/fractal.lefty
-%%DATADIR%%/lefty/fractal2.lefty
-%%DATADIR%%/lefty/lefty.psp
-%%DATADIR%%/lefty/slides.lefty
-%%DATADIR%%/lefty/tree.lefty
-@dirrm %%DATADIR%%/lefty
-@dirrm %%DATADIR%%/graphs/undirected
+%%DATADIR%%/graphs/undirected/Heawood.dot
+%%DATADIR%%/graphs/undirected/Petersen.dot
+%%PORTDOCS%%@dirrm %%DOCSDIR%%/html
+%%PORTDOCS%%@dirrm %%DOCSDIR%%/pdf
+%%PORTDOCS%%@dirrm %%DOCSDIR%%
+%%PORTDOCS%%@dirrm %%EXAMPLESDIR%%/pathplan_data
+%%PORTDOCS%%@dirrm %%EXAMPLESDIR%%
 @dirrm %%DATADIR%%/graphs/directed
+@dirrm %%DATADIR%%/graphs/undirected
 @dirrm %%DATADIR%%/graphs
-@dirrm %%DATADIR%%/doc/pdf
-@dirrm %%DATADIR%%/doc/html/info
-@dirrm %%DATADIR%%/doc/html
-@dirrm %%DATADIR%%/doc
-@dirrm %%DATADIR%%/demo/pathplan_data
-@dirrm %%DATADIR%%/demo
+@dirrm %%DATADIR%%/lefty
 @dirrm %%DATADIR%%
-%%PORTDOCS%%@dirrm %%DOCSDIR%%
+@dirrm lib/graphviz/guile
+@dirrm lib/graphviz/java
+@dirrm lib/graphviz/lua
+@dirrm lib/graphviz/ocaml
+@dirrm lib/graphviz/perl
+@dirrm lib/graphviz/php
+@dirrm lib/graphviz/python
+@dirrm lib/graphviz/ruby
+@dirrm lib/graphviz/sharp
+@dirrm lib/graphviz/tcl
 @dirrm lib/graphviz
 @dirrm include/graphviz