- update to 2.12

- cleaned USE_LDCONFIG
- full support for external GD library
- added OPTIONS support for swig and language bindings for (default none): perl php python ruby tcl lua guile
- added OPTIONS support for pangocairo (requires gtk, not selected by default)
PR:		109600
Submitted by:	Martin Matuska

6 files changed, 262 insertions, 106 deletions

diff --git a/graphics/graphviz/Makefile b/graphics/graphviz/Makefile
index 7e3033335e1b..a10f8fc3770b 100644
--- a/graphics/graphviz/Makefile
+++ b/graphics/graphviz/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	graphviz
-PORTVERSION=	2.8
+PORTVERSION=	2.12
 CATEGORIES=	graphics tk84
 MASTER_SITES=	http://www.graphviz.org/pub/graphviz/ARCHIVE/ \
 		http://mirror.inerd.com/FreeBSD/distfiles/${PORTNAME}/
@@ -14,15 +14,13 @@ MASTER_SITES=	http://www.graphviz.org/pub/graphviz/ARCHIVE/ \
 MAINTAINER=	dinoex@FreeBSD.org
 COMMENT=	Graph Visualization Software from AT&T and Bell Labs
 
-LIB_DEPENDS=	jpeg.9:${PORTSDIR}/graphics/jpeg		\
+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_TCL=	84
 USE_TK=		84
 USE_BISON=	yes
 USE_GMAKE=	yes
@@ -30,29 +28,15 @@ USE_ICONV=	yes
 USE_XPM=	yes
 USE_AUTOTOOLS=	libltdl:15 libtool:15
 GNU_CONFIGURE=	yes
-CONFIGURE_ENV=	CPPFLAGS="-I${X11BASE}/include -I${LOCALBASE}/include -I${TCL_INCLUDEDIR} -I${TK_INCLUDEDIR}" \
-		LDFLAGS="-L${LOCALBASE}/lib -L${X11BASE}/lib"	\
-		TCLCONFIG=${TCL_LIBDIR}/tclConfig.sh		\
-		TKCONFIG=${TK_LIBDIR}/tkConfig.sh		\
-		MISSING=${TRUE}
-CONFIGURE_ARGS=	--program-transform-name="s/x/x/"		\
-		--enable-dependency-tracking			\
-		--with-mylibgd					\
-		--with-iconvlibdir=${LOCALBASE}/lib		\
-		--with-tclsh=${TCLSH}				\
-		--with-wish=${WISH}				\
-		--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
+LDFLAGS+=	-L${LOCALBASE}/lib -L${X11BASE}/lib
+CPPFLAGS+=	-I${X11BASE}/include -I${LOCALBASE}/include -I${TCL_INCLUDEDIR} -I${TK_INCLUDEDIR}
+
 MAKE_ENV=	EXPR_COMPAT=yes MISSING=${TRUE}
 
 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
+MAN3=		agraph.3 cdt.3 expr.3 graph.3 gvc.3 pathplan.3
 MANN=		gdtclft.n tcldot.n tkspline.n
 MLINKS=		dot.1 circo.1		\
 		gxl2dot.1 dot2gxl.1	\
