Thu Feb 26 19:45:14 2009 UTC ()
pkgsrc changes:

- update to 2.20.3

Upstream changes:

October 7, 2008
        - Release 2.20.1
        - Security fix for stack overflow problem in the graph parser reported by IBM
June 25, 2008
        - Release 2.20.2
        - Fix bug in HTML-like labels
June 23, 2008
        - Release 2.20.1
        - Fix bug in ccomps related to conversion to cgraph
June 20, 2008
        - Release 2.20.0
        - Preparing for Release 2.20
        - Fixed bugs: 1315, 1317, 1324, 1336, 1343, 1364
        - Add new "folder" shape for nodes.
        - Migration of gvpr tools to libcgraph.
        - New output format -Teps  (encapsulated postscript)
        - Various NetBSD and SuSE fixes incorporated
        - ./configure now provides a summary
        - RPM specfile updates for fedora-10 (no more string comparisons)
        - Add MacOS support (Glen Low)
March 10, 2008
        - Release 2.18
        - Fixed bugs: 1249, 1255, 1256, 1268, 1276, 1289, 1295, 1300,
                Fedora BZ#247376,
        - in -Tps use a new number formatter that suppresses trailing 0.
        - support tcl/tk-8.5
        - support gcc-4.3
        - support for node usershapes/images in svg format (thanks Alex Poylisher)
        - install: perl, php, python, ruby, tcl, bindings in language-specified directories
        - add arrowhead scaling with edge penwidth
        - add "folder" node shape (thanks Pander)
        - many windows and mac fixes (thanks Glen)
        - add "smyna" large graph view (thanks Arif) (not yet included in binary distros)


(sno)
diff -r1.66 -r1.67 pkgsrc/graphics/graphviz/Makefile
diff -r1.25 -r1.26 pkgsrc/graphics/graphviz/PLIST
diff -r1.14 -r1.15 pkgsrc/graphics/graphviz/buildlink3.mk
diff -r1.29 -r1.30 pkgsrc/graphics/graphviz/distinfo
diff -r1.4 -r1.5 pkgsrc/graphics/graphviz/options.mk
diff -r1.7 -r1.8 pkgsrc/graphics/graphviz/patches/patch-aa
diff -r1.13 -r1.14 pkgsrc/graphics/graphviz/patches/patch-ab
diff -r1.17 -r0 pkgsrc/graphics/graphviz/patches/patch-ac
diff -r1.9 -r0 pkgsrc/graphics/graphviz/patches/patch-ad
diff -r1.9 -r0 pkgsrc/graphics/graphviz/patches/patch-an
diff -r1.13 -r0 pkgsrc/graphics/graphviz/patches/patch-ae
diff -r1.11 -r0 pkgsrc/graphics/graphviz/patches/patch-af
diff -r1.11 -r0 pkgsrc/graphics/graphviz/patches/patch-ao
diff -r1.12 -r1.13 pkgsrc/graphics/graphviz/patches/patch-ag
diff -r1.10 -r0 pkgsrc/graphics/graphviz/patches/patch-ah
diff -r1.10 -r0 pkgsrc/graphics/graphviz/patches/patch-al
diff -r1.10 -r0 pkgsrc/graphics/graphviz/patches/patch-aq
diff -r1.10 -r0 pkgsrc/graphics/graphviz/patches/patch-as
diff -r1.10 -r0 pkgsrc/graphics/graphviz/patches/patch-au
diff -r1.12 -r0 pkgsrc/graphics/graphviz/patches/patch-ai
diff -r1.12 -r0 pkgsrc/graphics/graphviz/patches/patch-am
diff -r1.9 -r1.10 pkgsrc/graphics/graphviz/patches/patch-aj
diff -r1.11 -r1.12 pkgsrc/graphics/graphviz/patches/patch-ak
diff -r1.10 -r1.11 pkgsrc/graphics/graphviz/patches/patch-ap
diff -r1.8 -r0 pkgsrc/graphics/graphviz/patches/patch-ar
diff -r1.8 -r0 pkgsrc/graphics/graphviz/patches/patch-at
cvs diff -r1.66 -r1.67 pkgsrc/graphics/graphviz/Makefile (expand / switch to context diff)
--- pkgsrc/graphics/graphviz/Makefile 2008/11/10 17:21:36 1.66
+++ pkgsrc/graphics/graphviz/Makefile 2009/02/26 19:45:14 1.67
@@ -1,9 +1,8 @@
-# $NetBSD: Makefile,v 1.66 2008/11/10 17:21:36 wiz Exp $
+# $NetBSD: Makefile,v 1.67 2009/02/26 19:45:14 sno Exp $
 
