- update to 2.18

4 files changed, 84 insertions, 202 deletions

diff --git a/graphics/graphviz/Makefile b/graphics/graphviz/Makefile
index 24630f44152c..7e3273e0696d 100644
--- a/graphics/graphviz/Makefile
+++ b/graphics/graphviz/Makefile
@@ -6,8 +6,7 @@
 #
 
 PORTNAME=	graphviz
-PORTVERSION=	2.16.1
-PORTREVISION=	1
+PORTVERSION=	2.18
 CATEGORIES=	graphics tk84
 MASTER_SITES=	http://www.graphviz.org/pub/graphviz/ARCHIVE/ \
 		http://mirror.inerd.com/FreeBSD/distfiles/${PORTNAME}/
@@ -29,6 +28,7 @@ WANT_GNOME=	yes
 GNU_CONFIGURE=	yes
 LDFLAGS+=	-L${LOCALBASE}/lib
 CPPFLAGS+=	-I${LOCALBASE}/include
+PLIST_SUB=	PORTVERSION="${PORTVERSION}"
 
 MAKE_ENV=	EXPR_COMPAT=yes MISSING=${TRUE}
 
@@ -56,8 +56,8 @@ FIX_INCLUDE=	ast_common.h \
 		lib/common/globals.h \
 		lib/gvc/gvcint.h
 
-PATCH_TCL_SCRIPTS=	tclpkg/gv/Makefile.in tclpkg/tcldot/demo/doted \
-			tclpkg/tclpathplan/demo/pathplan tclpkg/tkspline/demo/spline
+PATCH_TCL_SCRIPTS=	tclpkg/gv/Makefile.in tclpkg/tcldot/demo/doted.tcl \
+			tclpkg/tclpathplan/demo/pathplan.tcl tclpkg/tkspline/demo/spline.tcl
 PATCH_TK_SCRIPTS=	${PATCH_TCL_SCRIPTS}
 
 PDOCS_TXT=	AUTHORS NEWS ChangeLog cpl1.0.txt doc/Dot.ref doc/latex_suggestions.txt
@@ -95,8 +95,8 @@ CONFIGURE_ARGS+=	--program-transform-name="s/x/x/" \
 		--enable-dependency-tracking \
 		--enable-r=no \
 		--with-libgd \
-		--with-fontconfigincludedir=${X11BASE}/include \
-		--with-fontconfiglibdir=${X11BASE}/lib \
+		--with-fontconfigincludedir=${LOCABASE}/include \
+		--with-fontconfiglibdir=${LOCABASE}/lib \
 		--disable-io --disable-ocaml --disable-java \
 		--disable-sharp
 
@@ -122,6 +122,7 @@ USE_TCL_BUILD=		84
 CONFIGURE_ARGS+=	--with-tclsh=${TCLSH}
 CONFIGURE_ENV+=		TCLCONFIG="${TCL_LIBDIR}/tclConfig.sh"
 MANN+=			gdtclft.n tcldot.n
+PLIST_SUB+=		TCL_VER="${TCL_VER}"
 .endif
 
 .if defined(WITHOUT_ICONV)
@@ -132,7 +133,7 @@ CONFIGURE_ARGS+=	--with-iconvlibdir=${LOCALBASE}/lib
 CONFIGURE_ARGS+=	--with-iconvincludedir=${LOCALBASE}/include
 .endif
 
-.if !defined(WITHOUT_XPM) || exists(${X11BASE}/lib/libXpm.so)
+.if !defined(WITHOUT_XPM) || exists(${LOCABASE}/lib/libXpm.so)
 USE_XORG+=		xaw8 xpm xmu xt sm ice xext x11 xau xdmcp xp
 MAN1+=			lefty.1
 PLIST_SUB+=		WITH_XPM=""
@@ -365,18 +366,18 @@ post-install: install-ldconfig-file
 	@${ECHO_MSG} "Installing demo data..."
 	@${MKDIR} ${EXAMPLESDIR}
 	${INSTALL_SCRIPT} \
-		${WRKSRC}/tclpkg/gdtclft/demo/entities \
-		${WRKSRC}/tclpkg/tcldot/demo/doted \
-		${WRKSRC}/tclpkg/tcldot/demo/gcat \
-		${WRKSRC}/tclpkg/tclpathplan/demo/pathplan \
-		${WRKSRC}/tclpkg/tkspline/demo/spline \
+		${WRKSRC}/tclpkg/gdtclft/demo/entities.tcl \
+		${WRKSRC}/tclpkg/tcldot/demo/doted.tcl \
+		${WRKSRC}/tclpkg/tcldot/demo/gcat.tcl \
+		${WRKSRC}/tclpkg/tclpathplan/demo/pathplan.tcl \
+		${WRKSRC}/tclpkg/tkspline/demo/spline.tcl \
 		${EXAMPLESDIR}/
 	${INSTALL_DATA} \
-		${WRKSRC}/tclpkg/gdtclft/demo/entities.README \
-		${WRKSRC}/tclpkg/tcldot/demo/doted.README \
-		${WRKSRC}/tclpkg/tcldot/demo/gcat.README \
-		${WRKSRC}/tclpkg/tclpathplan/demo/pathplan.README \
-		${WRKSRC}/tclpkg/tkspline/demo/spline.README \
+		${WRKSRC}/tclpkg/gdtclft/demo/entities.tcl.README \
+		${WRKSRC}/tclpkg/tcldot/demo/doted.tcl.README \
+		${WRKSRC}/tclpkg/tcldot/demo/gcat.tcl.README \
+		${WRKSRC}/tclpkg/tclpathplan/demo/pathplan.tcl.README \
+		${WRKSRC}/tclpkg/tkspline/demo/spline.tcl.README \
 		${EXAMPLESDIR}/
 	@${MKDIR} ${EXAMPLESDIR}/pathplan_data
 	${INSTALL_DATA} \
