PkgSrc changes:

- Updating package graphics/graphviz to 2.22.2 - Setting license to cpl-1.0 - Rework optional dependencies handling (handle dependencies of dependencies) Upstream changes: March 13, 2009 - Release 2.22.2 - fix for buffer overflow (present in 2.22.0 and 2.22.1) - Fixed bugs: 1596, 1602 March 9, 2009 - Release 2.22.1 - build fixes for Visual Studio and for FreeBSD March 3, 2009 - Release 2.22.0 - Core: - libgvc api changed, version bumped. Affects third party applications using libgvc. - plugin api changed, version bumped. Affects third party plugins for graphviz. - 90% conversion to cgraph has been done, but not enabled yet, (and yes, its true what they say about the last 10% ) - drop libagraph from distribution (use libcgraph) - layout code completely converted to floating point. - new "dot -P" option for generating a graph of available plugins. - registered MIME type: text/vnd.graphviz for .gv files - rename files from .dot to .gv to avoid conflict with Word templates. .dot still supported, but deprecated. - new command: mm2gv (matrix-market graph file conversion) - rename commands: dot2gxl -> gv2gxl gxl2dot -> gxl2gv - Plugins: - new rsvg plugin for support of node shapes in SVG format - new gs plugin for support of node shapes in PS format - new lasi plugin for support of UTF-8 characters in PS output (the above thee plugins are Linux only, at the moment) - new quartz plugin (MacOSx only) - new gdiplus plugin (Windows only) - new -Tvml support in core plugin (thanks Steve Roush) - new -Ttk support in core plugin (also used by Tcldot and gv_tcl language bindings.) - disabled old style codegens completely - Linux: - new Ubuntu8 builds - new Fedora 10 and 11 builds - MacOSx: - Universal binary for Leopard: i386, x86_64, ppc, ppc64 - Should not conflict with parallel install of MacPorts version of graphviz - Improved GUI - Windows: - VisualC project files now available, in addition to the GNU Makefiles that are used the mingw builds. - Language Bindings: - fixed problem with writing dot, xdot, plain, canon to memory or to Tcl_Channels - renamed man pages to Debian style: gv.3tcl, gv.3perl, etc - Fixed bugs: 827, 1365, 1366, 1367, 1368, 1374, 1375, 1376, 1378, 1380, 1382, 1383, 1385, 1386, 1388, 1390, 1391, 1392, 1394, 1395, 1397, 1398, 1399, 1405, 1407, 1410, 1412, 1414, 1415, 1416, 1421, 1424, 1425, 1427, 1429, 1431, 1433, 1435, 1436, 1437, 1438, 1440, 1441, 1444, 1446, 1451, 1452, 1453, 1456, 1457, 1459, 1460, 1461, 1462, 1463, 1464, 1465, 1466, 1470, 1474, 1475, 1476, 1477, 1478, 1484, 1485, 1489, 1490, 1492, 1493, 1495, 1496, 1499, 1500, 1501, 1502, 1503, 1505, 1509, 1513, 1521, 1523, 1525, 1530, 1531, 1532, 1533, 1535, 1536, 1539, 1540, 1542, 1543, 1546, 1547, 1551, 1553, 1554, 1561, 1565, 1566, 1568, 1569, 1570, 1571, 1573, 1577, 1578, 1579, 1580, 1581, 1582, 1584, 1586,
author: sno <sno@pkgsrc.org> 2009-05-17 12:55:52 +0000
committer: sno <sno@pkgsrc.org> 2009-05-17 12:55:52 +0000
commit: 1fc133e9e595de7f7f07a8906ae452a60bb4cf01 (patch)
tree: d90e6f6a7910f33c7b71e97783fd1db6fedb190e /graphics
parent: af726844040f8d4a685740a51c261207d44d34cf (diff)
download: pkgsrc-1fc133e9e595de7f7f07a8906ae452a60bb4cf01.tar.gz
11 files changed, 430 insertions, 311 deletions
diff --git a/graphics/graphviz/DEINSTALL b/graphics/graphviz/DEINSTALL
index e9d7de16e46..c747484fada 100644
--- a/graphics/graphviz/DEINSTALL
+++ b/graphics/graphviz/DEINSTALL
@@ -1,9 +1,9 @@
-# $NetBSD: DEINSTALL,v 1.1 2007/09/21 17:40:38 joerg Exp $
+# $NetBSD: DEINSTALL,v 1.2 2009/05/17 12:55:52 sno Exp $
 
 : ${PKG_PREFIX=@PREFIX@}
 
 case ${STAGE} in
 DEINSTALL)
-	${RM} ${PKG_PREFIX}/lib/graphviz/config
+	${RM} ${PKG_PREFIX}/lib/graphviz/config6
 	;;
 esac
diff --git a/graphics/graphviz/Makefile b/graphics/graphviz/Makefile
index 04510b686d1..9e94fb2e31f 100644
--- a/graphics/graphviz/Makefile
+++ b/graphics/graphviz/Makefile
@@ -1,27 +1,26 @@
-# $NetBSD: Makefile,v 1.73 2009/04/01 17:12:57 tron Exp $
+# $NetBSD: Makefile,v 1.74 2009/05/17 12:55:52 sno Exp $
 
-DISTNAME=	graphviz-2.20.3
-PKGREVISION=	4
+DISTNAME=	graphviz-2.22.2
 CATEGORIES=	graphics
 MASTER_SITES=	http://www.graphviz.org/pub/graphviz/stable/SOURCES/
 
-MAINTAINER=	pkgsrc-users@NetBSD.org
+MAINTAINER=	sno@NetBSD.org
 HOMEPAGE=	http://www.graphviz.org/
 COMMENT=	Graph Drawing Programs from AT&T Research and Lucent Bell Labs
+LICENSE=	cpl-1.0
 
 PKG_INSTALLATION_TYPES=	overwrite pkgviews
 PKG_DESTDIR_SUPPORT=	user-destdir
 
 DEPENDS+= ghostscript-fonts>=6.0:../../fonts/ghostscript-fonts
 
-CHECK_FILES_SKIP=	${PREFIX}/lib/graphviz/config
+CHECK_FILES_SKIP=	${PREFIX}/lib/graphviz/config6
 
 USE_LANGUAGES=		c c++
 USE_LIBTOOL=		yes
 USE_TOOLS+=		bison pkg-config
 GNU_CONFIGURE=		yes
 CONFIGURE_ARGS+=	--disable-java
-CONFIGURE_ARGS+=	--disable-perl
 CONFIGURE_ARGS+=	--disable-php
 CONFIGURE_ARGS+=	--disable-python
 CONFIGURE_ARGS+=	--disable-ruby
@@ -50,6 +49,10 @@ REPLACE.tclsh.old=	.*tclsh
 REPLACE.tclsh.new=	${PREFIX}/bin/tclsh
 REPLACE_FILES.tclsh=	tclpkg/gv/demo/modgraph.tcl
 
+REPLACE_PERL+=		config/config_perl.pl lib/gd/configure.pl \
+			tclpkg/gv/demo/modgraph.pl contrib/dotmcl.pl \
+			contrib/dirgraph/dirgraph.pl
+
 .include "../../mk/bsd.prefs.mk"
 
 .include "../../mk/compiler.mk"
@@ -71,7 +74,8 @@ post-install:
 
 .include "../../converters/libiconv/buildlink3.mk"
 .include "../../devel/gettext-lib/buildlink3.mk"
-.include "../../devel/libltdl/convenience.mk"
+.include "../../devel/libltdl/buildlink3.mk"
+#.include "../../devel/libltdl/convenience.mk"
 .include "../../fonts/fontconfig/buildlink3.mk"
 #.include "../../graphics/jpeg/buildlink3.mk"
 #.include "../../graphics/png/buildlink3.mk"
diff --git a/graphics/graphviz/PLIST b/graphics/graphviz/PLIST
index 2459104ffe2..6cc049e4bd6 100644
--- a/graphics/graphviz/PLIST
+++ b/graphics/graphviz/PLIST
@@ -1,34 +1,37 @@
-@comment $NetBSD: PLIST,v 1.31 2009/04/01 17:12:57 tron Exp $
+@comment $NetBSD: PLIST,v 1.32 2009/05/17 12:55:52 sno Exp $
 bin/acyclic
 bin/bcomps
 bin/ccomps
 bin/circo
-bin/dot2gxl
-bin/fdp
-bin/neato
-bin/twopi
+${PLIST.gd}bin/diffimg
 bin/dijkstra
 bin/dot
+bin/dot2gxl
 bin/dotty
+bin/fdp
 bin/gc
+bin/gv2gxl
 bin/gvcolor
+bin/gvgen
 bin/gvpack
 bin/gvpr
 bin/gxl2dot
+bin/gxl2gv
 ${PLIST.x11}bin/lefty
 bin/lneato
