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 unified 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,68 +1,63 @@ @@ -1,68 +1,63 @@
1# $NetBSD: Makefile,v 1.66 2008/11/10 17:21:36 wiz Exp $ 1# $NetBSD: Makefile,v 1.67 2009/02/26 19:45:14 sno Exp $
2 2
3DISTNAME= graphviz-2.16.1 3DISTNAME= graphviz-2.20.3
4PKGREVISION= 4 
5CATEGORIES= graphics 4CATEGORIES= graphics
6MASTER_SITES= http://www.graphviz.org/pub/graphviz/ARCHIVE/ 5MASTER_SITES= http://www.graphviz.org/pub/graphviz/stable/SOURCES/
7 6
8MAINTAINER= pkgsrc-users@NetBSD.org 7MAINTAINER= pkgsrc-users@NetBSD.org
9HOMEPAGE= http://www.graphviz.org/ 8HOMEPAGE= http://www.graphviz.org/
10COMMENT= Graph Drawing Programs from AT&T Research and Lucent Bell Labs 9COMMENT= Graph Drawing Programs from AT&T Research and Lucent Bell Labs
11 10
12PKG_INSTALLATION_TYPES= overwrite pkgviews 11PKG_INSTALLATION_TYPES= overwrite pkgviews
13PKG_DESTDIR_SUPPORT= user-destdir 12PKG_DESTDIR_SUPPORT= user-destdir
14 13
15DEPENDS+= ghostscript-fonts>=6.0:../../fonts/ghostscript-fonts 14DEPENDS+= ghostscript-fonts>=6.0:../../fonts/ghostscript-fonts
16 15
17CHECK_FILES_SKIP= ${PREFIX}/lib/graphviz/config 16CHECK_FILES_SKIP= ${PREFIX}/lib/graphviz/config
18 17
19USE_LANGUAGES= c c++ 18USE_LANGUAGES= c c++
20USE_LIBTOOL= yes 19USE_LIBTOOL= yes
21USE_TOOLS+= bison pkg-config 20USE_TOOLS+= bison pkg-config
22GNU_CONFIGURE= yes 21GNU_CONFIGURE= yes
23CONFIGURE_ARGS+= --disable-java 22CONFIGURE_ARGS+= --disable-java
24CONFIGURE_ARGS+= --disable-perl 23CONFIGURE_ARGS+= --disable-perl
25CONFIGURE_ARGS+= --disable-php 24CONFIGURE_ARGS+= --disable-php
26CONFIGURE_ARGS+= --disable-python 25CONFIGURE_ARGS+= --disable-python
27CONFIGURE_ARGS+= --disable-ruby 26CONFIGURE_ARGS+= --disable-ruby
28CONFIGURE_ARGS+= --disable-sharp 27CONFIGURE_ARGS+= --disable-sharp
29CONFIGURE_ENV+= X11PREFIX=${X11PREFIX} X11BASE=${X11BASE} 
30# build fails when PHP and/or Ruby are also installed 28# build fails when PHP and/or Ruby are also installed
31CONFIGURE_ENV+= ac_cv_prog_PHP= 29CONFIGURE_ENV+= ac_cv_prog_PHP=
32CONFIGURE_ENV+= ac_cv_prog_RUBY= 30CONFIGURE_ENV+= ac_cv_prog_RUBY=
33CPPFLAGS+= -DNO_POSTSCRIPT_ALIAS=1 31CPPFLAGS+= -DNO_POSTSCRIPT_ALIAS=1
34PKGCONFIG_OVERRIDE= lib/agraph/libagraph.pc.in 32PKGCONFIG_OVERRIDE= lib/agraph/libagraph.pc.in
35PKGCONFIG_OVERRIDE+= lib/cdt/libcdt.pc.in 33PKGCONFIG_OVERRIDE+= lib/cdt/libcdt.pc.in
36PKGCONFIG_OVERRIDE+= lib/cgraph/libcgraph.pc.in 34PKGCONFIG_OVERRIDE+= lib/cgraph/libcgraph.pc.in
37PKGCONFIG_OVERRIDE+= lib/expr/libexpr.pc.in 35PKGCONFIG_OVERRIDE+= lib/expr/libexpr.pc.in
38PKGCONFIG_OVERRIDE+= lib/graph/libgraph.pc.in 36PKGCONFIG_OVERRIDE+= lib/graph/libgraph.pc.in
39PKGCONFIG_OVERRIDE+= lib/gvc/libgvc.pc.in 37PKGCONFIG_OVERRIDE+= lib/gvc/libgvc.pc.in
40PKGCONFIG_OVERRIDE+= lib/gvc/libgvc_builtins.pc.in 38PKGCONFIG_OVERRIDE+= lib/gvc/libgvc_builtins.pc.in
41PKGCONFIG_OVERRIDE+= lib/pathplan/libpathplan.pc.in 39PKGCONFIG_OVERRIDE+= lib/pathplan/libpathplan.pc.in
42XAW_TYPE= standard 40XAW_TYPE= standard
43 41
44.include "../../mk/bsd.prefs.mk" 42.include "../../mk/bsd.prefs.mk"
45 43
46.include "../../mk/compiler.mk" 44.include "../../mk/compiler.mk"
47.if !empty(CC_VERSION:Mgcc-2*) 45.if !empty(CC_VERSION:Mgcc-2*)
48BUILDLINK_TRANSFORM+= rm:-Wno-unused-parameter 46BUILDLINK_TRANSFORM+= rm:-Wno-unused-parameter
49.endif 47.endif
50 48
51# prevent another config.status run 49# prevent another config.status run
52pre-build: 50pre-build:
53 touch ${WRKSRC}/Makefile 51 touch ${WRKSRC}/Makefile
54 52
55.include "options.mk" 53.include "options.mk"
56 54
57.include "../../converters/libiconv/buildlink3.mk" 55.include "../../converters/libiconv/buildlink3.mk"
58.include "../../devel/gettext-lib/buildlink3.mk" 56.include "../../devel/gettext-lib/buildlink3.mk"
59.include "../../devel/libltdl/convenience.mk" 57.include "../../devel/libltdl/convenience.mk"
60.include "../../devel/pango/buildlink3.mk" 58.include "../../fonts/fontconfig/buildlink3.mk"
61.include "../../graphics/gd/buildlink3.mk" 59#.include "../../graphics/jpeg/buildlink3.mk"
62.include "../../graphics/jpeg/buildlink3.mk" 60#.include "../../graphics/png/buildlink3.mk"
63.include "../../graphics/png/buildlink3.mk" 
64.include "../../textproc/expat/buildlink3.mk" 61.include "../../textproc/expat/buildlink3.mk"
65.include "../../x11/libXp/buildlink3.mk" 
66.include "../../mk/xaw.buildlink3.mk" 
67.include "../../mk/pthread.buildlink3.mk" 62.include "../../mk/pthread.buildlink3.mk"
68.include "../../mk/bsd.pkg.mk" 63.include "../../mk/bsd.pkg.mk"
cvs diff -r1.25 -r1.26 pkgsrc/graphics/graphviz/PLIST (expand / switch to unified 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,37 +1,30 @@ @@ -1,37 +1,30 @@
1@comment $NetBSD: PLIST,v 1.25 2008/11/15 01:28:41 epg Exp $ 
2bin/acyclic 1bin/acyclic
3bin/bcomps 2bin/bcomps
4bin/ccomps 3bin/ccomps
5bin/circo 
6bin/diffimg 
7bin/dijkstra 4bin/dijkstra
8bin/dot 5bin/dot
9bin/dot2gxl 
10bin/dotty 6bin/dotty
11bin/fdp 
12bin/gc 7bin/gc
13bin/gvcolor 8bin/gvcolor
14bin/gvpack 9bin/gvpack
15bin/gvpr 10bin/gvpr
16bin/gxl2dot 11bin/gxl2dot
17bin/lefty 12${PLIST.x11}bin/lefty
18bin/lneato 13bin/lneato
19bin/neato 
20bin/nop 14bin/nop
21bin/prune 15bin/prune
22bin/sccmap 16bin/sccmap
23bin/tred 17bin/tred
24bin/twopi 
25bin/unflatten 18bin/unflatten
26include/graphviz/agraph.h 19include/graphviz/agraph.h
27include/graphviz/arith.h 20include/graphviz/arith.h
28include/graphviz/cdt.h 21include/graphviz/cdt.h
29include/graphviz/cgraph.h 22include/graphviz/cgraph.h
30include/graphviz/color.h 23include/graphviz/color.h
31include/graphviz/demand_loading.c 24include/graphviz/demand_loading.c
32include/graphviz/dot_builtins.c 25include/graphviz/dot_builtins.c
33include/graphviz/geom.h 26include/graphviz/geom.h
34include/graphviz/graph.h 27include/graphviz/graph.h
35include/graphviz/gv.cpp 28include/graphviz/gv.cpp
36include/graphviz/gv.i 29include/graphviz/gv.i
37include/graphviz/gvc.h 30include/graphviz/gvc.h
@@ -41,143 +34,95 @@ include/graphviz/gvcommon.h @@ -41,143 +34,95 @@ include/graphviz/gvcommon.h
41include/graphviz/gvplugin.h 34include/graphviz/gvplugin.h
42include/graphviz/gvplugin_device.h 35include/graphviz/gvplugin_device.h
43include/graphviz/gvplugin_layout.h 36include/graphviz/gvplugin_layout.h
44include/graphviz/gvplugin_loadimage.h 37include/graphviz/gvplugin_loadimage.h
45include/graphviz/gvplugin_render.h 38include/graphviz/gvplugin_render.h
46include/graphviz/gvplugin_textlayout.h 39include/graphviz/gvplugin_textlayout.h
47include/graphviz/no_demand_loading.c 40include/graphviz/no_demand_loading.c
48include/graphviz/pack.h 41include/graphviz/pack.h
49include/graphviz/pathgeom.h 42include/graphviz/pathgeom.h
50include/graphviz/pathplan.h 43include/graphviz/pathplan.h
51include/graphviz/textpara.h 44include/graphviz/textpara.h
52include/graphviz/types.h 45include/graphviz/types.h
53include/graphviz/usershape.h 46include/graphviz/usershape.h
 47lib/graphviz/config
 48lib/graphviz/libgvplugin_core.a
54lib/graphviz/libgvplugin_core.la 49lib/graphviz/libgvplugin_core.la
 50lib/graphviz/libgvplugin_core.so.5
 51lib/graphviz/libgvplugin_dot_layout.a
55lib/graphviz/libgvplugin_dot_layout.la 52lib/graphviz/libgvplugin_dot_layout.la
 53lib/graphviz/libgvplugin_dot_layout.so.5
 54lib/graphviz/libgvplugin_gd.a
56lib/graphviz/libgvplugin_gd.la 55lib/graphviz/libgvplugin_gd.la
57${PLIST.gtk}lib/graphviz/libgvplugin_gdk_pixbuf.la 56lib/graphviz/libgvplugin_gd.so.5
58${PLIST.gtk}lib/graphviz/libgvplugin_gtk.la 57lib/graphviz/libgvplugin_neato_layout.a
59${PLIST.guile}lib/graphviz/guile/libgv_guile.la 
60lib/graphviz/libgvplugin_neato_layout.la 58lib/graphviz/libgvplugin_neato_layout.la
61lib/graphviz/libgvplugin_pango.la 59lib/graphviz/libgvplugin_neato_layout.so.5
62lib/graphviz/libgvplugin_xlib.la 60lib/libagraph.a
63lib/graphviz/lua/gv.so 
64${PLIST.lua}lib/graphviz/lua/libgv_lua.la 
65${PLIST.ocaml}lib/graphviz/ocaml/META.gv 
66${PLIST.ocaml}lib/graphviz/ocaml/gv.a 
67${PLIST.ocaml}lib/graphviz/ocaml/gv.cma 
68${PLIST.ocaml}lib/graphviz/ocaml/gv.cmi 
69${PLIST.ocaml}lib/graphviz/ocaml/gv.cmo 
70${PLIST.ocaml}lib/graphviz/ocaml/gv.cmx 
71${PLIST.ocaml}lib/graphviz/ocaml/gv.cmxa 
72${PLIST.ocaml}lib/graphviz/ocaml/gv.mli 
73${PLIST.ocaml}lib/graphviz/ocaml/libgv_ocaml.a 
74${PLIST.ocaml}lib/graphviz/ocaml/libgv_ocaml.la 
75${PLIST.ocaml}lib/graphviz/ocaml/libgv_ocaml.so 
76lib/graphviz/perl/gv.so 
77lib/graphviz/pkgIndex.tcl 
78lib/graphviz/python/_gv.so 
79lib/graphviz/python23/_gv.so 
80lib/graphviz/python24/_gv.so 
81lib/graphviz/python25/_gv.so 
82lib/graphviz/r/gv.so 
83lib/graphviz/ruby/gv.so 
84lib/graphviz/tcl/gv.so 
85${PLIST.tcl}lib/graphviz/tcl/libgdtclft.la 
86${PLIST.tcl}lib/graphviz/tcl/libgv_tcl.la 
87${PLIST.tcl}lib/graphviz/tcl/libtcldot.la 
88${PLIST.tcl}lib/graphviz/tcl/libtcldot_builtin.la 
89${PLIST.tcl}lib/graphviz/tcl/libtclplan.la 
90${PLIST.tcl}lib/graphviz/tcl/libtkspline.la 
91lib/libagraph.la 61lib/libagraph.la
 62lib/libagraph.so.4
 63lib/libcdt.a
92lib/libcdt.la 64lib/libcdt.la
 65lib/libcdt.so.4
 66lib/libcgraph.a
93lib/libcgraph.la 67lib/libcgraph.la
 68lib/libcgraph.so.4
 69lib/libgraph.a
94lib/libgraph.la 70lib/libgraph.la
 71lib/libgraph.so.4
 72lib/libgvc.a
95lib/libgvc.la 73lib/libgvc.la
96lib/libgvc_builtins.la 74lib/libgvc.so.4
 75lib/libpathplan.a
97lib/libpathplan.la 76lib/libpathplan.la
 77lib/libpathplan.so.4
98lib/pkgconfig/libagraph.pc 78lib/pkgconfig/libagraph.pc
99lib/pkgconfig/libcdt.pc 79lib/pkgconfig/libcdt.pc
100lib/pkgconfig/libcgraph.pc 80lib/pkgconfig/libcgraph.pc
101lib/pkgconfig/libgraph.pc 81lib/pkgconfig/libgraph.pc
102lib/pkgconfig/libgvc.pc 82lib/pkgconfig/libgvc.pc
103lib/pkgconfig/libgvc_builtins.pc 
104lib/pkgconfig/libpathplan.pc 83lib/pkgconfig/libpathplan.pc
105man/man1/acyclic.1 84man/man1/acyclic.1
106man/man1/bcomps.1 85man/man1/bcomps.1
107man/man1/ccomps.1 86man/man1/ccomps.1
108man/man1/circo.1 
109man/man1/dijkstra.1 87man/man1/dijkstra.1
110man/man1/dot.1 88man/man1/dot.1
111man/man1/dot2gxl.1 
112man/man1/dotty.1 89man/man1/dotty.1
113man/man1/fdp.1 
114man/man1/gc.1 90man/man1/gc.1
115man/man1/gvcolor.1 91man/man1/gvcolor.1
116man/man1/gvpack.1 92man/man1/gvpack.1
117man/man1/gvpr.1 93man/man1/gvpr.1
118man/man1/gxl2dot.1 94man/man1/gxl2dot.1
119man/man1/lefty.1 95${PLIST.x11}man/man1/lefty.1
120man/man1/lneato.1 96man/man1/lneato.1
121man/man1/neato.1 
122man/man1/nop.1 97man/man1/nop.1
123man/man1/prune.1 98man/man1/prune.1
124man/man1/sccmap.1 99man/man1/sccmap.1
125man/man1/tred.1 100man/man1/tred.1
126man/man1/twopi.1 
127man/man1/unflatten.1 101man/man1/unflatten.1
128man/man3/agraph.3 102man/man3/agraph.3
129man/man3/cdt.3 103man/man3/cdt.3
130man/man3/cgraph.3 104man/man3/cgraph.3
131man/man3/graph.3 105man/man3/graph.3
132man/man3/gvc.3 106man/man3/gvc.3
133man/man3/pathplan.3 107man/man3/pathplan.3
134man/man7/graphviz.7 108man/man7/graphviz.7
135${PLIST.guile}man/mann/gv_guile.n 
136${PLIST.lua}man/mann/gv_lua.n 
137${PLIST.ocaml}man/mann/gv_ocaml.n 
138${PLIST.tcl}man/mann/gdtclft.n 
139${PLIST.tcl}man/mann/gv_tcl.n 
140${PLIST.tcl}man/mann/tcldot.n 
141${PLIST.tcl}man/mann/tkspline.n 
142${PLIST.tcl}share/graphviz/demo/doted 
143${PLIST.tcl}share/graphviz/demo/doted.README 
144${PLIST.tcl}share/graphviz/demo/entities 
145${PLIST.tcl}share/graphviz/demo/entities.README 
146${PLIST.tcl}share/graphviz/demo/entities.html 
147${PLIST.tcl}share/graphviz/demo/gcat 
148${PLIST.tcl}share/graphviz/demo/gcat.README 
149${PLIST.tcl}share/graphviz/demo/pathplan 
150${PLIST.tcl}share/graphviz/demo/pathplan.README 
151${PLIST.tcl}share/graphviz/demo/pathplan_data/boxes.dat 
152${PLIST.tcl}share/graphviz/demo/pathplan_data/dpd.dat 
153${PLIST.tcl}share/graphviz/demo/pathplan_data/funny.dat 
154${PLIST.tcl}share/graphviz/demo/pathplan_data/maze.dat 
155${PLIST.tcl}share/graphviz/demo/pathplan_data/nested.dat 
156${PLIST.tcl}share/graphviz/demo/pathplan_data/northo.dat 
157${PLIST.tcl}share/graphviz/demo/pathplan_data/obs.dat 
158${PLIST.tcl}share/graphviz/demo/pathplan_data/other.dat 
159${PLIST.tcl}share/graphviz/demo/pathplan_data/paths.dat 
160${PLIST.tcl}share/graphviz/demo/pathplan_data/rotor.dat 
161${PLIST.tcl}share/graphviz/demo/pathplan_data/u.dat 
162${PLIST.tcl}share/graphviz/demo/pathplan_data/unknown.dat 
163${PLIST.tcl}share/graphviz/demo/spline 
164${PLIST.tcl}share/graphviz/demo/spline.README 
165share/graphviz/doc/AUTHORS 109share/graphviz/doc/AUTHORS
166share/graphviz/doc/COPYING 110share/graphviz/doc/COPYING
167share/graphviz/doc/ChangeLog 111share/graphviz/doc/ChangeLog
168share/graphviz/doc/Dot.ref 112share/graphviz/doc/Dot.ref
169share/graphviz/doc/NEWS 113share/graphviz/doc/NEWS
170share/graphviz/doc/cpl1.0.txt 114share/graphviz/doc/cpl1.0.txt
 115share/graphviz/doc/fontfaq.txt
171share/graphviz/doc/html/FAQ.html 116share/graphviz/doc/html/FAQ.html
172share/graphviz/doc/html/build.html 117share/graphviz/doc/html/build.html
173share/graphviz/doc/html/index.html 118share/graphviz/doc/html/index.html
174share/graphviz/doc/html/info/Mcircle.gif 119share/graphviz/doc/html/info/Mcircle.gif
175share/graphviz/doc/html/info/Mdiamond.gif 120share/graphviz/doc/html/info/Mdiamond.gif
176share/graphviz/doc/html/info/Msquare.gif 121share/graphviz/doc/html/info/Msquare.gif
177share/graphviz/doc/html/info/a_box.gif 122share/graphviz/doc/html/info/a_box.gif
178share/graphviz/doc/html/info/a_crow.gif 123share/graphviz/doc/html/info/a_crow.gif
179share/graphviz/doc/html/info/a_diamond.gif 124share/graphviz/doc/html/info/a_diamond.gif
180share/graphviz/doc/html/info/a_dot.gif 125share/graphviz/doc/html/info/a_dot.gif
181share/graphviz/doc/html/info/a_ediamond.gif 126share/graphviz/doc/html/info/a_ediamond.gif
182share/graphviz/doc/html/info/a_empty.gif 127share/graphviz/doc/html/info/a_empty.gif
183share/graphviz/doc/html/info/a_forward.gif 128share/graphviz/doc/html/info/a_forward.gif
@@ -225,108 +170,103 @@ share/graphviz/doc/html/info/aa_ornormal @@ -225,108 +170,103 @@ share/graphviz/doc/html/info/aa_ornormal
225share/graphviz/doc/html/info/aa_rbox.gif 170share/graphviz/doc/html/info/aa_rbox.gif
226share/graphviz/doc/html/info/aa_rcrow.gif 171share/graphviz/doc/html/info/aa_rcrow.gif
227share/graphviz/doc/html/info/aa_rdiamond.gif 172share/graphviz/doc/html/info/aa_rdiamond.gif
228share/graphviz/doc/html/info/aa_rinv.gif 173share/graphviz/doc/html/info/aa_rinv.gif
229share/graphviz/doc/html/info/aa_rnormal.gif 174share/graphviz/doc/html/info/aa_rnormal.gif
230share/graphviz/doc/html/info/aa_rtee.gif 175share/graphviz/doc/html/info/aa_rtee.gif
231share/graphviz/doc/html/info/aa_rvee.gif 176share/graphviz/doc/html/info/aa_rvee.gif
232share/graphviz/doc/html/info/aa_tee.gif 177share/graphviz/doc/html/info/aa_tee.gif
233share/graphviz/doc/html/info/aa_vee.gif 178share/graphviz/doc/html/info/aa_vee.gif
234share/graphviz/doc/html/info/attrs.html 179share/graphviz/doc/html/info/attrs.html
235share/graphviz/doc/html/info/back.gif 180share/graphviz/doc/html/info/back.gif
236share/graphviz/doc/html/info/both.gif 181share/graphviz/doc/html/info/both.gif
237share/graphviz/doc/html/info/box.gif 182share/graphviz/doc/html/info/box.gif
 183share/graphviz/doc/html/info/box3d.gif
238share/graphviz/doc/html/info/circle.gif 184share/graphviz/doc/html/info/circle.gif
 185share/graphviz/doc/html/info/colorlist.gif
239share/graphviz/doc/html/info/colors.html 186share/graphviz/doc/html/info/colors.html
240share/graphviz/doc/html/info/command.html 187share/graphviz/doc/html/info/command.html
 188share/graphviz/doc/html/info/component.gif
241share/graphviz/doc/html/info/constraint.gif 189share/graphviz/doc/html/info/constraint.gif
242share/graphviz/doc/html/info/diamond.gif 190share/graphviz/doc/html/info/diamond.gif
243share/graphviz/doc/html/info/doublecircle.gif 191share/graphviz/doc/html/info/doublecircle.gif
244share/graphviz/doc/html/info/doubleoctagon.gif 192share/graphviz/doc/html/info/doubleoctagon.gif
245share/graphviz/doc/html/info/egg.gif 193share/graphviz/doc/html/info/egg.gif
246share/graphviz/doc/html/info/ellipse.gif 194share/graphviz/doc/html/info/ellipse.gif
247share/graphviz/doc/html/info/fill.gif 195share/graphviz/doc/html/info/fill.gif
 196share/graphviz/doc/html/info/folder.gif
248share/graphviz/doc/html/info/forward.gif 197share/graphviz/doc/html/info/forward.gif
249share/graphviz/doc/html/info/grammar.html 198share/graphviz/doc/html/info/grammar.html
250share/graphviz/doc/html/info/hexagon.gif 199share/graphviz/doc/html/info/hexagon.gif
251share/graphviz/doc/html/info/house.gif 200share/graphviz/doc/html/info/house.gif
252share/graphviz/doc/html/info/html1.gif 201share/graphviz/doc/html/info/html1.gif
253share/graphviz/doc/html/info/html2.gif 202share/graphviz/doc/html/info/html2.gif
254share/graphviz/doc/html/info/html3.gif 203share/graphviz/doc/html/info/html3.gif
255share/graphviz/doc/html/info/html4.gif 204share/graphviz/doc/html/info/html4.gif
256share/graphviz/doc/html/info/index.html 205share/graphviz/doc/html/info/index.html
257share/graphviz/doc/html/info/invhouse.gif 206share/graphviz/doc/html/info/invhouse.gif
258share/graphviz/doc/html/info/invtrapezium.gif 207share/graphviz/doc/html/info/invtrapezium.gif
259share/graphviz/doc/html/info/invtriangle.gif 208share/graphviz/doc/html/info/invtriangle.gif
260share/graphviz/doc/html/info/lang.html 209share/graphviz/doc/html/info/lang.html
261share/graphviz/doc/html/info/mrecord.gif 210share/graphviz/doc/html/info/mrecord.gif
262share/graphviz/doc/html/info/nohead.gif 211share/graphviz/doc/html/info/nohead.gif
263share/graphviz/doc/html/info/none.gif 212share/graphviz/doc/html/info/none.gif
 213share/graphviz/doc/html/info/note.gif
264share/graphviz/doc/html/info/octagon.gif 214share/graphviz/doc/html/info/octagon.gif
265share/graphviz/doc/html/info/output.html 215share/graphviz/doc/html/info/output.html
266share/graphviz/doc/html/info/parallelogram.gif 216share/graphviz/doc/html/info/parallelogram.gif
267share/graphviz/doc/html/info/pentagon.gif 217share/graphviz/doc/html/info/pentagon.gif
268share/graphviz/doc/html/info/plaintext.gif 218share/graphviz/doc/html/info/plaintext.gif
269share/graphviz/doc/html/info/point.gif 219share/graphviz/doc/html/info/point.gif
270share/graphviz/doc/html/info/polygon.gif 220share/graphviz/doc/html/info/polygon.gif
271share/graphviz/doc/html/info/record.gif 221share/graphviz/doc/html/info/record.gif
272share/graphviz/doc/html/info/rect.gif 222share/graphviz/doc/html/info/rect.gif
273share/graphviz/doc/html/info/rectangle.gif 223share/graphviz/doc/html/info/rectangle.gif
274share/graphviz/doc/html/info/round.gif 224share/graphviz/doc/html/info/round.gif
275share/graphviz/doc/html/info/sdlshapes.jpg 
276share/graphviz/doc/html/info/septagon.gif 225share/graphviz/doc/html/info/septagon.gif
277share/graphviz/doc/html/info/shapes.html 226share/graphviz/doc/html/info/shapes.html
 227share/graphviz/doc/html/info/tab.gif
278share/graphviz/doc/html/info/trapezium.gif 228share/graphviz/doc/html/info/trapezium.gif
279share/graphviz/doc/html/info/triangle.gif 229share/graphviz/doc/html/info/triangle.gif
280share/graphviz/doc/html/info/tripleoctagon.gif 230share/graphviz/doc/html/info/tripleoctagon.gif
281share/graphviz/doc/html/pspdf.png 231share/graphviz/doc/html/pspdf.png
282${PLIST.tcl}share/graphviz/doc/html/tcldot.html 
283share/graphviz/doc/html/winbuild.html 232share/graphviz/doc/html/winbuild.html
284share/graphviz/doc/latex_suggestions.txt 233share/graphviz/doc/latex_suggestions.txt
285share/graphviz/doc/pdf/acyclic.pdf 234share/graphviz/doc/pdf/acyclic.pdf
286share/graphviz/doc/pdf/agraph.pdf 235share/graphviz/doc/pdf/agraph.pdf
287share/graphviz/doc/pdf/bcomps.pdf 236share/graphviz/doc/pdf/bcomps.pdf
288share/graphviz/doc/pdf/ccomps.pdf 237share/graphviz/doc/pdf/ccomps.pdf
289share/graphviz/doc/pdf/cdt.pdf 238share/graphviz/doc/pdf/cdt.pdf
290share/graphviz/doc/pdf/cgraph.pdf 239share/graphviz/doc/pdf/cgraph.pdf
291share/graphviz/doc/pdf/circo.pdf 
292share/graphviz/doc/pdf/dijkstra.pdf 240share/graphviz/doc/pdf/dijkstra.pdf
293share/graphviz/doc/pdf/dot.pdf 241share/graphviz/doc/pdf/dot.pdf
294share/graphviz/doc/pdf/dot2gxl.pdf 
295share/graphviz/doc/pdf/dotguide.pdf 242share/graphviz/doc/pdf/dotguide.pdf
296share/graphviz/doc/pdf/dotty.pdf 243share/graphviz/doc/pdf/dotty.pdf
297share/graphviz/doc/pdf/dottyguide.pdf 244share/graphviz/doc/pdf/dottyguide.pdf
298share/graphviz/doc/pdf/fdp.pdf 
299share/graphviz/doc/pdf/gc.pdf 245share/graphviz/doc/pdf/gc.pdf
300${PLIST.tcl}share/graphviz/doc/pdf/gdtclft.pdf 
301share/graphviz/doc/pdf/graph.pdf 246share/graphviz/doc/pdf/graph.pdf
302share/graphviz/doc/pdf/gvc.pdf 247share/graphviz/doc/pdf/gvc.pdf
303share/graphviz/doc/pdf/gvcolor.pdf 248share/graphviz/doc/pdf/gvcolor.pdf
304share/graphviz/doc/pdf/gvpack.pdf 249share/graphviz/doc/pdf/gvpack.pdf
305share/graphviz/doc/pdf/gvpr.pdf 250share/graphviz/doc/pdf/gvpr.pdf
306share/graphviz/doc/pdf/gxl2dot.pdf 251share/graphviz/doc/pdf/gxl2dot.pdf
307share/graphviz/doc/pdf/lefty.pdf 
308share/graphviz/doc/pdf/leftyguide.pdf 252share/graphviz/doc/pdf/leftyguide.pdf
309share/graphviz/doc/pdf/lneato.pdf 253share/graphviz/doc/pdf/lneato.pdf
310share/graphviz/doc/pdf/neato.pdf 
311share/graphviz/doc/pdf/neatoguide.pdf 254share/graphviz/doc/pdf/neatoguide.pdf
312share/graphviz/doc/pdf/nop.pdf 255share/graphviz/doc/pdf/nop.pdf
313share/graphviz/doc/pdf/pathplan.pdf 256share/graphviz/doc/pdf/pathplan.pdf
314share/graphviz/doc/pdf/prune.pdf 257share/graphviz/doc/pdf/prune.pdf
315share/graphviz/doc/pdf/sccmap.pdf 258share/graphviz/doc/pdf/sccmap.pdf
316${PLIST.tcl}share/graphviz/doc/pdf/tcldot.pdf 
317${PLIST.tcl}share/graphviz/doc/pdf/tkspline.pdf 
318share/graphviz/doc/pdf/tred.pdf 259share/graphviz/doc/pdf/tred.pdf
319share/graphviz/doc/pdf/twopi.pdf 
320share/graphviz/doc/pdf/unflatten.pdf 260share/graphviz/doc/pdf/unflatten.pdf
321share/graphviz/graphs/directed/KW91.dot 261share/graphviz/graphs/directed/KW91.dot
322share/graphviz/graphs/directed/Latin1.dot 262share/graphviz/graphs/directed/Latin1.dot
323share/graphviz/graphs/directed/NaN.dot 263share/graphviz/graphs/directed/NaN.dot
324share/graphviz/graphs/directed/abstract.dot 264share/graphviz/graphs/directed/abstract.dot
325share/graphviz/graphs/directed/alf.dot 265share/graphviz/graphs/directed/alf.dot
326share/graphviz/graphs/directed/arrows.dot 266share/graphviz/graphs/directed/arrows.dot
327share/graphviz/graphs/directed/awilliams.dot 267share/graphviz/graphs/directed/awilliams.dot
328share/graphviz/graphs/directed/clust.dot 268share/graphviz/graphs/directed/clust.dot
329share/graphviz/graphs/directed/clust1.dot 269share/graphviz/graphs/directed/clust1.dot
330share/graphviz/graphs/directed/clust2.dot 270share/graphviz/graphs/directed/clust2.dot
331share/graphviz/graphs/directed/clust3.dot 271share/graphviz/graphs/directed/clust3.dot
332share/graphviz/graphs/directed/clust4.dot 272share/graphviz/graphs/directed/clust4.dot
@@ -376,47 +316,132 @@ share/graphviz/graphs/undirected/ngk10_4 @@ -376,47 +316,132 @@ share/graphviz/graphs/undirected/ngk10_4
376share/graphviz/graphs/undirected/process.dot 316share/graphviz/graphs/undirected/process.dot
377share/graphviz/lefty/box.lefty 317share/graphviz/lefty/box.lefty
378share/graphviz/lefty/def.lefty 318share/graphviz/lefty/def.lefty
379share/graphviz/lefty/dotty.lefty 319share/graphviz/lefty/dotty.lefty
380share/graphviz/lefty/dotty_draw.lefty 320share/graphviz/lefty/dotty_draw.lefty
381share/graphviz/lefty/dotty_edit.lefty 321share/graphviz/lefty/dotty_edit.lefty
382share/graphviz/lefty/dotty_layout.lefty 322share/graphviz/lefty/dotty_layout.lefty
383share/graphviz/lefty/dotty_ui.lefty 323share/graphviz/lefty/dotty_ui.lefty
384share/graphviz/lefty/fractal.lefty 324share/graphviz/lefty/fractal.lefty
385share/graphviz/lefty/fractal2.lefty 325share/graphviz/lefty/fractal2.lefty
386share/graphviz/lefty/lefty.psp 326share/graphviz/lefty/lefty.psp
387share/graphviz/lefty/slides.lefty 327share/graphviz/lefty/slides.lefty
388share/graphviz/lefty/tree.lefty 328share/graphviz/lefty/tree.lefty
 329${PLIST.x11}share/graphviz/doc/pdf/lefty.pdf
 330${PLIST.pangocairo}lib/graphviz/libgvplugin_pango.a
 331${PLIST.pangocairo}lib/graphviz/libgvplugin_pango.la
 332${PLIST.pangocairo}lib/graphviz/libgvplugin_pango.so.5
 333${PLIST.pangocairo}lib/graphviz/libgvplugin_xlib.a
 334${PLIST.pangocairo}lib/graphviz/libgvplugin_xlib.la
 335${PLIST.pangocairo}lib/graphviz/libgvplugin_xlib.so.5
 336${PLIST.guile}lib/graphviz/guile/libgv_guile.a
 337${PLIST.guile}lib/graphviz/guile/libgv_guile.la
 338${PLIST.guile}lib/graphviz/guile/libgv_guile.so
 339${PLIST.lua}lib/graphviz/lua/libgv_lua.a
 340${PLIST.lua}lib/graphviz/lua/libgv_lua.la
 341${PLIST.lua}lib/graphviz/lua/libgv_lua.so
 342${PLIST.guile}man/mann/gv_guile.n
 343${PLIST.lua}man/mann/gv_lua.n
 344${PLIST.lua}share/graphviz/demo/modgraph.lua
 345${PLIST.tcl}lib/graphviz/tcl/libgv_tcl.a
 346${PLIST.tcl}lib/graphviz/tcl/libgv_tcl.la
 347${PLIST.tcl}lib/graphviz/tcl/libgv_tcl.so
 348${PLIST.tcl}lib/graphviz/tcl/libtcldot.a
 349${PLIST.tcl}lib/graphviz/tcl/libtcldot.la
 350${PLIST.tcl}lib/graphviz/tcl/libtcldot.so.0
 351${PLIST.tcl}lib/graphviz/tcl/libtcldot_builtin.a
 352${PLIST.tcl}lib/graphviz/tcl/libtcldot_builtin.la
 353${PLIST.tcl}lib/graphviz/tcl/libtcldot_builtin.so.0
 354${PLIST.tcl}lib/graphviz/tcl/libtclplan.a
 355${PLIST.tcl}lib/graphviz/tcl/libtclplan.la
 356${PLIST.tcl}lib/graphviz/tcl/libtclplan.so.0
 357${PLIST.tcl}lib/graphviz/tcl/libtkspline.a
 358${PLIST.tcl}lib/graphviz/tcl/libtkspline.la
 359${PLIST.tcl}lib/graphviz/tcl/libtkspline.so.0
 360${PLIST.tcl}lib/graphviz/tcl/pkgIndex.tcl
 361${PLIST.tcl}man/mann/gv_tcl.n
 362${PLIST.tcl}man/mann/tcldot.n
 363${PLIST.tcl}man/mann/tkspline.n
 364${PLIST.tcl}share/graphviz/demo/doted.tcl
 365${PLIST.tcl}share/graphviz/demo/doted.tcl.README
 366${PLIST.tcl}share/graphviz/demo/entities.tcl
 367${PLIST.tcl}share/graphviz/demo/entities.tcl.README
 368${PLIST.tcl}share/graphviz/demo/entities.tcl.html
 369${PLIST.tcl}share/graphviz/demo/gcat.tcl
 370${PLIST.tcl}share/graphviz/demo/gcat.tcl.README
 371${PLIST.tcl}share/graphviz/demo/modgraph.tcl
 372${PLIST.tcl}share/graphviz/demo/pathplan.tcl
 373${PLIST.tcl}share/graphviz/demo/pathplan.tcl.README
 374${PLIST.tcl}share/graphviz/demo/pathplan_data/boxes.dat
 375${PLIST.tcl}share/graphviz/demo/pathplan_data/dpd.dat
 376${PLIST.tcl}share/graphviz/demo/pathplan_data/funny.dat
 377${PLIST.tcl}share/graphviz/demo/pathplan_data/maze.dat
 378${PLIST.tcl}share/graphviz/demo/pathplan_data/nested.dat
 379${PLIST.tcl}share/graphviz/demo/pathplan_data/northo.dat
 380${PLIST.tcl}share/graphviz/demo/pathplan_data/obs.dat
 381${PLIST.tcl}share/graphviz/demo/pathplan_data/other.dat
 382${PLIST.tcl}share/graphviz/demo/pathplan_data/paths.dat
 383${PLIST.tcl}share/graphviz/demo/pathplan_data/rotor.dat
 384${PLIST.tcl}share/graphviz/demo/pathplan_data/u.dat
 385${PLIST.tcl}share/graphviz/demo/pathplan_data/unknown.dat
 386${PLIST.tcl}share/graphviz/demo/spline.tcl
 387${PLIST.tcl}share/graphviz/demo/spline.tcl.README
 388${PLIST.tcl}share/graphviz/doc/html/tcldot.html
 389${PLIST.tcl}share/graphviz/doc/pdf/tcldot.pdf
 390${PLIST.tcl}share/graphviz/doc/pdf/tkspline.pdf
 391${PLIST.gtk}lib/graphviz/libgvplugin_gdk_pixbuf.a
 392${PLIST.gtk}lib/graphviz/libgvplugin_gdk_pixbuf.la
 393${PLIST.gtk}lib/graphviz/libgvplugin_gdk_pixbuf.so.5
 394${PLIST.gtk}lib/graphviz/libgvplugin_gtk.a
 395${PLIST.gtk}lib/graphviz/libgvplugin_gtk.la
 396${PLIST.gtk}lib/graphviz/libgvplugin_gtk.so.5
 397${PLIST.gd}bin/diffimg
 398${PLIST.gd}${PLIST.tcl}lib/graphviz/tcl/libgdtclft.a
 399${PLIST.gd}${PLIST.tcl}lib/graphviz/tcl/libgdtclft.la
 400${PLIST.gd}${PLIST.tcl}lib/graphviz/tcl/libgdtclft.so.0
 401${PLIST.gd}${PLIST.tcl}man/mann/gdtclft.n
 402${PLIST.gd}${PLIST.tcl}share/graphviz/doc/pdf/gdtclft.pdf
 403@exec ${MKDIR} %D/share/graphviz/smyrna
 404@dirrm share/graphviz/smyrna
389@dirrm share/graphviz/lefty 405@dirrm share/graphviz/lefty
390@dirrm share/graphviz/graphs/undirected 406@dirrm share/graphviz/graphs/undirected
391@dirrm share/graphviz/graphs/directed 407@dirrm share/graphviz/graphs/directed
392@dirrm share/graphviz/graphs 408@dirrm share/graphviz/graphs
 409@exec ${MKDIR} %D/share/graphviz/examples
 410@dirrm share/graphviz/examples
393@dirrm share/graphviz/doc/pdf 411@dirrm share/graphviz/doc/pdf
394@dirrm share/graphviz/doc/html/info 412@dirrm share/graphviz/doc/html/info
395@dirrm share/graphviz/doc/html 413@dirrm share/graphviz/doc/html
396@dirrm share/graphviz/doc 414@dirrm share/graphviz/doc
397@dirrm share/graphviz/demo/pathplan_data 415@dirrm share/graphviz/demo/pathplan_data
398@dirrm share/graphviz/demo 416@dirrm share/graphviz/demo
399@dirrm share/graphviz 417@dirrm share/graphviz
400@dirrm lib/graphviz/tcl 418@dirrm lib/graphviz/tcl
401@exec ${MKDIR} %D/lib/graphviz/sharp 419@exec ${MKDIR} %D/lib/graphviz/sharp
402@dirrm lib/graphviz/sharp 420@dirrm lib/graphviz/sharp
 421@exec ${MKDIR} %D/lib/graphviz/ruby
403@dirrm lib/graphviz/ruby 422@dirrm lib/graphviz/ruby
404@dirrm lib/graphviz/r 423@exec ${MKDIR} %D/lib/graphviz/python25
405@dirrm lib/graphviz/python25 424@dirrm lib/graphviz/python25
 425@exec ${MKDIR} %D/lib/graphviz/python24
406@dirrm lib/graphviz/python24 426@dirrm lib/graphviz/python24
 427@exec ${MKDIR} %D/lib/graphviz/python23
407@dirrm lib/graphviz/python23 428@dirrm lib/graphviz/python23
 429@exec ${MKDIR} %D/lib/graphviz/python
408@dirrm lib/graphviz/python 430@dirrm lib/graphviz/python
409@exec ${MKDIR} %D/lib/graphviz/php 431@exec ${MKDIR} %D/lib/graphviz/php
410@dirrm lib/graphviz/php 432@dirrm lib/graphviz/php
 433@exec ${MKDIR} %D/lib/graphviz/perl
411@dirrm lib/graphviz/perl 434@dirrm lib/graphviz/perl
412@exec ${MKDIR} %D/lib/graphviz/ocaml 435@exec ${MKDIR} %D/lib/graphviz/ocaml
413@dirrm lib/graphviz/ocaml 436@dirrm lib/graphviz/ocaml
414@dirrm lib/graphviz/lua 437@dirrm lib/graphviz/lua
415@exec ${MKDIR} %D/lib/graphviz/java 438@exec ${MKDIR} %D/lib/graphviz/java
416@dirrm lib/graphviz/java 439@dirrm lib/graphviz/java
417@exec ${MKDIR} %D/lib/graphviz/io 440@exec ${MKDIR} %D/lib/graphviz/io
418@dirrm lib/graphviz/io 441@dirrm lib/graphviz/io
419@exec ${MKDIR} %D/lib/graphviz/guile 
420@dirrm lib/graphviz/guile 442@dirrm lib/graphviz/guile
 443@exec ${MKDIR} %D/lib/graphviz/R
 444@dirrm lib/graphviz/R
421@dirrm lib/graphviz 445@dirrm lib/graphviz
422@dirrm include/graphviz 446@dirrm include/graphviz
 447
cvs diff -r1.14 -r1.15 pkgsrc/graphics/graphviz/buildlink3.mk (expand / switch to unified 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,26 +1,26 @@ @@ -1,26 +1,26 @@
1# $NetBSD: buildlink3.mk,v 1.14 2008/02/06 18:56:52 adam Exp $ 1# $NetBSD: buildlink3.mk,v 1.15 2009/02/26 19:45:14 sno Exp $
2 2
3BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+ 3BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+
4GRAPHVIZ_BUILDLINK3_MK:= ${GRAPHVIZ_BUILDLINK3_MK}+ 4GRAPHVIZ_BUILDLINK3_MK:= ${GRAPHVIZ_BUILDLINK3_MK}+
5 5
6.if ${BUILDLINK_DEPTH} == "+" 6.if ${BUILDLINK_DEPTH} == "+"
7BUILDLINK_DEPENDS+= graphviz 7BUILDLINK_DEPENDS+= graphviz
8.endif 8.endif
9 9
10BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Ngraphviz} 10BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Ngraphviz}
11BUILDLINK_PACKAGES+= graphviz 11BUILDLINK_PACKAGES+= graphviz
12BUILDLINK_ORDER:= ${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}graphviz 12BUILDLINK_ORDER:= ${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}graphviz
13 13
14.if ${GRAPHVIZ_BUILDLINK3_MK} == "+" 14.if ${GRAPHVIZ_BUILDLINK3_MK} == "+"
15BUILDLINK_API_DEPENDS.graphviz+= graphviz>=1.12 15BUILDLINK_API_DEPENDS.graphviz+= graphviz>=1.12
16BUILDLINK_ABI_DEPENDS.graphviz+= graphviz>=2.6nb5 16BUILDLINK_ABI_DEPENDS.graphviz+= graphviz>=2.6nb5
17BUILDLINK_PKGSRCDIR.graphviz?= ../../graphics/graphviz 17BUILDLINK_PKGSRCDIR.graphviz?= ../../graphics/graphviz
18.endif # GRAPHVIZ_BUILDLINK3_MK 18.endif # GRAPHVIZ_BUILDLINK3_MK
19 19
20.include "../../converters/libiconv/buildlink3.mk" 20.include "../../converters/libiconv/buildlink3.mk"
21.include "../../devel/pango/buildlink3.mk" 21#.include "../../devel/pango/buildlink3.mk"
22.include "../../graphics/jpeg/buildlink3.mk" 22.include "../../graphics/jpeg/buildlink3.mk"
23.include "../../graphics/png/buildlink3.mk" 23.include "../../graphics/png/buildlink3.mk"
24.include "../../textproc/expat/buildlink3.mk" 24.include "../../textproc/expat/buildlink3.mk"
25 25
26BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//} 26BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//}
cvs diff -r1.29 -r1.30 pkgsrc/graphics/graphviz/distinfo (expand / switch to unified 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 @@ @@ -1,26 +1,11 @@
1$NetBSD: distinfo,v 1.29 2008/10/12 13:14:39 tron Exp $ 1$NetBSD: distinfo,v 1.30 2009/02/26 19:45:14 sno Exp $
2 2
3SHA1 (graphviz-2.16.1.tar.gz) = 46b704bd9b81922bcd17167c88f3278a9645e894 3SHA1 (graphviz-2.20.3.tar.gz) = 63ae6bdb6b410387477d339225cc4f61c2bc7322
4RMD160 (graphviz-2.16.1.tar.gz) = 6d0f23fa176a1bef7ee0ca48cf1b700fe6cbfb42 4RMD160 (graphviz-2.20.3.tar.gz) = 64c80f3af55668e487f911132407c332c3c38e87
5Size (graphviz-2.16.1.tar.gz) = 8076271 bytes 5Size (graphviz-2.20.3.tar.gz) = 13381532 bytes
6SHA1 (patch-aa) = 4ac7fde6b76fa60c90ac241a4bcd304a7ed2ceeb 6SHA1 (patch-aa) = 6670dcf2d00ee81012b1acbc3bc141f9405c0b30
7SHA1 (patch-ab) = 0d3ac34e473d346ee8c1e2bd058165745c2f9258 7SHA1 (patch-ab) = c7d1f59d1bf2483d16d79dbf9ade57e61a98cded
8SHA1 (patch-ac) = 3ef2ea7bea573463cfa722fc3bfa9d18dde141c2 8SHA1 (patch-ag) = 4b89f087ba96d29b92a1b8c46e3ac041039df459
9SHA1 (patch-ad) = 5bbdfb6ad55ef76abfbc70105ad08fb0dc7a3792 9SHA1 (patch-aj) = 0adc177fb7c3e654cf46560a8c91e2712bc7d16a
10SHA1 (patch-ae) = da929ffd3d736aa5607a59ce325012563b16a994 10SHA1 (patch-ak) = 91133de18229d2165be392c790a504547a3adf64
11SHA1 (patch-af) = 2079dfdbc65afb742412b31e7d5c3e7cfab5c7ec 11SHA1 (patch-ap) = 5111cc72714f8ee96c7dadba4570e01b64ed3647
12SHA1 (patch-ag) = 06506df70858dc9e2a42d96ae2abab8cfc10e9d8 
13SHA1 (patch-ah) = 000b13d6fffa2a155cfb81250044754ab903a4cc 
14SHA1 (patch-ai) = 9a248d8f367ce2afffbe567b5f7549f50b72b43a 
15SHA1 (patch-aj) = 590f7e41ad5d611458f18b42639d3bc035037249 
16SHA1 (patch-ak) = ddcc83faa3881691dd36bcb83ee1ee3fea9d947f 
17SHA1 (patch-al) = 541be1e4efd013684840b71e57181bb2e603cbb5 
18SHA1 (patch-am) = 0ac59e3e67226112aee3aed76492c28c22281d2e 
19SHA1 (patch-an) = 7651e0034a6196569cd6b1a43df1a003ec875643 
20SHA1 (patch-ao) = 77f58bd320552c6111c288b332df6ba189eaf7ad 
21SHA1 (patch-ap) = 41d7731c86cb5cb27676e69765ea8fe5831c4bbb 
22SHA1 (patch-aq) = 7a14a748784d8e887a8449b649dab96b1bf7462c 
23SHA1 (patch-ar) = 44e5fdf98c8a86e2c17faca7d88df11c801a68fc 
24SHA1 (patch-as) = cf7408ba799ba70f7404205d99be950eb1d67d79 
25SHA1 (patch-at) = 2d9880b76536596dfadaf98cc1aa00aed1abd70c 
26SHA1 (patch-au) = 896ee85993c69f83a6808b026fa873a82a4cfa3e 
cvs diff -r1.4 -r1.5 pkgsrc/graphics/graphviz/options.mk (expand / switch to unified 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,24 +1,33 @@ @@ -1,24 +1,33 @@
1# $NetBSD: options.mk,v 1.4 2008/11/15 01:28:41 epg Exp $ 1# $NetBSD: options.mk,v 1.5 2009/02/26 19:45:14 sno Exp $
2 2
3PKG_OPTIONS_VAR= PKG_OPTIONS.graphviz 3PKG_OPTIONS_VAR= PKG_OPTIONS.graphviz
4PKG_SUPPORTED_OPTIONS= guile lua ocaml swig tcl gtk 4PKG_SUPPORTED_OPTIONS= x11 pangocairo guile lua ocaml swig tcl gtk gd
5PKG_SUGGESTED_OPTIONS= lua swig tcl 5PKG_SUGGESTED_OPTIONS= x11 pangocairo lua swig tcl
6 6
7.include "../../mk/bsd.options.mk" 7.include "../../mk/bsd.options.mk"
8 8
9PLIST_VARS+= guile gtk lua ocaml tcl 9PLIST_VARS+= guile gtk lua ocaml tcl pangocairo x11 gd
10 10
11.if !empty(PKG_OPTIONS:Mguile) 11.if !empty(PKG_OPTIONS:Mx11)
 12.include "../../x11/libXp/buildlink3.mk"
 13.include "../../mk/xaw.buildlink3.mk"
 14CONFIGURE_ENV+= X11PREFIX=${X11PREFIX} X11BASE=${X11BASE}
 15PLIST.x11= yes
 16.else
 17CONFIGURE_ARGS+= --without-x
 18.endif
 19
 20.if !empty(PKG_OPTIONS:Mx11) && !empty(PKG_OPTIONS:Mguile)
12.include "../../lang/guile/buildlink3.mk" 21.include "../../lang/guile/buildlink3.mk"
13CONFIGURE_ARGS+= --enable-guile 22CONFIGURE_ARGS+= --enable-guile
14PLIST.guile= yes 23PLIST.guile= yes
15.else 24.else
16CONFIGURE_ARGS+= --disable-guile 25CONFIGURE_ARGS+= --disable-guile
17.endif 26.endif
18 27
19.if !empty(PKG_OPTIONS:Mlua) 28.if !empty(PKG_OPTIONS:Mlua)
20.include "../../lang/lua/buildlink3.mk" 29.include "../../lang/lua/buildlink3.mk"
21PLIST.lua= yes 30PLIST.lua= yes
22.else 31.else
23CONFIGURE_ARGS+= --disable-lua 32CONFIGURE_ARGS+= --disable-lua
24.endif 33.endif
@@ -35,20 +44,36 @@ CONFIGURE_ARGS+= --disable-ocaml @@ -35,20 +44,36 @@ CONFIGURE_ARGS+= --disable-ocaml
35.else 44.else
36CONFIGURE_ARGS+= --disable-swig 45CONFIGURE_ARGS+= --disable-swig
37.endif 46.endif
38 47
39.if !empty(PKG_OPTIONS:Mtcl) 48.if !empty(PKG_OPTIONS:Mtcl)
40.include "../../x11/tk/buildlink3.mk" 49.include "../../x11/tk/buildlink3.mk"
41CONFIGURE_ENV+= TCLCONFIG=${TCLCONFIG_SH:Q} 50CONFIGURE_ENV+= TCLCONFIG=${TCLCONFIG_SH:Q}
42CONFIGURE_ENV+= TKCONFIG=${TKCONFIG_SH:Q} 51CONFIGURE_ENV+= TKCONFIG=${TKCONFIG_SH:Q}
43PLIST.tcl= yes 52PLIST.tcl= yes
44.else 53.else
45CONFIGURE_ARGS+= --disable-tcl 54CONFIGURE_ARGS+= --disable-tcl
46.endif 55.endif
47 56
48.if !empty(PKG_OPTIONS:Mgtk) 57.if !empty(PKG_OPTIONS:Mx11) && !empty(PKG_OPTIONS:Mgtk)
49.include "../../x11/gtk2/buildlink3.mk" 58.include "../../x11/gtk2/buildlink3.mk"
50PLIST.gtk= yes 59PLIST.gtk= yes
51.else 60.else
52CONFIGURE_ARGS+= --without-gdk-pixbuf 61CONFIGURE_ARGS+= --without-gdk-pixbuf
53CONFIGURE_ARGS+= --without-gtk 62CONFIGURE_ARGS+= --without-gtk
 63CONFIGURE_ARGS+= --without-gnomeui
 64.endif
 65
 66.if !empty(PKG_OPTIONS:Mgd)
 67.include "../../graphics/gd/buildlink3.mk"
 68PLIST.gd= yes
 69.else
 70CONFIGURE_ARGS+= --without-libgd
 71.endif
 72
 73.if !empty(PKG_OPTIONS:Mx11) && !empty(PKG_OPTIONS:Mpangocairo)
 74.include "../../devel/pango/buildlink3.mk"
 75.include "../../graphics/cairo/buildlink3.mk"
 76PLIST.pangocairo= yes
 77.else
 78CONFIGURE_ARGS+= --without-pangocairo
54.endif 79.endif
cvs diff -r1.7 -r1.8 pkgsrc/graphics/graphviz/patches/Attic/patch-aa (expand / switch to unified 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 @@ @@ -1,20 +1,52 @@
1$NetBSD: patch-aa,v 1.7 2008/02/06 18:56:52 adam Exp $ 1--- configure.ac.orig 2008-10-07 18:40:07.000000000 +0000
2 2+++ configure.ac 2009-02-26 19:14:19.000000000 +0000
3--- configure.ac.orig 2007-12-13 05:38:57.000000000 +0100 3@@ -23,17 +23,30 @@
4+++ configure.ac 4 AC_SUBST(GRAPHVIZ_VERSION_MINOR)
5@@ -279,6 +279,7 @@ dnl Checks for header files 5 AC_SUBST(GRAPHVIZ_VERSION_MICRO)
6 # AC_HAVE_HEADERS(string.h) 
7 AC_CHECK_HEADERS(stdarg.h stddef.h stddef.h stdlib.h stdint.h malloc.h \ 
8 search.h getopt.h pthread.h values.h float.h limits.h termios.h \ 
9+ crt_externs.h \ 
10 errno.h time.h unistd.h fenv.h strings.h inttypes.h setjmp.h \ 
11 sys/time.h sys/times.h sys/types.h sys/select.h fpu_control.h \ 
12 sys/fpu.h strings.h sys/socket.h sys/stat.h sys/mman.h \ 
13@@ -371,6 +372,7 @@ AC_FUNC_ALLOCA 
14  6
15 AC_CHECK_FUNCS([lrand48 drand48 srand48 setmode setenv getenv \ 7-# Windows version numbers
16 __freadable _sysconf getrusage strerror cbrt lsqrt vsnprintf \ 8-# For the build number: months since Jan 2000, day of month from the timestamp
17+ _NSGetEnviron \ 9-# For the revision number: hour, minute from the timestamp
18 strtoul strtoll strtoull uname]) 10-
 11-if test $GRAPHVIZ_VERSION_MICRO = "0"; then
 12- GRAPHVIZ_VERSION_BUILD=0
 13- GRAPHVIZ_VERSION_REVISION=0
 14-else
 15- GRAPHVIZ_VERSION_BUILD=`expr \( ${GRAPHVIZ_VERSION_MICRO:0:4} - 2000 \) \* 12 + ${GRAPHVIZ_VERSION_MICRO:4:2}`${GRAPHVIZ_VERSION_MICRO:6:2}
 16- GRAPHVIZ_VERSION_REVISION=${GRAPHVIZ_VERSION_MICRO:9:4}
 17-fi
 18+GRAPHVIZ_VERSION_BUILD=0
 19+GRAPHVIZ_VERSION_REVISION=0
 20+case "${host_os}" in
 21+ *uwin* | *cygwin* | *mingw32* )
 22+ # Windows version numbers
 23+ # For the build number: months since Jan 2000, day of month from the timestamp
 24+ # For the revision number: hour, minute from the timestamp
 25+
 26+ if test $GRAPHVIZ_VERSION_MICRO = "0"; then
 27+ GRAPHVIZ_VERSION_BUILD=0
 28+ GRAPHVIZ_VERSION_REVISION=0
 29+ else
 30+ # JR: patch from Michael van Elst:
 31+ # if we have a shellm we should have a working awk, too
 32+ eval `echo "$GRAPHVIZ_VERSION_MICRO" | awk '{
 33+ print "GRAPHVIZ_VERSION_BUILD=" \
 34+ (substr($1,1,4)-2000)*12+substr($1,5,2) \
 35+ substr($1,7,2)
 36+ print "GRAPHVIZ_VERSION_REVISION=" \
 37+ substr($1,10,4)
 38+ }'`
 39+ fi
 40+ ;;
 41+esac
 42 AC_SUBST(GRAPHVIZ_VERSION_BUILD)
 43 AC_SUBST(GRAPHVIZ_VERSION_REVISION)
19  44
20 AC_REPLACE_FUNCS([strcasecmp strncasecmp]) 45@@ -267,6 +280,7 @@
 46 ;;
 47 esac
 48 else
 49+echo ${CC}
 50 case "${CC}" in
 51 *icc* )
 52 # -Wall causes relocation errors with icc
cvs diff -r1.13 -r1.14 pkgsrc/graphics/graphviz/patches/Attic/patch-ab (expand / switch to unified 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 @@ @@ -1,24 +1,51 @@
1$NetBSD: patch-ab,v 1.13 2008/02/06 18:56:52 adam Exp $ 1--- configure.orig 2008-10-07 23:54:55.000000000 +0000
2 2+++ configure 2009-02-26 19:17:53.000000000 +0000
3--- config.h.in.orig 2007-12-13 06:52:34.000000000 +0100 3@@ -2402,18 +2402,26 @@
4+++ config.h.in 
5@@ -60,6 +60,9 @@ 
6 /* Define if you have the DevIL library */ 
7 #undef HAVE_DEVIL 
8  
9+/* Define to 1 if you have the <crt_externs.h> header file. */ 
10+#undef HAVE_CRT_EXTERNS_H 
11+ 
12 /* Define to 1 if you have the <dirent.h> header file, and it defines `DIR'. 
13 */ 
14 #undef HAVE_DIRENT_H 
15@@ -360,6 +363,9 @@ 
16 /* Define to 1 if the system has the type `_Bool'. */ 
17 #undef HAVE__BOOL 
18  
19+/* Define to 1 if you have the `_NSGetEnviron' function. */ 
20+#undef HAVE__NSGETENVIRON 
21+ 
22 /* Define to 1 if you have the `_sysconf' function. */ 
23 #undef HAVE__SYSCONF 
24  4
 5
 6
 7-
 8-# Windows version numbers
 9-# For the build number: months since Jan 2000, day of month from the timestamp
 10-# For the revision number: hour, minute from the timestamp
 11-
 12-if test $GRAPHVIZ_VERSION_MICRO = "0"; then
 13- GRAPHVIZ_VERSION_BUILD=0
 14- GRAPHVIZ_VERSION_REVISION=0
 15-else
 16- GRAPHVIZ_VERSION_BUILD=`expr \( ${GRAPHVIZ_VERSION_MICRO:0:4} - 2000 \) \* 12 + ${GRAPHVIZ_VERSION_MICRO:4:2}`${GRAPHVIZ_VERSION_MICRO:6:2}
 17- GRAPHVIZ_VERSION_REVISION=${GRAPHVIZ_VERSION_MICRO:9:4}
 18-fi
 19+GRAPHVIZ_VERSION_BUILD=0
 20+GRAPHVIZ_VERSION_REVISION=0
 21+case "${host_os}" in
 22+ *uwin* | *cygwin* | *mingw32* )
 23+ # Windows version numbers
 24+ # For the build number: months since Jan 2000, day of month from the timestamp
 25+ # For the revision number: hour, minute from the timestamp
 26+ if test $GRAPHVIZ_VERSION_MICRO != "0"; then
 27+ # JR: patch from Michael van Elst:
 28+ # if we have a shellm we should have a working awk, too
 29+ eval `echo "$GRAPHVIZ_VERSION_MICRO" | awk '{
 30+ print "GRAPHVIZ_VERSION_BUILD=" \
 31+ (substr($1,1,4)-2000)*12+substr($1,5,2) \
 32+ substr($1,7,2)
 33+ print "GRAPHVIZ_VERSION_REVISION=" \
 34+ substr($1,10,4)
 35+ }'`
 36+ fi
 37+ ;;
 38+esac
 39
 40
 41
 42@@ -6457,6 +6465,9 @@
 43 ;;
 44 *-sgi-irix* )
 45 ;;
 46+ *-ibm-aix* )
 47+ CC=cc_r
 48+ ;;
 49 esac
 50 else
 51 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 unified 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 @@ @@ -1,13 +1,13 @@