diff --git a/graphics/graphviz/distinfo b/graphics/graphviz/distinfo
index 84a387ebd541..17dfed8f0089 100644
--- a/graphics/graphviz/distinfo
+++ b/graphics/graphviz/distinfo
@@ -1,3 +1,3 @@
-MD5 (graphviz-2.16.1.tar.gz) = 8952fb2a627b38e38ed429a3a9d5cc5c
-SHA256 (graphviz-2.16.1.tar.gz) = 32c1a185ba39961935f104cc47d2bceea327c0de8c5636edc6ab83ac3c0c56d1
-SIZE (graphviz-2.16.1.tar.gz) = 8076271
+MD5 (graphviz-2.18.tar.gz) = 7df2705482c86fc7a9ee5f0446ed0b9e
+SHA256 (graphviz-2.18.tar.gz) = 6bc51969fa54c6ee3e64d8a4277c576931d50577b02114115668eeb5e515b42c
+SIZE (graphviz-2.18.tar.gz) = 13322519
diff --git a/graphics/graphviz/files/patch-cmd-dot-Makefile.in b/graphics/graphviz/files/patch-cmd-dot-Makefile.in
deleted file mode 100644
index c8ab768fdc1d..000000000000
--- a/graphics/graphviz/files/patch-cmd-dot-Makefile.in
+++ /dev/null
@@ -1,148 +0,0 @@
---- cmd/dot/Makefile.in.orig	2008-01-14 11:45:08.000000000 +0100
-+++ cmd/dot/Makefile.in	2008-01-14 12:38:06.000000000 +0100
-@@ -66,15 +66,23 @@
- am_dot_builtins_OBJECTS = dot.$(OBJEXT) dot_builtins.$(OBJEXT) \
- 	no_demand_loading.$(OBJEXT)
- dot_builtins_OBJECTS = $(am_dot_builtins_OBJECTS)
--@WITH_MYLIBGD_FALSE@dot_builtins_DEPENDENCIES = $(top_builddir)/plugin/dot_layout/libgvplugin_dot_layout.la \
--@WITH_MYLIBGD_FALSE@	$(top_builddir)/plugin/neato_layout/libgvplugin_neato_layout.la \
--@WITH_MYLIBGD_FALSE@	$(top_builddir)/plugin/core/libgvplugin_core.la \
--@WITH_MYLIBGD_FALSE@	$(top_builddir)/plugin/gd/libgvplugin_gd.la \
--@WITH_MYLIBGD_FALSE@	$(top_builddir)/plugin/pango/libgvplugin_pango.la \
--@WITH_MYLIBGD_FALSE@	$(top_builddir)/lib/gvc/libgvc_builtins.la \
--@WITH_MYLIBGD_FALSE@	$(top_builddir)/lib/pathplan/libpathplan.la \
--@WITH_MYLIBGD_FALSE@	$(top_builddir)/lib/graph/libgraph.la \
--@WITH_MYLIBGD_FALSE@	$(top_builddir)/lib/cdt/libcdt.la
-+@WITH_MYLIBGD_FALSE@@WITH_PANGOCAIRO_FALSE@dot_builtins_DEPENDENCIES = $(top_builddir)/plugin/dot_layout/libgvplugin_dot_layout.la \
-+@WITH_MYLIBGD_FALSE@@WITH_PANGOCAIRO_FALSE@	$(top_builddir)/plugin/neato_layout/libgvplugin_neato_layout.la \
-+@WITH_MYLIBGD_FALSE@@WITH_PANGOCAIRO_FALSE@	$(top_builddir)/plugin/core/libgvplugin_core.la \
-+@WITH_MYLIBGD_FALSE@@WITH_PANGOCAIRO_FALSE@	$(top_builddir)/plugin/gd/libgvplugin_gd.la \
-+@WITH_MYLIBGD_FALSE@@WITH_PANGOCAIRO_FALSE@	$(top_builddir)/lib/gvc/libgvc_builtins.la \
-+@WITH_MYLIBGD_FALSE@@WITH_PANGOCAIRO_FALSE@	$(top_builddir)/lib/pathplan/libpathplan.la \
-+@WITH_MYLIBGD_FALSE@@WITH_PANGOCAIRO_FALSE@	$(top_builddir)/lib/graph/libgraph.la \
-+@WITH_MYLIBGD_FALSE@@WITH_PANGOCAIRO_FALSE@	$(top_builddir)/lib/cdt/libcdt.la
-+@WITH_MYLIBGD_FALSE@@WITH_PANGOCAIRO_TRUE@dot_builtins_DEPENDENCIES = $(top_builddir)/plugin/dot_layout/libgvplugin_dot_layout.la \
-+@WITH_MYLIBGD_FALSE@@WITH_PANGOCAIRO_TRUE@	$(top_builddir)/plugin/neato_layout/libgvplugin_neato_layout.la \
-+@WITH_MYLIBGD_FALSE@@WITH_PANGOCAIRO_TRUE@	$(top_builddir)/plugin/core/libgvplugin_core.la \
-+@WITH_MYLIBGD_FALSE@@WITH_PANGOCAIRO_TRUE@	$(top_builddir)/plugin/gd/libgvplugin_gd.la \
-+@WITH_MYLIBGD_FALSE@@WITH_PANGOCAIRO_TRUE@	$(top_builddir)/plugin/pango/libgvplugin_pango.la \
-+@WITH_MYLIBGD_FALSE@@WITH_PANGOCAIRO_TRUE@	$(top_builddir)/lib/gvc/libgvc_builtins.la \
-+@WITH_MYLIBGD_FALSE@@WITH_PANGOCAIRO_TRUE@	$(top_builddir)/lib/pathplan/libpathplan.la \
-+@WITH_MYLIBGD_FALSE@@WITH_PANGOCAIRO_TRUE@	$(top_builddir)/lib/graph/libgraph.la \
-+@WITH_MYLIBGD_FALSE@@WITH_PANGOCAIRO_TRUE@	$(top_builddir)/lib/cdt/libcdt.la
- @WITH_MYLIBGD_TRUE@@WITH_PANGOCAIRO_FALSE@dot_builtins_DEPENDENCIES = $(top_builddir)/plugin/dot_layout/libgvplugin_dot_layout.la \
- @WITH_MYLIBGD_TRUE@@WITH_PANGOCAIRO_FALSE@	$(top_builddir)/plugin/neato_layout/libgvplugin_neato_layout.la \
- @WITH_MYLIBGD_TRUE@@WITH_PANGOCAIRO_FALSE@	$(top_builddir)/plugin/core/libgvplugin_core.la \
-@@ -96,15 +104,23 @@
- @WITH_MYLIBGD_TRUE@@WITH_PANGOCAIRO_TRUE@	$(top_builddir)/lib/gd/libgvgd_C.la
- am_dot_static_OBJECTS = dot.$(OBJEXT) no_demand_loading.$(OBJEXT)
- dot_static_OBJECTS = $(am_dot_static_OBJECTS)
--@WITH_MYLIBGD_FALSE@dot_static_DEPENDENCIES = $(top_builddir)/plugin/dot_layout/.libs/libgvplugin_dot_layout_C.a \
--@WITH_MYLIBGD_FALSE@	$(top_builddir)/plugin/neato_layout/.libs/libgvplugin_neato_layout_C.a \
--@WITH_MYLIBGD_FALSE@	$(top_builddir)/plugin/core/.libs/libgvplugin_core_C.a \
--@WITH_MYLIBGD_FALSE@	$(top_builddir)/plugin/gd/.libs/libgvplugin_gd_C.a \
--@WITH_MYLIBGD_FALSE@	$(top_builddir)/plugin/pango/.libs/libgvplugin_pango_C.a \
--@WITH_MYLIBGD_FALSE@	$(top_builddir)/lib/gvc/libgvc_C.la \
--@WITH_MYLIBGD_FALSE@	$(top_builddir)/lib/pathplan/libpathplan_C.la \
--@WITH_MYLIBGD_FALSE@	$(top_builddir)/lib/graph/libgraph_C.la \
--@WITH_MYLIBGD_FALSE@	$(top_builddir)/lib/cdt/libcdt_C.la
-+@WITH_MYLIBGD_FALSE@@WITH_PANGOCAIRO_FALSE@dot_static_DEPENDENCIES = $(top_builddir)/plugin/dot_layout/.libs/libgvplugin_dot_layout_C.a \
-+@WITH_MYLIBGD_FALSE@@WITH_PANGOCAIRO_FALSE@	$(top_builddir)/plugin/neato_layout/.libs/libgvplugin_neato_layout_C.a \
-+@WITH_MYLIBGD_FALSE@@WITH_PANGOCAIRO_FALSE@	$(top_builddir)/plugin/core/.libs/libgvplugin_core_C.a \
-+@WITH_MYLIBGD_FALSE@@WITH_PANGOCAIRO_FALSE@	$(top_builddir)/plugin/gd/.libs/libgvplugin_gd_C.a \
-+@WITH_MYLIBGD_FALSE@@WITH_PANGOCAIRO_FALSE@	$(top_builddir)/lib/gvc/libgvc_C.la \
-+@WITH_MYLIBGD_FALSE@@WITH_PANGOCAIRO_FALSE@	$(top_builddir)/lib/pathplan/libpathplan_C.la \
-+@WITH_MYLIBGD_FALSE@@WITH_PANGOCAIRO_FALSE@	$(top_builddir)/lib/graph/libgraph_C.la \
-+@WITH_MYLIBGD_FALSE@@WITH_PANGOCAIRO_FALSE@	$(top_builddir)/lib/cdt/libcdt_C.la
-+@WITH_MYLIBGD_FALSE@@WITH_PANGOCAIRO_TRUE@dot_static_DEPENDENCIES = $(top_builddir)/plugin/dot_layout/.libs/libgvplugin_dot_layout_C.a \
-+@WITH_MYLIBGD_FALSE@@WITH_PANGOCAIRO_TRUE@	$(top_builddir)/plugin/neato_layout/.libs/libgvplugin_neato_layout_C.a \
-+@WITH_MYLIBGD_FALSE@@WITH_PANGOCAIRO_TRUE@	$(top_builddir)/plugin/core/.libs/libgvplugin_core_C.a \
-+@WITH_MYLIBGD_FALSE@@WITH_PANGOCAIRO_TRUE@	$(top_builddir)/plugin/gd/.libs/libgvplugin_gd_C.a \
-+@WITH_MYLIBGD_FALSE@@WITH_PANGOCAIRO_TRUE@	$(top_builddir)/plugin/pango/.libs/libgvplugin_pango_C.a \
-+@WITH_MYLIBGD_FALSE@@WITH_PANGOCAIRO_TRUE@	$(top_builddir)/lib/gvc/libgvc_C.la \
-+@WITH_MYLIBGD_FALSE@@WITH_PANGOCAIRO_TRUE@	$(top_builddir)/lib/pathplan/libpathplan_C.la \
-+@WITH_MYLIBGD_FALSE@@WITH_PANGOCAIRO_TRUE@	$(top_builddir)/lib/graph/libgraph_C.la \
-+@WITH_MYLIBGD_FALSE@@WITH_PANGOCAIRO_TRUE@	$(top_builddir)/lib/cdt/libcdt_C.la
- @WITH_MYLIBGD_TRUE@@WITH_PANGOCAIRO_FALSE@dot_static_DEPENDENCIES = $(top_builddir)/plugin/dot_layout/.libs/libgvplugin_dot_layout_C.a \
- @WITH_MYLIBGD_TRUE@@WITH_PANGOCAIRO_FALSE@	$(top_builddir)/plugin/neato_layout/.libs/libgvplugin_neato_layout_C.a \
- @WITH_MYLIBGD_TRUE@@WITH_PANGOCAIRO_FALSE@	$(top_builddir)/plugin/core/.libs/libgvplugin_core_C.a \
-@@ -447,17 +463,28 @@
- # like $(top_srcdir)/lib/gvc/dot_builtins.c
- dot_static_SOURCES = dot.c $(top_srcdir)/lib/gvc/no_demand_loading.c
- dot_static_LDFLAGS = -export-dynamic -dlpreopen self -export-symbols-regex '.*_LTX_library'
--@WITH_MYLIBGD_FALSE@dot_static_LDADD = \
--@WITH_MYLIBGD_FALSE@	$(top_builddir)/plugin/dot_layout/.libs/libgvplugin_dot_layout_C.a \
--@WITH_MYLIBGD_FALSE@	$(top_builddir)/plugin/neato_layout/.libs/libgvplugin_neato_layout_C.a \
--@WITH_MYLIBGD_FALSE@	$(top_builddir)/plugin/core/.libs/libgvplugin_core_C.a \
--@WITH_MYLIBGD_FALSE@	$(top_builddir)/plugin/gd/.libs/libgvplugin_gd_C.a \
--@WITH_MYLIBGD_FALSE@	$(top_builddir)/plugin/pango/.libs/libgvplugin_pango_C.a \
--@WITH_MYLIBGD_FALSE@	$(top_builddir)/lib/gvc/libgvc_C.la \
--@WITH_MYLIBGD_FALSE@	$(top_builddir)/lib/pathplan/libpathplan_C.la \
--@WITH_MYLIBGD_FALSE@	$(top_builddir)/lib/graph/libgraph_C.la \
--@WITH_MYLIBGD_FALSE@	$(top_builddir)/lib/cdt/libcdt_C.la \
--@WITH_MYLIBGD_FALSE@       	@GD_LIBS@ @ICONV_LIBS@ @FONTCONFIG_LIBS@ @FREETYPE2_LIBS@ @JPEG_LIBS@ @PNG_LIBS@ @EXPAT_LIBS@ @Z_LIBS@ @LIBGEN_LIBS@ @LIBLTDL@ @SOCKET_LIBS@ @IPSEPCOLA_LIBS@ @PANGOCAIRO_LIBS@ @MATH_LIBS@
-+@WITH_MYLIBGD_FALSE@@WITH_PANGOCAIRO_FALSE@dot_static_LDADD = \
-+@WITH_MYLIBGD_FALSE@@WITH_PANGOCAIRO_FALSE@	$(top_builddir)/plugin/dot_layout/.libs/libgvplugin_dot_layout_C.a \
-+@WITH_MYLIBGD_FALSE@@WITH_PANGOCAIRO_FALSE@	$(top_builddir)/plugin/neato_layout/.libs/libgvplugin_neato_layout_C.a \
-+@WITH_MYLIBGD_FALSE@@WITH_PANGOCAIRO_FALSE@	$(top_builddir)/plugin/core/.libs/libgvplugin_core_C.a \
-+@WITH_MYLIBGD_FALSE@@WITH_PANGOCAIRO_FALSE@	$(top_builddir)/plugin/gd/.libs/libgvplugin_gd_C.a \
-+@WITH_MYLIBGD_FALSE@@WITH_PANGOCAIRO_FALSE@	$(top_builddir)/lib/gvc/libgvc_C.la \
-+@WITH_MYLIBGD_FALSE@@WITH_PANGOCAIRO_FALSE@	$(top_builddir)/lib/pathplan/libpathplan_C.la \
-+@WITH_MYLIBGD_FALSE@@WITH_PANGOCAIRO_FALSE@	$(top_builddir)/lib/graph/libgraph_C.la \
-+@WITH_MYLIBGD_FALSE@@WITH_PANGOCAIRO_FALSE@	$(top_builddir)/lib/cdt/libcdt_C.la \
-+@WITH_MYLIBGD_FALSE@@WITH_PANGOCAIRO_FALSE@       	@GD_LIBS@ @ICONV_LIBS@ @FONTCONFIG_LIBS@ @FREETYPE2_LIBS@ @JPEG_LIBS@ @PNG_LIBS@ @EXPAT_LIBS@ @Z_LIBS@ @LIBGEN_LIBS@ @LIBLTDL@ @SOCKET_LIBS@ @IPSEPCOLA_LIBS@ @PANGOCAIRO_LIBS@ @MATH_LIBS@
-+
-+@WITH_MYLIBGD_FALSE@@WITH_PANGOCAIRO_TRUE@dot_static_LDADD = \
-+@WITH_MYLIBGD_FALSE@@WITH_PANGOCAIRO_TRUE@	$(top_builddir)/plugin/dot_layout/.libs/libgvplugin_dot_layout_C.a \
-+@WITH_MYLIBGD_FALSE@@WITH_PANGOCAIRO_TRUE@	$(top_builddir)/plugin/neato_layout/.libs/libgvplugin_neato_layout_C.a \
-+@WITH_MYLIBGD_FALSE@@WITH_PANGOCAIRO_TRUE@	$(top_builddir)/plugin/core/.libs/libgvplugin_core_C.a \
-+@WITH_MYLIBGD_FALSE@@WITH_PANGOCAIRO_TRUE@	$(top_builddir)/plugin/gd/.libs/libgvplugin_gd_C.a \
-+@WITH_MYLIBGD_FALSE@@WITH_PANGOCAIRO_TRUE@	$(top_builddir)/plugin/pango/.libs/libgvplugin_pango_C.a \
-+@WITH_MYLIBGD_FALSE@@WITH_PANGOCAIRO_TRUE@	$(top_builddir)/lib/gvc/libgvc_C.la \
-+@WITH_MYLIBGD_FALSE@@WITH_PANGOCAIRO_TRUE@	$(top_builddir)/lib/pathplan/libpathplan_C.la \
-+@WITH_MYLIBGD_FALSE@@WITH_PANGOCAIRO_TRUE@	$(top_builddir)/lib/graph/libgraph_C.la \
-+@WITH_MYLIBGD_FALSE@@WITH_PANGOCAIRO_TRUE@	$(top_builddir)/lib/cdt/libcdt_C.la \
-+@WITH_MYLIBGD_FALSE@@WITH_PANGOCAIRO_TRUE@       	@GD_LIBS@ @ICONV_LIBS@ @FONTCONFIG_LIBS@ @FREETYPE2_LIBS@ @JPEG_LIBS@ @PNG_LIBS@ @EXPAT_LIBS@ @Z_LIBS@ @LIBGEN_LIBS@ @LIBLTDL@ @SOCKET_LIBS@ @IPSEPCOLA_LIBS@ @PANGOCAIRO_LIBS@ @MATH_LIBS@
- 
- @WITH_MYLIBGD_TRUE@@WITH_PANGOCAIRO_FALSE@dot_static_LDADD = \
- @WITH_MYLIBGD_TRUE@@WITH_PANGOCAIRO_FALSE@	$(top_builddir)/plugin/dot_layout/.libs/libgvplugin_dot_layout_C.a \
-@@ -485,17 +512,28 @@
- @WITH_MYLIBGD_TRUE@@WITH_PANGOCAIRO_TRUE@       	@ICONV_LIBS@ @FONTCONFIG_LIBS@ @FREETYPE2_LIBS@ @JPEG_LIBS@ @PNG_LIBS@ @EXPAT_LIBS@ @Z_LIBS@ @LIBGEN_LIBS@ @LIBLTDL@ @SOCKET_LIBS@ @IPSEPCOLA_LIBS@ @PANGOCAIRO_LIBS@ @MATH_LIBS@
- 
- dot_builtins_SOURCES = dot.c $(top_srcdir)/lib/gvc/dot_builtins.c $(top_srcdir)/lib/gvc/no_demand_loading.c
--@WITH_MYLIBGD_FALSE@dot_builtins_LDADD = \
--@WITH_MYLIBGD_FALSE@	$(top_builddir)/plugin/dot_layout/libgvplugin_dot_layout.la \
--@WITH_MYLIBGD_FALSE@	$(top_builddir)/plugin/neato_layout/libgvplugin_neato_layout.la \
--@WITH_MYLIBGD_FALSE@	$(top_builddir)/plugin/core/libgvplugin_core.la \
--@WITH_MYLIBGD_FALSE@	$(top_builddir)/plugin/gd/libgvplugin_gd.la \
--@WITH_MYLIBGD_FALSE@	$(top_builddir)/plugin/pango/libgvplugin_pango.la \
--@WITH_MYLIBGD_FALSE@	$(top_builddir)/lib/gvc/libgvc_builtins.la \
--@WITH_MYLIBGD_FALSE@	$(top_builddir)/lib/pathplan/libpathplan.la \
--@WITH_MYLIBGD_FALSE@	$(top_builddir)/lib/graph/libgraph.la \
--@WITH_MYLIBGD_FALSE@	$(top_builddir)/lib/cdt/libcdt.la \
--@WITH_MYLIBGD_FALSE@       	@GD_LIBS@ @ICONV_LIBS@ @FONTCONFIG_LIBS@ @FREETYPE2_LIBS@ @JPEG_LIBS@ @PNG_LIBS@ @EXPAT_LIBS@ @Z_LIBS@ @LIBGEN_LIBS@ @LIBLTDL@ @SOCKET_LIBS@ @IPSEPCOLA_LIBS@ @PANGOCAIRO_LIBS@ @MATH_LIBS@
-+@WITH_MYLIBGD_FALSE@@WITH_PANGOCAIRO_FALSE@dot_builtins_LDADD = \
-+@WITH_MYLIBGD_FALSE@@WITH_PANGOCAIRO_FALSE@	$(top_builddir)/plugin/dot_layout/libgvplugin_dot_layout.la \
-+@WITH_MYLIBGD_FALSE@@WITH_PANGOCAIRO_FALSE@	$(top_builddir)/plugin/neato_layout/libgvplugin_neato_layout.la \
-+@WITH_MYLIBGD_FALSE@@WITH_PANGOCAIRO_FALSE@	$(top_builddir)/plugin/core/libgvplugin_core.la \
-+@WITH_MYLIBGD_FALSE@@WITH_PANGOCAIRO_FALSE@	$(top_builddir)/plugin/gd/libgvplugin_gd.la \
-+@WITH_MYLIBGD_FALSE@@WITH_PANGOCAIRO_FALSE@	$(top_builddir)/lib/gvc/libgvc_builtins.la \
-+@WITH_MYLIBGD_FALSE@@WITH_PANGOCAIRO_FALSE@	$(top_builddir)/lib/pathplan/libpathplan.la \
-+@WITH_MYLIBGD_FALSE@@WITH_PANGOCAIRO_FALSE@	$(top_builddir)/lib/graph/libgraph.la \
-+@WITH_MYLIBGD_FALSE@@WITH_PANGOCAIRO_FALSE@	$(top_builddir)/lib/cdt/libcdt.la \
-+@WITH_MYLIBGD_FALSE@@WITH_PANGOCAIRO_FALSE@       	@GD_LIBS@ @ICONV_LIBS@ @FONTCONFIG_LIBS@ @FREETYPE2_LIBS@ @JPEG_LIBS@ @PNG_LIBS@ @EXPAT_LIBS@ @Z_LIBS@ @LIBGEN_LIBS@ @LIBLTDL@ @SOCKET_LIBS@ @IPSEPCOLA_LIBS@ @PANGOCAIRO_LIBS@ @MATH_LIBS@
-+
-+@WITH_MYLIBGD_FALSE@@WITH_PANGOCAIRO_TRUE@dot_builtins_LDADD = \
-+@WITH_MYLIBGD_FALSE@@WITH_PANGOCAIRO_TRUE@	$(top_builddir)/plugin/dot_layout/libgvplugin_dot_layout.la \
-+@WITH_MYLIBGD_FALSE@@WITH_PANGOCAIRO_TRUE@	$(top_builddir)/plugin/neato_layout/libgvplugin_neato_layout.la \
-+@WITH_MYLIBGD_FALSE@@WITH_PANGOCAIRO_TRUE@	$(top_builddir)/plugin/core/libgvplugin_core.la \
-+@WITH_MYLIBGD_FALSE@@WITH_PANGOCAIRO_TRUE@	$(top_builddir)/plugin/gd/libgvplugin_gd.la \
-+@WITH_MYLIBGD_FALSE@@WITH_PANGOCAIRO_TRUE@	$(top_builddir)/plugin/pango/libgvplugin_pango.la \
-+@WITH_MYLIBGD_FALSE@@WITH_PANGOCAIRO_TRUE@	$(top_builddir)/lib/gvc/libgvc_builtins.la \
-+@WITH_MYLIBGD_FALSE@@WITH_PANGOCAIRO_TRUE@	$(top_builddir)/lib/pathplan/libpathplan.la \
-+@WITH_MYLIBGD_FALSE@@WITH_PANGOCAIRO_TRUE@	$(top_builddir)/lib/graph/libgraph.la \
-+@WITH_MYLIBGD_FALSE@@WITH_PANGOCAIRO_TRUE@	$(top_builddir)/lib/cdt/libcdt.la \
-+@WITH_MYLIBGD_FALSE@@WITH_PANGOCAIRO_TRUE@       	@GD_LIBS@ @ICONV_LIBS@ @FONTCONFIG_LIBS@ @FREETYPE2_LIBS@ @JPEG_LIBS@ @PNG_LIBS@ @EXPAT_LIBS@ @Z_LIBS@ @LIBGEN_LIBS@ @LIBLTDL@ @SOCKET_LIBS@ @IPSEPCOLA_LIBS@ @PANGOCAIRO_LIBS@ @MATH_LIBS@
- 
- @WITH_MYLIBGD_TRUE@@WITH_PANGOCAIRO_FALSE@dot_builtins_LDADD = \
- @WITH_MYLIBGD_TRUE@@WITH_PANGOCAIRO_FALSE@	$(top_builddir)/plugin/dot_layout/libgvplugin_dot_layout.la \
diff --git a/graphics/graphviz/pkg-plist b/graphics/graphviz/pkg-plist
index 0f88a6cddc7c..056f3eb4788b 100644
--- a/graphics/graphviz/pkg-plist
+++ b/graphics/graphviz/pkg-plist
@@ -133,11 +133,10 @@ lib/graphviz/libgvplugin_neato_layout.a
 %%WITH_GUILE%%lib/graphviz/guile/libgv_guile.la
 %%WITH_GUILE%%lib/graphviz/guile/libgv_guile.so
 %%WITH_PHP%%lib/graphviz/php/gv.php