+bin/mm2gv
+bin/neato
 bin/nop
 bin/prune
 bin/sccmap
 bin/tred
+bin/twopi
 bin/unflatten
-include/graphviz/agraph.h
+${PLIST.pangocairo}bin/vimdot
 include/graphviz/arith.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/geom.h
 include/graphviz/graph.h
 include/graphviz/gv.cpp
@@ -37,30 +40,56 @@ include/graphviz/gvc.h
 include/graphviz/gvcext.h
 include/graphviz/gvcjob.h
 include/graphviz/gvcommon.h
+include/graphviz/gvconfig.h
 include/graphviz/gvplugin.h
 include/graphviz/gvplugin_device.h
 include/graphviz/gvplugin_layout.h
 include/graphviz/gvplugin_loadimage.h
 include/graphviz/gvplugin_render.h
 include/graphviz/gvplugin_textlayout.h
-include/graphviz/no_demand_loading.c
 include/graphviz/pack.h
 include/graphviz/pathgeom.h
 include/graphviz/pathplan.h
 include/graphviz/textpara.h
 include/graphviz/types.h
 include/graphviz/usershape.h
+${PLIST.guile}lib/graphviz/guile/libgv_guile.la
 lib/graphviz/libgvplugin_core.la
 lib/graphviz/libgvplugin_dot_layout.la
 lib/graphviz/libgvplugin_gd.la
+${PLIST.gtk}lib/graphviz/libgvplugin_gdk_pixbuf.la
+${PLIST.gtk}lib/graphviz/libgvplugin_gtk.la
 lib/graphviz/libgvplugin_neato_layout.la
-lib/libagraph.la
+${PLIST.pangocairo}lib/graphviz/libgvplugin_pango.la
+${PLIST.rsvg}lib/graphviz/libgvplugin_rsvg.la
+${PLIST.pangocairo}lib/graphviz/libgvplugin_xlib.la
+${PLIST.lua}lib/graphviz/lua/libgv_lua.la
+${PLIST.ocaml}lib/graphviz/ocaml/META.gv
+${PLIST.ocaml}lib/graphviz/ocaml/gv.a
+${PLIST.ocaml}lib/graphviz/ocaml/gv.cma
+${PLIST.ocaml}lib/graphviz/ocaml/gv.cmi
+${PLIST.ocaml}lib/graphviz/ocaml/gv.cmo
+${PLIST.ocaml}lib/graphviz/ocaml/gv.cmx
+${PLIST.ocaml}lib/graphviz/ocaml/gv.cmxa
+${PLIST.ocaml}lib/graphviz/ocaml/gv.mli
+${PLIST.ocaml}lib/graphviz/ocaml/libgv_ocaml.la
+${PLIST.perl}lib/graphviz/perl/gv.pm
+${PLIST.perl}lib/graphviz/perl/gv.so
+${PLIST.perl}lib/graphviz/perl/libgv_perl.la
+${PLIST.tcl}${PLIST.gd}lib/graphviz/tcl/libgdtclft.la
+${PLIST.tcl}lib/graphviz/tcl/libgv_tcl.la
+${PLIST.tcl}lib/graphviz/tcl/libtcldot.la
+${PLIST.tcl}lib/graphviz/tcl/libtcldot_builtin.la
+${PLIST.tcl}lib/graphviz/tcl/libtclplan.la
+${PLIST.tcl}lib/graphviz/tcl/libtkspline.la
+${PLIST.tcl}lib/graphviz/tcl/pkgIndex.tcl
 lib/libcdt.la
 lib/libcgraph.la
 lib/libgraph.la
 lib/libgvc.la
 lib/libpathplan.la
-lib/pkgconfig/libagraph.pc
+${PLIST.perl}lib/perl5/vendor_perl/5.10.0/${MACHINE_ARCH}-${LOWER_OPSYS}-thread-multi/gv.pm
+${PLIST.perl}lib/perl5/vendor_perl/5.10.0/${MACHINE_ARCH}-${LOWER_OPSYS}-thread-multi/gv.so
 lib/pkgconfig/libcdt.pc
 lib/pkgconfig/libcgraph.pc
 lib/pkgconfig/libgraph.pc
@@ -69,42 +98,80 @@ lib/pkgconfig/libpathplan.pc
 man/man1/acyclic.1
 man/man1/bcomps.1
 man/man1/ccomps.1
+man/man1/circo.1
 man/man1/dijkstra.1
 man/man1/dot.1
 man/man1/dotty.1
+man/man1/fdp.1
 man/man1/gc.1
+man/man1/gv2gxl.1
 man/man1/gvcolor.1
+man/man1/gvgen.1
 man/man1/gvpack.1
 man/man1/gvpr.1
-man/man1/gxl2dot.1
+man/man1/gxl2gv.1
 ${PLIST.x11}man/man1/lefty.1
 man/man1/lneato.1
+man/man1/mm2gv.1
+man/man1/neato.1
 man/man1/nop.1
 man/man1/prune.1
 man/man1/sccmap.1
 man/man1/tred.1
-man/man1/unflatten.1
-man/man1/circo.1
-man/man1/dot2gxl.1
-man/man1/fdp.1
-man/man1/neato.1
 man/man1/twopi.1
-man/man3/agraph.3
+man/man1/unflatten.1
 man/man3/cdt.3
 man/man3/cgraph.3
+${PLIST.tcl}${PLIST.gd}man/man3/gdtclft.3tcl
 man/man3/graph.3
+${PLIST.guile}man/man3/gv.3guile
+${PLIST.lua}man/man3/gv.3lua
+${PLIST.ocaml}man/man3/gv.3ocaml
+${PLIST.perl}man/man3/gv.3perl
+${PLIST.tcl}man/man3/gv.3tcl
 man/man3/gvc.3
 man/man3/pathplan.3
+${PLIST.tcl}man/man3/tcldot.3tcl
+${PLIST.tcl}man/man3/tkspline.3tk
 man/man7/graphviz.7
+${PLIST.tcl}share/graphviz/demo/doted.tcl
+${PLIST.tcl}share/graphviz/demo/doted.tcl.README
+${PLIST.tcl}share/graphviz/demo/entities.tcl
+${PLIST.tcl}share/graphviz/demo/entities.tcl.README
+${PLIST.tcl}share/graphviz/demo/entities.tcl.html
+${PLIST.tcl}share/graphviz/demo/gcat.tcl
+${PLIST.tcl}share/graphviz/demo/gcat.tcl.README
+${PLIST.lua}share/graphviz/demo/modgraph.lua
+${PLIST.perl}share/graphviz/demo/modgraph.pl
+${PLIST.tcl}share/graphviz/demo/modgraph.tcl
+${PLIST.tcl}share/graphviz/demo/pathplan.tcl
+${PLIST.tcl}share/graphviz/demo/pathplan.tcl.README
+${PLIST.tcl}share/graphviz/demo/pathplan_data/boxes.dat
+${PLIST.tcl}share/graphviz/demo/pathplan_data/dpd.dat
+${PLIST.tcl}share/graphviz/demo/pathplan_data/funny.dat
+${PLIST.tcl}share/graphviz/demo/pathplan_data/maze.dat
+${PLIST.tcl}share/graphviz/demo/pathplan_data/nested.dat
+${PLIST.tcl}share/graphviz/demo/pathplan_data/northo.dat
+${PLIST.tcl}share/graphviz/demo/pathplan_data/obs.dat
+${PLIST.tcl}share/graphviz/demo/pathplan_data/other.dat
+${PLIST.tcl}share/graphviz/demo/pathplan_data/paths.dat
+${PLIST.tcl}share/graphviz/demo/pathplan_data/rotor.dat
+${PLIST.tcl}share/graphviz/demo/pathplan_data/u.dat
+${PLIST.tcl}share/graphviz/demo/pathplan_data/unknown.dat
+${PLIST.tcl}share/graphviz/demo/spline.tcl
+${PLIST.tcl}share/graphviz/demo/spline.tcl.README
 share/graphviz/doc/AUTHORS
 share/graphviz/doc/COPYING
 share/graphviz/doc/ChangeLog
 share/graphviz/doc/Dot.ref
 share/graphviz/doc/NEWS
+share/graphviz/doc/addingLayout.txt
 share/graphviz/doc/cpl1.0.txt
 share/graphviz/doc/fontfaq.txt
 share/graphviz/doc/html/FAQ.html
+share/graphviz/doc/html/Gdtclft2.2.5.example.png
 share/graphviz/doc/html/build.html
+share/graphviz/doc/html/char.html
 share/graphviz/doc/html/index.html
 share/graphviz/doc/html/info/Mcircle.gif
 share/graphviz/doc/html/info/Mdiamond.gif
@@ -166,6 +233,7 @@ share/graphviz/doc/html/info/aa_rtee.gif
 share/graphviz/doc/html/info/aa_rvee.gif
 share/graphviz/doc/html/info/aa_tee.gif
 share/graphviz/doc/html/info/aa_vee.gif