1$NetBSD: patch-ag,v 1.12 2008/03/14 01:16:36 joerg Exp $ 1$NetBSD: patch-ag,v 1.13 2009/02/26 19:45:14 sno Exp $
2 2
3--- lib/gvc/Makefile.in.orig 2008-03-11 04:40:48.000000000 +0100 3--- lib/gvc/Makefile.in.orig 2008-12-01 12:32:24.000000000 +0100
4+++ lib/gvc/Makefile.in 4+++ lib/gvc/Makefile.in 2008-12-01 12:32:52.000000000 +0100
5@@ -422,7 +422,7 @@ libgvc_la_LIBADD = $(libgvc_C_la_LIBADD) 5@@ -465,7 +465,7 @@
6 $(top_builddir)/lib/cdt/libcdt.la \ 6 $(top_builddir)/lib/cdt/libcdt.la \
7 $(top_builddir)/lib/graph/libgraph.la \ 7 $(top_builddir)/lib/graph/libgraph.la \
8 $(top_builddir)/lib/pathplan/libpathplan.la \ 8 $(top_builddir)/lib/pathplan/libpathplan.la \
9- @EXPAT_LIBS@ @Z_LIBS@ 9- @EXPAT_LIBS@ @Z_LIBS@ @MATH_LIBS@
10+ @EXPAT_LIBS@ @Z_LIBS@ -lm ${PTHREAD_LDFLAGS} ${PTHREAD_LIBS} 10+ @EXPAT_LIBS@ @Z_LIBS@ @MATH_LIBS@ ${PTHREAD_LDFLAGS} ${PTHREAD_LIBS}
11  11
12  12
13 #For use without plugins. 13 #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 unified 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 @@ @@ -1,19 +1,20 @@
1$NetBSD: patch-aj,v 1.9 2008/03/11 15:46:57 joerg Exp $ 1$NetBSD: patch-aj,v 1.10 2009/02/26 19:45:14 sno Exp $
2 2
3--- plugin/gd/Makefile.am.orig 2008-03-11 05:22:41.000000000 +0100 3--- plugin/gd/Makefile.am.orig 2008-12-01 12:39:07.000000000 +0100
4+++ plugin/gd/Makefile.am 4+++ plugin/gd/Makefile.am 2008-12-01 12:40:44.000000000 +0100
5@@ -27,10 +27,14 @@ libgvplugin_gd_la_SOURCES = $(libgvplugi 5@@ -33,6 +33,7 @@
6 if WITH_MYLIBGD 
7 libgvplugin_gd_la_LIBADD = \ 
8 $(top_builddir)/lib/gd/libgvgd_C.la \ 6 $(top_builddir)/lib/gd/libgvgd_C.la \
9+ $(top_builddir)/lib/graph/libgraph.la \ 
10+ $(top_builddir)/lib/pathplan/libpathplan.la \ 
11 $(top_builddir)/lib/gvc/libgvc.la \ 7 $(top_builddir)/lib/gvc/libgvc.la \
 8 $(top_builddir)/lib/graph/libgraph.la \
 9+ $(top_builddir)/lib/pathplan/libpathplan.la \
 10 $(top_builddir)/lib/cdt/libcdt.la \
12 @ICONV_LIBS@ @FONTCONFIG_LIBS@ @FREETYPE2_LIBS@ @JPEG_LIBS@ @PNG_LIBS@ @EXPAT_LIBS@ @Z_LIBS@ @MATH_LIBS@ 11 @ICONV_LIBS@ @FONTCONFIG_LIBS@ @FREETYPE2_LIBS@ @JPEG_LIBS@ @PNG_LIBS@ @EXPAT_LIBS@ @Z_LIBS@ @MATH_LIBS@
13 else 12 AM_CPPFLAGS += -DNONDLL
 13@@ -40,6 +41,7 @@
14 libgvplugin_gd_la_LIBADD = \ 14 libgvplugin_gd_la_LIBADD = \
15+ $(top_builddir)/lib/graph/libgraph.la \ 15 $(top_builddir)/lib/gvc/libgvc.la \
 16 $(top_builddir)/lib/graph/libgraph.la \
16+ $(top_builddir)/lib/pathplan/libpathplan.la \ 17+ $(top_builddir)/lib/pathplan/libpathplan.la \
17 $(top_builddir)/lib/gvc/libgvc.la @GD_LIBS@ @MATH_LIBS@ 18 $(top_builddir)/lib/cdt/libcdt.la @GD_LIBS@ @MATH_LIBS@
18 endif 19 endif
19  20
cvs diff -r1.11 -r1.12 pkgsrc/graphics/graphviz/patches/Attic/patch-ak (expand / switch to unified 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 @@ @@ -1,18 +1,19 @@
1$NetBSD: patch-ak,v 1.11 2008/03/11 15:46:57 joerg Exp $ 1$NetBSD: patch-ak,v 1.12 2009/02/26 19:45:14 sno Exp $
2 2
3--- plugin/gd/Makefile.in.orig 2008-03-11 05:22:13.000000000 +0100 3--- plugin/gd/Makefile.in.orig 2008-12-01 12:42:20.000000000 +0100
4+++ plugin/gd/Makefile.in 4+++ plugin/gd/Makefile.in 2008-12-01 12:43:10.000000000 +0100
5@@ -380,9 +380,13 @@ libgvplugin_gd_C_la_SOURCES = \ 5@@ -64,12 +64,14 @@
6 libgvplugin_gd_la_LDFLAGS = -version-info @GVPLUGIN_VERSION_INFO@ 6 @WITH_MYLIBGD_FALSE@libgvplugin_gd_la_DEPENDENCIES = \
7 libgvplugin_gd_la_SOURCES = $(libgvplugin_gd_C_la_SOURCES) 7 @WITH_MYLIBGD_FALSE@ $(top_builddir)/lib/gvc/libgvc.la \
8 @WITH_MYLIBGD_FALSE@libgvplugin_gd_la_LIBADD = \ 8 @WITH_MYLIBGD_FALSE@ $(top_builddir)/lib/graph/libgraph.la \
9+@WITH_MYLIBGD_FALSE@ $(top_builddir)/lib/graph/libgraph.la \ 
10+@WITH_MYLIBGD_FALSE@ $(top_builddir)/lib/pathplan/libpathplan.la \ 9+@WITH_MYLIBGD_FALSE@ $(top_builddir)/lib/pathplan/libpathplan.la \
11 @WITH_MYLIBGD_FALSE@ $(top_builddir)/lib/gvc/libgvc.la @GD_LIBS@ @MATH_LIBS@ 10 @WITH_MYLIBGD_FALSE@ $(top_builddir)/lib/cdt/libcdt.la \
12  11 @WITH_MYLIBGD_FALSE@ $(am__append_3)
13 @WITH_MYLIBGD_TRUE@libgvplugin_gd_la_LIBADD = \ 12 @WITH_MYLIBGD_TRUE@libgvplugin_gd_la_DEPENDENCIES = \
14+@WITH_MYLIBGD_TRUE@ $(top_builddir)/lib/graph/libgraph.la \ 
15+@WITH_MYLIBGD_TRUE@ $(top_builddir)/lib/pathplan/libpathplan.la \ 
16 @WITH_MYLIBGD_TRUE@ $(top_builddir)/lib/gd/libgvgd_C.la \ 13 @WITH_MYLIBGD_TRUE@ $(top_builddir)/lib/gd/libgvgd_C.la \
17 @WITH_MYLIBGD_TRUE@ $(top_builddir)/lib/gvc/libgvc.la \ 14 @WITH_MYLIBGD_TRUE@ $(top_builddir)/lib/gvc/libgvc.la \
18 @WITH_MYLIBGD_TRUE@ @ICONV_LIBS@ @FONTCONFIG_LIBS@ @FREETYPE2_LIBS@ @JPEG_LIBS@ @PNG_LIBS@ @EXPAT_LIBS@ @Z_LIBS@ @MATH_LIBS@ 15 @WITH_MYLIBGD_TRUE@ $(top_builddir)/lib/graph/libgraph.la \
 16+@WITH_MYLIBGD_TRUE@ $(top_builddir)/lib/pathplan/libpathplan.la \
 17 @WITH_MYLIBGD_TRUE@ $(top_builddir)/lib/cdt/libcdt.la \
 18 @WITH_MYLIBGD_TRUE@ $(am__append_3)
 19 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 unified 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 @@ @@ -1,12 +1,33 @@
1$NetBSD: patch-ap,v 1.10 2008/03/11 15:46:57 joerg Exp $ 1$NetBSD: patch-ap,v 1.11 2009/02/26 19:45:14 sno Exp $
2 2
3--- lib/gvc/gvconfig.c.orig 2008-03-11 06:01:47.000000000 +0100 3--- lib/gvc/gvconfig.c.orig 2008-12-01 12:48:23.000000000 +0100
4+++ lib/gvc/gvconfig.c 4+++ lib/gvc/gvconfig.c 2008-12-01 12:50:26.000000000 +0100
5@@ -584,6 +584,7 @@ void gvconfig(GVC_t * gvc, boolean resca 5@@ -526,10 +526,7 @@
6 f = fopen(gvc->config_path,"r"); 6 }
7 if (!f) { 7 else {
8 agerr (AGERR,"failed to open %s for read.\n", gvc->config_path); 8 f = fopen(gvc->config_path,"r");
9+ exit(1); 9- if (!f) {
10 } 10- agerr (AGERR,"failed to open %s for read.\n", gvc->config_path);
11 else { 11- }
12 config_text = gmalloc(config_st.st_size + 1); 12- else {
 13+ if (f) {
 14 config_text = gmalloc(config_st.st_size + 1);
 15 sz = fread(config_text, 1, config_st.st_size, f);
 16 if (sz == 0) {
 17@@ -542,10 +539,13 @@
 18 rc = gvconfig_plugin_install_from_config(gvc, config_text);
 19 /* NB. config_text not freed because we retain char* into it */
 20 }
 21- }
 22- if (f) {
 23+
 24 fclose(f);
 25- }
 26+ }
 27+ else {
 28+ agerr (AGERR,"failed to open %s for read.\n", gvc->config_path);
 29+ exit(1);
 30+ }
 31 }
 32 }
 33 #endif
File Deleted: pkgsrc/graphics/graphviz/patches/Attic/patch-ar
File Deleted: pkgsrc/graphics/graphviz/patches/Attic/patch-at