@@ -68,12 +52,126 @@ PDOCS_TXT=	AUTHORS NEWS ChangeLog cpl1.0.txt doc/Dot.ref doc/latex_suggestions.t
 PDOCS_PDF=	doc/*.pdf */*/*.pdf
 PDOCS_HTML=	doc/*.html doc/info/*.html doc/info/*.gif
 
-INSTALLS_SHLIB=	yes
-LDCONFIG_DIRS=	%%PREFIX%%/lib/${PORTNAME}
 USE_LDCONFIG=	${PREFIX}/lib/${PORTNAME}
 
+OPTIONS=	PANGOCAIRO "build with pangocairo support (gtk)" off \
+		PERL "Perl bindings (swig)" off \
+		PHP "PHP bindings (swig)" off \
+		PYTHON "Python bindings (swig)" off \
+		RUBY "Ruby bindings (swig)" off \
+		LUA "Lua bindings (swig)" off \
+		TCL "TCL bindings (swig)" off \
+		GUILE "Guile bindings (swig)" off
+
 .include <bsd.port.pre.mk>
-.include "${PORTSDIR}/misc/ldconfig_compat/bsd.ldconfig.mk"
+
+CONFIGURE_ARGS=	--program-transform-name="s/x/x/"		\
+		--enable-dependency-tracking			\
+		--with-iconvlibdir=${LOCALBASE}/lib		\
+		--with-libgd					\
+		--with-tclsh=${TCLSH}				\
+		--with-wish=${WISH}				\
+		--with-fontconfigincludedir=${X11BASE}/include	\
+		--with-fontconfiglibdir=${X11BASE}/lib 		\
+		--disable-io --disable-ocaml --disable-java	\
+		--disable-sharp
+
+CONFIGURE_ENV=	CFLAGS="${CFLAGS}"			\
+		CPPFLAGS="${CPPFLAGS}"	 		\
+		LDFLAGS="${LDFLAGS}"			\
+		TCLCONFIG="${TCL_LIBDIR}/tclConfig.sh"	\
+		TKCONFIG="${TK_LIBDIR}/tkConfig.sh"	\
+		MISSING=${TRUE}
+
+.if !defined(WITH_PANGOCAIRO)
+CONFIGURE_ARGS+=	--with-pangocairo=no
+PLIST_SUB+=		WITH_PANGOCAIRO="@comment "
+.else
+CONFIGURE_ARGS+=	--with-gtk --with-pangocairo
+PLIST_SUB+=		WITH_PANGOCAIRO=""
+USE_GNOME=	gtk20 pango
+.include "${PORTSDIR}/Mk/bsd.gnome.mk"
+.endif
+
+.if defined(WITH_PERL) || defined(WITH_PHP) || defined(WITH_PYTHON) || \
+    defined(WITH_RUBY) || defined(WITH_LUA) || defined(WITH_TCL) || defined(WITH_GUILE)
+BUILD_DEPENDS+=		swig1.3:${PORTSDIR}/devel/swig13
+RUN_DEPENDS+=		swig1.3:${PORTSDIR}/devel/swig13
+CONFIGURE_ARGS+= 	--enable-swig
+CONFIGURE_ENV+=		SWIG="${LOCALBASE}/bin/swig1.3"
+.else
+CONFIGURE_ARGS+=	--disable-swig
+.endif
+
+. if !defined(WITH_PERL)
+CONFIGURE_ARGS+=	--disable-perl
+PLIST_SUB+=		WITH_PERL="@comment "
+. else
+CONFIGURE_ARGS+=	--enable-perl
+PLIST_SUB+=		WITH_PERL=""
+USE_PERL5=	yes
+. endif
+
+. if !defined(WITH_PHP)
+CONFIGURE_ARGS+=	--disable-php
+PLIST_SUB+=		WITH_PHP="@comment "
+. else
+CONFIGURE_ARGS+=	--enable-php
+PLIST_SUB+=		WITH_PHP=""
+USE_PHP_BUILD=	yes
+CPPFLAGS+=		-I${LOCALBASE}/include/php/Zend
+. endif
+
+. if !defined(WITH_PYTHON)
+CONFIGURE_ARGS+=	--disable-python
+PLIST_SUB+=		WITH_PYTHON="@comment "
+. else
+CONFIGURE_ARGS+=	--enable-python
+PLIST_SUB+=		WITH_PYTHON=""
+USE_PYTHON_BUILD=	yes
+.include "${PORTSDIR}/Mk/bsd.python.mk"
+LDFLAGS+=		"-L${PYTHON_LIBDIR}"
+. endif
+
+. if !defined(WITH_RUBY)
+CONFIGURE_ARGS+=	--disable-ruby
+PLIST_SUB+=		WITH_RUBY="@comment "
+. else
+CONFIGURE_ARGS+=	--enable-ruby
+PLIST_SUB+=		WITH_RUBY=""
+USE_RUBY=	yes
+.include "${PORTSDIR}/Mk/bsd.ruby.mk"
+. endif
+
+. if !defined(WITH_LUA)
+CONFIGURE_ARGS+=	--disable-lua
+PLIST_SUB+=		WITH_LUA="@comment "
+. else
+CONFIGURE_ARGS+=	--enable-lua
+PLIST_SUB+=		WITH_LUA=""
+USE_LUA=		yes
+.include "${PORTSDIR}/Mk/bsd.lua.mk"
+CPPFLAGS+=		-I${LUA_INCDIR}
+LDFLAGS+=		-L${LUA_LIBDIR}
+CONFIGURE_ENV+=		LUA="${LUA_BINDIR}/lua"
+. endif
+
+. if !defined(WITH_TCL)
+CONFIGURE_ARGS+=	--disable-tcl
+PLIST_SUB+=		WITH_TCL="@comment "
+. else
+CONFIGURE_ARGS+=	--enable-tcl
+PLIST_SUB+=		WITH_TCL=""
+. endif
+
+. if !defined(WITH_GUILE)
+CONFIGURE_ARGS+=	--disable-guile
+PLIST_SUB+=		WITH_GUILE="@comment "
+. else
+CONFIGURE_ARGS+=	--enable-guile
+PLIST_SUB+=		WITH_GUILE=""
+LIB_DEPENDS+=		guile.15:${PORTSDIR}/lang/guile
+. endif
 
 pre-patch:
 	@${FIND} ${WRKSRC} -name Makefile.in | ${XARGS}					\
@@ -90,9 +188,11 @@ pre-patch:
 	                  ${WRKSRC}/cmd/tools/Makefile.in			\
 	                  ${WRKSRC}/cmd/gvpr/Makefile.in
 
-.if ${OSVERSION} < 500000
-	@${REINPLACE_CMD} 's|-Wno-unused-parameter||g' ${WRKSRC}/configure
-.endif
+	@${FIND} ${WRKSRC}/lib -name 'Makefile.in' | ${XARGS}				\
+	  ${REINPLACE_CMD} -e 's|libdir = @libdir@|libdir = @libdir@/graphviz|g';
+
+	@${REINPLACE_CMD} -e "s|/usr/include/php|${LOCALBASE}/include/php|g" \
+		-e "s|-lruby|-lruby${RUBY_SUFFIX}|g" ${WRKSRC}/configure
 
 post-install-script:
 	${INSTALL_MAN} ${WRKSRC}/tclpkg/gdtclft/gdtclft.n   ${MANNPREFIX}/man/mann
diff --git a/graphics/graphviz/distinfo b/graphics/graphviz/distinfo
index 7d85e215d561..164b463a95cd 100644
--- a/graphics/graphviz/distinfo
+++ b/graphics/graphviz/distinfo
@@ -1,3 +1,3 @@
-MD5 (graphviz-2.8.tar.gz) = ca921b4a9bcd86da4a1092bb17a57d83
-SHA256 (graphviz-2.8.tar.gz) = be0c4b7e49f7c226c68d54bb47018f3b3bfb51bb992f5ad71da875cad13367ca
-SIZE (graphviz-2.8.tar.gz) = 4243130
+MD5 (graphviz-2.12.tar.gz) = e5547bc0ec47943c72f5c3e2b5dff58f
+SHA256 (graphviz-2.12.tar.gz) = 5191892d7950c28754659f703234f7888f132440a049f0d396f287b202f9e37f
+SIZE (graphviz-2.12.tar.gz) = 4607023
diff --git a/graphics/graphviz/files/patch-configure b/graphics/graphviz/files/patch-configure
index 5898e7d8f0d0..e69de29bb2d1 100644
--- a/graphics/graphviz/files/patch-configure
+++ b/graphics/graphviz/files/patch-configure
@@ -1,11 +0,0 @@
---- 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"
- 	            ;;
--                *alpha*-*-linux* )
-+                *alpha*-*-* )
-                     CFLAGS="${CFLAGS} -mieee -Wall"
-                     ;;
- 	        *-apple-darwin* )
diff --git a/graphics/graphviz/files/patch-contrib-diffimg-Makefile.in b/graphics/graphviz/files/patch-contrib-diffimg-Makefile.in
new file mode 100644
index 000000000000..424082843f47
--- /dev/null
+++ b/graphics/graphviz/files/patch-contrib-diffimg-Makefile.in
@@ -0,0 +1,26 @@
+--- contrib/diffimg/Makefile.in.orig	Mon Feb 26 16:39:29 2007
++++ contrib/diffimg/Makefile.in	Mon Feb 26 16:41:47 2007
+@@ -54,8 +54,8 @@
+ PROGRAMS = $(noinst_PROGRAMS)
+ am_diffimg_OBJECTS = diffimg.$(OBJEXT)
+ diffimg_OBJECTS = $(am_diffimg_OBJECTS)
+-@WITH_LIBGD_TRUE@diffimg_DEPENDENCIES =  \
+-@WITH_LIBGD_TRUE@	$(top_builddir)/lib/gd/libgvgd_C.la
++@WITH_MYLIBGD_TRUE@diffimg_DEPENDENCIES =  \
++@WITH_MYLIBGD_TRUE@	$(top_builddir)/lib/gd/libgvgd_C.la
+ DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir)
+ depcomp = $(SHELL) $(top_srcdir)/config/depcomp
+ am__depfiles_maybe = depfiles
+@@ -367,9 +367,9 @@
+ target_alias = @target_alias@
+ AM_CPPFLAGS = @GD_INCLUDES@
+ diffimg_SOURCES = diffimg.c
+-@WITH_LIBGD_FALSE@diffimg_LDADD = @GD_LIBS@
+-@WITH_LIBGD_TRUE@diffimg_LDADD = $(top_builddir)/lib/gd/libgvgd_C.la \
+-@WITH_LIBGD_TRUE@	@FC_LIBS@ @FT_LIBS@ @JPEG_LIBS@ @PNG_LIBS@ @Z_LIBS@ @MATH_LIBS@
++@WITH_LIBGD_TRUE@diffimg_LDADD = @GD_LIBS@
++@WITH_MYLIBGD_TRUE@diffimg_LDADD = $(top_builddir)/lib/gd/libgvgd_C.la \
++@WITH_MYLIBGD_TRUE@	@FC_LIBS@ @FT_LIBS@ @JPEG_LIBS@ @PNG_LIBS@ @Z_LIBS@ @MATH_LIBS@
+ 
+ GRAPH = "digraph G { hello -> world }"
+ CLEANFILES = *.png
diff --git a/graphics/graphviz/files/patch-tools::sfio::sfhdr.h b/graphics/graphviz/files/patch-tools::sfio::sfhdr.h
deleted file mode 100644
index d03db3e894bb..000000000000
--- a/graphics/graphviz/files/patch-tools::sfio::sfhdr.h
+++ /dev/null
@@ -1,23 +0,0 @@
---- 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>
- 
-+#ifndef va_copy
-+#define va_copy(to,fr) ((to)=(fr))
-+#endif
-+
- #if vt_threaded
- 
- /* initialization */
-@@ -230,7 +234,9 @@
- #endif
- 
- #if _hdr_values
-+#ifdef HAVE_VALUES_H
- #include	<values.h>
-+#endif
- #if !defined(SF_MAXDOUBLE) && defined(MAXDOUBLE)
- #define SF_MAXDOUBLE	MAXDOUBLE
- #endif
diff --git a/graphics/graphviz/pkg-plist b/graphics/graphviz/pkg-plist
index 0c14ac87ed2d..50bbb90b4a33 100644
--- a/graphics/graphviz/pkg-plist
+++ b/graphics/graphviz/pkg-plist
@@ -1,6 +1,5 @@
 bin/dot
 bin/dot2gxl