-DISTNAME=	graphviz-2.16.1
-PKGREVISION=	4
+DISTNAME=	graphviz-2.20.3
 CATEGORIES=	graphics
-MASTER_SITES=	http://www.graphviz.org/pub/graphviz/ARCHIVE/
+MASTER_SITES=	http://www.graphviz.org/pub/graphviz/stable/SOURCES/
 
 MAINTAINER=	pkgsrc-users@NetBSD.org
 HOMEPAGE=	http://www.graphviz.org/
@@ -26,12 +25,11 @@
 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/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
@@ -57,12 +55,9 @@
 .include "../../converters/libiconv/buildlink3.mk"
 .include "../../devel/gettext-lib/buildlink3.mk"
 .include "../../devel/libltdl/convenience.mk"
-.include "../../devel/pango/buildlink3.mk"
-.include "../../graphics/gd/buildlink3.mk"
-.include "../../graphics/jpeg/buildlink3.mk"
-.include "../../graphics/png/buildlink3.mk"
+.include "../../fonts/fontconfig/buildlink3.mk"
+#.include "../../graphics/jpeg/buildlink3.mk"
+#.include "../../graphics/png/buildlink3.mk"
 .include "../../textproc/expat/buildlink3.mk"
-.include "../../x11/libXp/buildlink3.mk"
-.include "../../mk/xaw.buildlink3.mk"
 .include "../../mk/pthread.buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
cvs diff -r1.25 -r1.26 pkgsrc/graphics/graphviz/PLIST (expand / switch to context diff)
--- pkgsrc/graphics/graphviz/PLIST 2008/11/15 01:28:41 1.25
+++ pkgsrc/graphics/graphviz/PLIST 2009/02/26 19:45:14 1.26
@@ -1,27 +1,20 @@
-@comment $NetBSD: PLIST,v 1.25 2008/11/15 01:28:41 epg Exp $
 bin/acyclic
 bin/bcomps
 bin/ccomps
-bin/circo
-bin/diffimg
 bin/dijkstra
 bin/dot
-bin/dot2gxl
 bin/dotty
-bin/fdp
 bin/gc
 bin/gvcolor
 bin/gvpack
 bin/gvpr
 bin/gxl2dot
-bin/lefty
+${PLIST.x11}bin/lefty
 bin/lneato
-bin/neato
 bin/nop
 bin/prune
 bin/sccmap
 bin/tred
-bin/twopi
 bin/unflatten
 include/graphviz/agraph.h
 include/graphviz/arith.h
@@ -51,79 +44,60 @@
 include/graphviz/textpara.h
 include/graphviz/types.h
 include/graphviz/usershape.h
+lib/graphviz/config
+lib/graphviz/libgvplugin_core.a
 lib/graphviz/libgvplugin_core.la
+lib/graphviz/libgvplugin_core.so.5
+lib/graphviz/libgvplugin_dot_layout.a
 lib/graphviz/libgvplugin_dot_layout.la
+lib/graphviz/libgvplugin_dot_layout.so.5
+lib/graphviz/libgvplugin_gd.a
 lib/graphviz/libgvplugin_gd.la
-${PLIST.gtk}lib/graphviz/libgvplugin_gdk_pixbuf.la
-${PLIST.gtk}lib/graphviz/libgvplugin_gtk.la
-${PLIST.guile}lib/graphviz/guile/libgv_guile.la
+lib/graphviz/libgvplugin_gd.so.5
+lib/graphviz/libgvplugin_neato_layout.a
 lib/graphviz/libgvplugin_neato_layout.la
