21 files changed, 163 insertions, 303 deletions
diff --git a/graphics/graphviz/Makefile b/graphics/graphviz/Makefile
index 504301f1e0c..197714abe06 100644
--- a/graphics/graphviz/Makefile
+++ b/graphics/graphviz/Makefile
@@ -1,7 +1,6 @@
-# $NetBSD: Makefile,v 1.60 2007/09/25 13:59:21 wiz Exp $
+# $NetBSD: Makefile,v 1.61 2008/02/06 18:56:52 adam Exp $
 
-DISTNAME=	graphviz-2.12
-PKGREVISION=	5
+DISTNAME=	graphviz-2.16.1
 CATEGORIES=	graphics
 MASTER_SITES=	http://www.graphviz.org/pub/graphviz/ARCHIVE/
 
@@ -20,17 +19,20 @@ USE_LANGUAGES=		c c++
 USE_LIBTOOL=		yes
 USE_TOOLS+=		pkg-config
 GNU_CONFIGURE=		yes
-CONFIGURE_ARGS+=	--without-gtk
-CONFIGURE_ARGS+=	--disable-sharp --disable-python --disable-perl --disable-ruby
-CONFIGURE_ENV+=		TCLCONFIG=${TCLCONFIG_SH:Q}
-CONFIGURE_ENV+=		TKCONFIG=${TKCONFIG_SH:Q}
-CONFIGURE_ENV+=		X11PREFIX=${X11PREFIX:Q} X11BASE=${X11BASE:Q}
+CONFIGURE_ARGS+=	--disable-java
+CONFIGURE_ARGS+=	--disable-perl
+CONFIGURE_ARGS+=	--disable-php
+CONFIGURE_ARGS+=	--disable-python
+CONFIGURE_ARGS+=	--disable-ruby
+CONFIGURE_ARGS+=	--disable-sharp
+CONFIGURE_ENV+=		X11PREFIX=${X11PREFIX} X11BASE=${X11BASE}
 # build fails when PHP and/or Ruby are also installed
 CONFIGURE_ENV+=		ac_cv_prog_PHP=
 CONFIGURE_ENV+=		ac_cv_prog_RUBY=
 CPPFLAGS+=		-DNO_POSTSCRIPT_ALIAS=1
 PKGCONFIG_OVERRIDE=	lib/agraph/libagraph.pc.in
 PKGCONFIG_OVERRIDE+=	lib/cdt/libcdt.pc.in
+PKGCONFIG_OVERRIDE+=	lib/cgraph/libcgraph.pc.in
 PKGCONFIG_OVERRIDE+=	lib/expr/libexpr.pc.in
 PKGCONFIG_OVERRIDE+=	lib/graph/libgraph.pc.in
 PKGCONFIG_OVERRIDE+=	lib/gvc/libgvc.pc.in
@@ -49,18 +51,20 @@ BUILDLINK_TRANSFORM+=	rm:-Wno-unused-parameter
 pre-build:
 	touch ${WRKSRC}/Makefile
 
+.include "options.mk"
+
 .include "../../converters/libiconv/buildlink3.mk"
 .include "../../devel/gettext-lib/buildlink3.mk"
 .include "../../devel/libltdl/convenience.mk"
 .include "../../devel/pango/buildlink3.mk"
-.include "../../devel/swig/buildlink3.mk"
-.include "../../lang/lua/buildlink3.mk"
+#.include "../../devel/swig/buildlink3.mk"
+#.include "../../lang/lua/buildlink3.mk"
 .include "../../graphics/gd/buildlink3.mk"
 .include "../../graphics/jpeg/buildlink3.mk"
 .include "../../graphics/png/buildlink3.mk"
 .include "../../textproc/expat/buildlink3.mk"
 .include "../../x11/libXp/buildlink3.mk"
-.include "../../x11/tk/buildlink3.mk"
+#.include "../../x11/tk/buildlink3.mk"
 .include "../../mk/xaw.buildlink3.mk"
 .include "../../mk/pthread.buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/graphics/graphviz/PLIST b/graphics/graphviz/PLIST
index 204a3224cec..7e646b620d8 100644
--- a/graphics/graphviz/PLIST
+++ b/graphics/graphviz/PLIST
@@ -1,8 +1,9 @@
-@comment $NetBSD: PLIST,v 1.19 2007/09/25 20:13:36 joerg Exp $
+@comment $NetBSD: PLIST,v 1.20 2008/02/06 18:56:52 adam Exp $
 bin/acyclic
 bin/bcomps
 bin/ccomps
 bin/circo
+bin/diffimg
 bin/dijkstra
 bin/dot
 bin/dot2gxl
@@ -22,28 +23,19 @@ bin/sccmap
 bin/tred
 bin/twopi
 bin/unflatten
-include/graphviz/aghdr.h
 include/graphviz/agraph.h
-include/graphviz/agxbuf.h
 include/graphviz/arith.h
-include/graphviz/ast_common.h
 include/graphviz/cdt.h
+include/graphviz/cgraph.h
 include/graphviz/color.h
 include/graphviz/demand_loading.c
 include/graphviz/dot_builtins.c
-include/graphviz/dthdr.h
-include/graphviz/exgram.h
-include/graphviz/exlib.h
-include/graphviz/expr.h
 include/graphviz/geom.h
-include/graphviz/globals.h
-include/graphviz/grammar.h
 include/graphviz/graph.h
 include/graphviz/gv.cpp
 include/graphviz/gv.i
 include/graphviz/gvc.h
 include/graphviz/gvcext.h