-bin/dot_static
 bin/circo
 bin/fdp
 bin/gc
@@ -24,6 +23,8 @@ bin/dotty
 bin/prune
 include/graphviz/ast_common.h
 include/graphviz/cdt.h
+include/graphviz/demand_loading.c
+include/graphviz/dot_builtins.c
 include/graphviz/dthdr.h
 include/graphviz/graph.h
 include/graphviz/libgraph.h
@@ -33,26 +34,16 @@ include/graphviz/agxbuf.h
 include/graphviz/aghdr.h
 include/graphviz/agraph.h
 include/graphviz/malloc.h
+include/graphviz/no_demand_loading.c
 include/graphviz/vmstub.h
 include/graphviz/grammar.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/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/textpara.h
+include/graphviz/usershape.h
 include/graphviz/vis.h
 include/graphviz/vispath.h
 include/graphviz/logic.h
@@ -63,14 +54,15 @@ include/graphviz/types.h
 include/graphviz/globals.h
 include/graphviz/gvc.h
 include/graphviz/gvcext.h
+include/graphviz/gvcommon.h
 include/graphviz/gvplugin.h
 include/graphviz/gvcjob.h
 include/graphviz/gvcint.h
 include/graphviz/gvplugin_render.h
 include/graphviz/gvplugin_layout.h