+share/graphviz/doc/html/info/arrows.html
 share/graphviz/doc/html/info/attrs.html
 share/graphviz/doc/html/info/back.gif
 share/graphviz/doc/html/info/both.gif
@@ -189,8 +257,11 @@ share/graphviz/doc/html/info/grammar.html
 share/graphviz/doc/html/info/hexagon.gif
 share/graphviz/doc/html/info/house.gif
 share/graphviz/doc/html/info/html1.gif
+share/graphviz/doc/html/info/html2.dot
 share/graphviz/doc/html/info/html2.gif
+share/graphviz/doc/html/info/html3.dot
 share/graphviz/doc/html/info/html3.gif
+share/graphviz/doc/html/info/html4.dot
 share/graphviz/doc/html/info/html4.gif
 share/graphviz/doc/html/info/index.html
 share/graphviz/doc/html/info/invhouse.gif
@@ -206,12 +277,15 @@ share/graphviz/doc/html/info/output.html
 share/graphviz/doc/html/info/parallelogram.gif
 share/graphviz/doc/html/info/pentagon.gif
 share/graphviz/doc/html/info/plaintext.gif
+share/graphviz/doc/html/info/plugins.png
 share/graphviz/doc/html/info/point.gif
 share/graphviz/doc/html/info/polygon.gif
 share/graphviz/doc/html/info/record.gif
+share/graphviz/doc/html/info/record2.gif
 share/graphviz/doc/html/info/rect.gif
 share/graphviz/doc/html/info/rectangle.gif
 share/graphviz/doc/html/info/round.gif
+share/graphviz/doc/html/info/sdlshapes.png
 share/graphviz/doc/html/info/septagon.gif
 share/graphviz/doc/html/info/shapes.html
 share/graphviz/doc/html/info/tab.gif
@@ -219,96 +293,114 @@ 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/schema/arguments.xml
+share/graphviz/doc/html/schema/attributes.xml
+share/graphviz/doc/html/schema/attributes.xslt
+${PLIST.tcl}share/graphviz/doc/html/tcldot.html
+share/graphviz/doc/html/todo.html
 share/graphviz/doc/html/winbuild.html
 share/graphviz/doc/latex_suggestions.txt
-share/graphviz/doc/pdf/acyclic.pdf
-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
-share/graphviz/doc/pdf/dot2gxl.pdf
+share/graphviz/doc/pdf/acyclic.1.pdf
+share/graphviz/doc/pdf/bcomps.1.pdf
+share/graphviz/doc/pdf/ccomps.1.pdf
+share/graphviz/doc/pdf/cdt.3.pdf
+share/graphviz/doc/pdf/cgraph.3.pdf
+share/graphviz/doc/pdf/circo.1.pdf
+share/graphviz/doc/pdf/dijkstra.1.pdf
+share/graphviz/doc/pdf/dot.1.pdf
 share/graphviz/doc/pdf/dotguide.pdf
-share/graphviz/doc/pdf/dotty.pdf
+share/graphviz/doc/pdf/dotty.1.pdf
 share/graphviz/doc/pdf/dottyguide.pdf
-share/graphviz/doc/pdf/fdp.pdf
-share/graphviz/doc/pdf/gc.pdf
-share/graphviz/doc/pdf/graph.pdf
-share/graphviz/doc/pdf/gvc.pdf
-share/graphviz/doc/pdf/gvcolor.pdf
-share/graphviz/doc/pdf/gvpack.pdf
-share/graphviz/doc/pdf/gvpr.pdf
-share/graphviz/doc/pdf/gxl2dot.pdf
+share/graphviz/doc/pdf/fdp.1.pdf
+share/graphviz/doc/pdf/gc.1.pdf
+${PLIST.tcl}${PLIST.gd}share/graphviz/doc/pdf/gdtclft.3tcl.pdf
+share/graphviz/doc/pdf/graph.3.pdf
+${PLIST.guile}share/graphviz/doc/pdf/gv.3guile.pdf
+${PLIST.lua}share/graphviz/doc/pdf/gv.3lua.pdf
+${PLIST.ocaml}share/graphviz/doc/pdf/gv.3ocaml.pdf
+${PLIST.perl}share/graphviz/doc/pdf/gv.3perl.pdf
+${PLIST.tcl}share/graphviz/doc/pdf/gv.3tcl.pdf
+share/graphviz/doc/pdf/gv2gxl.1.pdf
+share/graphviz/doc/pdf/gvc.3.pdf
+share/graphviz/doc/pdf/gvcolor.1.pdf
+share/graphviz/doc/pdf/gvgen.1.pdf
+share/graphviz/doc/pdf/gvpack.1.pdf
+share/graphviz/doc/pdf/gvpr.1.pdf
+share/graphviz/doc/pdf/gxl2gv.1.pdf
+${PLIST.x11}share/graphviz/doc/pdf/lefty.1.pdf
 share/graphviz/doc/pdf/leftyguide.pdf
-share/graphviz/doc/pdf/lneato.pdf
-share/graphviz/doc/pdf/neato.pdf
+share/graphviz/doc/pdf/libguide.pdf
+share/graphviz/doc/pdf/lneato.1.pdf
+share/graphviz/doc/pdf/mm2gv.1.pdf
+share/graphviz/doc/pdf/neato.1.pdf
 share/graphviz/doc/pdf/neatoguide.pdf
-share/graphviz/doc/pdf/nop.pdf
-share/graphviz/doc/pdf/pathplan.pdf
+share/graphviz/doc/pdf/nop.1.pdf
+share/graphviz/doc/pdf/pathplan.3.pdf
 share/graphviz/doc/pdf/prune.pdf
