4 files changed, 64 insertions, 79 deletions

diff --git a/graphics/graphviz/Makefile b/graphics/graphviz/Makefile
index 9abe3791ea4f..4e3bf91fc649 100644
--- a/graphics/graphviz/Makefile
+++ b/graphics/graphviz/Makefile
@@ -6,8 +6,7 @@
 #
 
 PORTNAME=	graphviz
-PORTVERSION=	1.10
-PORTREVISION=	2
+PORTVERSION=	1.12
 CATEGORIES=	graphics tk84
 MASTER_SITES=	http://www.graphviz.org/pub/graphviz/ARCHIVE/
 
@@ -17,33 +16,33 @@ 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 \
-		tk84.1:${PORTSDIR}/x11-toolkits/tk84
+		tk84.1:${PORTSDIR}/x11-toolkits/tk84 \
+		expat.5:${PORTSDIR}/textproc/expat2
 
+USE_BISON=	yes
+USE_GMAKE=	yes
 USE_ICONV=	yes
 USE_XPM=	yes
-USE_GMAKE=	yes
-USE_AUTOMAKE_VER=	14
-AUTOMAKE_ARGS=	--add-missing
-USE_LIBTOOL_VER=13
+GNU_CONFIGURE=	yes
 CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include -I${LOCALBASE}/include/tcl8.4 -I${LOCALBASE}/include/tk8.4" \
 		LDFLAGS="-L${LOCALBASE}/lib" \
 		TCLCONFIG=${LOCALBASE}/lib/tcl8.4/tclConfig.sh \
 		TKCONFIG=${LOCALBASE}/lib/tk8.4/tkConfig.sh \
-		AUTOHEADER=${LOCALBASE}/bin/autoheader213 \
-		AUTOCONF=${LOCALBASE}/bin/autoconf213 \
-		AUTOMAKE=${LOCALBASE}/bin/automake14 \
-		ACLOCAL=${LOCALBASE}/bin/aclocal14
+		MISSING=${TRUE}
 CONFIGURE_ARGS=	--program-transform-name="s/x/x/" \
-		--with-iconvlibdir=${LOCALBASE}/lib
+		--with-iconvlibdir=${LOCALBASE}/lib \
+		--with-tclsh=${LOCALBASE}/tcl8.4 \
+		--with-wish=${LOCALBASE}/wish8.4
 INSTALLS_SHLIB=	yes
 LDCONFIG_DIRS=	${PREFIX}/lib/graphviz
-MAKE_ENV=	EXPR_COMPAT=yes
+MAKE_ENV=	EXPR_COMPAT=yes MISSING=${TRUE}
 
-MAN1=		acyclic.1 ccomps.1 colorize.1 dot.1 dot2gxl.1 dotty.1 gc.1 \
-		gpr.1 gxl2dot.1 gvpack.1 lefty.1 neato.1 nop.1 prune.1 \
-		sccmap.1 tred.1 twopi.1 unflatten.1
+MAN1=		acyclic.1 bcomps.1 ccomps.1 circo.1 dijkstra.1 dot.1 \
+		dot2gxl.1 dotneato-config.1 dotty.1 fdp.1 gc.1 \
+		gxl2dot.1 gvcolor.1 gvpack.1 gvpr.1 lefty.1 lneato.1 \
+		neato.1 nop.1 prune.1 sccmap.1 tred.1 twopi.1 unflatten.1
 MAN3=		agraph.3 cdt.3 expr.3 graph.3 pack.3 pathplan.3
-MANN=		gdtclft.n tcldgl.n tcldgr.n tcldot.n tkspline.n
+MANN=		gdtclft.n tcldot.n tkspline.n
 
 MYPORTDOCS=	dotguide.pdf dottyguide.pdf gd.html leftyguide.pdf \
 		neatoguide.pdf tcldot.html Dot.ref FAQ.html