+include/graphviz/gvplugin_loadimage.h
 include/graphviz/gvplugin_textlayout.h
 include/graphviz/gvplugin_device.h
-include/graphviz/gvplugin_usershape.h
 include/graphviz/pack.h
 include/graphviz/exlib.h
 include/graphviz/exgram.h
@@ -78,65 +70,133 @@ include/graphviz/expr.h
 include/graphviz/gv.i
 include/graphviz/gv.cpp
 lib/graphviz/libcdt.so
-lib/graphviz/libcdt.so.2
+lib/graphviz/libcdt.so.3
 lib/graphviz/libcdt.la
 lib/graphviz/libcdt.a
 lib/graphviz/libgraph.so
-lib/graphviz/libgraph.so.2
+lib/graphviz/libgraph.so.3
 lib/graphviz/libgraph.la
 lib/graphviz/libgraph.a
 lib/graphviz/libagraph.so
-lib/graphviz/libagraph.so.2
+lib/graphviz/libagraph.so.3
 lib/graphviz/libagraph.la
 lib/graphviz/libagraph.a
-lib/graphviz/libgvgd.so
-lib/graphviz/libgvgd.so.2
-lib/graphviz/libgvgd.la
-lib/graphviz/libgvgd.a
 lib/graphviz/libpathplan.so