-share/graphviz/doc/pdf/sccmap.pdf
-share/graphviz/doc/pdf/tred.pdf
-share/graphviz/doc/pdf/unflatten.pdf
-share/graphviz/doc/pdf/twopi.pdf
-share/graphviz/graphs/directed/KW91.dot
-share/graphviz/graphs/directed/Latin1.dot
-share/graphviz/graphs/directed/NaN.dot
-share/graphviz/graphs/directed/abstract.dot
-share/graphviz/graphs/directed/alf.dot
-share/graphviz/graphs/directed/arrows.dot
-share/graphviz/graphs/directed/awilliams.dot
-share/graphviz/graphs/directed/clust.dot
-share/graphviz/graphs/directed/clust1.dot
-share/graphviz/graphs/directed/clust2.dot
-share/graphviz/graphs/directed/clust3.dot
-share/graphviz/graphs/directed/clust4.dot
-share/graphviz/graphs/directed/clust5.dot
-share/graphviz/graphs/directed/crazy.dot
-share/graphviz/graphs/directed/ctext.dot
-share/graphviz/graphs/directed/dfa.dot
-share/graphviz/graphs/directed/fig6.dot
-share/graphviz/graphs/directed/fsm.dot
-share/graphviz/graphs/directed/grammar.dot
-share/graphviz/graphs/directed/hashtable.dot
-share/graphviz/graphs/directed/honda-tokoro.dot
-share/graphviz/graphs/directed/jcctree.dot
-share/graphviz/graphs/directed/jsort.dot
-share/graphviz/graphs/directed/ldbxtried.dot
-share/graphviz/graphs/directed/longflat.dot
-share/graphviz/graphs/directed/mike.dot
-share/graphviz/graphs/directed/nhg.dot
-share/graphviz/graphs/directed/oldarrows.dot
-share/graphviz/graphs/directed/pgram.dot
-share/graphviz/graphs/directed/pm2way.dot
-share/graphviz/graphs/directed/pmpipe.dot
-share/graphviz/graphs/directed/polypoly.dot
-share/graphviz/graphs/directed/proc3d.dot
-share/graphviz/graphs/directed/record2.dot
-share/graphviz/graphs/directed/records.dot
-share/graphviz/graphs/directed/rowe.dot
-share/graphviz/graphs/directed/sdh.dot
-share/graphviz/graphs/directed/shells.dot
-share/graphviz/graphs/directed/states.dot
-share/graphviz/graphs/directed/structs.dot
-share/graphviz/graphs/directed/switch.dot
-share/graphviz/graphs/directed/table.dot
-share/graphviz/graphs/directed/train11.dot
-share/graphviz/graphs/directed/trapeziumlr.dot
-share/graphviz/graphs/directed/tree.dot
-share/graphviz/graphs/directed/triedds.dot
-share/graphviz/graphs/directed/try.dot
-share/graphviz/graphs/directed/unix.dot
-share/graphviz/graphs/directed/unix2.dot
-share/graphviz/graphs/directed/viewfile.dot
-share/graphviz/graphs/directed/world.dot
-share/graphviz/graphs/undirected/ER.dot
-share/graphviz/graphs/undirected/Heawood.dot
-share/graphviz/graphs/undirected/Petersen.dot
-share/graphviz/graphs/undirected/ngk10_4.dot
-share/graphviz/graphs/undirected/process.dot
+share/graphviz/doc/pdf/sccmap.1.pdf
+${PLIST.tcl}share/graphviz/doc/pdf/tcldot.3tcl.pdf
+${PLIST.tcl}share/graphviz/doc/pdf/tkspline.3tk.pdf
+share/graphviz/doc/pdf/tred.1.pdf
+share/graphviz/doc/pdf/twopi.1.pdf
+share/graphviz/doc/pdf/unflatten.1.pdf
+share/graphviz/graphs/directed/KW91.gv
+share/graphviz/graphs/directed/Latin1.gv
+share/graphviz/graphs/directed/NaN.gv
+share/graphviz/graphs/directed/abstract.gv
+share/graphviz/graphs/directed/alf.gv
+share/graphviz/graphs/directed/arrows.gv
+share/graphviz/graphs/directed/awilliams.gv
+share/graphviz/graphs/directed/clust.gv
+share/graphviz/graphs/directed/clust1.gv
+share/graphviz/graphs/directed/clust2.gv
+share/graphviz/graphs/directed/clust3.gv
+share/graphviz/graphs/directed/clust4.gv
+share/graphviz/graphs/directed/clust5.gv
+share/graphviz/graphs/directed/crazy.gv
+share/graphviz/graphs/directed/ctext.gv
+share/graphviz/graphs/directed/dfa.gv
+share/graphviz/graphs/directed/fig6.gv
+share/graphviz/graphs/directed/fsm.gv
+share/graphviz/graphs/directed/grammar.gv
+share/graphviz/graphs/directed/hashtable.gv
+share/graphviz/graphs/directed/honda-tokoro.gv
+share/graphviz/graphs/directed/jcctree.gv
+share/graphviz/graphs/directed/jsort.gv
+share/graphviz/graphs/directed/ldbxtried.gv
+share/graphviz/graphs/directed/longflat.gv
+share/graphviz/graphs/directed/mike.gv
+share/graphviz/graphs/directed/nhg.gv
+share/graphviz/graphs/directed/oldarrows.gv
+share/graphviz/graphs/directed/pgram.gv
+share/graphviz/graphs/directed/pm2way.gv
+share/graphviz/graphs/directed/pmpipe.gv
+share/graphviz/graphs/directed/polypoly.gv
+share/graphviz/graphs/directed/proc3d.gv
+share/graphviz/graphs/directed/psfonttest.gv
+share/graphviz/graphs/directed/record2.gv
+share/graphviz/graphs/directed/records.gv
+share/graphviz/graphs/directed/rowe.gv
+share/graphviz/graphs/directed/russian.gv
+share/graphviz/graphs/directed/sdh.gv
+share/graphviz/graphs/directed/shells.gv
+share/graphviz/graphs/directed/states.gv
+share/graphviz/graphs/directed/structs.gv
+share/graphviz/graphs/directed/switch.gv
+share/graphviz/graphs/directed/table.gv
+share/graphviz/graphs/directed/train11.gv
+share/graphviz/graphs/directed/trapeziumlr.gv
+share/graphviz/graphs/directed/tree.gv
+share/graphviz/graphs/directed/triedds.gv
+share/graphviz/graphs/directed/try.gv
+share/graphviz/graphs/directed/unix.gv
+share/graphviz/graphs/directed/unix2.gv
+share/graphviz/graphs/directed/viewfile.gv
+share/graphviz/graphs/directed/world.gv
+share/graphviz/graphs/undirected/ER.gv
+share/graphviz/graphs/undirected/Heawood.gv
+share/graphviz/graphs/undirected/Petersen.gv
+share/graphviz/graphs/undirected/ngk10_4.gv
+share/graphviz/graphs/undirected/process.gv
 share/graphviz/lefty/box.lefty
 share/graphviz/lefty/def.lefty
 share/graphviz/lefty/dotty.lefty
@@ -321,56 +413,6 @@ share/graphviz/lefty/fractal2.lefty
 share/graphviz/lefty/lefty.psp
 share/graphviz/lefty/slides.lefty
 share/graphviz/lefty/tree.lefty
-${PLIST.x11}share/graphviz/doc/pdf/lefty.pdf
-${PLIST.pangocairo}lib/graphviz/libgvplugin_pango.la
-${PLIST.pangocairo}lib/graphviz/libgvplugin_xlib.la
-${PLIST.guile}lib/graphviz/guile/libgv_guile.la
-${PLIST.lua}lib/graphviz/lua/libgv_lua.la
-${PLIST.guile}man/mann/gv_guile.n
-${PLIST.lua}man/mann/gv_lua.n
-${PLIST.lua}share/graphviz/demo/modgraph.lua
-${PLIST.tcl}lib/graphviz/tcl/libgv_tcl.la
-${PLIST.tcl}lib/graphviz/tcl/libtcldot.la
-${PLIST.tcl}lib/graphviz/tcl/libtcldot_builtin.la
-${PLIST.tcl}lib/graphviz/tcl/libtclplan.la
-${PLIST.tcl}lib/graphviz/tcl/libtkspline.la
-${PLIST.tcl}lib/graphviz/tcl/pkgIndex.tcl
-${PLIST.tcl}man/mann/gv_tcl.n
-${PLIST.tcl}man/mann/tcldot.n
-${PLIST.tcl}man/mann/tkspline.n
-${PLIST.tcl}share/graphviz/demo/doted.tcl
-${PLIST.tcl}share/graphviz/demo/doted.tcl.README
-${PLIST.tcl}share/graphviz/demo/entities.tcl
-${PLIST.tcl}share/graphviz/demo/entities.tcl.README
-${PLIST.tcl}share/graphviz/demo/entities.tcl.html
-${PLIST.tcl}share/graphviz/demo/gcat.tcl
-${PLIST.tcl}share/graphviz/demo/gcat.tcl.README
-${PLIST.tcl}share/graphviz/demo/modgraph.tcl
-${PLIST.tcl}share/graphviz/demo/pathplan.tcl
-${PLIST.tcl}share/graphviz/demo/pathplan.tcl.README
-${PLIST.tcl}share/graphviz/demo/pathplan_data/boxes.dat
-${PLIST.tcl}share/graphviz/demo/pathplan_data/dpd.dat
-${PLIST.tcl}share/graphviz/demo/pathplan_data/funny.dat
-${PLIST.tcl}share/graphviz/demo/pathplan_data/maze.dat
-${PLIST.tcl}share/graphviz/demo/pathplan_data/nested.dat
-${PLIST.tcl}share/graphviz/demo/pathplan_data/northo.dat
-${PLIST.tcl}share/graphviz/demo/pathplan_data/obs.dat
-${PLIST.tcl}share/graphviz/demo/pathplan_data/other.dat
-${PLIST.tcl}share/graphviz/demo/pathplan_data/paths.dat
-${PLIST.tcl}share/graphviz/demo/pathplan_data/rotor.dat
-${PLIST.tcl}share/graphviz/demo/pathplan_data/u.dat
-${PLIST.tcl}share/graphviz/demo/pathplan_data/unknown.dat
-${PLIST.tcl}share/graphviz/demo/spline.tcl
-${PLIST.tcl}share/graphviz/demo/spline.tcl.README
-${PLIST.tcl}share/graphviz/doc/html/tcldot.html
-${PLIST.tcl}share/graphviz/doc/pdf/tcldot.pdf
-${PLIST.tcl}share/graphviz/doc/pdf/tkspline.pdf
-${PLIST.gtk}lib/graphviz/libgvplugin_gdk_pixbuf.la
-${PLIST.gtk}lib/graphviz/libgvplugin_gtk.la
-${PLIST.gd}bin/diffimg
-${PLIST.gd}${PLIST.tcl}lib/graphviz/tcl/libgdtclft.la
-${PLIST.gd}${PLIST.tcl}man/mann/gdtclft.n
-${PLIST.gd}${PLIST.tcl}share/graphviz/doc/pdf/gdtclft.pdf
 @exec ${MKDIR} %D/share/graphviz/smyrna
 @dirrm share/graphviz/smyrna
 @dirrm share/graphviz/lefty
@@ -380,12 +422,16 @@ ${PLIST.gd}${PLIST.tcl}share/graphviz/doc/pdf/gdtclft.pdf
 @exec ${MKDIR} %D/share/graphviz/examples
 @dirrm share/graphviz/examples
 @dirrm share/graphviz/doc/pdf
+@dirrm share/graphviz/doc/html/schema
 @dirrm share/graphviz/doc/html/info
 @dirrm share/graphviz/doc/html
 @dirrm share/graphviz/doc
+@exec ${MKDIR} %D/share/graphviz/demo/pathplan_data
 @dirrm share/graphviz/demo/pathplan_data
 @dirrm share/graphviz/demo
 @dirrm share/graphviz