+%%WITH_PHP%%lib/graphviz/php/gv.so
 %%WITH_PHP%%lib/graphviz/php/libgv_php.a
 %%WITH_PHP%%lib/graphviz/php/libgv_php.la
 %%WITH_PHP%%lib/graphviz/php/libgv_php.so
-%%WITH_PHP%%lib/graphviz/php/php_gv.h
-lib/graphviz/tcl/gv.so
 %%WITH_TCL%%lib/graphviz/tcl/libgdtclft.a
 %%WITH_TCL%%lib/graphviz/tcl/libgdtclft.la
 %%WITH_TCL%%lib/graphviz/tcl/libgdtclft.so
@@ -157,33 +156,33 @@ lib/graphviz/tcl/gv.so
 %%WITH_TCL%%lib/graphviz/tcl/libtclplan.la
 %%WITH_TCL%%lib/graphviz/tcl/libtclplan.so
 %%WITH_TCL%%lib/graphviz/tcl/libtclplan.so.0
+%%WITH_TCL%%lib/graphviz/tcl/pkgIndex.tcl
+%%WITH_TCL%%lib/tcl%%TCL_VER%%/graphviz-%%PORTVERSION%%
 %%WITH_TK%%lib/graphviz/tcl/libtkspline.a
 %%WITH_TK%%lib/graphviz/tcl/libtkspline.la
 %%WITH_TK%%lib/graphviz/tcl/libtkspline.so
 %%WITH_TK%%lib/graphviz/tcl/libtkspline.so.0
