7 files changed, 397 insertions, 164 deletions

diff --git a/graphics/graphviz/Makefile b/graphics/graphviz/Makefile
index b355a1c9ea95..d683bced86e5 100644
--- a/graphics/graphviz/Makefile
+++ b/graphics/graphviz/Makefile
@@ -6,8 +6,7 @@
 #
 
 PORTNAME=	graphviz
-PORTVERSION=	2.2
-PORTREVISION=	2
+PORTVERSION=	2.6
 CATEGORIES=	graphics tk84
 MASTER_SITES=	http://www.graphviz.org/pub/graphviz/ARCHIVE/
 
@@ -17,6 +16,7 @@ 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.5:${PORTSDIR}/textproc/expat2 \
 		gd.4:${PORTSDIR}/graphics/gd
@@ -26,18 +26,26 @@ USE_GMAKE=	yes
 USE_ICONV=	yes
 USE_XPM=	yes
 GNU_CONFIGURE=	yes
-CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include -I${LOCALBASE}/include/tcl8.4 -I${LOCALBASE}/include/tk8.4" \
-		LDFLAGS="-L${LOCALBASE}/lib" \
+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 \
-		MISSING=${TRUE}
+		MISSING=${TRUE} \
+		OCAML=/nonexistent \
+		PERL=/nonexistent \
+		PHP=/nonexistent \
+		PYTHON=/nonexistent \
+		RUBY=/nonexistent
 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-wish=${LOCALBASE}/wish8.4 \
+		--with-fontconfigincludedir=${X11BASE}/include \
+		--with-fontconfiglibdir=${X11BASE}/lib
 MAKE_ENV=	EXPR_COMPAT=yes MISSING=${TRUE}
 
