5 files changed, 111 insertions, 120 deletions

diff --git a/graphics/graphviz/Makefile b/graphics/graphviz/Makefile
index 143bbad31226..0c3d6953eae8 100644
--- a/graphics/graphviz/Makefile
+++ b/graphics/graphviz/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	graphviz
-PORTVERSION=	1.8.8
+PORTVERSION=	1.8.10
 CATEGORIES=	graphics tk83
 MASTER_SITES=	http://www.graphviz.org/pub/graphviz/ARCHIVE/
 
@@ -37,7 +37,7 @@ MAKE_ENV=	EXPR_COMPAT=yes
 MAN1=		acyclic.1 ccomps.1 colorize.1 dot.1 dotty.1 gc.1 gpr.1 \
 		lefty.1 neato.1 nop.1 prune.1 sccmap.1 tred.1 \
 		twopi.1 unflatten.1
-MAN3=		agraph.3 cdt.3 expr.3 graph.3 pathplan.3
+MAN3=		agraph.3 cdt.3 expr.3 graph.3 pack.3 pathplan.3
 MANN=		gdtclft.n tcldgl.n tcldgr.n tcldot.n tkspline.n
 
 PORTDOCS=	dotguide.pdf dottyguide.pdf gd.html leftyguide.pdf \
diff --git a/graphics/graphviz/distinfo b/graphics/graphviz/distinfo
index f8e51c137ba9..d90fbb18436e 100644
--- a/graphics/graphviz/distinfo
+++ b/graphics/graphviz/distinfo
@@ -1 +1 @@
-MD5 (graphviz-1.8.8.tar.gz) = 5d0d7d6b80ea91d3c81284e42d1fbd06
+MD5 (graphviz-1.8.10.tar.gz) = 7c9663c8e2cde4f7edc2b412cc148330
diff --git a/graphics/graphviz/files/patch-configure.in b/graphics/graphviz/files/patch-configure.in
index 31097bedb1d4..b51d4b20bc10 100644
--- a/graphics/graphviz/files/patch-configure.in
+++ b/graphics/graphviz/files/patch-configure.in
@@ -22,12 +22,3 @@
  if test -f $TKCONFIG; then
      AC_MSG_RESULT([using $TKCONFIG])
      file=${TKCONFIG}