-lib/graphviz/lua/gv.so
+%%WITH_LUA%%lib/graphviz/lua/gv.so
 %%WITH_LUA%%lib/graphviz/lua/libgv_lua.a
 %%WITH_LUA%%lib/graphviz/lua/libgv_lua.la
 %%WITH_LUA%%lib/graphviz/lua/libgv_lua.so
-lib/graphviz/perl/gv.so
+%%WITH_PERL%%lib/graphviz/perl/gv.so
 %%WITH_PERL%%lib/graphviz/perl/gv.pm
 %%WITH_PERL%%lib/graphviz/perl/libgv_perl.a
 %%WITH_PERL%%lib/graphviz/perl/libgv_perl.la
 %%WITH_PERL%%lib/graphviz/perl/libgv_perl.so
-lib/graphviz/python/_gv.so
-lib/graphviz/python23/_gv.so
-lib/graphviz/python24/_gv.so
-lib/graphviz/python25/_gv.so
+%%WITH_PYTHON%%lib/graphviz/python/_gv.so
 %%WITH_PYTHON%%lib/graphviz/python/gv.py
 %%WITH_PYTHON%%lib/graphviz/python/libgv_python.a
 %%WITH_PYTHON%%lib/graphviz/python/libgv_python.la
 %%WITH_PYTHON%%lib/graphviz/python/libgv_python.so