-include/graphviz/gvcint.h
 include/graphviz/gvcjob.h
 include/graphviz/gvcommon.h
 include/graphviz/gvplugin.h
@@ -52,55 +44,48 @@ include/graphviz/gvplugin_layout.h
 include/graphviz/gvplugin_loadimage.h
 include/graphviz/gvplugin_render.h
 include/graphviz/gvplugin_textlayout.h
-include/graphviz/libgraph.h
-include/graphviz/logic.h
-include/graphviz/malloc.h
 include/graphviz/no_demand_loading.c
 include/graphviz/pack.h
-include/graphviz/parser.h
 include/graphviz/pathgeom.h
 include/graphviz/pathplan.h
-include/graphviz/pathutil.h
-include/graphviz/solvers.h
 include/graphviz/textpara.h
-include/graphviz/tri.h
-include/graphviz/triefa.h
 include/graphviz/types.h
 include/graphviz/usershape.h
-include/graphviz/vis.h
-include/graphviz/vispath.h
-include/graphviz/vmstub.h
 lib/graphviz/libgvplugin_core.la
 lib/graphviz/libgvplugin_dot_layout.la
 lib/graphviz/libgvplugin_gd.la
+${GTK}lib/graphviz/libgvplugin_gdk_pixbuf.la
+${GTK}lib/graphviz/libgvplugin_gtk.la
 lib/graphviz/libgvplugin_neato_layout.la
 lib/graphviz/libgvplugin_pango.la
 lib/graphviz/libgvplugin_xlib.la
 lib/graphviz/lua/gv.so
-lib/graphviz/lua/gv_lua.man
-lib/graphviz/lua/libgv_lua.la
+${TCL}${LUA}lib/graphviz/lua/libgv_lua.la
 lib/graphviz/perl/gv.so
 lib/graphviz/pkgIndex.tcl
 lib/graphviz/python/_gv.so
+lib/graphviz/python23/_gv.so
+lib/graphviz/python24/_gv.so
+lib/graphviz/python25/_gv.so
+lib/graphviz/r/gv.so
 lib/graphviz/ruby/gv.so
 lib/graphviz/tcl/gv.so
-lib/graphviz/tcl/gv_tcl.man
-lib/graphviz/tcl/libgdtclft.la
-lib/graphviz/tcl/libgv_tcl.la
-lib/graphviz/tcl/libtcldot.la
-lib/graphviz/tcl/libtcldot_builtin.la
-lib/graphviz/tcl/libtclplan.la
-lib/graphviz/tcl/libtkspline.la
+${TCL}lib/graphviz/tcl/libgdtclft.la
+${TCL}${LUA}lib/graphviz/tcl/libgv_tcl.la
+${TCL}lib/graphviz/tcl/libtcldot.la
+${TCL}lib/graphviz/tcl/libtcldot_builtin.la
+${TCL}lib/graphviz/tcl/libtclplan.la
+${TCL}lib/graphviz/tcl/libtkspline.la
 lib/libagraph.la
 lib/libcdt.la
-lib/libexpr.la
+lib/libcgraph.la
 lib/libgraph.la
 lib/libgvc.la
 lib/libgvc_builtins.la
 lib/libpathplan.la
 lib/pkgconfig/libagraph.pc
 lib/pkgconfig/libcdt.pc
-lib/pkgconfig/libexpr.pc
+lib/pkgconfig/libcgraph.pc
 lib/pkgconfig/libgraph.pc
 lib/pkgconfig/libgvc.pc
 lib/pkgconfig/libgvc_builtins.pc
@@ -130,36 +115,39 @@ man/man1/twopi.1
 man/man1/unflatten.1
 man/man3/agraph.3
 man/man3/cdt.3
-man/man3/expr.3
+man/man3/cgraph.3
 man/man3/graph.3
 man/man3/gvc.3
 man/man3/pathplan.3
-man/mann/gdtclft.n
-man/mann/tcldot.n
-man/mann/tkspline.n
-share/graphviz/demo/doted
-share/graphviz/demo/doted.README
-share/graphviz/demo/entities
-share/graphviz/demo/entities.README
-share/graphviz/demo/entities.html
-share/graphviz/demo/gcat
-share/graphviz/demo/gcat.README
-share/graphviz/demo/pathplan
-share/graphviz/demo/pathplan.README
-share/graphviz/demo/pathplan_data/boxes.dat
-share/graphviz/demo/pathplan_data/dpd.dat
-share/graphviz/demo/pathplan_data/funny.dat
-share/graphviz/demo/pathplan_data/maze.dat
-share/graphviz/demo/pathplan_data/nested.dat
-share/graphviz/demo/pathplan_data/northo.dat
-share/graphviz/demo/pathplan_data/obs.dat
-share/graphviz/demo/pathplan_data/other.dat
-share/graphviz/demo/pathplan_data/paths.dat
-share/graphviz/demo/pathplan_data/rotor.dat
-share/graphviz/demo/pathplan_data/u.dat
-share/graphviz/demo/pathplan_data/unknown.dat
-share/graphviz/demo/spline
-share/graphviz/demo/spline.README
+man/man7/graphviz.7
+${TCL}man/mann/gdtclft.n
+${TCL}${LUA}man/mann/gv_lua.n
+${TCL}${LUA}man/mann/gv_tcl.n
+${TCL}man/mann/tcldot.n
+${TCL}man/mann/tkspline.n
+${TCL}share/graphviz/demo/doted
+${TCL}share/graphviz/demo/doted.README
+${TCL}share/graphviz/demo/entities
+${TCL}share/graphviz/demo/entities.README
+${TCL}share/graphviz/demo/entities.html
+${TCL}share/graphviz/demo/gcat
+${TCL}share/graphviz/demo/gcat.README
+${TCL}share/graphviz/demo/pathplan
+${TCL}share/graphviz/demo/pathplan.README
+${TCL}share/graphviz/demo/pathplan_data/boxes.dat
+${TCL}share/graphviz/demo/pathplan_data/dpd.dat
+${TCL}share/graphviz/demo/pathplan_data/funny.dat
+${TCL}share/graphviz/demo/pathplan_data/maze.dat
+${TCL}share/graphviz/demo/pathplan_data/nested.dat
+${TCL}share/graphviz/demo/pathplan_data/northo.dat
+${TCL}share/graphviz/demo/pathplan_data/obs.dat
+${TCL}share/graphviz/demo/pathplan_data/other.dat
+${TCL}share/graphviz/demo/pathplan_data/paths.dat
+${TCL}share/graphviz/demo/pathplan_data/rotor.dat
+${TCL}share/graphviz/demo/pathplan_data/u.dat
+${TCL}share/graphviz/demo/pathplan_data/unknown.dat
+${TCL}share/graphviz/demo/spline
+${TCL}share/graphviz/demo/spline.README
 share/graphviz/doc/AUTHORS
 share/graphviz/doc/COPYING
 share/graphviz/doc/ChangeLog