-MAN1=		acyclic.1 bcomps.1 ccomps.1 dijkstra.1 dot.1 dotneato-config.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
diff --git a/graphics/graphviz/distinfo b/graphics/graphviz/distinfo
index 2e2246565efb..1ed505eca579 100644
--- a/graphics/graphviz/distinfo
+++ b/graphics/graphviz/distinfo
@@ -1,3 +1,3 @@
-MD5 (graphviz-2.2.tar.gz) = 9275d30695a5c22f360acbef7b85acd3
-SHA256 (graphviz-2.2.tar.gz) = ede074976937086b490882c203da986213e80e2a02b20b8b1349f0b9a9f6ca7b
-SIZE (graphviz-2.2.tar.gz) = 4379295
+MD5 (graphviz-2.6.tar.gz) = 0d61fc4f8660be31503d4f9ab6f26bf0
+SHA256 (graphviz-2.6.tar.gz) = 5208949dd8702205a5d65dfee4439870e36681aa076220cb159d28536fa2cca9
+SIZE (graphviz-2.6.tar.gz) = 4109848
diff --git a/graphics/graphviz/files/patch-configure b/graphics/graphviz/files/patch-configure
new file mode 100644
index 000000000000..b1dca02f7106
--- /dev/null
+++ b/graphics/graphviz/files/patch-configure
@@ -0,0 +1,294 @@
+--- configure.orig	Sun Aug 28 15:09:28 2005
++++ configure	Wed Dec 28 16:15:47 2005
+@@ -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-dotty::dotty.lefty b/graphics/graphviz/files/patch-dotty::dotty.lefty
deleted file mode 100644
index 7223873e7f2a..000000000000
--- a/graphics/graphviz/files/patch-dotty::dotty.lefty
+++ /dev/null
@@ -1,21 +0,0 @@
---- dotty/dotty.lefty.orig
-+++ dotty/dotty.lefty
-@@ -668,7 +668,10 @@
-         if (~(otype = ask ('print to', 'choice', 'file|printer')))
-             return;
-     if (otype == 'printer') {
--        name = '/tmp/dottyout.ps';
-+        if (~getenv ('TMPDIR'))
-+            name = concat (getenv ('HOME'), '/.dottyout.ps');
-+        else
-+            name = concat (getenv ('TMPDIR'), '/.dottyout.ps', random (10000));
-         if (getenv ('LEFTYWINSYS') ~= 'mswin' & ~pr)
-             if (~(pr = ask ('printer command', 'string', 'lpr')))
-                 return;
-@@ -768,5 +771,5 @@
-     vt.canvas = canvas;
-     destroywidget (pscanvas);
-     if (otype == 'printer' & getenv ('LEFTYWINSYS') ~= 'mswin')
--        system (concat (pr, ' /tmp/dottyout.ps; rm /tmp/dottyout.ps'));
-+        system (concat (pr, ' ', name, '; rm ',name));
- };
diff --git a/graphics/graphviz/files/patch-lefty::common.h b/graphics/graphviz/files/patch-lefty::common.h
deleted file mode 100644
index 997b1fb5e67c..000000000000
--- a/graphics/graphviz/files/patch-lefty::common.h
+++ /dev/null
@@ -1,22 +0,0 @@
---- lefty/common.h.orig	Fri Nov  5 19:56:20 2004
-+++ lefty/common.h	Fri Nov  5 20:00:50 2004
-@@ -53,6 +53,9 @@
- #ifdef FEATURE_CS
- #include <ast.h>
- #else
-+#ifdef HAVE_SYS_TYPES_H
-+#include <sys/types.h>
-+#endif
- #ifdef HAVE_STDLIB_H
- #include <stdlib.h>
- #endif
-@@ -67,9 +70,6 @@
- #endif
- #ifdef HAVE_LIMITS_H
- #include <limits.h>
--#endif
--#ifdef HAVE_SYS_TYPES_H
--#include <sys/types.h>
- #endif
- #ifdef HAVE_SYS_STAT_H
- #include <sys/stat.h>
diff --git a/graphics/graphviz/files/patch-tools::sfio::sfhdr.h b/graphics/graphviz/files/patch-tools::sfio::sfhdr.h
index efdc60a1cad5..d03db3e894bb 100644
--- a/graphics/graphviz/files/patch-tools::sfio::sfhdr.h
+++ b/graphics/graphviz/files/patch-tools::sfio::sfhdr.h
@@ -1,5 +1,5 @@
---- tools/sfio/sfhdr.h.orig	Fri Apr 27 04:17:42 2001
-+++ tools/sfio/sfhdr.h	Tue Feb 18 19:26:37 2003
+--- lib/sfio/sfhdr.h.orig	Fri Apr 27 04:17:42 2001
++++ lib/sfio/sfhdr.h	Tue Feb 18 19:26:37 2003
 @@ -122,6 +122,10 @@
  #include	<errno.h>
  #include	<ctype.h>
diff --git a/graphics/graphviz/pkg-plist b/graphics/graphviz/pkg-plist
index 30e4a2f51509..0901c533eb10 100644
--- a/graphics/graphviz/pkg-plist
+++ b/graphics/graphviz/pkg-plist
@@ -4,8 +4,8 @@ bin/ccomps
 bin/circo
 bin/dijkstra
 bin/dot
+bin/dot_static
 bin/dot2gxl
-bin/dotneato-config
 bin/dotty
 bin/fdp
 bin/gc
@@ -22,147 +22,130 @@ bin/sccmap
 bin/tred
 bin/twopi
 bin/unflatten
-include/graphviz/adjust.h
 include/graphviz/aghdr.h
 include/graphviz/agraph.h
 include/graphviz/agxbuf.h
+include/graphviz/arith.h
 include/graphviz/ast_common.h
-include/graphviz/bfs.h
-include/graphviz/block.h
-include/graphviz/blockpath.h
-include/graphviz/blocktree.h
-include/graphviz/cairogen-png.h
-include/graphviz/cairogen-ps.h
-include/graphviz/cairogen-win.h
 include/graphviz/cdt.h