-lib/graphviz/r/gv.so
-lib/graphviz/ruby/gv.so
+%%WITH_PYTHON%%%%PYTHON_LIBDIR%%/site-packages/_gv.so
+%%WITH_PYTHON%%%%PYTHON_LIBDIR%%/site-packages/gv.py
+%%WITH_RUBY%%lib/graphviz/ruby/gv.so
 %%WITH_RUBY%%lib/graphviz/ruby/libgv_ruby.a
 %%WITH_RUBY%%lib/graphviz/ruby/libgv_ruby.la
 %%WITH_RUBY%%lib/graphviz/ruby/libgv_ruby.so
-lib/graphviz/pkgIndex.tcl
+%%WITH_RUBY%%%%RUBY_SITEARCHLIBDIR%%/gv.so
 libdata/pkgconfig/libcdt.pc
 libdata/pkgconfig/libgraph.pc
 libdata/pkgconfig/libagraph.pc
@@ -214,6 +213,7 @@ libdata/pkgconfig/libgvc_builtins.pc
 %%PORTDOCS%%%%DOCSDIR%%/html/a_forward.gif
 %%PORTDOCS%%%%DOCSDIR%%/html/a_halfopen.gif
 %%PORTDOCS%%%%DOCSDIR%%/html/box.gif