@@ -277,7 +265,7 @@ share/graphviz/doc/html/info/trapezium.gif
 share/graphviz/doc/html/info/triangle.gif
 share/graphviz/doc/html/info/tripleoctagon.gif
 share/graphviz/doc/html/pspdf.png
-share/graphviz/doc/html/tcldot.html
+${TCL}share/graphviz/doc/html/tcldot.html
 share/graphviz/doc/html/winbuild.html
 share/graphviz/doc/latex_suggestions.txt
 share/graphviz/doc/pdf/acyclic.pdf
@@ -285,6 +273,7 @@ share/graphviz/doc/pdf/agraph.pdf
 share/graphviz/doc/pdf/bcomps.pdf
 share/graphviz/doc/pdf/ccomps.pdf
 share/graphviz/doc/pdf/cdt.pdf
+share/graphviz/doc/pdf/cgraph.pdf
 share/graphviz/doc/pdf/circo.pdf
 share/graphviz/doc/pdf/dijkstra.pdf
 share/graphviz/doc/pdf/dot.pdf
@@ -292,10 +281,9 @@ share/graphviz/doc/pdf/dot2gxl.pdf
 share/graphviz/doc/pdf/dotguide.pdf
 share/graphviz/doc/pdf/dotty.pdf
 share/graphviz/doc/pdf/dottyguide.pdf
-share/graphviz/doc/pdf/expr.pdf
 share/graphviz/doc/pdf/fdp.pdf
 share/graphviz/doc/pdf/gc.pdf
-share/graphviz/doc/pdf/gdtclft.pdf
+${TCL}share/graphviz/doc/pdf/gdtclft.pdf
 share/graphviz/doc/pdf/graph.pdf
 share/graphviz/doc/pdf/gvc.pdf
 share/graphviz/doc/pdf/gvcolor.pdf
@@ -311,8 +299,8 @@ share/graphviz/doc/pdf/nop.pdf
 share/graphviz/doc/pdf/pathplan.pdf
 share/graphviz/doc/pdf/prune.pdf
 share/graphviz/doc/pdf/sccmap.pdf
-share/graphviz/doc/pdf/tcldot.pdf
-share/graphviz/doc/pdf/tkspline.pdf
+${TCL}share/graphviz/doc/pdf/tcldot.pdf
+${TCL}share/graphviz/doc/pdf/tkspline.pdf
 share/graphviz/doc/pdf/tred.pdf
 share/graphviz/doc/pdf/twopi.pdf
 share/graphviz/doc/pdf/unflatten.pdf
@@ -398,6 +386,10 @@ share/graphviz/lefty/tree.lefty
 @dirrm lib/graphviz/tcl
 @dirrm lib/graphviz/sharp
 @dirrm lib/graphviz/ruby
+@dirrm lib/graphviz/r
+@dirrm lib/graphviz/python25
+@dirrm lib/graphviz/python24
+@dirrm lib/graphviz/python23
 @dirrm lib/graphviz/python
 @dirrm lib/graphviz/php
 @dirrm lib/graphviz/perl
diff --git a/graphics/graphviz/buildlink3.mk b/graphics/graphviz/buildlink3.mk
index 577cada8c2b..395cd88a3d0 100644
--- a/graphics/graphviz/buildlink3.mk
+++ b/graphics/graphviz/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.13 2007/01/08 11:29:47 adam Exp $
+# $NetBSD: buildlink3.mk,v 1.14 2008/02/06 18:56:52 adam Exp $
 
 BUILDLINK_DEPTH:=		${BUILDLINK_DEPTH}+
 GRAPHVIZ_BUILDLINK3_MK:=	${GRAPHVIZ_BUILDLINK3_MK}+
@@ -19,11 +19,8 @@ BUILDLINK_PKGSRCDIR.graphviz?=	../../graphics/graphviz
 
 .include "../../converters/libiconv/buildlink3.mk"
 .include "../../devel/pango/buildlink3.mk"