+@exec ${MKDIR} %D/lib/lua/5.1
+@dirrm lib/lua/5.1
 @dirrm lib/graphviz/tcl
 @exec ${MKDIR} %D/lib/graphviz/sharp
 @dirrm lib/graphviz/sharp
@@ -405,6 +451,7 @@ ${PLIST.gd}${PLIST.tcl}share/graphviz/doc/pdf/gdtclft.pdf
 @dirrm lib/graphviz/perl
 @exec ${MKDIR} %D/lib/graphviz/ocaml
 @dirrm lib/graphviz/ocaml
+@exec ${MKDIR} %D/lib/graphviz/lua
 @dirrm lib/graphviz/lua
 @exec ${MKDIR} %D/lib/graphviz/java
 @dirrm lib/graphviz/java
diff --git a/graphics/graphviz/distinfo b/graphics/graphviz/distinfo
index e625fefdfec..43b152eedc4 100644
--- a/graphics/graphviz/distinfo
+++ b/graphics/graphviz/distinfo
@@ -1,11 +1,11 @@
-$NetBSD: distinfo,v 1.33 2009/03/02 11:24:58 tron Exp $
+$NetBSD: distinfo,v 1.34 2009/05/17 12:55:52 sno Exp $
 
-SHA1 (graphviz-2.20.3.tar.gz) = 63ae6bdb6b410387477d339225cc4f61c2bc7322
-RMD160 (graphviz-2.20.3.tar.gz) = 64c80f3af55668e487f911132407c332c3c38e87
-Size (graphviz-2.20.3.tar.gz) = 13381532 bytes
-SHA1 (patch-aa) = f724a5512192aca3e6fdc645729a185790b71d9a
-SHA1 (patch-ab) = f9e4f61d13b1fe88dc56a17225f6bff6dc6e5dcd
-SHA1 (patch-ag) = 4b89f087ba96d29b92a1b8c46e3ac041039df459
-SHA1 (patch-aj) = 0adc177fb7c3e654cf46560a8c91e2712bc7d16a
-SHA1 (patch-ak) = 91133de18229d2165be392c790a504547a3adf64
-SHA1 (patch-ap) = 5111cc72714f8ee96c7dadba4570e01b64ed3647
+SHA1 (graphviz-2.22.2.tar.gz) = 92b40b1fb596a6b3e880e74101921d7681f62c94
+RMD160 (graphviz-2.22.2.tar.gz) = 546eebc1a0b97ffdc431a986102c9e25d1ea216e
+Size (graphviz-2.22.2.tar.gz) = 16674049 bytes
+SHA1 (patch-aa) = c9942207526b60caa90406a5204737be1207b71f
+SHA1 (patch-ab) = 01aae00529da57b9d5dd5ee27c2b9bbef3809d5d
+SHA1 (patch-ag) = 1eb3aab33f132b019a3faaa80bb68d44daa58f61
+SHA1 (patch-aj) = 743e72721f08e99661b09a49b867056dc1c97d3c
+SHA1 (patch-ak) = a70995383b63f51f7ddd3412ccf3867a61d3010d
+SHA1 (patch-ap) = 946df77ed76b1da7de6789247079755a39e9aee3
diff --git a/graphics/graphviz/options.mk b/graphics/graphviz/options.mk
index 040372c221f..b0857187ab7 100644
--- a/graphics/graphviz/options.mk
+++ b/graphics/graphviz/options.mk
@@ -1,30 +1,72 @@
-# $NetBSD: options.mk,v 1.5 2009/02/26 19:45:14 sno Exp $
+# $NetBSD: options.mk,v 1.6 2009/05/17 12:55:52 sno Exp $
 
 PKG_OPTIONS_VAR=	PKG_OPTIONS.graphviz
-PKG_SUPPORTED_OPTIONS=	x11 pangocairo guile lua ocaml swig tcl gtk gd
-PKG_SUGGESTED_OPTIONS=	x11 pangocairo lua swig tcl
+PKG_SUPPORTED_OPTIONS=	gd x11 pangocairo gtk rsvg swig guile lua ocaml tcl perl
+PKG_SUGGESTED_OPTIONS=	gd x11 pangocairo gtk rsvg swig lua tcl perl
 
 .include "../../mk/bsd.options.mk"
 
-PLIST_VARS+=		guile gtk lua ocaml tcl pangocairo x11 gd
+PLIST_VARS+=		gd x11 pangocairo rsvg gtk guile lua ocaml tcl perl
 
 .if !empty(PKG_OPTIONS:Mx11)
 .include "../../x11/libXp/buildlink3.mk"
 .include "../../mk/xaw.buildlink3.mk"
 CONFIGURE_ENV+=		X11PREFIX=${X11PREFIX} X11BASE=${X11BASE}
 PLIST.x11=		yes
+
+.if !empty(PKG_OPTIONS:Mpangocairo)
+.include "../../devel/pango/buildlink3.mk"
+.include "../../graphics/cairo/buildlink3.mk"
+PLIST.pangocairo=	yes
+
+.if !empty(PKG_OPTIONS:Mgtk)
+.include "../../x11/gtk2/buildlink3.mk"
+PLIST.gtk=		yes
+.else
+CONFIGURE_ARGS+=	--without-gdk-pixbuf
+CONFIGURE_ARGS+=	--without-gtk
+CONFIGURE_ARGS+=	--without-gnomeui
+.endif
+
+.if !empty(PKG_OPTIONS:Mrsvg)
+.include "../../graphics/librsvg/buildlink3.mk"
+PLIST.rsvg=		yes
+.else
+CONFIGURE_ARGS+=	--without-rsvg
+.endif
+
+.else
+CONFIGURE_ARGS+=	--without-pangocairo
+
+CONFIGURE_ARGS+=	--without-gdk-pixbuf
+CONFIGURE_ARGS+=	--without-gtk
+CONFIGURE_ARGS+=	--without-gnomeui
+
+CONFIGURE_ARGS+=	--without-rsvg
+.endif
+
 .else
 CONFIGURE_ARGS+=	--without-x
+
+CONFIGURE_ARGS+=	--without-pangocairo
+
+CONFIGURE_ARGS+=	--without-gdk-pixbuf
+CONFIGURE_ARGS+=	--without-gtk
+CONFIGURE_ARGS+=	--without-gnomeui
+
+CONFIGURE_ARGS+=	--without-rsvg
 .endif
 
-.if !empty(PKG_OPTIONS:Mx11) && !empty(PKG_OPTIONS:Mguile)
-.include "../../lang/guile/buildlink3.mk"
-CONFIGURE_ARGS+=	--enable-guile
-PLIST.guile=		yes
+.if !empty(PKG_OPTIONS:Mgd)
+.include "../../graphics/gd/buildlink3.mk"
+PLIST.gd=		yes
 .else
-CONFIGURE_ARGS+=	--disable-guile
+CONFIGURE_ARGS+=	--without-libgd
 .endif
 
+.if !empty(PKG_OPTIONS:Mswig)
+.include "../../devel/swig/buildlink3.mk"
+
 .if !empty(PKG_OPTIONS:Mlua)
 .include "../../lang/lua/buildlink3.mk"
 PLIST.lua=		yes
@@ -39,12 +81,6 @@ PLIST.ocaml=		yes
 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}
@@ -54,26 +90,28 @@ PLIST.tcl=		yes
 CONFIGURE_ARGS+=	--disable-tcl
 .endif
 
-.if !empty(PKG_OPTIONS:Mx11) && !empty(PKG_OPTIONS:Mgtk)
-.include "../../x11/gtk2/buildlink3.mk"
-PLIST.gtk=		yes
+.if !empty(PKG_OPTIONS:Mguile)
+.include "../../lang/guile/buildlink3.mk"
+CONFIGURE_ARGS+=	--enable-guile
+PLIST.guile=		yes
 .else
-CONFIGURE_ARGS+=	--without-gdk-pixbuf
-CONFIGURE_ARGS+=	--without-gtk
-CONFIGURE_ARGS+=	--without-gnomeui
+CONFIGURE_ARGS+=	--disable-guile
 .endif
 
-.if !empty(PKG_OPTIONS:Mgd)
-.include "../../graphics/gd/buildlink3.mk"
-PLIST.gd=		yes
+.if !empty(PKG_OPTIONS:Mperl)
+.include "../../lang/perl5/buildlink3.mk"
+CONFIGURE_ARGS+=	--enable-perl
+PLIST.perl=		yes
+USE_TOOLS+=perl
 .else
-CONFIGURE_ARGS+=	--without-libgd
+CONFIGURE_ARGS+=	--disable-perl
 .endif
 
-.if !empty(PKG_OPTIONS:Mx11) && !empty(PKG_OPTIONS:Mpangocairo)
-.include "../../devel/pango/buildlink3.mk"
-.include "../../graphics/cairo/buildlink3.mk"
-PLIST.pangocairo=		yes
 .else