-include/graphviz/circle.h
-include/graphviz/circo.h
-include/graphviz/circpos.h
-include/graphviz/circular.h
-include/graphviz/closest.h
-include/graphviz/clusteredges.h
-include/graphviz/colortbl.h
-include/graphviz/comp.h
-include/graphviz/conjgrad.h
-include/graphviz/const.h
-include/graphviz/dbg.h
-include/graphviz/defs.h
-include/graphviz/deglist.h
-include/graphviz/dijkstra.h
-include/graphviz/dot.h
-include/graphviz/dotneato.h
-include/graphviz/dotprocs.h
+include/graphviz/color.h
 include/graphviz/dthdr.h
-include/graphviz/edgelist.h
-include/graphviz/edges.h
-include/graphviz/embed_graph.h
+include/graphviz/entities.h
 include/graphviz/exgram.h
 include/graphviz/exlib.h
 include/graphviz/expr.h
-include/graphviz/fdp.h
-include/graphviz/geometry.h
+include/graphviz/gd.h
+include/graphviz/gd_io.h
+include/graphviz/gdcache.h
+include/graphviz/gdfontg.h
+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/geom.h
 include/graphviz/globals.h
 include/graphviz/grammar.h
 include/graphviz/graph.h
-include/graphviz/grid.h
-include/graphviz/gvre.h
-include/graphviz/gvrender.h
-include/graphviz/gvrenderint.h
-include/graphviz/heap.h
-include/graphviz/hedges.h
-include/graphviz/htmllex.h
-include/graphviz/htmltable.h
-include/graphviz/info.h
-include/graphviz/kkutils.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/gvplugin_render.h
+include/graphviz/gvplugin_textlayout.h
+include/graphviz/gvplugin_usershape.h
+include/graphviz/jisx0208.h
 include/graphviz/libgraph.h
-include/graphviz/macros.h
+include/graphviz/logic.h
 include/graphviz/malloc.h
-include/graphviz/matrix_ops.h
-include/graphviz/mem.h
-include/graphviz/neato.h
-include/graphviz/neatoprocs.h
-include/graphviz/nodelist.h
-include/graphviz/nodeset.h
-include/graphviz/options.h
 include/graphviz/pack.h
 include/graphviz/parser.h
 include/graphviz/pathgeom.h
 include/graphviz/pathplan.h
 include/graphviz/pathutil.h
-include/graphviz/pca.h
-include/graphviz/pointset.h
-include/graphviz/poly.h
-include/graphviz/render.h
-include/graphviz/renderprocs.h
-include/graphviz/simple.h
-include/graphviz/site.h
 include/graphviz/solvers.h
-include/graphviz/stack.h
-include/graphviz/stress.h
-include/graphviz/tlayout.h
 include/graphviz/tri.h
 include/graphviz/triefa.h
 include/graphviz/types.h
-include/graphviz/utils.h
 include/graphviz/vis.h
 include/graphviz/vispath.h
 include/graphviz/vmstub.h
-include/graphviz/voronoi.h
-include/graphviz/xlayout.h
+include/graphviz/wbmp.h
+lib/graphviz/config
+lib/graphviz/libagraph.a
 lib/graphviz/libagraph.la
 lib/graphviz/libagraph.so
-lib/graphviz/libagraph.so.0
+lib/graphviz/libagraph.so.1
+lib/graphviz/libcdt.a
 lib/graphviz/libcdt.la
 lib/graphviz/libcdt.so
-lib/graphviz/libcdt.so.0
-lib/graphviz/libcircogen.la
-lib/graphviz/libcircogen.so
-lib/graphviz/libcircogen.so.0
-lib/graphviz/libcommon.la
-lib/graphviz/libcommon.so
-lib/graphviz/libcommon.so.0
-lib/graphviz/libdotgen.la
-lib/graphviz/libdotgen.so
-lib/graphviz/libdotgen.so.0
-lib/graphviz/libdotneato.la
-lib/graphviz/libdotneato.so
-lib/graphviz/libdotneato.so.0
+lib/graphviz/libcdt.so.1
+lib/graphviz/libexpr.a
 lib/graphviz/libexpr.la
 lib/graphviz/libexpr.so