-.include "../../devel/swig/buildlink3.mk"
-.include "../../lang/lua/buildlink3.mk"
 .include "../../graphics/jpeg/buildlink3.mk"
 .include "../../graphics/png/buildlink3.mk"
 .include "../../textproc/expat/buildlink3.mk"
-.include "../../x11/tk/buildlink3.mk"
 
 BUILDLINK_DEPTH:=		${BUILDLINK_DEPTH:S/+$//}
diff --git a/graphics/graphviz/distinfo b/graphics/graphviz/distinfo
index 785022a1410..27189ee8470 100644
--- a/graphics/graphviz/distinfo
+++ b/graphics/graphviz/distinfo
@@ -1,21 +1,10 @@
-$NetBSD: distinfo,v 1.25 2007/03/03 16:51:36 joerg Exp $
+$NetBSD: distinfo,v 1.26 2008/02/06 18:56:52 adam Exp $
 
-SHA1 (graphviz-2.12.tar.gz) = aa48a926395a57c6c7e1e755b9432a29461538e3
-RMD160 (graphviz-2.12.tar.gz) = 68d55176cd5ce0e6a25c90b443529747e738d5c6
-Size (graphviz-2.12.tar.gz) = 4607023 bytes
-SHA1 (patch-aa) = 7674162928db2e16a724c2b4ecb2bd59a2b7d33c
-SHA1 (patch-ab) = 7fd332e66c44b8a384b6dba4eeccdafe3eb0d930
-SHA1 (patch-ac) = e0877aef8259172549e6b69f1478d1ccdef2bb6d
-SHA1 (patch-ad) = d14bfef61caec543812b9d5ea8d2c331bf350af8
-SHA1 (patch-ae) = df8ec6959bf1b8212f8bfcaf48586aa52537a457
-SHA1 (patch-af) = 3da8cd02537275fb75b92d0fc60db0daf22445f8
-SHA1 (patch-ag) = 69aa5b209a56bff0e70eef7be32fe2b137d2e944
-SHA1 (patch-ah) = 1ad530507a6e68468e3157a92abfe469ce6cb5ae
-SHA1 (patch-ai) = bab9b2692e566792f2f3acb5ef6af253faa237b7
-SHA1 (patch-aj) = fe47943c76c348af1cf9b302f6f4d1dd3ed45644
-SHA1 (patch-ak) = c107b665f328e61b7020ffaf75371ac8bd037a1b
-SHA1 (patch-al) = a54f2ef3bba3ff0395697d26a7b176b6dc1359ef
-SHA1 (patch-am) = 533b4021a56f961f2deaa3bb925365b41b01d6fd
-SHA1 (patch-an) = 61c567ce326247667d4be352426e927ab85f15fe
-SHA1 (patch-ao) = f8bc34fb7d5b6c90e903b9ddf2afcc037a3f18af
-SHA1 (patch-ap) = a23318138a5dbcc3f5085c099c1b6076a5ef5a60
+SHA1 (graphviz-2.16.1.tar.gz) = 46b704bd9b81922bcd17167c88f3278a9645e894
+RMD160 (graphviz-2.16.1.tar.gz) = 6d0f23fa176a1bef7ee0ca48cf1b700fe6cbfb42
+Size (graphviz-2.16.1.tar.gz) = 8076271 bytes
+SHA1 (patch-aa) = 4ac7fde6b76fa60c90ac241a4bcd304a7ed2ceeb
+SHA1 (patch-ab) = 0d3ac34e473d346ee8c1e2bd058165745c2f9258
+SHA1 (patch-ac) = 3ef2ea7bea573463cfa722fc3bfa9d18dde141c2
+SHA1 (patch-ad) = 5bbdfb6ad55ef76abfbc70105ad08fb0dc7a3792
+SHA1 (patch-ae) = da929ffd3d736aa5607a59ce325012563b16a994
diff --git a/graphics/graphviz/options.mk b/graphics/graphviz/options.mk
new file mode 100644
index 00000000000..9d981ba623b
--- /dev/null
+++ b/graphics/graphviz/options.mk
@@ -0,0 +1,53 @@
+# $NetBSD: options.mk,v 1.1 2008/02/06 18:56:52 adam Exp $
+
+PKG_OPTIONS_VAR=	PKG_OPTIONS.graphviz
+PKG_SUPPORTED_OPTIONS=	guile lua ocaml swig tcl gtk
+PKG_SUGGESTED_OPTIONS=	lua swig tcl
+
+.include "../../mk/bsd.options.mk"
+
+.if !empty(PKG_OPTIONS:Mguile)
+.include "../../lang/guile/buildlink3.mk"
+CONFIGURE_ARGS+=	--enable-guile
+.else
+CONFIGURE_ARGS+=	--disable-guile
+.endif
+
+.if !empty(PKG_OPTIONS:Mlua)
+.include "../../lang/lua/buildlink3.mk"
+PLIST_SUBST+=		LUA=
+.else
+CONFIGURE_ARGS+=	--disable-lua
+PLIST_SUBST+=		LUA="@comment "
+.endif
+
+.if !empty(PKG_OPTIONS:Mocaml)
+.include "../../lang/ocaml/buildlink3.mk"
+.else
+CONFIGURE_ARGS+=	--disable-ocaml
+.endif
+
+.if !empty(PKG_OPTIONS:Mswig)
+.include "../../devel/swig/buildlink3.mk"
+.else
+CONFIGURE_ARGS+=	--disable-swig
+.endif
+
+.if !empty(PKG_OPTIONS:Mtcl)
+.include "../../x11/tk/buildlink3.mk"
+CONFIGURE_ENV+=		TCLCONFIG=${TCLCONFIG_SH:Q}
+CONFIGURE_ENV+=		TKCONFIG=${TKCONFIG_SH:Q}
+PLIST_SUBST+=		TCL=
+.else
+CONFIGURE_ARGS+=	--disable-tcl
+PLIST_SUBST+=		TCL="@comment "
+.endif
+
+.if !empty(PKG_OPTIONS:Mgtk)
+.include "../../x11/gtk2/buildlink3.mk"
+PLIST_SUBST+=		GTK=
+.else
+CONFIGURE_ARGS+=	--without-gdk-pixbuf
+CONFIGURE_ARGS+=	--without-gtk
+PLIST_SUBST+=		GTK="@comment "
+.endif
diff --git a/graphics/graphviz/patches/patch-aa b/graphics/graphviz/patches/patch-aa
index 3c514ca81b3..2ef5a8fb61f 100644
--- a/graphics/graphviz/patches/patch-aa
+++ b/graphics/graphviz/patches/patch-aa
@@ -1,16 +1,16 @@
-$NetBSD: patch-aa,v 1.6 2007/01/08 11:29:47 adam Exp $
+$NetBSD: patch-aa,v 1.7 2008/02/06 18:56:52 adam Exp $
 
---- configure.ac.orig	2006-12-04 22:11:58.000000000 +0100
+--- configure.ac.orig	2007-12-13 05:38:57.000000000 +0100
 +++ configure.ac
-@@ -244,6 +244,7 @@ dnl Checks for header files
+@@ -279,6 +279,7 @@ dnl Checks for header files
  # AC_HAVE_HEADERS(string.h)
  AC_CHECK_HEADERS(stdarg.h stddef.h stddef.h stdlib.h stdint.h malloc.h \
  	search.h getopt.h pthread.h values.h float.h limits.h termios.h \
 +	crt_externs.h \
- 	errno.h time.h unistd.h fenv.h strings.h inttypes.h \
+ 	errno.h time.h unistd.h fenv.h strings.h inttypes.h setjmp.h \
  	sys/time.h sys/times.h sys/types.h sys/select.h fpu_control.h \
  	sys/fpu.h strings.h sys/socket.h sys/stat.h sys/mman.h \
-@@ -336,6 +337,7 @@ AC_FUNC_ALLOCA
+@@ -371,6 +372,7 @@ AC_FUNC_ALLOCA
  
  AC_CHECK_FUNCS([lrand48 drand48 srand48 setmode setenv getenv \
  	__freadable _sysconf getrusage strerror cbrt lsqrt vsnprintf \
diff --git a/graphics/graphviz/patches/patch-ab b/graphics/graphviz/patches/patch-ab
index cb9a0ed8700..cdd509692c0 100644
--- a/graphics/graphviz/patches/patch-ab
+++ b/graphics/graphviz/patches/patch-ab
@@ -1,10 +1,10 @@
-$NetBSD: patch-ab,v 1.12 2007/01/08 11:29:47 adam Exp $
+$NetBSD: patch-ab,v 1.13 2008/02/06 18:56:52 adam Exp $
 
---- config.h.in.orig	2006-12-04 23:02:31.000000000 +0100
+--- config.h.in.orig	2007-12-13 06:52:34.000000000 +0100
 +++ config.h.in
-@@ -57,6 +57,9 @@
- /* Define to 1 if you have the `dcgettext' function. */
- #undef HAVE_DCGETTEXT
+@@ -60,6 +60,9 @@
+ /* Define if you have the DevIL library */
+ #undef HAVE_DEVIL
  
 +/* Define to 1 if you have the <crt_externs.h> header file. */
 +#undef HAVE_CRT_EXTERNS_H
@@ -12,7 +12,7 @@ $NetBSD: patch-ab,v 1.12 2007/01/08 11:29:47 adam Exp $
  /* Define to 1 if you have the <dirent.h> header file, and it defines `DIR'.
     */
  #undef HAVE_DIRENT_H
-@@ -345,6 +348,9 @@
+@@ -360,6 +363,9 @@
  /* Define to 1 if the system has the type `_Bool'. */
  #undef HAVE__BOOL
  
diff --git a/graphics/graphviz/patches/patch-ac b/graphics/graphviz/patches/patch-ac
index 7a311eda350..3e3e887d6b5 100644
--- a/graphics/graphviz/patches/patch-ac
+++ b/graphics/graphviz/patches/patch-ac
@@ -1,20 +1,17 @@
-$NetBSD: patch-ac,v 1.16 2007/01/08 11:29:47 adam Exp $
+$NetBSD: patch-ac,v 1.17 2008/02/06 18:56:52 adam Exp $
 
---- configure.orig	2006-12-04 23:02:10.000000000 +0100
+--- configure.orig	2007-12-13 06:48:49.000000000 +0100
 +++ configure
-@@ -6315,6 +6315,7 @@ fi
+@@ -7198,6 +7198,7 @@ fi
  
  for ac_header in stdarg.h stddef.h stddef.h stdlib.h stdint.h malloc.h \
  	search.h getopt.h pthread.h values.h float.h limits.h termios.h \
 +	crt_externs.h \
- 	errno.h time.h unistd.h fenv.h strings.h inttypes.h \
+ 	errno.h time.h unistd.h fenv.h strings.h inttypes.h setjmp.h \
  	sys/time.h sys/times.h sys/types.h sys/select.h fpu_control.h \
  	sys/fpu.h strings.h sys/socket.h sys/stat.h sys/mman.h \
-@@ -7974,8 +7975,10 @@ fi
+@@ -8750,6 +8751,7 @@ fi
  
- 
- 
-+
  for ac_func in lrand48 drand48 srand48 setmode setenv getenv \
  	__freadable _sysconf getrusage strerror cbrt lsqrt vsnprintf \
 +	_NSGetEnviron \
diff --git a/graphics/graphviz/patches/patch-ad b/graphics/graphviz/patches/patch-ad
index a9a1896b519..195ba06cff7 100644
--- a/graphics/graphviz/patches/patch-ad
+++ b/graphics/graphviz/patches/patch-ad
@@ -1,18 +1,23 @@
-$NetBSD: patch-ad,v 1.8 2006/02/15 02:53:29 minskim Exp $
+$NetBSD: patch-ad,v 1.9 2008/02/06 18:56:53 adam Exp $
 
---- lib/ast/pathpath.c.orig	2005-08-28 05:47:29.000000000 -0700
+--- lib/ast/pathpath.c.orig	2007-05-03 21:09:15.000000000 +0200
 +++ lib/ast/pathpath.c
-@@ -33,7 +33,14 @@
- #include <unistd.h>
+@@ -37,11 +37,19 @@
+ #endif
  
  /* #include <option.h> */
 +#ifdef HAVE_CRT_EXTERNS_H
 +#include <crt_externs.h>
 +#endif
++
+ #ifdef WIN32
+ #define environ _environ
+ #else
 +#ifdef HAVE__NSGETENVIRON
 +#define environ (*_NSGetEnviron())
 +#else
  extern char **environ;
+ #endif
 +#endif
  char **opt_info_argv;
  
diff --git a/graphics/graphviz/patches/patch-ae b/graphics/graphviz/patches/patch-ae
index cc9d1a725c9..00bc130ccff 100644
--- a/graphics/graphviz/patches/patch-ae
+++ b/graphics/graphviz/patches/patch-ae
@@ -1,8 +1,8 @@
-$NetBSD: patch-ae,v 1.12 2007/01/20 13:49:03 joerg Exp $
+$NetBSD: patch-ae,v 1.13 2008/02/06 18:56:53 adam Exp $
 
---- plugin/gd/gvtextlayout_gd.c.orig	2007-01-17 19:18:08.000000000 +0100
+--- plugin/gd/gvtextlayout_gd.c.orig	2007-11-08 20:42:15.000000000 +0100
 +++ plugin/gd/gvtextlayout_gd.c
-@@ -49,7 +49,7 @@ char *gd_alternate_fontlist(char *font)
+@@ -52,7 +52,7 @@ char *gd_alternate_fontlist(char *font)
      len = strlen(font) + 1;
      if (len > fontbufsz) {
  	fontbufsz = 2 * len;
diff --git a/graphics/graphviz/patches/patch-af b/graphics/graphviz/patches/patch-af
deleted file mode 100644
index b95591778c9..00000000000
--- a/graphics/graphviz/patches/patch-af
+++ /dev/null
@@ -1,22 +0,0 @@
-$NetBSD: patch-af,v 1.9 2007/02/22 14:45:47 joerg Exp $
-
---- contrib/diffimg/Makefile.in.orig	2007-02-22 13:37:08.000000000 +0000
-+++ contrib/diffimg/Makefile.in
-@@ -54,8 +54,6 @@ CONFIG_CLEAN_FILES =
- 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
- DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir)
- depcomp = $(SHELL) $(top_srcdir)/config/depcomp
- am__depfiles_maybe = depfiles
-@@ -368,7 +366,7 @@ 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@diffimg_LDADD = -lgd \
- @WITH_LIBGD_TRUE@	@FC_LIBS@ @FT_LIBS@ @JPEG_LIBS@ @PNG_LIBS@ @Z_LIBS@ @MATH_LIBS@
- 
- GRAPH = "digraph G { hello -> world }"
diff --git a/graphics/graphviz/patches/patch-ag b/graphics/graphviz/patches/patch-ag
deleted file mode 100644
index 978c98745ce..00000000000
--- a/graphics/graphviz/patches/patch-ag
+++ /dev/null
@@ -1,12 +0,0 @@
-$NetBSD: patch-ag,v 1.9 2007/03/03 16:51:36 joerg Exp $
-
---- lib/expr/Makefile.in.orig	2007-02-26 23:50:50.000000000 +0000
-+++ lib/expr/Makefile.in
-@@ -428,6 +428,7 @@ libexpr_C_la_SOURCES = excc.c excontext.
- 
- libexpr_C_la_LIBADD = \
- 	$(top_builddir)/lib/ast/libast_C.la \
-+	$(top_builddir)/lib/cdt/libcdt_C.la \
- 	$(top_builddir)/lib/vmalloc/libvmalloc_C.la \
- 	$(top_builddir)/lib/sfio/libsfio_C.la
- 
diff --git a/graphics/graphviz/patches/patch-ah b/graphics/graphviz/patches/patch-ah
deleted file mode 100644
index d1bab0961e1..00000000000
--- a/graphics/graphviz/patches/patch-ah
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-ah,v 1.8 2007/03/03 16:51:37 joerg Exp $
-
---- lib/gvc/Makefile.in.orig	2007-02-26 23:34:57.000000000 +0000
-+++ lib/gvc/Makefile.in
-@@ -447,7 +447,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-ai b/graphics/graphviz/patches/patch-ai
deleted file mode 100644
index 4909befb663..00000000000
--- a/graphics/graphviz/patches/patch-ai
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-ai,v 1.10 2007/03/03 16:51:37 joerg Exp $
-
---- plugin/core/Makefile.in.orig	2007-02-26 23:57:55.000000000 +0000
-+++ plugin/core/Makefile.in
-@@ -404,7 +404,7 @@ libgvplugin_core_C_la_SOURCES = \
- 
- libgvplugin_core_la_LDFLAGS = -version-info @VERSION_INFO@ --no-undefined
- libgvplugin_core_la_SOURCES = $(libgvplugin_core_C_la_SOURCES)
--libgvplugin_core_la_LIBADD = 
-+libgvplugin_core_la_LIBADD = ../../lib/graph/libgraph.la ../../lib/gvc/libgvc.la -lz
- EXTRA_DIST = Makefile.old
- all: all-am
- 
diff --git a/graphics/graphviz/patches/patch-aj b/graphics/graphviz/patches/patch-aj
deleted file mode 100644
index eae0e8f3c2b..00000000000
--- a/graphics/graphviz/patches/patch-aj
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-aj,v 1.7 2007/03/03 16:51:37 joerg Exp $
-
---- plugin/gd/Makefile.in.orig	2007-02-27 00:15:53.000000000 +0000
-+++ plugin/gd/Makefile.in
-@@ -403,6 +403,8 @@ libgvplugin_gd_la_SOURCES = $(libgvplugi
- @WITH_MYLIBGD_TRUE@libgvplugin_gd_la_LIBADD = \
- @WITH_MYLIBGD_TRUE@	$(top_builddir)/lib/gd/libgvgd_C.la \
- @WITH_MYLIBGD_TRUE@	@ICONV_LIBS@ @FC_LIBS@ @FT_LIBS@ @JPEG_LIBS@ @PNG_LIBS@ @EXPAT_LIBS@ @Z_LIBS@ @MATH_LIBS@
-+libgvplugin_gd_la_LIBADD += ../../lib/gvc/libgvc.la ../../lib/graph/libgraph.la \
-+	../../lib/pathplan/libpathplan.la
- 
- EXTRA_DIST = Makefile.old
- all: all-am
diff --git a/graphics/graphviz/patches/patch-ak b/graphics/graphviz/patches/patch-ak
deleted file mode 100644
index 415467b49fe..00000000000
--- a/graphics/graphviz/patches/patch-ak
+++ /dev/null
@@ -1,15 +0,0 @@
-$NetBSD: patch-ak,v 1.9 2007/03/03 16:51:37 joerg Exp $
-
---- plugin/dot_layout/Makefile.in.orig	2007-02-27 00:27:18.000000000 +0000
-+++ plugin/dot_layout/Makefile.in
-@@ -406,7 +406,9 @@ libgvplugin_dot_layout_la_LDFLAGS = -ver
- 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/gvc/libgvc.la \
--	$(top_builddir)/lib/pathplan/libpathplan.la
-+	$(top_builddir)/lib/agraph/libagraph.la \
-+	$(top_builddir)/lib/graph/libgraph.la \
-+	$(top_builddir)/lib/pathplan/libpathplan.la -lm
- 
- EXTRA_DIST = Makefile.old
- all: all-am
diff --git a/graphics/graphviz/patches/patch-al b/graphics/graphviz/patches/patch-al
deleted file mode 100644
index 81de024aba7..00000000000
--- a/graphics/graphviz/patches/patch-al
+++ /dev/null
@@ -1,15 +0,0 @@
-$NetBSD: patch-al,v 1.8 2007/03/03 16:51:37 joerg Exp $
-
---- plugin/neato_layout/Makefile.in.orig	2007-02-27 00:29:02.000000000 +0000
-+++ plugin/neato_layout/Makefile.in
-@@ -415,7 +415,9 @@ libgvplugin_neato_layout_la_LDFLAGS = -v
- 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/gvc/libgvc.la \
--	$(top_builddir)/lib/pathplan/libpathplan.la @IPSEPCOLA_LIBS@
-+	$(top_builddir)/lib/graph/libgraph.la \
-+	$(top_builddir)/lib/expr/libexpr.la \
-+	$(top_builddir)/lib/pathplan/libpathplan.la @IPSEPCOLA_LIBS@ -lm
- 
- EXTRA_DIST = Makefile.old
- all: all-am
diff --git a/graphics/graphviz/patches/patch-am b/graphics/graphviz/patches/patch-am
deleted file mode 100644
index c919a432b10..00000000000
--- a/graphics/graphviz/patches/patch-am
+++ /dev/null
@@ -1,16 +0,0 @@
-$NetBSD: patch-am,v 1.10 2007/03/03 16:51:37 joerg Exp $
-
---- tclpkg/tcldot/Makefile.in.orig	2007-02-27 00:33:47.000000000 +0000
-+++ tclpkg/tcldot/Makefile.in
-@@ -490,6 +490,11 @@ libtcldot_la_LDFLAGS = -no-undefined
- @WITH_LIBGD_TRUE@@WITH_MYLIBGD_TRUE@        $(top_builddir)/lib/gd/libgvgd_C.la \
- @WITH_LIBGD_TRUE@@WITH_MYLIBGD_TRUE@	@PANGOCAIRO_LIBS@ @LIBGEN_LIBS@ @LIBLTDL@ @ICONV_LIBS@ @FC_LIBS@ @FT_LIBS@ @JPEG_LIBS@ @PNG_LIBS@ @Z_LIBS@ @MATH_LIBS@
- 
-+libtcldot_la_LIBADD += \
-+	$(top_builddir)/lib/agraph/libagraph.la \
-+	$(top_builddir)/lib/expr/libexpr.la \
-+	$(top_builddir)/lib/graph/libgraph.la \
-+
- libtcldot_builtin_la_SOURCES = \
- 	tcldot.c $(CODEGENS) $(GDTCLFT) \
- 	$(top_srcdir)/lib/gvc/dot_builtins.c \
diff --git a/graphics/graphviz/patches/patch-an b/graphics/graphviz/patches/patch-an
deleted file mode 100644
index 26fc20bb805..00000000000
--- a/graphics/graphviz/patches/patch-an
+++ /dev/null
@@ -1,31 +0,0 @@
-$NetBSD: patch-an,v 1.7 2007/03/03 16:51:37 joerg Exp $
-
---- tclpkg/gv/Makefile.in.orig	2007-02-27 00:41:02.000000000 +0000
-+++ tclpkg/gv/Makefile.in
-@@ -537,7 +537,7 @@ AM_CPPFLAGS = \
- 	-I$(top_srcdir)/lib/pathplan $(PERL_INCLUDES) $(OCAML_INCLUDES) $(PHP_INCLUDES) $(PYTHON_INCLUDES) $(RUBY_INCLUDES) $(TCL_INCLUDES) 
- 
- BASESOURCES = gv.cpp gv.i
--BASELIBS = $(top_builddir)/lib/gvc/libgvc.la
-+BASELIBS = $(top_builddir)/lib/gvc/libgvc.la ../../lib/expr/libexpr.la ../../lib/graph/libgraph.la
- pkgsharpdir = $(pkglibdir)/sharp
- SHARP_hdr = 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 SWIGTYPE_p_p_void.cs
- nodist_libgv_sharp_la_SOURCES = gv_sharp.cpp $(SHARP_hdr)
-@@ -566,7 +566,7 @@ pkgluadir = $(pkglibdir)/lua
- LUA_hdr = 
- nodist_libgv_lua_la_SOURCES = gv_lua.cpp $(LUA_hdr)
- libgv_lua_la_SOURCES = $(BASESOURCES)
--libgv_lua_la_LIBADD = $(BASELIBS) @LUA_LIBS@
-+libgv_lua_la_LIBADD = $(BASELIBS) -llua
- libgv_lua_la_LDFLAGS = 
- pkgocamldir = $(pkglibdir)/ocaml
- OCAML_hdr = gv.ml gv.mli
-@@ -602,7 +602,7 @@ pkgtcldir = $(pkglibdir)/tcl
- TCL_hdr = 
- nodist_libgv_tcl_la_SOURCES = gv_tcl.cpp $(TCL_hdr)
- libgv_tcl_la_SOURCES = $(BASESOURCES)
--libgv_tcl_la_LIBADD = $(top_builddir)/tclpkg/tclstubs/libtclstubs_C.la $(BASELIBS) @TCL_LIBS@
-+libgv_tcl_la_LIBADD = $(top_builddir)/tclpkg/tclstubs/libtclstubs_C.la $(BASELIBS) -ltcl84
- libgv_tcl_la_LDFLAGS = 
- pkginclude_DATA = gv.i gv.cpp
- pkglib_LTLIBRARIES = 
diff --git a/graphics/graphviz/patches/patch-ao b/graphics/graphviz/patches/patch-ao
deleted file mode 100644
index c53a41a6f94..00000000000
--- a/graphics/graphviz/patches/patch-ao
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-ao,v 1.9 2007/03/03 16:51:37 joerg Exp $
-
---- cmd/dot/Makefile.in.orig	2007-03-03 16:07:40.000000000 +0100
-+++ cmd/dot/Makefile.in
-@@ -418,7 +418,7 @@ AM_CPPFLAGS = \
- man_MANS = dot.1 
- pdf_DATA = dot.pdf
- dot_SOURCES = dot.c
--dot_LDADD = $(top_builddir)/lib/gvc/libgvc.la
-+dot_LDADD = $(top_builddir)/lib/gvc/libgvc.la ${PTHREAD_LDFLAGS} ${PTHREAD_LIBS}
- 
- # This automagic technique for building the list of builtins requires that the
- # symbols be in the binary image, but libtool makes it difficult
diff --git a/graphics/graphviz/patches/patch-ap b/graphics/graphviz/patches/patch-ap
deleted file mode 100644
index 073eacc7689..00000000000
--- a/graphics/graphviz/patches/patch-ap
+++ /dev/null
@@ -1,14 +0,0 @@
-$NetBSD: patch-ap,v 1.8 2007/03/03 16:51:38 joerg Exp $
-
---- cmd/tools/Makefile.in.orig	2007-03-03 16:31:25.000000000 +0100
-+++ cmd/tools/Makefile.in
-@@ -515,7 +515,8 @@ gvpack_SOURCES = gvpack.c gvpack_builtin
- gvpack_LDADD = \
- 	$(top_builddir)/lib/gvc/libgvc.la \
- 	$(top_builddir)/lib/ingraphs/libingraphs_C.la \
--	$(top_builddir)/plugin/neato_layout/libgvplugin_neato_layout.la
-+	$(top_builddir)/plugin/neato_layout/libgvplugin_neato_layout.la \
-+	${PTHREAD_LIBS} ${PTHREAD_LDFLAGS}
- 
- dijkstra_SOURCES = dijkstra.c
- dijkstra_LDADD = \