-CONFIGURE_ARGS+=	--without-pangocairo
+CONFIGURE_ARGS+=	--disable-swig
+CONFIGURE_ARGS+=	--disable-tcl
+CONFIGURE_ARGS+=	--disable-ocaml
+CONFIGURE_ARGS+=	--disable-lua
+CONFIGURE_ARGS+=	--disable-guile
+CONFIGURE_ARGS+=	--disable-perl
 .endif
diff --git a/graphics/graphviz/patches/patch-aa b/graphics/graphviz/patches/patch-aa
index 2ec094b0ddc..5201e9ce5f8 100644
--- a/graphics/graphviz/patches/patch-aa
+++ b/graphics/graphviz/patches/patch-aa
@@ -1,29 +1,19 @@
-$NetBSD: patch-aa,v 1.10 2009/03/02 11:24:58 tron Exp $
+$NetBSD: patch-aa,v 1.11 2009/05/17 12:55:52 sno Exp $
 
---- configure.ac.orig	2008-10-07 19:40:07.000000000 +0100
-+++ configure.ac	2009-03-02 11:04:39.000000000 +0000
-@@ -23,17 +23,30 @@
- AC_SUBST(GRAPHVIZ_VERSION_MINOR)
- AC_SUBST(GRAPHVIZ_VERSION_MICRO)
- 
--# Windows version numbers
--# For the build number: months since Jan 2000, day of month from the timestamp
--# For the revision number: hour, minute from the timestamp
--
--if test $GRAPHVIZ_VERSION_MICRO = "0"; then
--	GRAPHVIZ_VERSION_BUILD=0
--	GRAPHVIZ_VERSION_REVISION=0
--else
--	GRAPHVIZ_VERSION_BUILD=`expr \( ${GRAPHVIZ_VERSION_MICRO:0:4} - 2000 \) \* 12 + ${GRAPHVIZ_VERSION_MICRO:4:2}`${GRAPHVIZ_VERSION_MICRO:6:2}
--	GRAPHVIZ_VERSION_REVISION=${GRAPHVIZ_VERSION_MICRO:9:4}
--fi
-+GRAPHVIZ_VERSION_BUILD=0
-+GRAPHVIZ_VERSION_REVISION=0
-+case "${host_os}" in
+--- configure.ac.orig	2009-04-25 18:39:34.000000000 +0000
++++ configure.ac	2009-04-25 18:55:19.000000000 +0000
+@@ -83,13 +83,24 @@
+ GRAPHVIZ_VERSION_BUILD=0
+ GRAPHVIZ_VERSION_REVISION=0
+ case "${host_os}" in
+-  *uwin* | *cygwin* | *mingw32* )
 +  *uwin* | *cygwin* | *mingw32* ) 
-+	# Windows version numbers
-+	# For the build number: months since Jan 2000, day of month from the timestamp
-+	# For the revision number: hour, minute from the timestamp
+ 	# Windows version numbers
+ 	# For the build number: months since Jan 2000, day of month from the timestamp
+ 	# For the revision number: hour, minute from the timestamp
+-	if test $GRAPHVIZ_VERSION_MICRO != "0"; then
+-		GRAPHVIZ_VERSION_BUILD=`expr \( ${GRAPHVIZ_VERSION_MICRO:0:4} - 2000 \) \* 12 + ${GRAPHVIZ_VERSION_MICRO:4:2}`${GRAPHVIZ_VERSION_MICRO:6:2}
+-		GRAPHVIZ_VERSION_REVISION=${GRAPHVIZ_VERSION_MICRO:9:4}
 +
 +	if test $GRAPHVIZ_VERSION_MICRO = "0"; then
 +		GRAPHVIZ_VERSION_BUILD=0
@@ -38,21 +28,10 @@ $NetBSD: patch-aa,v 1.10 2009/03/02 11:24:58 tron Exp $
 +			print "GRAPHVIZ_VERSION_REVISION=" \
 +				substr($1,10,4)
 +		}'`
-+	fi
-+	;;
-+esac
- AC_SUBST(GRAPHVIZ_VERSION_BUILD)
- AC_SUBST(GRAPHVIZ_VERSION_REVISION)
- 
-@@ -267,6 +280,7 @@
- 	    ;;
-     esac
- else
-+echo ${CC}
-     case "${CC}" in
- 	*icc* )
- 	    # -Wall causes relocation errors with icc
-@@ -753,7 +767,7 @@
+ 	fi
+ 	;;
+ esac
+@@ -807,7 +818,7 @@
  		        LUA_VERSION=`$PKGCONFIG --modversion lua$l`
                          LUA_INCLUDES="$LUA_CFLAGS "`$PKGCONFIG --cflags lua$l`
                          LUA_LIBS="$LUA_LFLAGS "`$PKGCONFIG --libs lua$l`
@@ -61,7 +40,7 @@ $NetBSD: patch-aa,v 1.10 2009/03/02 11:24:58 tron Exp $
      
  		        pkgconfig_lualib_found=`$PKGCONFIG --exists lualib$l 2>/dev/null`
  		        if test  "x$?" = "x0"; then
-@@ -775,7 +789,7 @@
+@@ -829,7 +840,7 @@
                  LUA_INCLUDES=`$LUACONFIG --include`
                  LUA_LIBS=`$LUACONFIG --libs`
  	        LUA_VERSION="5.0.x"
@@ -70,3 +49,42 @@ $NetBSD: patch-aa,v 1.10 2009/03/02 11:24:58 tron Exp $
              fi
          fi
      