+%%PORTDOCS%%%%DOCSDIR%%/html/box3d.gif
 %%PORTDOCS%%%%DOCSDIR%%/html/a_inv.gif
 %%PORTDOCS%%%%DOCSDIR%%/html/a_invdot.gif
 %%PORTDOCS%%%%DOCSDIR%%/html/a_invempty.gif
@@ -266,6 +266,8 @@ libdata/pkgconfig/libgvc_builtins.pc
 %%PORTDOCS%%%%DOCSDIR%%/html/back.gif
 %%PORTDOCS%%%%DOCSDIR%%/html/both.gif
 %%PORTDOCS%%%%DOCSDIR%%/html/circle.gif
+%%PORTDOCS%%%%DOCSDIR%%/html/colorlist.gif
+%%PORTDOCS%%%%DOCSDIR%%/html/component.gif
 %%PORTDOCS%%%%DOCSDIR%%/html/constraint.gif
 %%PORTDOCS%%%%DOCSDIR%%/html/diamond.gif
 %%PORTDOCS%%%%DOCSDIR%%/html/doublecircle.gif
@@ -273,6 +275,7 @@ libdata/pkgconfig/libgvc_builtins.pc
 %%PORTDOCS%%%%DOCSDIR%%/html/egg.gif
 %%PORTDOCS%%%%DOCSDIR%%/html/ellipse.gif
 %%PORTDOCS%%%%DOCSDIR%%/html/fill.gif
