summaryrefslogtreecommitdiff
path: root/graphics
diff options
context:
space:
mode:
authorseb <seb>2004-11-29 22:11:50 +0000
committerseb <seb>2004-11-29 22:11:50 +0000
commita5e6138c1e1ffcef801abc0e8a4d22d514d834e9 (patch)
tree982339f583e3c6f37c5ecd84cae01d8e80d09e4c /graphics
parent4711d62ef2eaa0818317a2dd6618970da9376c25 (diff)
downloadpkgsrc-a5e6138c1e1ffcef801abc0e8a4d22d514d834e9.tar.gz
Update to version 1.16.
Changes since last packaged version (1.12) September 14, 2004 - release 1.16 dotneato - fix bugs: 275, 523, 526, 527, 529, 534 August 30, 2004 - release 1.14 dotneato - the official gd now has support support for GIFs again - the internal gd is now closely sync'ed with the official version and will eventually be removed in favor of using a separate installation of the official version. - gd has new support for FontConfig (thanks to Dag Lem) NB. the fontname attribute in graphs is now a font pattern as understood by fontconfig (e.g. fontname="Times-Italic"), unless it contains a '/' in which case it is interpreted as a font path as before. - gd provides support for html4 entities in decimal, hex or named, e.g "&lt;" - "dot -v" debugging output now reports fontname -> fontpath resolutions - PostScript generated by -Tps now uses "xshow" operator for strings for better matching of bitmap and PostScript outputs. - ability to use an external gd-2.0.29 version of libgd (EXPERIMENTAL) - new feature: parallel edges by using a ":" separated list of edge colors - new feature: rankdir=BT and rankdir=RL (thanks to Dag Lem) - new layout engine: fdp - force directed placement (EXPERIMENTAL) a neato-like undirected layout engine that produces clustered symmetric layouts. Supports edges between clusters and nodes. - updated neato engine: now using stress majorization as the default, which avoids the potential for cycling - model=subset in neato provides a third distance function, where two nodes sharing many nodes will be place farther apart - shape=none now equivalent to shape=plaintext - fix label justification with \l and \r - first cut at <FONT> support added to html labels - various color transparency fixes - various fixes for UTF8 and Latin[12] character encodings. - various cluster fixes. - improved hyperlink support in -Tsvg - support tooltips on clusters in client-side imagemaps gvpr - add support for scanf and friends general - greater use of shared libraries. - pkg-config files provided for shared libraries (EXPERIMENTAL) - "./configure --disable-shared --enable-static" works if needed - C++ wrappers on all header files (thanks to Victor Wodecki) - various configuration and portablity fixes - provide pdf version of man pages - Windows package provides graphviz libraries and header files - Closed bugs: 195, 198, 234, 321, 330, 399, 401, 406, 410, 411, 412, 413, 415, 416, 417, 423, 424, 427, 430, 431, 433, 434, 435, 438, 441, 442, 444, 445, 449, 450, 452, 454, 457, 458, 462, 463, 464, 467, 468, 469, 471, 475, 480, 482, 485, 495, 496, 498, 499, 500, 501, 504, 508, 511, 512, 514 March 5, 2004 - added glyphwidths.ps support utility
Diffstat (limited to 'graphics')
-rw-r--r--graphics/graphviz/Makefile41
-rw-r--r--graphics/graphviz/PLIST395
-rw-r--r--graphics/graphviz/distinfo102
-rw-r--r--graphics/graphviz/patches/patch-aa4
-rw-r--r--graphics/graphviz/patches/patch-ab268
-rw-r--r--graphics/graphviz/patches/patch-ac303
-rw-r--r--graphics/graphviz/patches/patch-ad28
-rw-r--r--graphics/graphviz/patches/patch-ae156
-rw-r--r--graphics/graphviz/patches/patch-af13
-rw-r--r--graphics/graphviz/patches/patch-ag36
-rw-r--r--graphics/graphviz/patches/patch-ah29
-rw-r--r--graphics/graphviz/patches/patch-ai163
-rw-r--r--graphics/graphviz/patches/patch-aj13
-rw-r--r--graphics/graphviz/patches/patch-ak32
-rw-r--r--graphics/graphviz/patches/patch-al28
-rw-r--r--graphics/graphviz/patches/patch-am167
-rw-r--r--graphics/graphviz/patches/patch-an10
-rw-r--r--graphics/graphviz/patches/patch-ao32
-rw-r--r--graphics/graphviz/patches/patch-ap6
-rw-r--r--graphics/graphviz/patches/patch-aq30
-rw-r--r--graphics/graphviz/patches/patch-ar29
-rw-r--r--graphics/graphviz/patches/patch-as155
-rw-r--r--graphics/graphviz/patches/patch-at13
-rw-r--r--graphics/graphviz/patches/patch-au32
-rw-r--r--graphics/graphviz/patches/patch-av17
-rw-r--r--graphics/graphviz/patches/patch-aw33
-rw-r--r--graphics/graphviz/patches/patch-ax12
-rw-r--r--graphics/graphviz/patches/patch-ay29
-rw-r--r--graphics/graphviz/patches/patch-az21
-rw-r--r--graphics/graphviz/patches/patch-ba135
-rw-r--r--graphics/graphviz/patches/patch-bb15
-rw-r--r--graphics/graphviz/patches/patch-bc136
-rw-r--r--graphics/graphviz/patches/patch-bd17
-rw-r--r--graphics/graphviz/patches/patch-be135
-rw-r--r--graphics/graphviz/patches/patch-bf21
-rw-r--r--graphics/graphviz/patches/patch-bg135
-rw-r--r--graphics/graphviz/patches/patch-bh20
-rw-r--r--graphics/graphviz/patches/patch-bi139
-rw-r--r--graphics/graphviz/patches/patch-bj17
-rw-r--r--graphics/graphviz/patches/patch-bk138
-rw-r--r--graphics/graphviz/patches/patch-bl21
-rw-r--r--graphics/graphviz/patches/patch-bm135
-rw-r--r--graphics/graphviz/patches/patch-bn22
-rw-r--r--graphics/graphviz/patches/patch-bo164
-rw-r--r--graphics/graphviz/patches/patch-bp20
-rw-r--r--graphics/graphviz/patches/patch-bq140
-rw-r--r--graphics/graphviz/patches/patch-br19
-rw-r--r--graphics/graphviz/patches/patch-bs134
-rw-r--r--graphics/graphviz/patches/patch-bt19
-rw-r--r--graphics/graphviz/patches/patch-bu143
-rw-r--r--graphics/graphviz/patches/patch-bv22
-rw-r--r--graphics/graphviz/patches/patch-bw146
-rw-r--r--graphics/graphviz/patches/patch-bx15
-rw-r--r--graphics/graphviz/patches/patch-by44
-rw-r--r--graphics/graphviz/patches/patch-bz19
-rw-r--r--graphics/graphviz/patches/patch-ca136
-rw-r--r--graphics/graphviz/patches/patch-cb13
-rw-r--r--graphics/graphviz/patches/patch-cc29
-rw-r--r--graphics/graphviz/patches/patch-cd13
-rw-r--r--graphics/graphviz/patches/patch-ce29
-rw-r--r--graphics/graphviz/patches/patch-cf20
-rw-r--r--graphics/graphviz/patches/patch-cg146
-rw-r--r--graphics/graphviz/patches/patch-ch12
-rw-r--r--graphics/graphviz/patches/patch-ci29
-rw-r--r--graphics/graphviz/patches/patch-cj12
-rw-r--r--graphics/graphviz/patches/patch-ck29
-rw-r--r--graphics/graphviz/patches/patch-cl12
-rw-r--r--graphics/graphviz/patches/patch-cm29
-rw-r--r--graphics/graphviz/patches/patch-cn12
-rw-r--r--graphics/graphviz/patches/patch-co29
-rw-r--r--graphics/graphviz/patches/patch-cp12
-rw-r--r--graphics/graphviz/patches/patch-cq29
-rw-r--r--graphics/graphviz/patches/patch-cr12
-rw-r--r--graphics/graphviz/patches/patch-cs29
-rw-r--r--graphics/graphviz/patches/patch-ct12
-rw-r--r--graphics/graphviz/patches/patch-cu29
-rw-r--r--graphics/graphviz/patches/patch-cv12
-rw-r--r--graphics/graphviz/patches/patch-cw29
78 files changed, 4121 insertions, 761 deletions
diff --git a/graphics/graphviz/Makefile b/graphics/graphviz/Makefile
index bcf519e8c4a..e60ca688aed 100644
--- a/graphics/graphviz/Makefile
+++ b/graphics/graphviz/Makefile
@@ -1,8 +1,7 @@
-# $NetBSD: Makefile,v 1.23 2004/10/03 00:14:52 tv Exp $
+# $NetBSD: Makefile,v 1.24 2004/11/29 22:11:50 seb Exp $
#
-DISTNAME= graphviz-1.12
-PKGREVISION= 1
+DISTNAME= graphviz-1.16
CATEGORIES= graphics
MASTER_SITES= http://www.graphviz.org/pub/graphviz/ARCHIVE/
@@ -19,6 +18,8 @@ USE_BUILDLINK3= yes
USE_LIBTOOL= yes
USE_X11= yes
XAW_TYPE= standard
+PKGCONFIG_OVERRIDE= */*.pc */*/*.pc
+PKGCONFIG_OVERRIDE_STAGE= post-build
.include "../../mk/bsd.prefs.mk"
@@ -26,44 +27,22 @@ CONFIGURE_ENV+= TCLCONFIG=${TCLCONFIG_SH}
CONFIGURE_ENV+= TKCONFIG=${TKCONFIG_SH}
CONFIGURE_ENV+= X11PREFIX=${X11PREFIX} X11BASE=${X11BASE}
-CONFIGURE_ARGS+= --with-zincludedir=${BUILDLINK_PREFIX.zlib}/include
-CONFIGURE_ARGS+= --with-zlibdir=${BUILDLINK_PREFIX.zlib}/lib
-CONFIGURE_ARGS+= --with-jpegincludedir=${BUILDLINK_PREFIX.jpeg}/include
-CONFIGURE_ARGS+= --with-jpeglibdir=${BUILDLINK_PREFIX.jpeg}/lib
-CONFIGURE_ARGS+= --with-expatincludedir=${BUILDLINK_PREFIX.expat}/include
-CONFIGURE_ARGS+= --with-expatlibdir=${BUILDLINK_PREFIX.expat}/lib
-CONFIGURE_ARGS+= --with-freetypeincludedir=${BUILDLINK_PREFIX.freetype2}/include
-CONFIGURE_ARGS+= --with-freetypelibdir=${BUILDLINK_PREFIX.freetype2}/lib
-
# Dynagraph is left out for now
#UNLIMIT_RESOURCES= datasize stacksize memorysize
CONFIGURE_ARGS+= --without-dynagraph
+# the upstream tarball still contains *.orig files
post-extract:
${FIND} ${WRKSRC} -name "*.orig" -print | ${XARGS} ${RM} -f
-post-install:
- ${INSTALL_DATA_DIR} ${PREFIX}/share/doc/graphviz
- ${INSTALL_DATA_DIR} ${PREFIX}/share/doc/html/graphviz
- ${INSTALL_DATA_DIR} ${PREFIX}/share/doc/html/graphviz/info
-.for __f__ in Dot.ref dotguide.pdf dottyguide.pdf leftyguide.pdf \
- neatoguide.pdf
- ${INSTALL_DATA} ${WRKSRC}/doc/${__f__} ${PREFIX}/share/doc/graphviz
-.endfor
-.for __f__ in FAQ.html tcldot.html
- ${INSTALL_DATA} ${WRKSRC}/doc/${__f__} ${PREFIX}/share/doc/html/graphviz
-.endfor
-.if 0 # dynagraph "disabled"
- ${INSTALL_DATA} ${WRKSRC}/dynagraph/dynagraph.html ${PREFIX}/share/doc/html/graphviz
-.endif
- for f in ${WRKSRC}/doc/info/*.html ${WRKSRC}/doc/info/*.gif; do \
- ${INSTALL_DATA} $${f} ${PREFIX}/share/doc/html/graphviz/info; \
- done
- ${INSTALL_DATA} ${WRKSRC}/COPYING ${PREFIX}/share/doc/graphviz
- ${INSTALL_DATA} ${WRKSRC}/MINTERMS.txt ${PREFIX}/share/doc/graphviz
+# prevent another config.status run
+pre-build:
+ ${TOUCH} ${WRKSRC}/Makefile
.include "../../graphics/png/buildlink3.mk"
+.include "../../devel/pkgconfig/buildlink3.mk"
.include "../../devel/zlib/buildlink3.mk"
+.include "../../fonts/fontconfig/buildlink3.mk"
.include "../../graphics/jpeg/buildlink3.mk"
.include "../../graphics/png/buildlink3.mk"
.include "../../graphics/freetype2/buildlink3.mk"
diff --git a/graphics/graphviz/PLIST b/graphics/graphviz/PLIST
index bbc2b5cdaea..d29421bada9 100644
--- a/graphics/graphviz/PLIST
+++ b/graphics/graphviz/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.8 2004/09/22 08:09:33 jlam Exp $
+@comment $NetBSD: PLIST,v 1.9 2004/11/29 22:11:51 seb Exp $
bin/acyclic
bin/bcomps
bin/ccomps
@@ -28,25 +28,35 @@ include/graphviz/aghdr.h
include/graphviz/agraph.h
include/graphviz/agxbuf.h
include/graphviz/ast_common.h
+include/graphviz/bfs.h
include/graphviz/block.h
include/graphviz/blockpath.h
include/graphviz/blocktree.h
+include/graphviz/cairogen-png.h
+include/graphviz/cairogen-ps.h
+include/graphviz/cairogen-win.h
include/graphviz/cdt.h
include/graphviz/circle.h
include/graphviz/circo.h
include/graphviz/circpos.h
include/graphviz/circular.h
+include/graphviz/closest.h
include/graphviz/colortbl.h
include/graphviz/comp.h
+include/graphviz/conjgrad.h
include/graphviz/const.h
include/graphviz/dbg.h
+include/graphviz/defs.h
include/graphviz/deglist.h
+include/graphviz/dijkstra.h
include/graphviz/dot.h
include/graphviz/dotneato.h
include/graphviz/dotprocs.h
include/graphviz/dthdr.h
include/graphviz/edgelist.h
include/graphviz/edges.h
+include/graphviz/embed_graph.h
+include/graphviz/entities.h
include/graphviz/exgram.h
include/graphviz/exlib.h
include/graphviz/expr.h
@@ -59,6 +69,7 @@ include/graphviz/gdfontl.h
include/graphviz/gdfontmb.h
include/graphviz/gdfonts.h
include/graphviz/gdfontt.h
+include/graphviz/gdfx.h
include/graphviz/gdhelpers.h
include/graphviz/geometry.h
include/graphviz/globals.h
@@ -74,9 +85,11 @@ include/graphviz/htmllex.h
include/graphviz/htmltable.h
include/graphviz/info.h
include/graphviz/jisx0208.h
+include/graphviz/kkutils.h
include/graphviz/libgraph.h
include/graphviz/macros.h
include/graphviz/malloc.h
+include/graphviz/matrix_ops.h
include/graphviz/mem.h
include/graphviz/neato.h
include/graphviz/neatoprocs.h
@@ -88,6 +101,7 @@ include/graphviz/parser.h
include/graphviz/pathgeom.h
include/graphviz/pathplan.h
include/graphviz/pathutil.h
+include/graphviz/pca.h
include/graphviz/pointset.h
include/graphviz/poly.h
include/graphviz/render.h
@@ -96,6 +110,7 @@ include/graphviz/simple.h
include/graphviz/site.h
include/graphviz/solvers.h
include/graphviz/stack.h
+include/graphviz/stress.h
include/graphviz/tlayout.h
include/graphviz/tri.h
include/graphviz/triefa.h
@@ -109,16 +124,37 @@ include/graphviz/wbmp.h
include/graphviz/xlayout.h
lib/graphviz/libagraph.la
lib/graphviz/libcdt.la
+lib/graphviz/libcircogen.la
+lib/graphviz/libcommon.la
+lib/graphviz/libdotgen.la
lib/graphviz/libdotneato.la
lib/graphviz/libexpr.la
+lib/graphviz/libfdpgen.la
lib/graphviz/libgdtclft.la
lib/graphviz/libgraph.la
+lib/graphviz/libgvgd.la
+lib/graphviz/libgvrender.la
+lib/graphviz/libneatogen.la
lib/graphviz/libpack.la
lib/graphviz/libpathplan.la
lib/graphviz/libtcldot.la
lib/graphviz/libtclplan.la
lib/graphviz/libtkspline.la
+lib/graphviz/libtwopigen.la
lib/graphviz/pkgIndex.tcl
+lib/pkgconfig/libagraph.pc
+lib/pkgconfig/libcdt.pc
+lib/pkgconfig/libcircogen.pc
+lib/pkgconfig/libcommon.pc
+lib/pkgconfig/libdotgen.pc
+lib/pkgconfig/libdotneato.pc
+lib/pkgconfig/libfdpgen.pc
+lib/pkgconfig/libgraph.pc
+lib/pkgconfig/libgvrender.pc
+lib/pkgconfig/libneatogen.pc
+lib/pkgconfig/libpack.pc
+lib/pkgconfig/libpathplan.pc
+lib/pkgconfig/libtwopigen.pc
man/man1/acyclic.1
man/man1/bcomps.1
man/man1/ccomps.1
@@ -152,119 +188,125 @@ man/man3/pathplan.3
man/mann/gdtclft.n
man/mann/tcldot.n
man/mann/tkspline.n
+share/doc/graphviz/AUTHORS
share/doc/graphviz/COPYING
+share/doc/graphviz/ChangeLog
share/doc/graphviz/Dot.ref
+share/doc/graphviz/FAQ.txt
share/doc/graphviz/MINTERMS.txt
-share/doc/graphviz/dotguide.pdf
-share/doc/graphviz/dottyguide.pdf
-share/doc/graphviz/leftyguide.pdf
-share/doc/graphviz/neatoguide.pdf
+share/doc/graphviz/NEWS
+share/doc/graphviz/latex_suggestions.txt
+share/doc/graphviz/pdf/dotguide.pdf
+share/doc/graphviz/pdf/dottyguide.pdf
+share/doc/graphviz/pdf/leftyguide.pdf
+share/doc/graphviz/pdf/neatoguide.pdf
share/doc/html/graphviz/FAQ.html
-share/doc/html/graphviz/info/Mcircle.gif
-share/doc/html/graphviz/info/Mdiamond.gif
-share/doc/html/graphviz/info/Msquare.gif
-share/doc/html/graphviz/info/a_both.gif
-share/doc/html/graphviz/info/a_box.gif
-share/doc/html/graphviz/info/a_crow.gif
-share/doc/html/graphviz/info/a_diamond.gif
-share/doc/html/graphviz/info/a_dot.gif
-share/doc/html/graphviz/info/a_ediamond.gif
-share/doc/html/graphviz/info/a_empty.gif
-share/doc/html/graphviz/info/a_forward.gif
-share/doc/html/graphviz/info/a_halfopen.gif
-share/doc/html/graphviz/info/a_inv.gif
-share/doc/html/graphviz/info/a_invdot.gif
-share/doc/html/graphviz/info/a_invempty.gif
-share/doc/html/graphviz/info/a_invodot.gif
-share/doc/html/graphviz/info/a_lteeoldiamond.gif
-share/doc/html/graphviz/info/a_nohead.gif
-share/doc/html/graphviz/info/a_none.gif
-share/doc/html/graphviz/info/a_normal.gif
-share/doc/html/graphviz/info/a_obox.gif
-share/doc/html/graphviz/info/a_odiamond.gif
-share/doc/html/graphviz/info/a_odot.gif
-share/doc/html/graphviz/info/a_open.gif
-share/doc/html/graphviz/info/a_tee.gif
-share/doc/html/graphviz/info/aa_box.gif
-share/doc/html/graphviz/info/aa_crow.gif
-share/doc/html/graphviz/info/aa_diamond.gif
-share/doc/html/graphviz/info/aa_dot.gif
-share/doc/html/graphviz/info/aa_inv.gif
-share/doc/html/graphviz/info/aa_lbox.gif
-share/doc/html/graphviz/info/aa_lcrow.gif
-share/doc/html/graphviz/info/aa_ldiamond.gif
-share/doc/html/graphviz/info/aa_linv.gif
-share/doc/html/graphviz/info/aa_lnormal.gif
-share/doc/html/graphviz/info/aa_ltee.gif
-share/doc/html/graphviz/info/aa_lvee.gif
-share/doc/html/graphviz/info/aa_none.gif
-share/doc/html/graphviz/info/aa_normal.gif
-share/doc/html/graphviz/info/aa_obox.gif
-share/doc/html/graphviz/info/aa_odiamond.gif
-share/doc/html/graphviz/info/aa_odot.gif
-share/doc/html/graphviz/info/aa_oinv.gif
-share/doc/html/graphviz/info/aa_olbox.gif
-share/doc/html/graphviz/info/aa_oldiamond.gif
-share/doc/html/graphviz/info/aa_olinv.gif
-share/doc/html/graphviz/info/aa_olnormal.gif
-share/doc/html/graphviz/info/aa_onormal.gif
-share/doc/html/graphviz/info/aa_orbox.gif
-share/doc/html/graphviz/info/aa_ordiamond.gif
-share/doc/html/graphviz/info/aa_orinv.gif
-share/doc/html/graphviz/info/aa_ornormal.gif
-share/doc/html/graphviz/info/aa_rbox.gif
-share/doc/html/graphviz/info/aa_rcrow.gif
-share/doc/html/graphviz/info/aa_rdiamond.gif
-share/doc/html/graphviz/info/aa_rinv.gif
-share/doc/html/graphviz/info/aa_rnormal.gif
-share/doc/html/graphviz/info/aa_rtee.gif
-share/doc/html/graphviz/info/aa_rvee.gif
-share/doc/html/graphviz/info/aa_tee.gif
-share/doc/html/graphviz/info/aa_vee.gif
-share/doc/html/graphviz/info/attrs.html
-share/doc/html/graphviz/info/back.gif
-share/doc/html/graphviz/info/both.gif
-share/doc/html/graphviz/info/box.gif
-share/doc/html/graphviz/info/circle.gif
-share/doc/html/graphviz/info/colors.html
-share/doc/html/graphviz/info/command.html
-share/doc/html/graphviz/info/constraint.gif
-share/doc/html/graphviz/info/diamond.gif
-share/doc/html/graphviz/info/doublecircle.gif
-share/doc/html/graphviz/info/doubleoctagon.gif
-share/doc/html/graphviz/info/egg.gif
-share/doc/html/graphviz/info/ellipse.gif
-share/doc/html/graphviz/info/fill.gif
-share/doc/html/graphviz/info/forward.gif
-share/doc/html/graphviz/info/grammar.html
-share/doc/html/graphviz/info/hexagon.gif
-share/doc/html/graphviz/info/house.gif
-share/doc/html/graphviz/info/html1.gif
-share/doc/html/graphviz/info/html2.gif
-share/doc/html/graphviz/info/index.html
-share/doc/html/graphviz/info/invhouse.gif
-share/doc/html/graphviz/info/invtrapezium.gif
-share/doc/html/graphviz/info/invtriangle.gif
-share/doc/html/graphviz/info/lang.html
-share/doc/html/graphviz/info/mrecord.gif
-share/doc/html/graphviz/info/nohead.gif
-share/doc/html/graphviz/info/octagon.gif
-share/doc/html/graphviz/info/output.html
-share/doc/html/graphviz/info/parallelogram.gif
-share/doc/html/graphviz/info/pentagon.gif
-share/doc/html/graphviz/info/plaintext.gif
-share/doc/html/graphviz/info/point.gif
-share/doc/html/graphviz/info/polygon.gif
-share/doc/html/graphviz/info/record.gif
-share/doc/html/graphviz/info/rect.gif
-share/doc/html/graphviz/info/rectangle.gif
-share/doc/html/graphviz/info/round.gif
-share/doc/html/graphviz/info/septagon.gif
-share/doc/html/graphviz/info/shapes.html
-share/doc/html/graphviz/info/trapezium.gif
-share/doc/html/graphviz/info/triangle.gif
-share/doc/html/graphviz/info/tripleoctagon.gif
-share/doc/html/graphviz/tcldot.html
+share/doc/html/graphviz/LICENSE.html
+share/doc/html/graphviz/Mcircle.gif
+share/doc/html/graphviz/Mdiamond.gif
+share/doc/html/graphviz/Msquare.gif
+share/doc/html/graphviz/a_box.gif
+share/doc/html/graphviz/a_crow.gif
+share/doc/html/graphviz/a_diamond.gif
+share/doc/html/graphviz/a_dot.gif
+share/doc/html/graphviz/a_ediamond.gif
+share/doc/html/graphviz/a_empty.gif
+share/doc/html/graphviz/a_forward.gif
+share/doc/html/graphviz/a_halfopen.gif
+share/doc/html/graphviz/a_inv.gif
+share/doc/html/graphviz/a_invdot.gif
+share/doc/html/graphviz/a_invempty.gif
+share/doc/html/graphviz/a_invodot.gif
+share/doc/html/graphviz/a_lteeoldiamond.gif
+share/doc/html/graphviz/a_nohead.gif
+share/doc/html/graphviz/a_none.gif
+share/doc/html/graphviz/a_normal.gif
+share/doc/html/graphviz/a_obox.gif
+share/doc/html/graphviz/a_odiamond.gif
+share/doc/html/graphviz/a_odot.gif
+share/doc/html/graphviz/a_open.gif
+share/doc/html/graphviz/a_tee.gif
+share/doc/html/graphviz/aa_box.gif
+share/doc/html/graphviz/aa_crow.gif
+share/doc/html/graphviz/aa_diamond.gif
+share/doc/html/graphviz/aa_dot.gif
+share/doc/html/graphviz/aa_inv.gif
+share/doc/html/graphviz/aa_lbox.gif
+share/doc/html/graphviz/aa_lcrow.gif
+share/doc/html/graphviz/aa_ldiamond.gif
+share/doc/html/graphviz/aa_linv.gif
+share/doc/html/graphviz/aa_lnormal.gif
+share/doc/html/graphviz/aa_ltee.gif
+share/doc/html/graphviz/aa_lvee.gif
+share/doc/html/graphviz/aa_none.gif
+share/doc/html/graphviz/aa_normal.gif
+share/doc/html/graphviz/aa_obox.gif
+share/doc/html/graphviz/aa_odiamond.gif
+share/doc/html/graphviz/aa_odot.gif
+share/doc/html/graphviz/aa_oinv.gif
+share/doc/html/graphviz/aa_olbox.gif
+share/doc/html/graphviz/aa_oldiamond.gif
+share/doc/html/graphviz/aa_olinv.gif
+share/doc/html/graphviz/aa_olnormal.gif
+share/doc/html/graphviz/aa_onormal.gif
+share/doc/html/graphviz/aa_orbox.gif
+share/doc/html/graphviz/aa_ordiamond.gif
+share/doc/html/graphviz/aa_orinv.gif
+share/doc/html/graphviz/aa_ornormal.gif
+share/doc/html/graphviz/aa_rbox.gif
+share/doc/html/graphviz/aa_rcrow.gif
+share/doc/html/graphviz/aa_rdiamond.gif
+share/doc/html/graphviz/aa_rinv.gif
+share/doc/html/graphviz/aa_rnormal.gif
+share/doc/html/graphviz/aa_rtee.gif
+share/doc/html/graphviz/aa_rvee.gif
+share/doc/html/graphviz/aa_tee.gif
+share/doc/html/graphviz/aa_vee.gif
+share/doc/html/graphviz/attrs.html
+share/doc/html/graphviz/back.gif
+share/doc/html/graphviz/binlicense.htm
+share/doc/html/graphviz/both.gif
+share/doc/html/graphviz/box.gif
+share/doc/html/graphviz/build.html
+share/doc/html/graphviz/circle.gif
+share/doc/html/graphviz/colors.html
+share/doc/html/graphviz/command.html
+share/doc/html/graphviz/constraint.gif
+share/doc/html/graphviz/diamond.gif
+share/doc/html/graphviz/doublecircle.gif
+share/doc/html/graphviz/doubleoctagon.gif
+share/doc/html/graphviz/egg.gif
+share/doc/html/graphviz/ellipse.gif
+share/doc/html/graphviz/fill.gif
+share/doc/html/graphviz/forward.gif
+share/doc/html/graphviz/grammar.html
+share/doc/html/graphviz/hexagon.gif
+share/doc/html/graphviz/house.gif
+share/doc/html/graphviz/html1.gif
+share/doc/html/graphviz/html2.gif
+share/doc/html/graphviz/index.html
+share/doc/html/graphviz/invhouse.gif
+share/doc/html/graphviz/invtrapezium.gif
+share/doc/html/graphviz/invtriangle.gif
+share/doc/html/graphviz/lang.html
+share/doc/html/graphviz/mrecord.gif
+share/doc/html/graphviz/nohead.gif
+share/doc/html/graphviz/octagon.gif
+share/doc/html/graphviz/output.html
+share/doc/html/graphviz/parallelogram.gif
+share/doc/html/graphviz/pentagon.gif
+share/doc/html/graphviz/plaintext.gif
+share/doc/html/graphviz/point.gif
+share/doc/html/graphviz/polygon.gif
+share/doc/html/graphviz/record.gif
+share/doc/html/graphviz/rect.gif
+share/doc/html/graphviz/rectangle.gif
+share/doc/html/graphviz/round.gif
+share/doc/html/graphviz/septagon.gif
+share/doc/html/graphviz/shapes.html
+share/doc/html/graphviz/trapezium.gif
+share/doc/html/graphviz/triangle.gif
+share/doc/html/graphviz/tripleoctagon.gif
share/examples/graphviz/doted
share/examples/graphviz/doted.README
share/examples/graphviz/entities
@@ -272,6 +314,68 @@ share/examples/graphviz/entities.README
share/examples/graphviz/entities.html
share/examples/graphviz/gcat
share/examples/graphviz/gcat.README
+share/examples/graphviz/graphs/directed/KW91.dot
+share/examples/graphviz/graphs/directed/Latin1.dot
+share/examples/graphviz/graphs/directed/NaN.dot
+share/examples/graphviz/graphs/directed/abstract.dot
+share/examples/graphviz/graphs/directed/alf.dot
+share/examples/graphviz/graphs/directed/arrows.dot
+share/examples/graphviz/graphs/directed/awilliams.dot
+share/examples/graphviz/graphs/directed/clust.dot
+share/examples/graphviz/graphs/directed/clust1.dot
+share/examples/graphviz/graphs/directed/clust2.dot
+share/examples/graphviz/graphs/directed/clust3.dot
+share/examples/graphviz/graphs/directed/clust4.dot
+share/examples/graphviz/graphs/directed/clust5.dot
+share/examples/graphviz/graphs/directed/crazy.dot
+share/examples/graphviz/graphs/directed/ctext.dot
+share/examples/graphviz/graphs/directed/dfa.dot
+share/examples/graphviz/graphs/directed/fig6.dot
+share/examples/graphviz/graphs/directed/fsm.dot
+share/examples/graphviz/graphs/directed/grammar.dot
+share/examples/graphviz/graphs/directed/hashtable.dot
+share/examples/graphviz/graphs/directed/honda-tokoro.dot
+share/examples/graphviz/graphs/directed/jcctree.dot
+share/examples/graphviz/graphs/directed/jsort.dot
+share/examples/graphviz/graphs/directed/ldbxtried.dot
+share/examples/graphviz/graphs/directed/longflat.dot
+share/examples/graphviz/graphs/directed/mike.dot
+share/examples/graphviz/graphs/directed/nhg.dot
+share/examples/graphviz/graphs/directed/oldarrows.dot
+share/examples/graphviz/graphs/directed/pgram.dot
+share/examples/graphviz/graphs/directed/pm2way.dot
+share/examples/graphviz/graphs/directed/pmpipe.dot
+share/examples/graphviz/graphs/directed/polypoly.dot
+share/examples/graphviz/graphs/directed/proc3d.dot
+share/examples/graphviz/graphs/directed/record2.dot
+share/examples/graphviz/graphs/directed/records.dot
+share/examples/graphviz/graphs/directed/rowe.dot
+share/examples/graphviz/graphs/directed/sdh.dot
+share/examples/graphviz/graphs/directed/shells.dot
+share/examples/graphviz/graphs/directed/states.dot
+share/examples/graphviz/graphs/directed/structs.dot
+share/examples/graphviz/graphs/directed/switch.dot
+share/examples/graphviz/graphs/directed/table.dot
+share/examples/graphviz/graphs/directed/train11.dot
+share/examples/graphviz/graphs/directed/trapeziumlr.dot
+share/examples/graphviz/graphs/directed/tree.dot
+share/examples/graphviz/graphs/directed/triedds.dot
+share/examples/graphviz/graphs/directed/try.dot
+share/examples/graphviz/graphs/directed/unix.dot
+share/examples/graphviz/graphs/directed/unix2.dot
+share/examples/graphviz/graphs/directed/viewfile.dot
+share/examples/graphviz/graphs/directed/world.dot
+share/examples/graphviz/graphs/undirected/ER.dot
+share/examples/graphviz/graphs/undirected/Heawood.dot
+share/examples/graphviz/graphs/undirected/Petersen.dot
+share/examples/graphviz/graphs/undirected/ngk10_4.dot
+share/examples/graphviz/graphs/undirected/process.dot
+share/examples/graphviz/lefty/box.lefty
+share/examples/graphviz/lefty/def.lefty
+share/examples/graphviz/lefty/fractal.lefty
+share/examples/graphviz/lefty/fractal2.lefty
+share/examples/graphviz/lefty/slides.lefty
+share/examples/graphviz/lefty/tree.lefty
share/examples/graphviz/pathplan
share/examples/graphviz/pathplan.README
share/examples/graphviz/pathplan_data/boxes.dat
@@ -288,83 +392,22 @@ share/examples/graphviz/pathplan_data/u.dat
share/examples/graphviz/pathplan_data/unknown.dat
share/examples/graphviz/spline
share/examples/graphviz/spline.README
-share/graphviz/graphs/directed/KW91.dot
-share/graphviz/graphs/directed/Latin1.dot
-share/graphviz/graphs/directed/NaN.dot
-share/graphviz/graphs/directed/abstract.dot
-share/graphviz/graphs/directed/alf.dot
-share/graphviz/graphs/directed/arrows.dot
-share/graphviz/graphs/directed/awilliams.dot
-share/graphviz/graphs/directed/clust.dot
-share/graphviz/graphs/directed/clust1.dot
-share/graphviz/graphs/directed/clust2.dot
-share/graphviz/graphs/directed/clust3.dot
-share/graphviz/graphs/directed/clust4.dot
-share/graphviz/graphs/directed/clust5.dot
-share/graphviz/graphs/directed/crazy.dot
-share/graphviz/graphs/directed/ctext.dot
-share/graphviz/graphs/directed/dfa.dot
-share/graphviz/graphs/directed/fig6.dot
-share/graphviz/graphs/directed/fsm.dot
-share/graphviz/graphs/directed/grammar.dot
-share/graphviz/graphs/directed/hashtable.dot
-share/graphviz/graphs/directed/honda-tokoro.dot
-share/graphviz/graphs/directed/jcctree.dot
-share/graphviz/graphs/directed/jsort.dot
-share/graphviz/graphs/directed/ldbxtried.dot
-share/graphviz/graphs/directed/longflat.dot
-share/graphviz/graphs/directed/mike.dot
-share/graphviz/graphs/directed/nhg.dot
-share/graphviz/graphs/directed/oldarrows.dot
-share/graphviz/graphs/directed/pgram.dot
-share/graphviz/graphs/directed/pm2way.dot
-share/graphviz/graphs/directed/pmpipe.dot
-share/graphviz/graphs/directed/polypoly.dot
-share/graphviz/graphs/directed/proc3d.dot
-share/graphviz/graphs/directed/record2.dot
-share/graphviz/graphs/directed/records.dot
-share/graphviz/graphs/directed/rowe.dot
-share/graphviz/graphs/directed/sdh.dot
-share/graphviz/graphs/directed/shells.dot
-share/graphviz/graphs/directed/states.dot
-share/graphviz/graphs/directed/structs.dot
-share/graphviz/graphs/directed/table.dot
-share/graphviz/graphs/directed/train11.dot
-share/graphviz/graphs/directed/trapeziumlr.dot
-share/graphviz/graphs/directed/tree.dot
-share/graphviz/graphs/directed/triedds.dot
-share/graphviz/graphs/directed/try.dot
-share/graphviz/graphs/directed/unix.dot
-share/graphviz/graphs/directed/unix2.dot
-share/graphviz/graphs/directed/unix2k.dot
-share/graphviz/graphs/directed/viewfile.dot
-share/graphviz/graphs/directed/world.dot
-share/graphviz/graphs/undirected/ER.dot
-share/graphviz/graphs/undirected/Heawood.dot
-share/graphviz/graphs/undirected/Petersen.dot
-share/graphviz/graphs/undirected/ngk10_4.dot
-share/graphviz/graphs/undirected/process.dot
-share/graphviz/lefty/box.lefty
-share/graphviz/lefty/def.lefty
share/graphviz/lefty/dotty.lefty
share/graphviz/lefty/dotty_draw.lefty
share/graphviz/lefty/dotty_edit.lefty
share/graphviz/lefty/dotty_layout.lefty
share/graphviz/lefty/dotty_ui.lefty
-share/graphviz/lefty/fractal.lefty
-share/graphviz/lefty/fractal2.lefty
share/graphviz/lefty/lefty.psp
-share/graphviz/lefty/slides.lefty
-share/graphviz/lefty/tree.lefty
@dirrm share/graphviz/lefty
-@dirrm share/graphviz/graphs/undirected
-@dirrm share/graphviz/graphs/directed
-@dirrm share/graphviz/graphs
@dirrm share/graphviz
@dirrm share/examples/graphviz/pathplan_data
+@dirrm share/examples/graphviz/lefty
+@dirrm share/examples/graphviz/graphs/undirected
+@dirrm share/examples/graphviz/graphs/directed
+@dirrm share/examples/graphviz/graphs
@dirrm share/examples/graphviz
-@dirrm share/doc/html/graphviz/info
@dirrm share/doc/html/graphviz
+@dirrm share/doc/graphviz/pdf
@dirrm share/doc/graphviz
@dirrm lib/graphviz
@dirrm include/graphviz
diff --git a/graphics/graphviz/distinfo b/graphics/graphviz/distinfo
index 1fc57f9fb34..98482b702ee 100644
--- a/graphics/graphviz/distinfo
+++ b/graphics/graphviz/distinfo
@@ -1,25 +1,79 @@
-$NetBSD: distinfo,v 1.11 2004/08/17 09:24:14 kristerw Exp $
+$NetBSD: distinfo,v 1.12 2004/11/29 22:11:51 seb Exp $
-SHA1 (graphviz-1.12/graphviz-1.12.tar.gz) = c41ddeb8228c5957c9fad7ae7975eefec648682c
-Size (graphviz-1.12/graphviz-1.12.tar.gz) = 3348808 bytes
-SHA1 (patch-aa) = d60925921fa7daa753ee04e267fce6f978644ea2
-SHA1 (patch-ab) = 751f786fec8f4907d6aedd37de0304c353621a83
-SHA1 (patch-ac) = a69f70e2a3f95f3ef0f32cfcaf9bf872afd1cea4
-SHA1 (patch-ad) = 023a7ebfe07181ad0804811f9de46dc071e3d570
-SHA1 (patch-ae) = d50e2022e7f6d8d56286ebaad76f336226c0b34d
-SHA1 (patch-af) = bb421c78192625c7a1df43a79aca907adf1b6f12
-SHA1 (patch-ag) = 14ef4661ddb3a039a722c569e06975dc5cf1a83a
-SHA1 (patch-ah) = 607a3e52246d56ea9b6ea6bab2b3e68e3edb2e66
-SHA1 (patch-ai) = ec091f9ccbc88c12a16b20f80c050da2f08ad982
-SHA1 (patch-aj) = 66672b1152252692154e4a8f84f0193ee41d5d59
-SHA1 (patch-ak) = e4a39a77acfa4e06969d0ac853e996d68661ffff
-SHA1 (patch-al) = 9c5eefb0e071f0683b74a9b10699fc2c6c234de6
-SHA1 (patch-am) = bbb29acab4ea2c7f01ff76fb4731e19911e1c3aa
-SHA1 (patch-an) = a86f5edfe6e27e5ebfcb5d32a8f3cab52d7dbb00
-SHA1 (patch-ao) = 410700df6fc0c5a4700b7d38f966024a13ce1648
-SHA1 (patch-ap) = cef1d5b5805ccee2e59e359ee8ede1f322886ee6
-SHA1 (patch-aq) = 6af96ef9a50543bda3ceef615ffda053fc13813f
-SHA1 (patch-ar) = da6312bc97343d91a8590872755b9faa7c0f80f4
-SHA1 (patch-as) = 01880404e721a70af19e0c2af49b046dca7f2a68
-SHA1 (patch-at) = 9d2a6f677f840ab1e6c98485509104d49cce19cf
-SHA1 (patch-au) = 3a75effec8c86e0db42f5088bc266e16319a6b75
+SHA1 (graphviz-1.16/graphviz-1.16.tar.gz) = f613884100c62fb409ec5a2571df46d9caafe5e0
+Size (graphviz-1.16/graphviz-1.16.tar.gz) = 4387670 bytes
+SHA1 (patch-aa) = 65d3092648d74ec2cbd4c4c685ae97048d6b8369
+SHA1 (patch-ab) = a0f006b1dfe0869a1faca7ff1152154bd39a62c1
+SHA1 (patch-ac) = 3322fce515598b9fddd6b87c84bb1973e15d37e4
+SHA1 (patch-ad) = 93c24f960bf5bfb405ab2d8751efc1e652cd92a0
+SHA1 (patch-ae) = 9255ba6000a7ebc3483d915ff8468e3a448200f8
+SHA1 (patch-af) = 37d2492fd95256fb7b4031d5013c068c89a27946
+SHA1 (patch-ag) = 77e008dfd6f40ae135bbf75aacd73b08cd3e3395
+SHA1 (patch-ah) = f67540019094bbf3132b453660b2bc3e8cdc9ae9
+SHA1 (patch-ai) = 6175b487bc1859e2a1a56b17867922f61c25d48d
+SHA1 (patch-aj) = 605cac0dc649047a5cce2b66f14298b6b5a56e03
+SHA1 (patch-ak) = ea22a76938ec574f4dd1f400ca935cdbacb7bd64
+SHA1 (patch-al) = 72dd4e2c82b20d15c29a6d581c1057b02e23ff67
+SHA1 (patch-am) = bc9b74aca6e76f9faf633c604118c0df07d0f58a
+SHA1 (patch-an) = 3b2f9afeb799c732c80d57526a82e52da70639f1
+SHA1 (patch-ao) = e165189a3e9c8e83a0fbb1c614b1e230f9919793
+SHA1 (patch-ap) = 157a1185fcfcc9376e08ec6392050d67890ade58
+SHA1 (patch-aq) = 1cb76e7209e080a934da091921061eddb704dd1a
+SHA1 (patch-ar) = 7c8ac4768071cbc4554da3f27ca4bcc8538229ab
+SHA1 (patch-as) = 05b2f1721ed181b0f12daf32700c96c74e00658f
+SHA1 (patch-at) = 31057001f25260b72da8f8617c24627d721cf413
+SHA1 (patch-au) = 1b47f17ba332918378ab72750ca6d5a8fb510555
+SHA1 (patch-av) = b6f3789262b1df0004deba32a960e5aa26373b2d
+SHA1 (patch-aw) = 19bd5db29bde4fdb90d5f42dd86e1cbffee4350e
+SHA1 (patch-ax) = b290d89d881904f804d7a426aaa4510fb7e371bf
+SHA1 (patch-ay) = 7c12461a5429a66c426d868c3115e0f3422f59b9
+SHA1 (patch-az) = 65cc7e6820fcef2a65280c8f2f0f3ea6dfccab7c
+SHA1 (patch-ba) = ad09bb3d21a77863f0b79cc9c31730972a5b1ed5
+SHA1 (patch-bb) = fe43a6bb6c4e1f5a4369587d98aeb8da73a3a921
+SHA1 (patch-bc) = 625a6fb18cc276ff43d9f4e318d985ef1cca7be1
+SHA1 (patch-bd) = 13d9bc3eb37214cca072952049d0a5da39a6e131
+SHA1 (patch-be) = ff4f7137f4cbca830e9551673340657bcdf8c7df
+SHA1 (patch-bf) = 1bcc0eda8351c373bec2f016f8a4dcb153fbe409
+SHA1 (patch-bg) = 594cca47fa8cd21f910f417886368f9a46de5434
+SHA1 (patch-bh) = 8b1b6c6cfee812ab163d6306275799affa627913
+SHA1 (patch-bi) = 8adb75c2a8aab4312cd075863d929e97c5714164
+SHA1 (patch-bj) = 8671814fa3539eef980ed1a7e5b05fc26526bd88
+SHA1 (patch-bk) = ad0b7262473783df3c337cd78f260d19f28d289a
+SHA1 (patch-bl) = 473744a42c8b3e6a62ad87799b35788a9a3816b8
+SHA1 (patch-bm) = f2b57453298c09c16f933b03ce3015b1ac0cfde5
+SHA1 (patch-bn) = a2aafc79a26e7e68f95ef841ace3f31e7ade65ab
+SHA1 (patch-bo) = 860f450cc0ee6e25d8fec7e758c1918f4c4720e1
+SHA1 (patch-bp) = 5cd12fec1ccd74964707b6a2da4277cbe4c7f9f5
+SHA1 (patch-bq) = b07e60b897a2653dc6e357d29c9fbb056e4e7b8e
+SHA1 (patch-br) = f417a5545b1e019f8c769b22ffcd79091030fb67
+SHA1 (patch-bs) = f9e0a38cb1113129ccf801bfb3347adb3827686a
+SHA1 (patch-bt) = 301fec1d5c7b6879f71c7f89663ca313834611ff
+SHA1 (patch-bu) = af47727c3a1dd592f5d0b4f006ba7452b8f44da8
+SHA1 (patch-bv) = 69d8265ae78b376faf6c500960e0c2a823ce9ee0
+SHA1 (patch-bw) = 20eaaa7c849db653f7486e7ac9626455a0704ce4
+SHA1 (patch-bx) = 8f59d965eab1671ec238ed33f81734a6ef22c6ed
+SHA1 (patch-by) = d0dc92ad3680e2c6845c8600281da5e4d3a1f365
+SHA1 (patch-bz) = ca697013c8c3b95990d2c99b256646287e199bdd
+SHA1 (patch-ca) = b6bcf483ee384bd8a51383a49dda8b61a437bdb6
+SHA1 (patch-cb) = 50210dc6f6e0676df267af54422aab240feded78
+SHA1 (patch-cc) = ee35c991c06e09ec21b83fbf3d9ecdb8fdfaaf8f
+SHA1 (patch-cd) = d1ea0b21b4fc6806c7437becc608644436424306
+SHA1 (patch-ce) = 9bb280bd0d25ad46ec5acbd6e52affabec70a1d2
+SHA1 (patch-cf) = 75fac94de9c4a11c51b638f4fcffd3604d711177
+SHA1 (patch-cg) = 2d8cc460da9b2d5f390d53f4961832d1c9d0d6c4
+SHA1 (patch-ch) = a4f7bbb9d1f9e270e32b10769f4892274a5012e5
+SHA1 (patch-ci) = a72094c6e50303ed115de3053704dbb79e6fa08c
+SHA1 (patch-cj) = 15616acf9865b8efd9f600556ad85bae50072c20
+SHA1 (patch-ck) = 523fdcf57b0db9dd6b17f9b51b0fd9dcafc57ba0
+SHA1 (patch-cl) = aefb3fd1c75032b93f1951b219102e083a43dc95
+SHA1 (patch-cm) = fd1fccfa526d938b138729ef18d332088efcd578
+SHA1 (patch-cn) = d63d01b0ab7b0c300c95103cfdff5e7c5e25e394
+SHA1 (patch-co) = 9f7f8aebf0528b8c07563f81cc73a8a4fac2b2a9
+SHA1 (patch-cp) = 67972caba6d2bc86939ef20c1b2cd293adc1e8a4
+SHA1 (patch-cq) = f23120ccd807181645ccceda7e3f392702fa92d7
+SHA1 (patch-cr) = afb30a10dd36c8997f7c59b49870366f955cfba7
+SHA1 (patch-cs) = 06bed81033cb95f6ecdb86164d44a722b8e6a338
+SHA1 (patch-ct) = 26aa6e315d073f884ddbc278463e1f5a1e9e7f40
+SHA1 (patch-cu) = 91ebc8ddace412aed6bd3dcffb168d9e599ad10a
+SHA1 (patch-cv) = f94b4964ce868687ba4d0bf70ffce2231ac40568
+SHA1 (patch-cw) = 1d7080efd1420335d8d61877506b4228dd69a27a
diff --git a/graphics/graphviz/patches/patch-aa b/graphics/graphviz/patches/patch-aa
index c4af813b0bd..6be6f7c21f7 100644
--- a/graphics/graphviz/patches/patch-aa
+++ b/graphics/graphviz/patches/patch-aa
@@ -1,6 +1,6 @@
-$NetBSD: patch-aa,v 1.2 2002/08/28 13:49:36 seb Exp $
+$NetBSD: patch-aa,v 1.3 2004/11/29 22:11:51 seb Exp $
---- MINTERMS.txt.orig Tue Apr 16 22:37:02 2002
+--- MINTERMS.txt.orig 2002-04-16 20:37:02.000000000 +0000
+++ MINTERMS.txt
@@ -2,7 +2,7 @@
Appendix A - Minimum Terms
diff --git a/graphics/graphviz/patches/patch-ab b/graphics/graphviz/patches/patch-ab
index c1535a12983..f4da6255359 100644
--- a/graphics/graphviz/patches/patch-ab
+++ b/graphics/graphviz/patches/patch-ab
@@ -1,154 +1,176 @@
-$NetBSD: patch-ab,v 1.7 2004/04/17 16:56:10 seb Exp $
+$NetBSD: patch-ab,v 1.8 2004/11/29 22:11:51 seb Exp $
---- configure.in.orig 2004-03-02 00:18:28.000000000 +0000
-+++ configure.in
+--- configure.ac.orig 2004-09-14 22:04:08.000000000 +0000
++++ configure.ac
@@ -25,7 +25,10 @@ case "${target_os}" in
PATHSEPARATOR=":"
;;
* ) # This sucks! Whatever happened to standards for file system layout?
- DEFAULT_FONTPATH="/usr/X11R6/lib/X11/fonts/TrueType:/usr/X11R6/lib/X11/fonts/truetype:/usr/X11R6/lib/X11/fonts/TTF:/usr/share/fonts/TrueType:/usr/share/fonts/truetype:/usr/openwin/lib/X11/fonts/TrueType:/usr/X11R6/lib/X11/fonts/Type1:/usr/common/share/fonts/ttf";
+ DEFAULT_FONTPATH="${X11PREFIX}/lib/X11/fonts/TrueType:${X11PREFIX}/lib/X11/fonts/truetype:${X11PREFIX}/lib/X11/fonts/TTF:/usr/share/fonts/TrueType:/usr/share/fonts/truetype:/usr/openwin/lib/X11/fonts/TrueType:/usr/X11R6/lib/X11/fonts/Type1:/usr/common/share/fonts/ttf";
-+ if test x"$X11PREFIX" != x"$X11BASE"; then
-+ DEFAULT_FONTPATH="${DEFAULT_FONTPATH}:${X11BASE}/lib/X11/fonts/TrueType:${X11BASE}/lib/X11/fonts/truetype:${X11BASE}/lib/X11/fonts/TTF:${X11BASE}/lib/X11/fonts/Type1"
-+ fi
++ if test x"$X11PREFIX" != x"$X11BASE"; then
++ DEFAULT_FONTPATH="${DEFAULT_FONTPATH}:${X11BASE}/lib/X11/fonts/TrueType:${X11BASE}/lib/X11/fonts/truetype:${X11BASE}/lib/X11/fonts/TTF:${X11BASE}/lib/X11/fonts/Type1"
++ fi
PATHSEPARATOR=":"
;;
esac
-@@ -202,52 +205,13 @@ fi
- # AC_MSG_RESULT(no)
- # )
+@@ -206,71 +209,12 @@ dnl INCLUDES and LIBS for TCL
+ # start by assuming we have it
+ HAVE_TCL=1
--dnl -----------------------------------
--dnl INCLUDES and LIBS for TCL
-AC_ARG_WITH(tclsh,
-- [ --with-tclsh=PROG build graphviz for specific tclsh],
-- TCLSH=$withval,)
+- [ --with-tclsh=PROG build graphviz for specific tclsh],
+- TCLSH=$withval,)
+-
-if test "x$TCLSH" = "x"; then
-- AC_PATH_PROG(TCLSH,tclsh8.4)
-- if test "x$TCLSH" = "x"; then
-- AC_PATH_PROG(TCLSH,tclsh8.3)
-- if test "x$TCLSH" = "x"; then
-- AC_PATH_PROG(TCLSH,tclsh)
-- fi
-- fi
+- AC_PATH_PROG(TCLSH,tclsh8.4)
+- if test "x$TCLSH" = "x"; then
+- AC_PATH_PROG(TCLSH,tclsh8.3)
+- if test "x$TCLSH" = "x"; then
+- AC_PATH_PROG(TCLSH,tclsh)
+- fi
+- fi
-fi
--TCL_VERSION_FOUND=`echo 'puts [[info tclversion]]' | $TCLSH`
--
--# can't assume ksh on all architectures
--# TCLSH_EXEC_PREFIX=${TCLSH%%/bin/tclsh.*}
--TCLSH_EXEC_PREFIX=`echo $TCLSH|sed -e 's%/bin/tclsh.*$%%'`
-
--if test -f ${TCLSH_EXEC_PREFIX}/include/tcl${TCL_VERSION_FOUND}/tcl.h; then
-- TCL_INCLUDES="-I${TCLSH_EXEC_PREFIX}/include/tcl${TCL_VERSION_FOUND} -I${TCLSH_EXEC_PREFIX}/include/tcl${TCL_VERSION_FOUND}/generic"
--else
--if test "x${TCLSH_EXEC_PREFIX}" != "x/usr" -a -f ${TCLSH_EXEC_PREFIX}/include/tcl.h; then
-- TCL_INCLUDES=-I${TCLSH_EXEC_PREFIX}/include
--fi
--fi
--if test "x$TCL_INCLUDES" != "x" ; then
-- AC_MSG_RESULT([using tcl headers from $TCL_INCLUDES])
+-if test "x$TCLSH" = "x"; then
+- AC_MSG_WARN([Unable to find a tclsh. The Tcl packages will not be built])
+- HAVE_TCL=0
-fi
--AC_SUBST(TCL_INCLUDES)
-
--# Some systems don't have Tcl. Don't build
--# the Tcl products if we don't have the library.
--if test -f ${TCLSH_EXEC_PREFIX}/lib/tcl${TCL_VERSION_FOUND}/tclConfig.sh; then
-- TCLCONFIG=${TCLSH_EXEC_PREFIX}/lib/tcl${TCL_VERSION_FOUND}/tclConfig.sh
--else
--if test -f ${TCLSH_EXEC_PREFIX}/lib/tclConfig.sh; then
-- TCLCONFIG=${TCLSH_EXEC_PREFIX}/lib/tclConfig.sh
--fi
+-if test "$HAVE_TCL" = "1"; then
+- TCL_VERSION_FOUND=`echo 'puts [[info tclversion]]' | $TCLSH`
+-
+- # can't assume ksh on all architectures
+- # TCLSH_EXEC_PREFIX=${TCLSH%%/bin/tclsh.*}
+- # so use sed instead
+- TCLSH_EXEC_PREFIX=`echo $TCLSH|sed -e 's%/bin/tclsh.*$%%'`
+-
+- if test -f ${TCLSH_EXEC_PREFIX}/include/tcl${TCL_VERSION_FOUND}/tcl.h; then
+- TCL_INCLUDES="-I${TCLSH_EXEC_PREFIX}/include/tcl${TCL_VERSION_FOUND} -I${TCLSH_EXEC_PREFIX}/include/tcl${TCL_VERSION_FOUND}/generic"
+- else
+- if test "x${TCLSH_EXEC_PREFIX}" != "x/usr" -a -f ${TCLSH_EXEC_PREFIX}/include/tcl.h; then
+- TCL_INCLUDES=-I${TCLSH_EXEC_PREFIX}/include
+- fi
+- fi
+- if test "x$TCL_INCLUDES" != "x" ; then
+- AC_MSG_RESULT([using tcl headers from $TCL_INCLUDES])
+- fi
+- AC_SUBST(TCL_INCLUDES)
+- save_CPPFLAGS=$CPPFLAGS
+- CPPFLAGS="$CPPFLAGS $TCL_INCLUDES"
++. ${TCLCONFIG}
++TCL_INCLUDES=${TCL_INCLUDE_SPEC}
++AC_SUBST(TCL_INCLUDES)
+ AC_CHECK_HEADER(tcl.h,,[
+ AC_MSG_WARN([Unable to find header tcl.h. The Tcl packages will not be built])
+ HAVE_TCL=0])
+- CPPFLAGS=$save_CPPFLAGS
-fi
-
- if test "x$TCLCONFIG" != "x"; then
- AC_MSG_RESULT([using $TCLCONFIG])
- file=${TCLCONFIG}
- . $file
-+ #
-+ TCLSH_EXEC_PREFIX="${TCL_EXEC_PREFIX}"
-+ TCL_INCLUDES="${TCL_INCLUDE_SPEC}"
+-if test "$HAVE_TCL" = "1"; then
+- # Some systems don't have Tcl. Don't build
+- # the Tcl products if we don't have the library.
+- if test -f ${TCLSH_EXEC_PREFIX}/lib/tcl${TCL_VERSION_FOUND}/tclConfig.sh; then
+- TCLCONFIG=${TCLSH_EXEC_PREFIX}/lib/tcl${TCL_VERSION_FOUND}/tclConfig.sh
+- else
+- if test -f ${TCLSH_EXEC_PREFIX}/lib/tclConfig.sh; then
+- TCLCONFIG=${TCLSH_EXEC_PREFIX}/lib/tclConfig.sh
+- fi
+- fi
+- if test "x$TCLCONFIG" != "x"; then
+- AC_MSG_RESULT([using $TCLCONFIG])
+- file=${TCLCONFIG}
+- . $file
+- else
+- AC_MSG_WARN([Unable to find tclConfig.sh. The Tcl packages will not be built])
+- HAVE_TCL=0
+- fi
+-fi
+
+ if test "$HAVE_TCL" = "1"; then
# TCL STUBS support is required
- if test "${TCL_SUPPORTS_STUBS}" = "1"; then
- # TCL_SUBDIRS="tclstubs tclhandle gdtclft tcldot tcldgr tcldgl tclpathplan"
-@@ -293,6 +257,7 @@ AC_SUBST(TCL_NEEDS_EXP_FILE)
- AC_SUBST(TCL_EXPORT_FILE_SUFFIX)
- AC_SUBST(TCL_LIBS)
- AC_SUBST(TCL_PREFIX)
-+AC_SUBST(TCL_INCLUDES)
- AC_SUBST(TCL_EXEC_PREFIX)
- AC_SUBST(TCL_SHLIB_CFLAGS)
- AC_SUBST(TCL_SHLIB_CXXFLAGS)
-@@ -321,58 +286,13 @@ AC_SUBST(TCL_STUB_LIB_SPEC)
- AC_SUBST(TCL_BUILD_STUB_LIB_PATH)
- AC_SUBST(TCL_STUB_LIB_PATH)
+@@ -353,77 +297,13 @@ if test "$HAVE_TCL" = "0"; then
+ fi
--dnl -----------------------------------
--dnl INCLUDES and LIBS for TK
--AC_ARG_WITH(wish,
-- [ --with-wish=PROG build graphviz for specific wish],
-- WISH=$withval,)
--if test "x$WISH" = "x"; then
-- AC_PATH_PROG(WISH,wish8.4)
-- if test "x$WISH" = "x"; then
-- AC_PATH_PROG(WISH,wish8.3)
-- if test "x$WISH" = "x"; then
-- AC_PATH_PROG(WISH,wish)
-- fi
-- fi
+ HAVE_TK=$HAVE_TCL
+-
+-if test "$HAVE_TK" = "1"; then
+- AC_ARG_WITH(wish,
+- [ --with-wish=PROG build graphviz for specific wish],
+- WISH=$withval,)
+- if test "x$WISH" = "x"; then
+- AC_PATH_PROG(WISH,wish8.4)
+- if test "x$WISH" = "x"; then
+- AC_PATH_PROG(WISH,wish8.3)
+- if test "x$WISH" = "x"; then
+- AC_PATH_PROG(WISH,wish)
+- fi
+- fi
+- fi
+- if test "x$WISH" = "x"; then
+- AC_MSG_WARN([Unable to find a wish. The Tk packages will not be built])
+- HAVE_TK=0
+- fi
-fi
-
+-if test "$HAVE_TK" = "1"; then
+- #TK_VERSION_FOUND=`echo 'puts [[info tkversion]]' | $WISH`
+- #
+- # No such var as tkversion. Use tclversion instead.
+- TK_VERSION_FOUND=${TCL_VERSION_FOUND}
+-
+- # can't assume ksh on all architectures
+- # WISH_EXEC_PREFIX=${WISH%%/bin/tclsh.*}
+- # so use sed instead
+- WISH_EXEC_PREFIX=`echo $WISH|sed -e 's%/bin/wish.*$%%'`
-
--#TK_VERSION_FOUND=`echo 'puts [[info tkversion]]' | $WISH`
--#
--# No such var as tkversion. Use tclversion instead.
--TK_VERSION_FOUND=${TCL_VERSION_FOUND}
--
--# can't assume ksh on all architectures
--# WISH_EXEC_PREFIX=${WISH%%/bin/tclsh.*}
--WISH_EXEC_PREFIX=`echo $WISH|sed -e 's%/bin/wish.*$%%'`
--
--if test -f ${WISH_EXEC_PREFIX}/include/tk${TK_VERSION_FOUND}/tk.h; then
+- if test -f ${WISH_EXEC_PREFIX}/include/tk${TK_VERSION_FOUND}/tk.h; then
- TK_INCLUDES="-I${WISH_EXEC_PREFIX}/include/tk${TK_VERSION_FOUND} -I${WISH_EXEC_PREFIX}/include/tk${TK_VERSION_FOUND}/generic"
--else
--if test "x${WISH_EXEC_PREFIX}" != "x/usr" -a -f ${WISH_EXEC_PREFIX}/include/tk.h; then
-- TK_INCLUDES=-I${WISH_EXEC_PREFIX}/include
--fi
--fi
--if test "x$TK_INCLUDES" != "x" ; then
+- else
+- if test "x${WISH_EXEC_PREFIX}" != "x/usr" -a -f ${WISH_EXEC_PREFIX}/include/tk.h; then
+- TK_INCLUDES=-I${WISH_EXEC_PREFIX}/include
+- fi
+- fi
+- if test "x$TK_INCLUDES" != "x" ; then
- AC_MSG_RESULT([using tk headers from $TK_INCLUDES])
--fi
--AC_SUBST(TK_INCLUDES)
--
--# Some systems don't have Tcl. Don't build
--# Some systems have Tcl, but not TK. Don't build
--# the Tk products if we don't have the library.
--if test -f ${WISH_EXEC_PREFIX}/lib/tk${TK_VERSION_FOUND}/tkConfig.sh; then
-- TKCONFIG=${WISH_EXEC_PREFIX}/lib/tk${TK_VERSION_FOUND}/tkConfig.sh
--else
--if test -f ${WISH_EXEC_PREFIX}/lib/tkConfig.sh; then
-- TKCONFIG=${WISH_EXEC_PREFIX}/lib/tkConfig.sh
--fi
--fi
--
- if test "x$TKCONFIG" != "x"; then
- AC_MSG_RESULT([using $TKCONFIG])
- file=${TKCONFIG}
- . $file
-+ #
-+ WISH_EXEC_PREFIX="${TK_EXEC_PREFIX}"
-+ TK_INCLUDES="-I${TK_PREFIX}/include"
- if test "${TCL_SUPPORTS_STUBS}" = "1"; then
- TK_PKGINDEX="tkspline/pkgIndex.tcl"
- else
-@@ -414,6 +334,7 @@ AC_SUBST(TK_BUILD_STUB_LIB_SPEC)
- AC_SUBST(TK_STUB_LIB_SPEC)
- AC_SUBST(TK_BUILD_STUB_LIB_PATH)
- AC_SUBST(TK_STUB_LIB_PATH)
+- fi
+- AC_SUBST(TK_INCLUDES)
+- save_CPPFLAGS=$CPPFLAGS
+- CPPFLAGS="$CPPFLAGS $TCL_INCLUDES $TK_INCLUDES"
++. ${TKCONFIG}
++TK_INCLUDES="-I${TK_PREFIX}/include"
+AC_SUBST(TK_INCLUDES)
+ AC_CHECK_HEADER(tk.h,,[
+ AC_MSG_WARN([Unable to find header tk.h. The Tk packages will not be built])
+ HAVE_TK=0])
+- CPPFLAGS=$save_CPPFLAGS
+-fi
- dnl -----------------------------------
- dnl Support for generic "extra" search paths for includes and libraries
-@@ -774,36 +695,12 @@ AC_MSG_RESULT(no)])
+-if test "$HAVE_TK" = "1"; then
+- # Some systems don't have Tcl. Don't build
+- # Some systems have Tcl, but not TK. Don't build
+- # the Tk products if we don't have the library.
+- if test -f ${WISH_EXEC_PREFIX}/lib/tk${TK_VERSION_FOUND}/tkConfig.sh; then
+- TKCONFIG=${WISH_EXEC_PREFIX}/lib/tk${TK_VERSION_FOUND}/tkConfig.sh
+- else
+- if test -f ${WISH_EXEC_PREFIX}/lib/tkConfig.sh; then
+- TKCONFIG=${WISH_EXEC_PREFIX}/lib/tkConfig.sh
+- fi
+- fi
+- if test "x$TKCONFIG" != "x"; then
+- AC_MSG_RESULT([using $TKCONFIG])
+- file=${TKCONFIG}
+- . $file
+- else
+- AC_MSG_WARN([Unable to find tkConfig.sh. The Tk packages will not be built])
+- HAVE_TK=0
+- fi
+-fi
+-
+ #if test "$HAVE_TK" = "1"; then
+ # # TK STUBS support is required (but support is indicated by TCL_SUPPORTS_STUBS)
+ # if test "x${TCL_SUPPORTS_STUBS}" != "x1"; then
+@@ -1014,36 +894,12 @@ AC_MSG_RESULT(no)])
# -----------------------------------
# tclInt.h
diff --git a/graphics/graphviz/patches/patch-ac b/graphics/graphviz/patches/patch-ac
index 7e3485418e0..78bd8176224 100644
--- a/graphics/graphviz/patches/patch-ac
+++ b/graphics/graphviz/patches/patch-ac
@@ -1,40 +1,52 @@
-$NetBSD: patch-ac,v 1.9 2004/04/17 16:56:10 seb Exp $
+$NetBSD: patch-ac,v 1.10 2004/11/29 22:11:51 seb Exp $
---- configure.orig 2004-03-02 00:20:47.000000000 +0000
+--- configure.orig 2004-09-14 22:12:44.000000000 +0000
+++ configure
-@@ -1021,8 +1021,6 @@ Optional Packages:
- --with-pic try to use only PIC/non-PIC objects default=use both
- --with-dmalloc use dmalloc for debugging memory use
+@@ -464,7 +464,7 @@ ac_includes_default="\
+ # include <unistd.h>
+ #endif"
+
+-ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix program_transform_name bindir sbindir libexecdir datadir sysconfdir sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS build build_cpu build_vendor build_os host host_cpu host_vendor host_os target target_cpu target_vendor target_os CYGWIN MINGW32 DARWIN INSTALL_PROGRAM INSTALL_SCRIPT INSTALL_DATA CYGPATH_W PACKAGE VERSION ACLOCAL AUTOCONF AUTOMAKE AUTOHEADER MAKEINFO install_sh STRIP ac_ct_STRIP INSTALL_STRIP_PROGRAM mkdir_p AWK SET_MAKE am__leading_dot AMTAR am__tar am__untar BUILDDATE CC CFLAGS LDFLAGS CPPFLAGS ac_ct_CC EXEEXT OBJEXT DEPDIR am__include am__quote AMDEP_TRUE AMDEP_FALSE AMDEPBACKSLASH CCDEPMODE am__fastdepCC_TRUE am__fastdepCC_FALSE CXX CXXFLAGS ac_ct_CXX CXXDEPMODE am__fastdepCXX_TRUE am__fastdepCXX_FALSE LEX LEXLIB LEX_OUTPUT_ROOT YACC EGREP LN_S ECHO AR ac_ct_AR RANLIB ac_ct_RANLIB CPP CXXCPP F77 FFLAGS ac_ct_F77 LIBTOOL SED SORT KSH TOP_DIR BUILD_DIR ENABLE_DYNAGRAPH_TRUE ENABLE_DYNAGRAPH_FALSE ENABLE_GVRENDER_TRUE ENABLE_GVRENDER_FALSE ENABLE_CODEGENS_TRUE ENABLE_CODEGENS_FALSE TCLSH TCL_INCLUDES HAVE_TCL WITH_TCL_TRUE WITH_TCL_FALSE TCL_PKGINDEX TCL_VERSION TCL_MAJOR_VERSION TCL_MINOR_VERSION TCL_PATCH_LEVEL TCL_CFLAGS TCL_DEFS TCL_SHLIB_SUFFIX TCL_SRC_DIR TCL_STUB_LIB_SPEC WISH TK_INCLUDES HAVE_TK WITH_TK_TRUE WITH_TK_FALSE TK_PKGINDEX TK_VERSION TK_MAJOR_VERSION TK_MINOR_VERSION TK_PATCH_LEVEL TK_DEFS TK_XINCLUDES TK_SRC_DIR TK_CFLAGS TK_STUB_LIB_SPEC MATH_LIBS SOCKET_LIBS X_CFLAGS X_PRE_LIBS X_LIBS X_EXTRA_LIBS WITH_X_TRUE WITH_X_FALSE EXPAT_CONFIG EXPAT_INCLUDES EXPAT_LIBS XPM_INCLUDES XPM_LIBS XAW_INCLUDES XAW_LIBS Z_INCLUDES Z_LIBS GDLIB_CONFIG GD_INCLUDES GD_LIBS WITH_MYLIBGD_TRUE WITH_MYLIBGD_FALSE LIBICONV LTLIBICONV ICONV_INCLUDES ICONV_LIBS FREETYPE_CONFIG FT_INCLUDES FT_LIBS FONTCONFIG_CONFIG FC_INCLUDES FC_LIBS LIBPNG_CONFIG PNG_INCLUDES PNG_LIBS JPEG_INCLUDES JPEG_LIBS PKG_CONFIG LIBSVG_CAIRO_CFLAGS LIBSVG_CAIRO_LIBS ALLOCA LIBOBJS TCLINT_INCLUDES TKINT_INCLUDES LTLIBOBJS'
++ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix program_transform_name bindir sbindir libexecdir datadir sysconfdir sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS build build_cpu build_vendor build_os host host_cpu host_vendor host_os target target_cpu target_vendor target_os CYGWIN MINGW32 DARWIN INSTALL_PROGRAM INSTALL_SCRIPT INSTALL_DATA CYGPATH_W PACKAGE VERSION ACLOCAL AUTOCONF AUTOMAKE AUTOHEADER MAKEINFO install_sh STRIP ac_ct_STRIP INSTALL_STRIP_PROGRAM mkdir_p AWK SET_MAKE am__leading_dot AMTAR am__tar am__untar BUILDDATE CC CFLAGS LDFLAGS CPPFLAGS ac_ct_CC EXEEXT OBJEXT DEPDIR am__include am__quote AMDEP_TRUE AMDEP_FALSE AMDEPBACKSLASH CCDEPMODE am__fastdepCC_TRUE am__fastdepCC_FALSE CXX CXXFLAGS ac_ct_CXX CXXDEPMODE am__fastdepCXX_TRUE am__fastdepCXX_FALSE LEX LEXLIB LEX_OUTPUT_ROOT YACC EGREP LN_S ECHO AR ac_ct_AR RANLIB ac_ct_RANLIB CPP CXXCPP F77 FFLAGS ac_ct_F77 LIBTOOL SED SORT KSH TOP_DIR BUILD_DIR ENABLE_DYNAGRAPH_TRUE ENABLE_DYNAGRAPH_FALSE ENABLE_GVRENDER_TRUE ENABLE_GVRENDER_FALSE ENABLE_CODEGENS_TRUE ENABLE_CODEGENS_FALSE TCL_INCLUDES HAVE_TCL WITH_TCL_TRUE WITH_TCL_FALSE TCL_PKGINDEX TCL_VERSION TCL_MAJOR_VERSION TCL_MINOR_VERSION TCL_PATCH_LEVEL TCL_CFLAGS TCL_DEFS TCL_SHLIB_SUFFIX TCL_SRC_DIR TCL_STUB_LIB_SPEC TK_INCLUDES HAVE_TK WITH_TK_TRUE WITH_TK_FALSE TK_PKGINDEX TK_VERSION TK_MAJOR_VERSION TK_MINOR_VERSION TK_PATCH_LEVEL TK_DEFS TK_XINCLUDES TK_SRC_DIR TK_CFLAGS TK_STUB_LIB_SPEC MATH_LIBS SOCKET_LIBS X_CFLAGS X_PRE_LIBS X_LIBS X_EXTRA_LIBS WITH_X_TRUE WITH_X_FALSE EXPAT_CONFIG EXPAT_INCLUDES EXPAT_LIBS XPM_INCLUDES XPM_LIBS XAW_INCLUDES XAW_LIBS Z_INCLUDES Z_LIBS GDLIB_CONFIG GD_INCLUDES GD_LIBS WITH_MYLIBGD_TRUE WITH_MYLIBGD_FALSE LIBICONV LTLIBICONV ICONV_INCLUDES ICONV_LIBS FREETYPE_CONFIG FT_INCLUDES FT_LIBS FONTCONFIG_CONFIG FC_INCLUDES FC_LIBS LIBPNG_CONFIG PNG_INCLUDES PNG_LIBS JPEG_INCLUDES JPEG_LIBS PKG_CONFIG LIBSVG_CAIRO_CFLAGS LIBSVG_CAIRO_LIBS ALLOCA LIBOBJS TCLINT_INCLUDES TKINT_INCLUDES LTLIBOBJS'
+ ac_subst_files=''
+
+ # Initialize some variables set by options.
+@@ -1054,8 +1054,6 @@ Optional Packages:
+ --with-tags[=TAGS]
+ include additional configurations [automatic]
--with-efence use efence for debugging memory use
- --with-tclsh=PROG build graphviz for specific tclsh
- --with-wish=PROG build graphviz for specific wish
--with-extraincludedir=DIR use extra includes from DIR
--with-extralibdir=DIR use extra libraries from DIR
--with-x use the X Window System
-@@ -1530,7 +1528,10 @@ case "${target_os}" in
+@@ -1676,7 +1674,10 @@ case "${target_os}" in
PATHSEPARATOR=":"
;;
* ) # This sucks! Whatever happened to standards for file system layout?
- DEFAULT_FONTPATH="/usr/X11R6/lib/X11/fonts/TrueType:/usr/X11R6/lib/X11/fonts/truetype:/usr/X11R6/lib/X11/fonts/TTF:/usr/share/fonts/TrueType:/usr/share/fonts/truetype:/usr/openwin/lib/X11/fonts/TrueType:/usr/X11R6/lib/X11/fonts/Type1:/usr/common/share/fonts/ttf";
+ DEFAULT_FONTPATH="${X11PREFIX}/lib/X11/fonts/TrueType:${X11PREFIX}/lib/X11/fonts/truetype:${X11PREFIX}/lib/X11/fonts/TTF:/usr/share/fonts/TrueType:/usr/share/fonts/truetype:/usr/openwin/lib/X11/fonts/TrueType:/usr/X11R6/lib/X11/fonts/Type1:/usr/common/share/fonts/ttf";
-+ if test x"$X11PREFIX" != x"$X11BASE"; then
-+ DEFAULT_FONTPATH="${DEFAULT_FONTPATH}:${X11BASE}/lib/X11/fonts/TrueType:${X11BASE}/lib/X11/fonts/truetype:${X11BASE}/lib/X11/fonts/TTF:${X11BASE}/lib/X11/fonts/Type1"
-+ fi
++ if test x"$X11PREFIX" != x"$X11BASE"; then
++ DEFAULT_FONTPATH="${DEFAULT_FONTPATH}:${X11BASE}/lib/X11/fonts/TrueType:${X11BASE}/lib/X11/fonts/truetype:${X11BASE}/lib/X11/fonts/TTF:${X11BASE}/lib/X11/fonts/Type1"
++ fi
PATHSEPARATOR=":"
;;
esac
-@@ -8964,169 +8965,14 @@ fi
- # AC_MSG_RESULT(no)
- # )
+@@ -20354,165 +20355,9 @@ fi
+ # start by assuming we have it
+ HAVE_TCL=1
+
++. ${TCLCONFIG}
++TCL_INCLUDES=${TCL_INCLUDE_SPEC}
--
-# Check whether --with-tclsh or --without-tclsh was given.
-if test "${with_tclsh+set}" = set; then
- withval="$with_tclsh"
- TCLSH=$withval
-fi;
+-
-if test "x$TCLSH" = "x"; then
-- # Extract the first word of "tclsh8.4", so it can be a program name with args.
+- # Extract the first word of "tclsh8.4", so it can be a program name with args.
-set dummy tclsh8.4; ac_word=$2
-echo "$as_me:$LINENO: checking for $ac_word" >&5
-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
@@ -73,8 +85,8 @@ $NetBSD: patch-ac,v 1.9 2004/04/17 16:56:10 seb Exp $
-echo "${ECHO_T}no" >&6
-fi
-
-- if test "x$TCLSH" = "x"; then
-- # Extract the first word of "tclsh8.3", so it can be a program name with args.
+- if test "x$TCLSH" = "x"; then
+- # Extract the first word of "tclsh8.3", so it can be a program name with args.
-set dummy tclsh8.3; ac_word=$2
-echo "$as_me:$LINENO: checking for $ac_word" >&5
-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
@@ -113,8 +125,8 @@ $NetBSD: patch-ac,v 1.9 2004/04/17 16:56:10 seb Exp $
-echo "${ECHO_T}no" >&6
-fi
-
-- if test "x$TCLSH" = "x"; then
-- # Extract the first word of "tclsh", so it can be a program name with args.
+- if test "x$TCLSH" = "x"; then
+- # Extract the first word of "tclsh", so it can be a program name with args.
-set dummy tclsh; ac_word=$2
-echo "$as_me:$LINENO: checking for $ac_word" >&5
-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
@@ -153,60 +165,88 @@ $NetBSD: patch-ac,v 1.9 2004/04/17 16:56:10 seb Exp $
-echo "${ECHO_T}no" >&6
-fi
-
-- fi
-- fi
+- fi
+- fi
-fi
--TCL_VERSION_FOUND=`echo 'puts [info tclversion]' | $TCLSH`
-
--# can't assume ksh on all architectures
--# TCLSH_EXEC_PREFIX=${TCLSH%%/bin/tclsh.*}
--TCLSH_EXEC_PREFIX=`echo $TCLSH|sed -e 's%/bin/tclsh.*$%%'`
--
--if test -f ${TCLSH_EXEC_PREFIX}/include/tcl${TCL_VERSION_FOUND}/tcl.h; then
-- TCL_INCLUDES="-I${TCLSH_EXEC_PREFIX}/include/tcl${TCL_VERSION_FOUND} -I${TCLSH_EXEC_PREFIX}/include/tcl${TCL_VERSION_FOUND}/generic"
--else
--if test "x${TCLSH_EXEC_PREFIX}" != "x/usr" -a -f ${TCLSH_EXEC_PREFIX}/include/tcl.h; then
-- TCL_INCLUDES=-I${TCLSH_EXEC_PREFIX}/include
--fi
--fi
--if test "x$TCL_INCLUDES" != "x" ; then
-- echo "$as_me:$LINENO: result: using tcl headers from $TCL_INCLUDES" >&5
--echo "${ECHO_T}using tcl headers from $TCL_INCLUDES" >&6
+-if test "x$TCLSH" = "x"; then
+- { echo "$as_me:$LINENO: WARNING: Unable to find a tclsh. The Tcl packages will not be built" >&5
+-echo "$as_me: WARNING: Unable to find a tclsh. The Tcl packages will not be built" >&2;}
+- HAVE_TCL=0
-fi
-
+-if test "$HAVE_TCL" = "1"; then
+- TCL_VERSION_FOUND=`echo 'puts [info tclversion]' | $TCLSH`
-
--# Some systems don't have Tcl. Don't build
--# the Tcl products if we don't have the library.
--if test -f ${TCLSH_EXEC_PREFIX}/lib/tcl${TCL_VERSION_FOUND}/tclConfig.sh; then
-- TCLCONFIG=${TCLSH_EXEC_PREFIX}/lib/tcl${TCL_VERSION_FOUND}/tclConfig.sh
--else
--if test -f ${TCLSH_EXEC_PREFIX}/lib/tclConfig.sh; then
-- TCLCONFIG=${TCLSH_EXEC_PREFIX}/lib/tclConfig.sh
--fi
+- # can't assume ksh on all architectures
+- # TCLSH_EXEC_PREFIX=${TCLSH%%/bin/tclsh.*}
+- # so use sed instead
+- TCLSH_EXEC_PREFIX=`echo $TCLSH|sed -e 's%/bin/tclsh.*$%%'`
+-
+- if test -f ${TCLSH_EXEC_PREFIX}/include/tcl${TCL_VERSION_FOUND}/tcl.h; then
+- TCL_INCLUDES="-I${TCLSH_EXEC_PREFIX}/include/tcl${TCL_VERSION_FOUND} -I${TCLSH_EXEC_PREFIX}/include/tcl${TCL_VERSION_FOUND}/generic"
+- else
+- if test "x${TCLSH_EXEC_PREFIX}" != "x/usr" -a -f ${TCLSH_EXEC_PREFIX}/include/tcl.h; then
+- TCL_INCLUDES=-I${TCLSH_EXEC_PREFIX}/include
+- fi
+- fi
+- if test "x$TCL_INCLUDES" != "x" ; then
+- echo "$as_me:$LINENO: result: using tcl headers from $TCL_INCLUDES" >&5
+-echo "${ECHO_T}using tcl headers from $TCL_INCLUDES" >&6
+- fi
+-
+- save_CPPFLAGS=$CPPFLAGS
+- CPPFLAGS="$CPPFLAGS $TCL_INCLUDES"
+ if test "${ac_cv_header_tcl_h+set}" = set; then
+ echo "$as_me:$LINENO: checking for tcl.h" >&5
+ echo $ECHO_N "checking for tcl.h... $ECHO_C" >&6
+@@ -20660,30 +20505,6 @@ echo "$as_me: WARNING: Unable to find he
+ fi
+
+
+- CPPFLAGS=$save_CPPFLAGS
-fi
-
- if test "x$TCLCONFIG" != "x"; then
- echo "$as_me:$LINENO: result: using $TCLCONFIG" >&5
- echo "${ECHO_T}using $TCLCONFIG" >&6
- file=${TCLCONFIG}
- . $file
-+ #
-+ TCLSH_EXEC_PREFIX="${TCL_EXEC_PREFIX}"
-+ TCL_INCLUDES="${TCL_INCLUDE_SPEC}"
- # TCL STUBS support is required
- if test "${TCL_SUPPORTS_STUBS}" = "1"; then
- # TCL_SUBDIRS="tclstubs tclhandle gdtclft tcldot tcldgr tcldgl tclpathplan"
-@@ -9212,174 +9058,14 @@ fi
+-if test "$HAVE_TCL" = "1"; then
+- # Some systems don't have Tcl. Don't build
+- # the Tcl products if we don't have the library.
+- if test -f ${TCLSH_EXEC_PREFIX}/lib/tcl${TCL_VERSION_FOUND}/tclConfig.sh; then
+- TCLCONFIG=${TCLSH_EXEC_PREFIX}/lib/tcl${TCL_VERSION_FOUND}/tclConfig.sh
+- else
+- if test -f ${TCLSH_EXEC_PREFIX}/lib/tclConfig.sh; then
+- TCLCONFIG=${TCLSH_EXEC_PREFIX}/lib/tclConfig.sh
+- fi
+- fi
+- if test "x$TCLCONFIG" != "x"; then
+- echo "$as_me:$LINENO: result: using $TCLCONFIG" >&5
+-echo "${ECHO_T}using $TCLCONFIG" >&6
+- file=${TCLCONFIG}
+- . $file
+- else
+- { echo "$as_me:$LINENO: WARNING: Unable to find tclConfig.sh. The Tcl packages will not be built" >&5
+-echo "$as_me: WARNING: Unable to find tclConfig.sh. The Tcl packages will not be built" >&2;}
+- HAVE_TCL=0
+- fi
+-fi
+ if test "$HAVE_TCL" = "1"; then
+ # TCL STUBS support is required
+@@ -20775,169 +20596,9 @@ echo "$as_me: WARNING: No Tcl. The Tk pa
+ fi
+ HAVE_TK=$HAVE_TCL
++. ${TKCONFIG}
++TK_INCLUDES="-I${TK_PREFIX}/include"
+-if test "$HAVE_TK" = "1"; then
+-
-# Check whether --with-wish or --without-wish was given.
-if test "${with_wish+set}" = set; then
- withval="$with_wish"
- WISH=$withval
-fi;
--if test "x$WISH" = "x"; then
-- # Extract the first word of "wish8.4", so it can be a program name with args.
+- if test "x$WISH" = "x"; then
+- # Extract the first word of "wish8.4", so it can be a program name with args.
-set dummy wish8.4; ac_word=$2
-echo "$as_me:$LINENO: checking for $ac_word" >&5
-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
@@ -245,8 +285,8 @@ $NetBSD: patch-ac,v 1.9 2004/04/17 16:56:10 seb Exp $
-echo "${ECHO_T}no" >&6
-fi
-
-- if test "x$WISH" = "x"; then
-- # Extract the first word of "wish8.3", so it can be a program name with args.
+- if test "x$WISH" = "x"; then
+- # Extract the first word of "wish8.3", so it can be a program name with args.
-set dummy wish8.3; ac_word=$2
-echo "$as_me:$LINENO: checking for $ac_word" >&5
-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
@@ -285,8 +325,8 @@ $NetBSD: patch-ac,v 1.9 2004/04/17 16:56:10 seb Exp $
-echo "${ECHO_T}no" >&6
-fi
-
-- if test "x$WISH" = "x"; then
-- # Extract the first word of "wish", so it can be a program name with args.
+- if test "x$WISH" = "x"; then
+- # Extract the first word of "wish", so it can be a program name with args.
-set dummy wish; ac_word=$2
-echo "$as_me:$LINENO: checking for $ac_word" >&5
-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
@@ -325,64 +365,77 @@ $NetBSD: patch-ac,v 1.9 2004/04/17 16:56:10 seb Exp $
-echo "${ECHO_T}no" >&6
-fi
-
-- fi
-- fi
+- fi
+- fi
+- fi
+- if test "x$WISH" = "x"; then
+- { echo "$as_me:$LINENO: WARNING: Unable to find a wish. The Tk packages will not be built" >&5
+-echo "$as_me: WARNING: Unable to find a wish. The Tk packages will not be built" >&2;}
+- HAVE_TK=0
+- fi
-fi
-
+-if test "$HAVE_TK" = "1"; then
+- #TK_VERSION_FOUND=`echo 'puts [[info tkversion]]' | $WISH`
+- #
+- # No such var as tkversion. Use tclversion instead.
+- TK_VERSION_FOUND=${TCL_VERSION_FOUND}
-
--#TK_VERSION_FOUND=`echo 'puts [[info tkversion]]' | $WISH`
--#
--# No such var as tkversion. Use tclversion instead.
--TK_VERSION_FOUND=${TCL_VERSION_FOUND}
--
--# can't assume ksh on all architectures
--# WISH_EXEC_PREFIX=${WISH%%/bin/tclsh.*}
--WISH_EXEC_PREFIX=`echo $WISH|sed -e 's%/bin/wish.*$%%'`
+- # can't assume ksh on all architectures
+- # WISH_EXEC_PREFIX=${WISH%%/bin/tclsh.*}
+- # so use sed instead
+- WISH_EXEC_PREFIX=`echo $WISH|sed -e 's%/bin/wish.*$%%'`
-
--if test -f ${WISH_EXEC_PREFIX}/include/tk${TK_VERSION_FOUND}/tk.h; then
+- if test -f ${WISH_EXEC_PREFIX}/include/tk${TK_VERSION_FOUND}/tk.h; then
- TK_INCLUDES="-I${WISH_EXEC_PREFIX}/include/tk${TK_VERSION_FOUND} -I${WISH_EXEC_PREFIX}/include/tk${TK_VERSION_FOUND}/generic"
--else
--if test "x${WISH_EXEC_PREFIX}" != "x/usr" -a -f ${WISH_EXEC_PREFIX}/include/tk.h; then
-- TK_INCLUDES=-I${WISH_EXEC_PREFIX}/include
--fi
--fi
--if test "x$TK_INCLUDES" != "x" ; then
+- else
+- if test "x${WISH_EXEC_PREFIX}" != "x/usr" -a -f ${WISH_EXEC_PREFIX}/include/tk.h; then
+- TK_INCLUDES=-I${WISH_EXEC_PREFIX}/include
+- fi
+- fi
+- if test "x$TK_INCLUDES" != "x" ; then
- echo "$as_me:$LINENO: result: using tk headers from $TK_INCLUDES" >&5
-echo "${ECHO_T}using tk headers from $TK_INCLUDES" >&6
--fi
+- fi
-
--
--# Some systems don't have Tcl. Don't build
--# Some systems have Tcl, but not TK. Don't build
--# the Tk products if we don't have the library.
--if test -f ${WISH_EXEC_PREFIX}/lib/tk${TK_VERSION_FOUND}/tkConfig.sh; then
-- TKCONFIG=${WISH_EXEC_PREFIX}/lib/tk${TK_VERSION_FOUND}/tkConfig.sh
--else
--if test -f ${WISH_EXEC_PREFIX}/lib/tkConfig.sh; then
-- TKCONFIG=${WISH_EXEC_PREFIX}/lib/tkConfig.sh
--fi
--fi
--
- if test "x$TKCONFIG" != "x"; then
- echo "$as_me:$LINENO: result: using $TKCONFIG" >&5
- echo "${ECHO_T}using $TKCONFIG" >&6
- file=${TKCONFIG}
- . $file
-+ #
-+ WISH_EXEC_PREFIX="${TK_EXEC_PREFIX}"
-+ TK_INCLUDES="-I${TK_PREFIX}/include"
- if test "${TCL_SUPPORTS_STUBS}" = "1"; then
- TK_PKGINDEX="tkspline/pkgIndex.tcl"
- else
-@@ -9434,6 +9120,7 @@ fi
+- save_CPPFLAGS=$CPPFLAGS
+- CPPFLAGS="$CPPFLAGS $TCL_INCLUDES $TK_INCLUDES"
+ if test "${ac_cv_header_tk_h+set}" = set; then
+ echo "$as_me:$LINENO: checking for tk.h" >&5
+ echo $ECHO_N "checking for tk.h... $ECHO_C" >&6
+@@ -21085,31 +20746,6 @@ echo "$as_me: WARNING: Unable to find he
+ fi
+- CPPFLAGS=$save_CPPFLAGS
+-fi
+-
+-if test "$HAVE_TK" = "1"; then
+- # Some systems don't have Tcl. Don't build
+- # Some systems have Tcl, but not TK. Don't build
+- # the Tk products if we don't have the library.
+- if test -f ${WISH_EXEC_PREFIX}/lib/tk${TK_VERSION_FOUND}/tkConfig.sh; then
+- TKCONFIG=${WISH_EXEC_PREFIX}/lib/tk${TK_VERSION_FOUND}/tkConfig.sh
+- else
+- if test -f ${WISH_EXEC_PREFIX}/lib/tkConfig.sh; then
+- TKCONFIG=${WISH_EXEC_PREFIX}/lib/tkConfig.sh
+- fi
+- fi
+- if test "x$TKCONFIG" != "x"; then
+- echo "$as_me:$LINENO: result: using $TKCONFIG" >&5
+-echo "${ECHO_T}using $TKCONFIG" >&6
+- file=${TKCONFIG}
+- . $file
+- else
+- { echo "$as_me:$LINENO: WARNING: Unable to find tkConfig.sh. The Tk packages will not be built" >&5
+-echo "$as_me: WARNING: Unable to find tkConfig.sh. The Tk packages will not be built" >&2;}
+- HAVE_TK=0
+- fi
+-fi
-+
- # Check whether --with-extraincludedir or --without-extraincludedir was given.
- if test "${with_extraincludedir+set}" = set; then
- withval="$with_extraincludedir"
-@@ -13653,36 +13340,12 @@ rm -f conftest.$ac_objext conftest.$ac_e
+ #if test "$HAVE_TK" = "1"; then
+ # # TK STUBS support is required (but support is indicated by TCL_SUPPORTS_STUBS)
+@@ -27946,36 +27582,12 @@ rm -f conftest.err conftest.$ac_objext c
# -----------------------------------
# tclInt.h
@@ -421,37 +474,19 @@ $NetBSD: patch-ac,v 1.9 2004/04/17 16:56:10 seb Exp $
# -----------------------------------
-@@ -14920,8 +14583,6 @@ s,@ENABLE_GVRENDER_TRUE@,$ENABLE_GVRENDE
+@@ -29395,7 +29007,6 @@ s,@ENABLE_GVRENDER_TRUE@,$ENABLE_GVRENDE
s,@ENABLE_GVRENDER_FALSE@,$ENABLE_GVRENDER_FALSE,;t t
s,@ENABLE_CODEGENS_TRUE@,$ENABLE_CODEGENS_TRUE,;t t
s,@ENABLE_CODEGENS_FALSE@,$ENABLE_CODEGENS_FALSE,;t t
-s,@TCLSH@,$TCLSH,;t t
--s,@TCL_INCLUDES@,$TCL_INCLUDES,;t t
+ s,@TCL_INCLUDES@,$TCL_INCLUDES,;t t
+ s,@HAVE_TCL@,$HAVE_TCL,;t t
s,@WITH_TCL_TRUE@,$WITH_TCL_TRUE,;t t
- s,@WITH_TCL_FALSE@,$WITH_TCL_FALSE,;t t
- s,@TCL_PKGINDEX@,$TCL_PKGINDEX,;t t
-@@ -14944,6 +14605,7 @@ s,@TCL_NEEDS_EXP_FILE@,$TCL_NEEDS_EXP_FI
- s,@TCL_EXPORT_FILE_SUFFIX@,$TCL_EXPORT_FILE_SUFFIX,;t t
- s,@TCL_LIBS@,$TCL_LIBS,;t t
- s,@TCL_PREFIX@,$TCL_PREFIX,;t t
-+s,@TCL_INCLUDES@,$TCL_INCLUDES,;t t
- s,@TCL_EXEC_PREFIX@,$TCL_EXEC_PREFIX,;t t
- s,@TCL_SHLIB_CFLAGS@,$TCL_SHLIB_CFLAGS,;t t
- s,@TCL_SHLIB_CXXFLAGS@,$TCL_SHLIB_CXXFLAGS,;t t
-@@ -14971,8 +14633,6 @@ s,@TCL_BUILD_STUB_LIB_SPEC@,$TCL_BUILD_S
+@@ -29410,7 +29021,6 @@ s,@TCL_DEFS@,$TCL_DEFS,;t t
+ s,@TCL_SHLIB_SUFFIX@,$TCL_SHLIB_SUFFIX,;t t
+ s,@TCL_SRC_DIR@,$TCL_SRC_DIR,;t t
s,@TCL_STUB_LIB_SPEC@,$TCL_STUB_LIB_SPEC,;t t
- s,@TCL_BUILD_STUB_LIB_PATH@,$TCL_BUILD_STUB_LIB_PATH,;t t
- s,@TCL_STUB_LIB_PATH@,$TCL_STUB_LIB_PATH,;t t
-s,@WISH@,$WISH,;t t
--s,@TK_INCLUDES@,$TK_INCLUDES,;t t
+ s,@TK_INCLUDES@,$TK_INCLUDES,;t t
+ s,@HAVE_TK@,$HAVE_TK,;t t
s,@WITH_TK_TRUE@,$WITH_TK_TRUE,;t t
- s,@WITH_TK_FALSE@,$WITH_TK_FALSE,;t t
- s,@TK_PKGINDEX@,$TK_PKGINDEX,;t t
-@@ -14999,6 +14659,7 @@ s,@TK_BUILD_STUB_LIB_SPEC@,$TK_BUILD_STU
- s,@TK_STUB_LIB_SPEC@,$TK_STUB_LIB_SPEC,;t t
- s,@TK_BUILD_STUB_LIB_PATH@,$TK_BUILD_STUB_LIB_PATH,;t t
- s,@TK_STUB_LIB_PATH@,$TK_STUB_LIB_PATH,;t t
-+s,@TK_INCLUDES@,$TK_INCLUDES,;t t
- s,@SOCKET_LIBS@,$SOCKET_LIBS,;t t
- s,@X_CFLAGS@,$X_CFLAGS,;t t
- s,@X_PRE_LIBS@,$X_PRE_LIBS,;t t
diff --git a/graphics/graphviz/patches/patch-ad b/graphics/graphviz/patches/patch-ad
index 6cec1e7ad3b..73c039d52fd 100644
--- a/graphics/graphviz/patches/patch-ad
+++ b/graphics/graphviz/patches/patch-ad
@@ -1,13 +1,21 @@
-$NetBSD: patch-ad,v 1.5 2004/04/17 16:56:10 seb Exp $
+$NetBSD: patch-ad,v 1.6 2004/11/29 22:11:51 seb Exp $
---- gdtclft/Makefile.am.orig 2004-02-27 13:01:47.000000000 +0000
-+++ gdtclft/Makefile.am
-@@ -22,7 +22,7 @@ libgdtclft_la_SOURCES = gdtclft.c
- libgdtclft_la_LIBADD = \
- $(top_builddir)/tclhandle/libtclhandle.la \
- $(top_builddir)/gd/libgdconvenience.la \
-- $(top_builddir)/tclstubs/libtclstubs.la
-+ ${TCL_STUB_LIB_SPEC}
+--- agraph/Makefile.am.orig 2004-07-26 16:52:05.000000000 +0000
++++ agraph/Makefile.am
+@@ -1,7 +1,6 @@
+ ## Process this file with automake to produce Makefile.in
- all-local: pkgIndex.tcl
+-pdfdir = $(pkgdatadir)/doc/pdf
+-pkgconfigdir = $(pkglibdir)/pkgconfig
++pkgconfigdir = $(libdir)/pkgconfig
+ pdf = agraph.pdf
+ man = agraph.3
+@@ -14,7 +13,6 @@ pkginclude_HEADERS = aghdr.h agraph.h ma
+ pkglib_LTLIBRARIES = libagraph.la
+ pkgconfig_DATA = libagraph.pc
+ man_MANS = $(man)
+-pdf_DATA = $(pdf)
+
+ libagraph_la_SOURCES = agerror.c apply.c attr.c \
+ edge.c flatten.c grammar.y graph.c id.c imap.c io.c \
diff --git a/graphics/graphviz/patches/patch-ae b/graphics/graphviz/patches/patch-ae
index e202ad785ef..81d03d2ae8b 100644
--- a/graphics/graphviz/patches/patch-ae
+++ b/graphics/graphviz/patches/patch-ae
@@ -1,39 +1,135 @@
-$NetBSD: patch-ae,v 1.7 2004/04/17 16:56:10 seb Exp $
+$NetBSD: patch-ae,v 1.8 2004/11/29 22:11:51 seb Exp $
---- gdtclft/Makefile.in.orig 2004-04-17 13:41:29.000000000 +0000
-+++ gdtclft/Makefile.in
-@@ -104,7 +104,6 @@ SOCKET_LIBS = @SOCKET_LIBS@
+--- agraph/Makefile.in.orig 2004-09-14 22:12:57.000000000 +0000
++++ agraph/Makefile.in
+@@ -59,8 +59,7 @@ am__vpath_adj = case $$p in \
+ esac;
+ am__strip_dir = `echo $$p | sed -e 's|^.*/||'`;
+ am__installdirs = "$(DESTDIR)$(pkglibdir)" "$(DESTDIR)$(man3dir)" \
+- "$(DESTDIR)$(pdfdir)" "$(DESTDIR)$(pkgconfigdir)" \
+- "$(DESTDIR)$(pkgincludedir)"
++ "$(DESTDIR)$(pkgconfigdir)" "$(DESTDIR)$(pkgincludedir)"
+ pkglibLTLIBRARIES_INSTALL = $(INSTALL)
+ LTLIBRARIES = $(pkglib_LTLIBRARIES)
+ libagraph_la_LIBADD =
+@@ -90,9 +89,8 @@ DIST_SOURCES = $(libagraph_la_SOURCES)
+ man3dir = $(mandir)/man3
+ NROFF = nroff
+ MANS = $(man_MANS)
+-pdfDATA_INSTALL = $(INSTALL_DATA)
+ pkgconfigDATA_INSTALL = $(INSTALL_DATA)
+-DATA = $(pdf_DATA) $(pkgconfig_DATA)
++DATA = $(pkgconfig_DATA)
+ pkgincludeHEADERS_INSTALL = $(INSTALL_HEADER)
+ HEADERS = $(pkginclude_HEADERS)
+ ETAGS = etags
+@@ -197,7 +195,6 @@ SOCKET_LIBS = @SOCKET_LIBS@
SORT = @SORT@
STRIP = @STRIP@
TCLINT_INCLUDES = @TCLINT_INCLUDES@
-TCLSH = @TCLSH@
- TCLSH_EXEC_PREFIX = @TCLSH_EXEC_PREFIX@
- TCL_BUILD_LIB_SPEC = @TCL_BUILD_LIB_SPEC@
- TCL_BUILD_STUB_LIB_PATH = @TCL_BUILD_STUB_LIB_PATH@
-@@ -181,7 +180,6 @@ TK_XINCLUDES = @TK_XINCLUDES@
- TK_XLIBSW = @TK_XLIBSW@
+ TCL_CFLAGS = @TCL_CFLAGS@
+ TCL_DEFS = @TCL_DEFS@
+ TCL_INCLUDES = @TCL_INCLUDES@
+@@ -223,7 +220,6 @@ TK_VERSION = @TK_VERSION@
+ TK_XINCLUDES = @TK_XINCLUDES@
TOP_DIR = @TOP_DIR@
VERSION = @VERSION@
-WISH = @WISH@
- XAW_INCLUDES = @XAW_INCLUDES@
- XAW_LIBS = @XAW_LIBS@
- XPM_INCLUDES = @XPM_INCLUDES@
-@@ -218,7 +216,7 @@ libgdtclft_la_SOURCES = gdtclft.c
- libgdtclft_la_LIBADD = \
- $(top_builddir)/tclhandle/libtclhandle.la \
- $(top_builddir)/gd/libgdconvenience.la \
-- $(top_builddir)/tclstubs/libtclstubs.la
-+ ${TCL_STUB_LIB_SPEC}
-
-
- CLEANFILES = pkgIndex.tcl
-@@ -232,8 +230,7 @@ LTLIBRARIES = $(pkglib_LTLIBRARIES)
-
- libgdtclft_la_LDFLAGS =
- libgdtclft_la_DEPENDENCIES = $(top_builddir)/tclhandle/libtclhandle.la \
-- $(top_builddir)/gd/libgdconvenience.la \
-- $(top_builddir)/tclstubs/libtclstubs.la
-+ $(top_builddir)/gd/libgdconvenience.la
- am_libgdtclft_la_OBJECTS = gdtclft.lo
- libgdtclft_la_OBJECTS = $(am_libgdtclft_la_OBJECTS)
+ WITH_MYLIBGD_FALSE = @WITH_MYLIBGD_FALSE@
+ WITH_MYLIBGD_TRUE = @WITH_MYLIBGD_TRUE@
+ WITH_TCL_FALSE = @WITH_TCL_FALSE@
+@@ -290,8 +286,7 @@ target_alias = @target_alias@
+ target_cpu = @target_cpu@
+ target_os = @target_os@
+ target_vendor = @target_vendor@
+-pdfdir = $(pkgdatadir)/doc/pdf
+-pkgconfigdir = $(pkglibdir)/pkgconfig
++pkgconfigdir = $(libdir)/pkgconfig
+ pdf = agraph.pdf
+ man = agraph.3
+ AM_CPPFLAGS = \
+@@ -302,7 +297,6 @@ pkginclude_HEADERS = aghdr.h agraph.h ma
+ pkglib_LTLIBRARIES = libagraph.la
+ pkgconfig_DATA = libagraph.pc
+ man_MANS = $(man)
+-pdf_DATA = $(pdf)
+ libagraph_la_SOURCES = agerror.c apply.c attr.c \
+ edge.c flatten.c grammar.y graph.c id.c imap.c io.c \
+ mem.c node.c obj.c pend.c rec.c refstr.c scan.l subg.c \
+@@ -505,23 +499,6 @@ uninstall-man3:
+ echo " rm -f '$(DESTDIR)$(man3dir)/$$inst'"; \
+ rm -f "$(DESTDIR)$(man3dir)/$$inst"; \
+ done
+-install-pdfDATA: $(pdf_DATA)
+- @$(NORMAL_INSTALL)
+- test -z "$(pdfdir)" || $(mkdir_p) "$(DESTDIR)$(pdfdir)"
+- @list='$(pdf_DATA)'; for p in $$list; do \
+- if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
+- f=$(am__strip_dir) \
+- echo " $(pdfDATA_INSTALL) '$$d$$p' '$(DESTDIR)$(pdfdir)/$$f'"; \
+- $(pdfDATA_INSTALL) "$$d$$p" "$(DESTDIR)$(pdfdir)/$$f"; \
+- done
+-
+-uninstall-pdfDATA:
+- @$(NORMAL_UNINSTALL)
+- @list='$(pdf_DATA)'; for p in $$list; do \
+- f=$(am__strip_dir) \
+- echo " rm -f '$(DESTDIR)$(pdfdir)/$$f'"; \
+- rm -f "$(DESTDIR)$(pdfdir)/$$f"; \
+- done
+ install-pkgconfigDATA: $(pkgconfig_DATA)
+ @$(NORMAL_INSTALL)
+ test -z "$(pkgconfigdir)" || $(mkdir_p) "$(DESTDIR)$(pkgconfigdir)"
+@@ -636,7 +613,7 @@ check-am: all-am
+ check: check-am
+ all-am: Makefile $(LTLIBRARIES) $(MANS) $(DATA) $(HEADERS)
+ installdirs:
+- for dir in "$(DESTDIR)$(pkglibdir)" "$(DESTDIR)$(man3dir)" "$(DESTDIR)$(pdfdir)" "$(DESTDIR)$(pkgconfigdir)" "$(DESTDIR)$(pkgincludedir)"; do \
++ for dir in "$(DESTDIR)$(pkglibdir)" "$(DESTDIR)$(man3dir)" "$(DESTDIR)$(pkgconfigdir)" "$(DESTDIR)$(pkgincludedir)"; do \
+ test -z "$$dir" || $(mkdir_p) "$$dir"; \
+ done
+ install: install-am
+@@ -687,7 +664,7 @@ info: info-am
+
+ info-am:
+
+-install-data-am: install-man install-pdfDATA install-pkgconfigDATA \
++install-data-am: install-man install-pkgconfigDATA \
+ install-pkgincludeHEADERS
+
+ install-exec-am: install-pkglibLTLIBRARIES
+@@ -716,9 +693,8 @@ ps: ps-am
+
+ ps-am:
+
+-uninstall-am: uninstall-info-am uninstall-man uninstall-pdfDATA \
+- uninstall-pkgconfigDATA uninstall-pkgincludeHEADERS \
+- uninstall-pkglibLTLIBRARIES
++uninstall-am: uninstall-info-am uninstall-man uninstall-pkgconfigDATA \
++ uninstall-pkgincludeHEADERS uninstall-pkglibLTLIBRARIES
+
+ uninstall-man: uninstall-man3
+
+@@ -728,14 +704,13 @@ uninstall-man: uninstall-man3
+ distclean-tags distdir dvi dvi-am html html-am info info-am \
+ install install-am install-data install-data-am install-exec \
+ install-exec-am install-info install-info-am install-man \
+- install-man3 install-pdfDATA install-pkgconfigDATA \
+- install-pkgincludeHEADERS install-pkglibLTLIBRARIES \
+- install-strip installcheck installcheck-am installdirs \
+- maintainer-clean maintainer-clean-generic mostlyclean \
+- mostlyclean-compile mostlyclean-generic mostlyclean-libtool \
+- pdf pdf-am ps ps-am tags uninstall uninstall-am \
+- uninstall-info-am uninstall-man uninstall-man3 \
+- uninstall-pdfDATA uninstall-pkgconfigDATA \
++ install-man3 install-pkgconfigDATA install-pkgincludeHEADERS \
++ install-pkglibLTLIBRARIES install-strip installcheck \
++ installcheck-am installdirs maintainer-clean \
++ maintainer-clean-generic mostlyclean mostlyclean-compile \
++ mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \
++ tags uninstall uninstall-am uninstall-info-am uninstall-man \
++ uninstall-man3 uninstall-pkgconfigDATA \
+ uninstall-pkgincludeHEADERS uninstall-pkglibLTLIBRARIES
+
diff --git a/graphics/graphviz/patches/patch-af b/graphics/graphviz/patches/patch-af
index 3c5e5e678c0..ff4bd45d684 100644
--- a/graphics/graphviz/patches/patch-af
+++ b/graphics/graphviz/patches/patch-af
@@ -1,13 +1,12 @@
-$NetBSD: patch-af,v 1.4 2004/04/17 16:56:10 seb Exp $
+$NetBSD: patch-af,v 1.5 2004/11/29 22:11:51 seb Exp $
---- gdtclft/demo/Makefile.am.orig 2003-09-09 10:15:24.000000000 +0000
+--- gdtclft/demo/Makefile.am.orig 2004-07-26 16:52:10.000000000 +0000
+++ gdtclft/demo/Makefile.am
-@@ -2,7 +2,7 @@
-
- AUTOMAKE_OPTIONS = 1.4
+@@ -1,6 +1,6 @@
+ ## Process this file with automake to produce Makefile.in
-demodir = $(datadir)/@PACKAGE@/demo
+demodir = $(prefix)/share/examples/@PACKAGE@
+
+ if WITH_TCL
demo_SCRIPTS = entities
- demo_DATA = entities.README entities.html
- EXTRA_DIST = $(demo_SCRIPTS) $(demo_DATA)
diff --git a/graphics/graphviz/patches/patch-ag b/graphics/graphviz/patches/patch-ag
index 83e063368fb..a8e398d1166 100644
--- a/graphics/graphviz/patches/patch-ag
+++ b/graphics/graphviz/patches/patch-ag
@@ -1,29 +1,29 @@
-$NetBSD: patch-ag,v 1.6 2004/04/17 16:56:10 seb Exp $
+$NetBSD: patch-ag,v 1.7 2004/11/29 22:11:51 seb Exp $
---- gdtclft/demo/Makefile.in.orig 2004-03-02 00:20:38.000000000 +0000
+--- gdtclft/demo/Makefile.in.orig 2004-09-14 22:13:16.000000000 +0000
+++ gdtclft/demo/Makefile.in
-@@ -104,7 +104,6 @@ SOCKET_LIBS = @SOCKET_LIBS@
+@@ -160,7 +160,6 @@ SOCKET_LIBS = @SOCKET_LIBS@
SORT = @SORT@
STRIP = @STRIP@
TCLINT_INCLUDES = @TCLINT_INCLUDES@
-TCLSH = @TCLSH@
- TCLSH_EXEC_PREFIX = @TCLSH_EXEC_PREFIX@
- TCL_BUILD_LIB_SPEC = @TCL_BUILD_LIB_SPEC@
- TCL_BUILD_STUB_LIB_PATH = @TCL_BUILD_STUB_LIB_PATH@
-@@ -181,7 +180,6 @@ TK_XINCLUDES = @TK_XINCLUDES@
- TK_XLIBSW = @TK_XLIBSW@
+ TCL_CFLAGS = @TCL_CFLAGS@
+ TCL_DEFS = @TCL_DEFS@
+ TCL_INCLUDES = @TCL_INCLUDES@
+@@ -186,7 +185,6 @@ TK_VERSION = @TK_VERSION@
+ TK_XINCLUDES = @TK_XINCLUDES@
TOP_DIR = @TOP_DIR@
VERSION = @VERSION@
-WISH = @WISH@
- XAW_INCLUDES = @XAW_INCLUDES@
- XAW_LIBS = @XAW_LIBS@
- XPM_INCLUDES = @XPM_INCLUDES@
-@@ -199,7 +197,7 @@ install_sh = @install_sh@
-
- AUTOMAKE_OPTIONS = 1.4
-
+ WITH_MYLIBGD_FALSE = @WITH_MYLIBGD_FALSE@
+ WITH_MYLIBGD_TRUE = @WITH_MYLIBGD_TRUE@
+ WITH_TCL_FALSE = @WITH_TCL_FALSE@
+@@ -253,7 +251,7 @@ target_alias = @target_alias@
+ target_cpu = @target_cpu@
+ target_os = @target_os@
+ target_vendor = @target_vendor@
-demodir = $(datadir)/@PACKAGE@/demo
+demodir = $(prefix)/share/examples/@PACKAGE@
- demo_SCRIPTS = entities
- demo_DATA = entities.README entities.html
- EXTRA_DIST = $(demo_SCRIPTS) $(demo_DATA)
+ @WITH_TCL_TRUE@demo_SCRIPTS = entities
+ @WITH_TCL_TRUE@demo_DATA = entities.README entities.html
+ EXTRA_DIST = entities entities.README entities.html
diff --git a/graphics/graphviz/patches/patch-ah b/graphics/graphviz/patches/patch-ah
index 4df60b3edf6..f34943a8210 100644
--- a/graphics/graphviz/patches/patch-ah
+++ b/graphics/graphviz/patches/patch-ah
@@ -1,13 +1,22 @@
-$NetBSD: patch-ah,v 1.5 2004/04/17 16:56:10 seb Exp $
+$NetBSD: patch-ah,v 1.6 2004/11/29 22:11:51 seb Exp $
---- tcldot/Makefile.am.orig 2004-02-27 13:01:48.000000000 +0000
-+++ tcldot/Makefile.am
-@@ -46,7 +46,7 @@ libtcldot_la_LIBADD = \
- $(top_builddir)/cdt/libcdtconvenience.la \
- $(top_builddir)/gd/libgdconvenience.la \
- $(top_builddir)/gdtclft/gdtclft.lo \
-- $(top_builddir)/tclstubs/libtclstubs.la
-+ ${TCL_STUB_LIB_SPEC}
+--- cdt/Makefile.am.orig 2004-07-26 16:52:06.000000000 +0000
++++ cdt/Makefile.am
+@@ -1,8 +1,7 @@
+ ## Process this file with automake to produce Makefile.in
- all-local: pkgIndex.tcl
+-pdfdir = $(pkgdatadir)/doc/pdf
+ pkgextraincludedir = $(pkgincludedir)
+-pkgconfigdir = $(pkglibdir)/pkgconfig
++pkgconfigdir = $(libdir)/pkgconfig
+
+ man = cdt.3
+ pdf = cdt.pdf
+@@ -12,7 +11,6 @@ AM_CPPFLAGS = -I$(top_srcdir)
+ pkginclude_HEADERS = cdt.h dthdr.h
+ pkglib_LTLIBRARIES = libcdt.la
+ man_MANS = $(man)
+-pdf_DATA = $(pdf)
+ pkgextrainclude_DATA = $(top_builddir)/ast_common.h
+ pkgconfig_DATA = libcdt.pc
diff --git a/graphics/graphviz/patches/patch-ai b/graphics/graphviz/patches/patch-ai
index 7e847bc98e1..86c77c9f1ee 100644
--- a/graphics/graphviz/patches/patch-ai
+++ b/graphics/graphviz/patches/patch-ai
@@ -1,39 +1,142 @@
-$NetBSD: patch-ai,v 1.7 2004/04/17 16:56:10 seb Exp $
+$NetBSD: patch-ai,v 1.8 2004/11/29 22:11:51 seb Exp $
---- tcldot/Makefile.in.orig 2004-04-17 13:42:01.000000000 +0000
-+++ tcldot/Makefile.in
-@@ -104,7 +104,6 @@ SOCKET_LIBS = @SOCKET_LIBS@
+--- cdt/Makefile.in.orig 2004-09-14 22:12:59.000000000 +0000
++++ cdt/Makefile.in
+@@ -58,8 +58,8 @@ am__vpath_adj = case $$p in \
+ esac;
+ am__strip_dir = `echo $$p | sed -e 's|^.*/||'`;
+ am__installdirs = "$(DESTDIR)$(pkglibdir)" "$(DESTDIR)$(man3dir)" \
+- "$(DESTDIR)$(pdfdir)" "$(DESTDIR)$(pkgconfigdir)" \
+- "$(DESTDIR)$(pkgextraincludedir)" "$(DESTDIR)$(pkgincludedir)"
++ "$(DESTDIR)$(pkgconfigdir)" "$(DESTDIR)$(pkgextraincludedir)" \
++ "$(DESTDIR)$(pkgincludedir)"
+ pkglibLTLIBRARIES_INSTALL = $(INSTALL)
+ LTLIBRARIES = $(pkglib_LTLIBRARIES)
+ libcdt_la_LIBADD =
+@@ -84,10 +84,9 @@ DIST_SOURCES = $(libcdt_la_SOURCES)
+ man3dir = $(mandir)/man3
+ NROFF = nroff
+ MANS = $(man_MANS)
+-pdfDATA_INSTALL = $(INSTALL_DATA)
+ pkgconfigDATA_INSTALL = $(INSTALL_DATA)
+ pkgextraincludeDATA_INSTALL = $(INSTALL_DATA)
+-DATA = $(pdf_DATA) $(pkgconfig_DATA) $(pkgextrainclude_DATA)
++DATA = $(pkgconfig_DATA) $(pkgextrainclude_DATA)
+ pkgincludeHEADERS_INSTALL = $(INSTALL_HEADER)
+ HEADERS = $(pkginclude_HEADERS)
+ ETAGS = etags
+@@ -192,7 +191,6 @@ SOCKET_LIBS = @SOCKET_LIBS@
SORT = @SORT@
STRIP = @STRIP@
TCLINT_INCLUDES = @TCLINT_INCLUDES@
-TCLSH = @TCLSH@
- TCLSH_EXEC_PREFIX = @TCLSH_EXEC_PREFIX@
- TCL_BUILD_LIB_SPEC = @TCL_BUILD_LIB_SPEC@
- TCL_BUILD_STUB_LIB_PATH = @TCL_BUILD_STUB_LIB_PATH@
-@@ -181,7 +180,6 @@ TK_XINCLUDES = @TK_XINCLUDES@
- TK_XLIBSW = @TK_XLIBSW@
+ TCL_CFLAGS = @TCL_CFLAGS@
+ TCL_DEFS = @TCL_DEFS@
+ TCL_INCLUDES = @TCL_INCLUDES@
+@@ -218,7 +216,6 @@ TK_VERSION = @TK_VERSION@
+ TK_XINCLUDES = @TK_XINCLUDES@
TOP_DIR = @TOP_DIR@
VERSION = @VERSION@
-WISH = @WISH@
- XAW_INCLUDES = @XAW_INCLUDES@
- XAW_LIBS = @XAW_LIBS@
- XPM_INCLUDES = @XPM_INCLUDES@
-@@ -242,7 +240,7 @@ libtcldot_la_LIBADD = \
- $(top_builddir)/cdt/libcdtconvenience.la \
- $(top_builddir)/gd/libgdconvenience.la \
- $(top_builddir)/gdtclft/gdtclft.lo \
-- $(top_builddir)/tclstubs/libtclstubs.la
-+ ${TCL_STUB_LIB_SPEC}
-
-
- CLEANFILES = pkgIndex.tcl
-@@ -270,8 +268,7 @@ libtcldot_la_DEPENDENCIES = $(top_buildd
- $(top_builddir)/graph/libgraphconvenience.la \
- $(top_builddir)/cdt/libcdtconvenience.la \
- $(top_builddir)/gd/libgdconvenience.la \
-- $(top_builddir)/gdtclft/gdtclft.lo \
-- $(top_builddir)/tclstubs/libtclstubs.la
-+ $(top_builddir)/gdtclft/gdtclft.lo
- am_libtcldot_la_OBJECTS = tcldot.lo tkgen.lo
- libtcldot_la_OBJECTS = $(am_libtcldot_la_OBJECTS)
+ WITH_MYLIBGD_FALSE = @WITH_MYLIBGD_FALSE@
+ WITH_MYLIBGD_TRUE = @WITH_MYLIBGD_TRUE@
+ WITH_TCL_FALSE = @WITH_TCL_FALSE@
+@@ -285,16 +282,14 @@ target_alias = @target_alias@
+ target_cpu = @target_cpu@
+ target_os = @target_os@
+ target_vendor = @target_vendor@
+-pdfdir = $(pkgdatadir)/doc/pdf
+ pkgextraincludedir = $(pkgincludedir)
+-pkgconfigdir = $(pkglibdir)/pkgconfig
++pkgconfigdir = $(libdir)/pkgconfig
+ man = cdt.3
+ pdf = cdt.pdf
+ AM_CPPFLAGS = -I$(top_srcdir)
+ pkginclude_HEADERS = cdt.h dthdr.h
+ pkglib_LTLIBRARIES = libcdt.la
+ man_MANS = $(man)
+-pdf_DATA = $(pdf)
+ pkgextrainclude_DATA = $(top_builddir)/ast_common.h
+ pkgconfig_DATA = libcdt.pc
+ libcdt_la_SOURCES = dtclose.c dtdisc.c dtextract.c dtflatten.c \
+@@ -466,23 +461,6 @@ uninstall-man3:
+ echo " rm -f '$(DESTDIR)$(man3dir)/$$inst'"; \
+ rm -f "$(DESTDIR)$(man3dir)/$$inst"; \
+ done
+-install-pdfDATA: $(pdf_DATA)
+- @$(NORMAL_INSTALL)
+- test -z "$(pdfdir)" || $(mkdir_p) "$(DESTDIR)$(pdfdir)"
+- @list='$(pdf_DATA)'; for p in $$list; do \
+- if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
+- f=$(am__strip_dir) \
+- echo " $(pdfDATA_INSTALL) '$$d$$p' '$(DESTDIR)$(pdfdir)/$$f'"; \
+- $(pdfDATA_INSTALL) "$$d$$p" "$(DESTDIR)$(pdfdir)/$$f"; \
+- done
+-
+-uninstall-pdfDATA:
+- @$(NORMAL_UNINSTALL)
+- @list='$(pdf_DATA)'; for p in $$list; do \
+- f=$(am__strip_dir) \
+- echo " rm -f '$(DESTDIR)$(pdfdir)/$$f'"; \
+- rm -f "$(DESTDIR)$(pdfdir)/$$f"; \
+- done
+ install-pkgconfigDATA: $(pkgconfig_DATA)
+ @$(NORMAL_INSTALL)
+ test -z "$(pkgconfigdir)" || $(mkdir_p) "$(DESTDIR)$(pkgconfigdir)"
+@@ -614,7 +592,7 @@ check-am: all-am
+ check: check-am
+ all-am: Makefile $(LTLIBRARIES) $(MANS) $(DATA) $(HEADERS)
+ installdirs:
+- for dir in "$(DESTDIR)$(pkglibdir)" "$(DESTDIR)$(man3dir)" "$(DESTDIR)$(pdfdir)" "$(DESTDIR)$(pkgconfigdir)" "$(DESTDIR)$(pkgextraincludedir)" "$(DESTDIR)$(pkgincludedir)"; do \
++ for dir in "$(DESTDIR)$(pkglibdir)" "$(DESTDIR)$(man3dir)" "$(DESTDIR)$(pkgconfigdir)" "$(DESTDIR)$(pkgextraincludedir)" "$(DESTDIR)$(pkgincludedir)"; do \
+ test -z "$$dir" || $(mkdir_p) "$$dir"; \
+ done
+ install: install-am
+@@ -663,7 +641,7 @@ info: info-am
+ info-am:
+
+-install-data-am: install-man install-pdfDATA install-pkgconfigDATA \
++install-data-am: install-man install-pkgconfigDATA \
+ install-pkgextraincludeDATA install-pkgincludeHEADERS
+
+ install-exec-am: install-pkglibLTLIBRARIES
+@@ -692,9 +670,9 @@ ps: ps-am
+
+ ps-am:
+
+-uninstall-am: uninstall-info-am uninstall-man uninstall-pdfDATA \
+- uninstall-pkgconfigDATA uninstall-pkgextraincludeDATA \
+- uninstall-pkgincludeHEADERS uninstall-pkglibLTLIBRARIES
++uninstall-am: uninstall-info-am uninstall-man uninstall-pkgconfigDATA \
++ uninstall-pkgextraincludeDATA uninstall-pkgincludeHEADERS \
++ uninstall-pkglibLTLIBRARIES
+
+ uninstall-man: uninstall-man3
+
+@@ -704,16 +682,15 @@ uninstall-man: uninstall-man3
+ distclean-tags distdir dvi dvi-am html html-am info info-am \
+ install install-am install-data install-data-am install-exec \
+ install-exec-am install-info install-info-am install-man \
+- install-man3 install-pdfDATA install-pkgconfigDATA \
+- install-pkgextraincludeDATA install-pkgincludeHEADERS \
+- install-pkglibLTLIBRARIES install-strip installcheck \
+- installcheck-am installdirs maintainer-clean \
+- maintainer-clean-generic mostlyclean mostlyclean-compile \
+- mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \
+- tags uninstall uninstall-am uninstall-info-am uninstall-man \
+- uninstall-man3 uninstall-pdfDATA uninstall-pkgconfigDATA \
+- uninstall-pkgextraincludeDATA uninstall-pkgincludeHEADERS \
+- uninstall-pkglibLTLIBRARIES
++ install-man3 install-pkgconfigDATA install-pkgextraincludeDATA \
++ install-pkgincludeHEADERS install-pkglibLTLIBRARIES \
++ install-strip installcheck installcheck-am installdirs \
++ maintainer-clean maintainer-clean-generic mostlyclean \
++ mostlyclean-compile mostlyclean-generic mostlyclean-libtool \
++ pdf pdf-am ps ps-am tags uninstall uninstall-am \
++ uninstall-info-am uninstall-man uninstall-man3 \
++ uninstall-pkgconfigDATA uninstall-pkgextraincludeDATA \
++ uninstall-pkgincludeHEADERS uninstall-pkglibLTLIBRARIES
+
+
+ .3.pdf:
diff --git a/graphics/graphviz/patches/patch-aj b/graphics/graphviz/patches/patch-aj
index 8b702e19b54..706e39eb91b 100644
--- a/graphics/graphviz/patches/patch-aj
+++ b/graphics/graphviz/patches/patch-aj
@@ -1,13 +1,12 @@
-$NetBSD: patch-aj,v 1.4 2004/04/17 16:56:10 seb Exp $
+$NetBSD: patch-aj,v 1.5 2004/11/29 22:11:51 seb Exp $
---- tcldot/demo/Makefile.am.orig 2003-11-08 11:38:10.000000000 +0000
+--- tcldot/demo/Makefile.am.orig 2004-07-26 16:52:12.000000000 +0000
+++ tcldot/demo/Makefile.am
-@@ -2,7 +2,7 @@
+@@ -1,6 +1,6 @@
+ ## Process this file with automake to produce Makefile.in
- AUTOMAKE_OPTIONS = 1.4
-
--demodir = $(datadir)/@PACKAGE@/demo
+-demodir = $(pkgdatadir)/demo
+demodir = $(prefix)/share/examples/@PACKAGE@
+
if WITH_TCL
demo_SCRIPTS = doted gcat
- demo_DATA = doted.README gcat.README
diff --git a/graphics/graphviz/patches/patch-ak b/graphics/graphviz/patches/patch-ak
index c1d46d5c726..47f82888e5b 100644
--- a/graphics/graphviz/patches/patch-ak
+++ b/graphics/graphviz/patches/patch-ak
@@ -1,28 +1,28 @@
-$NetBSD: patch-ak,v 1.6 2004/04/17 16:56:10 seb Exp $
+$NetBSD: patch-ak,v 1.7 2004/11/29 22:11:51 seb Exp $
---- tcldot/demo/Makefile.in.orig 2004-03-02 00:20:40.000000000 +0000
+--- tcldot/demo/Makefile.in.orig 2004-09-14 22:13:28.000000000 +0000
+++ tcldot/demo/Makefile.in
-@@ -104,7 +104,6 @@ SOCKET_LIBS = @SOCKET_LIBS@
+@@ -160,7 +160,6 @@ SOCKET_LIBS = @SOCKET_LIBS@
SORT = @SORT@
STRIP = @STRIP@
TCLINT_INCLUDES = @TCLINT_INCLUDES@
-TCLSH = @TCLSH@
- TCLSH_EXEC_PREFIX = @TCLSH_EXEC_PREFIX@
- TCL_BUILD_LIB_SPEC = @TCL_BUILD_LIB_SPEC@
- TCL_BUILD_STUB_LIB_PATH = @TCL_BUILD_STUB_LIB_PATH@
-@@ -181,7 +180,6 @@ TK_XINCLUDES = @TK_XINCLUDES@
- TK_XLIBSW = @TK_XLIBSW@
+ TCL_CFLAGS = @TCL_CFLAGS@
+ TCL_DEFS = @TCL_DEFS@
+ TCL_INCLUDES = @TCL_INCLUDES@
+@@ -186,7 +185,6 @@ TK_VERSION = @TK_VERSION@
+ TK_XINCLUDES = @TK_XINCLUDES@
TOP_DIR = @TOP_DIR@
VERSION = @VERSION@
-WISH = @WISH@
- XAW_INCLUDES = @XAW_INCLUDES@
- XAW_LIBS = @XAW_LIBS@
- XPM_INCLUDES = @XPM_INCLUDES@
-@@ -199,7 +197,7 @@ install_sh = @install_sh@
-
- AUTOMAKE_OPTIONS = 1.4
-
--demodir = $(datadir)/@PACKAGE@/demo
+ WITH_MYLIBGD_FALSE = @WITH_MYLIBGD_FALSE@
+ WITH_MYLIBGD_TRUE = @WITH_MYLIBGD_TRUE@
+ WITH_TCL_FALSE = @WITH_TCL_FALSE@
+@@ -253,7 +251,7 @@ target_alias = @target_alias@
+ target_cpu = @target_cpu@
+ target_os = @target_os@
+ target_vendor = @target_vendor@
+-demodir = $(pkgdatadir)/demo
+demodir = $(prefix)/share/examples/@PACKAGE@
@WITH_TCL_TRUE@demo_SCRIPTS = doted gcat
@WITH_TCL_TRUE@demo_DATA = doted.README gcat.README
diff --git a/graphics/graphviz/patches/patch-al b/graphics/graphviz/patches/patch-al
index 584931e82a6..916ec305275 100644
--- a/graphics/graphviz/patches/patch-al
+++ b/graphics/graphviz/patches/patch-al
@@ -1,13 +1,19 @@
-$NetBSD: patch-al,v 1.5 2004/04/17 16:56:10 seb Exp $
+$NetBSD: patch-al,v 1.6 2004/11/29 22:11:51 seb Exp $
---- tclpathplan/Makefile.am.orig 2003-11-08 11:38:10.000000000 +0000
-+++ tclpathplan/Makefile.am
-@@ -23,7 +23,7 @@ libtclplan_la_SOURCES = find_ints.c inte
- libtclplan_la_LIBADD = \
- $(top_builddir)/tclhandle/libtclhandle.la \
- $(top_builddir)/pathplan/libpathplanconvenience.la \
-- $(top_builddir)/tclstubs/libtclstubs.la
-+ ${TCL_STUB_LIB_SPEC}
-
- all-local: pkgIndex.tcl
+--- contrib/prune/Makefile.am.orig 2004-07-26 16:52:06.000000000 +0000
++++ contrib/prune/Makefile.am
+@@ -1,6 +1,5 @@
+ ## Process this file with automake to produce Makefile.in
+
+-pdfdir = $(pkgdatadir)/doc/pdf
+
+ AM_CPPFLAGS = \
+ -I$(top_srcdir) \
+@@ -11,7 +10,6 @@ AM_CPPFLAGS = \
+ bin_PROGRAMS = prune
+ noinst_HEADERS = generic_list.h
+ man_MANS = prune.1
+-pdf_DATA = prune.pdf
+
+ prune_SOURCES = generic_list.c prune.c
diff --git a/graphics/graphviz/patches/patch-am b/graphics/graphviz/patches/patch-am
index 2dc57e231b3..b2d4fbf6609 100644
--- a/graphics/graphviz/patches/patch-am
+++ b/graphics/graphviz/patches/patch-am
@@ -1,39 +1,144 @@
-$NetBSD: patch-am,v 1.7 2004/04/17 16:56:10 seb Exp $
+$NetBSD: patch-am,v 1.8 2004/11/29 22:11:51 seb Exp $
---- tclpathplan/Makefile.in.orig 2004-04-17 13:41:50.000000000 +0000
-+++ tclpathplan/Makefile.in
-@@ -104,7 +104,6 @@ SOCKET_LIBS = @SOCKET_LIBS@
+--- contrib/prune/Makefile.in.orig 2004-09-14 22:13:00.000000000 +0000
++++ contrib/prune/Makefile.in
+@@ -15,7 +15,6 @@
+ @SET_MAKE@
+
+
+-
+ SOURCES = $(prune_SOURCES)
+
+ srcdir = @srcdir@
+@@ -52,8 +51,7 @@ am__configure_deps = $(am__aclocal_m4_de
+ mkinstalldirs = $(install_sh) -d
+ CONFIG_HEADER = $(top_builddir)/config.h
+ CONFIG_CLEAN_FILES =
+-am__installdirs = "$(DESTDIR)$(bindir)" "$(DESTDIR)$(man1dir)" \
+- "$(DESTDIR)$(pdfdir)"
++am__installdirs = "$(DESTDIR)$(bindir)" "$(DESTDIR)$(man1dir)"
+ binPROGRAMS_INSTALL = $(INSTALL_PROGRAM)
+ PROGRAMS = $(bin_PROGRAMS)
+ am_prune_OBJECTS = generic_list.$(OBJEXT) prune.$(OBJEXT)
+@@ -77,14 +75,6 @@ DIST_SOURCES = $(prune_SOURCES)
+ man1dir = $(mandir)/man1
+ NROFF = nroff
+ MANS = $(man_MANS)
+-am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`;
+-am__vpath_adj = case $$p in \
+- $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \
+- *) f=$$p;; \
+- esac;
+-am__strip_dir = `echo $$p | sed -e 's|^.*/||'`;
+-pdfDATA_INSTALL = $(INSTALL_DATA)
+-DATA = $(pdf_DATA)
+ HEADERS = $(noinst_HEADERS)
+ ETAGS = etags
+ CTAGS = ctags
+@@ -188,7 +178,6 @@ SOCKET_LIBS = @SOCKET_LIBS@
SORT = @SORT@
STRIP = @STRIP@
TCLINT_INCLUDES = @TCLINT_INCLUDES@
-TCLSH = @TCLSH@
- TCLSH_EXEC_PREFIX = @TCLSH_EXEC_PREFIX@
- TCL_BUILD_LIB_SPEC = @TCL_BUILD_LIB_SPEC@
- TCL_BUILD_STUB_LIB_PATH = @TCL_BUILD_STUB_LIB_PATH@
-@@ -181,7 +180,6 @@ TK_XINCLUDES = @TK_XINCLUDES@
- TK_XLIBSW = @TK_XLIBSW@
+ TCL_CFLAGS = @TCL_CFLAGS@
+ TCL_DEFS = @TCL_DEFS@
+ TCL_INCLUDES = @TCL_INCLUDES@
+@@ -214,7 +203,6 @@ TK_VERSION = @TK_VERSION@
+ TK_XINCLUDES = @TK_XINCLUDES@
TOP_DIR = @TOP_DIR@
VERSION = @VERSION@
-WISH = @WISH@
- XAW_INCLUDES = @XAW_INCLUDES@
- XAW_LIBS = @XAW_LIBS@
- XPM_INCLUDES = @XPM_INCLUDES@
-@@ -220,7 +218,7 @@ libtclplan_la_SOURCES = find_ints.c inte
- libtclplan_la_LIBADD = \
- $(top_builddir)/tclhandle/libtclhandle.la \
- $(top_builddir)/pathplan/libpathplanconvenience.la \
-- $(top_builddir)/tclstubs/libtclstubs.la
-+ ${TCL_STUB_LIB_SPEC}
-
-
- CLEANFILES = pkgIndex.tcl
-@@ -234,8 +232,7 @@ LTLIBRARIES = $(pkglib_LTLIBRARIES)
-
- libtclplan_la_LDFLAGS =
- libtclplan_la_DEPENDENCIES = $(top_builddir)/tclhandle/libtclhandle.la \
-- $(top_builddir)/pathplan/libpathplanconvenience.la \
-- $(top_builddir)/tclstubs/libtclstubs.la
-+ $(top_builddir)/pathplan/libpathplanconvenience.la
- am_libtclplan_la_OBJECTS = find_ints.lo intersect.lo makecw.lo \
- tclpathplan.lo wrapper.lo
- libtclplan_la_OBJECTS = $(am_libtclplan_la_OBJECTS)
+ WITH_MYLIBGD_FALSE = @WITH_MYLIBGD_FALSE@
+ WITH_MYLIBGD_TRUE = @WITH_MYLIBGD_TRUE@
+ WITH_TCL_FALSE = @WITH_TCL_FALSE@
+@@ -281,7 +269,6 @@ target_alias = @target_alias@
+ target_cpu = @target_cpu@
+ target_os = @target_os@
+ target_vendor = @target_vendor@
+-pdfdir = $(pkgdatadir)/doc/pdf
+ AM_CPPFLAGS = \
+ -I$(top_srcdir) \
+ -I$(top_srcdir)/tools/src \
+@@ -290,7 +277,6 @@ AM_CPPFLAGS = \
+
+ noinst_HEADERS = generic_list.h
+ man_MANS = prune.1
+-pdf_DATA = prune.pdf
+ prune_SOURCES = generic_list.c prune.c
+ prune_LDADD = $(top_builddir)/tools/src/libingraphs.la \
+ $(top_builddir)/agraph/libagraph.la \
+@@ -447,23 +433,6 @@ uninstall-man1:
+ echo " rm -f '$(DESTDIR)$(man1dir)/$$inst'"; \
+ rm -f "$(DESTDIR)$(man1dir)/$$inst"; \
+ done
+-install-pdfDATA: $(pdf_DATA)
+- @$(NORMAL_INSTALL)
+- test -z "$(pdfdir)" || $(mkdir_p) "$(DESTDIR)$(pdfdir)"
+- @list='$(pdf_DATA)'; for p in $$list; do \
+- if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
+- f=$(am__strip_dir) \
+- echo " $(pdfDATA_INSTALL) '$$d$$p' '$(DESTDIR)$(pdfdir)/$$f'"; \
+- $(pdfDATA_INSTALL) "$$d$$p" "$(DESTDIR)$(pdfdir)/$$f"; \
+- done
+-
+-uninstall-pdfDATA:
+- @$(NORMAL_UNINSTALL)
+- @list='$(pdf_DATA)'; for p in $$list; do \
+- f=$(am__strip_dir) \
+- echo " rm -f '$(DESTDIR)$(pdfdir)/$$f'"; \
+- rm -f "$(DESTDIR)$(pdfdir)/$$f"; \
+- done
+
+ ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
+ list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
+@@ -542,9 +511,9 @@ distdir: $(DISTFILES)
+ done
+ check-am: all-am
+ check: check-am
+-all-am: Makefile $(PROGRAMS) $(MANS) $(DATA) $(HEADERS)
++all-am: Makefile $(PROGRAMS) $(MANS) $(HEADERS)
+ installdirs:
+- for dir in "$(DESTDIR)$(bindir)" "$(DESTDIR)$(man1dir)" "$(DESTDIR)$(pdfdir)"; do \
++ for dir in "$(DESTDIR)$(bindir)" "$(DESTDIR)$(man1dir)"; do \
+ test -z "$$dir" || $(mkdir_p) "$$dir"; \
+ done
+ install: install-am
+@@ -592,7 +561,7 @@ info: info-am
+
+ info-am:
+
+-install-data-am: install-man install-pdfDATA
++install-data-am: install-man
+
+ install-exec-am: install-binPROGRAMS
+
+@@ -620,8 +589,7 @@ ps: ps-am
+
+ ps-am:
+
+-uninstall-am: uninstall-binPROGRAMS uninstall-info-am uninstall-man \
+- uninstall-pdfDATA
++uninstall-am: uninstall-binPROGRAMS uninstall-info-am uninstall-man
+
+ uninstall-man: uninstall-man1
+
+@@ -631,13 +599,12 @@ uninstall-man: uninstall-man1
+ dvi-am html html-am info info-am install install-am \
+ install-binPROGRAMS install-data install-data-am install-exec \
+ install-exec-am install-info install-info-am install-man \
+- install-man1 install-pdfDATA install-strip installcheck \
+- installcheck-am installdirs maintainer-clean \
+- maintainer-clean-generic mostlyclean mostlyclean-compile \
+- mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \
+- tags uninstall uninstall-am uninstall-binPROGRAMS \
+- uninstall-info-am uninstall-man uninstall-man1 \
+- uninstall-pdfDATA
++ install-man1 install-strip installcheck installcheck-am \
++ installdirs maintainer-clean maintainer-clean-generic \
++ mostlyclean mostlyclean-compile mostlyclean-generic \
++ mostlyclean-libtool pdf pdf-am ps ps-am tags uninstall \
++ uninstall-am uninstall-binPROGRAMS uninstall-info-am \
++ uninstall-man uninstall-man1
+
+
+ .1.pdf:
diff --git a/graphics/graphviz/patches/patch-an b/graphics/graphviz/patches/patch-an
index 487b3d5ed00..d3519e05480 100644
--- a/graphics/graphviz/patches/patch-an
+++ b/graphics/graphviz/patches/patch-an
@@ -1,13 +1,13 @@
-$NetBSD: patch-an,v 1.4 2004/04/17 16:56:10 seb Exp $
+$NetBSD: patch-an,v 1.5 2004/11/29 22:11:51 seb Exp $
---- tclpathplan/demo/Makefile.am.orig 2003-11-08 11:38:10.000000000 +0000
+--- tclpathplan/demo/Makefile.am.orig 2004-07-26 16:52:13.000000000 +0000
+++ tclpathplan/demo/Makefile.am
-@@ -4,7 +4,7 @@ AUTOMAKE_OPTIONS = 1.4
+@@ -2,7 +2,7 @@
SUBDIRS = pathplan_data
--demodir = $(datadir)/@PACKAGE@/demo
+-demodir = $(pkgdatadir)/demo
+demodir = $(prefix)/share/examples/@PACKAGE@
+
if WITH_TCL
demo_SCRIPTS = pathplan
- demo_DATA = pathplan.README
diff --git a/graphics/graphviz/patches/patch-ao b/graphics/graphviz/patches/patch-ao
index e8a42571db9..88067b187f0 100644
--- a/graphics/graphviz/patches/patch-ao
+++ b/graphics/graphviz/patches/patch-ao
@@ -1,29 +1,29 @@
-$NetBSD: patch-ao,v 1.6 2004/04/17 16:56:10 seb Exp $
+$NetBSD: patch-ao,v 1.7 2004/11/29 22:11:51 seb Exp $
---- tclpathplan/demo/Makefile.in.orig 2004-03-02 00:20:41.000000000 +0000
+--- tclpathplan/demo/Makefile.in.orig 2004-09-14 22:13:30.000000000 +0000
+++ tclpathplan/demo/Makefile.in
-@@ -104,7 +104,6 @@ SOCKET_LIBS = @SOCKET_LIBS@
+@@ -169,7 +169,6 @@ SOCKET_LIBS = @SOCKET_LIBS@
SORT = @SORT@
STRIP = @STRIP@
TCLINT_INCLUDES = @TCLINT_INCLUDES@
-TCLSH = @TCLSH@
- TCLSH_EXEC_PREFIX = @TCLSH_EXEC_PREFIX@
- TCL_BUILD_LIB_SPEC = @TCL_BUILD_LIB_SPEC@
- TCL_BUILD_STUB_LIB_PATH = @TCL_BUILD_STUB_LIB_PATH@
-@@ -181,7 +180,6 @@ TK_XINCLUDES = @TK_XINCLUDES@
- TK_XLIBSW = @TK_XLIBSW@
+ TCL_CFLAGS = @TCL_CFLAGS@
+ TCL_DEFS = @TCL_DEFS@
+ TCL_INCLUDES = @TCL_INCLUDES@
+@@ -195,7 +194,6 @@ TK_VERSION = @TK_VERSION@
+ TK_XINCLUDES = @TK_XINCLUDES@
TOP_DIR = @TOP_DIR@
VERSION = @VERSION@
-WISH = @WISH@
- XAW_INCLUDES = @XAW_INCLUDES@
- XAW_LIBS = @XAW_LIBS@
- XPM_INCLUDES = @XPM_INCLUDES@
-@@ -201,7 +199,7 @@ AUTOMAKE_OPTIONS = 1.4
-
+ WITH_MYLIBGD_FALSE = @WITH_MYLIBGD_FALSE@
+ WITH_MYLIBGD_TRUE = @WITH_MYLIBGD_TRUE@
+ WITH_TCL_FALSE = @WITH_TCL_FALSE@
+@@ -263,7 +261,7 @@ target_cpu = @target_cpu@
+ target_os = @target_os@
+ target_vendor = @target_vendor@
SUBDIRS = pathplan_data
-
--demodir = $(datadir)/@PACKAGE@/demo
+-demodir = $(pkgdatadir)/demo
+demodir = $(prefix)/share/examples/@PACKAGE@
@WITH_TCL_TRUE@demo_SCRIPTS = pathplan
@WITH_TCL_TRUE@demo_DATA = pathplan.README
-
+ EXTRA_DIST = pathplan pathplan.README
diff --git a/graphics/graphviz/patches/patch-ap b/graphics/graphviz/patches/patch-ap
index be6db32279b..bb5c6ab404d 100644
--- a/graphics/graphviz/patches/patch-ap
+++ b/graphics/graphviz/patches/patch-ap
@@ -1,8 +1,8 @@
-$NetBSD: patch-ap,v 1.5 2004/04/17 16:56:10 seb Exp $
+$NetBSD: patch-ap,v 1.6 2004/11/29 22:11:51 seb Exp $
---- tclpathplan/demo/pathplan_data/Makefile.am.orig 2003-11-08 11:38:10.000000000 +0000
+--- tclpathplan/demo/pathplan_data/Makefile.am.orig 2004-07-26 16:52:13.000000000 +0000
+++ tclpathplan/demo/pathplan_data/Makefile.am
-@@ -5,7 +5,7 @@ AUTOMAKE_OPTIONS = 1.4
+@@ -3,7 +3,7 @@
EXAMPLES = boxes.dat dpd.dat funny.dat maze.dat nested.dat northo.dat \
obs.dat other.dat paths.dat rotor.dat u.dat unknown.dat
diff --git a/graphics/graphviz/patches/patch-aq b/graphics/graphviz/patches/patch-aq
index 9b6317ac757..7515cb7f7a9 100644
--- a/graphics/graphviz/patches/patch-aq
+++ b/graphics/graphviz/patches/patch-aq
@@ -1,29 +1,29 @@
-$NetBSD: patch-aq,v 1.7 2004/04/17 16:56:10 seb Exp $
+$NetBSD: patch-aq,v 1.8 2004/11/29 22:11:51 seb Exp $
---- tclpathplan/demo/pathplan_data/Makefile.in.orig 2004-03-02 00:20:41.000000000 +0000
+--- tclpathplan/demo/pathplan_data/Makefile.in.orig 2004-09-14 22:13:30.000000000 +0000
+++ tclpathplan/demo/pathplan_data/Makefile.in
-@@ -104,7 +104,6 @@ SOCKET_LIBS = @SOCKET_LIBS@
+@@ -157,7 +157,6 @@ SOCKET_LIBS = @SOCKET_LIBS@
SORT = @SORT@
STRIP = @STRIP@
TCLINT_INCLUDES = @TCLINT_INCLUDES@
-TCLSH = @TCLSH@
- TCLSH_EXEC_PREFIX = @TCLSH_EXEC_PREFIX@
- TCL_BUILD_LIB_SPEC = @TCL_BUILD_LIB_SPEC@
- TCL_BUILD_STUB_LIB_PATH = @TCL_BUILD_STUB_LIB_PATH@
-@@ -181,7 +180,6 @@ TK_XINCLUDES = @TK_XINCLUDES@
- TK_XLIBSW = @TK_XLIBSW@
+ TCL_CFLAGS = @TCL_CFLAGS@
+ TCL_DEFS = @TCL_DEFS@
+ TCL_INCLUDES = @TCL_INCLUDES@
+@@ -183,7 +182,6 @@ TK_VERSION = @TK_VERSION@
+ TK_XINCLUDES = @TK_XINCLUDES@
TOP_DIR = @TOP_DIR@
VERSION = @VERSION@
-WISH = @WISH@
- XAW_INCLUDES = @XAW_INCLUDES@
- XAW_LIBS = @XAW_LIBS@
- XPM_INCLUDES = @XPM_INCLUDES@
-@@ -203,7 +201,7 @@ EXAMPLES = boxes.dat dpd.dat funny.dat m
+ WITH_MYLIBGD_FALSE = @WITH_MYLIBGD_FALSE@
+ WITH_MYLIBGD_TRUE = @WITH_MYLIBGD_TRUE@
+ WITH_TCL_FALSE = @WITH_TCL_FALSE@
+@@ -253,7 +251,7 @@ target_vendor = @target_vendor@
+ EXAMPLES = boxes.dat dpd.dat funny.dat maze.dat nested.dat northo.dat \
obs.dat other.dat paths.dat rotor.dat u.dat unknown.dat
-
-pathplanexampledir = $(datadir)/@PACKAGE@/demo/pathplan_data
+pathplanexampledir = $(prefix)/share/examples/@PACKAGE@/pathplan_data
-
@WITH_TCL_TRUE@pathplanexample_DATA = $(EXAMPLES)
-
+ EXTRA_DIST = $(EXAMPLES)
+ all: all-am
diff --git a/graphics/graphviz/patches/patch-ar b/graphics/graphviz/patches/patch-ar
index 58e14c963f3..dbcffdca9d8 100644
--- a/graphics/graphviz/patches/patch-ar
+++ b/graphics/graphviz/patches/patch-ar
@@ -1,15 +1,22 @@
-$NetBSD: patch-ar,v 1.4 2004/04/17 16:56:10 seb Exp $
+$NetBSD: patch-ar,v 1.5 2004/11/29 22:11:51 seb Exp $
---- tkspline/Makefile.am.orig 2003-11-08 11:38:11.000000000 +0000
-+++ tkspline/Makefile.am
-@@ -20,8 +20,8 @@ endif
- libtkspline_la_SOURCES = tkspline.c
+--- dotneato/Makefile.am.orig 2004-09-02 15:06:01.000000000 +0000
++++ dotneato/Makefile.am
+@@ -2,8 +2,7 @@
- libtkspline_la_LIBADD = \
-- $(top_builddir)/tkstubs/libtkstubs.la \
-- $(top_builddir)/tclstubs/libtclstubs.la
-+ ${TK_STUB_LIB_SPEC} \
-+ ${TCL_STUB_LIB_SPEC}
+ SUBDIRS = common gvrender pack dotgen neatogen twopigen fdpgen circogen gvre_svg
- all-local: pkgIndex.tcl
+-pdfdir = $(pkgdatadir)/doc/pdf
+-pkgconfigdir = $(pkglibdir)/pkgconfig
++pkgconfigdir = $(libdir)/pkgconfig
+ linkedman = neato.1 twopi.1 fdp.1 circo.1
+ linkedpdf = neato.pdf twopi.pdf fdp.pdf circo.pdf
+@@ -31,7 +30,6 @@ bin_SCRIPTS = dotneato-config
+ bin_PROGRAMS = dot neato twopi fdp circo
+ noinst_PROGRAMS = dotmemtest neatomemtest twopimemtest fdpmemtest
+ man_MANS = $(man)
+-pdf_DATA = $(pdf)
+
+ libdotneato_la_SOURCES = dotneato.c
+ libdotneato_la_LIBADD = \
diff --git a/graphics/graphviz/patches/patch-as b/graphics/graphviz/patches/patch-as
index 41618126619..1c86334da35 100644
--- a/graphics/graphviz/patches/patch-as
+++ b/graphics/graphviz/patches/patch-as
@@ -1,41 +1,140 @@
-$NetBSD: patch-as,v 1.6 2004/04/17 16:56:10 seb Exp $
+$NetBSD: patch-as,v 1.7 2004/11/29 22:11:51 seb Exp $
---- tkspline/Makefile.in.orig 2004-04-17 13:41:39.000000000 +0000
-+++ tkspline/Makefile.in
-@@ -104,7 +104,6 @@ SOCKET_LIBS = @SOCKET_LIBS@
+--- dotneato/Makefile.in.orig 2004-09-14 22:13:02.000000000 +0000
++++ dotneato/Makefile.in
+@@ -66,8 +66,7 @@ am__vpath_adj = case $$p in \
+ am__strip_dir = `echo $$p | sed -e 's|^.*/||'`;
+ am__installdirs = "$(DESTDIR)$(pkglibdir)" "$(DESTDIR)$(bindir)" \
+ "$(DESTDIR)$(bindir)" "$(DESTDIR)$(man1dir)" \
+- "$(DESTDIR)$(pdfdir)" "$(DESTDIR)$(pkgconfigdir)" \
+- "$(DESTDIR)$(pkgincludedir)"
++ "$(DESTDIR)$(pkgconfigdir)" "$(DESTDIR)$(pkgincludedir)"
+ pkglibLTLIBRARIES_INSTALL = $(INSTALL)
+ LTLIBRARIES = $(pkglib_LTLIBRARIES)
+ libdotneato_la_DEPENDENCIES = \
+@@ -161,9 +160,8 @@ RECURSIVE_TARGETS = all-recursive check-
+ man1dir = $(mandir)/man1
+ NROFF = nroff
+ MANS = $(man_MANS)
+-pdfDATA_INSTALL = $(INSTALL_DATA)
+ pkgconfigDATA_INSTALL = $(INSTALL_DATA)
+-DATA = $(pdf_DATA) $(pkgconfig_DATA)
++DATA = $(pkgconfig_DATA)
+ pkgincludeHEADERS_INSTALL = $(INSTALL_HEADER)
+ HEADERS = $(pkginclude_HEADERS)
+ ETAGS = etags
+@@ -269,7 +267,6 @@ SOCKET_LIBS = @SOCKET_LIBS@
SORT = @SORT@
STRIP = @STRIP@
TCLINT_INCLUDES = @TCLINT_INCLUDES@
-TCLSH = @TCLSH@
- TCLSH_EXEC_PREFIX = @TCLSH_EXEC_PREFIX@
- TCL_BUILD_LIB_SPEC = @TCL_BUILD_LIB_SPEC@
- TCL_BUILD_STUB_LIB_PATH = @TCL_BUILD_STUB_LIB_PATH@
-@@ -181,7 +180,6 @@ TK_XINCLUDES = @TK_XINCLUDES@
- TK_XLIBSW = @TK_XLIBSW@
+ TCL_CFLAGS = @TCL_CFLAGS@
+ TCL_DEFS = @TCL_DEFS@
+ TCL_INCLUDES = @TCL_INCLUDES@
+@@ -295,7 +292,6 @@ TK_VERSION = @TK_VERSION@
+ TK_XINCLUDES = @TK_XINCLUDES@
TOP_DIR = @TOP_DIR@
VERSION = @VERSION@
-WISH = @WISH@
- XAW_INCLUDES = @XAW_INCLUDES@
- XAW_LIBS = @XAW_LIBS@
- XPM_INCLUDES = @XPM_INCLUDES@
-@@ -216,8 +214,8 @@ SUBDIRS = demo
- libtkspline_la_SOURCES = tkspline.c
+ WITH_MYLIBGD_FALSE = @WITH_MYLIBGD_FALSE@
+ WITH_MYLIBGD_TRUE = @WITH_MYLIBGD_TRUE@
+ WITH_TCL_FALSE = @WITH_TCL_FALSE@
+@@ -363,8 +359,7 @@ target_cpu = @target_cpu@
+ target_os = @target_os@
+ target_vendor = @target_vendor@
+ SUBDIRS = common gvrender pack dotgen neatogen twopigen fdpgen circogen gvre_svg
+-pdfdir = $(pkgdatadir)/doc/pdf
+-pkgconfigdir = $(pkglibdir)/pkgconfig
++pkgconfigdir = $(libdir)/pkgconfig
+ linkedman = neato.1 twopi.1 fdp.1 circo.1
+ linkedpdf = neato.pdf twopi.pdf fdp.pdf circo.pdf
+ man = dot.1 $(linkedman) dotneato-config.1
+@@ -388,7 +383,6 @@ pkglib_LTLIBRARIES = libdotneato.la
+ pkgconfig_DATA = libdotneato.pc
+ bin_SCRIPTS = dotneato-config
+ man_MANS = $(man)
+-pdf_DATA = $(pdf)
+ libdotneato_la_SOURCES = dotneato.c
+ libdotneato_la_LIBADD = \
+ $(top_builddir)/dotneato/common/libcommon.la \
+@@ -681,23 +675,6 @@ uninstall-man1:
+ echo " rm -f '$(DESTDIR)$(man1dir)/$$inst'"; \
+ rm -f "$(DESTDIR)$(man1dir)/$$inst"; \
+ done
+-install-pdfDATA: $(pdf_DATA)
+- @$(NORMAL_INSTALL)
+- test -z "$(pdfdir)" || $(mkdir_p) "$(DESTDIR)$(pdfdir)"
+- @list='$(pdf_DATA)'; for p in $$list; do \
+- if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
+- f=$(am__strip_dir) \
+- echo " $(pdfDATA_INSTALL) '$$d$$p' '$(DESTDIR)$(pdfdir)/$$f'"; \
+- $(pdfDATA_INSTALL) "$$d$$p" "$(DESTDIR)$(pdfdir)/$$f"; \
+- done
+-
+-uninstall-pdfDATA:
+- @$(NORMAL_UNINSTALL)
+- @list='$(pdf_DATA)'; for p in $$list; do \
+- f=$(am__strip_dir) \
+- echo " rm -f '$(DESTDIR)$(pdfdir)/$$f'"; \
+- rm -f "$(DESTDIR)$(pdfdir)/$$f"; \
+- done
+ install-pkgconfigDATA: $(pkgconfig_DATA)
+ @$(NORMAL_INSTALL)
+ test -z "$(pkgconfigdir)" || $(mkdir_p) "$(DESTDIR)$(pkgconfigdir)"
+@@ -901,7 +878,7 @@ all-am: Makefile $(LTLIBRARIES) $(PROGRA
+ $(HEADERS)
+ installdirs: installdirs-recursive
+ installdirs-am:
+- for dir in "$(DESTDIR)$(pkglibdir)" "$(DESTDIR)$(bindir)" "$(DESTDIR)$(bindir)" "$(DESTDIR)$(man1dir)" "$(DESTDIR)$(pdfdir)" "$(DESTDIR)$(pkgconfigdir)" "$(DESTDIR)$(pkgincludedir)"; do \
++ for dir in "$(DESTDIR)$(pkglibdir)" "$(DESTDIR)$(bindir)" "$(DESTDIR)$(bindir)" "$(DESTDIR)$(man1dir)" "$(DESTDIR)$(pkgconfigdir)" "$(DESTDIR)$(pkgincludedir)"; do \
+ test -z "$$dir" || $(mkdir_p) "$$dir"; \
+ done
+ install: install-recursive
+@@ -950,7 +927,7 @@ info: info-recursive
- libtkspline_la_LIBADD = \
-- $(top_builddir)/tkstubs/libtkstubs.la \
-- $(top_builddir)/tclstubs/libtclstubs.la
-+ ${TK_STUB_LIB_SPEC} \
-+ ${TCL_STUB_LIB_SPEC}
+ info-am:
+-install-data-am: install-man install-pdfDATA install-pkgconfigDATA \
++install-data-am: install-man install-pkgconfigDATA \
+ install-pkgincludeHEADERS
- CLEANFILES = pkgIndex.tcl
-@@ -230,8 +228,7 @@ CONFIG_CLEAN_FILES =
- LTLIBRARIES = $(pkglib_LTLIBRARIES)
+ install-exec-am: install-binPROGRAMS install-binSCRIPTS \
+@@ -981,9 +958,8 @@ ps: ps-recursive
+ ps-am:
+
+ uninstall-am: uninstall-binPROGRAMS uninstall-binSCRIPTS \
+- uninstall-info-am uninstall-man uninstall-pdfDATA \
+- uninstall-pkgconfigDATA uninstall-pkgincludeHEADERS \
+- uninstall-pkglibLTLIBRARIES
++ uninstall-info-am uninstall-man uninstall-pkgconfigDATA \
++ uninstall-pkgincludeHEADERS uninstall-pkglibLTLIBRARIES
+
+ uninstall-info: uninstall-info-recursive
+
+@@ -998,17 +974,16 @@ uninstall-man: uninstall-man1
+ install install-am install-binPROGRAMS install-binSCRIPTS \
+ install-data install-data-am install-exec install-exec-am \
+ install-info install-info-am install-man install-man1 \
+- install-pdfDATA install-pkgconfigDATA \
+- install-pkgincludeHEADERS install-pkglibLTLIBRARIES \
+- install-strip installcheck installcheck-am installdirs \
+- installdirs-am maintainer-clean maintainer-clean-generic \
+- maintainer-clean-recursive mostlyclean mostlyclean-compile \
+- mostlyclean-generic mostlyclean-libtool mostlyclean-recursive \
+- pdf pdf-am ps ps-am tags tags-recursive uninstall uninstall-am \
++ install-pkgconfigDATA install-pkgincludeHEADERS \
++ install-pkglibLTLIBRARIES install-strip installcheck \
++ installcheck-am installdirs installdirs-am maintainer-clean \
++ maintainer-clean-generic maintainer-clean-recursive \
++ mostlyclean mostlyclean-compile mostlyclean-generic \
++ mostlyclean-libtool mostlyclean-recursive pdf pdf-am ps ps-am \
++ tags tags-recursive uninstall uninstall-am \
+ uninstall-binPROGRAMS uninstall-binSCRIPTS uninstall-info-am \
+- uninstall-man uninstall-man1 uninstall-pdfDATA \
+- uninstall-pkgconfigDATA uninstall-pkgincludeHEADERS \
+- uninstall-pkglibLTLIBRARIES
++ uninstall-man uninstall-man1 uninstall-pkgconfigDATA \
++ uninstall-pkgincludeHEADERS uninstall-pkglibLTLIBRARIES
- libtkspline_la_LDFLAGS =
--libtkspline_la_DEPENDENCIES = $(top_builddir)/tkstubs/libtkstubs.la \
-- $(top_builddir)/tclstubs/libtclstubs.la
-+libtkspline_la_DEPENDENCIES =
- am_libtkspline_la_OBJECTS = tkspline.lo
- libtkspline_la_OBJECTS = $(am_libtkspline_la_OBJECTS)
+ $(linkedman): $(top_srcdir)/dotneato/dot.1
diff --git a/graphics/graphviz/patches/patch-at b/graphics/graphviz/patches/patch-at
index 5e23e11927b..679a59f0e6d 100644
--- a/graphics/graphviz/patches/patch-at
+++ b/graphics/graphviz/patches/patch-at
@@ -1,13 +1,12 @@
-$NetBSD: patch-at,v 1.5 2004/04/17 16:56:10 seb Exp $
+$NetBSD: patch-at,v 1.6 2004/11/29 22:11:51 seb Exp $
---- tkspline/demo/Makefile.am.orig 2003-11-08 11:38:11.000000000 +0000
+--- tkspline/demo/Makefile.am.orig 2004-07-26 16:52:14.000000000 +0000
+++ tkspline/demo/Makefile.am
-@@ -2,7 +2,7 @@
+@@ -1,6 +1,6 @@
+ ## Process this file with automake to produce Makefile.in
- AUTOMAKE_OPTIONS = 1.4
-
--demodir = $(datadir)/@PACKAGE@/demo
+-demodir = $(pkgdatadir)/demo
+demodir = $(prefix)/share/examples/@PACKAGE@
+
if WITH_TK
demo_SCRIPTS = spline
- demo_DATA = spline.README
diff --git a/graphics/graphviz/patches/patch-au b/graphics/graphviz/patches/patch-au
index 30c474a5742..3655e246b52 100644
--- a/graphics/graphviz/patches/patch-au
+++ b/graphics/graphviz/patches/patch-au
@@ -1,28 +1,28 @@
-$NetBSD: patch-au,v 1.7 2004/04/17 16:56:10 seb Exp $
+$NetBSD: patch-au,v 1.8 2004/11/29 22:11:51 seb Exp $
---- tkspline/demo/Makefile.in.orig 2004-03-02 00:20:41.000000000 +0000
+--- tkspline/demo/Makefile.in.orig 2004-09-14 22:13:32.000000000 +0000
+++ tkspline/demo/Makefile.in
-@@ -104,7 +104,6 @@ SOCKET_LIBS = @SOCKET_LIBS@
+@@ -160,7 +160,6 @@ SOCKET_LIBS = @SOCKET_LIBS@
SORT = @SORT@
STRIP = @STRIP@
TCLINT_INCLUDES = @TCLINT_INCLUDES@
-TCLSH = @TCLSH@
- TCLSH_EXEC_PREFIX = @TCLSH_EXEC_PREFIX@
- TCL_BUILD_LIB_SPEC = @TCL_BUILD_LIB_SPEC@
- TCL_BUILD_STUB_LIB_PATH = @TCL_BUILD_STUB_LIB_PATH@
-@@ -181,7 +180,6 @@ TK_XINCLUDES = @TK_XINCLUDES@
- TK_XLIBSW = @TK_XLIBSW@
+ TCL_CFLAGS = @TCL_CFLAGS@
+ TCL_DEFS = @TCL_DEFS@
+ TCL_INCLUDES = @TCL_INCLUDES@
+@@ -186,7 +185,6 @@ TK_VERSION = @TK_VERSION@
+ TK_XINCLUDES = @TK_XINCLUDES@
TOP_DIR = @TOP_DIR@
VERSION = @VERSION@
-WISH = @WISH@
- XAW_INCLUDES = @XAW_INCLUDES@
- XAW_LIBS = @XAW_LIBS@
- XPM_INCLUDES = @XPM_INCLUDES@
-@@ -199,7 +197,7 @@ install_sh = @install_sh@
-
- AUTOMAKE_OPTIONS = 1.4
-
--demodir = $(datadir)/@PACKAGE@/demo
+ WITH_MYLIBGD_FALSE = @WITH_MYLIBGD_FALSE@
+ WITH_MYLIBGD_TRUE = @WITH_MYLIBGD_TRUE@
+ WITH_TCL_FALSE = @WITH_TCL_FALSE@
+@@ -253,7 +251,7 @@ target_alias = @target_alias@
+ target_cpu = @target_cpu@
+ target_os = @target_os@
+ target_vendor = @target_vendor@
+-demodir = $(pkgdatadir)/demo
+demodir = $(prefix)/share/examples/@PACKAGE@
@WITH_TK_TRUE@demo_SCRIPTS = spline
@WITH_TK_TRUE@demo_DATA = spline.README
diff --git a/graphics/graphviz/patches/patch-av b/graphics/graphviz/patches/patch-av
new file mode 100644
index 00000000000..2dd7a4bca3c
--- /dev/null
+++ b/graphics/graphviz/patches/patch-av
@@ -0,0 +1,17 @@
+$NetBSD: patch-av,v 1.4 2004/11/29 22:11:51 seb Exp $
+
+--- doc/Makefile.am.orig 2004-09-14 18:10:11.000000000 +0000
++++ doc/Makefile.am
+@@ -7,9 +7,9 @@ pdf = dotguide.pdf dottyguide.pdf leftyg
+ html = build.html FAQ.html binlicense.htm
+ txt = Dot.ref latex_suggestions.txt
+
+-pdfdir = $(pkgdatadir)/doc/pdf
+-htmldir = $(pkgdatadir)/doc/html
+-txtdir = $(pkgdatadir)/doc
++pdfdir = $(prefix)/share/doc/graphviz/pdf
++htmldir = $(prefix)/share/doc/html/graphviz
++txtdir = $(prefix)/share/doc/graphviz
+
+ pdf_DATA = $(pdf)
+ html_DATA = $(html)
diff --git a/graphics/graphviz/patches/patch-aw b/graphics/graphviz/patches/patch-aw
new file mode 100644
index 00000000000..74c0f2bd178
--- /dev/null
+++ b/graphics/graphviz/patches/patch-aw
@@ -0,0 +1,33 @@
+$NetBSD: patch-aw,v 1.7 2004/11/29 22:11:51 seb Exp $
+
+--- doc/Makefile.in.orig 2004-09-14 22:13:00.000000000 +0000
++++ doc/Makefile.in
+@@ -169,7 +169,6 @@ SOCKET_LIBS = @SOCKET_LIBS@
+ SORT = @SORT@
+ STRIP = @STRIP@
+ TCLINT_INCLUDES = @TCLINT_INCLUDES@
+-TCLSH = @TCLSH@
+ TCL_CFLAGS = @TCL_CFLAGS@
+ TCL_DEFS = @TCL_DEFS@
+ TCL_INCLUDES = @TCL_INCLUDES@
+@@ -195,7 +194,6 @@ TK_VERSION = @TK_VERSION@
+ TK_XINCLUDES = @TK_XINCLUDES@
+ TOP_DIR = @TOP_DIR@
+ VERSION = @VERSION@
+-WISH = @WISH@
+ WITH_MYLIBGD_FALSE = @WITH_MYLIBGD_FALSE@
+ WITH_MYLIBGD_TRUE = @WITH_MYLIBGD_TRUE@
+ WITH_TCL_FALSE = @WITH_TCL_FALSE@
+@@ -268,9 +266,9 @@ SUBDIRS = info
+ pdf = dotguide.pdf dottyguide.pdf leftyguide.pdf neatoguide.pdf
+ html = build.html FAQ.html binlicense.htm
+ txt = Dot.ref latex_suggestions.txt
+-pdfdir = $(pkgdatadir)/doc/pdf
+-htmldir = $(pkgdatadir)/doc/html
+-txtdir = $(pkgdatadir)/doc
++pdfdir = $(prefix)/share/doc/graphviz/pdf
++htmldir = $(prefix)/share/doc/html/graphviz
++txtdir = $(prefix)/share/doc/graphviz
+ pdf_DATA = $(pdf)
+ html_DATA = $(html)
+ txt_DATA = $(txt)
diff --git a/graphics/graphviz/patches/patch-ax b/graphics/graphviz/patches/patch-ax
new file mode 100644
index 00000000000..326e46b4306
--- /dev/null
+++ b/graphics/graphviz/patches/patch-ax
@@ -0,0 +1,12 @@
+$NetBSD: patch-ax,v 1.5 2004/11/29 22:11:51 seb Exp $
+
+--- doc/info/Makefile.am.orig 2004-07-26 16:52:06.000000000 +0000
++++ doc/info/Makefile.am
+@@ -1,6 +1,6 @@
+ ## Process this file with automake to produce Makefile.in
+
+-htmldir = $(pkgdatadir)/doc/html/info
++htmldir = $(prefix)/share/doc/html/graphviz
+
+ html_DATA = attrs.html colors.html command.html grammar.html \
+ index.html lang.html output.html shapes.html \
diff --git a/graphics/graphviz/patches/patch-ay b/graphics/graphviz/patches/patch-ay
new file mode 100644
index 00000000000..7e8bc06b13a
--- /dev/null
+++ b/graphics/graphviz/patches/patch-ay
@@ -0,0 +1,29 @@
+$NetBSD: patch-ay,v 1.7 2004/11/29 22:11:51 seb Exp $
+
+--- doc/info/Makefile.in.orig 2004-09-14 22:13:01.000000000 +0000
++++ doc/info/Makefile.in
+@@ -157,7 +157,6 @@ SOCKET_LIBS = @SOCKET_LIBS@
+ SORT = @SORT@
+ STRIP = @STRIP@
+ TCLINT_INCLUDES = @TCLINT_INCLUDES@
+-TCLSH = @TCLSH@
+ TCL_CFLAGS = @TCL_CFLAGS@
+ TCL_DEFS = @TCL_DEFS@
+ TCL_INCLUDES = @TCL_INCLUDES@
+@@ -183,7 +182,6 @@ TK_VERSION = @TK_VERSION@
+ TK_XINCLUDES = @TK_XINCLUDES@
+ TOP_DIR = @TOP_DIR@
+ VERSION = @VERSION@
+-WISH = @WISH@
+ WITH_MYLIBGD_FALSE = @WITH_MYLIBGD_FALSE@
+ WITH_MYLIBGD_TRUE = @WITH_MYLIBGD_TRUE@
+ WITH_TCL_FALSE = @WITH_TCL_FALSE@
+@@ -250,7 +248,7 @@ target_alias = @target_alias@
+ target_cpu = @target_cpu@
+ target_os = @target_os@
+ target_vendor = @target_vendor@
+-htmldir = $(pkgdatadir)/doc/html/info
++htmldir = $(prefix)/share/doc/html/graphviz
+ html_DATA = attrs.html colors.html command.html grammar.html \
+ index.html lang.html output.html shapes.html \
+ Mcircle.gif Mdiamond.gif Msquare.gif \
diff --git a/graphics/graphviz/patches/patch-az b/graphics/graphviz/patches/patch-az
new file mode 100644
index 00000000000..2ab0da16650
--- /dev/null
+++ b/graphics/graphviz/patches/patch-az
@@ -0,0 +1,21 @@
+$NetBSD: patch-az,v 1.6 2004/11/29 22:11:51 seb Exp $
+
+--- dotneato/pack/Makefile.am.orig 2004-07-26 16:52:07.000000000 +0000
++++ dotneato/pack/Makefile.am
+@@ -1,7 +1,6 @@
+ ## Process this file with automake to produce Makefile.in
+
+-pdfdir = $(pkgdatadir)/doc/pdf
+-pkgconfigdir = $(pkglibdir)/pkgconfig
++pkgconfigdir = $(libdir)/pkgconfig
+
+ AM_CPPFLAGS = -I$(top_srcdir) \
+ -I$(top_srcdir)/dotneato/common \
+@@ -15,7 +14,6 @@ pkginclude_HEADERS = pack.h
+ pkglib_LTLIBRARIES = libpack.la
+ pkgconfig_DATA = libpack.pc
+ man_MANS = pack.3
+-pdf_DATA = pack.pdf
+
+ libpack_la_SOURCES = ccomps.c pack.c
+
diff --git a/graphics/graphviz/patches/patch-ba b/graphics/graphviz/patches/patch-ba
new file mode 100644
index 00000000000..5c4024c97ce
--- /dev/null
+++ b/graphics/graphviz/patches/patch-ba
@@ -0,0 +1,135 @@
+$NetBSD: patch-ba,v 1.8 2004/11/29 22:11:51 seb Exp $
+
+--- dotneato/pack/Makefile.in.orig 2004-09-14 22:13:08.000000000 +0000
++++ dotneato/pack/Makefile.in
+@@ -58,8 +58,7 @@ am__vpath_adj = case $$p in \
+ esac;
+ am__strip_dir = `echo $$p | sed -e 's|^.*/||'`;
+ am__installdirs = "$(DESTDIR)$(pkglibdir)" "$(DESTDIR)$(man3dir)" \
+- "$(DESTDIR)$(pdfdir)" "$(DESTDIR)$(pkgconfigdir)" \
+- "$(DESTDIR)$(pkgincludedir)"
++ "$(DESTDIR)$(pkgconfigdir)" "$(DESTDIR)$(pkgincludedir)"
+ pkglibLTLIBRARIES_INSTALL = $(INSTALL)
+ LTLIBRARIES = $(pkglib_LTLIBRARIES)
+ libpack_la_LIBADD =
+@@ -81,9 +80,8 @@ DIST_SOURCES = $(libpack_la_SOURCES)
+ man3dir = $(mandir)/man3
+ NROFF = nroff
+ MANS = $(man_MANS)
+-pdfDATA_INSTALL = $(INSTALL_DATA)
+ pkgconfigDATA_INSTALL = $(INSTALL_DATA)
+-DATA = $(pdf_DATA) $(pkgconfig_DATA)
++DATA = $(pkgconfig_DATA)
+ pkgincludeHEADERS_INSTALL = $(INSTALL_HEADER)
+ HEADERS = $(pkginclude_HEADERS)
+ ETAGS = etags
+@@ -188,7 +186,6 @@ SOCKET_LIBS = @SOCKET_LIBS@
+ SORT = @SORT@
+ STRIP = @STRIP@
+ TCLINT_INCLUDES = @TCLINT_INCLUDES@
+-TCLSH = @TCLSH@
+ TCL_CFLAGS = @TCL_CFLAGS@
+ TCL_DEFS = @TCL_DEFS@
+ TCL_INCLUDES = @TCL_INCLUDES@
+@@ -214,7 +211,6 @@ TK_VERSION = @TK_VERSION@
+ TK_XINCLUDES = @TK_XINCLUDES@
+ TOP_DIR = @TOP_DIR@
+ VERSION = @VERSION@
+-WISH = @WISH@
+ WITH_MYLIBGD_FALSE = @WITH_MYLIBGD_FALSE@
+ WITH_MYLIBGD_TRUE = @WITH_MYLIBGD_TRUE@
+ WITH_TCL_FALSE = @WITH_TCL_FALSE@
+@@ -281,8 +277,7 @@ target_alias = @target_alias@
+ target_cpu = @target_cpu@
+ target_os = @target_os@
+ target_vendor = @target_vendor@
+-pdfdir = $(pkgdatadir)/doc/pdf
+-pkgconfigdir = $(pkglibdir)/pkgconfig
++pkgconfigdir = $(libdir)/pkgconfig
+ AM_CPPFLAGS = -I$(top_srcdir) \
+ -I$(top_srcdir)/dotneato/common \
+ -I$(top_srcdir)/dotneato/gvrender \
+@@ -295,7 +290,6 @@ pkginclude_HEADERS = pack.h
+ pkglib_LTLIBRARIES = libpack.la
+ pkgconfig_DATA = libpack.pc
+ man_MANS = pack.3
+-pdf_DATA = pack.pdf
+ libpack_la_SOURCES = ccomps.c pack.c
+ EXTRA_DIST = $(man_MANS) $(pdf_DATA) Makefile.old ptest.c
+ DISTCLEANFILES = $(pdf_DATA)
+@@ -448,23 +442,6 @@ uninstall-man3:
+ echo " rm -f '$(DESTDIR)$(man3dir)/$$inst'"; \
+ rm -f "$(DESTDIR)$(man3dir)/$$inst"; \
+ done
+-install-pdfDATA: $(pdf_DATA)
+- @$(NORMAL_INSTALL)
+- test -z "$(pdfdir)" || $(mkdir_p) "$(DESTDIR)$(pdfdir)"
+- @list='$(pdf_DATA)'; for p in $$list; do \
+- if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
+- f=$(am__strip_dir) \
+- echo " $(pdfDATA_INSTALL) '$$d$$p' '$(DESTDIR)$(pdfdir)/$$f'"; \
+- $(pdfDATA_INSTALL) "$$d$$p" "$(DESTDIR)$(pdfdir)/$$f"; \
+- done
+-
+-uninstall-pdfDATA:
+- @$(NORMAL_UNINSTALL)
+- @list='$(pdf_DATA)'; for p in $$list; do \
+- f=$(am__strip_dir) \
+- echo " rm -f '$(DESTDIR)$(pdfdir)/$$f'"; \
+- rm -f "$(DESTDIR)$(pdfdir)/$$f"; \
+- done
+ install-pkgconfigDATA: $(pkgconfig_DATA)
+ @$(NORMAL_INSTALL)
+ test -z "$(pkgconfigdir)" || $(mkdir_p) "$(DESTDIR)$(pkgconfigdir)"
+@@ -579,7 +556,7 @@ check-am: all-am
+ check: check-am
+ all-am: Makefile $(LTLIBRARIES) $(MANS) $(DATA) $(HEADERS)
+ installdirs:
+- for dir in "$(DESTDIR)$(pkglibdir)" "$(DESTDIR)$(man3dir)" "$(DESTDIR)$(pdfdir)" "$(DESTDIR)$(pkgconfigdir)" "$(DESTDIR)$(pkgincludedir)"; do \
++ for dir in "$(DESTDIR)$(pkglibdir)" "$(DESTDIR)$(man3dir)" "$(DESTDIR)$(pkgconfigdir)" "$(DESTDIR)$(pkgincludedir)"; do \
+ test -z "$$dir" || $(mkdir_p) "$$dir"; \
+ done
+ install: install-am
+@@ -628,7 +605,7 @@ info: info-am
+
+ info-am:
+
+-install-data-am: install-man install-pdfDATA install-pkgconfigDATA \
++install-data-am: install-man install-pkgconfigDATA \
+ install-pkgincludeHEADERS
+
+ install-exec-am: install-pkglibLTLIBRARIES
+@@ -657,9 +634,8 @@ ps: ps-am
+
+ ps-am:
+
+-uninstall-am: uninstall-info-am uninstall-man uninstall-pdfDATA \
+- uninstall-pkgconfigDATA uninstall-pkgincludeHEADERS \
+- uninstall-pkglibLTLIBRARIES
++uninstall-am: uninstall-info-am uninstall-man uninstall-pkgconfigDATA \
++ uninstall-pkgincludeHEADERS uninstall-pkglibLTLIBRARIES
+
+ uninstall-man: uninstall-man3
+
+@@ -669,14 +645,13 @@ uninstall-man: uninstall-man3
+ distclean-tags distdir dvi dvi-am html html-am info info-am \
+ install install-am install-data install-data-am install-exec \
+ install-exec-am install-info install-info-am install-man \
+- install-man3 install-pdfDATA install-pkgconfigDATA \
+- install-pkgincludeHEADERS install-pkglibLTLIBRARIES \
+- install-strip installcheck installcheck-am installdirs \
+- maintainer-clean maintainer-clean-generic mostlyclean \
+- mostlyclean-compile mostlyclean-generic mostlyclean-libtool \
+- pdf pdf-am ps ps-am tags uninstall uninstall-am \
+- uninstall-info-am uninstall-man uninstall-man3 \
+- uninstall-pdfDATA uninstall-pkgconfigDATA \
++ install-man3 install-pkgconfigDATA install-pkgincludeHEADERS \
++ install-pkglibLTLIBRARIES install-strip installcheck \
++ installcheck-am installdirs maintainer-clean \
++ maintainer-clean-generic mostlyclean mostlyclean-compile \
++ mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \
++ tags uninstall uninstall-am uninstall-info-am uninstall-man \
++ uninstall-man3 uninstall-pkgconfigDATA \
+ uninstall-pkgincludeHEADERS uninstall-pkglibLTLIBRARIES
+
+
diff --git a/graphics/graphviz/patches/patch-bb b/graphics/graphviz/patches/patch-bb
new file mode 100644
index 00000000000..3cae3295497
--- /dev/null
+++ b/graphics/graphviz/patches/patch-bb
@@ -0,0 +1,15 @@
+$NetBSD: patch-bb,v 1.5 2004/11/29 22:11:51 seb Exp $
+
+--- dotty/Makefile.am.orig 2004-07-26 16:52:08.000000000 +0000
++++ dotty/Makefile.am
+@@ -7,10 +7,8 @@ man = dotty.1
+ pdf = dotty.pdf
+
+ leftydir = $(pkgdatadir)/lefty
+-pdfdir = $(pkgdatadir)/doc/pdf
+
+ man_MANS = $(man)
+-pdf_DATA = $(pdf)
+ bin_SCRIPTS = dotty
+ lefty_SCRIPTS = $(DOTTYSCRIPTS)
+
diff --git a/graphics/graphviz/patches/patch-bc b/graphics/graphviz/patches/patch-bc
new file mode 100644
index 00000000000..5e14e271b25
--- /dev/null
+++ b/graphics/graphviz/patches/patch-bc
@@ -0,0 +1,136 @@
+$NetBSD: patch-bc,v 1.7 2004/11/29 22:11:51 seb Exp $
+
+--- dotty/Makefile.in.orig 2004-09-14 22:13:09.000000000 +0000
++++ dotty/Makefile.in
+@@ -14,7 +14,6 @@
+
+ @SET_MAKE@
+
+-
+ srcdir = @srcdir@
+ top_srcdir = @top_srcdir@
+ VPATH = @srcdir@
+@@ -48,7 +47,7 @@ mkinstalldirs = $(install_sh) -d
+ CONFIG_HEADER = $(top_builddir)/config.h
+ CONFIG_CLEAN_FILES =
+ am__installdirs = "$(DESTDIR)$(bindir)" "$(DESTDIR)$(leftydir)" \
+- "$(DESTDIR)$(man1dir)" "$(DESTDIR)$(pdfdir)"
++ "$(DESTDIR)$(man1dir)"
+ binSCRIPT_INSTALL = $(INSTALL_SCRIPT)
+ leftySCRIPT_INSTALL = $(INSTALL_SCRIPT)
+ SCRIPTS = $(bin_SCRIPTS) $(lefty_SCRIPTS)
+@@ -57,14 +56,6 @@ DIST_SOURCES =
+ man1dir = $(mandir)/man1
+ NROFF = nroff
+ MANS = $(man_MANS)
+-am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`;
+-am__vpath_adj = case $$p in \
+- $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \
+- *) f=$$p;; \
+- esac;
+-am__strip_dir = `echo $$p | sed -e 's|^.*/||'`;
+-pdfDATA_INSTALL = $(INSTALL_DATA)
+-DATA = $(pdf_DATA)
+ DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
+ ACLOCAL = @ACLOCAL@
+ ALLOCA = @ALLOCA@
+@@ -165,7 +156,6 @@ SOCKET_LIBS = @SOCKET_LIBS@
+ SORT = @SORT@
+ STRIP = @STRIP@
+ TCLINT_INCLUDES = @TCLINT_INCLUDES@
+-TCLSH = @TCLSH@
+ TCL_CFLAGS = @TCL_CFLAGS@
+ TCL_DEFS = @TCL_DEFS@
+ TCL_INCLUDES = @TCL_INCLUDES@
+@@ -191,7 +181,6 @@ TK_VERSION = @TK_VERSION@
+ TK_XINCLUDES = @TK_XINCLUDES@
+ TOP_DIR = @TOP_DIR@
+ VERSION = @VERSION@
+-WISH = @WISH@
+ WITH_MYLIBGD_FALSE = @WITH_MYLIBGD_FALSE@
+ WITH_MYLIBGD_TRUE = @WITH_MYLIBGD_TRUE@
+ WITH_TCL_FALSE = @WITH_TCL_FALSE@
+@@ -264,9 +253,7 @@ DOTTYSCRIPTS = dotty.lefty dotty_draw.le
+ man = dotty.1
+ pdf = dotty.pdf
+ leftydir = $(pkgdatadir)/lefty
+-pdfdir = $(pkgdatadir)/doc/pdf
+ man_MANS = $(man)
+-pdf_DATA = $(pdf)
+ bin_SCRIPTS = dotty
+ lefty_SCRIPTS = $(DOTTYSCRIPTS)
+ EXTRA_DIST = $(DOTTYSCRIPTS) $(man) $(pdf) \
+@@ -400,23 +387,6 @@ uninstall-man1:
+ echo " rm -f '$(DESTDIR)$(man1dir)/$$inst'"; \
+ rm -f "$(DESTDIR)$(man1dir)/$$inst"; \
+ done
+-install-pdfDATA: $(pdf_DATA)
+- @$(NORMAL_INSTALL)
+- test -z "$(pdfdir)" || $(mkdir_p) "$(DESTDIR)$(pdfdir)"
+- @list='$(pdf_DATA)'; for p in $$list; do \
+- if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
+- f=$(am__strip_dir) \
+- echo " $(pdfDATA_INSTALL) '$$d$$p' '$(DESTDIR)$(pdfdir)/$$f'"; \
+- $(pdfDATA_INSTALL) "$$d$$p" "$(DESTDIR)$(pdfdir)/$$f"; \
+- done
+-
+-uninstall-pdfDATA:
+- @$(NORMAL_UNINSTALL)
+- @list='$(pdf_DATA)'; for p in $$list; do \
+- f=$(am__strip_dir) \
+- echo " rm -f '$(DESTDIR)$(pdfdir)/$$f'"; \
+- rm -f "$(DESTDIR)$(pdfdir)/$$f"; \
+- done
+ tags: TAGS
+ TAGS:
+
+@@ -453,9 +423,9 @@ distdir: $(DISTFILES)
+ done
+ check-am: all-am
+ check: check-am
+-all-am: Makefile $(SCRIPTS) $(MANS) $(DATA)
++all-am: Makefile $(SCRIPTS) $(MANS)
+ installdirs:
+- for dir in "$(DESTDIR)$(bindir)" "$(DESTDIR)$(leftydir)" "$(DESTDIR)$(man1dir)" "$(DESTDIR)$(pdfdir)"; do \
++ for dir in "$(DESTDIR)$(bindir)" "$(DESTDIR)$(leftydir)" "$(DESTDIR)$(man1dir)"; do \
+ test -z "$$dir" || $(mkdir_p) "$$dir"; \
+ done
+ install: install-am
+@@ -501,7 +471,7 @@ info: info-am
+
+ info-am:
+
+-install-data-am: install-leftySCRIPTS install-man install-pdfDATA
++install-data-am: install-leftySCRIPTS install-man
+
+ install-exec-am: install-binSCRIPTS
+
+@@ -528,7 +498,7 @@ ps: ps-am
+ ps-am:
+
+ uninstall-am: uninstall-binSCRIPTS uninstall-info-am \
+- uninstall-leftySCRIPTS uninstall-man uninstall-pdfDATA
++ uninstall-leftySCRIPTS uninstall-man
+
+ uninstall-man: uninstall-man1
+
+@@ -537,13 +507,12 @@ uninstall-man: uninstall-man1
+ dvi-am html html-am info info-am install install-am \
+ install-binSCRIPTS install-data install-data-am install-exec \
+ install-exec-am install-info install-info-am \
+- install-leftySCRIPTS install-man install-man1 install-pdfDATA \
+- install-strip installcheck installcheck-am installdirs \
+- maintainer-clean maintainer-clean-generic mostlyclean \
+- mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \
+- uninstall uninstall-am uninstall-binSCRIPTS uninstall-info-am \
+- uninstall-leftySCRIPTS uninstall-man uninstall-man1 \
+- uninstall-pdfDATA
++ install-leftySCRIPTS install-man install-man1 install-strip \
++ installcheck installcheck-am installdirs maintainer-clean \
++ maintainer-clean-generic mostlyclean mostlyclean-generic \
++ mostlyclean-libtool pdf pdf-am ps ps-am uninstall uninstall-am \
++ uninstall-binSCRIPTS uninstall-info-am uninstall-leftySCRIPTS \
++ uninstall-man uninstall-man1
+
+
+ dotty: $(top_srcdir)/dotty/dotty.sh
diff --git a/graphics/graphviz/patches/patch-bd b/graphics/graphviz/patches/patch-bd
new file mode 100644
index 00000000000..ce95140e955
--- /dev/null
+++ b/graphics/graphviz/patches/patch-bd
@@ -0,0 +1,17 @@
+$NetBSD: patch-bd,v 1.1 2004/11/29 22:11:51 seb Exp $
+
+--- gdtclft/Makefile.am.orig 2004-09-08 21:27:30.000000000 +0000
++++ gdtclft/Makefile.am
+@@ -14,12 +14,10 @@ AM_CFLAGS = @TCL_CFLAGS@
+ man = gdtclft.n
+ pdf = gdtclft.pdf
+
+-pdfdir = $(pkgdatadir)/doc/pdf
+
+ if WITH_TCL
+ pkglib_LTLIBRARIES = libgdtclft.la
+ man_MANS = $(man)
+-pdf_DATA = $(pdf)
+ endif
+
+ libgdtclft_la_SOURCES = gdtclft.c
diff --git a/graphics/graphviz/patches/patch-be b/graphics/graphviz/patches/patch-be
new file mode 100644
index 00000000000..8a68e85b370
--- /dev/null
+++ b/graphics/graphviz/patches/patch-be
@@ -0,0 +1,135 @@
+$NetBSD: patch-be,v 1.1 2004/11/29 22:11:51 seb Exp $
+
+--- gdtclft/Makefile.in.orig 2004-09-14 22:13:16.000000000 +0000
++++ gdtclft/Makefile.in
+@@ -14,7 +14,6 @@
+
+ @SET_MAKE@
+
+-
+ SOURCES = $(libgdtclft_la_SOURCES)
+
+ srcdir = @srcdir@
+@@ -55,8 +54,7 @@ am__vpath_adj = case $$p in \
+ *) f=$$p;; \
+ esac;
+ am__strip_dir = `echo $$p | sed -e 's|^.*/||'`;
+-am__installdirs = "$(DESTDIR)$(pkglibdir)" "$(DESTDIR)$(manndir)" \
+- "$(DESTDIR)$(pdfdir)"
++am__installdirs = "$(DESTDIR)$(pkglibdir)" "$(DESTDIR)$(manndir)"
+ pkglibLTLIBRARIES_INSTALL = $(INSTALL)
+ LTLIBRARIES = $(pkglib_LTLIBRARIES)
+ libgdtclft_la_DEPENDENCIES = \
+@@ -87,8 +85,6 @@ RECURSIVE_TARGETS = all-recursive check-
+ manndir = $(mandir)/mann
+ NROFF = nroff
+ MANS = $(man_MANS)
+-pdfDATA_INSTALL = $(INSTALL_DATA)
+-DATA = $(pdf_DATA)
+ ETAGS = etags
+ CTAGS = ctags
+ DIST_SUBDIRS = $(SUBDIRS)
+@@ -192,7 +188,6 @@ SOCKET_LIBS = @SOCKET_LIBS@
+ SORT = @SORT@
+ STRIP = @STRIP@
+ TCLINT_INCLUDES = @TCLINT_INCLUDES@
+-TCLSH = @TCLSH@
+ TCL_CFLAGS = @TCL_CFLAGS@
+ TCL_DEFS = @TCL_DEFS@
+ TCL_INCLUDES = @TCL_INCLUDES@
+@@ -218,7 +213,6 @@ TK_VERSION = @TK_VERSION@
+ TK_XINCLUDES = @TK_XINCLUDES@
+ TOP_DIR = @TOP_DIR@
+ VERSION = @VERSION@
+-WISH = @WISH@
+ WITH_MYLIBGD_FALSE = @WITH_MYLIBGD_FALSE@
+ WITH_MYLIBGD_TRUE = @WITH_MYLIBGD_TRUE@
+ WITH_TCL_FALSE = @WITH_TCL_FALSE@
+@@ -294,10 +288,8 @@ AM_CPPFLAGS = \
+ AM_CFLAGS = @TCL_CFLAGS@
+ man = gdtclft.n
+ pdf = gdtclft.pdf
+-pdfdir = $(pkgdatadir)/doc/pdf
+ @WITH_TCL_TRUE@pkglib_LTLIBRARIES = libgdtclft.la
+ @WITH_TCL_TRUE@man_MANS = $(man)
+-@WITH_TCL_TRUE@pdf_DATA = $(pdf)
+ libgdtclft_la_SOURCES = gdtclft.c
+ libgdtclft_la_LIBADD = \
+ $(top_builddir)/tclhandle/libtclhandle.la \
+@@ -452,23 +444,6 @@ uninstall-mann:
+ echo " rm -f '$(DESTDIR)$(manndir)/$$inst'"; \
+ rm -f "$(DESTDIR)$(manndir)/$$inst"; \
+ done
+-install-pdfDATA: $(pdf_DATA)
+- @$(NORMAL_INSTALL)
+- test -z "$(pdfdir)" || $(mkdir_p) "$(DESTDIR)$(pdfdir)"
+- @list='$(pdf_DATA)'; for p in $$list; do \
+- if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
+- f=$(am__strip_dir) \
+- echo " $(pdfDATA_INSTALL) '$$d$$p' '$(DESTDIR)$(pdfdir)/$$f'"; \
+- $(pdfDATA_INSTALL) "$$d$$p" "$(DESTDIR)$(pdfdir)/$$f"; \
+- done
+-
+-uninstall-pdfDATA:
+- @$(NORMAL_UNINSTALL)
+- @list='$(pdf_DATA)'; for p in $$list; do \
+- f=$(am__strip_dir) \
+- echo " rm -f '$(DESTDIR)$(pdfdir)/$$f'"; \
+- rm -f "$(DESTDIR)$(pdfdir)/$$f"; \
+- done
+
+ # This directory's subdirectories are mostly independent; you can cd
+ # into them and run `make' without going through this Makefile.
+@@ -635,10 +610,10 @@ distdir: $(DISTFILES)
+ check-am: all-am
+ check: check-recursive
+ @WITH_TCL_FALSE@all-local:
+-all-am: Makefile $(LTLIBRARIES) $(MANS) $(DATA) all-local
++all-am: Makefile $(LTLIBRARIES) $(MANS) all-local
+ installdirs: installdirs-recursive
+ installdirs-am:
+- for dir in "$(DESTDIR)$(pkglibdir)" "$(DESTDIR)$(manndir)" "$(DESTDIR)$(pdfdir)"; do \
++ for dir in "$(DESTDIR)$(pkglibdir)" "$(DESTDIR)$(manndir)"; do \
+ test -z "$$dir" || $(mkdir_p) "$$dir"; \
+ done
+ install: install-recursive
+@@ -688,7 +663,7 @@ info: info-recursive
+
+ info-am:
+
+-install-data-am: install-man install-pdfDATA
++install-data-am: install-man
+
+ install-exec-am: install-pkglibLTLIBRARIES
+
+@@ -716,7 +691,7 @@ ps: ps-recursive
+
+ ps-am:
+
+-uninstall-am: uninstall-info-am uninstall-man uninstall-pdfDATA \
++uninstall-am: uninstall-info-am uninstall-man \
+ uninstall-pkglibLTLIBRARIES
+
+ uninstall-info: uninstall-info-recursive
+@@ -731,14 +706,13 @@ uninstall-man: uninstall-mann
+ dvi dvi-am html html-am info info-am install install-am \
+ install-data install-data-am install-exec install-exec-am \
+ install-info install-info-am install-man install-mann \
+- install-pdfDATA install-pkglibLTLIBRARIES install-strip \
+- installcheck installcheck-am installdirs installdirs-am \
+- maintainer-clean maintainer-clean-generic \
+- maintainer-clean-recursive mostlyclean mostlyclean-compile \
+- mostlyclean-generic mostlyclean-libtool mostlyclean-recursive \
+- pdf pdf-am ps ps-am tags tags-recursive uninstall uninstall-am \
+- uninstall-info-am uninstall-man uninstall-mann \
+- uninstall-pdfDATA uninstall-pkglibLTLIBRARIES
++ install-pkglibLTLIBRARIES install-strip installcheck \
++ installcheck-am installdirs installdirs-am maintainer-clean \
++ maintainer-clean-generic maintainer-clean-recursive \
++ mostlyclean mostlyclean-compile mostlyclean-generic \
++ mostlyclean-libtool mostlyclean-recursive pdf pdf-am ps ps-am \
++ tags tags-recursive uninstall uninstall-am uninstall-info-am \
++ uninstall-man uninstall-mann uninstall-pkglibLTLIBRARIES
+
+
+ @WITH_TCL_TRUE@all-local: pkgIndex.tcl
diff --git a/graphics/graphviz/patches/patch-bf b/graphics/graphviz/patches/patch-bf
new file mode 100644
index 00000000000..9f2ffa1ca02
--- /dev/null
+++ b/graphics/graphviz/patches/patch-bf
@@ -0,0 +1,21 @@
+$NetBSD: patch-bf,v 1.1 2004/11/29 22:11:51 seb Exp $
+
+--- graph/Makefile.am.orig 2004-08-12 22:29:42.000000000 +0000
++++ graph/Makefile.am
+@@ -1,7 +1,6 @@
+ ## Process this file with automake to produce Makefile.in
+
+-pdfdir = $(pkgdatadir)/doc/pdf
+-pkgconfigdir = $(pkglibdir)/pkgconfig
++pkgconfigdir = $(libdir)/pkgconfig
+
+ man = graph.3
+ pdf = graph.pdf
+@@ -14,7 +13,6 @@ pkginclude_HEADERS = graph.h libgraph.h
+ pkglib_LTLIBRARIES = libgraph.la
+ pkgconfig_DATA = libgraph.pc
+ man_MANS = $(man)
+-pdf_DATA = $(pdf)
+
+ libgraph_la_SOURCES = attribs.c agxbuf.c edge.c graph.c graphio.c lexer.c \
+ node.c parser.y refstr.c trie.c
diff --git a/graphics/graphviz/patches/patch-bg b/graphics/graphviz/patches/patch-bg
new file mode 100644
index 00000000000..8b25cd6bf9c
--- /dev/null
+++ b/graphics/graphviz/patches/patch-bg
@@ -0,0 +1,135 @@
+$NetBSD: patch-bg,v 1.1 2004/11/29 22:11:51 seb Exp $
+
+--- graph/Makefile.in.orig 2004-09-14 22:13:17.000000000 +0000
++++ graph/Makefile.in
+@@ -58,8 +58,7 @@ am__vpath_adj = case $$p in \
+ esac;
+ am__strip_dir = `echo $$p | sed -e 's|^.*/||'`;
+ am__installdirs = "$(DESTDIR)$(pkglibdir)" "$(DESTDIR)$(man3dir)" \
+- "$(DESTDIR)$(pdfdir)" "$(DESTDIR)$(pkgconfigdir)" \
+- "$(DESTDIR)$(pkgincludedir)"
++ "$(DESTDIR)$(pkgconfigdir)" "$(DESTDIR)$(pkgincludedir)"
+ pkglibLTLIBRARIES_INSTALL = $(INSTALL)
+ LTLIBRARIES = $(pkglib_LTLIBRARIES)
+ libgraph_la_DEPENDENCIES = $(top_builddir)/cdt/libcdt.la
+@@ -85,9 +84,8 @@ DIST_SOURCES = $(libgraph_la_SOURCES)
+ man3dir = $(mandir)/man3
+ NROFF = nroff
+ MANS = $(man_MANS)
+-pdfDATA_INSTALL = $(INSTALL_DATA)
+ pkgconfigDATA_INSTALL = $(INSTALL_DATA)
+-DATA = $(pdf_DATA) $(pkgconfig_DATA)
++DATA = $(pkgconfig_DATA)
+ pkgincludeHEADERS_INSTALL = $(INSTALL_HEADER)
+ HEADERS = $(pkginclude_HEADERS)
+ ETAGS = etags
+@@ -192,7 +190,6 @@ SOCKET_LIBS = @SOCKET_LIBS@
+ SORT = @SORT@
+ STRIP = @STRIP@
+ TCLINT_INCLUDES = @TCLINT_INCLUDES@
+-TCLSH = @TCLSH@
+ TCL_CFLAGS = @TCL_CFLAGS@
+ TCL_DEFS = @TCL_DEFS@
+ TCL_INCLUDES = @TCL_INCLUDES@
+@@ -218,7 +215,6 @@ TK_VERSION = @TK_VERSION@
+ TK_XINCLUDES = @TK_XINCLUDES@
+ TOP_DIR = @TOP_DIR@
+ VERSION = @VERSION@
+-WISH = @WISH@
+ WITH_MYLIBGD_FALSE = @WITH_MYLIBGD_FALSE@
+ WITH_MYLIBGD_TRUE = @WITH_MYLIBGD_TRUE@
+ WITH_TCL_FALSE = @WITH_TCL_FALSE@
+@@ -285,8 +281,7 @@ target_alias = @target_alias@
+ target_cpu = @target_cpu@
+ target_os = @target_os@
+ target_vendor = @target_vendor@
+-pdfdir = $(pkgdatadir)/doc/pdf
+-pkgconfigdir = $(pkglibdir)/pkgconfig
++pkgconfigdir = $(libdir)/pkgconfig
+ man = graph.3
+ pdf = graph.pdf
+ AM_CPPFLAGS = \
+@@ -297,7 +292,6 @@ pkginclude_HEADERS = graph.h libgraph.h
+ pkglib_LTLIBRARIES = libgraph.la
+ pkgconfig_DATA = libgraph.pc
+ man_MANS = $(man)
+-pdf_DATA = $(pdf)
+ libgraph_la_SOURCES = attribs.c agxbuf.c edge.c graph.c graphio.c lexer.c \
+ node.c parser.y refstr.c trie.c
+
+@@ -484,23 +478,6 @@ uninstall-man3:
+ echo " rm -f '$(DESTDIR)$(man3dir)/$$inst'"; \
+ rm -f "$(DESTDIR)$(man3dir)/$$inst"; \
+ done
+-install-pdfDATA: $(pdf_DATA)
+- @$(NORMAL_INSTALL)
+- test -z "$(pdfdir)" || $(mkdir_p) "$(DESTDIR)$(pdfdir)"
+- @list='$(pdf_DATA)'; for p in $$list; do \
+- if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
+- f=$(am__strip_dir) \
+- echo " $(pdfDATA_INSTALL) '$$d$$p' '$(DESTDIR)$(pdfdir)/$$f'"; \
+- $(pdfDATA_INSTALL) "$$d$$p" "$(DESTDIR)$(pdfdir)/$$f"; \
+- done
+-
+-uninstall-pdfDATA:
+- @$(NORMAL_UNINSTALL)
+- @list='$(pdf_DATA)'; for p in $$list; do \
+- f=$(am__strip_dir) \
+- echo " rm -f '$(DESTDIR)$(pdfdir)/$$f'"; \
+- rm -f "$(DESTDIR)$(pdfdir)/$$f"; \
+- done
+ install-pkgconfigDATA: $(pkgconfig_DATA)
+ @$(NORMAL_INSTALL)
+ test -z "$(pkgconfigdir)" || $(mkdir_p) "$(DESTDIR)$(pkgconfigdir)"
+@@ -615,7 +592,7 @@ check-am: all-am
+ check: check-am
+ all-am: Makefile $(LTLIBRARIES) $(MANS) $(DATA) $(HEADERS)
+ installdirs:
+- for dir in "$(DESTDIR)$(pkglibdir)" "$(DESTDIR)$(man3dir)" "$(DESTDIR)$(pdfdir)" "$(DESTDIR)$(pkgconfigdir)" "$(DESTDIR)$(pkgincludedir)"; do \
++ for dir in "$(DESTDIR)$(pkglibdir)" "$(DESTDIR)$(man3dir)" "$(DESTDIR)$(pkgconfigdir)" "$(DESTDIR)$(pkgincludedir)"; do \
+ test -z "$$dir" || $(mkdir_p) "$$dir"; \
+ done
+ install: install-am
+@@ -665,7 +642,7 @@ info: info-am
+
+ info-am:
+
+-install-data-am: install-man install-pdfDATA install-pkgconfigDATA \
++install-data-am: install-man install-pkgconfigDATA \
+ install-pkgincludeHEADERS
+
+ install-exec-am: install-pkglibLTLIBRARIES
+@@ -694,9 +671,8 @@ ps: ps-am
+
+ ps-am:
+
+-uninstall-am: uninstall-info-am uninstall-man uninstall-pdfDATA \
+- uninstall-pkgconfigDATA uninstall-pkgincludeHEADERS \
+- uninstall-pkglibLTLIBRARIES
++uninstall-am: uninstall-info-am uninstall-man uninstall-pkgconfigDATA \
++ uninstall-pkgincludeHEADERS uninstall-pkglibLTLIBRARIES
+
+ uninstall-man: uninstall-man3
+
+@@ -706,14 +682,13 @@ uninstall-man: uninstall-man3
+ distclean-tags distdir dvi dvi-am html html-am info info-am \
+ install install-am install-data install-data-am install-exec \
+ install-exec-am install-info install-info-am install-man \
+- install-man3 install-pdfDATA install-pkgconfigDATA \
+- install-pkgincludeHEADERS install-pkglibLTLIBRARIES \
+- install-strip installcheck installcheck-am installdirs \
+- maintainer-clean maintainer-clean-generic mostlyclean \
+- mostlyclean-compile mostlyclean-generic mostlyclean-libtool \
+- pdf pdf-am ps ps-am tags uninstall uninstall-am \
+- uninstall-info-am uninstall-man uninstall-man3 \
+- uninstall-pdfDATA uninstall-pkgconfigDATA \
++ install-man3 install-pkgconfigDATA install-pkgincludeHEADERS \
++ install-pkglibLTLIBRARIES install-strip installcheck \
++ installcheck-am installdirs maintainer-clean \
++ maintainer-clean-generic mostlyclean mostlyclean-compile \
++ mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \
++ tags uninstall uninstall-am uninstall-info-am uninstall-man \
++ uninstall-man3 uninstall-pkgconfigDATA \
+ uninstall-pkgincludeHEADERS uninstall-pkglibLTLIBRARIES
+
+
diff --git a/graphics/graphviz/patches/patch-bh b/graphics/graphviz/patches/patch-bh
new file mode 100644
index 00000000000..83baed534a2
--- /dev/null
+++ b/graphics/graphviz/patches/patch-bh
@@ -0,0 +1,20 @@
+$NetBSD: patch-bh,v 1.1 2004/11/29 22:11:51 seb Exp $
+
+--- lefty/Makefile.am.orig 2004-07-26 16:52:10.000000000 +0000
++++ lefty/Makefile.am
+@@ -11,7 +11,6 @@ man = lefty.1
+ pdf = lefty.pdf
+
+ leftydir = $(pkgdatadir)/lefty
+-pdfdir = $(pkgdatadir)/doc/pdf
+
+ AM_CFLAGS = -DLEFTYPATH=\"$(leftydir)\" -DHAVEDOT @X_CFLAGS@
+
+@@ -20,7 +19,6 @@ noinst_HEADERS = code.h common.h display
+ if WITH_X
+ bin_PROGRAMS = lefty
+ man_MANS = $(man)
+-pdf_DATA = $(pdf)
+ endif
+
+ lefty_SCRIPTS = lefty.psp
diff --git a/graphics/graphviz/patches/patch-bi b/graphics/graphviz/patches/patch-bi
new file mode 100644
index 00000000000..79106bcc91c
--- /dev/null
+++ b/graphics/graphviz/patches/patch-bi
@@ -0,0 +1,139 @@
+$NetBSD: patch-bi,v 1.1 2004/11/29 22:11:51 seb Exp $
+
+--- lefty/Makefile.in.orig 2004-09-14 22:13:20.000000000 +0000
++++ lefty/Makefile.in
+@@ -16,7 +16,6 @@
+
+
+
+-
+ SOURCES = $(lefty_SOURCES)
+
+ srcdir = @srcdir@
+@@ -54,7 +53,7 @@ mkinstalldirs = $(install_sh) -d
+ CONFIG_HEADER = $(top_builddir)/config.h
+ CONFIG_CLEAN_FILES =
+ am__installdirs = "$(DESTDIR)$(bindir)" "$(DESTDIR)$(leftydir)" \
+- "$(DESTDIR)$(man1dir)" "$(DESTDIR)$(pdfdir)"
++ "$(DESTDIR)$(man1dir)"
+ binPROGRAMS_INSTALL = $(INSTALL_PROGRAM)
+ PROGRAMS = $(bin_PROGRAMS)
+ am_lefty_OBJECTS = code.$(OBJEXT) common.$(OBJEXT) display.$(OBJEXT) \
+@@ -90,14 +89,6 @@ RECURSIVE_TARGETS = all-recursive check-
+ man1dir = $(mandir)/man1
+ NROFF = nroff
+ MANS = $(man_MANS)
+-am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`;
+-am__vpath_adj = case $$p in \
+- $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \
+- *) f=$$p;; \
+- esac;
+-am__strip_dir = `echo $$p | sed -e 's|^.*/||'`;
+-pdfDATA_INSTALL = $(INSTALL_DATA)
+-DATA = $(pdf_DATA)
+ HEADERS = $(noinst_HEADERS)
+ ETAGS = etags
+ CTAGS = ctags
+@@ -202,7 +193,6 @@ SOCKET_LIBS = @SOCKET_LIBS@
+ SORT = @SORT@
+ STRIP = @STRIP@
+ TCLINT_INCLUDES = @TCLINT_INCLUDES@
+-TCLSH = @TCLSH@
+ TCL_CFLAGS = @TCL_CFLAGS@
+ TCL_DEFS = @TCL_DEFS@
+ TCL_INCLUDES = @TCL_INCLUDES@
+@@ -228,7 +218,6 @@ TK_VERSION = @TK_VERSION@
+ TK_XINCLUDES = @TK_XINCLUDES@
+ TOP_DIR = @TOP_DIR@
+ VERSION = @VERSION@
+-WISH = @WISH@
+ WITH_MYLIBGD_FALSE = @WITH_MYLIBGD_FALSE@
+ WITH_MYLIBGD_TRUE = @WITH_MYLIBGD_TRUE@
+ WITH_TCL_FALSE = @WITH_TCL_FALSE@
+@@ -304,13 +293,11 @@ AM_CPPFLAGS = \
+ man = lefty.1
+ pdf = lefty.pdf
+ leftydir = $(pkgdatadir)/lefty
+-pdfdir = $(pkgdatadir)/doc/pdf
+ AM_CFLAGS = -DLEFTYPATH=\"$(leftydir)\" -DHAVEDOT @X_CFLAGS@
+ noinst_HEADERS = code.h common.h display.h exec.h g.h gfxview.h internal.h \
+ io.h lex.h mem.h parse.h str.h tbl.h txtview.h
+
+ @WITH_X_TRUE@man_MANS = $(man)
+-@WITH_X_TRUE@pdf_DATA = $(pdf)
+ lefty_SCRIPTS = lefty.psp
+ lefty_SOURCES = code.c common.c display.c exec.c g.c gfxview.c internal.c \
+ lefty.c lex.c mem.c parse.c str.c tbl.c txtview.c
+@@ -511,23 +498,6 @@ uninstall-man1:
+ echo " rm -f '$(DESTDIR)$(man1dir)/$$inst'"; \
+ rm -f "$(DESTDIR)$(man1dir)/$$inst"; \
+ done
+-install-pdfDATA: $(pdf_DATA)
+- @$(NORMAL_INSTALL)
+- test -z "$(pdfdir)" || $(mkdir_p) "$(DESTDIR)$(pdfdir)"
+- @list='$(pdf_DATA)'; for p in $$list; do \
+- if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
+- f=$(am__strip_dir) \
+- echo " $(pdfDATA_INSTALL) '$$d$$p' '$(DESTDIR)$(pdfdir)/$$f'"; \
+- $(pdfDATA_INSTALL) "$$d$$p" "$(DESTDIR)$(pdfdir)/$$f"; \
+- done
+-
+-uninstall-pdfDATA:
+- @$(NORMAL_UNINSTALL)
+- @list='$(pdf_DATA)'; for p in $$list; do \
+- f=$(am__strip_dir) \
+- echo " rm -f '$(DESTDIR)$(pdfdir)/$$f'"; \
+- rm -f "$(DESTDIR)$(pdfdir)/$$f"; \
+- done
+
+ # This directory's subdirectories are mostly independent; you can cd
+ # into them and run `make' without going through this Makefile.
+@@ -693,10 +663,10 @@ distdir: $(DISTFILES)
+ done
+ check-am: all-am
+ check: check-recursive
+-all-am: Makefile $(PROGRAMS) $(SCRIPTS) $(MANS) $(DATA) $(HEADERS)
++all-am: Makefile $(PROGRAMS) $(SCRIPTS) $(MANS) $(HEADERS)
+ installdirs: installdirs-recursive
+ installdirs-am:
+- for dir in "$(DESTDIR)$(bindir)" "$(DESTDIR)$(leftydir)" "$(DESTDIR)$(man1dir)" "$(DESTDIR)$(pdfdir)"; do \
++ for dir in "$(DESTDIR)$(bindir)" "$(DESTDIR)$(leftydir)" "$(DESTDIR)$(man1dir)"; do \
+ test -z "$$dir" || $(mkdir_p) "$$dir"; \
+ done
+ install: install-recursive
+@@ -744,7 +714,7 @@ info: info-recursive
+
+ info-am:
+
+-install-data-am: install-leftySCRIPTS install-man install-pdfDATA
++install-data-am: install-leftySCRIPTS install-man
+
+ install-exec-am: install-binPROGRAMS
+
+@@ -773,7 +743,7 @@ ps: ps-recursive
+ ps-am:
+
+ uninstall-am: uninstall-binPROGRAMS uninstall-info-am \
+- uninstall-leftySCRIPTS uninstall-man uninstall-pdfDATA
++ uninstall-leftySCRIPTS uninstall-man
+
+ uninstall-info: uninstall-info-recursive
+
+@@ -787,14 +757,14 @@ uninstall-man: uninstall-man1
+ html-am info info-am install install-am install-binPROGRAMS \
+ install-data install-data-am install-exec install-exec-am \
+ install-info install-info-am install-leftySCRIPTS install-man \
+- install-man1 install-pdfDATA install-strip installcheck \
+- installcheck-am installdirs installdirs-am maintainer-clean \
++ install-man1 install-strip installcheck installcheck-am \
++ installdirs installdirs-am maintainer-clean \
+ maintainer-clean-generic maintainer-clean-recursive \
+ mostlyclean mostlyclean-compile mostlyclean-generic \
+ mostlyclean-libtool mostlyclean-recursive pdf pdf-am ps ps-am \
+ tags tags-recursive uninstall uninstall-am \
+ uninstall-binPROGRAMS uninstall-info-am uninstall-leftySCRIPTS \
+- uninstall-man uninstall-man1 uninstall-pdfDATA
++ uninstall-man uninstall-man1
+
+
+ .1.pdf:
diff --git a/graphics/graphviz/patches/patch-bj b/graphics/graphviz/patches/patch-bj
new file mode 100644
index 00000000000..6efc30712f4
--- /dev/null
+++ b/graphics/graphviz/patches/patch-bj
@@ -0,0 +1,17 @@
+$NetBSD: patch-bj,v 1.1 2004/11/29 22:11:51 seb Exp $
+
+--- lneato/Makefile.am.orig 2004-07-26 16:52:12.000000000 +0000
++++ lneato/Makefile.am
+@@ -1,12 +1,10 @@
+ ## Process this file with automake to produce Makefile.in
+
+-pdfdir = $(pkgdatadir)/doc/pdf
+
+ man = lneato.1
+ pdf = lneato.pdf
+
+ man_MANS = $(man)
+-pdf_DATA = $(pdf)
+ bin_SCRIPTS = lneato
+
+ lneato: ${top_srcdir}/lneato/lneato.sh
diff --git a/graphics/graphviz/patches/patch-bk b/graphics/graphviz/patches/patch-bk
new file mode 100644
index 00000000000..330e3419dd0
--- /dev/null
+++ b/graphics/graphviz/patches/patch-bk
@@ -0,0 +1,138 @@
+$NetBSD: patch-bk,v 1.1 2004/11/29 22:11:51 seb Exp $
+
+--- lneato/Makefile.in.orig 2004-09-14 22:13:25.000000000 +0000
++++ lneato/Makefile.in
+@@ -14,7 +14,6 @@
+
+ @SET_MAKE@
+
+-
+ srcdir = @srcdir@
+ top_srcdir = @top_srcdir@
+ VPATH = @srcdir@
+@@ -47,8 +46,7 @@ am__configure_deps = $(am__aclocal_m4_de
+ mkinstalldirs = $(install_sh) -d
+ CONFIG_HEADER = $(top_builddir)/config.h
+ CONFIG_CLEAN_FILES =
+-am__installdirs = "$(DESTDIR)$(bindir)" "$(DESTDIR)$(man1dir)" \
+- "$(DESTDIR)$(pdfdir)"
++am__installdirs = "$(DESTDIR)$(bindir)" "$(DESTDIR)$(man1dir)"
+ binSCRIPT_INSTALL = $(INSTALL_SCRIPT)
+ SCRIPTS = $(bin_SCRIPTS)
+ SOURCES =
+@@ -56,14 +54,6 @@ DIST_SOURCES =
+ man1dir = $(mandir)/man1
+ NROFF = nroff
+ MANS = $(man_MANS)
+-am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`;
+-am__vpath_adj = case $$p in \
+- $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \
+- *) f=$$p;; \
+- esac;
+-am__strip_dir = `echo $$p | sed -e 's|^.*/||'`;
+-pdfDATA_INSTALL = $(INSTALL_DATA)
+-DATA = $(pdf_DATA)
+ DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
+ ACLOCAL = @ACLOCAL@
+ ALLOCA = @ALLOCA@
+@@ -164,7 +154,6 @@ SOCKET_LIBS = @SOCKET_LIBS@
+ SORT = @SORT@
+ STRIP = @STRIP@
+ TCLINT_INCLUDES = @TCLINT_INCLUDES@
+-TCLSH = @TCLSH@
+ TCL_CFLAGS = @TCL_CFLAGS@
+ TCL_DEFS = @TCL_DEFS@
+ TCL_INCLUDES = @TCL_INCLUDES@
+@@ -190,7 +179,6 @@ TK_VERSION = @TK_VERSION@
+ TK_XINCLUDES = @TK_XINCLUDES@
+ TOP_DIR = @TOP_DIR@
+ VERSION = @VERSION@
+-WISH = @WISH@
+ WITH_MYLIBGD_FALSE = @WITH_MYLIBGD_FALSE@
+ WITH_MYLIBGD_TRUE = @WITH_MYLIBGD_TRUE@
+ WITH_TCL_FALSE = @WITH_TCL_FALSE@
+@@ -257,11 +245,9 @@ target_alias = @target_alias@
+ target_cpu = @target_cpu@
+ target_os = @target_os@
+ target_vendor = @target_vendor@
+-pdfdir = $(pkgdatadir)/doc/pdf
+ man = lneato.1
+ pdf = lneato.pdf
+ man_MANS = $(man)
+-pdf_DATA = $(pdf)
+ bin_SCRIPTS = lneato
+ EXTRA_DIST = $(man) $(pdf) lneato.bsh lneato.ksh lneato.sh \
+ Makefile.old mswin32
+@@ -374,23 +360,6 @@ uninstall-man1:
+ echo " rm -f '$(DESTDIR)$(man1dir)/$$inst'"; \
+ rm -f "$(DESTDIR)$(man1dir)/$$inst"; \
+ done
+-install-pdfDATA: $(pdf_DATA)
+- @$(NORMAL_INSTALL)
+- test -z "$(pdfdir)" || $(mkdir_p) "$(DESTDIR)$(pdfdir)"
+- @list='$(pdf_DATA)'; for p in $$list; do \
+- if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
+- f=$(am__strip_dir) \
+- echo " $(pdfDATA_INSTALL) '$$d$$p' '$(DESTDIR)$(pdfdir)/$$f'"; \
+- $(pdfDATA_INSTALL) "$$d$$p" "$(DESTDIR)$(pdfdir)/$$f"; \
+- done
+-
+-uninstall-pdfDATA:
+- @$(NORMAL_UNINSTALL)
+- @list='$(pdf_DATA)'; for p in $$list; do \
+- f=$(am__strip_dir) \
+- echo " rm -f '$(DESTDIR)$(pdfdir)/$$f'"; \
+- rm -f "$(DESTDIR)$(pdfdir)/$$f"; \
+- done
+ tags: TAGS
+ TAGS:
+
+@@ -427,9 +396,9 @@ distdir: $(DISTFILES)
+ done
+ check-am: all-am
+ check: check-am
+-all-am: Makefile $(SCRIPTS) $(MANS) $(DATA)
++all-am: Makefile $(SCRIPTS) $(MANS)
+ installdirs:
+- for dir in "$(DESTDIR)$(bindir)" "$(DESTDIR)$(man1dir)" "$(DESTDIR)$(pdfdir)"; do \
++ for dir in "$(DESTDIR)$(bindir)" "$(DESTDIR)$(man1dir)"; do \
+ test -z "$$dir" || $(mkdir_p) "$$dir"; \
+ done
+ install: install-am
+@@ -475,7 +444,7 @@ info: info-am
+
+ info-am:
+
+-install-data-am: install-man install-pdfDATA
++install-data-am: install-man
+
+ install-exec-am: install-binSCRIPTS
+
+@@ -501,8 +470,7 @@ ps: ps-am
+
+ ps-am:
+
+-uninstall-am: uninstall-binSCRIPTS uninstall-info-am uninstall-man \
+- uninstall-pdfDATA
++uninstall-am: uninstall-binSCRIPTS uninstall-info-am uninstall-man
+
+ uninstall-man: uninstall-man1
+
+@@ -511,12 +479,11 @@ uninstall-man: uninstall-man1
+ dvi-am html html-am info info-am install install-am \
+ install-binSCRIPTS install-data install-data-am install-exec \
+ install-exec-am install-info install-info-am install-man \
+- install-man1 install-pdfDATA install-strip installcheck \
+- installcheck-am installdirs maintainer-clean \
+- maintainer-clean-generic mostlyclean mostlyclean-generic \
+- mostlyclean-libtool pdf pdf-am ps ps-am uninstall uninstall-am \
+- uninstall-binSCRIPTS uninstall-info-am uninstall-man \
+- uninstall-man1 uninstall-pdfDATA
++ install-man1 install-strip installcheck installcheck-am \
++ installdirs maintainer-clean maintainer-clean-generic \
++ mostlyclean mostlyclean-generic mostlyclean-libtool pdf pdf-am \
++ ps ps-am uninstall uninstall-am uninstall-binSCRIPTS \
++ uninstall-info-am uninstall-man uninstall-man1
+
+
+ lneato: ${top_srcdir}/lneato/lneato.sh
diff --git a/graphics/graphviz/patches/patch-bl b/graphics/graphviz/patches/patch-bl
new file mode 100644
index 00000000000..8ff8a31786e
--- /dev/null
+++ b/graphics/graphviz/patches/patch-bl
@@ -0,0 +1,21 @@
+$NetBSD: patch-bl,v 1.1 2004/11/29 22:11:51 seb Exp $
+
+--- pathplan/Makefile.am.orig 2004-07-26 16:52:12.000000000 +0000
++++ pathplan/Makefile.am
+@@ -1,7 +1,6 @@
+ ## Process this file with automake to produce Makefile.in
+
+-pdfdir = $(pkgdatadir)/doc/pdf
+-pkgconfigdir = $(pkglibdir)/pkgconfig
++pkgconfigdir = $(libdir)/pkgconfig
+
+ man = pathplan.3
+ pdf = pathplan.pdf
+@@ -11,7 +10,6 @@ pkginclude_HEADERS = pathgeom.h pathplan
+ pkglib_LTLIBRARIES = libpathplan.la
+ pkgconfig_DATA = libpathplan.pc
+ man_MANS = $(man)
+-pdf_DATA = $(pdf)
+
+ libpathplan_la_SOURCES = cvt.c inpoly.c route.c shortest.c \
+ shortestpth.c solvers.c triang.c util.c visibility.c
diff --git a/graphics/graphviz/patches/patch-bm b/graphics/graphviz/patches/patch-bm
new file mode 100644
index 00000000000..f4027b7f128
--- /dev/null
+++ b/graphics/graphviz/patches/patch-bm
@@ -0,0 +1,135 @@
+$NetBSD: patch-bm,v 1.1 2004/11/29 22:11:51 seb Exp $
+
+--- pathplan/Makefile.in.orig 2004-09-14 22:13:27.000000000 +0000
++++ pathplan/Makefile.in
+@@ -58,8 +58,7 @@ am__vpath_adj = case $$p in \
+ esac;
+ am__strip_dir = `echo $$p | sed -e 's|^.*/||'`;
+ am__installdirs = "$(DESTDIR)$(pkglibdir)" "$(DESTDIR)$(man3dir)" \
+- "$(DESTDIR)$(pdfdir)" "$(DESTDIR)$(pkgconfigdir)" \
+- "$(DESTDIR)$(pkgincludedir)"
++ "$(DESTDIR)$(pkgconfigdir)" "$(DESTDIR)$(pkgincludedir)"
+ pkglibLTLIBRARIES_INSTALL = $(INSTALL)
+ LTLIBRARIES = $(pkglib_LTLIBRARIES)
+ libpathplan_la_DEPENDENCIES =
+@@ -82,9 +81,8 @@ DIST_SOURCES = $(libpathplan_la_SOURCES)
+ man3dir = $(mandir)/man3
+ NROFF = nroff
+ MANS = $(man_MANS)
+-pdfDATA_INSTALL = $(INSTALL_DATA)
+ pkgconfigDATA_INSTALL = $(INSTALL_DATA)
+-DATA = $(pdf_DATA) $(pkgconfig_DATA)
++DATA = $(pkgconfig_DATA)
+ pkgincludeHEADERS_INSTALL = $(INSTALL_HEADER)
+ HEADERS = $(pkginclude_HEADERS)
+ ETAGS = etags
+@@ -189,7 +187,6 @@ SOCKET_LIBS = @SOCKET_LIBS@
+ SORT = @SORT@
+ STRIP = @STRIP@
+ TCLINT_INCLUDES = @TCLINT_INCLUDES@
+-TCLSH = @TCLSH@
+ TCL_CFLAGS = @TCL_CFLAGS@
+ TCL_DEFS = @TCL_DEFS@
+ TCL_INCLUDES = @TCL_INCLUDES@
+@@ -215,7 +212,6 @@ TK_VERSION = @TK_VERSION@
+ TK_XINCLUDES = @TK_XINCLUDES@
+ TOP_DIR = @TOP_DIR@
+ VERSION = @VERSION@
+-WISH = @WISH@
+ WITH_MYLIBGD_FALSE = @WITH_MYLIBGD_FALSE@
+ WITH_MYLIBGD_TRUE = @WITH_MYLIBGD_TRUE@
+ WITH_TCL_FALSE = @WITH_TCL_FALSE@
+@@ -282,8 +278,7 @@ target_alias = @target_alias@
+ target_cpu = @target_cpu@
+ target_os = @target_os@
+ target_vendor = @target_vendor@
+-pdfdir = $(pkgdatadir)/doc/pdf
+-pkgconfigdir = $(pkglibdir)/pkgconfig
++pkgconfigdir = $(libdir)/pkgconfig
+ man = pathplan.3
+ pdf = pathplan.pdf
+ pkginclude_HEADERS = pathgeom.h pathplan.h pathutil.h solvers.h \
+@@ -292,7 +287,6 @@ pkginclude_HEADERS = pathgeom.h pathplan
+ pkglib_LTLIBRARIES = libpathplan.la
+ pkgconfig_DATA = libpathplan.pc
+ man_MANS = $(man)
+-pdf_DATA = $(pdf)
+ libpathplan_la_SOURCES = cvt.c inpoly.c route.c shortest.c \
+ shortestpth.c solvers.c triang.c util.c visibility.c
+
+@@ -455,23 +449,6 @@ uninstall-man3:
+ echo " rm -f '$(DESTDIR)$(man3dir)/$$inst'"; \
+ rm -f "$(DESTDIR)$(man3dir)/$$inst"; \
+ done
+-install-pdfDATA: $(pdf_DATA)
+- @$(NORMAL_INSTALL)
+- test -z "$(pdfdir)" || $(mkdir_p) "$(DESTDIR)$(pdfdir)"
+- @list='$(pdf_DATA)'; for p in $$list; do \
+- if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
+- f=$(am__strip_dir) \
+- echo " $(pdfDATA_INSTALL) '$$d$$p' '$(DESTDIR)$(pdfdir)/$$f'"; \
+- $(pdfDATA_INSTALL) "$$d$$p" "$(DESTDIR)$(pdfdir)/$$f"; \
+- done
+-
+-uninstall-pdfDATA:
+- @$(NORMAL_UNINSTALL)
+- @list='$(pdf_DATA)'; for p in $$list; do \
+- f=$(am__strip_dir) \
+- echo " rm -f '$(DESTDIR)$(pdfdir)/$$f'"; \
+- rm -f "$(DESTDIR)$(pdfdir)/$$f"; \
+- done
+ install-pkgconfigDATA: $(pkgconfig_DATA)
+ @$(NORMAL_INSTALL)
+ test -z "$(pkgconfigdir)" || $(mkdir_p) "$(DESTDIR)$(pkgconfigdir)"
+@@ -586,7 +563,7 @@ check-am: all-am
+ check: check-am
+ all-am: Makefile $(LTLIBRARIES) $(MANS) $(DATA) $(HEADERS)
+ installdirs:
+- for dir in "$(DESTDIR)$(pkglibdir)" "$(DESTDIR)$(man3dir)" "$(DESTDIR)$(pdfdir)" "$(DESTDIR)$(pkgconfigdir)" "$(DESTDIR)$(pkgincludedir)"; do \
++ for dir in "$(DESTDIR)$(pkglibdir)" "$(DESTDIR)$(man3dir)" "$(DESTDIR)$(pkgconfigdir)" "$(DESTDIR)$(pkgincludedir)"; do \
+ test -z "$$dir" || $(mkdir_p) "$$dir"; \
+ done
+ install: install-am
+@@ -635,7 +612,7 @@ info: info-am
+
+ info-am:
+
+-install-data-am: install-man install-pdfDATA install-pkgconfigDATA \
++install-data-am: install-man install-pkgconfigDATA \
+ install-pkgincludeHEADERS
+
+ install-exec-am: install-pkglibLTLIBRARIES
+@@ -664,9 +641,8 @@ ps: ps-am
+
+ ps-am:
+
+-uninstall-am: uninstall-info-am uninstall-man uninstall-pdfDATA \
+- uninstall-pkgconfigDATA uninstall-pkgincludeHEADERS \
+- uninstall-pkglibLTLIBRARIES
++uninstall-am: uninstall-info-am uninstall-man uninstall-pkgconfigDATA \
++ uninstall-pkgincludeHEADERS uninstall-pkglibLTLIBRARIES
+
+ uninstall-man: uninstall-man3
+
+@@ -676,14 +652,13 @@ uninstall-man: uninstall-man3
+ distclean-tags distdir dvi dvi-am html html-am info info-am \
+ install install-am install-data install-data-am install-exec \
+ install-exec-am install-info install-info-am install-man \
+- install-man3 install-pdfDATA install-pkgconfigDATA \
+- install-pkgincludeHEADERS install-pkglibLTLIBRARIES \
+- install-strip installcheck installcheck-am installdirs \
+- maintainer-clean maintainer-clean-generic mostlyclean \
+- mostlyclean-compile mostlyclean-generic mostlyclean-libtool \
+- pdf pdf-am ps ps-am tags uninstall uninstall-am \
+- uninstall-info-am uninstall-man uninstall-man3 \
+- uninstall-pdfDATA uninstall-pkgconfigDATA \
++ install-man3 install-pkgconfigDATA install-pkgincludeHEADERS \
++ install-pkglibLTLIBRARIES install-strip installcheck \
++ installcheck-am installdirs maintainer-clean \
++ maintainer-clean-generic mostlyclean mostlyclean-compile \
++ mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \
++ tags uninstall uninstall-am uninstall-info-am uninstall-man \
++ uninstall-man3 uninstall-pkgconfigDATA \
+ uninstall-pkgincludeHEADERS uninstall-pkglibLTLIBRARIES
+
+
diff --git a/graphics/graphviz/patches/patch-bn b/graphics/graphviz/patches/patch-bn
new file mode 100644
index 00000000000..2442156f792
--- /dev/null
+++ b/graphics/graphviz/patches/patch-bn
@@ -0,0 +1,22 @@
+$NetBSD: patch-bn,v 1.1 2004/11/29 22:11:51 seb Exp $
+
+--- tcldot/Makefile.am.orig 2004-09-08 21:27:30.000000000 +0000
++++ tcldot/Makefile.am
+@@ -2,8 +2,6 @@
+
+ SUBDIRS = demo
+
+-pdfdir = $(pkgdatadir)/doc/pdf
+-htmldir = $(pkgdatadir)/doc/html
+
+ AM_CPPFLAGS = \
+ -I$(top_srcdir) \
+@@ -31,8 +29,6 @@ noinst_HEADERS = tcldot.h
+ if WITH_TCL
+ pkglib_LTLIBRARIES = libtcldot.la
+ man_MANS = $(man)
+-pdf_DATA = $(pdf)
+-html_DATA = $(html)
+ endif
+
+ libtcldot_la_SOURCES = tcldot.c tkgen.c $(top_srcdir)/gdtclft/gdtclft.c
diff --git a/graphics/graphviz/patches/patch-bo b/graphics/graphviz/patches/patch-bo
new file mode 100644
index 00000000000..74fc403ecbc
--- /dev/null
+++ b/graphics/graphviz/patches/patch-bo
@@ -0,0 +1,164 @@
+$NetBSD: patch-bo,v 1.1 2004/11/29 22:11:51 seb Exp $
+
+--- tcldot/Makefile.in.orig 2004-09-14 22:13:27.000000000 +0000
++++ tcldot/Makefile.in
+@@ -15,7 +15,6 @@
+ @SET_MAKE@
+
+
+-
+ SOURCES = $(libtcldot_la_SOURCES)
+
+ srcdir = @srcdir@
+@@ -57,8 +56,7 @@ am__vpath_adj = case $$p in \
+ *) f=$$p;; \
+ esac;
+ am__strip_dir = `echo $$p | sed -e 's|^.*/||'`;
+-am__installdirs = "$(DESTDIR)$(pkglibdir)" "$(DESTDIR)$(manndir)" \
+- "$(DESTDIR)$(htmldir)" "$(DESTDIR)$(pdfdir)"
++am__installdirs = "$(DESTDIR)$(pkglibdir)" "$(DESTDIR)$(manndir)"
+ pkglibLTLIBRARIES_INSTALL = $(INSTALL)
+ LTLIBRARIES = $(pkglib_LTLIBRARIES)
+ libtcldot_la_DEPENDENCIES = $(top_builddir)/tclhandle/libtclhandle.la \
+@@ -93,9 +91,6 @@ RECURSIVE_TARGETS = all-recursive check-
+ manndir = $(mandir)/mann
+ NROFF = nroff
+ MANS = $(man_MANS)
+-htmlDATA_INSTALL = $(INSTALL_DATA)
+-pdfDATA_INSTALL = $(INSTALL_DATA)
+-DATA = $(html_DATA) $(pdf_DATA)
+ HEADERS = $(noinst_HEADERS)
+ ETAGS = etags
+ CTAGS = ctags
+@@ -200,7 +195,6 @@ SOCKET_LIBS = @SOCKET_LIBS@
+ SORT = @SORT@
+ STRIP = @STRIP@
+ TCLINT_INCLUDES = @TCLINT_INCLUDES@
+-TCLSH = @TCLSH@
+ TCL_CFLAGS = @TCL_CFLAGS@
+ TCL_DEFS = @TCL_DEFS@
+ TCL_INCLUDES = @TCL_INCLUDES@
+@@ -226,7 +220,6 @@ TK_VERSION = @TK_VERSION@
+ TK_XINCLUDES = @TK_XINCLUDES@
+ TOP_DIR = @TOP_DIR@
+ VERSION = @VERSION@
+-WISH = @WISH@
+ WITH_MYLIBGD_FALSE = @WITH_MYLIBGD_FALSE@
+ WITH_MYLIBGD_TRUE = @WITH_MYLIBGD_TRUE@
+ WITH_TCL_FALSE = @WITH_TCL_FALSE@
+@@ -294,8 +287,6 @@ target_cpu = @target_cpu@
+ target_os = @target_os@
+ target_vendor = @target_vendor@
+ SUBDIRS = demo
+-pdfdir = $(pkgdatadir)/doc/pdf
+-htmldir = $(pkgdatadir)/doc/html
+ AM_CPPFLAGS = \
+ -I$(top_srcdir) \
+ -I$(top_srcdir)/dotneato/dotgen \
+@@ -317,8 +308,6 @@ html = tcldot.html
+ noinst_HEADERS = tcldot.h
+ @WITH_TCL_TRUE@pkglib_LTLIBRARIES = libtcldot.la
+ @WITH_TCL_TRUE@man_MANS = $(man)
+-@WITH_TCL_TRUE@pdf_DATA = $(pdf)
+-@WITH_TCL_TRUE@html_DATA = $(html)
+ libtcldot_la_SOURCES = tcldot.c tkgen.c $(top_srcdir)/gdtclft/gdtclft.c
+ libtcldot_la_LIBADD = \
+ $(top_builddir)/tclhandle/libtclhandle.la \
+@@ -489,40 +478,6 @@ uninstall-mann:
+ echo " rm -f '$(DESTDIR)$(manndir)/$$inst'"; \
+ rm -f "$(DESTDIR)$(manndir)/$$inst"; \
+ done
+-install-htmlDATA: $(html_DATA)
+- @$(NORMAL_INSTALL)
+- test -z "$(htmldir)" || $(mkdir_p) "$(DESTDIR)$(htmldir)"
+- @list='$(html_DATA)'; for p in $$list; do \
+- if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
+- f=$(am__strip_dir) \
+- echo " $(htmlDATA_INSTALL) '$$d$$p' '$(DESTDIR)$(htmldir)/$$f'"; \
+- $(htmlDATA_INSTALL) "$$d$$p" "$(DESTDIR)$(htmldir)/$$f"; \
+- done
+-
+-uninstall-htmlDATA:
+- @$(NORMAL_UNINSTALL)
+- @list='$(html_DATA)'; for p in $$list; do \
+- f=$(am__strip_dir) \
+- echo " rm -f '$(DESTDIR)$(htmldir)/$$f'"; \
+- rm -f "$(DESTDIR)$(htmldir)/$$f"; \
+- done
+-install-pdfDATA: $(pdf_DATA)
+- @$(NORMAL_INSTALL)
+- test -z "$(pdfdir)" || $(mkdir_p) "$(DESTDIR)$(pdfdir)"
+- @list='$(pdf_DATA)'; for p in $$list; do \
+- if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
+- f=$(am__strip_dir) \
+- echo " $(pdfDATA_INSTALL) '$$d$$p' '$(DESTDIR)$(pdfdir)/$$f'"; \
+- $(pdfDATA_INSTALL) "$$d$$p" "$(DESTDIR)$(pdfdir)/$$f"; \
+- done
+-
+-uninstall-pdfDATA:
+- @$(NORMAL_UNINSTALL)
+- @list='$(pdf_DATA)'; for p in $$list; do \
+- f=$(am__strip_dir) \
+- echo " rm -f '$(DESTDIR)$(pdfdir)/$$f'"; \
+- rm -f "$(DESTDIR)$(pdfdir)/$$f"; \
+- done
+
+ # This directory's subdirectories are mostly independent; you can cd
+ # into them and run `make' without going through this Makefile.
+@@ -690,10 +645,10 @@ distdir: $(DISTFILES)
+ check-am: all-am
+ check: check-recursive
+ @WITH_TCL_FALSE@all-local:
+-all-am: Makefile $(LTLIBRARIES) $(MANS) $(DATA) $(HEADERS) all-local
++all-am: Makefile $(LTLIBRARIES) $(MANS) $(HEADERS) all-local
+ installdirs: installdirs-recursive
+ installdirs-am:
+- for dir in "$(DESTDIR)$(pkglibdir)" "$(DESTDIR)$(manndir)" "$(DESTDIR)$(htmldir)" "$(DESTDIR)$(pdfdir)"; do \
++ for dir in "$(DESTDIR)$(pkglibdir)" "$(DESTDIR)$(manndir)"; do \
+ test -z "$$dir" || $(mkdir_p) "$$dir"; \
+ done
+ install: install-recursive
+@@ -743,7 +698,7 @@ info: info-recursive
+
+ info-am:
+
+-install-data-am: install-htmlDATA install-man install-pdfDATA
++install-data-am: install-man
+
+ install-exec-am: install-pkglibLTLIBRARIES
+
+@@ -771,8 +726,8 @@ ps: ps-recursive
+
+ ps-am:
+
+-uninstall-am: uninstall-htmlDATA uninstall-info-am uninstall-man \
+- uninstall-pdfDATA uninstall-pkglibLTLIBRARIES
++uninstall-am: uninstall-info-am uninstall-man \
++ uninstall-pkglibLTLIBRARIES
+
+ uninstall-info: uninstall-info-recursive
+
+@@ -785,15 +740,14 @@ uninstall-man: uninstall-mann
+ distclean-libtool distclean-recursive distclean-tags distdir \
+ dvi dvi-am html html-am info info-am install install-am \
+ install-data install-data-am install-exec install-exec-am \
+- install-htmlDATA install-info install-info-am install-man \
+- install-mann install-pdfDATA install-pkglibLTLIBRARIES \
+- install-strip installcheck installcheck-am installdirs \
+- installdirs-am maintainer-clean maintainer-clean-generic \
+- maintainer-clean-recursive mostlyclean mostlyclean-compile \
+- mostlyclean-generic mostlyclean-libtool mostlyclean-recursive \
+- pdf pdf-am ps ps-am tags tags-recursive uninstall uninstall-am \
+- uninstall-htmlDATA uninstall-info-am uninstall-man \
+- uninstall-mann uninstall-pdfDATA uninstall-pkglibLTLIBRARIES
++ install-info install-info-am install-man install-mann \
++ install-pkglibLTLIBRARIES install-strip installcheck \
++ installcheck-am installdirs installdirs-am maintainer-clean \
++ maintainer-clean-generic maintainer-clean-recursive \
++ mostlyclean mostlyclean-compile mostlyclean-generic \
++ mostlyclean-libtool mostlyclean-recursive pdf pdf-am ps ps-am \
++ tags tags-recursive uninstall uninstall-am uninstall-info-am \
++ uninstall-man uninstall-mann uninstall-pkglibLTLIBRARIES
+
+
+ @WITH_TCL_TRUE@all-local: pkgIndex.tcl
diff --git a/graphics/graphviz/patches/patch-bp b/graphics/graphviz/patches/patch-bp
new file mode 100644
index 00000000000..59ad15e0186
--- /dev/null
+++ b/graphics/graphviz/patches/patch-bp
@@ -0,0 +1,20 @@
+$NetBSD: patch-bp,v 1.1 2004/11/29 22:11:51 seb Exp $
+
+--- tkspline/Makefile.am.orig 2004-09-08 21:27:30.000000000 +0000
++++ tkspline/Makefile.am
+@@ -2,7 +2,6 @@
+
+ SUBDIRS = demo
+
+-pdfdir = $(pkgdatadir)/doc/pdf
+
+ man = tkspline.n
+ pdf = tkspline.pdf
+@@ -19,7 +18,6 @@ AM_CFLAGS = @X_CFLAGS@ @TCL_CFLAGS@ @TK
+ if WITH_TK
+ pkglib_LTLIBRARIES = libtkspline.la
+ man_MANS = $(man)
+-pdf_DATA = $(pdf)
+ endif
+
+ libtkspline_la_SOURCES = tkspline.c
diff --git a/graphics/graphviz/patches/patch-bq b/graphics/graphviz/patches/patch-bq
new file mode 100644
index 00000000000..0513b346ee2
--- /dev/null
+++ b/graphics/graphviz/patches/patch-bq
@@ -0,0 +1,140 @@
+$NetBSD: patch-bq,v 1.1 2004/11/29 22:11:51 seb Exp $
+
+--- tkspline/Makefile.in.orig 2004-09-14 22:13:32.000000000 +0000
++++ tkspline/Makefile.in
+@@ -14,7 +14,6 @@
+
+ @SET_MAKE@
+
+-
+ SOURCES = $(libtkspline_la_SOURCES)
+
+ srcdir = @srcdir@
+@@ -55,8 +54,7 @@ am__vpath_adj = case $$p in \
+ *) f=$$p;; \
+ esac;
+ am__strip_dir = `echo $$p | sed -e 's|^.*/||'`;
+-am__installdirs = "$(DESTDIR)$(pkglibdir)" "$(DESTDIR)$(manndir)" \
+- "$(DESTDIR)$(pdfdir)"
++am__installdirs = "$(DESTDIR)$(pkglibdir)" "$(DESTDIR)$(manndir)"
+ pkglibLTLIBRARIES_INSTALL = $(INSTALL)
+ LTLIBRARIES = $(pkglib_LTLIBRARIES)
+ libtkspline_la_DEPENDENCIES = $(top_builddir)/tkstubs/libtkstubs.la \
+@@ -86,8 +84,6 @@ RECURSIVE_TARGETS = all-recursive check-
+ manndir = $(mandir)/mann
+ NROFF = nroff
+ MANS = $(man_MANS)
+-pdfDATA_INSTALL = $(INSTALL_DATA)
+-DATA = $(pdf_DATA)
+ ETAGS = etags
+ CTAGS = ctags
+ DIST_SUBDIRS = $(SUBDIRS)
+@@ -191,7 +187,6 @@ SOCKET_LIBS = @SOCKET_LIBS@
+ SORT = @SORT@
+ STRIP = @STRIP@
+ TCLINT_INCLUDES = @TCLINT_INCLUDES@
+-TCLSH = @TCLSH@
+ TCL_CFLAGS = @TCL_CFLAGS@
+ TCL_DEFS = @TCL_DEFS@
+ TCL_INCLUDES = @TCL_INCLUDES@
+@@ -217,7 +212,6 @@ TK_VERSION = @TK_VERSION@
+ TK_XINCLUDES = @TK_XINCLUDES@
+ TOP_DIR = @TOP_DIR@
+ VERSION = @VERSION@
+-WISH = @WISH@
+ WITH_MYLIBGD_FALSE = @WITH_MYLIBGD_FALSE@
+ WITH_MYLIBGD_TRUE = @WITH_MYLIBGD_TRUE@
+ WITH_TCL_FALSE = @WITH_TCL_FALSE@
+@@ -285,7 +279,6 @@ target_cpu = @target_cpu@
+ target_os = @target_os@
+ target_vendor = @target_vendor@
+ SUBDIRS = demo
+-pdfdir = $(pkgdatadir)/doc/pdf
+ man = tkspline.n
+ pdf = tkspline.pdf
+ AM_CPPFLAGS = \
+@@ -299,7 +292,6 @@ AM_CFLAGS = @X_CFLAGS@ @TCL_CFLAGS@ @TK
+
+ @WITH_TK_TRUE@pkglib_LTLIBRARIES = libtkspline.la
+ @WITH_TK_TRUE@man_MANS = $(man)
+-@WITH_TK_TRUE@pdf_DATA = $(pdf)
+ libtkspline_la_SOURCES = tkspline.c
+ libtkspline_la_LIBADD = \
+ $(top_builddir)/tkstubs/libtkstubs.la \
+@@ -454,23 +446,6 @@ uninstall-mann:
+ echo " rm -f '$(DESTDIR)$(manndir)/$$inst'"; \
+ rm -f "$(DESTDIR)$(manndir)/$$inst"; \
+ done
+-install-pdfDATA: $(pdf_DATA)
+- @$(NORMAL_INSTALL)
+- test -z "$(pdfdir)" || $(mkdir_p) "$(DESTDIR)$(pdfdir)"
+- @list='$(pdf_DATA)'; for p in $$list; do \
+- if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
+- f=$(am__strip_dir) \
+- echo " $(pdfDATA_INSTALL) '$$d$$p' '$(DESTDIR)$(pdfdir)/$$f'"; \
+- $(pdfDATA_INSTALL) "$$d$$p" "$(DESTDIR)$(pdfdir)/$$f"; \
+- done
+-
+-uninstall-pdfDATA:
+- @$(NORMAL_UNINSTALL)
+- @list='$(pdf_DATA)'; for p in $$list; do \
+- f=$(am__strip_dir) \
+- echo " rm -f '$(DESTDIR)$(pdfdir)/$$f'"; \
+- rm -f "$(DESTDIR)$(pdfdir)/$$f"; \
+- done
+
+ # This directory's subdirectories are mostly independent; you can cd
+ # into them and run `make' without going through this Makefile.
+@@ -637,10 +612,10 @@ distdir: $(DISTFILES)
+ check-am: all-am
+ check: check-recursive
+ @WITH_TK_FALSE@all-local:
+-all-am: Makefile $(LTLIBRARIES) $(MANS) $(DATA) all-local
++all-am: Makefile $(LTLIBRARIES) $(MANS) all-local
+ installdirs: installdirs-recursive
+ installdirs-am:
+- for dir in "$(DESTDIR)$(pkglibdir)" "$(DESTDIR)$(manndir)" "$(DESTDIR)$(pdfdir)"; do \
++ for dir in "$(DESTDIR)$(pkglibdir)" "$(DESTDIR)$(manndir)"; do \
+ test -z "$$dir" || $(mkdir_p) "$$dir"; \
+ done
+ install: install-recursive
+@@ -690,7 +665,7 @@ info: info-recursive
+
+ info-am:
+
+-install-data-am: install-man install-pdfDATA
++install-data-am: install-man
+
+ install-exec-am: install-pkglibLTLIBRARIES
+
+@@ -718,7 +693,7 @@ ps: ps-recursive
+
+ ps-am:
+
+-uninstall-am: uninstall-info-am uninstall-man uninstall-pdfDATA \
++uninstall-am: uninstall-info-am uninstall-man \
+ uninstall-pkglibLTLIBRARIES
+
+ uninstall-info: uninstall-info-recursive
+@@ -733,14 +708,13 @@ uninstall-man: uninstall-mann
+ dvi dvi-am html html-am info info-am install install-am \
+ install-data install-data-am install-exec install-exec-am \
+ install-info install-info-am install-man install-mann \
+- install-pdfDATA install-pkglibLTLIBRARIES install-strip \
+- installcheck installcheck-am installdirs installdirs-am \
+- maintainer-clean maintainer-clean-generic \
+- maintainer-clean-recursive mostlyclean mostlyclean-compile \
+- mostlyclean-generic mostlyclean-libtool mostlyclean-recursive \
+- pdf pdf-am ps ps-am tags tags-recursive uninstall uninstall-am \
+- uninstall-info-am uninstall-man uninstall-mann \
+- uninstall-pdfDATA uninstall-pkglibLTLIBRARIES
++ install-pkglibLTLIBRARIES install-strip installcheck \
++ installcheck-am installdirs installdirs-am maintainer-clean \
++ maintainer-clean-generic maintainer-clean-recursive \
++ mostlyclean mostlyclean-compile mostlyclean-generic \
++ mostlyclean-libtool mostlyclean-recursive pdf pdf-am ps ps-am \
++ tags tags-recursive uninstall uninstall-am uninstall-info-am \
++ uninstall-man uninstall-mann uninstall-pkglibLTLIBRARIES
+
+
+ @WITH_TK_TRUE@all-local: pkgIndex.tcl
diff --git a/graphics/graphviz/patches/patch-br b/graphics/graphviz/patches/patch-br
new file mode 100644
index 00000000000..b8915b745ed
--- /dev/null
+++ b/graphics/graphviz/patches/patch-br
@@ -0,0 +1,19 @@
+$NetBSD: patch-br,v 1.1 2004/11/29 22:11:51 seb Exp $
+
+--- tools/expr/Makefile.am.orig 2004-07-26 16:52:14.000000000 +0000
++++ tools/expr/Makefile.am
+@@ -1,6 +1,5 @@
+ ## Process this file with automake to produce Makefile.in
+
+-pdfdir = $(pkgdatadir)/doc/pdf
+
+ AM_CPPFLAGS = \
+ -I$(top_srcdir) \
+@@ -13,7 +12,6 @@ pkginclude_HEADERS = exgram.h exlib.h ex
+ pkglib_LTLIBRARIES = libexpr.la
+ noinst_LTLIBRARIES = libexprconvenience.la
+ man_MANS = expr.3
+-pdf_DATA = expr.pdf
+
+ libexpr_la_SOURCES = excc.c excontext.c exdata.c exerror.c \
+ exeval.c exexpr.c exlexname.c exopen.c exrewind.c extoken.c \
diff --git a/graphics/graphviz/patches/patch-bs b/graphics/graphviz/patches/patch-bs
new file mode 100644
index 00000000000..93d8335f595
--- /dev/null
+++ b/graphics/graphviz/patches/patch-bs
@@ -0,0 +1,134 @@
+$NetBSD: patch-bs,v 1.1 2004/11/29 22:11:51 seb Exp $
+
+--- tools/expr/Makefile.in.orig 2004-09-14 22:13:35.000000000 +0000
++++ tools/expr/Makefile.in
+@@ -15,7 +15,6 @@
+ @SET_MAKE@
+
+
+-
+ SOURCES = $(libexpr_la_SOURCES) $(libexprconvenience_la_SOURCES)
+
+ srcdir = @srcdir@
+@@ -58,7 +57,7 @@ am__vpath_adj = case $$p in \
+ esac;
+ am__strip_dir = `echo $$p | sed -e 's|^.*/||'`;
+ am__installdirs = "$(DESTDIR)$(pkglibdir)" "$(DESTDIR)$(man3dir)" \
+- "$(DESTDIR)$(pdfdir)" "$(DESTDIR)$(pkgincludedir)"
++ "$(DESTDIR)$(pkgincludedir)"
+ pkglibLTLIBRARIES_INSTALL = $(INSTALL)
+ LTLIBRARIES = $(noinst_LTLIBRARIES) $(pkglib_LTLIBRARIES)
+ libexpr_la_LIBADD =
+@@ -92,8 +91,6 @@ DIST_SOURCES = $(libexpr_la_SOURCES) $(l
+ man3dir = $(mandir)/man3
+ NROFF = nroff
+ MANS = $(man_MANS)
+-pdfDATA_INSTALL = $(INSTALL_DATA)
+-DATA = $(pdf_DATA)
+ pkgincludeHEADERS_INSTALL = $(INSTALL_HEADER)
+ HEADERS = $(pkginclude_HEADERS)
+ ETAGS = etags
+@@ -198,7 +195,6 @@ SOCKET_LIBS = @SOCKET_LIBS@
+ SORT = @SORT@
+ STRIP = @STRIP@
+ TCLINT_INCLUDES = @TCLINT_INCLUDES@
+-TCLSH = @TCLSH@
+ TCL_CFLAGS = @TCL_CFLAGS@
+ TCL_DEFS = @TCL_DEFS@
+ TCL_INCLUDES = @TCL_INCLUDES@
+@@ -224,7 +220,6 @@ TK_VERSION = @TK_VERSION@
+ TK_XINCLUDES = @TK_XINCLUDES@
+ TOP_DIR = @TOP_DIR@
+ VERSION = @VERSION@
+-WISH = @WISH@
+ WITH_MYLIBGD_FALSE = @WITH_MYLIBGD_FALSE@
+ WITH_MYLIBGD_TRUE = @WITH_MYLIBGD_TRUE@
+ WITH_TCL_FALSE = @WITH_TCL_FALSE@
+@@ -291,7 +286,6 @@ target_alias = @target_alias@
+ target_cpu = @target_cpu@
+ target_os = @target_os@
+ target_vendor = @target_vendor@
+-pdfdir = $(pkgdatadir)/doc/pdf
+ AM_CPPFLAGS = \
+ -I$(top_srcdir) \
+ -I$(top_srcdir)/tools/vmalloc \
+@@ -303,7 +297,6 @@ pkginclude_HEADERS = exgram.h exlib.h ex
+ pkglib_LTLIBRARIES = libexpr.la
+ noinst_LTLIBRARIES = libexprconvenience.la
+ man_MANS = expr.3
+-pdf_DATA = expr.pdf
+ libexpr_la_SOURCES = excc.c excontext.c exdata.c exerror.c \
+ exeval.c exexpr.c exlexname.c exopen.c exrewind.c extoken.c \
+ extype.c exzero.c exparse.y
+@@ -486,23 +479,6 @@ uninstall-man3:
+ echo " rm -f '$(DESTDIR)$(man3dir)/$$inst'"; \
+ rm -f "$(DESTDIR)$(man3dir)/$$inst"; \
+ done
+-install-pdfDATA: $(pdf_DATA)
+- @$(NORMAL_INSTALL)
+- test -z "$(pdfdir)" || $(mkdir_p) "$(DESTDIR)$(pdfdir)"
+- @list='$(pdf_DATA)'; for p in $$list; do \
+- if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
+- f=$(am__strip_dir) \
+- echo " $(pdfDATA_INSTALL) '$$d$$p' '$(DESTDIR)$(pdfdir)/$$f'"; \
+- $(pdfDATA_INSTALL) "$$d$$p" "$(DESTDIR)$(pdfdir)/$$f"; \
+- done
+-
+-uninstall-pdfDATA:
+- @$(NORMAL_UNINSTALL)
+- @list='$(pdf_DATA)'; for p in $$list; do \
+- f=$(am__strip_dir) \
+- echo " rm -f '$(DESTDIR)$(pdfdir)/$$f'"; \
+- rm -f "$(DESTDIR)$(pdfdir)/$$f"; \
+- done
+ install-pkgincludeHEADERS: $(pkginclude_HEADERS)
+ @$(NORMAL_INSTALL)
+ test -z "$(pkgincludedir)" || $(mkdir_p) "$(DESTDIR)$(pkgincludedir)"
+@@ -598,9 +574,9 @@ distdir: $(DISTFILES)
+ done
+ check-am: all-am
+ check: check-am
+-all-am: Makefile $(LTLIBRARIES) $(MANS) $(DATA) $(HEADERS)
++all-am: Makefile $(LTLIBRARIES) $(MANS) $(HEADERS)
+ installdirs:
+- for dir in "$(DESTDIR)$(pkglibdir)" "$(DESTDIR)$(man3dir)" "$(DESTDIR)$(pdfdir)" "$(DESTDIR)$(pkgincludedir)"; do \
++ for dir in "$(DESTDIR)$(pkglibdir)" "$(DESTDIR)$(man3dir)" "$(DESTDIR)$(pkgincludedir)"; do \
+ test -z "$$dir" || $(mkdir_p) "$$dir"; \
+ done
+ install: install-am
+@@ -650,7 +626,7 @@ info: info-am
+
+ info-am:
+
+-install-data-am: install-man install-pdfDATA install-pkgincludeHEADERS
++install-data-am: install-man install-pkgincludeHEADERS
+
+ install-exec-am: install-pkglibLTLIBRARIES
+
+@@ -678,7 +654,7 @@ ps: ps-am
+
+ ps-am:
+
+-uninstall-am: uninstall-info-am uninstall-man uninstall-pdfDATA \
++uninstall-am: uninstall-info-am uninstall-man \
+ uninstall-pkgincludeHEADERS uninstall-pkglibLTLIBRARIES
+
+ uninstall-man: uninstall-man3
+@@ -689,15 +665,14 @@ uninstall-man: uninstall-man3
+ distclean-libtool distclean-tags distdir dvi dvi-am html \
+ html-am info info-am install install-am install-data \
+ install-data-am install-exec install-exec-am install-info \
+- install-info-am install-man install-man3 install-pdfDATA \
++ install-info-am install-man install-man3 \
+ install-pkgincludeHEADERS install-pkglibLTLIBRARIES \
+ install-strip installcheck installcheck-am installdirs \
+ maintainer-clean maintainer-clean-generic mostlyclean \
+ mostlyclean-compile mostlyclean-generic mostlyclean-libtool \
+ pdf pdf-am ps ps-am tags uninstall uninstall-am \
+ uninstall-info-am uninstall-man uninstall-man3 \
+- uninstall-pdfDATA uninstall-pkgincludeHEADERS \
+- uninstall-pkglibLTLIBRARIES
++ uninstall-pkgincludeHEADERS uninstall-pkglibLTLIBRARIES
+
+
+ $(libexprconvenience_la_OBJECTS): exparse.h exparse.c exgram.h exop.h
diff --git a/graphics/graphviz/patches/patch-bt b/graphics/graphviz/patches/patch-bt
new file mode 100644
index 00000000000..cce84b38f8a
--- /dev/null
+++ b/graphics/graphviz/patches/patch-bt
@@ -0,0 +1,19 @@
+$NetBSD: patch-bt,v 1.1 2004/11/29 22:11:51 seb Exp $
+
+--- tools/gpr/Makefile.am.orig 2004-07-26 16:52:14.000000000 +0000
++++ tools/gpr/Makefile.am
+@@ -1,6 +1,5 @@
+ ## Process this file with automake to produce Makefile.in
+
+-pdfdir = $(pkgdatadir)/doc/pdf
+
+ AM_CPPFLAGS = \
+ -I$(top_srcdir) \
+@@ -17,7 +16,6 @@ bin_PROGRAMS = gvpr
+ noinst_PROGRAMS = mkdefs
+ noinst_HEADERS = actions.h compile.h gprstate.h parse.h queue.h
+ man_MANS = gvpr.1
+-pdf_DATA = gvpr.pdf
+
+ gvpr_SOURCES = actions.c compile.c gvpr.c gprstate.c parse.c queue.c
+
diff --git a/graphics/graphviz/patches/patch-bu b/graphics/graphviz/patches/patch-bu
new file mode 100644
index 00000000000..8db9f3b3492
--- /dev/null
+++ b/graphics/graphviz/patches/patch-bu
@@ -0,0 +1,143 @@
+$NetBSD: patch-bu,v 1.1 2004/11/29 22:11:51 seb Exp $
+
+--- tools/gpr/Makefile.in.orig 2004-09-14 22:13:36.000000000 +0000
++++ tools/gpr/Makefile.in
+@@ -15,7 +15,6 @@
+ @SET_MAKE@
+
+
+-
+ SOURCES = $(gvpr_SOURCES) $(mkdefs_SOURCES)
+
+ srcdir = @srcdir@
+@@ -53,8 +52,7 @@ am__configure_deps = $(am__aclocal_m4_de
+ mkinstalldirs = $(install_sh) -d
+ CONFIG_HEADER = $(top_builddir)/config.h
+ CONFIG_CLEAN_FILES =
+-am__installdirs = "$(DESTDIR)$(bindir)" "$(DESTDIR)$(man1dir)" \
+- "$(DESTDIR)$(pdfdir)"
++am__installdirs = "$(DESTDIR)$(bindir)" "$(DESTDIR)$(man1dir)"
+ binPROGRAMS_INSTALL = $(INSTALL_PROGRAM)
+ PROGRAMS = $(bin_PROGRAMS) $(noinst_PROGRAMS)
+ am_gvpr_OBJECTS = actions.$(OBJEXT) compile.$(OBJEXT) gvpr.$(OBJEXT) \
+@@ -86,14 +84,6 @@ DIST_SOURCES = $(gvpr_SOURCES) $(mkdefs_
+ man1dir = $(mandir)/man1
+ NROFF = nroff
+ MANS = $(man_MANS)
+-am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`;
+-am__vpath_adj = case $$p in \
+- $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \
+- *) f=$$p;; \
+- esac;
+-am__strip_dir = `echo $$p | sed -e 's|^.*/||'`;
+-pdfDATA_INSTALL = $(INSTALL_DATA)
+-DATA = $(pdf_DATA)
+ HEADERS = $(noinst_HEADERS)
+ ETAGS = etags
+ CTAGS = ctags
+@@ -197,7 +187,6 @@ SOCKET_LIBS = @SOCKET_LIBS@
+ SORT = @SORT@
+ STRIP = @STRIP@
+ TCLINT_INCLUDES = @TCLINT_INCLUDES@
+-TCLSH = @TCLSH@
+ TCL_CFLAGS = @TCL_CFLAGS@
+ TCL_DEFS = @TCL_DEFS@
+ TCL_INCLUDES = @TCL_INCLUDES@
+@@ -223,7 +212,6 @@ TK_VERSION = @TK_VERSION@
+ TK_XINCLUDES = @TK_XINCLUDES@
+ TOP_DIR = @TOP_DIR@
+ VERSION = @VERSION@
+-WISH = @WISH@
+ WITH_MYLIBGD_FALSE = @WITH_MYLIBGD_FALSE@
+ WITH_MYLIBGD_TRUE = @WITH_MYLIBGD_TRUE@
+ WITH_TCL_FALSE = @WITH_TCL_FALSE@
+@@ -290,7 +278,6 @@ target_alias = @target_alias@
+ target_cpu = @target_cpu@
+ target_os = @target_os@
+ target_vendor = @target_vendor@
+-pdfdir = $(pkgdatadir)/doc/pdf
+ AM_CPPFLAGS = \
+ -I$(top_srcdir) \
+ -I$(top_srcdir)/tools/expr \
+@@ -304,7 +291,6 @@ AM_CPPFLAGS = \
+
+ noinst_HEADERS = actions.h compile.h gprstate.h parse.h queue.h
+ man_MANS = gvpr.1
+-pdf_DATA = gvpr.pdf
+ gvpr_SOURCES = actions.c compile.c gvpr.c gprstate.c parse.c queue.c
+ gvpr_LDADD = $(top_builddir)/tools/expr/libexpr.la \
+ $(top_builddir)/tools/ast/libast.la \
+@@ -482,23 +468,6 @@ uninstall-man1:
+ echo " rm -f '$(DESTDIR)$(man1dir)/$$inst'"; \
+ rm -f "$(DESTDIR)$(man1dir)/$$inst"; \
+ done
+-install-pdfDATA: $(pdf_DATA)
+- @$(NORMAL_INSTALL)
+- test -z "$(pdfdir)" || $(mkdir_p) "$(DESTDIR)$(pdfdir)"
+- @list='$(pdf_DATA)'; for p in $$list; do \
+- if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
+- f=$(am__strip_dir) \
+- echo " $(pdfDATA_INSTALL) '$$d$$p' '$(DESTDIR)$(pdfdir)/$$f'"; \
+- $(pdfDATA_INSTALL) "$$d$$p" "$(DESTDIR)$(pdfdir)/$$f"; \
+- done
+-
+-uninstall-pdfDATA:
+- @$(NORMAL_UNINSTALL)
+- @list='$(pdf_DATA)'; for p in $$list; do \
+- f=$(am__strip_dir) \
+- echo " rm -f '$(DESTDIR)$(pdfdir)/$$f'"; \
+- rm -f "$(DESTDIR)$(pdfdir)/$$f"; \
+- done
+
+ ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
+ list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
+@@ -577,9 +546,9 @@ distdir: $(DISTFILES)
+ done
+ check-am: all-am
+ check: check-am
+-all-am: Makefile $(PROGRAMS) $(MANS) $(DATA) $(HEADERS)
++all-am: Makefile $(PROGRAMS) $(MANS) $(HEADERS)
+ installdirs:
+- for dir in "$(DESTDIR)$(bindir)" "$(DESTDIR)$(man1dir)" "$(DESTDIR)$(pdfdir)"; do \
++ for dir in "$(DESTDIR)$(bindir)" "$(DESTDIR)$(man1dir)"; do \
+ test -z "$$dir" || $(mkdir_p) "$$dir"; \
+ done
+ install: install-am
+@@ -629,7 +598,7 @@ info: info-am
+
+ info-am:
+
+-install-data-am: install-man install-pdfDATA
++install-data-am: install-man
+
+ install-exec-am: install-binPROGRAMS
+
+@@ -657,8 +626,7 @@ ps: ps-am
+
+ ps-am:
+
+-uninstall-am: uninstall-binPROGRAMS uninstall-info-am uninstall-man \
+- uninstall-pdfDATA
++uninstall-am: uninstall-binPROGRAMS uninstall-info-am uninstall-man
+
+ uninstall-man: uninstall-man1
+
+@@ -669,12 +637,12 @@ uninstall-man: uninstall-man1
+ html-am info info-am install install-am install-binPROGRAMS \
+ install-data install-data-am install-exec install-exec-am \
+ install-info install-info-am install-man install-man1 \
+- install-pdfDATA install-strip installcheck installcheck-am \
+- installdirs maintainer-clean maintainer-clean-generic \
+- mostlyclean mostlyclean-compile mostlyclean-generic \
+- mostlyclean-libtool pdf pdf-am ps ps-am tags uninstall \
+- uninstall-am uninstall-binPROGRAMS uninstall-info-am \
+- uninstall-man uninstall-man1 uninstall-pdfDATA
++ install-strip installcheck installcheck-am installdirs \
++ maintainer-clean maintainer-clean-generic mostlyclean \
++ mostlyclean-compile mostlyclean-generic mostlyclean-libtool \
++ pdf pdf-am ps ps-am tags uninstall uninstall-am \
++ uninstall-binPROGRAMS uninstall-info-am uninstall-man \
++ uninstall-man1
+
+
+ $(gvpr_OBJECTS): gdefs.h
diff --git a/graphics/graphviz/patches/patch-bv b/graphics/graphviz/patches/patch-bv
new file mode 100644
index 00000000000..fa58e78bea4
--- /dev/null
+++ b/graphics/graphviz/patches/patch-bv
@@ -0,0 +1,22 @@
+$NetBSD: patch-bv,v 1.1 2004/11/29 22:11:51 seb Exp $
+
+--- tools/src/Makefile.am.orig 2004-07-26 16:52:15.000000000 +0000
++++ tools/src/Makefile.am
+@@ -11,7 +11,6 @@ AM_CPPFLAGS = \
+ -I$(top_srcdir)/dotneato/gvrender \
+ -I$(top_srcdir)/dotneato/common @EXPAT_INCLUDES@
+
+-pdfdir = $(pkgdatadir)/doc/pdf
+
+ noinst_HEADERS = ingraphs.h colortbl.h convert.h
+ noinst_LTLIBRARIES = libingraphs.la
+@@ -22,9 +21,6 @@ bin_SCRIPTS = dot2gxl
+ man_MANS = gc.1 gvcolor.1 gxl2dot.1 dot2gxl.1 acyclic.1 nop.1 \
+ ccomps.1 sccmap.1 tred.1 unflatten.1 gvpack.1 \
+ dijkstra.1 bcomps.1
+-pdf_DATA = gc.pdf gvcolor.pdf gxl2dot.pdf dot2gxl.pdf acyclic.pdf nop.pdf \
+- ccomps.pdf sccmap.pdf tred.pdf unflatten.pdf gvpack.pdf \
+- dijkstra.pdf bcomps.pdf
+
+ dot2gxl.1: $(top_srcdir)/tools/src/gxl2dot.1
+ rm -f $@
diff --git a/graphics/graphviz/patches/patch-bw b/graphics/graphviz/patches/patch-bw
new file mode 100644
index 00000000000..2d2ef83f1d6
--- /dev/null
+++ b/graphics/graphviz/patches/patch-bw
@@ -0,0 +1,146 @@
+$NetBSD: patch-bw,v 1.1 2004/11/29 22:11:51 seb Exp $
+
+--- tools/src/Makefile.in.orig 2004-09-14 22:13:39.000000000 +0000
++++ tools/src/Makefile.in
+@@ -17,7 +17,6 @@
+
+
+
+-
+ SOURCES = $(libingraphs_la_SOURCES) $(acyclic_SOURCES) $(bcomps_SOURCES) $(ccomps_SOURCES) $(dijkstra_SOURCES) $(gc_SOURCES) $(gvcolor_SOURCES) $(gvpack_SOURCES) $(gxl2dot_SOURCES) $(nop_SOURCES) $(sccmap_SOURCES) $(tred_SOURCES) $(unflatten_SOURCES)
+
+ srcdir = @srcdir@
+@@ -62,7 +61,7 @@ libingraphs_la_LIBADD =
+ am_libingraphs_la_OBJECTS = ingraphs.lo
+ libingraphs_la_OBJECTS = $(am_libingraphs_la_OBJECTS)
+ am__installdirs = "$(DESTDIR)$(bindir)" "$(DESTDIR)$(bindir)" \
+- "$(DESTDIR)$(man1dir)" "$(DESTDIR)$(pdfdir)"
++ "$(DESTDIR)$(man1dir)"
+ binPROGRAMS_INSTALL = $(INSTALL_PROGRAM)
+ PROGRAMS = $(bin_PROGRAMS)
+ am_acyclic_OBJECTS = acyclic.$(OBJEXT)
+@@ -153,14 +152,6 @@ DIST_SOURCES = $(libingraphs_la_SOURCES)
+ man1dir = $(mandir)/man1
+ NROFF = nroff
+ MANS = $(man_MANS)
+-am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`;
+-am__vpath_adj = case $$p in \
+- $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \
+- *) f=$$p;; \
+- esac;
+-am__strip_dir = `echo $$p | sed -e 's|^.*/||'`;
+-pdfDATA_INSTALL = $(INSTALL_DATA)
+-DATA = $(pdf_DATA)
+ HEADERS = $(noinst_HEADERS)
+ ETAGS = etags
+ CTAGS = ctags
+@@ -264,7 +255,6 @@ SOCKET_LIBS = @SOCKET_LIBS@
+ SORT = @SORT@
+ STRIP = @STRIP@
+ TCLINT_INCLUDES = @TCLINT_INCLUDES@
+-TCLSH = @TCLSH@
+ TCL_CFLAGS = @TCL_CFLAGS@
+ TCL_DEFS = @TCL_DEFS@
+ TCL_INCLUDES = @TCL_INCLUDES@
+@@ -290,7 +280,6 @@ TK_VERSION = @TK_VERSION@
+ TK_XINCLUDES = @TK_XINCLUDES@
+ TOP_DIR = @TOP_DIR@
+ VERSION = @VERSION@
+-WISH = @WISH@
+ WITH_MYLIBGD_FALSE = @WITH_MYLIBGD_FALSE@
+ WITH_MYLIBGD_TRUE = @WITH_MYLIBGD_TRUE@
+ WITH_TCL_FALSE = @WITH_TCL_FALSE@
+@@ -368,7 +357,6 @@ AM_CPPFLAGS = \
+ -I$(top_srcdir)/dotneato/gvrender \
+ -I$(top_srcdir)/dotneato/common @EXPAT_INCLUDES@
+
+-pdfdir = $(pkgdatadir)/doc/pdf
+ noinst_HEADERS = ingraphs.h colortbl.h convert.h
+ noinst_LTLIBRARIES = libingraphs.la
+ bin_SCRIPTS = dot2gxl
+@@ -376,10 +364,6 @@ man_MANS = gc.1 gvcolor.1 gxl2dot.1 dot2
+ ccomps.1 sccmap.1 tred.1 unflatten.1 gvpack.1 \
+ dijkstra.1 bcomps.1
+
+-pdf_DATA = gc.pdf gvcolor.pdf gxl2dot.pdf dot2gxl.pdf acyclic.pdf nop.pdf \
+- ccomps.pdf sccmap.pdf tred.pdf unflatten.pdf gvpack.pdf \
+- dijkstra.pdf bcomps.pdf
+-
+ libingraphs_la_SOURCES = ingraphs.c ingraphs.h
+ gxl2dot_SOURCES = cvtgxl.c dot2gxl.c gxl2dot.c
+ gxl2dot_LDADD = \
+@@ -688,23 +672,6 @@ uninstall-man1:
+ echo " rm -f '$(DESTDIR)$(man1dir)/$$inst'"; \
+ rm -f "$(DESTDIR)$(man1dir)/$$inst"; \
+ done
+-install-pdfDATA: $(pdf_DATA)
+- @$(NORMAL_INSTALL)
+- test -z "$(pdfdir)" || $(mkdir_p) "$(DESTDIR)$(pdfdir)"
+- @list='$(pdf_DATA)'; for p in $$list; do \
+- if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
+- f=$(am__strip_dir) \
+- echo " $(pdfDATA_INSTALL) '$$d$$p' '$(DESTDIR)$(pdfdir)/$$f'"; \
+- $(pdfDATA_INSTALL) "$$d$$p" "$(DESTDIR)$(pdfdir)/$$f"; \
+- done
+-
+-uninstall-pdfDATA:
+- @$(NORMAL_UNINSTALL)
+- @list='$(pdf_DATA)'; for p in $$list; do \
+- f=$(am__strip_dir) \
+- echo " rm -f '$(DESTDIR)$(pdfdir)/$$f'"; \
+- rm -f "$(DESTDIR)$(pdfdir)/$$f"; \
+- done
+
+ ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
+ list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
+@@ -783,10 +750,10 @@ distdir: $(DISTFILES)
+ done
+ check-am: all-am
+ check: check-am
+-all-am: Makefile $(LTLIBRARIES) $(PROGRAMS) $(SCRIPTS) $(MANS) $(DATA) \
++all-am: Makefile $(LTLIBRARIES) $(PROGRAMS) $(SCRIPTS) $(MANS) \
+ $(HEADERS)
+ installdirs:
+- for dir in "$(DESTDIR)$(bindir)" "$(DESTDIR)$(bindir)" "$(DESTDIR)$(man1dir)" "$(DESTDIR)$(pdfdir)"; do \
++ for dir in "$(DESTDIR)$(bindir)" "$(DESTDIR)$(bindir)" "$(DESTDIR)$(man1dir)"; do \
+ test -z "$$dir" || $(mkdir_p) "$$dir"; \
+ done
+ install: install-am
+@@ -836,7 +803,7 @@ info: info-am
+
+ info-am:
+
+-install-data-am: install-man install-pdfDATA
++install-data-am: install-man
+
+ install-exec-am: install-binPROGRAMS install-binSCRIPTS
+
+@@ -865,7 +832,7 @@ ps: ps-am
+ ps-am:
+
+ uninstall-am: uninstall-binPROGRAMS uninstall-binSCRIPTS \
+- uninstall-info-am uninstall-man uninstall-pdfDATA
++ uninstall-info-am uninstall-man
+
+ uninstall-man: uninstall-man1
+
+@@ -876,13 +843,12 @@ uninstall-man: uninstall-man1
+ html-am info info-am install install-am install-binPROGRAMS \
+ install-binSCRIPTS install-data install-data-am install-exec \
+ install-exec-am install-info install-info-am install-man \
+- install-man1 install-pdfDATA install-strip installcheck \
+- installcheck-am installdirs maintainer-clean \
+- maintainer-clean-generic mostlyclean mostlyclean-compile \
+- mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \
+- tags uninstall uninstall-am uninstall-binPROGRAMS \
+- uninstall-binSCRIPTS uninstall-info-am uninstall-man \
+- uninstall-man1 uninstall-pdfDATA
++ install-man1 install-strip installcheck installcheck-am \
++ installdirs maintainer-clean maintainer-clean-generic \
++ mostlyclean mostlyclean-compile mostlyclean-generic \
++ mostlyclean-libtool pdf pdf-am ps ps-am tags uninstall \
++ uninstall-am uninstall-binPROGRAMS uninstall-binSCRIPTS \
++ uninstall-info-am uninstall-man uninstall-man1
+
+
+ dot2gxl.1: $(top_srcdir)/tools/src/gxl2dot.1
diff --git a/graphics/graphviz/patches/patch-bx b/graphics/graphviz/patches/patch-bx
new file mode 100644
index 00000000000..b9cdbc8b87d
--- /dev/null
+++ b/graphics/graphviz/patches/patch-bx
@@ -0,0 +1,15 @@
+$NetBSD: patch-bx,v 1.1 2004/11/29 22:11:51 seb Exp $
+
+--- Makefile.am.orig 2004-08-23 13:49:11.000000000 +0000
++++ Makefile.am
+@@ -3,8 +3,8 @@
+ pkgindexdir = $(libdir)/@PACKAGE@
+ pkgindex_DATA = pkgIndex.tcl
+
+-txtdir = $(pkgdatadir)/doc
+-htmldir = $(pkgdatadir)/doc/html
++txtdir = $(prefix)/share/doc/graphviz
++htmldir = $(prefix)/share/doc/html/graphviz
+
+ txt = AUTHORS COPYING ChangeLog NEWS FAQ.txt MINTERMS.txt
+ html = LICENSE.html
diff --git a/graphics/graphviz/patches/patch-by b/graphics/graphviz/patches/patch-by
new file mode 100644
index 00000000000..ce18f62d4e1
--- /dev/null
+++ b/graphics/graphviz/patches/patch-by
@@ -0,0 +1,44 @@
+$NetBSD: patch-by,v 1.1 2004/11/29 22:11:51 seb Exp $
+
+--- Makefile.in.orig 2004-09-14 22:13:40.000000000 +0000
++++ Makefile.in
+@@ -41,9 +41,9 @@ DIST_COMMON = README $(am__configure_dep
+ $(srcdir)/Makefile.in $(srcdir)/ast_common.h.in \
+ $(srcdir)/config.h.in $(srcdir)/graphviz.spec.in \
+ $(top_srcdir)/configure AUTHORS COPYING ChangeLog INSTALL NEWS \
+- config/config.guess config/config.sub config/depcomp \
+- config/install-sh config/ltmain.sh config/missing \
+- config/ylwrap
++ config/config.guess config/config.rpath config/config.sub \
++ config/depcomp config/install-sh config/ltmain.sh \
++ config/missing config/ylwrap
+ subdir = .
+ ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
+ am__aclocal_m4_deps = $(top_srcdir)/configure.ac
+@@ -187,7 +187,6 @@ SOCKET_LIBS = @SOCKET_LIBS@
+ SORT = @SORT@
+ STRIP = @STRIP@
+ TCLINT_INCLUDES = @TCLINT_INCLUDES@
+-TCLSH = @TCLSH@
+ TCL_CFLAGS = @TCL_CFLAGS@
+ TCL_DEFS = @TCL_DEFS@
+ TCL_INCLUDES = @TCL_INCLUDES@
+@@ -213,7 +212,6 @@ TK_VERSION = @TK_VERSION@
+ TK_XINCLUDES = @TK_XINCLUDES@
+ TOP_DIR = @TOP_DIR@
+ VERSION = @VERSION@
+-WISH = @WISH@
+ WITH_MYLIBGD_FALSE = @WITH_MYLIBGD_FALSE@
+ WITH_MYLIBGD_TRUE = @WITH_MYLIBGD_TRUE@
+ WITH_TCL_FALSE = @WITH_TCL_FALSE@
+@@ -282,8 +280,8 @@ target_os = @target_os@
+ target_vendor = @target_vendor@
+ pkgindexdir = $(libdir)/@PACKAGE@
+ pkgindex_DATA = pkgIndex.tcl
+-txtdir = $(pkgdatadir)/doc
+-htmldir = $(pkgdatadir)/doc/html
++txtdir = $(prefix)/share/doc/graphviz
++htmldir = $(prefix)/share/doc/html/graphviz
+ txt = AUTHORS COPYING ChangeLog NEWS FAQ.txt MINTERMS.txt
+ html = LICENSE.html
+ txt_DATA = $(txt)
diff --git a/graphics/graphviz/patches/patch-bz b/graphics/graphviz/patches/patch-bz
new file mode 100644
index 00000000000..dc572505765
--- /dev/null
+++ b/graphics/graphviz/patches/patch-bz
@@ -0,0 +1,19 @@
+$NetBSD: patch-bz,v 1.1 2004/11/29 22:11:51 seb Exp $
+
+--- gd/Makefile.am.orig 2004-08-13 16:41:39.000000000 +0000
++++ gd/Makefile.am
+@@ -4,14 +4,12 @@ html = gd.html
+
+ AM_CPPFLAGS = @FT_INCLUDES@ @FC_INCLUDES@ @PNG_INCLUDES@ @JPEG_INCLUDES@ @Z_INCLUDES@
+
+-htmldir = $(pkgdatadir)/doc/html
+
+ if WITH_MYLIBGD
+ pkginclude_HEADERS = gd.h gd_io.h gdcache.h gdfontg.h gdfontl.h gdfontmb.h \
+ gdfonts.h gdfontt.h gdhelpers.h jisx0208.h wbmp.h gdfx.h entities.h
+ pkglib_LTLIBRARIES = libgvgd.la
+ noinst_PROGRAMS = fontwheeltest fontsizetest gdtestft gddemo circletexttest
+-html_DATA = $(html)
+ endif
+
+ libgvgd_la_SOURCES = gd.c gd_gd.c gd_gd2.c gd_io.c gd_io_dp.c gd_io_file.c \
diff --git a/graphics/graphviz/patches/patch-ca b/graphics/graphviz/patches/patch-ca
new file mode 100644
index 00000000000..ad9269016c4
--- /dev/null
+++ b/graphics/graphviz/patches/patch-ca
@@ -0,0 +1,136 @@
+$NetBSD: patch-ca,v 1.1 2004/11/29 22:11:51 seb Exp $
+
+--- gd/Makefile.in.orig 2004-09-14 22:13:15.000000000 +0000
++++ gd/Makefile.in
+@@ -16,7 +16,6 @@
+
+
+
+-
+ SOURCES = $(libgvgd_la_SOURCES) $(circletexttest_SOURCES) $(fontsizetest_SOURCES) $(fontwheeltest_SOURCES) $(gddemo_SOURCES) $(gdtestft_SOURCES)
+
+ srcdir = @srcdir@
+@@ -62,7 +61,7 @@ am__vpath_adj = case $$p in \
+ *) f=$$p;; \
+ esac;
+ am__strip_dir = `echo $$p | sed -e 's|^.*/||'`;
+-am__installdirs = "$(DESTDIR)$(pkglibdir)" "$(DESTDIR)$(htmldir)" \
++am__installdirs = "$(DESTDIR)$(pkglibdir)" \
+ "$(DESTDIR)$(pkgincludedir)"
+ pkglibLTLIBRARIES_INSTALL = $(INSTALL)
+ LTLIBRARIES = $(pkglib_LTLIBRARIES)
+@@ -108,8 +107,6 @@ SOURCES = $(libgvgd_la_SOURCES) $(circle
+ DIST_SOURCES = $(libgvgd_la_SOURCES) $(circletexttest_SOURCES) \
+ $(fontsizetest_SOURCES) $(fontwheeltest_SOURCES) \
+ $(gddemo_SOURCES) $(gdtestft_SOURCES)
+-htmlDATA_INSTALL = $(INSTALL_DATA)
+-DATA = $(html_DATA)
+ am__pkginclude_HEADERS_DIST = gd.h gd_io.h gdcache.h gdfontg.h \
+ gdfontl.h gdfontmb.h gdfonts.h gdfontt.h gdhelpers.h \
+ jisx0208.h wbmp.h gdfx.h entities.h
+@@ -217,7 +214,6 @@ SOCKET_LIBS = @SOCKET_LIBS@
+ SORT = @SORT@
+ STRIP = @STRIP@
+ TCLINT_INCLUDES = @TCLINT_INCLUDES@
+-TCLSH = @TCLSH@
+ TCL_CFLAGS = @TCL_CFLAGS@
+ TCL_DEFS = @TCL_DEFS@
+ TCL_INCLUDES = @TCL_INCLUDES@
+@@ -243,7 +239,6 @@ TK_VERSION = @TK_VERSION@
+ TK_XINCLUDES = @TK_XINCLUDES@
+ TOP_DIR = @TOP_DIR@
+ VERSION = @VERSION@
+-WISH = @WISH@
+ WITH_MYLIBGD_FALSE = @WITH_MYLIBGD_FALSE@
+ WITH_MYLIBGD_TRUE = @WITH_MYLIBGD_TRUE@
+ WITH_TCL_FALSE = @WITH_TCL_FALSE@
+@@ -312,12 +307,10 @@ target_os = @target_os@
+ target_vendor = @target_vendor@
+ html = gd.html
+ AM_CPPFLAGS = @FT_INCLUDES@ @FC_INCLUDES@ @PNG_INCLUDES@ @JPEG_INCLUDES@ @Z_INCLUDES@
+-htmldir = $(pkgdatadir)/doc/html
+ @WITH_MYLIBGD_TRUE@pkginclude_HEADERS = gd.h gd_io.h gdcache.h gdfontg.h gdfontl.h gdfontmb.h \
+ @WITH_MYLIBGD_TRUE@ gdfonts.h gdfontt.h gdhelpers.h jisx0208.h wbmp.h gdfx.h entities.h
+
+ @WITH_MYLIBGD_TRUE@pkglib_LTLIBRARIES = libgvgd.la
+-@WITH_MYLIBGD_TRUE@html_DATA = $(html)
+ libgvgd_la_SOURCES = gd.c gd_gd.c gd_gd2.c gd_io.c gd_io_dp.c gd_io_file.c \
+ gd_ss.c gd_io_ss.c gd_gif_in.c gd_gif_out.c gd_jpeg.c gd_png.c \
+ gdcache.c gdfontg.c gdfontl.c gdfontmb.c gdfonts.c gdfontt.c \
+@@ -504,23 +497,6 @@ clean-libtool:
+ distclean-libtool:
+ -rm -f libtool
+ uninstall-info-am:
+-install-htmlDATA: $(html_DATA)
+- @$(NORMAL_INSTALL)
+- test -z "$(htmldir)" || $(mkdir_p) "$(DESTDIR)$(htmldir)"
+- @list='$(html_DATA)'; for p in $$list; do \
+- if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
+- f=$(am__strip_dir) \
+- echo " $(htmlDATA_INSTALL) '$$d$$p' '$(DESTDIR)$(htmldir)/$$f'"; \
+- $(htmlDATA_INSTALL) "$$d$$p" "$(DESTDIR)$(htmldir)/$$f"; \
+- done
+-
+-uninstall-htmlDATA:
+- @$(NORMAL_UNINSTALL)
+- @list='$(html_DATA)'; for p in $$list; do \
+- f=$(am__strip_dir) \
+- echo " rm -f '$(DESTDIR)$(htmldir)/$$f'"; \
+- rm -f "$(DESTDIR)$(htmldir)/$$f"; \
+- done
+ install-pkgincludeHEADERS: $(pkginclude_HEADERS)
+ @$(NORMAL_INSTALL)
+ test -z "$(pkgincludedir)" || $(mkdir_p) "$(DESTDIR)$(pkgincludedir)"
+@@ -616,9 +592,9 @@ distdir: $(DISTFILES)
+ done
+ check-am: all-am
+ check: check-am
+-all-am: Makefile $(LTLIBRARIES) $(PROGRAMS) $(DATA) $(HEADERS)
++all-am: Makefile $(LTLIBRARIES) $(PROGRAMS) $(HEADERS)
+ installdirs:
+- for dir in "$(DESTDIR)$(pkglibdir)" "$(DESTDIR)$(htmldir)" "$(DESTDIR)$(pkgincludedir)"; do \
++ for dir in "$(DESTDIR)$(pkglibdir)" "$(DESTDIR)$(pkgincludedir)"; do \
+ test -z "$$dir" || $(mkdir_p) "$$dir"; \
+ done
+ install: install-am
+@@ -667,7 +643,7 @@ info: info-am
+
+ info-am:
+
+-install-data-am: install-htmlDATA install-pkgincludeHEADERS
++install-data-am: install-pkgincludeHEADERS
+
+ install-exec-am: install-pkglibLTLIBRARIES
+
+@@ -695,22 +671,21 @@ ps: ps-am
+
+ ps-am:
+
+-uninstall-am: uninstall-htmlDATA uninstall-info-am \
+- uninstall-pkgincludeHEADERS uninstall-pkglibLTLIBRARIES
++uninstall-am: uninstall-info-am uninstall-pkgincludeHEADERS \
++ uninstall-pkglibLTLIBRARIES
+
+ .PHONY: CTAGS GTAGS all all-am check check-am clean clean-generic \
+ clean-libtool clean-noinstPROGRAMS clean-pkglibLTLIBRARIES \
+ ctags distclean distclean-compile distclean-generic \
+ distclean-libtool distclean-tags distdir dvi dvi-am html \
+ html-am info info-am install install-am install-data \
+- install-data-am install-exec install-exec-am install-htmlDATA \
+- install-info install-info-am install-man \
+- install-pkgincludeHEADERS install-pkglibLTLIBRARIES \
+- install-strip installcheck installcheck-am installdirs \
+- maintainer-clean maintainer-clean-generic mostlyclean \
+- mostlyclean-compile mostlyclean-generic mostlyclean-libtool \
+- pdf pdf-am ps ps-am tags uninstall uninstall-am \
+- uninstall-htmlDATA uninstall-info-am \
++ install-data-am install-exec install-exec-am install-info \
++ install-info-am install-man install-pkgincludeHEADERS \
++ install-pkglibLTLIBRARIES install-strip installcheck \
++ installcheck-am installdirs maintainer-clean \
++ maintainer-clean-generic mostlyclean mostlyclean-compile \
++ mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \
++ tags uninstall uninstall-am uninstall-info-am \
+ uninstall-pkgincludeHEADERS uninstall-pkglibLTLIBRARIES
+
+
diff --git a/graphics/graphviz/patches/patch-cb b/graphics/graphviz/patches/patch-cb
new file mode 100644
index 00000000000..4f2bfa144a1
--- /dev/null
+++ b/graphics/graphviz/patches/patch-cb
@@ -0,0 +1,13 @@
+$NetBSD: patch-cb,v 1.1 2004/11/29 22:11:51 seb Exp $
+
+--- graphs/directed/Makefile.am.orig 2004-08-18 16:27:57.000000000 +0000
++++ graphs/directed/Makefile.am
+@@ -10,7 +10,7 @@ GRAPHS = KW91.dot Latin1.dot NaN.dot abs
+ structs.dot table.dot train11.dot trapeziumlr.dot tree.dot triedds.dot \
+ try.dot unix.dot unix2.dot viewfile.dot world.dot switch.dot
+
+-graphdir = $(pkgdatadir)/graphs
++graphdir = $(prefix)/share/examples/graphviz/graphs
+ directeddir = $(graphdir)/directed
+ directed_DATA = $(GRAPHS)
+
diff --git a/graphics/graphviz/patches/patch-cc b/graphics/graphviz/patches/patch-cc
new file mode 100644
index 00000000000..0b62c63a6e9
--- /dev/null
+++ b/graphics/graphviz/patches/patch-cc
@@ -0,0 +1,29 @@
+$NetBSD: patch-cc,v 1.1 2004/11/29 22:11:51 seb Exp $
+
+--- graphs/directed/Makefile.in.orig 2004-09-14 22:13:18.000000000 +0000
++++ graphs/directed/Makefile.in
+@@ -157,7 +157,6 @@ SOCKET_LIBS = @SOCKET_LIBS@
+ SORT = @SORT@
+ STRIP = @STRIP@
+ TCLINT_INCLUDES = @TCLINT_INCLUDES@
+-TCLSH = @TCLSH@
+ TCL_CFLAGS = @TCL_CFLAGS@
+ TCL_DEFS = @TCL_DEFS@
+ TCL_INCLUDES = @TCL_INCLUDES@
+@@ -183,7 +182,6 @@ TK_VERSION = @TK_VERSION@
+ TK_XINCLUDES = @TK_XINCLUDES@
+ TOP_DIR = @TOP_DIR@
+ VERSION = @VERSION@
+-WISH = @WISH@
+ WITH_MYLIBGD_FALSE = @WITH_MYLIBGD_FALSE@
+ WITH_MYLIBGD_TRUE = @WITH_MYLIBGD_TRUE@
+ WITH_TCL_FALSE = @WITH_TCL_FALSE@
+@@ -260,7 +258,7 @@ GRAPHS = KW91.dot Latin1.dot NaN.dot abs
+ structs.dot table.dot train11.dot trapeziumlr.dot tree.dot triedds.dot \
+ try.dot unix.dot unix2.dot viewfile.dot world.dot switch.dot
+
+-graphdir = $(pkgdatadir)/graphs
++graphdir = $(prefix)/share/examples/graphviz/graphs
+ directeddir = $(graphdir)/directed
+ directed_DATA = $(GRAPHS)
+ EXTRA_DIST = $(GRAPHS)
diff --git a/graphics/graphviz/patches/patch-cd b/graphics/graphviz/patches/patch-cd
new file mode 100644
index 00000000000..629005a4acf
--- /dev/null
+++ b/graphics/graphviz/patches/patch-cd
@@ -0,0 +1,13 @@
+$NetBSD: patch-cd,v 1.1 2004/11/29 22:11:51 seb Exp $
+
+--- graphs/undirected/Makefile.am.orig 2004-07-26 16:52:10.000000000 +0000
++++ graphs/undirected/Makefile.am
+@@ -2,7 +2,7 @@
+
+ GRAPHS = ER.dot ngk10_4.dot process.dot Heawood.dot Petersen.dot
+
+-graphdir = $(pkgdatadir)/graphs
++graphdir = $(prefix)/share/examples/graphviz/graphs
+ undirecteddir = $(graphdir)/undirected
+ undirected_DATA = $(GRAPHS)
+
diff --git a/graphics/graphviz/patches/patch-ce b/graphics/graphviz/patches/patch-ce
new file mode 100644
index 00000000000..63fbc9ef726
--- /dev/null
+++ b/graphics/graphviz/patches/patch-ce
@@ -0,0 +1,29 @@
+$NetBSD: patch-ce,v 1.1 2004/11/29 22:11:51 seb Exp $
+
+--- graphs/undirected/Makefile.in.orig 2004-09-14 22:13:19.000000000 +0000
++++ graphs/undirected/Makefile.in
+@@ -157,7 +157,6 @@ SOCKET_LIBS = @SOCKET_LIBS@
+ SORT = @SORT@
+ STRIP = @STRIP@
+ TCLINT_INCLUDES = @TCLINT_INCLUDES@
+-TCLSH = @TCLSH@
+ TCL_CFLAGS = @TCL_CFLAGS@
+ TCL_DEFS = @TCL_DEFS@
+ TCL_INCLUDES = @TCL_INCLUDES@
+@@ -183,7 +182,6 @@ TK_VERSION = @TK_VERSION@
+ TK_XINCLUDES = @TK_XINCLUDES@
+ TOP_DIR = @TOP_DIR@
+ VERSION = @VERSION@
+-WISH = @WISH@
+ WITH_MYLIBGD_FALSE = @WITH_MYLIBGD_FALSE@
+ WITH_MYLIBGD_TRUE = @WITH_MYLIBGD_TRUE@
+ WITH_TCL_FALSE = @WITH_TCL_FALSE@
+@@ -251,7 +249,7 @@ target_cpu = @target_cpu@
+ target_os = @target_os@
+ target_vendor = @target_vendor@
+ GRAPHS = ER.dot ngk10_4.dot process.dot Heawood.dot Petersen.dot
+-graphdir = $(pkgdatadir)/graphs
++graphdir = $(prefix)/share/examples/graphviz/graphs
+ undirecteddir = $(graphdir)/undirected
+ undirected_DATA = $(GRAPHS)
+ EXTRA_DIST = $(GRAPHS)
diff --git a/graphics/graphviz/patches/patch-cf b/graphics/graphviz/patches/patch-cf
new file mode 100644
index 00000000000..69b7f03f8a0
--- /dev/null
+++ b/graphics/graphviz/patches/patch-cf
@@ -0,0 +1,20 @@
+$NetBSD: patch-cf,v 1.1 2004/11/29 22:11:51 seb Exp $
+
+--- dynagraph/Makefile.am.orig 2004-07-26 16:52:08.000000000 +0000
++++ dynagraph/Makefile.am
+@@ -2,7 +2,6 @@
+
+ SUBDIRS = common dynadag fdp graphsearch incrface shortspline voronoi
+
+-htmldir = $(pkgdatadir)/doc/html
+
+ html = dynagraph.html
+
+@@ -17,7 +16,6 @@ AM_CFLAGS = -DDATE="\"`date`\""
+ if ENABLE_DYNAGRAPH
+ bin_PROGRAMS = dynagraph
+ noinst_PROGRAMS = gengraph
+-html_DATA = $(html)
+ endif
+
+ gengraph_SOURCES = gengraph.cpp
diff --git a/graphics/graphviz/patches/patch-cg b/graphics/graphviz/patches/patch-cg
new file mode 100644
index 00000000000..17a6de1189b
--- /dev/null
+++ b/graphics/graphviz/patches/patch-cg
@@ -0,0 +1,146 @@
+$NetBSD: patch-cg,v 1.1 2004/11/29 22:11:51 seb Exp $
+
+--- dynagraph/Makefile.in.orig 2004-09-14 22:13:10.000000000 +0000
++++ dynagraph/Makefile.in
+@@ -14,7 +14,6 @@
+
+ @SET_MAKE@
+
+-
+ SOURCES = $(dynagraph_SOURCES) $(gengraph_SOURCES)
+
+ srcdir = @srcdir@
+@@ -51,7 +50,7 @@ am__configure_deps = $(am__aclocal_m4_de
+ mkinstalldirs = $(install_sh) -d
+ CONFIG_HEADER = $(top_builddir)/config.h
+ CONFIG_CLEAN_FILES =
+-am__installdirs = "$(DESTDIR)$(bindir)" "$(DESTDIR)$(htmldir)"
++am__installdirs = "$(DESTDIR)$(bindir)"
+ binPROGRAMS_INSTALL = $(INSTALL_PROGRAM)
+ PROGRAMS = $(bin_PROGRAMS) $(noinst_PROGRAMS)
+ am_dynagraph_OBJECTS = main.$(OBJEXT)
+@@ -91,14 +90,6 @@ RECURSIVE_TARGETS = all-recursive check-
+ install-recursive installcheck-recursive installdirs-recursive \
+ pdf-recursive ps-recursive uninstall-info-recursive \
+ uninstall-recursive
+-am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`;
+-am__vpath_adj = case $$p in \
+- $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \
+- *) f=$$p;; \
+- esac;
+-am__strip_dir = `echo $$p | sed -e 's|^.*/||'`;
+-htmlDATA_INSTALL = $(INSTALL_DATA)
+-DATA = $(html_DATA)
+ ETAGS = etags
+ CTAGS = ctags
+ DIST_SUBDIRS = $(SUBDIRS)
+@@ -202,7 +193,6 @@ SOCKET_LIBS = @SOCKET_LIBS@
+ SORT = @SORT@
+ STRIP = @STRIP@
+ TCLINT_INCLUDES = @TCLINT_INCLUDES@
+-TCLSH = @TCLSH@
+ TCL_CFLAGS = @TCL_CFLAGS@
+ TCL_DEFS = @TCL_DEFS@
+ TCL_INCLUDES = @TCL_INCLUDES@
+@@ -228,7 +218,6 @@ TK_VERSION = @TK_VERSION@
+ TK_XINCLUDES = @TK_XINCLUDES@
+ TOP_DIR = @TOP_DIR@
+ VERSION = @VERSION@
+-WISH = @WISH@
+ WITH_MYLIBGD_FALSE = @WITH_MYLIBGD_FALSE@
+ WITH_MYLIBGD_TRUE = @WITH_MYLIBGD_TRUE@
+ WITH_TCL_FALSE = @WITH_TCL_FALSE@
+@@ -296,7 +285,6 @@ target_cpu = @target_cpu@
+ target_os = @target_os@
+ target_vendor = @target_vendor@
+ SUBDIRS = common dynadag fdp graphsearch incrface shortspline voronoi
+-htmldir = $(pkgdatadir)/doc/html
+ html = dynagraph.html
+ AM_CPPFLAGS = \
+ -I$(top_srcdir) \
+@@ -305,7 +293,6 @@ AM_CPPFLAGS = \
+ -I$(top_srcdir)/cdt
+
+ AM_CFLAGS = -DDATE="\"`date`\""
+-@ENABLE_DYNAGRAPH_TRUE@html_DATA = $(html)
+ gengraph_SOURCES = gengraph.cpp
+ gengraph_LDADD = $(top_builddir)/dynagraph/common/libdynagraph.la \
+ $(top_builddir)/agraph/libagraph.la \
+@@ -439,23 +426,6 @@ clean-libtool:
+ distclean-libtool:
+ -rm -f libtool
+ uninstall-info-am:
+-install-htmlDATA: $(html_DATA)
+- @$(NORMAL_INSTALL)
+- test -z "$(htmldir)" || $(mkdir_p) "$(DESTDIR)$(htmldir)"
+- @list='$(html_DATA)'; for p in $$list; do \
+- if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
+- f=$(am__strip_dir) \
+- echo " $(htmlDATA_INSTALL) '$$d$$p' '$(DESTDIR)$(htmldir)/$$f'"; \
+- $(htmlDATA_INSTALL) "$$d$$p" "$(DESTDIR)$(htmldir)/$$f"; \
+- done
+-
+-uninstall-htmlDATA:
+- @$(NORMAL_UNINSTALL)
+- @list='$(html_DATA)'; for p in $$list; do \
+- f=$(am__strip_dir) \
+- echo " rm -f '$(DESTDIR)$(htmldir)/$$f'"; \
+- rm -f "$(DESTDIR)$(htmldir)/$$f"; \
+- done
+
+ # This directory's subdirectories are mostly independent; you can cd
+ # into them and run `make' without going through this Makefile.
+@@ -621,10 +591,10 @@ distdir: $(DISTFILES)
+ done
+ check-am: all-am
+ check: check-recursive
+-all-am: Makefile $(PROGRAMS) $(DATA)
++all-am: Makefile $(PROGRAMS)
+ installdirs: installdirs-recursive
+ installdirs-am:
+- for dir in "$(DESTDIR)$(bindir)" "$(DESTDIR)$(htmldir)"; do \
++ for dir in "$(DESTDIR)$(bindir)"; do \
+ test -z "$$dir" || $(mkdir_p) "$$dir"; \
+ done
+ install: install-recursive
+@@ -672,7 +642,7 @@ info: info-recursive
+
+ info-am:
+
+-install-data-am: install-htmlDATA
++install-data-am:
+
+ install-exec-am: install-binPROGRAMS
+
+@@ -700,8 +670,7 @@ ps: ps-recursive
+
+ ps-am:
+
+-uninstall-am: uninstall-binPROGRAMS uninstall-htmlDATA \
+- uninstall-info-am
++uninstall-am: uninstall-binPROGRAMS uninstall-info-am
+
+ uninstall-info: uninstall-info-recursive
+
+@@ -712,14 +681,13 @@ uninstall-info: uninstall-info-recursive
+ distclean-libtool distclean-recursive distclean-tags distdir \
+ dvi dvi-am html html-am info info-am install install-am \
+ install-binPROGRAMS install-data install-data-am install-exec \
+- install-exec-am install-htmlDATA install-info install-info-am \
+- install-man install-strip installcheck installcheck-am \
+- installdirs installdirs-am maintainer-clean \
+- maintainer-clean-generic maintainer-clean-recursive \
+- mostlyclean mostlyclean-compile mostlyclean-generic \
+- mostlyclean-libtool mostlyclean-recursive pdf pdf-am ps ps-am \
+- tags tags-recursive uninstall uninstall-am \
+- uninstall-binPROGRAMS uninstall-htmlDATA uninstall-info-am
++ install-exec-am install-info install-info-am install-man \
++ install-strip installcheck installcheck-am installdirs \
++ installdirs-am maintainer-clean maintainer-clean-generic \
++ maintainer-clean-recursive mostlyclean mostlyclean-compile \
++ mostlyclean-generic mostlyclean-libtool mostlyclean-recursive \
++ pdf pdf-am ps ps-am tags tags-recursive uninstall uninstall-am \
++ uninstall-binPROGRAMS uninstall-info-am
+
+ # Tell versions [3.59,3.63) of GNU make to not export all variables.
+ # Otherwise a system limit (for SysV at least) may be exceeded.
diff --git a/graphics/graphviz/patches/patch-ch b/graphics/graphviz/patches/patch-ch
new file mode 100644
index 00000000000..43c8883a8e6
--- /dev/null
+++ b/graphics/graphviz/patches/patch-ch
@@ -0,0 +1,12 @@
+$NetBSD: patch-ch,v 1.1 2004/11/29 22:11:51 seb Exp $
+
+--- lefty/examples/Makefile.am.orig 2004-07-26 16:52:11.000000000 +0000
++++ lefty/examples/Makefile.am
+@@ -1,6 +1,6 @@
+ ## Process this file with automake to produce Makefile.in
+
+-leftydir = $(pkgdatadir)/lefty
++leftydir = $(prefix)/share/examples/graphviz/lefty
+
+ lefty_SCRIPTS = box.lefty def.lefty fractal.lefty fractal2.lefty \
+ slides.lefty tree.lefty
diff --git a/graphics/graphviz/patches/patch-ci b/graphics/graphviz/patches/patch-ci
new file mode 100644
index 00000000000..73109daf3ed
--- /dev/null
+++ b/graphics/graphviz/patches/patch-ci
@@ -0,0 +1,29 @@
+$NetBSD: patch-ci,v 1.1 2004/11/29 22:11:51 seb Exp $
+
+--- lefty/examples/Makefile.in.orig 2004-09-14 22:13:22.000000000 +0000
++++ lefty/examples/Makefile.in
+@@ -151,7 +151,6 @@ SOCKET_LIBS = @SOCKET_LIBS@
+ SORT = @SORT@
+ STRIP = @STRIP@
+ TCLINT_INCLUDES = @TCLINT_INCLUDES@
+-TCLSH = @TCLSH@
+ TCL_CFLAGS = @TCL_CFLAGS@
+ TCL_DEFS = @TCL_DEFS@
+ TCL_INCLUDES = @TCL_INCLUDES@
+@@ -177,7 +176,6 @@ TK_VERSION = @TK_VERSION@
+ TK_XINCLUDES = @TK_XINCLUDES@
+ TOP_DIR = @TOP_DIR@
+ VERSION = @VERSION@
+-WISH = @WISH@
+ WITH_MYLIBGD_FALSE = @WITH_MYLIBGD_FALSE@
+ WITH_MYLIBGD_TRUE = @WITH_MYLIBGD_TRUE@
+ WITH_TCL_FALSE = @WITH_TCL_FALSE@
+@@ -244,7 +242,7 @@ target_alias = @target_alias@
+ target_cpu = @target_cpu@
+ target_os = @target_os@
+ target_vendor = @target_vendor@
+-leftydir = $(pkgdatadir)/lefty
++leftydir = $(prefix)/share/examples/graphviz/lefty
+ lefty_SCRIPTS = box.lefty def.lefty fractal.lefty fractal2.lefty \
+ slides.lefty tree.lefty
+
diff --git a/graphics/graphviz/patches/patch-cj b/graphics/graphviz/patches/patch-cj
new file mode 100644
index 00000000000..de32681b450
--- /dev/null
+++ b/graphics/graphviz/patches/patch-cj
@@ -0,0 +1,12 @@
+$NetBSD: patch-cj,v 1.1 2004/11/29 22:11:51 seb Exp $
+
+--- dotneato/circogen/Makefile.am.orig 2004-08-12 22:29:41.000000000 +0000
++++ dotneato/circogen/Makefile.am
+@@ -1,6 +1,6 @@
+ ## Process this file with automake to produce Makefile.in
+
+-pkgconfigdir = $(pkglibdir)/pkgconfig
++pkgconfigdir = $(libdir)/pkgconfig
+
+ AM_CPPFLAGS = \
+ -I$(top_srcdir) \
diff --git a/graphics/graphviz/patches/patch-ck b/graphics/graphviz/patches/patch-ck
new file mode 100644
index 00000000000..e718b72a9ec
--- /dev/null
+++ b/graphics/graphviz/patches/patch-ck
@@ -0,0 +1,29 @@
+$NetBSD: patch-ck,v 1.1 2004/11/29 22:11:51 seb Exp $
+
+--- dotneato/circogen/Makefile.in.orig 2004-09-14 22:13:03.000000000 +0000
++++ dotneato/circogen/Makefile.in
+@@ -186,7 +186,6 @@ SOCKET_LIBS = @SOCKET_LIBS@
+ SORT = @SORT@
+ STRIP = @STRIP@
+ TCLINT_INCLUDES = @TCLINT_INCLUDES@
+-TCLSH = @TCLSH@
+ TCL_CFLAGS = @TCL_CFLAGS@
+ TCL_DEFS = @TCL_DEFS@
+ TCL_INCLUDES = @TCL_INCLUDES@
+@@ -212,7 +211,6 @@ TK_VERSION = @TK_VERSION@
+ TK_XINCLUDES = @TK_XINCLUDES@
+ TOP_DIR = @TOP_DIR@
+ VERSION = @VERSION@
+-WISH = @WISH@
+ WITH_MYLIBGD_FALSE = @WITH_MYLIBGD_FALSE@
+ WITH_MYLIBGD_TRUE = @WITH_MYLIBGD_TRUE@
+ WITH_TCL_FALSE = @WITH_TCL_FALSE@
+@@ -279,7 +277,7 @@ target_alias = @target_alias@
+ target_cpu = @target_cpu@
+ target_os = @target_os@
+ target_vendor = @target_vendor@
+-pkgconfigdir = $(pkglibdir)/pkgconfig
++pkgconfigdir = $(libdir)/pkgconfig
+ AM_CPPFLAGS = \
+ -I$(top_srcdir) \
+ -I$(top_srcdir)/dotneato/common \
diff --git a/graphics/graphviz/patches/patch-cl b/graphics/graphviz/patches/patch-cl
new file mode 100644
index 00000000000..d302faec67b
--- /dev/null
+++ b/graphics/graphviz/patches/patch-cl
@@ -0,0 +1,12 @@
+$NetBSD: patch-cl,v 1.1 2004/11/29 22:11:51 seb Exp $
+
+--- dotneato/common/Makefile.am.orig 2004-08-12 22:29:41.000000000 +0000
++++ dotneato/common/Makefile.am
+@@ -1,6 +1,6 @@
+ ## Process this file with automake to produce Makefile.in
+
+-pkgconfigdir = $(pkglibdir)/pkgconfig
++pkgconfigdir = $(libdir)/pkgconfig
+
+ AM_CPPFLAGS = \
+ -I$(top_srcdir) \
diff --git a/graphics/graphviz/patches/patch-cm b/graphics/graphviz/patches/patch-cm
new file mode 100644
index 00000000000..058875dace3
--- /dev/null
+++ b/graphics/graphviz/patches/patch-cm
@@ -0,0 +1,29 @@
+$NetBSD: patch-cm,v 1.1 2004/11/29 22:11:51 seb Exp $
+
+--- dotneato/common/Makefile.in.orig 2004-09-14 22:13:03.000000000 +0000
++++ dotneato/common/Makefile.in
+@@ -192,7 +192,6 @@ SOCKET_LIBS = @SOCKET_LIBS@
+ SORT = @SORT@
+ STRIP = @STRIP@
+ TCLINT_INCLUDES = @TCLINT_INCLUDES@
+-TCLSH = @TCLSH@
+ TCL_CFLAGS = @TCL_CFLAGS@
+ TCL_DEFS = @TCL_DEFS@
+ TCL_INCLUDES = @TCL_INCLUDES@
+@@ -218,7 +217,6 @@ TK_VERSION = @TK_VERSION@
+ TK_XINCLUDES = @TK_XINCLUDES@
+ TOP_DIR = @TOP_DIR@
+ VERSION = @VERSION@
+-WISH = @WISH@
+ WITH_MYLIBGD_FALSE = @WITH_MYLIBGD_FALSE@
+ WITH_MYLIBGD_TRUE = @WITH_MYLIBGD_TRUE@
+ WITH_TCL_FALSE = @WITH_TCL_FALSE@
+@@ -285,7 +283,7 @@ target_alias = @target_alias@
+ target_cpu = @target_cpu@
+ target_os = @target_os@
+ target_vendor = @target_vendor@
+-pkgconfigdir = $(pkglibdir)/pkgconfig
++pkgconfigdir = $(libdir)/pkgconfig
+ AM_CPPFLAGS = \
+ -I$(top_srcdir) \
+ -I$(top_srcdir)/dotneato/gvrender \
diff --git a/graphics/graphviz/patches/patch-cn b/graphics/graphviz/patches/patch-cn
new file mode 100644
index 00000000000..513e5d138ce
--- /dev/null
+++ b/graphics/graphviz/patches/patch-cn
@@ -0,0 +1,12 @@
+$NetBSD: patch-cn,v 1.1 2004/11/29 22:11:51 seb Exp $
+
+--- dotneato/dotgen/Makefile.am.orig 2004-08-12 22:29:42.000000000 +0000
++++ dotneato/dotgen/Makefile.am
+@@ -1,6 +1,6 @@
+ ## Process this file with automake to produce Makefile.in
+
+-pkgconfigdir = $(pkglibdir)/pkgconfig
++pkgconfigdir = $(libdir)/pkgconfig
+
+ AM_CPPFLAGS = \
+ -I$(top_srcdir) \
diff --git a/graphics/graphviz/patches/patch-co b/graphics/graphviz/patches/patch-co
new file mode 100644
index 00000000000..dd21a1776b6
--- /dev/null
+++ b/graphics/graphviz/patches/patch-co
@@ -0,0 +1,29 @@
+$NetBSD: patch-co,v 1.1 2004/11/29 22:11:51 seb Exp $
+
+--- dotneato/dotgen/Makefile.in.orig 2004-09-14 22:13:04.000000000 +0000
++++ dotneato/dotgen/Makefile.in
+@@ -189,7 +189,6 @@ SOCKET_LIBS = @SOCKET_LIBS@
+ SORT = @SORT@
+ STRIP = @STRIP@
+ TCLINT_INCLUDES = @TCLINT_INCLUDES@
+-TCLSH = @TCLSH@
+ TCL_CFLAGS = @TCL_CFLAGS@
+ TCL_DEFS = @TCL_DEFS@
+ TCL_INCLUDES = @TCL_INCLUDES@
+@@ -215,7 +214,6 @@ TK_VERSION = @TK_VERSION@
+ TK_XINCLUDES = @TK_XINCLUDES@
+ TOP_DIR = @TOP_DIR@
+ VERSION = @VERSION@
+-WISH = @WISH@
+ WITH_MYLIBGD_FALSE = @WITH_MYLIBGD_FALSE@
+ WITH_MYLIBGD_TRUE = @WITH_MYLIBGD_TRUE@
+ WITH_TCL_FALSE = @WITH_TCL_FALSE@
+@@ -282,7 +280,7 @@ target_alias = @target_alias@
+ target_cpu = @target_cpu@
+ target_os = @target_os@
+ target_vendor = @target_vendor@
+-pkgconfigdir = $(pkglibdir)/pkgconfig
++pkgconfigdir = $(libdir)/pkgconfig
+ AM_CPPFLAGS = \
+ -I$(top_srcdir) \
+ -I$(top_srcdir)/dotneato/common \
diff --git a/graphics/graphviz/patches/patch-cp b/graphics/graphviz/patches/patch-cp
new file mode 100644
index 00000000000..d90a05b2a0a
--- /dev/null
+++ b/graphics/graphviz/patches/patch-cp
@@ -0,0 +1,12 @@
+$NetBSD: patch-cp,v 1.1 2004/11/29 22:11:51 seb Exp $
+
+--- dotneato/fdpgen/Makefile.am.orig 2004-08-12 22:29:42.000000000 +0000
++++ dotneato/fdpgen/Makefile.am
+@@ -1,6 +1,6 @@
+ ## Process this file with automake to produce Makefile.in
+
+-pkgconfigdir = $(pkglibdir)/pkgconfig
++pkgconfigdir = $(libdir)/pkgconfig
+
+ AM_CPPFLAGS = \
+ -I$(top_srcdir) \
diff --git a/graphics/graphviz/patches/patch-cq b/graphics/graphviz/patches/patch-cq
new file mode 100644
index 00000000000..dbf899c681e
--- /dev/null
+++ b/graphics/graphviz/patches/patch-cq
@@ -0,0 +1,29 @@
+$NetBSD: patch-cq,v 1.1 2004/11/29 22:11:51 seb Exp $
+
+--- dotneato/fdpgen/Makefile.in.orig 2004-09-14 22:13:05.000000000 +0000
++++ dotneato/fdpgen/Makefile.in
+@@ -185,7 +185,6 @@ SOCKET_LIBS = @SOCKET_LIBS@
+ SORT = @SORT@
+ STRIP = @STRIP@
+ TCLINT_INCLUDES = @TCLINT_INCLUDES@
+-TCLSH = @TCLSH@
+ TCL_CFLAGS = @TCL_CFLAGS@
+ TCL_DEFS = @TCL_DEFS@
+ TCL_INCLUDES = @TCL_INCLUDES@
+@@ -211,7 +210,6 @@ TK_VERSION = @TK_VERSION@
+ TK_XINCLUDES = @TK_XINCLUDES@
+ TOP_DIR = @TOP_DIR@
+ VERSION = @VERSION@
+-WISH = @WISH@
+ WITH_MYLIBGD_FALSE = @WITH_MYLIBGD_FALSE@
+ WITH_MYLIBGD_TRUE = @WITH_MYLIBGD_TRUE@
+ WITH_TCL_FALSE = @WITH_TCL_FALSE@
+@@ -278,7 +276,7 @@ target_alias = @target_alias@
+ target_cpu = @target_cpu@
+ target_os = @target_os@
+ target_vendor = @target_vendor@
+-pkgconfigdir = $(pkglibdir)/pkgconfig
++pkgconfigdir = $(libdir)/pkgconfig
+ AM_CPPFLAGS = \
+ -I$(top_srcdir) \
+ -I$(top_srcdir)/dotneato/common \
diff --git a/graphics/graphviz/patches/patch-cr b/graphics/graphviz/patches/patch-cr
new file mode 100644
index 00000000000..410763e020f
--- /dev/null
+++ b/graphics/graphviz/patches/patch-cr
@@ -0,0 +1,12 @@
+$NetBSD: patch-cr,v 1.1 2004/11/29 22:11:51 seb Exp $
+
+--- dotneato/gvrender/Makefile.am.orig 2004-08-12 22:29:42.000000000 +0000
++++ dotneato/gvrender/Makefile.am
+@@ -1,6 +1,6 @@
+ ## Process this file with automake to produce Makefile.in
+
+-pkgconfigdir = $(pkglibdir)/pkgconfig
++pkgconfigdir = $(libdir)/pkgconfig
+
+ AM_CPPFLAGS = \
+ -I$(top_srcdir) \
diff --git a/graphics/graphviz/patches/patch-cs b/graphics/graphviz/patches/patch-cs
new file mode 100644
index 00000000000..ad415542fa7
--- /dev/null
+++ b/graphics/graphviz/patches/patch-cs
@@ -0,0 +1,29 @@
+$NetBSD: patch-cs,v 1.1 2004/11/29 22:11:51 seb Exp $
+
+--- dotneato/gvrender/Makefile.in.orig 2004-09-14 22:13:06.000000000 +0000
++++ dotneato/gvrender/Makefile.in
+@@ -185,7 +185,6 @@ SOCKET_LIBS = @SOCKET_LIBS@
+ SORT = @SORT@
+ STRIP = @STRIP@
+ TCLINT_INCLUDES = @TCLINT_INCLUDES@
+-TCLSH = @TCLSH@
+ TCL_CFLAGS = @TCL_CFLAGS@
+ TCL_DEFS = @TCL_DEFS@
+ TCL_INCLUDES = @TCL_INCLUDES@
+@@ -211,7 +210,6 @@ TK_VERSION = @TK_VERSION@
+ TK_XINCLUDES = @TK_XINCLUDES@
+ TOP_DIR = @TOP_DIR@
+ VERSION = @VERSION@
+-WISH = @WISH@
+ WITH_MYLIBGD_FALSE = @WITH_MYLIBGD_FALSE@
+ WITH_MYLIBGD_TRUE = @WITH_MYLIBGD_TRUE@
+ WITH_TCL_FALSE = @WITH_TCL_FALSE@
+@@ -278,7 +276,7 @@ target_alias = @target_alias@
+ target_cpu = @target_cpu@
+ target_os = @target_os@
+ target_vendor = @target_vendor@
+-pkgconfigdir = $(pkglibdir)/pkgconfig
++pkgconfigdir = $(libdir)/pkgconfig
+ AM_CPPFLAGS = \
+ -I$(top_srcdir) \
+ -I$(top_srcdir)/dotneato/common \
diff --git a/graphics/graphviz/patches/patch-ct b/graphics/graphviz/patches/patch-ct
new file mode 100644
index 00000000000..0b51d350568
--- /dev/null
+++ b/graphics/graphviz/patches/patch-ct
@@ -0,0 +1,12 @@
+$NetBSD: patch-ct,v 1.1 2004/11/29 22:11:51 seb Exp $
+
+--- dotneato/neatogen/Makefile.am.orig 2004-08-12 22:29:42.000000000 +0000
++++ dotneato/neatogen/Makefile.am
+@@ -1,6 +1,6 @@
+ ## Process this file with automake to produce Makefile.in
+
+-pkgconfigdir = $(pkglibdir)/pkgconfig
++pkgconfigdir = $(libdir)/pkgconfig
+
+ AM_CPPFLAGS = \
+ -I$(top_srcdir) \
diff --git a/graphics/graphviz/patches/patch-cu b/graphics/graphviz/patches/patch-cu
new file mode 100644
index 00000000000..1bf96975803
--- /dev/null
+++ b/graphics/graphviz/patches/patch-cu
@@ -0,0 +1,29 @@
+$NetBSD: patch-cu,v 1.1 2004/11/29 22:11:51 seb Exp $
+
+--- dotneato/neatogen/Makefile.in.orig 2004-09-14 22:13:07.000000000 +0000
++++ dotneato/neatogen/Makefile.in
+@@ -192,7 +192,6 @@ SOCKET_LIBS = @SOCKET_LIBS@
+ SORT = @SORT@
+ STRIP = @STRIP@
+ TCLINT_INCLUDES = @TCLINT_INCLUDES@
+-TCLSH = @TCLSH@
+ TCL_CFLAGS = @TCL_CFLAGS@
+ TCL_DEFS = @TCL_DEFS@
+ TCL_INCLUDES = @TCL_INCLUDES@
+@@ -218,7 +217,6 @@ TK_VERSION = @TK_VERSION@
+ TK_XINCLUDES = @TK_XINCLUDES@
+ TOP_DIR = @TOP_DIR@
+ VERSION = @VERSION@
+-WISH = @WISH@
+ WITH_MYLIBGD_FALSE = @WITH_MYLIBGD_FALSE@
+ WITH_MYLIBGD_TRUE = @WITH_MYLIBGD_TRUE@
+ WITH_TCL_FALSE = @WITH_TCL_FALSE@
+@@ -285,7 +283,7 @@ target_alias = @target_alias@
+ target_cpu = @target_cpu@
+ target_os = @target_os@
+ target_vendor = @target_vendor@
+-pkgconfigdir = $(pkglibdir)/pkgconfig
++pkgconfigdir = $(libdir)/pkgconfig
+ AM_CPPFLAGS = \
+ -I$(top_srcdir) \
+ -I$(top_srcdir)/dotneato/common \
diff --git a/graphics/graphviz/patches/patch-cv b/graphics/graphviz/patches/patch-cv
new file mode 100644
index 00000000000..11ea50da283
--- /dev/null
+++ b/graphics/graphviz/patches/patch-cv
@@ -0,0 +1,12 @@
+$NetBSD: patch-cv,v 1.1 2004/11/29 22:11:51 seb Exp $
+
+--- dotneato/twopigen/Makefile.am.orig 2004-08-12 22:29:42.000000000 +0000
++++ dotneato/twopigen/Makefile.am
+@@ -1,6 +1,6 @@
+ ## Process this file with automake to produce Makefile.in
+
+-pkgconfigdir = $(pkglibdir)/pkgconfig
++pkgconfigdir = $(libdir)/pkgconfig
+
+ AM_CPPFLAGS = \
+ -I$(top_srcdir) \
diff --git a/graphics/graphviz/patches/patch-cw b/graphics/graphviz/patches/patch-cw
new file mode 100644
index 00000000000..60f68c15358
--- /dev/null
+++ b/graphics/graphviz/patches/patch-cw
@@ -0,0 +1,29 @@
+$NetBSD: patch-cw,v 1.1 2004/11/29 22:11:51 seb Exp $
+
+--- dotneato/twopigen/Makefile.in.orig 2004-09-14 22:13:08.000000000 +0000
++++ dotneato/twopigen/Makefile.in
+@@ -184,7 +184,6 @@ SOCKET_LIBS = @SOCKET_LIBS@
+ SORT = @SORT@
+ STRIP = @STRIP@
+ TCLINT_INCLUDES = @TCLINT_INCLUDES@
+-TCLSH = @TCLSH@
+ TCL_CFLAGS = @TCL_CFLAGS@
+ TCL_DEFS = @TCL_DEFS@
+ TCL_INCLUDES = @TCL_INCLUDES@
+@@ -210,7 +209,6 @@ TK_VERSION = @TK_VERSION@
+ TK_XINCLUDES = @TK_XINCLUDES@
+ TOP_DIR = @TOP_DIR@
+ VERSION = @VERSION@
+-WISH = @WISH@
+ WITH_MYLIBGD_FALSE = @WITH_MYLIBGD_FALSE@
+ WITH_MYLIBGD_TRUE = @WITH_MYLIBGD_TRUE@
+ WITH_TCL_FALSE = @WITH_TCL_FALSE@
+@@ -277,7 +275,7 @@ target_alias = @target_alias@
+ target_cpu = @target_cpu@
+ target_os = @target_os@
+ target_vendor = @target_vendor@
+-pkgconfigdir = $(pkglibdir)/pkgconfig
++pkgconfigdir = $(libdir)/pkgconfig
+ AM_CPPFLAGS = \
+ -I$(top_srcdir) \
+ -I$(top_srcdir)/dotneato/common \