+@@ -919,8 +930,8 @@
+         use_ocaml="No (ocaml not available)"
+       else
+         AC_CHECK_PROG(OCAML_OPT,ocamlopt,ocamlopt)
+-        OCAML_INCLUDES=-I/usr/lib$LIBPOSTFIX/ocaml
+-        OCAML_LIBS=-L/usr/lib$LIBPOSTFIX/ocaml
++        OCAML_INCLUDES=-I${PREFIX}/lib$LIBPOSTFIX/ocaml
++        OCAML_LIBS=-L${PREFIX}/lib$LIBPOSTFIX/ocaml
+         save_CPPFLAGS=$CPPFLAGS
+         CPPFLAGS="$CPPFLAGS $OCAML_INCLUDES"
+         AC_CHECK_HEADER(caml/mlvalues.h,[
+@@ -1006,13 +1017,13 @@
+       if test "x$PHP" = "x"; then
+         use_php="No (php not available)"
+       else
+-        if test -d /usr/include/php5; then
+-          PHP_INCLUDES="-I/usr/include/php5 -I/usr/include/php5/main -I/usr/include/php5/Zend -I/usr/include/php5/TSRM"
++        if test -d ${PREFIX}/include/php5; then
++          PHP_INCLUDES="-I${PREFIX}/include/php5 -I${PREFIX}/include/php5/main -I${PREFIX}/include/php5/Zend -I${PREFIX}/include/php5/TSRM"
+         else
+-          PHP_INCLUDES="-I/usr/include/php -I/usr/include/php/main -I/usr/include/php/Zend -I/usr/include/php/TSRM"
++          PHP_INCLUDES="-I${PREFIX}/include/php -I${PREFIX}/include/php/main -I${PREFIX}/include/php/Zend -I${PREFIX}/include/php/TSRM"
+         fi
+-        PHP_INSTALL_DIR="/usr/lib${LIBPOSTFIX}/php/modules"
+-        PHP_INSTALL_DATADIR="/usr/share/php"
++        PHP_INSTALL_DIR="${PREFIX}/lib${LIBPOSTFIX}/php/modules"
++        PHP_INSTALL_DATADIR="${PREFIX}/share/php"
+         PHP_LIBS=
+         save_CPPFLAGS=$CPPFLAGS
+         CPPFLAGS="$CPPFLAGS $PHP_INCLUDES"
+@@ -2232,7 +2243,7 @@
+ 
+ AC_ARG_WITH(platformsdkincludedir,
+   [AS_HELP_STRING([--with-platformsdkincludedir=DIR],[use Platform SDK (Windows) includes from DIR])],
+-  [PLATFORMSDKINCLUDE=$withval; PLATFORMSDKINCLUDE_ESCAPED=${PLATFORMSDKINCLUDE//'\\'/\\\\}; PLATFORMSDKINCLUDE_ESCAPED=${PLATFORMSDKINCLUDE_ESCAPED// /\\ }])
++  [PLATFORMSDKINCLUDE=$withval; PLATFORMSDKINCLUDE_ESCAPED=`echo ${PLATFORMSDKINCLUDE} | sed "s/'\\'/\\\\/g" | sed "s/ /\\ /g"`])
+ 
+ AC_ARG_WITH(platformsdklibdir,
+   [AS_HELP_STRING([--with-platformsdklibdir=DIR],[use Platform SDK (Windows) libraries from DIR])],
diff --git a/graphics/graphviz/patches/patch-ab b/graphics/graphviz/patches/patch-ab
index ea9022b8baa..0952e43b882 100644
--- a/graphics/graphviz/patches/patch-ab
+++ b/graphics/graphviz/patches/patch-ab
@@ -1,31 +1,13 @@
-$NetBS$
+$NetBSD: patch-ab,v 1.17 2009/05/17 12:55:52 sno Exp $
 
---- configure.orig	2008-10-08 00:54:55.000000000 +0100
-+++ configure	2009-03-02 11:03:05.000000000 +0000
-@@ -2402,18 +2402,26 @@
- 
- 
- 
--
--# Windows version numbers
--# For the build number: months since Jan 2000, day of month from the timestamp
--# For the revision number: hour, minute from the timestamp
--
--if test $GRAPHVIZ_VERSION_MICRO = "0"; then
--	GRAPHVIZ_VERSION_BUILD=0
--	GRAPHVIZ_VERSION_REVISION=0
--else
--	GRAPHVIZ_VERSION_BUILD=`expr \( ${GRAPHVIZ_VERSION_MICRO:0:4} - 2000 \) \* 12 + ${GRAPHVIZ_VERSION_MICRO:4:2}`${GRAPHVIZ_VERSION_MICRO:6:2}
--	GRAPHVIZ_VERSION_REVISION=${GRAPHVIZ_VERSION_MICRO:9:4}
--fi
-+GRAPHVIZ_VERSION_BUILD=0
-+GRAPHVIZ_VERSION_REVISION=0
-+case "${host_os}" in
-+  *uwin* | *cygwin* | *mingw32* )
-+	# Windows version numbers
-+	# For the build number: months since Jan 2000, day of month from the timestamp
-+	# For the revision number: hour, minute from the timestamp
-+	if test $GRAPHVIZ_VERSION_MICRO != "0"; then
+--- configure.orig	2009-04-25 18:25:48.000000000 +0000
++++ configure	2009-04-25 18:53:35.000000000 +0000
+@@ -2593,11 +2593,18 @@
+ 	# For the build number: months since Jan 2000, day of month from the timestamp
+ 	# For the revision number: hour, minute from the timestamp
+ 	if test $GRAPHVIZ_VERSION_MICRO != "0"; then
+-		GRAPHVIZ_VERSION_BUILD=`expr \( ${GRAPHVIZ_VERSION_MICRO:0:4} - 2000 \) \* 12 + ${GRAPHVIZ_VERSION_MICRO:4:2}`${GRAPHVIZ_VERSION_MICRO:6:2}
+-		GRAPHVIZ_VERSION_REVISION=${GRAPHVIZ_VERSION_MICRO:9:4}
 +		# JR: patch from Michael van Elst:
 +		#     if we have a shellm we should have a working awk, too
 +		eval `echo "$GRAPHVIZ_VERSION_MICRO" | awk '{
@@ -35,13 +17,14 @@ $NetBS$
 +			print "GRAPHVIZ_VERSION_REVISION=" \
 +				substr($1,10,4)
 +		}'`
-+	fi
-+	;;
+ 	fi
+ 	;;
+-esac
 +esac 
  
  
  
-@@ -6457,6 +6465,9 @@
+@@ -6448,6 +6455,9 @@
  	    ;;
  	*-sgi-irix* )
  	    ;;
@@ -50,8 +33,8 @@ $NetBS$
 +	    ;;
      esac
  else
-     case "${CC}" in
-@@ -26311,7 +26322,7 @@
+     for ac_prog in windres
+@@ -26307,7 +26317,7 @@
  		        LUA_VERSION=`$PKGCONFIG --modversion lua$l`
                          LUA_INCLUDES="$LUA_CFLAGS "`$PKGCONFIG --cflags lua$l`
                          LUA_LIBS="$LUA_LFLAGS "`$PKGCONFIG --libs lua$l`
@@ -60,7 +43,7 @@ $NetBS$
  
  		        pkgconfig_lualib_found=`$PKGCONFIG --exists lualib$l 2>/dev/null`
  		        if test  "x$?" = "x0"; then
-@@ -26375,7 +26386,7 @@
+@@ -26371,7 +26381,7 @@
                  LUA_INCLUDES=`$LUACONFIG --include`
                  LUA_LIBS=`$LUACONFIG --libs`
  	        LUA_VERSION="5.0.x"
@@ -69,14 +52,42 @@ $NetBS$
              fi
          fi
  
-@@ -34814,10 +34825,6 @@
+@@ -26957,8 +26967,8 @@
+ fi
  
  
+-        OCAML_INCLUDES=-I/usr/lib$LIBPOSTFIX/ocaml
+-        OCAML_LIBS=-L/usr/lib$LIBPOSTFIX/ocaml
++        OCAML_INCLUDES=-I${PREFIX}/lib$LIBPOSTFIX/ocaml
++        OCAML_LIBS=-L${PREFIX}/lib$LIBPOSTFIX/ocaml
+         save_CPPFLAGS=$CPPFLAGS
+         CPPFLAGS="$CPPFLAGS $OCAML_INCLUDES"
+         if test "${ac_cv_header_caml_mlvalues_h+set}" = set; then
+@@ -27414,13 +27424,13 @@
+       if test "x$PHP" = "x"; then
+         use_php="No (php not available)"
+       else
+-        if test -d /usr/include/php5; then
+-          PHP_INCLUDES="-I/usr/include/php5 -I/usr/include/php5/main -I/usr/include/php5/Zend -I/usr/include/php5/TSRM"
++        if test -d ${PREFIX}/include/php5; then
++          PHP_INCLUDES="-I${PREFIX}/include/php5 -I${PREFIX}/include/php5/main -I${PREFIX}/include/php5/Zend -I${PREFIX}/include/php5/TSRM"
+         else
+-          PHP_INCLUDES="-I/usr/include/php -I/usr/include/php/main -I/usr/include/php/Zend -I/usr/include/php/TSRM"
++          PHP_INCLUDES="-I${PREFIX}/include/php -I${PREFIX}/include/php/main -I${PREFIX}/include/php/Zend -I${PREFIX}/include/php/TSRM"
+         fi
+-        PHP_INSTALL_DIR="/usr/lib${LIBPOSTFIX}/php/modules"
+-        PHP_INSTALL_DATADIR="/usr/share/php"
++        PHP_INSTALL_DIR="${PREFIX}/lib${LIBPOSTFIX}/php/modules"
++        PHP_INSTALL_DATADIR="${PREFIX}/share/php"
+         PHP_LIBS=
+         save_CPPFLAGS=$CPPFLAGS
+         CPPFLAGS="$CPPFLAGS $PHP_INCLUDES"
+@@ -33333,7 +33343,7 @@
  
--# Check whether --with-platformsdkincludedir was given.
--if test "${with_platformsdkincludedir+set}" = set; then
+ # Check whether --with-platformsdkincludedir was given.
+ if test "${with_platformsdkincludedir+set}" = set; then
 -  withval=$with_platformsdkincludedir; PLATFORMSDKINCLUDE=$withval; PLATFORMSDKINCLUDE_ESCAPED=${PLATFORMSDKINCLUDE//'\\'/\\\\}; PLATFORMSDKINCLUDE_ESCAPED=${PLATFORMSDKINCLUDE_ESCAPED// /\\ }
--fi
- 
++  withval=$with_platformsdkincludedir; PLATFORMSDKINCLUDE=$withval; PLATFORMSDKINCLUDE_ESCAPED=`echo ${PLATFORMSDKINCLUDE} | sed "s/'\\'/\\\\/g" | sed "s/ /\\ /g"`
+ fi
  
  
diff --git a/graphics/graphviz/patches/patch-ag b/graphics/graphviz/patches/patch-ag
index 7e40cd06378..7a4676baf8e 100644
--- a/graphics/graphviz/patches/patch-ag
+++ b/graphics/graphviz/patches/patch-ag
@@ -1,13 +1,13 @@
-$NetBSD: patch-ag,v 1.13 2009/02/26 19:45:14 sno Exp $
+$NetBSD: patch-ag,v 1.14 2009/05/17 12:55:52 sno Exp $
 
---- lib/gvc/Makefile.in.orig	2008-12-01 12:32:24.000000000 +0100
-+++ lib/gvc/Makefile.in	2008-12-01 12:32:52.000000000 +0100
-@@ -465,7 +465,7 @@
+--- lib/gvc/Makefile.in.orig	2009-03-13 18:19:15.000000000 +0000
++++ lib/gvc/Makefile.in	2009-04-25 20:20:54.000000000 +0000
+@@ -433,7 +431,7 @@
  	$(top_builddir)/lib/cdt/libcdt.la \
- 	$(top_builddir)/lib/graph/libgraph.la \
+ 	$(top_builddir)/lib/$(GRAPH)/lib$(GRAPH).la \
  	$(top_builddir)/lib/pathplan/libpathplan.la \
--	@EXPAT_LIBS@ @Z_LIBS@ @MATH_LIBS@
-+	@EXPAT_LIBS@ @Z_LIBS@ @MATH_LIBS@ ${PTHREAD_LDFLAGS} ${PTHREAD_LIBS}
+-	$(EXPAT_LIBS) $(Z_LIBS) $(MATH_LIBS)
++	$(EXPAT_LIBS) $(Z_LIBS) $(MATH_LIBS) ${PTHREAD_LDFLAGS} ${PTHREAD_LIBS\
  
- 
- #For use without plugins.
+ libgvc_la_DEPENDENCIES = $(libgvc_C_la_DEPENDENCIES)
+ EXTRA_DIST = $(man_MANS) $(pdf_DATA) Makefile.old regex_win32.h regex_win32.c gvc.vcproj
diff --git a/graphics/graphviz/patches/patch-aj b/graphics/graphviz/patches/patch-aj
index d1feeb971c8..2a1ddb2eb52 100644
--- a/graphics/graphviz/patches/patch-aj
+++ b/graphics/graphviz/patches/patch-aj
@@ -1,20 +1,20 @@
-$NetBSD: patch-aj,v 1.10 2009/02/26 19:45:14 sno Exp $
+$NetBSD: patch-aj,v 1.11 2009/05/17 12:55:52 sno Exp $
 
---- plugin/gd/Makefile.am.orig	2008-12-01 12:39:07.000000000 +0100
-+++ plugin/gd/Makefile.am	2008-12-01 12:40:44.000000000 +0100
-@@ -33,6 +33,7 @@
+--- plugin/gd/Makefile.am.orig	2009-03-01 16:57:51.000000000 +0000
++++ plugin/gd/Makefile.am	2009-04-25 18:09:16.000000000 +0000
+@@ -39,6 +39,7 @@
  	$(top_builddir)/lib/gd/libgvgd_C.la \
  	$(top_builddir)/lib/gvc/libgvc.la \
- 	$(top_builddir)/lib/graph/libgraph.la \
+ 	$(top_builddir)/lib/$(GRAPH)/lib$(GRAPH).la \
 +	$(top_builddir)/lib/pathplan/libpathplan.la \
  	$(top_builddir)/lib/cdt/libcdt.la \
  	@ICONV_LIBS@ @FONTCONFIG_LIBS@ @FREETYPE2_LIBS@ @JPEG_LIBS@ @PNG_LIBS@ @EXPAT_LIBS@ @Z_LIBS@ @MATH_LIBS@
  AM_CPPFLAGS += -DNONDLL
-@@ -40,6 +41,7 @@
+@@ -46,6 +47,7 @@
  libgvplugin_gd_la_LIBADD = \
  	$(top_builddir)/lib/gvc/libgvc.la \
- 	$(top_builddir)/lib/graph/libgraph.la \
+ 	$(top_builddir)/lib/$(GRAPH)/lib$(GRAPH).la \
 +	$(top_builddir)/lib/pathplan/libpathplan.la \
  	$(top_builddir)/lib/cdt/libcdt.la @GD_LIBS@ @MATH_LIBS@
  endif
- 
+ libgvplugin_gd_la_DEPENDENCIES =  $(top_builddir)/lib/gvc/libgvc.la
diff --git a/graphics/graphviz/patches/patch-ak b/graphics/graphviz/patches/patch-ak
index e0267d30932..645eb00e818 100644
--- a/graphics/graphviz/patches/patch-ak
+++ b/graphics/graphviz/patches/patch-ak
@@ -1,19 +1,19 @@
-$NetBSD: patch-ak,v 1.12 2009/02/26 19:45:14 sno Exp $
+$NetBSD: patch-ak,v 1.13 2009/05/17 12:55:52 sno Exp $
 
---- plugin/gd/Makefile.in.orig	2008-12-01 12:42:20.000000000 +0100
-+++ plugin/gd/Makefile.in	2008-12-01 12:43:10.000000000 +0100
-@@ -64,12 +64,14 @@
- @WITH_MYLIBGD_FALSE@libgvplugin_gd_la_DEPENDENCIES =  \
+--- plugin/gd/Makefile.in.orig	2009-03-13 18:19:20.000000000 +0000
++++ plugin/gd/Makefile.in	2009-04-25 18:15:00.000000000 +0000
+@@ -410,12 +410,14 @@
+ @WITH_MYLIBGD_FALSE@libgvplugin_gd_la_LIBADD =  \
  @WITH_MYLIBGD_FALSE@	$(top_builddir)/lib/gvc/libgvc.la \
- @WITH_MYLIBGD_FALSE@	$(top_builddir)/lib/graph/libgraph.la \
+ @WITH_MYLIBGD_FALSE@	$(top_builddir)/lib/$(GRAPH)/lib$(GRAPH).la \
 +@WITH_MYLIBGD_FALSE@	$(top_builddir)/lib/pathplan/libpathplan.la \
  @WITH_MYLIBGD_FALSE@	$(top_builddir)/lib/cdt/libcdt.la \
- @WITH_MYLIBGD_FALSE@	$(am__append_3)
- @WITH_MYLIBGD_TRUE@libgvplugin_gd_la_DEPENDENCIES =  \
+ @WITH_MYLIBGD_FALSE@	@GD_LIBS@ @MATH_LIBS@ $(am__append_3)
+ @WITH_MYLIBGD_TRUE@libgvplugin_gd_la_LIBADD =  \
  @WITH_MYLIBGD_TRUE@	$(top_builddir)/lib/gd/libgvgd_C.la \
  @WITH_MYLIBGD_TRUE@	$(top_builddir)/lib/gvc/libgvc.la \
- @WITH_MYLIBGD_TRUE@	$(top_builddir)/lib/graph/libgraph.la \
+ @WITH_MYLIBGD_TRUE@	$(top_builddir)/lib/$(GRAPH)/lib$(GRAPH).la \
 +@WITH_MYLIBGD_TRUE@	$(top_builddir)/lib/pathplan/libpathplan.la \
  @WITH_MYLIBGD_TRUE@	$(top_builddir)/lib/cdt/libcdt.la \
- @WITH_MYLIBGD_TRUE@	$(am__append_3)
- am__objects_1 = gvplugin_gd.lo gvrender_gd.lo gvrender_gd_vrml.lo \
+ @WITH_MYLIBGD_TRUE@	@ICONV_LIBS@ @FONTCONFIG_LIBS@ \
+ @WITH_MYLIBGD_TRUE@	@FREETYPE2_LIBS@ @JPEG_LIBS@ @PNG_LIBS@ \
diff --git a/graphics/graphviz/patches/patch-ap b/graphics/graphviz/patches/patch-ap
index c2ad4e88cc5..d8370c84506 100644
--- a/graphics/graphviz/patches/patch-ap
+++ b/graphics/graphviz/patches/patch-ap
@@ -1,20 +1,21 @@
-$NetBSD: patch-ap,v 1.11 2009/02/26 19:45:14 sno Exp $
+$NetBSD: patch-ap,v 1.12 2009/05/17 12:55:52 sno Exp $
 
---- lib/gvc/gvconfig.c.orig	2008-12-01 12:48:23.000000000 +0100
-+++ lib/gvc/gvconfig.c	2008-12-01 12:50:26.000000000 +0100
-@@ -526,10 +526,7 @@
+--- lib/gvc/gvconfig.c.orig	2009-02-25 17:46:45.000000000 +0000
++++ lib/gvc/gvconfig.c	2009-04-25 18:18:53.000000000 +0000
+@@ -543,11 +543,7 @@
          }
          else {
      	    f = fopen(gvc->config_path,"r");
 -    	    if (!f) {
 -    	        agerr (AGERR,"failed to open %s for read.\n", gvc->config_path);
+-		exit(1);
 -    	    }
 -    	    else {
 +    	    if (f) {
      	        config_text = gmalloc(config_st.st_size + 1);
      	        sz = fread(config_text, 1, config_st.st_size, f);
      	        if (sz == 0) {
-@@ -542,10 +539,13 @@
+@@ -560,10 +556,13 @@
      	            rc = gvconfig_plugin_install_from_config(gvc, config_text);
      		    /* NB. config_text not freed because we retain char* into it */
      	        }
author	sno <sno@pkgsrc.org>	2009-05-17 12:55:52 +0000
committer	sno <sno@pkgsrc.org>	2009-05-17 12:55:52 +0000
commit	1fc133e9e595de7f7f07a8906ae452a60bb4cf01 (patch)
tree	d90e6f6a7910f33c7b71e97783fd1db6fedb190e /graphics
parent	af726844040f8d4a685740a51c261207d44d34cf (diff)
download	pkgsrc-1fc133e9e595de7f7f07a8906ae452a60bb4cf01.tar.gz