- update to 2.16.1

4 files changed, 156 insertions, 4 deletions

diff --git a/graphics/graphviz/Makefile b/graphics/graphviz/Makefile
index b6b5ff4..f677b12 100644
--- a/graphics/graphviz/Makefile
+++ b/graphics/graphviz/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	graphviz
-PORTVERSION=	2.16
+PORTVERSION=	2.16.1
 CATEGORIES=	graphics tk84
 MASTER_SITES=	http://www.graphviz.org/pub/graphviz/ARCHIVE/ \
 		http://mirror.inerd.com/FreeBSD/distfiles/${PORTNAME}/
@@ -24,6 +24,7 @@ LIB_DEPENDS+=	jpeg.9:${PORTSDIR}/graphics/jpeg \
 USE_BISON=	build
 USE_GMAKE=	yes
 USE_AUTOTOOLS=	libltdl:15 libtool:15
+WANT_GNOME=	yes
 GNU_CONFIGURE=	yes
 LDFLAGS+=	-L${LOCALBASE}/lib -L${X11BASE}/lib
 CPPFLAGS+=	-I${X11BASE}/include -I${LOCALBASE}/include -I${TCL_INCLUDEDIR} -I${TK_INCLUDEDIR}
@@ -87,6 +88,7 @@ OPTIONS=	TK "Build with TK support" on \
 
 CONFIGURE_ARGS+=	--program-transform-name="s/x/x/" \
 		--enable-dependency-tracking \
+		--enable-r=no \
 		--with-libgd \
 		--with-fontconfigincludedir=${X11BASE}/include \
 		--with-fontconfiglibdir=${X11BASE}/lib \
diff --git a/graphics/graphviz/distinfo b/graphics/graphviz/distinfo
index 7ba9bb8..84a387e 100644
--- a/graphics/graphviz/distinfo
+++ b/graphics/graphviz/distinfo
@@ -1,3 +1,3 @@
-MD5 (graphviz-2.16.tar.gz) = c8cac2c66a52e37a2be9290d4f38e525
-SHA256 (graphviz-2.16.tar.gz) = 5cacd8fdc3a8a63e85d6cdcb4376849742fcd36ea11258cbe13fc2f1224f0423
-SIZE (graphviz-2.16.tar.gz) = 8068186
+MD5 (graphviz-2.16.1.tar.gz) = 8952fb2a627b38e38ed429a3a9d5cc5c
+SHA256 (graphviz-2.16.1.tar.gz) = 32c1a185ba39961935f104cc47d2bceea327c0de8c5636edc6ab83ac3c0c56d1
+SIZE (graphviz-2.16.1.tar.gz) = 8076271
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 0000000..c8ab768
--- /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 \
diff --git a/graphics/graphviz/pkg-plist b/graphics/graphviz/pkg-plist
index 60698a7..1ceccb7 100644
--- a/graphics/graphviz/pkg-plist
+++ b/graphics/graphviz/pkg-plist
@@ -178,6 +178,7 @@ lib/graphviz/python25/_gv.so
 %%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_RUBY%%lib/graphviz/ruby/libgv_ruby.a
 %%WITH_RUBY%%lib/graphviz/ruby/libgv_ruby.la
@@ -456,6 +457,7 @@ 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