Fix dynamic linkage (again). Fix a segmentation fault when the config

file can't be opened for write. Fix guile option.

Bump revision.

18 files changed, 278 insertions, 3 deletions

diff --git a/graphics/graphviz/PLIST b/graphics/graphviz/PLIST
index 1eb5b58ea39..06f1857fe9a 100644
--- a/graphics/graphviz/PLIST
+++ b/graphics/graphviz/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.21 2008/03/10 12:37:59 wiz Exp $
+@comment $NetBSD: PLIST,v 1.22 2008/03/11 15:46:57 joerg Exp $
 bin/acyclic
 bin/bcomps
 bin/ccomps
@@ -56,6 +56,7 @@ lib/graphviz/libgvplugin_dot_layout.la
 lib/graphviz/libgvplugin_gd.la
 ${GTK}lib/graphviz/libgvplugin_gdk_pixbuf.la
 ${GTK}lib/graphviz/libgvplugin_gtk.la
+${TCL}${GUILE}lib/graphviz/guile/libgv_guile.la
 lib/graphviz/libgvplugin_neato_layout.la
 lib/graphviz/libgvplugin_pango.la
 lib/graphviz/libgvplugin_xlib.la
@@ -121,6 +122,7 @@ man/man3/gvc.3
 man/man3/pathplan.3
 man/man7/graphviz.7
 ${TCL}man/mann/gdtclft.n
+${TCL}${GUILE}man/mann/gv_guile.n
 ${TCL}${LUA}man/mann/gv_lua.n
 ${TCL}${LUA}man/mann/gv_tcl.n
 ${TCL}man/mann/tcldot.n
diff --git a/graphics/graphviz/distinfo b/graphics/graphviz/distinfo
index 27189ee8470..9e5f4dafe36 100644
--- a/graphics/graphviz/distinfo
+++ b/graphics/graphviz/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.26 2008/02/06 18:56:52 adam Exp $
+$NetBSD: distinfo,v 1.27 2008/03/11 15:46:57 joerg Exp $
 
 SHA1 (graphviz-2.16.1.tar.gz) = 46b704bd9b81922bcd17167c88f3278a9645e894
 RMD160 (graphviz-2.16.1.tar.gz) = 6d0f23fa176a1bef7ee0ca48cf1b700fe6cbfb42
@@ -8,3 +8,18 @@ SHA1 (patch-ab) = 0d3ac34e473d346ee8c1e2bd058165745c2f9258
 SHA1 (patch-ac) = 3ef2ea7bea573463cfa722fc3bfa9d18dde141c2
 SHA1 (patch-ad) = 5bbdfb6ad55ef76abfbc70105ad08fb0dc7a3792
 SHA1 (patch-ae) = da929ffd3d736aa5607a59ce325012563b16a994
+SHA1 (patch-af) = 2079dfdbc65afb742412b31e7d5c3e7cfab5c7ec
+SHA1 (patch-ag) = d8095ac59b5d28e8653029a1aecf67e4a2039ce6
+SHA1 (patch-ah) = 000b13d6fffa2a155cfb81250044754ab903a4cc
+SHA1 (patch-ai) = 9a248d8f367ce2afffbe567b5f7549f50b72b43a
+SHA1 (patch-aj) = 590f7e41ad5d611458f18b42639d3bc035037249
+SHA1 (patch-ak) = ddcc83faa3881691dd36bcb83ee1ee3fea9d947f
+SHA1 (patch-al) = 541be1e4efd013684840b71e57181bb2e603cbb5
+SHA1 (patch-am) = 0ac59e3e67226112aee3aed76492c28c22281d2e
+SHA1 (patch-an) = 7651e0034a6196569cd6b1a43df1a003ec875643
+SHA1 (patch-ao) = 77f58bd320552c6111c288b332df6ba189eaf7ad
+SHA1 (patch-ap) = 41d7731c86cb5cb27676e69765ea8fe5831c4bbb
+SHA1 (patch-aq) = 7a14a748784d8e887a8449b649dab96b1bf7462c
+SHA1 (patch-ar) = 44e5fdf98c8a86e2c17faca7d88df11c801a68fc
+SHA1 (patch-as) = cf7408ba799ba70f7404205d99be950eb1d67d79
+SHA1 (patch-at) = 2d9880b76536596dfadaf98cc1aa00aed1abd70c
diff --git a/graphics/graphviz/options.mk b/graphics/graphviz/options.mk
index 9d981ba623b..7aa7e47b457 100644
--- a/graphics/graphviz/options.mk
+++ b/graphics/graphviz/options.mk
@@ -1,4 +1,4 @@
-# $NetBSD: options.mk,v 1.1 2008/02/06 18:56:52 adam Exp $
+# $NetBSD: options.mk,v 1.2 2008/03/11 15:46:57 joerg Exp $
 
 PKG_OPTIONS_VAR=	PKG_OPTIONS.graphviz
 PKG_SUPPORTED_OPTIONS=	guile lua ocaml swig tcl gtk