+%%PORTDOCS%%%%DOCSDIR%%/html/folder.gif
 %%PORTDOCS%%%%DOCSDIR%%/html/forward.gif
 %%PORTDOCS%%%%DOCSDIR%%/html/hexagon.gif
 %%PORTDOCS%%%%DOCSDIR%%/html/house.gif
@@ -284,8 +287,9 @@ libdata/pkgconfig/libgvc_builtins.pc
 %%PORTDOCS%%%%DOCSDIR%%/html/invtrapezium.gif
 %%PORTDOCS%%%%DOCSDIR%%/html/invtriangle.gif
 %%PORTDOCS%%%%DOCSDIR%%/html/mrecord.gif
-%%PORTDOCS%%%%DOCSDIR%%/html/none.gif
 %%PORTDOCS%%%%DOCSDIR%%/html/nohead.gif
+%%PORTDOCS%%%%DOCSDIR%%/html/none.gif
+%%PORTDOCS%%%%DOCSDIR%%/html/note.gif
 %%PORTDOCS%%%%DOCSDIR%%/html/octagon.gif
 %%PORTDOCS%%%%DOCSDIR%%/html/parallelogram.gif
 %%PORTDOCS%%%%DOCSDIR%%/html/pentagon.gif
@@ -297,6 +301,7 @@ libdata/pkgconfig/libgvc_builtins.pc
 %%PORTDOCS%%%%DOCSDIR%%/html/rectangle.gif
 %%PORTDOCS%%%%DOCSDIR%%/html/round.gif
 %%PORTDOCS%%%%DOCSDIR%%/html/septagon.gif