-@@ -561,7 +565,7 @@
- # Checks for header files
- # AC_STDC_HEADERS
- # AC_HAVE_HEADERS(string.h)
--AC_CHECK_HEADERS(malloc.h search.h getopt.h values.h termios.h \
-+AC_CHECK_HEADERS(search.h getopt.h values.h termios.h \
- 	errno.h sys/time.h unistd.h fenv.h fpu_control.h sys/fpu.h strings.h)
- AC_HEADER_TIME
- AC_HEADER_DIRENT
diff --git a/graphics/graphviz/files/patch-lefty::exec.c b/graphics/graphviz/files/patch-lefty::exec.c
deleted file mode 100644
index 343211d06a3e..000000000000
--- a/graphics/graphviz/files/patch-lefty::exec.c
+++ /dev/null
@@ -1,59 +0,0 @@
---- lefty/exec.c.orig	Wed Apr 17 16:28:33 2002
-+++ lefty/exec.c	Wed Apr 17 16:33:21 2002
-@@ -261,6 +261,8 @@
-             return (boolop (v1o) == FALSE) ? Tfalse: Ttrue;
-         case C_NOT:
-             return (boolop (v1o) == TRUE) ? Tfalse: Ttrue;
-+	default:
-+	    break;
-         }
-         /* NOT REACHED */
-         return Tfalse;
-@@ -646,7 +648,7 @@
- }
- 
- static Tobj getval (Tobj co, int ci) {
--    Tobj cvo, cko, cto;
-+    Tobj cvo = 0, cko = 0, cto = 0;
-     Ctype_t ct, vt;
-     int vi, ni, nn = 0;
- 
-@@ -687,10 +689,10 @@
- }
- 
- static int getvar (Tobj co, int ci, tnk_t *tnkp) {
--    Tobj cvo, cko, cto;
--    Ctype_t ct, vt;
-+    Tobj cvo = 0, cko = 0, cto = 0;
-+    Ctype_t ct, vt = 0;
-     long m;
--    int vi, ovi, nn, ni;
-+    int vi, ovi, nn = 0, ni;
- 
-     if ((ct = TCgettype (co, ci)) == C_LVAR) {
-         nn = (int) TCgetinteger (co, (ni = TCgetnext (co, TCgetfp (co, ci))));
-@@ -780,6 +782,8 @@
-         case C_REAL:
-             Tinsr (tnk.u.tnks.to, TCgetreal (tnk.u.tnks.co, tnk.u.tnks.vi), vo);
-             break;
-+        default:
-+            break;
-         }
-         break;
-     }
-@@ -848,6 +852,7 @@
-     case C_LE: return (r <= 0) ? TRUE : FALSE;
-     case C_GT: return (r >  0) ? TRUE : FALSE;
-     case C_GE: return (r >= 0) ? TRUE : FALSE;
-+    default: break;
-     }
-     panic (POS, "orderop", "bad op code");
-     return FALSE; /* NOT REACHED */
-@@ -892,6 +897,7 @@
-     case C_MUL:   d3 = d1 * d2;               break;
-     case C_DIV:   d3 = d1 / d2;               break;
-     case C_MOD:   d3 = (long) d1 % (long) d2; break;
-+    default: break;
-     }
- result:
-     if (d3 == (double) (long) d3)
diff --git a/graphics/graphviz/pkg-plist b/graphics/graphviz/pkg-plist
index 390599e068eb..02dabfcad8be 100644
--- a/graphics/graphviz/pkg-plist
+++ b/graphics/graphviz/pkg-plist
@@ -3,8 +3,10 @@ bin/ccomps
 bin/colorize
 bin/dot
 bin/dotty
+bin/dynagraph
 bin/gc
 bin/gpr
+bin/graphsearch
 bin/lefty
 bin/lneato
 bin/neato
@@ -14,9 +16,65 @@ bin/sccmap
 bin/tred
 bin/twopi
 bin/unflatten
+include/graphviz/aghdr.h
+include/graphviz/agraph.h
+include/graphviz/ast_common.h
+include/graphviz/cdt.h
+include/graphviz/dthdr.h
+include/graphviz/exgram.h
+include/graphviz/exlib.h
+include/graphviz/expr.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/gdhelpers.h
+include/graphviz/grammar.h
+include/graphviz/graph.h
+include/graphviz/jisx0208.h
+include/graphviz/libgraph.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/pointset.h
+include/graphviz/solvers.h
+include/graphviz/tri.h
+include/graphviz/triefa.h
+include/graphviz/vis.h
+include/graphviz/vispath.h
+include/graphviz/vmstub.h
+include/graphviz/wbmp.h
+lib/graphviz/libagraph.a
+lib/graphviz/libagraph.so
+lib/graphviz/libagraph.so.0
+lib/graphviz/libcdt.a
+lib/graphviz/libcdt.so
+lib/graphviz/libcdt.so.0
+lib/graphviz/libexpr.a
+lib/graphviz/libexpr.so
+lib/graphviz/libexpr.so.0
+lib/graphviz/libgd.a
+lib/graphviz/libgd.so
+lib/graphviz/libgd.so.0
 lib/graphviz/libgdtclft.a
 lib/graphviz/libgdtclft.so
 lib/graphviz/libgdtclft.so.0