@@ -9,8 +9,10 @@ PKG_SUGGESTED_OPTIONS=	lua swig tcl
 .if !empty(PKG_OPTIONS:Mguile)
 .include "../../lang/guile/buildlink3.mk"
 CONFIGURE_ARGS+=	--enable-guile
+PLIST_SUBST+=		GUILE=""
 .else
 CONFIGURE_ARGS+=	--disable-guile
+PLIST_SUBST+=		GUILE="@comment "
 .endif
 
 .if !empty(PKG_OPTIONS:Mlua)
diff --git a/graphics/graphviz/patches/patch-af b/graphics/graphviz/patches/patch-af
new file mode 100644
index 00000000000..c53e14348f9
--- /dev/null
+++ b/graphics/graphviz/patches/patch-af
@@ -0,0 +1,13 @@
+$NetBSD: patch-af,v 1.11 2008/03/11 15:46:57 joerg Exp $
+
+--- lib/gvc/Makefile.am.orig	2008-03-11 04:40:27.000000000 +0100
++++ lib/gvc/Makefile.am
+@@ -40,7 +40,7 @@ libgvc_la_LIBADD = $(libgvc_C_la_LIBADD)
+ 	$(top_builddir)/lib/cdt/libcdt.la \
+ 	$(top_builddir)/lib/graph/libgraph.la \
+ 	$(top_builddir)/lib/pathplan/libpathplan.la \
+-	@EXPAT_LIBS@ @Z_LIBS@
++	@EXPAT_LIBS@ @Z_LIBS@ -lm
+ 
+ #For use without plugins.
+ #  so it needs to be linked with a preset table of builtins, e.g. dot_builtins.c,
diff --git a/graphics/graphviz/patches/patch-ag b/graphics/graphviz/patches/patch-ag
new file mode 100644
index 00000000000..f0742425a46
--- /dev/null
+++ b/graphics/graphviz/patches/patch-ag
@@ -0,0 +1,13 @@
+$NetBSD: patch-ag,v 1.11 2008/03/11 15:46:57 joerg Exp $
+
+--- lib/gvc/Makefile.in.orig	2008-03-11 04:40:48.000000000 +0100
++++ lib/gvc/Makefile.in
+@@ -422,7 +422,7 @@ libgvc_la_LIBADD = $(libgvc_C_la_LIBADD)
+ 	$(top_builddir)/lib/cdt/libcdt.la \
+ 	$(top_builddir)/lib/graph/libgraph.la \
+ 	$(top_builddir)/lib/pathplan/libpathplan.la \
+-	@EXPAT_LIBS@ @Z_LIBS@
++	@EXPAT_LIBS@ @Z_LIBS@ -lm
+ 
+ 
+ #For use without plugins.
diff --git a/graphics/graphviz/patches/patch-ah b/graphics/graphviz/patches/patch-ah
new file mode 100644
index 00000000000..27baeaf3626
--- /dev/null
+++ b/graphics/graphviz/patches/patch-ah
@@ -0,0 +1,15 @@
+$NetBSD: patch-ah,v 1.10 2008/03/11 15:46:57 joerg Exp $
+
+--- plugin/core/Makefile.am.orig	2008-03-11 04:50:50.000000000 +0100
++++ plugin/core/Makefile.am
+@@ -25,7 +25,9 @@ libgvplugin_core_C_la_SOURCES = \
+ 
+ libgvplugin_core_la_LDFLAGS = -version-info @GVPLUGIN_VERSION_INFO@
+ libgvplugin_core_la_SOURCES = $(libgvplugin_core_C_la_SOURCES)
+-libgvplugin_core_la_LIBADD = $(top_builddir)/lib/gvc/libgvc.la
++libgvplugin_core_la_LIBADD = $(top_builddir)/lib/gvc/libgvc.la \
++    $(top_builddir)/lib/cgraph/libcgraph.la \
++    $(top_builddir)/lib/graph/libgraph.la
+ 
+ EXTRA_DIST = Makefile.old
+ 
diff --git a/graphics/graphviz/patches/patch-ai b/graphics/graphviz/patches/patch-ai
new file mode 100644
index 00000000000..0b81b427ca5
--- /dev/null
+++ b/graphics/graphviz/patches/patch-ai
@@ -0,0 +1,15 @@
+$NetBSD: patch-ai,v 1.12 2008/03/11 15:46:57 joerg Exp $
+
+--- plugin/core/Makefile.in.orig	2008-03-11 04:50:53.000000000 +0100
++++ plugin/core/Makefile.in
+@@ -380,7 +380,9 @@ libgvplugin_core_C_la_SOURCES = \
+ 
+ libgvplugin_core_la_LDFLAGS = -version-info @GVPLUGIN_VERSION_INFO@
+ libgvplugin_core_la_SOURCES = $(libgvplugin_core_C_la_SOURCES)
+-libgvplugin_core_la_LIBADD = $(top_builddir)/lib/gvc/libgvc.la
++libgvplugin_core_la_LIBADD = $(top_builddir)/lib/gvc/libgvc.la \
++    $(top_builddir)/lib/cgraph/libcgraph.la \
++    $(top_builddir)/lib/graph/libgraph.la
+ EXTRA_DIST = Makefile.old
+ all: all-am
+ 
diff --git a/graphics/graphviz/patches/patch-aj b/graphics/graphviz/patches/patch-aj
new file mode 100644
index 00000000000..bc3f24958a9
--- /dev/null
+++ b/graphics/graphviz/patches/patch-aj
@@ -0,0 +1,19 @@
+$NetBSD: patch-aj,v 1.9 2008/03/11 15:46:57 joerg Exp $
+
+--- plugin/gd/Makefile.am.orig	2008-03-11 05:22:41.000000000 +0100
++++ plugin/gd/Makefile.am
+@@ -27,10 +27,14 @@ libgvplugin_gd_la_SOURCES = $(libgvplugi
+ if WITH_MYLIBGD
+ libgvplugin_gd_la_LIBADD = \
+ 	$(top_builddir)/lib/gd/libgvgd_C.la \
++	$(top_builddir)/lib/graph/libgraph.la \
++	$(top_builddir)/lib/pathplan/libpathplan.la \
+ 	$(top_builddir)/lib/gvc/libgvc.la \
+ 	@ICONV_LIBS@ @FONTCONFIG_LIBS@ @FREETYPE2_LIBS@ @JPEG_LIBS@ @PNG_LIBS@ @EXPAT_LIBS@ @Z_LIBS@ @MATH_LIBS@
+ else
+ libgvplugin_gd_la_LIBADD = \
++	$(top_builddir)/lib/graph/libgraph.la \
++	$(top_builddir)/lib/pathplan/libpathplan.la \
+ 	$(top_builddir)/lib/gvc/libgvc.la @GD_LIBS@ @MATH_LIBS@
+ endif
+ 
diff --git a/graphics/graphviz/patches/patch-ak b/graphics/graphviz/patches/patch-ak
new file mode 100644
index 00000000000..d423f9ceaf8
--- /dev/null
+++ b/graphics/graphviz/patches/patch-ak
@@ -0,0 +1,18 @@
+$NetBSD: patch-ak,v 1.11 2008/03/11 15:46:57 joerg Exp $
+
+--- plugin/gd/Makefile.in.orig	2008-03-11 05:22:13.000000000 +0100
++++ plugin/gd/Makefile.in
+@@ -380,9 +380,13 @@ libgvplugin_gd_C_la_SOURCES = \
+ libgvplugin_gd_la_LDFLAGS = -version-info @GVPLUGIN_VERSION_INFO@
+ libgvplugin_gd_la_SOURCES = $(libgvplugin_gd_C_la_SOURCES)
+ @WITH_MYLIBGD_FALSE@libgvplugin_gd_la_LIBADD = \
++@WITH_MYLIBGD_FALSE@	$(top_builddir)/lib/graph/libgraph.la \
++@WITH_MYLIBGD_FALSE@	$(top_builddir)/lib/pathplan/libpathplan.la \
+ @WITH_MYLIBGD_FALSE@	$(top_builddir)/lib/gvc/libgvc.la @GD_LIBS@ @MATH_LIBS@
+ 
+ @WITH_MYLIBGD_TRUE@libgvplugin_gd_la_LIBADD = \
++@WITH_MYLIBGD_TRUE@	$(top_builddir)/lib/graph/libgraph.la \
++@WITH_MYLIBGD_TRUE@	$(top_builddir)/lib/pathplan/libpathplan.la \
+ @WITH_MYLIBGD_TRUE@	$(top_builddir)/lib/gd/libgvgd_C.la \
+ @WITH_MYLIBGD_TRUE@	$(top_builddir)/lib/gvc/libgvc.la \
+ @WITH_MYLIBGD_TRUE@	@ICONV_LIBS@ @FONTCONFIG_LIBS@ @FREETYPE2_LIBS@ @JPEG_LIBS@ @PNG_LIBS@ @EXPAT_LIBS@ @Z_LIBS@ @MATH_LIBS@
diff --git a/graphics/graphviz/patches/patch-al b/graphics/graphviz/patches/patch-al
new file mode 100644
index 00000000000..63946e7097a
--- /dev/null
+++ b/graphics/graphviz/patches/patch-al
@@ -0,0 +1,16 @@
+$NetBSD: patch-al,v 1.10 2008/03/11 15:46:57 joerg Exp $
+
+--- plugin/dot_layout/Makefile.am.orig	2008-03-11 05:27:35.000000000 +0100
++++ plugin/dot_layout/Makefile.am
+@@ -23,8 +23,10 @@ libgvplugin_dot_layout_C_la_LIBADD = \
+ libgvplugin_dot_layout_la_LDFLAGS = -version-info @GVPLUGIN_VERSION_INFO@
+ libgvplugin_dot_layout_la_SOURCES = $(libgvplugin_dot_layout_C_la_SOURCES)
+ libgvplugin_dot_layout_la_LIBADD = $(libgvplugin_dot_layout_C_la_LIBADD) \
++	$(top_builddir)/lib/graph/libgraph.la \
+ 	$(top_builddir)/lib/gvc/libgvc.la \
+-	$(top_builddir)/lib/pathplan/libpathplan.la
++	$(top_builddir)/lib/pathplan/libpathplan.la \
++	-lm
+ 
+ EXTRA_DIST = Makefile.old
+ 
diff --git a/graphics/graphviz/patches/patch-am b/graphics/graphviz/patches/patch-am
new file mode 100644
index 00000000000..216765f0ba1
--- /dev/null
+++ b/graphics/graphviz/patches/patch-am
@@ -0,0 +1,16 @@
+$NetBSD: patch-am,v 1.12 2008/03/11 15:46:57 joerg Exp $
+
+--- plugin/dot_layout/Makefile.in.orig	2008-03-11 05:25:53.000000000 +0100
++++ plugin/dot_layout/Makefile.in
+@@ -381,8 +381,10 @@ libgvplugin_dot_layout_C_la_LIBADD = \
+ libgvplugin_dot_layout_la_LDFLAGS = -version-info @GVPLUGIN_VERSION_INFO@
+ libgvplugin_dot_layout_la_SOURCES = $(libgvplugin_dot_layout_C_la_SOURCES)
+ libgvplugin_dot_layout_la_LIBADD = $(libgvplugin_dot_layout_C_la_LIBADD) \
++	$(top_builddir)/lib/graph/libgraph.la \
+ 	$(top_builddir)/lib/gvc/libgvc.la \
+-	$(top_builddir)/lib/pathplan/libpathplan.la
++	$(top_builddir)/lib/pathplan/libpathplan.la \
++	-lm
+ 
+ EXTRA_DIST = Makefile.old
+ all: all-am
diff --git a/graphics/graphviz/patches/patch-an b/graphics/graphviz/patches/patch-an
new file mode 100644
index 00000000000..e3b04f5e896
--- /dev/null
+++ b/graphics/graphviz/patches/patch-an
@@ -0,0 +1,16 @@
+$NetBSD: patch-an,v 1.9 2008/03/11 15:46:57 joerg Exp $
+
+--- plugin/neato_layout/Makefile.am.orig	2008-03-11 05:29:54.000000000 +0100
++++ plugin/neato_layout/Makefile.am
+@@ -26,7 +26,10 @@ libgvplugin_neato_layout_C_la_LIBADD = \
+ libgvplugin_neato_layout_la_LDFLAGS = -version-info @GVPLUGIN_VERSION_INFO@
+ libgvplugin_neato_layout_la_SOURCES = $(libgvplugin_neato_layout_C_la_SOURCES)
+ libgvplugin_neato_layout_la_LIBADD = $(libgvplugin_neato_layout_C_la_LIBADD) \
++	$(top_builddir)/lib/cdt/libcdt.la \
++	$(top_builddir)/lib/graph/libgraph.la \
+ 	$(top_builddir)/lib/gvc/libgvc.la \
+-	$(top_builddir)/lib/pathplan/libpathplan.la @IPSEPCOLA_LIBS@
++	$(top_builddir)/lib/pathplan/libpathplan.la @IPSEPCOLA_LIBS@ \
++	-lm
+ 
+ EXTRA_DIST = Makefile.old
diff --git a/graphics/graphviz/patches/patch-ao b/graphics/graphviz/patches/patch-ao
new file mode 100644
index 00000000000..1deedb20474
--- /dev/null
+++ b/graphics/graphviz/patches/patch-ao
@@ -0,0 +1,17 @@
+$NetBSD: patch-ao,v 1.11 2008/03/11 15:46:57 joerg Exp $
+
+--- plugin/neato_layout/Makefile.in.orig	2008-03-11 05:28:19.000000000 +0100
++++ plugin/neato_layout/Makefile.in
+@@ -387,8 +387,11 @@ libgvplugin_neato_layout_C_la_LIBADD = \
+ libgvplugin_neato_layout_la_LDFLAGS = -version-info @GVPLUGIN_VERSION_INFO@
+ libgvplugin_neato_layout_la_SOURCES = $(libgvplugin_neato_layout_C_la_SOURCES)
+ libgvplugin_neato_layout_la_LIBADD = $(libgvplugin_neato_layout_C_la_LIBADD) \
++	$(top_builddir)/lib/cdt/libcdt.la \
++	$(top_builddir)/lib/graph/libgraph.la \
+ 	$(top_builddir)/lib/gvc/libgvc.la \
+-	$(top_builddir)/lib/pathplan/libpathplan.la @IPSEPCOLA_LIBS@
++	$(top_builddir)/lib/pathplan/libpathplan.la @IPSEPCOLA_LIBS@ \
++	-lm
+ 
+ EXTRA_DIST = Makefile.old
+ all: all-am
diff --git a/graphics/graphviz/patches/patch-ap b/graphics/graphviz/patches/patch-ap
new file mode 100644
index 00000000000..8c5c80500ff
--- /dev/null
+++ b/graphics/graphviz/patches/patch-ap
@@ -0,0 +1,12 @@
+$NetBSD: patch-ap,v 1.10 2008/03/11 15:46:57 joerg Exp $
+
+--- lib/gvc/gvconfig.c.orig	2008-03-11 06:01:47.000000000 +0100
++++ lib/gvc/gvconfig.c
+@@ -584,6 +584,7 @@ void gvconfig(GVC_t * gvc, boolean resca
+     	f = fopen(gvc->config_path,"r");
+     	if (!f) {
+     	    agerr (AGERR,"failed to open %s for read.\n", gvc->config_path);
++	    exit(1);
+     	}
+     	else {
+     	    config_text = gmalloc(config_st.st_size + 1);
diff --git a/graphics/graphviz/patches/patch-aq b/graphics/graphviz/patches/patch-aq
new file mode 100644
index 00000000000..530544fd190
--- /dev/null
+++ b/graphics/graphviz/patches/patch-aq
@@ -0,0 +1,14 @@
+$NetBSD: patch-aq,v 1.10 2008/03/11 15:46:57 joerg Exp $
+
+--- tclpkg/tcldot/Makefile.am.orig	2008-03-11 15:59:16.000000000 +0100
++++ tclpkg/tcldot/Makefile.am
+@@ -75,7 +75,8 @@ libtcldot_builtin_la_LIBADD = \
+ 	$(top_builddir)/lib/gvc/libgvc_C.la \
+ 	$(top_builddir)/lib/graph/libgraph_C.la \
+ 	$(top_builddir)/lib/cdt/libcdt_C.la \
+-	$(top_builddir)/lib/pathplan/libpathplan_C.la
++	$(top_builddir)/lib/pathplan/libpathplan_C.la \
++	-ltcl84
+ 
+ if WITH_PANGOCAIRO
+ libtcldot_builtin_la_LIBADD += $(top_builddir)/plugin/pango/libgvplugin_pango_C.la @PANGOCAIRO_LIBS@
diff --git a/graphics/graphviz/patches/patch-ar b/graphics/graphviz/patches/patch-ar
new file mode 100644
index 00000000000..50ff8958be6
--- /dev/null
+++ b/graphics/graphviz/patches/patch-ar
@@ -0,0 +1,21 @@
+$NetBSD: patch-ar,v 1.8 2008/03/11 15:46:57 joerg Exp $
+
+--- tclpkg/tcldot/Makefile.in.orig	2008-03-11 15:58:50.000000000 +0100
++++ tclpkg/tcldot/Makefile.in
+@@ -457,11 +457,11 @@ libtcldot_builtin_la_LIBADD =  \
+ 	$(top_builddir)/lib/gvc/libgvc_C.la \
+ 	$(top_builddir)/lib/graph/libgraph_C.la \
+ 	$(top_builddir)/lib/cdt/libcdt_C.la \
+-	$(top_builddir)/lib/pathplan/libpathplan_C.la $(am__append_4) \
+-	$(am__append_5) $(am__append_6) $(am__append_7) \
+-	$(am__append_8) @ICONV_LIBS@ @EXPAT_LIBS@ @LIBGEN_LIBS@ \
+-	@LIBLTDL@ @SOCKET_LIBS@ @IPSEPCOLA_LIBS@ @MATH_LIBS@ \
+-	$(am__empty)
++	$(top_builddir)/lib/pathplan/libpathplan_C.la -ltcl84 \
++	$(am__append_4) $(am__append_5) $(am__append_6) \
++	$(am__append_7) $(am__append_8) @ICONV_LIBS@ @EXPAT_LIBS@ \
++	@LIBGEN_LIBS@ @LIBLTDL@ @SOCKET_LIBS@ @IPSEPCOLA_LIBS@ \
++	@MATH_LIBS@ $(am__empty)
+ EXTRA_DIST = $(man) $(pdf) $(html) README README.Tkspline Makefile.old
+ CLEANFILES = pkgIndex.tcl
+ DISTCLEANFILES = $(pdf)
diff --git a/graphics/graphviz/patches/patch-as b/graphics/graphviz/patches/patch-as
new file mode 100644
index 00000000000..764c9f9b9c0
--- /dev/null
+++ b/graphics/graphviz/patches/patch-as
@@ -0,0 +1,26 @@
+$NetBSD: patch-as,v 1.10 2008/03/11 15:46:57 joerg Exp $
+
+--- tclpkg/gv/Makefile.am.orig	2008-03-11 16:07:00.000000000 +0100
++++ tclpkg/gv/Makefile.am
+@@ -14,8 +14,10 @@ AM_CPPFLAGS = \
+ LIBS =  @LIBS@ -lc
+ 
+ BASESOURCES = gv.cpp gv.i
+-BASELIBS = $(top_builddir)/lib/gvc/libgvc.la
+-
++BASELIBS = $(top_builddir)/lib/gvc/libgvc.la \
++	$(top_builddir)/lib/cgraph/libcgraph.la \
++	$(top_builddir)/lib/graph/libgraph.la \
++	$(top_builddir)/lib/cdt/libcdt.la
+ pkgsharpdir = $(pkglibdir)/sharp
+ SHARP_data = gv.cs gvPINVOKE.cs SWIGTYPE_p_Agraph_t.cs SWIGTYPE_p_Agnode_t.cs SWIGTYPE_p_Agedge_t.cs SWIGTYPE_p_Agsym_t.cs SWIGTYPE_p_FILE.cs
+ nodist_libgv_sharp_la_SOURCES = gv_sharp.cpp $(SHARP_data)
+@@ -30,7 +32,7 @@ pkgguiledir = $(pkglibdir)/guile
+ GUILE_data = 
+ nodist_libgv_guile_la_SOURCES = gv_guile.cpp $(GUILE_data)
+ libgv_guile_la_SOURCES = $(BASESOURCES) gv_dummy_init.cpp
+-libgv_guile_la_LIBADD = $(BASELIBS) @GUILE_LIBS@
++libgv_guile_la_LIBADD = $(BASELIBS) @GUILE_LIBS@ -lguile
+ libgv_guile_la_LDFLAGS = -module -avoid-version
+ $(GUILE_data): gv_guile.cpp
+ gv_guile.cpp: gv.i
diff --git a/graphics/graphviz/patches/patch-at b/graphics/graphviz/patches/patch-at
new file mode 100644
index 00000000000..8672fd34543
--- /dev/null
+++ b/graphics/graphviz/patches/patch-at
@@ -0,0 +1,25 @@
+$NetBSD: patch-at,v 1.8 2008/03/11 15:46:57 joerg Exp $
+
+--- tclpkg/gv/Makefile.in.orig	2008-03-11 16:07:03.000000000 +0100
++++ tclpkg/gv/Makefile.in
+@@ -628,7 +628,10 @@ AM_CPPFLAGS = \
+ 	-I$(top_srcdir)/lib/pathplan $(GUILE_INCLUDES) $(LUA_INCLUDES) $(OCAML_INCLUDES) $(PERL_INCLUDES) $(PHP_INCLUDES) $(PYTHON_INCLUDES) $(R_CFLAGS) $(RUBY_INCLUDES) $(TCL_INCLUDES)
+ 
+ BASESOURCES = gv.cpp gv.i
+-BASELIBS = $(top_builddir)/lib/gvc/libgvc.la
++BASELIBS = $(top_builddir)/lib/gvc/libgvc.la \
++	$(top_builddir)/lib/cgraph/libcgraph.la \
++	$(top_builddir)/lib/graph/libgraph.la \
++	$(top_builddir)/lib/cdt/libcdt.la
+ pkgsharpdir = $(pkglibdir)/sharp
+ SHARP_data = gv.cs gvPINVOKE.cs SWIGTYPE_p_Agraph_t.cs SWIGTYPE_p_Agnode_t.cs SWIGTYPE_p_Agedge_t.cs SWIGTYPE_p_Agsym_t.cs SWIGTYPE_p_FILE.cs
+ nodist_libgv_sharp_la_SOURCES = gv_sharp.cpp $(SHARP_data)
+@@ -639,7 +642,7 @@ pkgguiledir = $(pkglibdir)/guile
+ GUILE_data = 
+ nodist_libgv_guile_la_SOURCES = gv_guile.cpp $(GUILE_data)
+ libgv_guile_la_SOURCES = $(BASESOURCES) gv_dummy_init.cpp
+-libgv_guile_la_LIBADD = $(BASELIBS) @GUILE_LIBS@
++libgv_guile_la_LIBADD = $(BASELIBS) @GUILE_LIBS@ -lguile
+ libgv_guile_la_LDFLAGS = -module -avoid-version
+ pkgiodir = $(pkglibdir)/io
+ IO_data =