diff options
| author | sno <sno@pkgsrc.org> | 2009-02-26 19:45:14 +0000 |
|---|---|---|
| committer | sno <sno@pkgsrc.org> | 2009-02-26 19:45:14 +0000 |
| commit | cb4ecb9af0b169ecbf35cc35386b3af30341c05e (patch) | |
| tree | 9a6002e012b2598c404b8d76ce14abc8b6350fc6 /graphics/graphviz | |
| parent | d4a12362a9115687403638267edcf691f7820bd3 (diff) | |
| download | pkgsrc-cb4ecb9af0b169ecbf35cc35386b3af30341c05e.tar.gz | |
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)
Diffstat (limited to 'graphics/graphviz')
26 files changed, 330 insertions, 493 deletions
diff --git a/graphics/graphviz/Makefile b/graphics/graphviz/Makefile index 7f7812b380e..e87cab1f0eb 100644 --- a/graphics/graphviz/Makefile +++ b/graphics/graphviz/Makefile @@ -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-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/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 @@ pre-build: .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" diff --git a/graphics/graphviz/PLIST b/graphics/graphviz/PLIST index e837aee7cf4..fa5b8e71f37 100644 --- a/graphics/graphviz/PLIST +++ b/graphics/graphviz/PLIST @@ -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/pathplan.h 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/graph.3 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/attrs.html 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/doubleoctagon.gif 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/lang.html 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/record.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.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/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/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/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.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 @@ share/graphviz/lefty/tree.lefty @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 @@ share/graphviz/lefty/tree.lefty @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 + diff --git a/graphics/graphviz/buildlink3.mk b/graphics/graphviz/buildlink3.mk index 395cd88a3d0..aa1e4d5eae8 100644 --- a/graphics/graphviz/buildlink3.mk +++ b/graphics/graphviz/buildlink3.mk @@ -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 @@ BUILDLINK_PKGSRCDIR.graphviz?= ../../graphics/graphviz .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" diff --git a/graphics/graphviz/distinfo b/graphics/graphviz/distinfo index ae77de65374..e485f2e60f0 100644 --- a/graphics/graphviz/distinfo +++ b/graphics/graphviz/distinfo @@ -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 -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 -SHA1 (patch-af) = 2079dfdbc65afb742412b31e7d5c3e7cfab5c7ec -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 +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) = 6670dcf2d00ee81012b1acbc3bc141f9405c0b30 +SHA1 (patch-ab) = c7d1f59d1bf2483d16d79dbf9ade57e61a98cded +SHA1 (patch-ag) = 4b89f087ba96d29b92a1b8c46e3ac041039df459 +SHA1 (patch-aj) = 0adc177fb7c3e654cf46560a8c91e2712bc7d16a +SHA1 (patch-ak) = 91133de18229d2165be392c790a504547a3adf64 +SHA1 (patch-ap) = 5111cc72714f8ee96c7dadba4570e01b64ed3647 diff --git a/graphics/graphviz/options.mk b/graphics/graphviz/options.mk index 14507bf7bf1..040372c221f 100644 --- a/graphics/graphviz/options.mk +++ b/graphics/graphviz/options.mk @@ -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 @@ PLIST.tcl= yes 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 diff --git a/graphics/graphviz/patches/patch-aa b/graphics/graphviz/patches/patch-aa index 2ef5a8fb61f..a5dbf252716 100644 --- a/graphics/graphviz/patches/patch-aa +++ b/graphics/graphviz/patches/patch-aa @@ -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 diff --git a/graphics/graphviz/patches/patch-ab b/graphics/graphviz/patches/patch-ab index cdd509692c0..6b477b5c22e 100644 --- a/graphics/graphviz/patches/patch-ab +++ b/graphics/graphviz/patches/patch-ab @@ -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 diff --git a/graphics/graphviz/patches/patch-ac b/graphics/graphviz/patches/patch-ac deleted file mode 100644 index 3e3e887d6b5..00000000000 --- a/graphics/graphviz/patches/patch-ac +++ /dev/null @@ -1,20 +0,0 @@ -$NetBSD: patch-ac,v 1.17 2008/02/06 18:56:52 adam Exp $ - ---- configure.orig 2007-12-13 06:48:49.000000000 +0100 -+++ configure -@@ -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 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 \ -@@ -8750,6 +8751,7 @@ fi - - for ac_func in lrand48 drand48 srand48 setmode setenv getenv \ - __freadable _sysconf getrusage strerror cbrt lsqrt vsnprintf \ -+ _NSGetEnviron \ - strtoul strtoll strtoull uname - do - as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh` diff --git a/graphics/graphviz/patches/patch-ad b/graphics/graphviz/patches/patch-ad deleted file mode 100644 index 195ba06cff7..00000000000 --- a/graphics/graphviz/patches/patch-ad +++ /dev/null @@ -1,24 +0,0 @@ -$NetBSD: patch-ad,v 1.9 2008/02/06 18:56:53 adam Exp $ - ---- lib/ast/pathpath.c.orig 2007-05-03 21:09:15.000000000 +0200 -+++ lib/ast/pathpath.c -@@ -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; - - char *pathpath(register char *path, const char *p, const char *a, int mode) diff --git a/graphics/graphviz/patches/patch-ae b/graphics/graphviz/patches/patch-ae deleted file mode 100644 index 00bc130ccff..00000000000 --- a/graphics/graphviz/patches/patch-ae +++ /dev/null @@ -1,13 +0,0 @@ -$NetBSD: patch-ae,v 1.13 2008/02/06 18:56:53 adam Exp $ - ---- plugin/gd/gvtextlayout_gd.c.orig 2007-11-08 20:42:15.000000000 +0100 -+++ plugin/gd/gvtextlayout_gd.c -@@ -52,7 +52,7 @@ char *gd_alternate_fontlist(char *font) - len = strlen(font) + 1; - if (len > fontbufsz) { - fontbufsz = 2 * len; -- if (fontbuf) -+ if (fontbuf == NULL) - fontbuf = malloc(fontbufsz); - else - fontbuf = realloc(fontbuf, fontbufsz); diff --git a/graphics/graphviz/patches/patch-af b/graphics/graphviz/patches/patch-af deleted file mode 100644 index c53e14348f9..00000000000 --- a/graphics/graphviz/patches/patch-af +++ /dev/null @@ -1,13 +0,0 @@ -$NetBSD: patch-af,v 1.11 2008/03/11 15:46:57 joerg Exp $ - ---- lib/gvc/Makefile.am.orig 2008-03-11 04:40:27.000000000 +0100 -+++ lib/gvc/Makefile.am -@@ -40,7 +40,7 @@ libgvc_la_LIBADD = $(libgvc_C_la_LIBADD) - $(top_builddir)/lib/cdt/libcdt.la \ - $(top_builddir)/lib/graph/libgraph.la \ - $(top_builddir)/lib/pathplan/libpathplan.la \ -- @EXPAT_LIBS@ @Z_LIBS@ -+ @EXPAT_LIBS@ @Z_LIBS@ -lm - - #For use without plugins. - # so it needs to be linked with a preset table of builtins, e.g. dot_builtins.c, diff --git a/graphics/graphviz/patches/patch-ag b/graphics/graphviz/patches/patch-ag index 344b2eb4b7e..7e40cd06378 100644 --- a/graphics/graphviz/patches/patch-ag +++ b/graphics/graphviz/patches/patch-ag @@ -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. diff --git a/graphics/graphviz/patches/patch-ah b/graphics/graphviz/patches/patch-ah deleted file mode 100644 index 27baeaf3626..00000000000 --- a/graphics/graphviz/patches/patch-ah +++ /dev/null @@ -1,15 +0,0 @@ -$NetBSD: patch-ah,v 1.10 2008/03/11 15:46:57 joerg Exp $ - ---- plugin/core/Makefile.am.orig 2008-03-11 04:50:50.000000000 +0100 -+++ plugin/core/Makefile.am -@@ -25,7 +25,9 @@ libgvplugin_core_C_la_SOURCES = \ - - libgvplugin_core_la_LDFLAGS = -version-info @GVPLUGIN_VERSION_INFO@ - libgvplugin_core_la_SOURCES = $(libgvplugin_core_C_la_SOURCES) --libgvplugin_core_la_LIBADD = $(top_builddir)/lib/gvc/libgvc.la -+libgvplugin_core_la_LIBADD = $(top_builddir)/lib/gvc/libgvc.la \ -+ $(top_builddir)/lib/cgraph/libcgraph.la \ -+ $(top_builddir)/lib/graph/libgraph.la - - EXTRA_DIST = Makefile.old - diff --git a/graphics/graphviz/patches/patch-ai b/graphics/graphviz/patches/patch-ai deleted file mode 100644 index 0b81b427ca5..00000000000 --- a/graphics/graphviz/patches/patch-ai +++ /dev/null @@ -1,15 +0,0 @@ -$NetBSD: patch-ai,v 1.12 2008/03/11 15:46:57 joerg Exp $ - ---- plugin/core/Makefile.in.orig 2008-03-11 04:50:53.000000000 +0100 -+++ plugin/core/Makefile.in -@@ -380,7 +380,9 @@ libgvplugin_core_C_la_SOURCES = \ - - libgvplugin_core_la_LDFLAGS = -version-info @GVPLUGIN_VERSION_INFO@ - libgvplugin_core_la_SOURCES = $(libgvplugin_core_C_la_SOURCES) --libgvplugin_core_la_LIBADD = $(top_builddir)/lib/gvc/libgvc.la -+libgvplugin_core_la_LIBADD = $(top_builddir)/lib/gvc/libgvc.la \ -+ $(top_builddir)/lib/cgraph/libcgraph.la \ -+ $(top_builddir)/lib/graph/libgraph.la - EXTRA_DIST = Makefile.old - all: all-am - diff --git a/graphics/graphviz/patches/patch-aj b/graphics/graphviz/patches/patch-aj index bc3f24958a9..d1feeb971c8 100644 --- a/graphics/graphviz/patches/patch-aj +++ b/graphics/graphviz/patches/patch-aj @@ -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 diff --git a/graphics/graphviz/patches/patch-ak b/graphics/graphviz/patches/patch-ak index d423f9ceaf8..e0267d30932 100644 --- a/graphics/graphviz/patches/patch-ak +++ b/graphics/graphviz/patches/patch-ak @@ -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 \ diff --git a/graphics/graphviz/patches/patch-al b/graphics/graphviz/patches/patch-al deleted file mode 100644 index 63946e7097a..00000000000 --- a/graphics/graphviz/patches/patch-al +++ /dev/null @@ -1,16 +0,0 @@ -$NetBSD: patch-al,v 1.10 2008/03/11 15:46:57 joerg Exp $ - ---- plugin/dot_layout/Makefile.am.orig 2008-03-11 05:27:35.000000000 +0100 -+++ plugin/dot_layout/Makefile.am -@@ -23,8 +23,10 @@ libgvplugin_dot_layout_C_la_LIBADD = \ - libgvplugin_dot_layout_la_LDFLAGS = -version-info @GVPLUGIN_VERSION_INFO@ - libgvplugin_dot_layout_la_SOURCES = $(libgvplugin_dot_layout_C_la_SOURCES) - libgvplugin_dot_layout_la_LIBADD = $(libgvplugin_dot_layout_C_la_LIBADD) \ -+ $(top_builddir)/lib/graph/libgraph.la \ - $(top_builddir)/lib/gvc/libgvc.la \ -- $(top_builddir)/lib/pathplan/libpathplan.la -+ $(top_builddir)/lib/pathplan/libpathplan.la \ -+ -lm - - EXTRA_DIST = Makefile.old - diff --git a/graphics/graphviz/patches/patch-am b/graphics/graphviz/patches/patch-am deleted file mode 100644 index 216765f0ba1..00000000000 --- a/graphics/graphviz/patches/patch-am +++ /dev/null @@ -1,16 +0,0 @@ -$NetBSD: patch-am,v 1.12 2008/03/11 15:46:57 joerg Exp $ - ---- plugin/dot_layout/Makefile.in.orig 2008-03-11 05:25:53.000000000 +0100 -+++ plugin/dot_layout/Makefile.in -@@ -381,8 +381,10 @@ libgvplugin_dot_layout_C_la_LIBADD = \ - libgvplugin_dot_layout_la_LDFLAGS = -version-info @GVPLUGIN_VERSION_INFO@ - libgvplugin_dot_layout_la_SOURCES = $(libgvplugin_dot_layout_C_la_SOURCES) - libgvplugin_dot_layout_la_LIBADD = $(libgvplugin_dot_layout_C_la_LIBADD) \ -+ $(top_builddir)/lib/graph/libgraph.la \ - $(top_builddir)/lib/gvc/libgvc.la \ -- $(top_builddir)/lib/pathplan/libpathplan.la -+ $(top_builddir)/lib/pathplan/libpathplan.la \ -+ -lm - - EXTRA_DIST = Makefile.old - all: all-am diff --git a/graphics/graphviz/patches/patch-an b/graphics/graphviz/patches/patch-an deleted file mode 100644 index e3b04f5e896..00000000000 --- a/graphics/graphviz/patches/patch-an +++ /dev/null @@ -1,16 +0,0 @@ -$NetBSD: patch-an,v 1.9 2008/03/11 15:46:57 joerg Exp $ - ---- plugin/neato_layout/Makefile.am.orig 2008-03-11 05:29:54.000000000 +0100 -+++ plugin/neato_layout/Makefile.am -@@ -26,7 +26,10 @@ libgvplugin_neato_layout_C_la_LIBADD = \ - libgvplugin_neato_layout_la_LDFLAGS = -version-info @GVPLUGIN_VERSION_INFO@ - libgvplugin_neato_layout_la_SOURCES = $(libgvplugin_neato_layout_C_la_SOURCES) - libgvplugin_neato_layout_la_LIBADD = $(libgvplugin_neato_layout_C_la_LIBADD) \ -+ $(top_builddir)/lib/cdt/libcdt.la \ -+ $(top_builddir)/lib/graph/libgraph.la \ - $(top_builddir)/lib/gvc/libgvc.la \ -- $(top_builddir)/lib/pathplan/libpathplan.la @IPSEPCOLA_LIBS@ -+ $(top_builddir)/lib/pathplan/libpathplan.la @IPSEPCOLA_LIBS@ \ -+ -lm - - EXTRA_DIST = Makefile.old diff --git a/graphics/graphviz/patches/patch-ao b/graphics/graphviz/patches/patch-ao deleted file mode 100644 index 1deedb20474..00000000000 --- a/graphics/graphviz/patches/patch-ao +++ /dev/null @@ -1,17 +0,0 @@ -$NetBSD: patch-ao,v 1.11 2008/03/11 15:46:57 joerg Exp $ - ---- plugin/neato_layout/Makefile.in.orig 2008-03-11 05:28:19.000000000 +0100 -+++ plugin/neato_layout/Makefile.in -@@ -387,8 +387,11 @@ libgvplugin_neato_layout_C_la_LIBADD = \ - libgvplugin_neato_layout_la_LDFLAGS = -version-info @GVPLUGIN_VERSION_INFO@ - libgvplugin_neato_layout_la_SOURCES = $(libgvplugin_neato_layout_C_la_SOURCES) - libgvplugin_neato_layout_la_LIBADD = $(libgvplugin_neato_layout_C_la_LIBADD) \ -+ $(top_builddir)/lib/cdt/libcdt.la \ -+ $(top_builddir)/lib/graph/libgraph.la \ - $(top_builddir)/lib/gvc/libgvc.la \ -- $(top_builddir)/lib/pathplan/libpathplan.la @IPSEPCOLA_LIBS@ -+ $(top_builddir)/lib/pathplan/libpathplan.la @IPSEPCOLA_LIBS@ \ -+ -lm - - EXTRA_DIST = Makefile.old - all: all-am diff --git a/graphics/graphviz/patches/patch-ap b/graphics/graphviz/patches/patch-ap index 8c5c80500ff..c2ad4e88cc5 100644 --- a/graphics/graphviz/patches/patch-ap +++ b/graphics/graphviz/patches/patch-ap @@ -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 -@@ -584,6 +584,7 @@ void gvconfig(GVC_t * gvc, boolean resca - f = fopen(gvc->config_path,"r"); - if (!f) { - agerr (AGERR,"failed to open %s for read.\n", gvc->config_path); -+ exit(1); - } - else { - config_text = gmalloc(config_st.st_size + 1); +--- 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 @@ + } + else { + f = fopen(gvc->config_path,"r"); +- if (!f) { +- agerr (AGERR,"failed to open %s for read.\n", gvc->config_path); +- } +- 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 diff --git a/graphics/graphviz/patches/patch-aq b/graphics/graphviz/patches/patch-aq deleted file mode 100644 index 530544fd190..00000000000 --- a/graphics/graphviz/patches/patch-aq +++ /dev/null @@ -1,14 +0,0 @@ -$NetBSD: patch-aq,v 1.10 2008/03/11 15:46:57 joerg Exp $ - ---- tclpkg/tcldot/Makefile.am.orig 2008-03-11 15:59:16.000000000 +0100 -+++ tclpkg/tcldot/Makefile.am -@@ -75,7 +75,8 @@ libtcldot_builtin_la_LIBADD = \ - $(top_builddir)/lib/gvc/libgvc_C.la \ - $(top_builddir)/lib/graph/libgraph_C.la \ - $(top_builddir)/lib/cdt/libcdt_C.la \ -- $(top_builddir)/lib/pathplan/libpathplan_C.la -+ $(top_builddir)/lib/pathplan/libpathplan_C.la \ -+ -ltcl84 - - if WITH_PANGOCAIRO - libtcldot_builtin_la_LIBADD += $(top_builddir)/plugin/pango/libgvplugin_pango_C.la @PANGOCAIRO_LIBS@ diff --git a/graphics/graphviz/patches/patch-ar b/graphics/graphviz/patches/patch-ar deleted file mode 100644 index 50ff8958be6..00000000000 --- a/graphics/graphviz/patches/patch-ar +++ /dev/null @@ -1,21 +0,0 @@ -$NetBSD: patch-ar,v 1.8 2008/03/11 15:46:57 joerg Exp $ - ---- tclpkg/tcldot/Makefile.in.orig 2008-03-11 15:58:50.000000000 +0100 -+++ tclpkg/tcldot/Makefile.in -@@ -457,11 +457,11 @@ libtcldot_builtin_la_LIBADD = \ - $(top_builddir)/lib/gvc/libgvc_C.la \ - $(top_builddir)/lib/graph/libgraph_C.la \ - $(top_builddir)/lib/cdt/libcdt_C.la \ -- $(top_builddir)/lib/pathplan/libpathplan_C.la $(am__append_4) \ -- $(am__append_5) $(am__append_6) $(am__append_7) \ -- $(am__append_8) @ICONV_LIBS@ @EXPAT_LIBS@ @LIBGEN_LIBS@ \ -- @LIBLTDL@ @SOCKET_LIBS@ @IPSEPCOLA_LIBS@ @MATH_LIBS@ \ -- $(am__empty) -+ $(top_builddir)/lib/pathplan/libpathplan_C.la -ltcl84 \ -+ $(am__append_4) $(am__append_5) $(am__append_6) \ -+ $(am__append_7) $(am__append_8) @ICONV_LIBS@ @EXPAT_LIBS@ \ -+ @LIBGEN_LIBS@ @LIBLTDL@ @SOCKET_LIBS@ @IPSEPCOLA_LIBS@ \ -+ @MATH_LIBS@ $(am__empty) - EXTRA_DIST = $(man) $(pdf) $(html) README README.Tkspline Makefile.old - CLEANFILES = pkgIndex.tcl - DISTCLEANFILES = $(pdf) diff --git a/graphics/graphviz/patches/patch-as b/graphics/graphviz/patches/patch-as deleted file mode 100644 index 764c9f9b9c0..00000000000 --- a/graphics/graphviz/patches/patch-as +++ /dev/null @@ -1,26 +0,0 @@ -$NetBSD: patch-as,v 1.10 2008/03/11 15:46:57 joerg Exp $ - ---- tclpkg/gv/Makefile.am.orig 2008-03-11 16:07:00.000000000 +0100 -+++ tclpkg/gv/Makefile.am -@@ -14,8 +14,10 @@ AM_CPPFLAGS = \ - LIBS = @LIBS@ -lc - - BASESOURCES = gv.cpp gv.i --BASELIBS = $(top_builddir)/lib/gvc/libgvc.la -- -+BASELIBS = $(top_builddir)/lib/gvc/libgvc.la \ -+ $(top_builddir)/lib/cgraph/libcgraph.la \ -+ $(top_builddir)/lib/graph/libgraph.la \ -+ $(top_builddir)/lib/cdt/libcdt.la - pkgsharpdir = $(pkglibdir)/sharp - SHARP_data = gv.cs gvPINVOKE.cs SWIGTYPE_p_Agraph_t.cs SWIGTYPE_p_Agnode_t.cs SWIGTYPE_p_Agedge_t.cs SWIGTYPE_p_Agsym_t.cs SWIGTYPE_p_FILE.cs - nodist_libgv_sharp_la_SOURCES = gv_sharp.cpp $(SHARP_data) -@@ -30,7 +32,7 @@ pkgguiledir = $(pkglibdir)/guile - GUILE_data = - nodist_libgv_guile_la_SOURCES = gv_guile.cpp $(GUILE_data) - libgv_guile_la_SOURCES = $(BASESOURCES) gv_dummy_init.cpp --libgv_guile_la_LIBADD = $(BASELIBS) @GUILE_LIBS@ -+libgv_guile_la_LIBADD = $(BASELIBS) @GUILE_LIBS@ -lguile - libgv_guile_la_LDFLAGS = -module -avoid-version - $(GUILE_data): gv_guile.cpp - gv_guile.cpp: gv.i diff --git a/graphics/graphviz/patches/patch-at b/graphics/graphviz/patches/patch-at deleted file mode 100644 index 8672fd34543..00000000000 --- a/graphics/graphviz/patches/patch-at +++ /dev/null @@ -1,25 +0,0 @@ -$NetBSD: patch-at,v 1.8 2008/03/11 15:46:57 joerg Exp $ - ---- tclpkg/gv/Makefile.in.orig 2008-03-11 16:07:03.000000000 +0100 -+++ tclpkg/gv/Makefile.in -@@ -628,7 +628,10 @@ AM_CPPFLAGS = \ - -I$(top_srcdir)/lib/pathplan $(GUILE_INCLUDES) $(LUA_INCLUDES) $(OCAML_INCLUDES) $(PERL_INCLUDES) $(PHP_INCLUDES) $(PYTHON_INCLUDES) $(R_CFLAGS) $(RUBY_INCLUDES) $(TCL_INCLUDES) - - BASESOURCES = gv.cpp gv.i --BASELIBS = $(top_builddir)/lib/gvc/libgvc.la -+BASELIBS = $(top_builddir)/lib/gvc/libgvc.la \ -+ $(top_builddir)/lib/cgraph/libcgraph.la \ -+ $(top_builddir)/lib/graph/libgraph.la \ -+ $(top_builddir)/lib/cdt/libcdt.la - pkgsharpdir = $(pkglibdir)/sharp - SHARP_data = gv.cs gvPINVOKE.cs SWIGTYPE_p_Agraph_t.cs SWIGTYPE_p_Agnode_t.cs SWIGTYPE_p_Agedge_t.cs SWIGTYPE_p_Agsym_t.cs SWIGTYPE_p_FILE.cs - nodist_libgv_sharp_la_SOURCES = gv_sharp.cpp $(SHARP_data) -@@ -639,7 +642,7 @@ pkgguiledir = $(pkglibdir)/guile - GUILE_data = - nodist_libgv_guile_la_SOURCES = gv_guile.cpp $(GUILE_data) - libgv_guile_la_SOURCES = $(BASESOURCES) gv_dummy_init.cpp --libgv_guile_la_LIBADD = $(BASELIBS) @GUILE_LIBS@ -+libgv_guile_la_LIBADD = $(BASELIBS) @GUILE_LIBS@ -lguile - libgv_guile_la_LDFLAGS = -module -avoid-version - pkgiodir = $(pkglibdir)/io - IO_data = diff --git a/graphics/graphviz/patches/patch-au b/graphics/graphviz/patches/patch-au deleted file mode 100644 index 32a12877c09..00000000000 --- a/graphics/graphviz/patches/patch-au +++ /dev/null @@ -1,24 +0,0 @@ -$NetBSD: patch-au,v 1.10 2008/10/12 13:14:39 tron Exp $ - ---- lib/graph/parser.y.orig 2007-09-07 13:05:44.000000000 +0100 -+++ lib/graph/parser.y 2008-10-12 13:46:18.000000000 +0100 -@@ -31,7 +31,8 @@ - static Agnode_t *N; - static Agedge_t *E; - static objstack_t *SP; --static Agraph_t *Gstack[32]; -+#define GSTACK_SIZE 64 -+static Agraph_t *Gstack[64]; - static int GSP; - - static void subgraph_warn (void) -@@ -44,6 +45,9 @@ - - static void push_subg(Agraph_t *g) - { -+ if (GSP >= GSTACK_SIZE) { -+ agerr (AGERR, "Gstack overflow in graph parser\n"); exit(1); -+ } - G = Gstack[GSP++] = g; - } - |