+%%PORTDOCS%%%%DOCSDIR%%/html/tab.gif
 %%PORTDOCS%%%%DOCSDIR%%/html/trapezium.gif
 %%PORTDOCS%%%%DOCSDIR%%/html/triangle.gif
 %%PORTDOCS%%%%DOCSDIR%%/html/tripleoctagon.gif
@@ -342,12 +347,12 @@ libdata/pkgconfig/libgvc_builtins.pc
 %%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%%/entities.tcl
+%%EXAMPLESDIR%%/entities.tcl.README
+%%EXAMPLESDIR%%/doted.tcl
+%%EXAMPLESDIR%%/doted.tcl.README
+%%EXAMPLESDIR%%/gcat.tcl
+%%EXAMPLESDIR%%/gcat.tcl.README
 %%EXAMPLESDIR%%/pathplan_data/boxes.dat
 %%EXAMPLESDIR%%/pathplan_data/dpd.dat
 %%EXAMPLESDIR%%/pathplan_data/funny.dat
@@ -360,10 +365,16 @@ libdata/pkgconfig/libgvc_builtins.pc
 %%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
+%%EXAMPLESDIR%%/pathplan.tcl
+%%EXAMPLESDIR%%/pathplan.tcl.README
+%%EXAMPLESDIR%%/spline.tcl
+%%EXAMPLESDIR%%/spline.tcl.README
+%%WITH_LUA%%%%DATADIR%%/demo/modgraph.lua
+%%WITH_PERL%%%%DATADIR%%/demo/modgraph.pl
+%%WITH_PHP%%%%DATADIR%%/demo/modgraph.php
+%%WITH_PYTHON%%%%DATADIR%%/demo/modgraph.py
+%%WITH_RUBY%%%%DATADIR%%/demo/modgraph.rb
+%%WITH_TCL%%%%DATADIR%%/demo/modgraph.tcl
 %%DATADIR%%/lefty/box.lefty
 %%DATADIR%%/lefty/def.lefty
 %%DATADIR%%/lefty/fractal.lefty
@@ -432,22 +443,28 @@ libdata/pkgconfig/libgvc_builtins.pc
 %%DATADIR%%/graphs/undirected/process.dot
 %%DATADIR%%/graphs/undirected/Heawood.dot
 %%DATADIR%%/graphs/undirected/Petersen.dot
-%%PORTDOCS%%@dirrm %%DOCSDIR%%/html
-%%PORTDOCS%%@dirrm %%DOCSDIR%%/pdf
-%%PORTDOCS%%@dirrm %%DOCSDIR%%
-@dirrm %%EXAMPLESDIR%%/pathplan_data
-@dirrm %%EXAMPLESDIR%%
+@exec mkdir -p %D/lib/graphviz/R
 @exec mkdir -p %D/lib/graphviz/guile
+@exec mkdir -p %D/lib/graphviz/io
+@exec mkdir -p %D/lib/graphviz/lua
 @exec mkdir -p %D/lib/graphviz/java
 @exec mkdir -p %D/lib/graphviz/ocaml
+@exec mkdir -p %D/lib/graphviz/perl
 @exec mkdir -p %D/lib/graphviz/php
+@exec mkdir -p %D/lib/graphviz/python25
+@exec mkdir -p %D/lib/graphviz/python24
+@exec mkdir -p %D/lib/graphviz/python23
+@exec mkdir -p %D/lib/graphviz/python
+@exec mkdir -p %D/lib/graphviz/ruby
 @exec mkdir -p %D/lib/graphviz/sharp
-@dirrm %%DATADIR%%/graphs/directed
-@dirrm %%DATADIR%%/graphs/undirected
-@dirrm %%DATADIR%%/graphs
-@dirrm %%DATADIR%%/lefty
-@dirrm %%DATADIR%%
+@exec mkdir -p %D/lib/graphviz/tcl
+@exec mkdir -p %D/%%DATADIR%%/demo
+@exec mkdir -p %D/%%DATADIR%%/examples
+@exec mkdir -p %D/%%DATADIR%%/gui
+@exec mkdir -p %D/%%DATADIR%%/icons
+@dirrm lib/graphviz/R
 @dirrm lib/graphviz/guile
+@dirrm lib/graphviz/io
 @dirrm lib/graphviz/java
 @dirrm lib/graphviz/lua
 @dirrm lib/graphviz/ocaml
@@ -457,10 +474,22 @@ libdata/pkgconfig/libgvc_builtins.pc
 @dirrm lib/graphviz/python24
 @dirrm lib/graphviz/python23
 @dirrm lib/graphviz/python
-@dirrm lib/graphviz/r
 @dirrm lib/graphviz/ruby
 @dirrm lib/graphviz/sharp
 @dirrm lib/graphviz/tcl
-@dirrm lib/graphviz/io
 @dirrm lib/graphviz
 @dirrm include/graphviz
+@dirrm %%DATADIR%%/demo
+@dirrm %%DATADIR%%/examples
+@dirrm %%DATADIR%%/gui
+@dirrm %%DATADIR%%/icons
+@dirrm %%DATADIR%%/graphs/directed
+@dirrm %%DATADIR%%/graphs/undirected
+@dirrm %%DATADIR%%/graphs
+@dirrm %%DATADIR%%/lefty
+@dirrm %%DATADIR%%
+@dirrm %%EXAMPLESDIR%%/pathplan_data
+@dirrm %%EXAMPLESDIR%%
+%%PORTDOCS%%@dirrm %%DOCSDIR%%/html
+%%PORTDOCS%%@dirrm %%DOCSDIR%%/pdf
+%%PORTDOCS%%@dirrm %%DOCSDIR%%