-lib/graphviz/libgvplugin_pango.la
-lib/graphviz/libgvplugin_xlib.la
-lib/graphviz/lua/gv.so
-${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.a
-${PLIST.ocaml}lib/graphviz/ocaml/libgv_ocaml.la
-${PLIST.ocaml}lib/graphviz/ocaml/libgv_ocaml.so
-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
-${PLIST.tcl}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
+lib/graphviz/libgvplugin_neato_layout.so.5
+lib/libagraph.a
 lib/libagraph.la
+lib/libagraph.so.4
+lib/libcdt.a
 lib/libcdt.la
+lib/libcdt.so.4
+lib/libcgraph.a
 lib/libcgraph.la
+lib/libcgraph.so.4
+lib/libgraph.a
 lib/libgraph.la
+lib/libgraph.so.4
+lib/libgvc.a
 lib/libgvc.la
-lib/libgvc_builtins.la
+lib/libgvc.so.4
+lib/libpathplan.a
 lib/libpathplan.la
+lib/libpathplan.so.4
 lib/pkgconfig/libagraph.pc
 lib/pkgconfig/libcdt.pc
 lib/pkgconfig/libcgraph.pc
 lib/pkgconfig/libgraph.pc
 lib/pkgconfig/libgvc.pc
-lib/pkgconfig/libgvc_builtins.pc
 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/dot2gxl.1
 man/man1/dotty.1
-man/man1/fdp.1
 man/man1/gc.1
 man/man1/gvcolor.1
 man/man1/gvpack.1
 man/man1/gvpr.1
 man/man1/gxl2dot.1
-man/man1/lefty.1
+${PLIST.x11}man/man1/lefty.1
 man/man1/lneato.1
-man/man1/neato.1
 man/man1/nop.1
 man/man1/prune.1
 man/man1/sccmap.1
 man/man1/tred.1
-man/man1/twopi.1
 man/man1/unflatten.1
 man/man3/agraph.3
 man/man3/cdt.3
@@ -132,42 +106,13 @@
 man/man3/gvc.3
 man/man3/pathplan.3
 man/man7/graphviz.7
-${PLIST.guile}man/mann/gv_guile.n
-${PLIST.lua}man/mann/gv_lua.n
-${PLIST.ocaml}man/mann/gv_ocaml.n
-${PLIST.tcl}man/mann/gdtclft.n
-${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
-${PLIST.tcl}share/graphviz/demo/doted.README
-${PLIST.tcl}share/graphviz/demo/entities
-${PLIST.tcl}share/graphviz/demo/entities.README
-${PLIST.tcl}share/graphviz/demo/entities.html
-${PLIST.tcl}share/graphviz/demo/gcat
-${PLIST.tcl}share/graphviz/demo/gcat.README
-${PLIST.tcl}share/graphviz/demo/pathplan
-${PLIST.tcl}share/graphviz/demo/pathplan.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
-${PLIST.tcl}share/graphviz/demo/spline.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/cpl1.0.txt
+share/graphviz/doc/fontfaq.txt
 share/graphviz/doc/html/FAQ.html
 share/graphviz/doc/html/build.html
 share/graphviz/doc/html/index.html
@@ -235,9 +180,12 @@
 share/graphviz/doc/html/info/back.gif
 share/graphviz/doc/html/info/both.gif
 share/graphviz/doc/html/info/box.gif
+share/graphviz/doc/html/info/box3d.gif
 share/graphviz/doc/html/info/circle.gif
+share/graphviz/doc/html/info/colorlist.gif
 share/graphviz/doc/html/info/colors.html
 share/graphviz/doc/html/info/command.html
+share/graphviz/doc/html/info/component.gif
 share/graphviz/doc/html/info/constraint.gif
 share/graphviz/doc/html/info/diamond.gif
 share/graphviz/doc/html/info/doublecircle.gif
@@ -245,6 +193,7 @@
 share/graphviz/doc/html/info/egg.gif
 share/graphviz/doc/html/info/ellipse.gif
 share/graphviz/doc/html/info/fill.gif
+share/graphviz/doc/html/info/folder.gif
 share/graphviz/doc/html/info/forward.gif
 share/graphviz/doc/html/info/grammar.html
 share/graphviz/doc/html/info/hexagon.gif
@@ -261,6 +210,7 @@
 share/graphviz/doc/html/info/mrecord.gif
 share/graphviz/doc/html/info/nohead.gif
 share/graphviz/doc/html/info/none.gif
+share/graphviz/doc/html/info/note.gif
 share/graphviz/doc/html/info/octagon.gif
 share/graphviz/doc/html/info/output.html
 share/graphviz/doc/html/info/parallelogram.gif
@@ -272,14 +222,13 @@
 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.jpg
 share/graphviz/doc/html/info/septagon.gif
 share/graphviz/doc/html/info/shapes.html
+share/graphviz/doc/html/info/tab.gif
 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
-${PLIST.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
@@ -288,35 +237,26 @@
 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/dotguide.pdf
 share/graphviz/doc/pdf/dotty.pdf
 share/graphviz/doc/pdf/dottyguide.pdf
-share/graphviz/doc/pdf/fdp.pdf
 share/graphviz/doc/pdf/gc.pdf
-${PLIST.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
 share/graphviz/doc/pdf/gvpack.pdf
 share/graphviz/doc/pdf/gvpr.pdf
 share/graphviz/doc/pdf/gxl2dot.pdf
-share/graphviz/doc/pdf/lefty.pdf
 share/graphviz/doc/pdf/leftyguide.pdf
 share/graphviz/doc/pdf/lneato.pdf
-share/graphviz/doc/pdf/neato.pdf
 share/graphviz/doc/pdf/neatoguide.pdf
 share/graphviz/doc/pdf/nop.pdf
 share/graphviz/doc/pdf/pathplan.pdf
 share/graphviz/doc/pdf/prune.pdf
 share/graphviz/doc/pdf/sccmap.pdf
-${PLIST.tcl}share/graphviz/doc/pdf/tcldot.pdf
-${PLIST.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
 share/graphviz/graphs/directed/KW91.dot
 share/graphviz/graphs/directed/Latin1.dot
@@ -386,10 +326,88 @@
 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.a
+${PLIST.pangocairo}lib/graphviz/libgvplugin_pango.la
+${PLIST.pangocairo}lib/graphviz/libgvplugin_pango.so.5
+${PLIST.pangocairo}lib/graphviz/libgvplugin_xlib.a
+${PLIST.pangocairo}lib/graphviz/libgvplugin_xlib.la
+${PLIST.pangocairo}lib/graphviz/libgvplugin_xlib.so.5
+${PLIST.guile}lib/graphviz/guile/libgv_guile.a
+${PLIST.guile}lib/graphviz/guile/libgv_guile.la
+${PLIST.guile}lib/graphviz/guile/libgv_guile.so
+${PLIST.lua}lib/graphviz/lua/libgv_lua.a
+${PLIST.lua}lib/graphviz/lua/libgv_lua.la
+${PLIST.lua}lib/graphviz/lua/libgv_lua.so
+${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.a
+${PLIST.tcl}lib/graphviz/tcl/libgv_tcl.la
+${PLIST.tcl}lib/graphviz/tcl/libgv_tcl.so
+${PLIST.tcl}lib/graphviz/tcl/libtcldot.a
+${PLIST.tcl}lib/graphviz/tcl/libtcldot.la
+${PLIST.tcl}lib/graphviz/tcl/libtcldot.so.0
+${PLIST.tcl}lib/graphviz/tcl/libtcldot_builtin.a
+${PLIST.tcl}lib/graphviz/tcl/libtcldot_builtin.la
+${PLIST.tcl}lib/graphviz/tcl/libtcldot_builtin.so.0
+${PLIST.tcl}lib/graphviz/tcl/libtclplan.a
+${PLIST.tcl}lib/graphviz/tcl/libtclplan.la
+${PLIST.tcl}lib/graphviz/tcl/libtclplan.so.0
+${PLIST.tcl}lib/graphviz/tcl/libtkspline.a
+${PLIST.tcl}lib/graphviz/tcl/libtkspline.la
+${PLIST.tcl}lib/graphviz/tcl/libtkspline.so.0
+${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.a
+${PLIST.gtk}lib/graphviz/libgvplugin_gdk_pixbuf.la
+${PLIST.gtk}lib/graphviz/libgvplugin_gdk_pixbuf.so.5
+${PLIST.gtk}lib/graphviz/libgvplugin_gtk.a
+${PLIST.gtk}lib/graphviz/libgvplugin_gtk.la
+${PLIST.gtk}lib/graphviz/libgvplugin_gtk.so.5
+${PLIST.gd}bin/diffimg
+${PLIST.gd}${PLIST.tcl}lib/graphviz/tcl/libgdtclft.a
+${PLIST.gd}${PLIST.tcl}lib/graphviz/tcl/libgdtclft.la
+${PLIST.gd}${PLIST.tcl}lib/graphviz/tcl/libgdtclft.so.0
+${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
 @dirrm share/graphviz/graphs/undirected
 @dirrm share/graphviz/graphs/directed
 @dirrm share/graphviz/graphs
+@exec ${MKDIR} %D/share/graphviz/examples
+@dirrm share/graphviz/examples
 @dirrm share/graphviz/doc/pdf
 @dirrm share/graphviz/doc/html/info
 @dirrm share/graphviz/doc/html
@@ -400,14 +418,19 @@
 @dirrm lib/graphviz/tcl
 @exec ${MKDIR} %D/lib/graphviz/sharp
 @dirrm lib/graphviz/sharp
+@exec ${MKDIR} %D/lib/graphviz/ruby
 @dirrm lib/graphviz/ruby
-@dirrm lib/graphviz/r
+@exec ${MKDIR} %D/lib/graphviz/python25
 @dirrm lib/graphviz/python25
+@exec ${MKDIR} %D/lib/graphviz/python24
 @dirrm lib/graphviz/python24
+@exec ${MKDIR} %D/lib/graphviz/python23
 @dirrm lib/graphviz/python23
+@exec ${MKDIR} %D/lib/graphviz/python
 @dirrm lib/graphviz/python
 @exec ${MKDIR} %D/lib/graphviz/php
 @dirrm lib/graphviz/php
+@exec ${MKDIR} %D/lib/graphviz/perl
 @dirrm lib/graphviz/perl
 @exec ${MKDIR} %D/lib/graphviz/ocaml
 @dirrm lib/graphviz/ocaml
@@ -416,7 +439,9 @@
 @dirrm lib/graphviz/java
 @exec ${MKDIR} %D/lib/graphviz/io
 @dirrm lib/graphviz/io
-@exec ${MKDIR} %D/lib/graphviz/guile
 @dirrm lib/graphviz/guile
+@exec ${MKDIR} %D/lib/graphviz/R
+@dirrm lib/graphviz/R
 @dirrm lib/graphviz
 @dirrm include/graphviz
+
cvs diff -r1.14 -r1.15 pkgsrc/graphics/graphviz/buildlink3.mk (expand / switch to context diff)
--- pkgsrc/graphics/graphviz/buildlink3.mk 2008/02/06 18:56:52 1.14
+++ pkgsrc/graphics/graphviz/buildlink3.mk 2009/02/26 19:45:14 1.15
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.14 2008/02/06 18:56:52 adam Exp $
+# $NetBSD: buildlink3.mk,v 1.15 2009/02/26 19:45:14 sno Exp $
 
 BUILDLINK_DEPTH:=		${BUILDLINK_DEPTH}+
 GRAPHVIZ_BUILDLINK3_MK:=	${GRAPHVIZ_BUILDLINK3_MK}+
@@ -18,7 +18,7 @@
 .endif	# GRAPHVIZ_BUILDLINK3_MK
 
 .include "../../converters/libiconv/buildlink3.mk"
-.include "../../devel/pango/buildlink3.mk"
+#.include "../../devel/pango/buildlink3.mk"
 .include "../../graphics/jpeg/buildlink3.mk"
 .include "../../graphics/png/buildlink3.mk"
 .include "../../textproc/expat/buildlink3.mk"
cvs diff -r1.29 -r1.30 pkgsrc/graphics/graphviz/distinfo (expand / switch to context diff)
--- pkgsrc/graphics/graphviz/distinfo 2008/10/12 13:14:39 1.29
+++ pkgsrc/graphics/graphviz/distinfo 2009/02/26 19:45:14 1.30
@@ -1,26 +1,11 @@
-$NetBSD: distinfo,v 1.29 2008/10/12 13:14:39 tron Exp $
+$NetBSD: distinfo,v 1.30 2009/02/26 19:45:14 sno Exp $
 
-SHA1 (graphviz-2.16.1.tar.gz) = 46b704bd9b81922bcd17167c88f3278a9645e894
+SHA1 (graphviz-2.20.3.tar.gz) = 63ae6bdb6b410387477d339225cc4f61c2bc7322
-RMD160 (graphviz-2.16.1.tar.gz) = 6d0f23fa176a1bef7ee0ca48cf1b700fe6cbfb42
+RMD160 (graphviz-2.20.3.tar.gz) = 64c80f3af55668e487f911132407c332c3c38e87
-Size (graphviz-2.16.1.tar.gz) = 8076271 bytes
+Size (graphviz-2.20.3.tar.gz) = 13381532 bytes
-SHA1 (patch-aa) = 4ac7fde6b76fa60c90ac241a4bcd304a7ed2ceeb
+SHA1 (patch-aa) = 6670dcf2d00ee81012b1acbc3bc141f9405c0b30
-SHA1 (patch-ab) = 0d3ac34e473d346ee8c1e2bd058165745c2f9258
+SHA1 (patch-ab) = c7d1f59d1bf2483d16d79dbf9ade57e61a98cded
-SHA1 (patch-ac) = 3ef2ea7bea573463cfa722fc3bfa9d18dde141c2
+SHA1 (patch-ag) = 4b89f087ba96d29b92a1b8c46e3ac041039df459
-SHA1 (patch-ad) = 5bbdfb6ad55ef76abfbc70105ad08fb0dc7a3792
+SHA1 (patch-aj) = 0adc177fb7c3e654cf46560a8c91e2712bc7d16a
-SHA1 (patch-ae) = da929ffd3d736aa5607a59ce325012563b16a994
+SHA1 (patch-ak) = 91133de18229d2165be392c790a504547a3adf64
-SHA1 (patch-af) = 2079dfdbc65afb742412b31e7d5c3e7cfab5c7ec
+SHA1 (patch-ap) = 5111cc72714f8ee96c7dadba4570e01b64ed3647
-SHA1 (patch-ag) = 06506df70858dc9e2a42d96ae2abab8cfc10e9d8
-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
-SHA1 (patch-au) = 896ee85993c69f83a6808b026fa873a82a4cfa3e
cvs diff -r1.4 -r1.5 pkgsrc/graphics/graphviz/options.mk (expand / switch to context diff)
--- pkgsrc/graphics/graphviz/options.mk 2008/11/15 01:28:41 1.4
+++ pkgsrc/graphics/graphviz/options.mk 2009/02/26 19:45:14 1.5
@@ -1,14 +1,23 @@
-# $NetBSD: options.mk,v 1.4 2008/11/15 01:28:41 epg Exp $
+# $NetBSD: options.mk,v 1.5 2009/02/26 19:45:14 sno Exp $
 
 PKG_OPTIONS_VAR=	PKG_OPTIONS.graphviz
-PKG_SUPPORTED_OPTIONS=	guile lua ocaml swig tcl gtk
-PKG_SUGGESTED_OPTIONS=	lua swig tcl
+PKG_SUPPORTED_OPTIONS=	x11 pangocairo guile lua ocaml swig tcl gtk gd
+PKG_SUGGESTED_OPTIONS=	x11 pangocairo lua swig tcl
 
 .include "../../mk/bsd.options.mk"
 
-PLIST_VARS+=		guile gtk lua ocaml tcl
+PLIST_VARS+=		guile gtk lua ocaml tcl pangocairo x11 gd
 
-.if !empty(PKG_OPTIONS:Mguile)
+.if !empty(PKG_OPTIONS:Mx11)
+.include "../../x11/libXp/buildlink3.mk"
+.include "../../mk/xaw.buildlink3.mk"
+CONFIGURE_ENV+=		X11PREFIX=${X11PREFIX} X11BASE=${X11BASE}
+PLIST.x11=		yes
+.else
+CONFIGURE_ARGS+=	--without-x
+.endif
+
+.if !empty(PKG_OPTIONS:Mx11) && !empty(PKG_OPTIONS:Mguile)
 .include "../../lang/guile/buildlink3.mk"
 CONFIGURE_ARGS+=	--enable-guile
 PLIST.guile=		yes
@@ -45,10 +54,26 @@
 CONFIGURE_ARGS+=	--disable-tcl
 .endif
 
-.if !empty(PKG_OPTIONS:Mgtk)
+.if !empty(PKG_OPTIONS:Mx11) && !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:Mgd)
+.include "../../graphics/gd/buildlink3.mk"
+PLIST.gd=		yes
+.else
+CONFIGURE_ARGS+=	--without-libgd
+.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
 .endif
cvs diff -r1.7 -r1.8 pkgsrc/graphics/graphviz/patches/Attic/patch-aa (expand / switch to context diff)
--- pkgsrc/graphics/graphviz/patches/Attic/patch-aa 2008/02/06 18:56:52 1.7
+++ pkgsrc/graphics/graphviz/patches/Attic/patch-aa 2009/02/26 19:45:14 1.8
@@ -1,20 +1,52 @@
-$NetBSD: patch-aa,v 1.7 2008/02/06 18:56:52 adam Exp $
-
---- configure.ac.orig	2007-12-13 05:38:57.000000000 +0100
-+++ configure.ac
-@@ -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 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 \
-@@ -371,6 +372,7 @@ AC_FUNC_ALLOCA
+--- configure.ac.orig	2008-10-07 18:40:07.000000000 +0000
++++ configure.ac	2009-02-26 19:14:19.000000000 +0000
+@@ -23,17 +23,30 @@
+ AC_SUBST(GRAPHVIZ_VERSION_MINOR)
+ AC_SUBST(GRAPHVIZ_VERSION_MICRO)
  
- AC_CHECK_FUNCS([lrand48 drand48 srand48 setmode setenv getenv \
- 	__freadable _sysconf getrusage strerror cbrt lsqrt vsnprintf \
-+	_NSGetEnviron \
- 	strtoul strtoll strtoull uname])
+-# 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
++		GRAPHVIZ_VERSION_BUILD=0
++		GRAPHVIZ_VERSION_REVISION=0
++	else
++		# JR: patch from Michael van Elst:
++		#     if we have a shellm we should have a working awk, too
++		eval `echo "$GRAPHVIZ_VERSION_MICRO" | awk '{
++			print "GRAPHVIZ_VERSION_BUILD=" \
++				(substr($1,1,4)-2000)*12+substr($1,5,2) \
++				substr($1,7,2)
++			print "GRAPHVIZ_VERSION_REVISION=" \
++				substr($1,10,4)
++		}'`
++	fi
++	;;
++esac
+ AC_SUBST(GRAPHVIZ_VERSION_BUILD)
+ AC_SUBST(GRAPHVIZ_VERSION_REVISION)
  
- AC_REPLACE_FUNCS([strcasecmp strncasecmp])
+@@ -267,6 +280,7 @@
+ 	    ;;
+     esac
+ else
++echo ${CC}
+     case "${CC}" in
+ 	*icc* )
+ 	    # -Wall causes relocation errors with icc
cvs diff -r1.13 -r1.14 pkgsrc/graphics/graphviz/patches/Attic/patch-ab (expand / switch to context diff)
--- pkgsrc/graphics/graphviz/patches/Attic/patch-ab 2008/02/06 18:56:52 1.13
+++ pkgsrc/graphics/graphviz/patches/Attic/patch-ab 2009/02/26 19:45:14 1.14
@@ -1,24 +1,51 @@
-$NetBSD: patch-ab,v 1.13 2008/02/06 18:56:52 adam Exp $
-
---- config.h.in.orig	2007-12-13 06:52:34.000000000 +0100
-+++ config.h.in
-@@ -60,6 +60,9 @@
- /* Define if you have the DevIL library */
- #undef HAVE_DEVIL
+--- configure.orig	2008-10-07 23:54:55.000000000 +0000
++++ configure	2009-02-26 19:17:53.000000000 +0000
+@@ -2402,18 +2402,26 @@
  
-+/* Define to 1 if you have the <crt_externs.h> header file. */
-+#undef HAVE_CRT_EXTERNS_H
-+
- /* Define to 1 if you have the <dirent.h> header file, and it defines `DIR'.
-    */
- #undef HAVE_DIRENT_H
-@@ -360,6 +363,9 @@
- /* Define to 1 if the system has the type `_Bool'. */
- #undef HAVE__BOOL
  
-+/* Define to 1 if you have the `_NSGetEnviron' function. */
-+#undef HAVE__NSGETENVIRON
-+
- /* Define to 1 if you have the `_sysconf' function. */
- #undef HAVE__SYSCONF
  
+-
+-# 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
++		# JR: patch from Michael van Elst:
++		#     if we have a shellm we should have a working awk, too
++		eval `echo "$GRAPHVIZ_VERSION_MICRO" | awk '{
++			print "GRAPHVIZ_VERSION_BUILD=" \
++				(substr($1,1,4)-2000)*12+substr($1,5,2) \
++				substr($1,7,2)
++			print "GRAPHVIZ_VERSION_REVISION=" \
++				substr($1,10,4)
++		}'`
++	fi
++	;;
++esac 
+ 
+ 
+ 
+@@ -6457,6 +6465,9 @@
+ 	    ;;
+ 	*-sgi-irix* )
+ 	    ;;
++	*-ibm-aix* )
++	    CC=cc_r
++	    ;;
+     esac
+ else
+     case "${CC}" in
File Deleted: pkgsrc/graphics/graphviz/patches/Attic/patch-ac
File Deleted: pkgsrc/graphics/graphviz/patches/Attic/patch-ad
File Deleted: pkgsrc/graphics/graphviz/patches/Attic/patch-an
File Deleted: pkgsrc/graphics/graphviz/patches/Attic/patch-ae
File Deleted: pkgsrc/graphics/graphviz/patches/Attic/patch-af
File Deleted: pkgsrc/graphics/graphviz/patches/Attic/patch-ao
cvs diff -r1.12 -r1.13 pkgsrc/graphics/graphviz/patches/Attic/patch-ag (expand / switch to context diff)
--- pkgsrc/graphics/graphviz/patches/Attic/patch-ag 2008/03/14 01:16:36 1.12
+++ pkgsrc/graphics/graphviz/patches/Attic/patch-ag 2009/02/26 19:45:14 1.13
@@ -1,13 +1,13 @@
-$NetBSD: patch-ag,v 1.12 2008/03/14 01:16:36 joerg Exp $
+$NetBSD: patch-ag,v 1.13 2009/02/26 19:45:14 sno 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)
+--- 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 @@
  	$(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 ${PTHREAD_LDFLAGS} ${PTHREAD_LIBS}
+-	@EXPAT_LIBS@ @Z_LIBS@ @MATH_LIBS@
++	@EXPAT_LIBS@ @Z_LIBS@ @MATH_LIBS@ ${PTHREAD_LDFLAGS} ${PTHREAD_LIBS}
  
  
  #For use without plugins.
File Deleted: pkgsrc/graphics/graphviz/patches/Attic/patch-ah
File Deleted: pkgsrc/graphics/graphviz/patches/Attic/patch-al
File Deleted: pkgsrc/graphics/graphviz/patches/Attic/patch-aq
File Deleted: pkgsrc/graphics/graphviz/patches/Attic/patch-as
File Deleted: pkgsrc/graphics/graphviz/patches/Attic/patch-au
File Deleted: pkgsrc/graphics/graphviz/patches/Attic/patch-ai
File Deleted: pkgsrc/graphics/graphviz/patches/Attic/patch-am
cvs diff -r1.9 -r1.10 pkgsrc/graphics/graphviz/patches/Attic/patch-aj (expand / switch to context diff)
--- pkgsrc/graphics/graphviz/patches/Attic/patch-aj 2008/03/11 15:46:57 1.9
+++ pkgsrc/graphics/graphviz/patches/Attic/patch-aj 2009/02/26 19:45:14 1.10
@@ -1,19 +1,20 @@
-$NetBSD: patch-aj,v 1.9 2008/03/11 15:46:57 joerg Exp $
+$NetBSD: patch-aj,v 1.10 2009/02/26 19:45:14 sno 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 = \
+--- 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 @@
  	$(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 \
+ 	$(top_builddir)/lib/graph/libgraph.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@
- else
+ AM_CPPFLAGS += -DNONDLL
+@@ -40,6 +41,7 @@
  libgvplugin_gd_la_LIBADD = \
-+	$(top_builddir)/lib/graph/libgraph.la \
+ 	$(top_builddir)/lib/gvc/libgvc.la \
+ 	$(top_builddir)/lib/graph/libgraph.la \
 +	$(top_builddir)/lib/pathplan/libpathplan.la \
- 	$(top_builddir)/lib/gvc/libgvc.la @GD_LIBS@ @MATH_LIBS@
+ 	$(top_builddir)/lib/cdt/libcdt.la @GD_LIBS@ @MATH_LIBS@
  endif
cvs diff -r1.11 -r1.12 pkgsrc/graphics/graphviz/patches/Attic/patch-ak (expand / switch to context diff)
--- pkgsrc/graphics/graphviz/patches/Attic/patch-ak 2008/03/11 15:46:57 1.11
+++ pkgsrc/graphics/graphviz/patches/Attic/patch-ak 2009/02/26 19:45:14 1.12
@@ -1,18 +1,19 @@
-$NetBSD: patch-ak,v 1.11 2008/03/11 15:46:57 joerg Exp $
+$NetBSD: patch-ak,v 1.12 2009/02/26 19:45:14 sno 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 \
+--- 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 =  \
+ @WITH_MYLIBGD_FALSE@	$(top_builddir)/lib/gvc/libgvc.la \
+ @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_FALSE@	$(top_builddir)/lib/cdt/libcdt.la \
+ @WITH_MYLIBGD_FALSE@	$(am__append_3)
+ @WITH_MYLIBGD_TRUE@libgvplugin_gd_la_DEPENDENCIES =  \
  @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@
+ @WITH_MYLIBGD_TRUE@	$(top_builddir)/lib/graph/libgraph.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 \
cvs diff -r1.10 -r1.11 pkgsrc/graphics/graphviz/patches/Attic/patch-ap (expand / switch to context diff)
--- pkgsrc/graphics/graphviz/patches/Attic/patch-ap 2008/03/11 15:46:57 1.10
+++ pkgsrc/graphics/graphviz/patches/Attic/patch-ap 2009/02/26 19:45:14 1.11
@@ -1,12 +1,33 @@
-$NetBSD: patch-ap,v 1.10 2008/03/11 15:46:57 joerg Exp $
+$NetBSD: patch-ap,v 1.11 2009/02/26 19:45:14 sno Exp $
 
---- lib/gvc/gvconfig.c.orig	2008-03-11 06:01:47.000000000 +0100
+--- lib/gvc/gvconfig.c.orig	2008-12-01 12:48:23.000000000 +0100
-+++ lib/gvc/gvconfig.c
++++ lib/gvc/gvconfig.c	2008-12-01 12:50:26.000000000 +0100
-@@ -584,6 +584,7 @@ void gvconfig(GVC_t * gvc, boolean resca
+@@ -526,10 +526,7 @@
-     	f = fopen(gvc->config_path,"r");
+         }
-     	if (!f) {
+         else {
-     	    agerr (AGERR,"failed to open %s for read.\n", gvc->config_path);
+     	    f = fopen(gvc->config_path,"r");
-+	    exit(1);
+-    	    if (!f) {
-     	}
+-    	        agerr (AGERR,"failed to open %s for read.\n", gvc->config_path);
-     	else {
+-    	    }
-     	    config_text = gmalloc(config_st.st_size + 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 @@
+     	            rc = gvconfig_plugin_install_from_config(gvc, config_text);
+     		    /* NB. config_text not freed because we retain char* into it */
+     	        }
+-    	    }
+-    	    if (f) {
++
+     	        fclose(f);
+-	    }
++    	    }
++    	    else {
++    	        agerr (AGERR,"failed to open %s for read.\n", gvc->config_path);
++		exit(1);
++    	    }
+         }
+     }
+ #endif
File Deleted: pkgsrc/graphics/graphviz/patches/Attic/patch-ar
File Deleted: pkgsrc/graphics/graphviz/patches/Attic/patch-at