-lib/graphviz/libexpr.so.0
-lib/graphviz/libfdpgen.la
-lib/graphviz/libfdpgen.so
-lib/graphviz/libfdpgen.so.0
+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/libgraph.so
-lib/graphviz/libgraph.so.0
-lib/graphviz/libgvrender.la
-lib/graphviz/libgvrender.so
-lib/graphviz/libgvrender.so.0
-lib/graphviz/libneatogen.la
-lib/graphviz/libneatogen.so
-lib/graphviz/libneatogen.so.0
+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/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/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_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.0
+lib/graphviz/libpack.so.1
+lib/graphviz/libpathplan.a
 lib/graphviz/libpathplan.la
 lib/graphviz/libpathplan.so
-lib/graphviz/libpathplan.so.0
+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/libtwopigen.la
-lib/graphviz/libtwopigen.so
-lib/graphviz/libtwopigen.so.0
-lib/graphviz/libtkspline.so.0
-lib/graphviz/libtkspline.so
+lib/graphviz/libtkspline.a
 lib/graphviz/libtkspline.la
+lib/graphviz/libtkspline.so
+lib/graphviz/libtkspline.so.0
 lib/graphviz/pkgIndex.tcl
 %%PORTDOCS%%%%DOCSDIR%%/Dot.ref
 %%PORTDOCS%%%%DOCSDIR%%/FAQ.html
@@ -170,19 +153,11 @@ lib/graphviz/pkgIndex.tcl
 %%PORTDOCS%%%%DOCSDIR%%/dottyguide.pdf
 %%PORTDOCS%%%%DOCSDIR%%/leftyguide.pdf
 %%PORTDOCS%%%%DOCSDIR%%/neatoguide.pdf
-lib/graphviz/pkgconfig/libagraph.pc
-lib/graphviz/pkgconfig/libcdt.pc
-lib/graphviz/pkgconfig/libcircogen.pc
-lib/graphviz/pkgconfig/libcommon.pc
-lib/graphviz/pkgconfig/libdotgen.pc
-lib/graphviz/pkgconfig/libdotneato.pc
-lib/graphviz/pkgconfig/libfdpgen.pc
-lib/graphviz/pkgconfig/libgraph.pc
-lib/graphviz/pkgconfig/libgvrender.pc
-lib/graphviz/pkgconfig/libneatogen.pc
-lib/graphviz/pkgconfig/libpack.pc
-lib/graphviz/pkgconfig/libpathplan.pc
-lib/graphviz/pkgconfig/libtwopigen.pc
+lib/pkgconfig/libagraph.pc
+lib/pkgconfig/libcdt.pc
+lib/pkgconfig/libgraph.pc
+lib/pkgconfig/libgvc.pc
+lib/pkgconfig/libpathplan.pc
 %%DATADIR%%/demo/doted
 %%DATADIR%%/demo/doted.README
 %%DATADIR%%/demo/entities
@@ -214,6 +189,7 @@ lib/graphviz/pkgconfig/libtwopigen.pc
 %%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
@@ -330,7 +306,6 @@ lib/graphviz/pkgconfig/libtwopigen.pc
 %%DATADIR%%/doc/pdf/dot.pdf
 %%DATADIR%%/doc/pdf/dot2gxl.pdf
 %%DATADIR%%/doc/pdf/dotguide.pdf
-%%DATADIR%%/doc/pdf/dotneato-config.pdf
 %%DATADIR%%/doc/pdf/dotty.pdf
 %%DATADIR%%/doc/pdf/dottyguide.pdf
 %%DATADIR%%/doc/pdf/expr.pdf
@@ -437,6 +412,5 @@ lib/graphviz/pkgconfig/libtwopigen.pc
 @dirrm %%DATADIR%%/demo
 @dirrm %%DATADIR%%
 %%PORTDOCS%%@dirrm %%DOCSDIR%%
-@dirrm lib/graphviz/pkgconfig
 @dirrm lib/graphviz
 @dirrm include/graphviz