diff --git a/graphics/graphviz/distinfo b/graphics/graphviz/distinfo
index 089aacc2f150..2842fc4e9964 100644
--- a/graphics/graphviz/distinfo
+++ b/graphics/graphviz/distinfo
@@ -1,2 +1,2 @@
-MD5 (graphviz-1.10.tar.gz) = e1402531abff68d146bf94e72b44dc2a
-SIZE (graphviz-1.10.tar.gz) = 3357416
+MD5 (graphviz-1.12.tar.gz) = 84910caae072c714d107ca9f3e54ace0
+SIZE (graphviz-1.12.tar.gz) = 3371279
diff --git a/graphics/graphviz/files/patch-aclocal.m4 b/graphics/graphviz/files/patch-aclocal.m4
deleted file mode 100644
index 64ee7d0e9a84..000000000000
--- a/graphics/graphviz/files/patch-aclocal.m4
+++ /dev/null
@@ -1,32 +0,0 @@
---- aclocal.m4.orig	Tue Feb 18 18:22:38 2003
-+++ aclocal.m4	Tue Feb 18 18:24:43 2003
-@@ -144,10 +144,10 @@
- # Some tools Automake needs.
- AC_REQUIRE([AM_SANITY_CHECK])dnl
- AC_REQUIRE([AC_ARG_PROGRAM])dnl
--AM_MISSING_PROG(ACLOCAL, aclocal)
--AM_MISSING_PROG(AUTOCONF, autoconf)
--AM_MISSING_PROG(AUTOMAKE, automake)
--AM_MISSING_PROG(AUTOHEADER, autoheader)
-+AM_MISSING_PROG(ACLOCAL, ${ACLOCAL})
-+AM_MISSING_PROG(AUTOCONF, ${AUTOCONF})
-+AM_MISSING_PROG(AUTOMAKE, ${AUTOMAKE})
-+AM_MISSING_PROG(AUTOHEADER, ${AUTOHEADER})
- AM_MISSING_PROG(MAKEINFO, makeinfo)
- AM_MISSING_PROG(AMTAR, tar)
- AM_PROG_INSTALL_SH
-@@ -563,10 +563,13 @@
- # serial 46 AC_PROG_LIBTOOL
- 
- AC_DEFUN([AC_PROG_LIBTOOL],
--[AC_REQUIRE([AC_LIBTOOL_SETUP])dnl
-+[
-+AC_REQUIRE([AC_OBJEXT])dnl
-+AC_REQUIRE([AC_EXEEXT])dnl
- 
- # This can be used to rebuild libtool when needed
- LIBTOOL_DEPS="$ac_aux_dir/ltmain.sh"
-+$ac_aux_dir/ltconfig $LIBTOOL_DEPS
- 
- # Always use our own libtool.
- LIBTOOL='$(SHELL) $(top_builddir)/libtool'
diff --git a/graphics/graphviz/pkg-plist b/graphics/graphviz/pkg-plist
index 10c28237ca6e..c887baee3ad9 100644
--- a/graphics/graphviz/pkg-plist
+++ b/graphics/graphviz/pkg-plist
@@ -1,13 +1,17 @@
 bin/acyclic
+bin/bcomps
 bin/ccomps
-bin/colorize
+bin/circo
+bin/dijkstra
 bin/dot
 bin/dot2gxl
 bin/dotneato-config
 bin/dotty
+bin/fdp
 bin/gc
-bin/gpr
+bin/gvcolor
 bin/gvpack
+bin/gvpr
 bin/gxl2dot
 bin/lefty
 bin/lneato
@@ -21,18 +25,31 @@ bin/unflatten
 include/graphviz/adjust.h
 include/graphviz/aghdr.h
 include/graphviz/agraph.h
+include/graphviz/agxbuf.h
 include/graphviz/ast_common.h
+include/graphviz/block.h
+include/graphviz/blockpath.h
+include/graphviz/blocktree.h
 include/graphviz/cdt.h
 include/graphviz/circle.h
+include/graphviz/circo.h
+include/graphviz/circpos.h
+include/graphviz/circular.h
+include/graphviz/colortbl.h
+include/graphviz/comp.h
 include/graphviz/const.h
+include/graphviz/dbg.h
+include/graphviz/deglist.h
 include/graphviz/dot.h
 include/graphviz/dotneato.h
 include/graphviz/dotprocs.h
 include/graphviz/dthdr.h
+include/graphviz/edgelist.h
 include/graphviz/edges.h
 include/graphviz/exgram.h
 include/graphviz/exlib.h
 include/graphviz/expr.h
+include/graphviz/fdp.h
 include/graphviz/gd.h
 include/graphviz/gd_io.h
 include/graphviz/gdcache.h
@@ -46,8 +63,14 @@ include/graphviz/geometry.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/jisx0208.h
 include/graphviz/libgraph.h
@@ -56,6 +79,9 @@ include/graphviz/malloc.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
@@ -68,6 +94,8 @@ include/graphviz/renderprocs.h
 include/graphviz/simple.h
 include/graphviz/site.h
 include/graphviz/solvers.h
+include/graphviz/stack.h
+include/graphviz/tlayout.h
 include/graphviz/tri.h
 include/graphviz/triefa.h
 include/graphviz/types.h
@@ -77,44 +105,38 @@ include/graphviz/vispath.h
 include/graphviz/vmstub.h
 include/graphviz/voronoi.h
 include/graphviz/wbmp.h
-include/graphviz/xbuf.h
-lib/graphviz/libagraph.a
+include/graphviz/xlayout.h
+lib/graphviz/libagraph.la
 lib/graphviz/libagraph.so
 lib/graphviz/libagraph.so.0
-lib/graphviz/libcdt.a
+lib/graphviz/libcdt.la
 lib/graphviz/libcdt.so
 lib/graphviz/libcdt.so.0
-lib/graphviz/libdotneato.a
+lib/graphviz/libdotneato.la
 lib/graphviz/libdotneato.so
 lib/graphviz/libdotneato.so.0
-lib/graphviz/libexpr.a
+lib/graphviz/libexpr.la
 lib/graphviz/libexpr.so
 lib/graphviz/libexpr.so.0
-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/libpack.a
+lib/graphviz/libpack.la
 lib/graphviz/libpack.so
 lib/graphviz/libpack.so.0
-lib/graphviz/libpathplan.a
+lib/graphviz/libpathplan.la
 lib/graphviz/libpathplan.so
 lib/graphviz/libpathplan.so.0
-lib/graphviz/libtcldgl.a
-lib/graphviz/libtcldgl.so
-lib/graphviz/libtcldgl.so.0
-lib/graphviz/libtcldgr.a
-lib/graphviz/libtcldgr.so
-lib/graphviz/libtcldgr.so.0
-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/pkgIndex.tcl
@@ -126,10 +148,6 @@ lib/graphviz/pkgIndex.tcl
 %%PORTDOCS%%share/doc/graphviz/leftyguide.pdf
 %%PORTDOCS%%share/doc/graphviz/neatoguide.pdf
 %%PORTDOCS%%share/doc/graphviz/tcldot.html
-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
@@ -137,9 +155,6 @@ 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
@@ -161,6 +176,7 @@ share/graphviz/graphs/directed/Latin1.dot
 share/graphviz/graphs/directed/NaN.dot
 share/graphviz/graphs/directed/abstract.dot
 share/graphviz/graphs/directed/alf.dot
+share/graphviz/graphs/directed/arrows.dot
 share/graphviz/graphs/directed/awilliams.dot
 share/graphviz/graphs/directed/clust.dot
 share/graphviz/graphs/directed/clust1.dot
@@ -181,8 +197,8 @@ 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
+share/graphviz/graphs/directed/oldarrows.dot
 share/graphviz/graphs/directed/pgram.dot
 share/graphviz/graphs/directed/pm2way.dot
 share/graphviz/graphs/directed/pmpipe.dot
@@ -191,9 +207,11 @@ 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/sdh.dot
 share/graphviz/graphs/directed/shells.dot
 share/graphviz/graphs/directed/states.dot
 share/graphviz/graphs/directed/structs.dot
+share/graphviz/graphs/directed/table.dot
 share/graphviz/graphs/directed/train11.dot
 share/graphviz/graphs/directed/trapeziumlr.dot
 share/graphviz/graphs/directed/tree.dot