-lib/graphviz/libpathplan.so.2
+lib/graphviz/libpathplan.so.3
 lib/graphviz/libpathplan.la
 lib/graphviz/libpathplan.a
 lib/graphviz/libgvc.so
-lib/graphviz/libgvc.so.2
+lib/graphviz/libgvc.so.3
 lib/graphviz/libgvc.la
 lib/graphviz/libgvc.a
 lib/graphviz/libgvc_builtins.so
-lib/graphviz/libgvc_builtins.so.2
+lib/graphviz/libgvc_builtins.so.3
 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.so.3
 lib/graphviz/libexpr.la
 lib/graphviz/libexpr.a
-lib/graphviz/libgvplugin_neato_layout.so
-lib/graphviz/libgvplugin_neato_layout.so.2
-lib/graphviz/libgvplugin_neato_layout.la
-lib/graphviz/libgvplugin_neato_layout.a
+lib/graphviz/libgvplugin_core.so
+lib/graphviz/libgvplugin_core.so.3
+lib/graphviz/libgvplugin_core.la
+lib/graphviz/libgvplugin_core.a
 lib/graphviz/libgvplugin_dot_layout.so
-lib/graphviz/libgvplugin_dot_layout.so.2
+lib/graphviz/libgvplugin_dot_layout.so.3
 lib/graphviz/libgvplugin_dot_layout.la
 lib/graphviz/libgvplugin_dot_layout.a
