- update to 2.16.1

1 files changed, 148 insertions, 0 deletions

diff --git a/graphics/graphviz/files/patch-cmd-dot-Makefile.in b/graphics/graphviz/files/patch-cmd-dot-Makefile.in
new file mode 100644
index 000000000000..c8ab768fdc1d
--- /dev/null
+++ b/graphics/graphviz/files/patch-cmd-dot-Makefile.in
@@ -0,0 +1,148 @@
+--- 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 \