+lib/graphviz/libgraph.a
+lib/graphviz/libgraph.so
+lib/graphviz/libgraph.so.0
+lib/graphviz/libpack.a
+lib/graphviz/libpack.so
+lib/graphviz/libpack.so.0
+lib/graphviz/libpathplan.a
+lib/graphviz/libpathplan.so
+lib/graphviz/libpathplan.so.0
 lib/graphviz/libtcldgl.a
 lib/graphviz/libtcldgl.so
 lib/graphviz/libtcldgl.so.0
@@ -41,19 +99,38 @@ lib/graphviz/pkgIndex.tcl
 %%PORTDOCS%%share/doc/graphviz/leftyguide.pdf
 %%PORTDOCS%%share/doc/graphviz/neatoguide.pdf
 %%PORTDOCS%%share/doc/graphviz/tcldot.html
-share/graphviz/lefty/dotty.lefty
-share/graphviz/lefty/dotty_draw.lefty
-share/graphviz/lefty/dotty_edit.lefty
-share/graphviz/lefty/dotty_layout.lefty
-share/graphviz/lefty/dotty_ui.lefty
-share/graphviz/lefty/box.lefty
-share/graphviz/lefty/def.lefty
-share/graphviz/lefty/fractal.lefty
-share/graphviz/lefty/fractal2.lefty
-share/graphviz/lefty/slides.lefty
-share/graphviz/lefty/tree.lefty
-share/graphviz/lefty/lefty.psp
+share/graphviz/demo/dge
+share/graphviz/demo/dge.README
+share/graphviz/demo/dge.example1.dot
+share/graphviz/demo/dge.example2.dot
+share/graphviz/demo/doted
+share/graphviz/demo/doted.README
+share/graphviz/demo/entities
+share/graphviz/demo/entities.README
+share/graphviz/demo/entities.html
+share/graphviz/demo/gcat
+share/graphviz/demo/gcat.README
+share/graphviz/demo/ihi
+share/graphviz/demo/ihi.README
+share/graphviz/demo/ihi.testdata
+share/graphviz/demo/pathplan
+share/graphviz/demo/pathplan.README
+share/graphviz/demo/pathplan_data/boxes.dat
+share/graphviz/demo/pathplan_data/dpd.dat
+share/graphviz/demo/pathplan_data/funny.dat
+share/graphviz/demo/pathplan_data/maze.dat
+share/graphviz/demo/pathplan_data/nested.dat
+share/graphviz/demo/pathplan_data/northo.dat
+share/graphviz/demo/pathplan_data/obs.dat
+share/graphviz/demo/pathplan_data/other.dat
+share/graphviz/demo/pathplan_data/paths.dat
+share/graphviz/demo/pathplan_data/rotor.dat
+share/graphviz/demo/pathplan_data/u.dat
+share/graphviz/demo/pathplan_data/unknown.dat
+share/graphviz/demo/spline
+share/graphviz/demo/spline.README
 share/graphviz/graphs/directed/KW91.dot
+share/graphviz/graphs/directed/Latin1.dot
 share/graphviz/graphs/directed/NaN.dot
 share/graphviz/graphs/directed/abstract.dot
 share/graphviz/graphs/directed/alf.dot
@@ -71,9 +148,11 @@ share/graphviz/graphs/directed/fig6.dot
 share/graphviz/graphs/directed/fsm.dot
 share/graphviz/graphs/directed/grammar.dot
 share/graphviz/graphs/directed/hashtable.dot
+share/graphviz/graphs/directed/honda-tokoro.dot
 share/graphviz/graphs/directed/jcctree.dot
 share/graphviz/graphs/directed/jsort.dot
 share/graphviz/graphs/directed/ldbxtried.dot
+share/graphviz/graphs/directed/longflat.dot
 share/graphviz/graphs/directed/mike.dot
 share/graphviz/graphs/directed/newarrows.dot
 share/graphviz/graphs/directed/nhg.dot
@@ -82,6 +161,7 @@ share/graphviz/graphs/directed/pm2way.dot
 share/graphviz/graphs/directed/pmpipe.dot
 share/graphviz/graphs/directed/polypoly.dot
 share/graphviz/graphs/directed/proc3d.dot