-lib/graphviz/libgvplugin_usershape_gd.so
-lib/graphviz/libgvplugin_usershape_gd.so.2
-lib/graphviz/libgvplugin_usershape_gd.la
-lib/graphviz/libgvplugin_usershape_gd.a
+lib/graphviz/libgvplugin_gd.so
+lib/graphviz/libgvplugin_gd.so.3
+lib/graphviz/libgvplugin_gd.la
+lib/graphviz/libgvplugin_gd.a
+%%WITH_PANGOCAIRO%%lib/graphviz/libgvplugin_gtk.a
+%%WITH_PANGOCAIRO%%lib/graphviz/libgvplugin_gtk.la
+%%WITH_PANGOCAIRO%%lib/graphviz/libgvplugin_gtk.so
+%%WITH_PANGOCAIRO%%lib/graphviz/libgvplugin_gtk.so.3
+lib/graphviz/libgvplugin_neato_layout.so
+lib/graphviz/libgvplugin_neato_layout.so.3
+lib/graphviz/libgvplugin_neato_layout.la
+lib/graphviz/libgvplugin_neato_layout.a
+lib/graphviz/libgvplugin_pango.so
+lib/graphviz/libgvplugin_pango.so.3
+lib/graphviz/libgvplugin_pango.la
+lib/graphviz/libgvplugin_pango.a
+%%WITH_PANGOCAIRO%%lib/graphviz/libgvplugin_xlib.a
+%%WITH_PANGOCAIRO%%lib/graphviz/libgvplugin_xlib.la
+%%WITH_PANGOCAIRO%%lib/graphviz/libgvplugin_xlib.so
+%%WITH_PANGOCAIRO%%lib/graphviz/libgvplugin_xlib.so.3
+%%WITH_GUILE%%/lib/graphviz/guile/gv_guile.man
+%%WITH_GUILE%%/lib/graphviz/guile/libgv_guile.a
+%%WITH_GUILE%%/lib/graphviz/guile/libgv_guile.la
+%%WITH_GUILE%%/lib/graphviz/guile/libgv_guile.so
+%%WITH_GUILE%%/lib/graphviz/guile/libgv_guile.so.0
+%%WITH_PHP%%/lib/graphviz/php/gv.php
+%%WITH_PHP%%/lib/graphviz/php/gv_php.man
+%%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/libgv_php.so.0
+%%WITH_PHP%%/lib/graphviz/php/php_gv.h
 lib/graphviz/tcl/gv.so
+%%WITH_TCL%%lib/graphviz/tcl/gv_tcl.man
+%%WITH_TCL%%lib/graphviz/tcl/libgdtclft.a
+%%WITH_TCL%%lib/graphviz/tcl/libgdtclft.la
+%%WITH_TCL%%lib/graphviz/tcl/libgdtclft.so
+%%WITH_TCL%%lib/graphviz/tcl/libgdtclft.so.0
+%%WITH_TCL%%lib/graphviz/tcl/libgv_tcl.a
+%%WITH_TCL%%lib/graphviz/tcl/libgv_tcl.la
+%%WITH_TCL%%lib/graphviz/tcl/libgv_tcl.so
+%%WITH_TCL%%lib/graphviz/tcl/libgv_tcl.so.0
+%%WITH_TCL%%lib/graphviz/tcl/libtcldot.a
+%%WITH_TCL%%lib/graphviz/tcl/libtcldot.la
+%%WITH_TCL%%lib/graphviz/tcl/libtcldot.so
+%%WITH_TCL%%lib/graphviz/tcl/libtcldot.so.0
+%%WITH_TCL%%lib/graphviz/tcl/libtcldot_builtin.a
+%%WITH_TCL%%lib/graphviz/tcl/libtcldot_builtin.la
+%%WITH_TCL%%lib/graphviz/tcl/libtcldot_builtin.so
+%%WITH_TCL%%lib/graphviz/tcl/libtcldot_builtin.so.0
+%%WITH_TCL%%lib/graphviz/tcl/libtclplan.a
+%%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/libtkspline.a
+%%WITH_TCL%%lib/graphviz/tcl/libtkspline.la
+%%WITH_TCL%%lib/graphviz/tcl/libtkspline.so
+%%WITH_TCL%%lib/graphviz/tcl/libtkspline.so.0
 lib/graphviz/lua/gv.so
+%%WITH_LUA%%/lib/graphviz/lua/gv_lua.man
+%%WITH_LUA%%/lib/graphviz/lua/libgv_lua.a
+%%WITH_LUA%%/lib/graphviz/lua/libgv_lua.la
+%%WITH_LUA%%/lib/graphviz/lua/libgv_lua.so
+%%WITH_LUA%%/lib/graphviz/lua/libgv_lua.so.0
 lib/graphviz/perl/gv.so
