- 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

1 files changed, 105 insertions, 41 deletions

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