+share/graphviz/graphs/directed/record2.dot
 share/graphviz/graphs/directed/records.dot
 share/graphviz/graphs/directed/rowe.dot
 share/graphviz/graphs/directed/shells.dot
@@ -94,48 +174,26 @@ share/graphviz/graphs/directed/triedds.dot
 share/graphviz/graphs/directed/try.dot
 share/graphviz/graphs/directed/unix.dot
 share/graphviz/graphs/directed/unix2.dot
+share/graphviz/graphs/directed/unix2k.dot
 share/graphviz/graphs/directed/viewfile.dot
 share/graphviz/graphs/directed/world.dot
-share/graphviz/graphs/directed/honda-tokoro.dot
-share/graphviz/graphs/directed/Latin1.dot
-share/graphviz/graphs/directed/longflat.dot
-share/graphviz/graphs/directed/record2.dot
-share/graphviz/graphs/directed/unix2k.dot
 share/graphviz/graphs/undirected/ER.dot
-share/graphviz/graphs/undirected/ngk10_4.dot
-share/graphviz/graphs/undirected/process.dot
 share/graphviz/graphs/undirected/Heawood.dot
 share/graphviz/graphs/undirected/Petersen.dot
-share/graphviz/demo/entities
-share/graphviz/demo/entities.README
-share/graphviz/demo/entities.html
-share/graphviz/demo/doted
-share/graphviz/demo/gcat
-share/graphviz/demo/doted.README
-share/graphviz/demo/gcat.README
-share/graphviz/demo/ihi
-share/graphviz/demo/ihi.README
-share/graphviz/demo/ihi.testdata
-share/graphviz/demo/dge
-share/graphviz/demo/dge.README
-share/graphviz/demo/dge.example1.dot
-share/graphviz/demo/dge.example2.dot
-share/graphviz/demo/pathplan_data/boxes.dat
-share/graphviz/demo/pathplan_data/dpd.dat
-share/graphviz/demo/pathplan_data/funny.dat
-share/graphviz/demo/pathplan_data/maze.dat
-share/graphviz/demo/pathplan_data/nested.dat
-share/graphviz/demo/pathplan_data/northo.dat
-share/graphviz/demo/pathplan_data/obs.dat
-share/graphviz/demo/pathplan_data/other.dat
-share/graphviz/demo/pathplan_data/paths.dat
-share/graphviz/demo/pathplan_data/rotor.dat
-share/graphviz/demo/pathplan_data/u.dat
-share/graphviz/demo/pathplan_data/unknown.dat
-share/graphviz/demo/pathplan
-share/graphviz/demo/pathplan.README
-share/graphviz/demo/spline
-share/graphviz/demo/spline.README
+share/graphviz/graphs/undirected/ngk10_4.dot
+share/graphviz/graphs/undirected/process.dot
+share/graphviz/lefty/box.lefty
+share/graphviz/lefty/def.lefty
+share/graphviz/lefty/dotty.lefty
+share/graphviz/lefty/dotty_draw.lefty
+share/graphviz/lefty/dotty_edit.lefty
+share/graphviz/lefty/dotty_layout.lefty
+share/graphviz/lefty/dotty_ui.lefty
+share/graphviz/lefty/fractal.lefty
+share/graphviz/lefty/fractal2.lefty
+share/graphviz/lefty/lefty.psp
+share/graphviz/lefty/slides.lefty
+share/graphviz/lefty/tree.lefty
 @dirrm share/graphviz/lefty
 @dirrm share/graphviz/graphs/undirected
 @dirrm share/graphviz/graphs/directed
@@ -145,3 +203,4 @@ share/graphviz/demo/spline.README
 @dirrm share/graphviz
 %%PORTDOCS%%@dirrm share/doc/graphviz
 @dirrm lib/graphviz
+@dirrm include/graphviz