+%%WITH_PERL%%lib/graphviz/perl/gv.pm
+%%WITH_PERL%%lib/graphviz/perl/gv_perl.man
+%%WITH_PERL%%lib/graphviz/perl/libgv_perl.a
+%%WITH_PERL%%lib/graphviz/perl/libgv_perl.la
+%%WITH_PERL%%lib/graphviz/perl/libgv_perl.so
+%%WITH_PERL%%lib/graphviz/perl/libgv_perl.so.0
 lib/graphviz/python/_gv.so
+%%WITH_PYTHON%%lib/graphviz/python/gv.py
+%%WITH_PYTHON%%lib/graphviz/python/gv_python.man
+%%WITH_PYTHON%%lib/graphviz/python/libgv_python.a
+%%WITH_PYTHON%%lib/graphviz/python/libgv_python.la
+%%WITH_PYTHON%%lib/graphviz/python/libgv_python.so
+%%WITH_PYTHON%%lib/graphviz/python/libgv_python.so.0
 lib/graphviz/ruby/gv.so
-lib/graphviz/config
+%%WITH_RUBY%%lib/graphviz/ruby/gv_ruby.man
+%%WITH_RUBY%%lib/graphviz/ruby/libgv_ruby.a
+%%WITH_RUBY%%lib/graphviz/ruby/libgv_ruby.la
+%%WITH_RUBY%%lib/graphviz/ruby/libgv_ruby.so
+%%WITH_RUBY%%lib/graphviz/ruby/libgv_ruby.so.0
 lib/graphviz/pkgIndex.tcl
 libdata/pkgconfig/libcdt.pc
 libdata/pkgconfig/libgraph.pc
 libdata/pkgconfig/libagraph.pc
 libdata/pkgconfig/libpathplan.pc
 libdata/pkgconfig/libgvc.pc
+libdata/pkgconfig/libgvc_builtins.pc
+libdata/pkgconfig/libexpr.pc
 %%PORTDOCS%%%%DOCSDIR%%/html/FAQ.html
 %%PORTDOCS%%%%DOCSDIR%%/html/build.html
 %%PORTDOCS%%%%DOCSDIR%%/html/index.html
@@ -224,10 +284,13 @@ libdata/pkgconfig/libgvc.pc
 %%PORTDOCS%%%%DOCSDIR%%/html/house.gif
 %%PORTDOCS%%%%DOCSDIR%%/html/html1.gif
 %%PORTDOCS%%%%DOCSDIR%%/html/html2.gif
+%%PORTDOCS%%%%DOCSDIR%%/html/html3.gif
+%%PORTDOCS%%%%DOCSDIR%%/html/html4.gif
 %%PORTDOCS%%%%DOCSDIR%%/html/invhouse.gif
 %%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/octagon.gif
 %%PORTDOCS%%%%DOCSDIR%%/html/parallelogram.gif
@@ -257,6 +320,7 @@ libdata/pkgconfig/libgvc.pc
 %%PORTDOCS%%%%DOCSDIR%%/pdf/ccomps.pdf
 %%PORTDOCS%%%%DOCSDIR%%/pdf/dijkstra.pdf
 %%PORTDOCS%%%%DOCSDIR%%/pdf/gc.pdf
+%%PORTDOCS%%%%DOCSDIR%%/pdf/gvc.pdf
 %%PORTDOCS%%%%DOCSDIR%%/pdf/gvcolor.pdf
 %%PORTDOCS%%%%DOCSDIR%%/pdf/gvpack.pdf
 %%PORTDOCS%%%%DOCSDIR%%/pdf/gxl2dot.pdf
@@ -269,7 +333,6 @@ libdata/pkgconfig/libgvc.pc
 %%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
@@ -400,5 +463,6 @@ libdata/pkgconfig/libgvc.pc
 @dirrm lib/graphviz/ruby
 @dirrm lib/graphviz/sharp
 @dirrm lib/graphviz/tcl
+@dirrm lib/graphviz/io
 @dirrm lib/graphviz
 @dirrm include/graphviz