Update to 1.9

Package changes: - Be a specific/verbose about dependencies' includes and libraries directories - Require Xaw type "standard" - Install complete html documentation - Add libiconv dependency - Remove libgd documentation - Add upcoming libcurl support in comments Changes since version 1.8.10: January 23, 2003 - declare this version 1.9 (3-level version numbering has been dropped now that we have nightly snapshot builds with their own extended numbering.) - general - config.h is no longer installed. config.h is generated by ./configure for the current build only. It may not be applicable for derivative builds. - improve ICONV configure tests - lots of janitor-work to clean up warning messages from -Wall - use @OBJEXT@ in Makefile.am so that .obj is used under cygwin - fixes for Solaris builds - use libpng-config if available - reduce long build times due to touching ast_common.h too often - improve dependency tracking. "make -j8" now works with distcc - autogen.sh fixes to work on RH7.3, RH8.0, and Solaris. - eliminate use of suffix rules which confused some makes. - DOT language allows '+' for concatenation of quoted strings - dot, neato, twopi - fix bugs 209, 210, 214, 216, 217, 222, 224, 225, 229, 230, 233, 236, 237 - update gd into alignment with gd-2.0.9 - change to make libagraph output compatible with libgraph input - add shapes: septagon, pentagon, a_ediamond, rect, rectangle - introduce "ND_...", "ED_...", "GD_...", node/edge/graph-data accessor macros in partial preparation for use of libagraph in dot. - add libdotneato.so, dotneato.h, dotneato-config to aid use of dot libraries by user apps based on installed graphviz-devel rpm and without access to graphviz sources. - new xdot output format providing detailed drawing instructions - new -y command line flag, inverts y coordinates - support multple -T when -o given, as in: cat xxx.dot | dot -Tpng -Tcmap -o xxx which produces xxx.png and xxx.cmap from a single layout computation. Intended for use in CGI programs. - agraph - correct callback ordering for deletions - tools - add gxl2dot and dot2gxl for GXL language conversions - gvui now provides *map output - tcldot, tcldgr, tcldgl - improve tcl8.4 support - extend search path for tcl.h to include /usr/local/include/tcl8.4/ in support of BSD install conventions. - dynagraph - many fixes - change to not build dynagraph by default (use --with-dynagraph) - docs - dotguide updates
author: seb <seb> 2003-03-03 11:34:57 +0000
committer: seb <seb> 2003-03-03 11:34:57 +0000
commit: 48f5d9920e9146d31ea02d7273480af5060772a9 (patch)
tree: 13f122fcfbe697d87f93995c69039357bda55f4f /graphics
parent: 54e6192383d68f17f25250bfeb7bf838e6dd38a3 (diff)
download: pkgsrc-48f5d9920e9146d31ea02d7273480af5060772a9.tar.gz
30 files changed, 1029 insertions, 556 deletions
diff --git a/graphics/graphviz/Makefile b/graphics/graphviz/Makefile
index e96fa8afddb..4dd0b8bb2b6 100644
--- a/graphics/graphviz/Makefile
+++ b/graphics/graphviz/Makefile
@@ -1,8 +1,7 @@
-# $NetBSD: Makefile,v 1.9 2002/12/24 06:10:06 wiz Exp $
+# $NetBSD: Makefile,v 1.10 2003/03/03 11:34:57 seb Exp $
 #
 
-DISTNAME=	graphviz-1.8.10
-PKGREVISION=	1
+DISTNAME=	graphviz-1.9
 CATEGORIES=	graphics
 MASTER_SITES=	http://www.graphviz.org/pub/graphviz/ARCHIVE/
 
@@ -17,6 +16,7 @@ USE_BUILDLINK2=		yes
 USE_LIBTOOL=		yes
 USE_X11=		yes
 LIBTOOL_OVERRIDE=	${WRKSRC}/libtool
+XAW_TYPE=		standard
 
 CONFIGURE_ENV+=		TCLCONFIG=${BUILDLINK_PREFIX.tcl}/lib/tclConfig.sh
 CONFIGURE_ENV+=		TKCONFIG=${BUILDLINK_PREFIX.tk}/lib/tkConfig.sh
@@ -24,6 +24,18 @@ CONFIGURE_ENV+=		X11PREFIX=${X11PREFIX} X11BASE=${X11BASE}
 CONFIGURE_ENV+=		BUILDLINK_PREFIX_TCL=${BUILDLINK_PREFIX.tcl}
 CONFIGURE_ENV+=		BUILDLINK_PREFIX_TK=${BUILDLINK_PREFIX.tk}
 
+CONFIGURE_ARGS+=	--with-zincludedir=${BUILDLINK_PREFIX.zlib}/include
+CONFIGURE_ARGS+=	--with-zlibdir=${BUILDLINK_PREFIX.zlib}/lib
+CONFIGURE_ARGS+=	--with-iconvincludedir=${BUILDLINK_PREFIX.iconv}/include
+CONFIGURE_ARGS+=	--with-iconvlibdir=${BUILDLINK_PREFIX.iconv}/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
+# curl support... Not yet
+#CONFIGURE_ARGS+=	--with-curlincludedir=${BUILDLINK_PREFIX.curl}/include
+#CONFIGURE_ARGS+=	--with-curllibdir=${BUILDLINK_PREFIX.curl}/lib
+
 # Dynagraph is left out for now
 #UNLIMIT_RESOURCES=	datasize stacksize memorysize
 CONFIGURE_ARGS+=	--without-dynagraph
@@ -36,24 +48,31 @@ post-extract:
 post-install:
 	${INSTALL_DATA_DIR} ${PREFIX}/share/doc/graphviz
 	${INSTALL_DATA_DIR} ${PREFIX}/share/doc/html/graphviz
-.for __f__ in Dot.ref dotguide.pdf dottyguide.pdf leftyguide.pdf \
+	${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 gd.html tcldot.html
+.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
 
 
-.include "../../devel/zlib/buildlink2.mk"
 .include "../../graphics/png/buildlink2.mk"
+.include "../../devel/zlib/buildlink2.mk"
+.include "../../converters/libiconv/buildlink2.mk"
 .include "../../graphics/jpeg/buildlink2.mk"
 .include "../../graphics/freetype2/buildlink2.mk"
 .include "../../x11/tk/buildlink2.mk"
+# .include "../../www/curl/buildlink2.mk"
+.include "../../textproc/expat/buildlink2.mk"
 .include "../../mk/xaw.buildlink2.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/graphics/graphviz/PLIST b/graphics/graphviz/PLIST
index 82143ee0920..05d4702c394 100644
--- a/graphics/graphviz/PLIST
+++ b/graphics/graphviz/PLIST
@@ -1,13 +1,16 @@
-@comment $NetBSD: PLIST,v 1.4 2002/12/01 18:33:41 seb Exp $
+@comment $NetBSD: PLIST,v 1.5 2003/03/03 11:34:58 seb Exp $
 bin/acyclic
 bin/ccomps
 bin/colorize
 bin/dot
+bin/dot2gxl
+bin/dotneato-config
 bin/dotty
 @comment bin/dynagraph
 bin/gc
 bin/gpr
 @comment bin/graphsearch
+bin/gxl2dot
 bin/lefty
 bin/lneato
 bin/neato
@@ -17,11 +20,18 @@ bin/sccmap
 bin/tred
 bin/twopi
 bin/unflatten
+include/graphviz/adjust.h
 include/graphviz/aghdr.h
 include/graphviz/agraph.h
 include/graphviz/ast_common.h
 include/graphviz/cdt.h
+include/graphviz/circle.h
+include/graphviz/const.h
+include/graphviz/dot.h
+include/graphviz/dotneato.h
+include/graphviz/dotprocs.h
 include/graphviz/dthdr.h
+include/graphviz/edges.h
 include/graphviz/exgram.h
 include/graphviz/exlib.h
 include/graphviz/expr.h
@@ -34,24 +44,42 @@ include/graphviz/gdfontmb.h
 include/graphviz/gdfonts.h
 include/graphviz/gdfontt.h
 include/graphviz/gdhelpers.h
+include/graphviz/geometry.h
+include/graphviz/globals.h
 include/graphviz/grammar.h
 include/graphviz/graph.h
+include/graphviz/heap.h
+include/graphviz/hedges.h
+include/graphviz/info.h
 include/graphviz/jisx0208.h
 include/graphviz/libgraph.h
+include/graphviz/macros.h
 include/graphviz/malloc.h
+include/graphviz/mem.h
+include/graphviz/neato.h
+include/graphviz/neatoprocs.h
 include/graphviz/pack.h
 include/graphviz/parser.h
 include/graphviz/pathgeom.h
 include/graphviz/pathplan.h
 include/graphviz/pathutil.h
 include/graphviz/pointset.h
+include/graphviz/poly.h
+include/graphviz/render.h
+include/graphviz/renderprocs.h
+include/graphviz/simple.h
+include/graphviz/site.h
 include/graphviz/solvers.h
 include/graphviz/tri.h
 include/graphviz/triefa.h
+include/graphviz/types.h
+include/graphviz/utils.h
 include/graphviz/vis.h
 include/graphviz/vispath.h
 include/graphviz/vmstub.h
+include/graphviz/voronoi.h
 include/graphviz/wbmp.h
+include/graphviz/xbuf.h
 lib/graphviz/libagraph.a
 lib/graphviz/libagraph.la
 lib/graphviz/libagraph.so
@@ -62,16 +90,16 @@ lib/graphviz/libcdt.la
 lib/graphviz/libcdt.so
 lib/graphviz/libcdt.so.0
 lib/graphviz/libcdt.so.0.0
+lib/graphviz/libdotneato.a
+lib/graphviz/libdotneato.la
+lib/graphviz/libdotneato.so
+lib/graphviz/libdotneato.so.0
+lib/graphviz/libdotneato.so.0.0
 lib/graphviz/libexpr.a
 lib/graphviz/libexpr.la
 lib/graphviz/libexpr.so
 lib/graphviz/libexpr.so.0
 lib/graphviz/libexpr.so.0.0
-lib/graphviz/libgd.a
-lib/graphviz/libgd.la
-lib/graphviz/libgd.so
-lib/graphviz/libgd.so.0
-lib/graphviz/libgd.so.0.0
 lib/graphviz/libgdtclft.a
 lib/graphviz/libgdtclft.la
 lib/graphviz/libgdtclft.so
@@ -122,9 +150,11 @@ man/man1/acyclic.1
 man/man1/ccomps.1
 man/man1/colorize.1
 man/man1/dot.1
+man/man1/dot2gxl.1
 man/man1/dotty.1
 man/man1/gc.1
 man/man1/gpr.1
+man/man1/gxl2dot.1
 man/man1/lefty.1
 man/man1/neato.1
 man/man1/nop.1
@@ -153,7 +183,84 @@ share/doc/graphviz/leftyguide.pdf
 share/doc/graphviz/neatoguide.pdf
 share/doc/html/graphviz/FAQ.html
 @comment share/doc/html/graphviz/dynagraph.html
-share/doc/html/graphviz/gd.html
+share/doc/html/graphviz/info/Box.gif
+share/doc/html/graphviz/info/Diamond.gif
+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_back.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_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/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/crow.gif
+share/doc/html/graphviz/info/diamond.gif
+share/doc/html/graphviz/info/dot.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/empty.gif
+share/doc/html/graphviz/info/forward.gif
+share/doc/html/graphviz/info/grammar.html
+share/doc/html/graphviz/info/half.gif
+share/doc/html/graphviz/info/hexagon.gif
+share/doc/html/graphviz/info/house.gif
+share/doc/html/graphviz/info/index.html
+share/doc/html/graphviz/info/inv.gif
+share/doc/html/graphviz/info/invdot.gif
+share/doc/html/graphviz/info/invempty.gif
+share/doc/html/graphviz/info/invhouse.gif
+share/doc/html/graphviz/info/invodot.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/nohead.gif
+share/doc/html/graphviz/info/none.gif
+share/doc/html/graphviz/info/normal.gif
+share/doc/html/graphviz/info/obox.gif
+share/doc/html/graphviz/info/octagon.gif
+share/doc/html/graphviz/info/odiamond.gif
+share/doc/html/graphviz/info/odot.gif
+share/doc/html/graphviz/info/open.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/septagon.gif
+share/doc/html/graphviz/info/shapes.html
+share/doc/html/graphviz/info/tee.gif
+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/examples/graphviz/dge
 share/examples/graphviz/dge.README
@@ -257,6 +364,7 @@ share/graphviz/lefty/tree.lefty
 @dirrm share/graphviz
 @dirrm share/examples/graphviz/pathplan_data
 @dirrm share/examples/graphviz
+@dirrm share/doc/html/graphviz/info
 @dirrm share/doc/html/graphviz
 @dirrm share/doc/graphviz
 @dirrm lib/graphviz
diff --git a/graphics/graphviz/buildlink2.mk b/graphics/graphviz/buildlink2.mk
index 98179c236aa..d84bcf50dff 100644
--- a/graphics/graphviz/buildlink2.mk
+++ b/graphics/graphviz/buildlink2.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink2.mk,v 1.1 2003/01/09 11:21:42 uebayasi Exp $
+# $NetBSD: buildlink2.mk,v 1.2 2003/03/03 11:34:58 seb Exp $
 #
 # This Makefile fragment is included by packages that use graphviz.
 #
@@ -9,7 +9,7 @@
 GRAPHVIZ_BUILDLINK2_MK=	# defined
 
 BUILDLINK_PACKAGES+=			graphviz
-BUILDLINK_DEPENDS.graphviz?=		graphviz>=1.8.10nb1
+BUILDLINK_DEPENDS.graphviz?=		graphviz>=1.9
 BUILDLINK_PKGSRCDIR.graphviz?=		../../graphics/graphviz
 
 EVAL_PREFIX+=	BUILDLINK_PREFIX.graphviz=graphviz
diff --git a/graphics/graphviz/distinfo b/graphics/graphviz/distinfo
index a54d3ca0842..86ccc0f8510 100644
--- a/graphics/graphviz/distinfo
+++ b/graphics/graphviz/distinfo
@@ -1,33 +1,33 @@
-$NetBSD: distinfo,v 1.6 2002/12/01 18:33:41 seb Exp $
+$NetBSD: distinfo,v 1.7 2003/03/03 11:34:58 seb Exp $
 
-SHA1 (graphviz-1.8.10.tar.gz) = 2559795b6601d419890d2780803032d6504869fa
-Size (graphviz-1.8.10.tar.gz) = 2837389 bytes
+SHA1 (graphviz-1.9.tar.gz) = 87e383a1738124b2736ceba0824ebe235446577b
+Size (graphviz-1.9.tar.gz) = 3173162 bytes
 SHA1 (patch-aa) = d60925921fa7daa753ee04e267fce6f978644ea2
 SHA1 (patch-ab) = 4f726e7f8c5c61fd73b53c83e348b503ed2c5299
-SHA1 (patch-ac) = 08372eb70ad0040519dfe6ae32216976127e7d15
-SHA1 (patch-ad) = 81f77ec2d25c1c8e8c12f73891dcdcd67f260e17
-SHA1 (patch-ae) = 40c123397384368504d2d4930f1c52d4a4826350
-SHA1 (patch-af) = dcb086b86e33d534a462e3e82feb07153375b153
-SHA1 (patch-ag) = 05faa990eed1ddf65f5c8c61e75d9421332782e6
-SHA1 (patch-ah) = 6846b255517c91a912adb05c38abce3c0069ea6c
-SHA1 (patch-ai) = d7f30a8976f17fe4c961a14eb9209f7b2edc1d0c
-SHA1 (patch-aj) = e3f0d660b878d552e078c7715bbbf7789b689559
-SHA1 (patch-ak) = 26f82e552f45968893c5c07476ac4dd49c2b2ae4
-SHA1 (patch-al) = 673b060b1c10feadd2c6e1b1cf4e20f8676a0a9a
-SHA1 (patch-am) = b6337716d48c52a5603f2b80dcb1deced5fec748
-SHA1 (patch-an) = 605f2ed8b0c81500e9cc76407fa00ce8c7cd7658
-SHA1 (patch-ao) = ef6e508e153bc6191d41deeec1ae9cc6913ea4a8
-SHA1 (patch-ap) = b4202a993ad6989698506e2caecc358bbf85b3b8
-SHA1 (patch-aq) = 012280cbf551c39839735fcfc94a223cc0701291
-SHA1 (patch-ar) = fa77ff1193866c333157e528f8f27f210476c5e5
-SHA1 (patch-as) = 28452cc8d007c6489f97adcda5ba7d9fd1386f26
-SHA1 (patch-at) = 007f961b06bf60016497d1cc60cca6b98d260e81
-SHA1 (patch-au) = 1a502172dab1cc798794e18bcf4dd931c41ddf09
+SHA1 (patch-ac) = afaeee6960f7d168acb61a7d7c6b8f95866fa3e5
+SHA1 (patch-ad) = bfa4e07ae7968fdda88342b8f0e1e769ac74a2b9
+SHA1 (patch-ae) = 9df3ca38dc6f93f9370fd3374e8fe920943994b8
+SHA1 (patch-af) = 0b65e9e30328957d7ecd0479bfc938e55e29b141
+SHA1 (patch-ag) = 45b468bd5ceb267c66e97192f9ed3112ddbaa762
+SHA1 (patch-ah) = 4126fc78fe2b42a5f023d49d928c97df12544f96
+SHA1 (patch-ai) = 698e2212d761c4b1ace42c891f8cae11893f357c
+SHA1 (patch-aj) = 0e06cdaf97f7c7e57738f6cabdf6907c766c035e
+SHA1 (patch-ak) = 331df33504eb8df5bf8ee3f2ea47e1fc57573fd7
+SHA1 (patch-al) = 461853f8b3aea6e4034428a90436b60a493cca08
+SHA1 (patch-am) = 1eb897e98bca8d9f5dea2f9ce0267aa309735a13
+SHA1 (patch-an) = afb5ae74861113a206a3c7a1c0bc87cb6c23e517
+SHA1 (patch-ao) = 55c26f319464268d081cbc2ec9eb8ab362435e62
+SHA1 (patch-ap) = b29f54ee21b6571b07fa692bd9eb653a7e10436d
+SHA1 (patch-aq) = 56f9a6b64c78fd0eae0d8037177c2e91ea2bb713
+SHA1 (patch-ar) = 2bac7b9059fabcc5bd98059784722bb912be98dd
+SHA1 (patch-as) = 78609997e50b6946e1d30ca043d3971a938b4904
+SHA1 (patch-at) = 08bd6e08b61a650b5b65ae217973df7d42f701c5
+SHA1 (patch-au) = ce84674f8ee4c15cbdbbf325c56b6e8f9e66531c
 SHA1 (patch-av) = b7e5f709cd84cecaa198fe764a54868b4b0cc5d8
-SHA1 (patch-aw) = a2c391c1a1189d320e2eaca3aad572262f8c0079
-SHA1 (patch-ax) = a604b5d45e4a0d1df89de1b55f0e13346144fe44
-SHA1 (patch-ay) = a175c1adbd0dfc235bc23e94d8c4562a09951d3f
-SHA1 (patch-az) = 87f9ccec2349a60cd58b9797f14641d803b25c0a
-SHA1 (patch-ba) = 67b34a674120c175dd66ce57044056a7079d2d9b
-SHA1 (patch-bb) = a92de630d37ce562c3bd87978a9a8fb248d475f1
-SHA1 (patch-bc) = d3215051807a24d1258cd7355f4443d731398267
+SHA1 (patch-aw) = 21f4de791352bd826fd1cbb99ddd2db9e1a0ebb8
+SHA1 (patch-ax) = e251347c9022dc6be61cb2790973dfdd2791f50b
+SHA1 (patch-ay) = 90ae86f00763dfd538bdff7396902bbf68bbef02
+SHA1 (patch-az) = b1e6eaf223405b97bce47f2a986fc726ee8a0a9d
+SHA1 (patch-ba) = ca4d295331d1d6072a405f0e4950af810fdc9a63
+SHA1 (patch-bb) = 7b42bb0f86aac0c58945efcab3adc55f02cf6212
+SHA1 (patch-bc) = 1718cfdaa7dc66c799240240875995b652dd2251
diff --git a/graphics/graphviz/patches/patch-ac b/graphics/graphviz/patches/patch-ac
index a982793cc00..42808b60c99 100644
--- a/graphics/graphviz/patches/patch-ac
+++ b/graphics/graphviz/patches/patch-ac
@@ -1,79 +1,8 @@
-$NetBSD: patch-ac,v 1.6 2002/12/01 18:33:42 seb Exp $
+$NetBSD: patch-ac,v 1.7 2003/03/03 11:34:59 seb Exp $
 
---- configure.orig	Thu Nov 28 12:11:23 2002
+--- configure.orig	2003-03-02 20:11:10.000000000 +0000
 +++ configure
-@@ -1483,60 +1483,9 @@ else
-   fi
- fi
- 
--for ac_declaration in \
--   ''\
--   '#include <stdlib.h>' \
--   'extern "C" void std::exit (int) throw (); using std::exit;' \
--   'extern "C" void std::exit (int); using std::exit;' \
--   'extern "C" void exit (int) throw ();' \
--   'extern "C" void exit (int);' \
--   'void exit (int);'
--do
--  cat > conftest.$ac_ext <<EOF
--#line 1497 "configure"
--#include "confdefs.h"
--#include <stdlib.h>
--$ac_declaration
--int main() {
--exit (42);
--; return 0; }
--EOF
--if { (eval echo configure:1505: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
--  :
--else
--  echo "configure: failed program was:" >&5
--  cat conftest.$ac_ext >&5
--  rm -rf conftest*
--  continue
--fi
--rm -f conftest*
--  cat > conftest.$ac_ext <<EOF
--#line 1515 "configure"
--#include "confdefs.h"
--$ac_declaration
--int main() {
--exit (42);
--; return 0; }
--EOF
--if { (eval echo configure:1522: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
--  rm -rf conftest*
--  break
--else
--  echo "configure: failed program was:" >&5
--  cat conftest.$ac_ext >&5
--fi
--rm -f conftest*
--done
--if test -n "$ac_declaration"; then
--  echo '#ifdef __cplusplus' >>confdefs.h
--  echo $ac_declaration      >>confdefs.h
--  echo '#endif'             >>confdefs.h
--fi
--
--
- 
-         echo $ac_n "checking for strerror in -lcposix""... $ac_c" 1>&6
--echo "configure:1540: checking for strerror in -lcposix" >&5
-+echo "configure:1489: checking for strerror in -lcposix" >&5
- ac_lib_var=`echo cposix'_'strerror | sed 'y%./+-%__p_%'`
- if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
-   echo $ac_n "(cached) $ac_c" 1>&6
-@@ -1868,7 +1817,7 @@ test -n "$YACC" && break
- done
- test -n "$YACC" || YACC="yacc"
- 
--for ac_prog in gawk mawk nawk awk
-+for ac_prog in mawk gawk nawk awk
- do
- # Extract the first word of "$ac_prog", so it can be a program name with args.
- set dummy $ac_prog; ac_word=$2
-@@ -5901,7 +5850,10 @@ DEFAULT_FONTPATH="C:/WINDOWS/FONTS;C:/WI
+@@ -8376,7 +8376,10 @@ DEFAULT_FONTPATH="C:/WINDOWS/FONTS;C:/WI
  PATHSEPARATOR=";"
  else
  # This sucks!  Whatever happened to standards for file system layout?
@@ -85,7 +14,7 @@ $NetBSD: patch-ac,v 1.6 2002/12/01 18:33:42 seb Exp $
  PATHSEPARATOR=":"
  fi
  fi
-@@ -6124,7 +6076,7 @@ if test -f $TCLCONFIG; then
+@@ -8691,7 +8694,7 @@ echo "${ECHO_T}using $TCLCONFIG" >&6
      . $file
      # TCL STUBS support is required
      if test "${TCL_SUPPORTS_STUBS}" = "1"; then
@@ -93,8 +22,8 @@ $NetBSD: patch-ac,v 1.6 2002/12/01 18:33:42 seb Exp $
 +        TCL_SUBDIRS="tclhandle gdtclft tcldot tcldgr tcldgl tclpathplan"
          TCL_PKGINDEX="gdtclft/pkgIndex.tcl tcldot/pkgIndex.tcl tcldgr/pkgIndex.tcl tcldgl/pkgIndex.tcl tclpathplan/pkgIndex.tcl"
      else
-         echo "configure: warning: Tcl does not have STUBs support, perhaps it is too old? The packages: "gdtclft tcldot tcldgr tcldgl tclpathplan" will not be built" 1>&2
-@@ -6214,7 +6166,7 @@ if test -f $TKCONFIG; then
+         { echo "$as_me:$LINENO: WARNING: Tcl does not have STUBs support, perhaps it is too old? The packages: \"gdtclft tcldot tcldgr tcldgl tclpathplan\" will not be built" >&5
+@@ -8924,7 +8927,7 @@ echo "${ECHO_T}using $TKCONFIG" >&6
      file=${TKCONFIG}
      . $file
      if test "${TCL_SUPPORTS_STUBS}" = "1"; then
@@ -102,8 +31,8 @@ $NetBSD: patch-ac,v 1.6 2002/12/01 18:33:42 seb Exp $
 +        TK_SUBDIRS="tkspline"
          TK_PKGINDEX="tkspline/pkgIndex.tcl"
      else
-         echo "configure: warning: Tcl does not have STUBs support, so neither does Tk. The packages: "tkspline" will not be built" 1>&2
-@@ -8885,36 +8837,12 @@ rm -f conftest*
+         { echo "$as_me:$LINENO: WARNING: Tcl does not have STUBs support, so neither does Tk. The packages: \"tkspline\" will not be built" >&5
+@@ -14120,36 +14123,12 @@ rm -f conftest.$ac_objext conftest.$ac_e
  
  # -----------------------------------
  # tclInt.h
diff --git a/graphics/graphviz/patches/patch-ad b/graphics/graphviz/patches/patch-ad
index 100c5dea492..55b15a461e2 100644
--- a/graphics/graphviz/patches/patch-ad
+++ b/graphics/graphviz/patches/patch-ad
@@ -1,12 +1,12 @@
-$NetBSD: patch-ad,v 1.2 2002/08/28 13:49:36 seb Exp $
+$NetBSD: patch-ad,v 1.3 2003/03/03 11:34:59 seb Exp $
 
---- gdtclft/Makefile.am.orig	Thu Aug  1 17:43:30 2002
+--- gdtclft/Makefile.am.orig	2003-01-15 17:22:13.000000000 +0000
 +++ gdtclft/Makefile.am
-@@ -18,7 +18,7 @@ libgdtclft_la_SOURCES = gdtclft.c
+@@ -20,7 +20,7 @@ libgdtclft_la_SOURCES = gdtclft.c
  libgdtclft_la_LIBADD = \
- 	../tclhandle/libtclhandle.la \
- 	../gd/libgdconvenience.la \
--	../tclstubs/libtclstubs.la
+ 	$(top_srcdir)/tclhandle/libtclhandle.la \
+ 	$(top_srcdir)/gd/libgdconvenience.la \
+-	$(top_srcdir)/tclstubs/libtclstubs.la
 +	${TCL_STUB_LIB_SPEC}
  
  all-local: pkgIndex.tcl
diff --git a/graphics/graphviz/patches/patch-ae b/graphics/graphviz/patches/patch-ae
index 0e289463d44..8bc4dc5a913 100644
--- a/graphics/graphviz/patches/patch-ae
+++ b/graphics/graphviz/patches/patch-ae
@@ -1,53 +1,120 @@
-$NetBSD: patch-ae,v 1.4 2002/08/28 13:49:36 seb Exp $
+$NetBSD: patch-ae,v 1.5 2003/03/03 11:34:59 seb Exp $
 
---- gdtclft/Makefile.in.orig	Mon Aug  5 05:11:26 2002
+--- gdtclft/Makefile.in.orig	2003-03-02 20:12:23.000000000 +0000
 +++ gdtclft/Makefile.in
-@@ -185,9 +185,7 @@ Z_LIBS = @Z_LIBS@
+@@ -225,7 +225,7 @@ libgdtclft_la_SOURCES = gdtclft.c
+ libgdtclft_la_LIBADD = \
+ 	$(top_srcdir)/tclhandle/libtclhandle.la \
+ 	$(top_srcdir)/gd/libgdconvenience.la \
+-	$(top_srcdir)/tclstubs/libtclstubs.la
++	${TCL_STUB_LIB_SPEC}
  
- AUTOMAKE_OPTIONS = 1.4
  
--INCLUDES = @TCL_CFLAGS@ @TCL_INCLUDES@ \
--	-I$(top_srcdir)/tclhandle \
--	-I$(top_srcdir)/gd
-+INCLUDES = @TCL_CFLAGS@ @TCL_INCLUDES@ 	-I$(top_srcdir)/tclhandle 	-I$(top_srcdir)/gd
+ CLEANFILES = pkgIndex.tcl
+@@ -239,8 +239,7 @@ LTLIBRARIES = $(pkglib_LTLIBRARIES)
+ 
+ libgdtclft_la_LDFLAGS =
+ libgdtclft_la_DEPENDENCIES = $(top_srcdir)/tclhandle/libtclhandle.la \
+-	$(top_srcdir)/gd/libgdconvenience.la \
+-	$(top_srcdir)/tclstubs/libtclstubs.la
++	$(top_srcdir)/gd/libgdconvenience.la
+ am_libgdtclft_la_OBJECTS = gdtclft.lo
+ libgdtclft_la_OBJECTS = $(am_libgdtclft_la_OBJECTS)
  
+@@ -248,8 +247,7 @@ DEFS = @DEFS@
+ DEFAULT_INCLUDES =  -I. -I$(srcdir) -I$(top_builddir)
+ CPPFLAGS = @CPPFLAGS@
+ LDFLAGS = @LDFLAGS@
+-depcomp = $(SHELL) $(top_srcdir)/depcomp
+-@AMDEP_TRUE@DEP_FILES = $(DEPDIR)/gdtclft.Plo
++depcomp =
+ COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
+ 	$(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
+ LTCOMPILE = $(LIBTOOL) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) \
+@@ -286,7 +284,7 @@ distclean-libtool:
+ 	-rm -f libtool
+ $(srcdir)/Makefile.in:  Makefile.am  $(top_srcdir)/configure.in $(ACLOCAL_M4)
+ 	cd $(top_srcdir) && \
+-	  $(AUTOMAKE) --gnu  gdtclft/Makefile
++	  $(AUTOMAKE) --foreign  --ignore-deps gdtclft/Makefile
+ Makefile:  $(srcdir)/Makefile.in  $(top_builddir)/config.status
+ 	cd $(top_builddir) && \
+ 	  CONFIG_HEADERS= CONFIG_LINKS= \
+@@ -319,29 +317,14 @@ mostlyclean-compile:
+ distclean-compile:
+ 	-rm -f *.tab.c
  
- LIBS = @LIBS@ -lc
-@@ -199,10 +197,7 @@ man_MANS = gdtclft.n
+-@AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/gdtclft.Plo@am__quote@
+-
+-distclean-depend:
+-	-rm -rf $(DEPDIR)
+-
+ .c.o:
+-@AMDEP_TRUE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
+-@AMDEP_TRUE@	depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@
+-@AMDEP_TRUE@	$(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ 	$(COMPILE) -c `test -f $< || echo '$(srcdir)/'`$<
  
- libgdtclft_la_SOURCES = gdtclft.c
+ .c.obj:
+-@AMDEP_TRUE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
+-@AMDEP_TRUE@	depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@
+-@AMDEP_TRUE@	$(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ 	$(COMPILE) -c `cygpath -w $<`
  
--libgdtclft_la_LIBADD = \
--	../tclhandle/libtclhandle.la \
--	../gd/libgdconvenience.la \
--	../tclstubs/libtclstubs.la
-+libgdtclft_la_LIBADD =  	../tclhandle/libtclhandle.la 	../gd/libgdconvenience.la 	${TCL_STUB_LIB_SPEC}
+ .c.lo:
+-@AMDEP_TRUE@	source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
+-@AMDEP_TRUE@	depfile='$(DEPDIR)/$*.Plo' tmpdepfile='$(DEPDIR)/$*.TPlo' @AMDEPBACKSLASH@
+-@AMDEP_TRUE@	$(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ 	$(LTCOMPILE) -c -o $@ `test -f $< || echo '$(srcdir)/'`$<
+-CCDEPMODE = @CCDEPMODE@
+ uninstall-info-am:
  
+ manndir = $(mandir)/mann
+@@ -548,8 +531,8 @@ clean-am: clean-generic clean-libtool cl
  
- CLEANFILES = pkgIndex.tcl
-@@ -223,7 +218,7 @@ X_EXTRA_LIBS = @X_EXTRA_LIBS@
- X_PRE_LIBS = @X_PRE_LIBS@
- libgdtclft_la_LDFLAGS = 
- libgdtclft_la_DEPENDENCIES =  ../tclhandle/libtclhandle.la \
--../gd/libgdconvenience.la ../tclstubs/libtclstubs.la
-+../gd/libgdconvenience.la
- libgdtclft_la_OBJECTS =  gdtclft.lo
- CFLAGS = @CFLAGS@
- COMPILE = $(CC) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
-@@ -239,7 +234,7 @@ DIST_COMMON =  Makefile.am Makefile.in
- 
- DISTFILES = $(DIST_COMMON) $(SOURCES) $(HEADERS) $(TEXINFOS) $(EXTRA_DIST)
- 
--TAR = gtar
-+TAR = tar
- GZIP_ENV = --best
- SOURCES = $(libgdtclft_la_SOURCES)
- OBJECTS = $(libgdtclft_la_OBJECTS)
-@@ -480,7 +475,6 @@ distdir: $(DISTFILES)
- 	      || exit 1; \
- 	  fi; \
- 	done
--
- info-am:
- info: info-recursive
- dvi-am:
+ distclean: distclean-recursive
+ 
+-distclean-am: clean-am distclean-compile distclean-depend \
+-	distclean-generic distclean-libtool distclean-tags
++distclean-am: clean-am distclean-compile distclean-generic \
++	distclean-libtool distclean-tags
+ 
+ dvi: dvi-recursive
+ 
+@@ -587,21 +570,21 @@ uninstall-man: uninstall-mann
+ 
+ .PHONY: $(RECURSIVE_TARGETS) GTAGS all all-am all-local check check-am \
+ 	clean clean-generic clean-libtool clean-pkglibLTLIBRARIES \
+-	clean-recursive distclean distclean-compile distclean-depend \
+-	distclean-generic distclean-libtool distclean-recursive \
+-	distclean-tags distdir dvi dvi-am dvi-recursive info info-am \
+-	info-recursive install install-am install-data install-data-am \
+-	install-data-recursive install-exec install-exec-am \
+-	install-exec-recursive install-info install-info-am \
+-	install-info-recursive install-man install-mann \
+-	install-pkglibLTLIBRARIES install-recursive install-strip \
+-	installcheck installcheck-am installdirs installdirs-am \
+-	installdirs-recursive maintainer-clean maintainer-clean-generic \
+-	maintainer-clean-recursive mostlyclean mostlyclean-compile \
+-	mostlyclean-generic mostlyclean-libtool mostlyclean-recursive \
+-	tags tags-recursive uninstall uninstall-am uninstall-info-am \
+-	uninstall-info-recursive uninstall-man uninstall-mann \
+-	uninstall-pkglibLTLIBRARIES uninstall-recursive
++	clean-recursive distclean distclean-compile distclean-generic \
++	distclean-libtool distclean-recursive distclean-tags distdir \
++	dvi dvi-am dvi-recursive info info-am info-recursive install \
++	install-am install-data install-data-am install-data-recursive \
++	install-exec install-exec-am install-exec-recursive \
++	install-info install-info-am install-info-recursive install-man \
++	install-mann install-pkglibLTLIBRARIES install-recursive \
++	install-strip installcheck installcheck-am installdirs \
++	installdirs-am installdirs-recursive maintainer-clean \
++	maintainer-clean-generic maintainer-clean-recursive mostlyclean \
++	mostlyclean-compile mostlyclean-generic mostlyclean-libtool \
++	mostlyclean-recursive tags tags-recursive uninstall \
++	uninstall-am uninstall-info-am uninstall-info-recursive \
++	uninstall-man uninstall-mann uninstall-pkglibLTLIBRARIES \
++	uninstall-recursive
+ 
+ 
+ all-local: pkgIndex.tcl
diff --git a/graphics/graphviz/patches/patch-af b/graphics/graphviz/patches/patch-af
index c09e837b5c0..36166aa114d 100644
--- a/graphics/graphviz/patches/patch-af
+++ b/graphics/graphviz/patches/patch-af
@@ -1,6 +1,6 @@
-$NetBSD: patch-af,v 1.2 2002/08/28 13:49:37 seb Exp $
+$NetBSD: patch-af,v 1.3 2003/03/03 11:34:59 seb Exp $
 
---- gdtclft/demo/Makefile.am.orig	Wed May 15 23:55:30 2002
+--- gdtclft/demo/Makefile.am.orig	2003-01-15 17:22:13.000000000 +0000
 +++ gdtclft/demo/Makefile.am
 @@ -2,7 +2,7 @@
  
@@ -10,4 +10,4 @@ $NetBSD: patch-af,v 1.2 2002/08/28 13:49:37 seb Exp $
 +demodir = $(prefix)/share/examples/@PACKAGE@
  demo_SCRIPTS = entities
  demo_DATA = entities.README entities.html
- EXTRA_DIST = $(demo_SCRIPTS) $(demo_DATA)
+ EXTRA_DIST = $(demo_SCRIPTS) $(demo_DATA) CVS/*
diff --git a/graphics/graphviz/patches/patch-ag b/graphics/graphviz/patches/patch-ag
index dd63e57e5a0..99b00049f2c 100644
--- a/graphics/graphviz/patches/patch-ag
+++ b/graphics/graphviz/patches/patch-ag
@@ -1,8 +1,8 @@
-$NetBSD: patch-ag,v 1.4 2002/08/28 13:49:37 seb Exp $
+$NetBSD: patch-ag,v 1.5 2003/03/03 11:34:59 seb Exp $
 
---- gdtclft/demo/Makefile.in.orig	Mon Aug  5 05:11:27 2002
+--- gdtclft/demo/Makefile.in.orig	2003-03-02 20:12:23.000000000 +0000
 +++ gdtclft/demo/Makefile.in
-@@ -185,7 +185,7 @@ Z_LIBS = @Z_LIBS@
+@@ -206,7 +206,7 @@ install_sh = @install_sh@
  
  AUTOMAKE_OPTIONS = 1.4
  
@@ -10,13 +10,21 @@ $NetBSD: patch-ag,v 1.4 2002/08/28 13:49:37 seb Exp $
 +demodir = $(prefix)/share/examples/@PACKAGE@
  demo_SCRIPTS = entities
  demo_DATA = entities.README entities.html
- EXTRA_DIST = $(demo_SCRIPTS) $(demo_DATA)
-@@ -201,7 +201,7 @@ DIST_COMMON =  Makefile.am Makefile.in
+ EXTRA_DIST = $(demo_SCRIPTS) $(demo_DATA) CVS/*
+@@ -216,6 +216,7 @@ CONFIG_HEADER = $(top_builddir)/config.h
+ CONFIG_CLEAN_FILES =
+ SCRIPTS = $(demo_SCRIPTS)
  
- DISTFILES = $(DIST_COMMON) $(SOURCES) $(HEADERS) $(TEXINFOS) $(EXTRA_DIST)
++depcomp =
+ DIST_SOURCES =
+ DATA = $(demo_DATA)
  
--TAR = gtar
-+TAR = tar
- GZIP_ENV = --best
- all: all-redirect
- .SUFFIXES:
+@@ -234,7 +235,7 @@ distclean-libtool:
+ 	-rm -f libtool
+ $(srcdir)/Makefile.in:  Makefile.am  $(top_srcdir)/configure.in $(ACLOCAL_M4)
+ 	cd $(top_srcdir) && \
+-	  $(AUTOMAKE) --gnu  gdtclft/demo/Makefile
++	  $(AUTOMAKE) --foreign  --ignore-deps gdtclft/demo/Makefile
+ Makefile:  $(srcdir)/Makefile.in  $(top_builddir)/config.status
+ 	cd $(top_builddir) && \
+ 	  CONFIG_HEADERS= CONFIG_LINKS= \
diff --git a/graphics/graphviz/patches/patch-ah b/graphics/graphviz/patches/patch-ah
index 044e1d9e879..cd22ec5659f 100644
--- a/graphics/graphviz/patches/patch-ah
+++ b/graphics/graphviz/patches/patch-ah
@@ -1,12 +1,12 @@
-$NetBSD: patch-ah,v 1.2 2002/08/28 13:49:37 seb Exp $
+$NetBSD: patch-ah,v 1.3 2003/03/03 11:35:00 seb Exp $
 
---- tcldgl/Makefile.am.orig	Thu Aug  1 17:43:30 2002
+--- tcldgl/Makefile.am.orig	2003-01-15 17:22:16.000000000 +0000
 +++ tcldgl/Makefile.am
-@@ -32,7 +32,7 @@ libtcldgl_la_LIBADD = \
- 	../agutil/libagutil.la \
- 	../shape/libshape.la \
- 	../ns/libns.la \
--	../tclstubs/libtclstubs.la
+@@ -34,7 +34,7 @@ libtcldgl_la_LIBADD = \
+ 	$(top_srcdir)/agutil/libagutil.la \
+ 	$(top_srcdir)/shape/libshape.la \
+ 	$(top_srcdir)/ns/libns.la \
+-	$(top_srcdir)/tclstubs/libtclstubs.la
 +	${TCL_STUB_LIB_SPEC}
  
  all-local: pkgIndex.tcl
diff --git a/graphics/graphviz/patches/patch-ai b/graphics/graphviz/patches/patch-ai
index 710c26881c8..03d084a095c 100644
--- a/graphics/graphviz/patches/patch-ai
+++ b/graphics/graphviz/patches/patch-ai
@@ -1,67 +1,124 @@
-$NetBSD: patch-ai,v 1.4 2002/08/28 13:49:37 seb Exp $
+$NetBSD: patch-ai,v 1.5 2003/03/03 11:35:00 seb Exp $
 
---- tcldgl/Makefile.in.orig	Mon Aug  5 05:11:30 2002
+--- tcldgl/Makefile.in.orig	2003-03-02 20:12:23.000000000 +0000
 +++ tcldgl/Makefile.in
-@@ -185,12 +185,7 @@ Z_LIBS = @Z_LIBS@
+@@ -239,7 +239,7 @@ libtcldgl_la_LIBADD = \
+ 	$(top_srcdir)/agutil/libagutil.la \
+ 	$(top_srcdir)/shape/libshape.la \
+ 	$(top_srcdir)/ns/libns.la \
+-	$(top_srcdir)/tclstubs/libtclstubs.la
++	${TCL_STUB_LIB_SPEC}
  
- AUTOMAKE_OPTIONS = 1.4
  
--INCLUDES = @TCL_CFLAGS@ @TCL_INCLUDES@ \
--	-I$(top_srcdir)/agraph \
--	-I$(top_srcdir)/cdt \
--	-I$(top_srcdir)/tclhandle \
--	-I$(top_srcdir)/incr \
--	-I$(top_srcdir)/shape
-+INCLUDES = @TCL_CFLAGS@ @TCL_INCLUDES@ 	-I$(top_srcdir)/agraph 	-I$(top_srcdir)/cdt 	-I$(top_srcdir)/tclhandle 	-I$(top_srcdir)/incr 	-I$(top_srcdir)/shape
+ CLEANFILES = pkgIndex.tcl
+@@ -260,8 +260,7 @@ libtcldgl_la_DEPENDENCIES = $(top_srcdir
+ 	$(top_srcdir)/incr/libincr.la \
+ 	$(top_srcdir)/pathplan/libpathplanconvenience.la \
+ 	$(top_srcdir)/agutil/libagutil.la \
+-	$(top_srcdir)/shape/libshape.la $(top_srcdir)/ns/libns.la \
+-	$(top_srcdir)/tclstubs/libtclstubs.la
++	$(top_srcdir)/shape/libshape.la $(top_srcdir)/ns/libns.la
+ am_libtcldgl_la_OBJECTS = dgl.lo dglayout.lo dglshape.lo dglutil.lo
+ libtcldgl_la_OBJECTS = $(am_libtcldgl_la_OBJECTS)
  
+@@ -269,9 +268,7 @@ DEFS = @DEFS@
+ DEFAULT_INCLUDES =  -I. -I$(srcdir) -I$(top_builddir)
+ CPPFLAGS = @CPPFLAGS@
+ LDFLAGS = @LDFLAGS@
+-depcomp = $(SHELL) $(top_srcdir)/depcomp
+-@AMDEP_TRUE@DEP_FILES = $(DEPDIR)/dgl.Plo $(DEPDIR)/dglayout.Plo \
+-@AMDEP_TRUE@	$(DEPDIR)/dglshape.Plo $(DEPDIR)/dglutil.Plo
++depcomp =
+ COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
+ 	$(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
+ LTCOMPILE = $(LIBTOOL) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) \
+@@ -310,7 +307,7 @@ distclean-libtool:
+ 	-rm -f libtool
+ $(srcdir)/Makefile.in:  Makefile.am  $(top_srcdir)/configure.in $(ACLOCAL_M4)
+ 	cd $(top_srcdir) && \
+-	  $(AUTOMAKE) --gnu  tcldgl/Makefile
++	  $(AUTOMAKE) --foreign  --ignore-deps tcldgl/Makefile
+ Makefile:  $(srcdir)/Makefile.in  $(top_builddir)/config.status
+ 	cd $(top_builddir) && \
+ 	  CONFIG_HEADERS= CONFIG_LINKS= \
+@@ -343,32 +340,14 @@ mostlyclean-compile:
+ distclean-compile:
+ 	-rm -f *.tab.c
  
- LIBS = @LIBS@
-@@ -203,20 +198,7 @@ man_MANS = tcldgl.n
+-@AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/dgl.Plo@am__quote@
+-@AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/dglayout.Plo@am__quote@
+-@AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/dglshape.Plo@am__quote@
+-@AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/dglutil.Plo@am__quote@
+-
+-distclean-depend:
+-	-rm -rf $(DEPDIR)
+-
+ .c.o:
+-@AMDEP_TRUE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
+-@AMDEP_TRUE@	depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@
+-@AMDEP_TRUE@	$(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ 	$(COMPILE) -c `test -f $< || echo '$(srcdir)/'`$<
  
- libtcldgl_la_SOURCES = dgl.c dglayout.c dglshape.c dglutil.c dgl.h
+ .c.obj:
+-@AMDEP_TRUE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
+-@AMDEP_TRUE@	depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@
+-@AMDEP_TRUE@	$(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ 	$(COMPILE) -c `cygpath -w $<`
  
--libtcldgl_la_LIBADD = \
--	../tclhandle/libtclhandle.la \
--	../agraph/libagraphconvenience.la \
--	../cdt/libcdtconvenience.la \
--	../fdp/libfdp.la \
--	../dag/libdag.la \
--	../geo/libgeo.la \
--	../grid/libgrid.la \
--	../incr/libincr.la \
--	../pathplan/libpathplanconvenience.la \
--	../agutil/libagutil.la \
--	../shape/libshape.la \
--	../ns/libns.la \
--	../tclstubs/libtclstubs.la
-+libtcldgl_la_LIBADD =  	../tclhandle/libtclhandle.la 	../agraph/libagraphconvenience.la 	../cdt/libcdtconvenience.la 	../fdp/libfdp.la 	../dag/libdag.la 	../geo/libgeo.la 	../grid/libgrid.la 	../incr/libincr.la 	../pathplan/libpathplanconvenience.la 	../agutil/libagutil.la 	../shape/libshape.la 	../ns/libns.la 	${TCL_STUB_LIB_SPEC}
+ .c.lo:
+-@AMDEP_TRUE@	source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
+-@AMDEP_TRUE@	depfile='$(DEPDIR)/$*.Plo' tmpdepfile='$(DEPDIR)/$*.TPlo' @AMDEPBACKSLASH@
+-@AMDEP_TRUE@	$(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ 	$(LTCOMPILE) -c -o $@ `test -f $< || echo '$(srcdir)/'`$<
+-CCDEPMODE = @CCDEPMODE@
+ uninstall-info-am:
  
+ manndir = $(mandir)/mann
+@@ -575,8 +554,8 @@ clean-am: clean-generic clean-libtool cl
  
- CLEANFILES = pkgIndex.tcl
-@@ -240,8 +222,7 @@ libtcldgl_la_DEPENDENCIES =  ../tclhandl
- ../agraph/libagraphconvenience.la ../cdt/libcdtconvenience.la \
- ../fdp/libfdp.la ../dag/libdag.la ../geo/libgeo.la ../grid/libgrid.la \
- ../incr/libincr.la ../pathplan/libpathplanconvenience.la \
--../agutil/libagutil.la ../shape/libshape.la ../ns/libns.la \
--../tclstubs/libtclstubs.la
-+../agutil/libagutil.la ../shape/libshape.la ../ns/libns.la
- libtcldgl_la_OBJECTS =  dgl.lo dglayout.lo dglshape.lo dglutil.lo
- CFLAGS = @CFLAGS@
- COMPILE = $(CC) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
-@@ -259,7 +240,7 @@ DIST_COMMON =  Makefile.am Makefile.in
+ distclean: distclean-recursive
  
- DISTFILES = $(DIST_COMMON) $(SOURCES) $(HEADERS) $(TEXINFOS) $(EXTRA_DIST)
+-distclean-am: clean-am distclean-compile distclean-depend \
+-	distclean-generic distclean-libtool distclean-tags
++distclean-am: clean-am distclean-compile distclean-generic \
++	distclean-libtool distclean-tags
  
--TAR = gtar
-+TAR = tar
- GZIP_ENV = --best
- SOURCES = $(libtcldgl_la_SOURCES)
- OBJECTS = $(libtcldgl_la_OBJECTS)
-@@ -500,7 +481,6 @@ distdir: $(DISTFILES)
- 	      || exit 1; \
- 	  fi; \
- 	done
--
- info-am:
- info: info-recursive
- dvi-am:
+ dvi: dvi-recursive
+ 
+@@ -614,21 +593,21 @@ uninstall-man: uninstall-mann
+ 
+ .PHONY: $(RECURSIVE_TARGETS) GTAGS all all-am all-local check check-am \
+ 	clean clean-generic clean-libtool clean-pkglibLTLIBRARIES \
+-	clean-recursive distclean distclean-compile distclean-depend \
+-	distclean-generic distclean-libtool distclean-recursive \
+-	distclean-tags distdir dvi dvi-am dvi-recursive info info-am \
+-	info-recursive install install-am install-data install-data-am \
+-	install-data-recursive install-exec install-exec-am \
+-	install-exec-recursive install-info install-info-am \
+-	install-info-recursive install-man install-mann \
+-	install-pkglibLTLIBRARIES install-recursive install-strip \
+-	installcheck installcheck-am installdirs installdirs-am \
+-	installdirs-recursive maintainer-clean maintainer-clean-generic \
+-	maintainer-clean-recursive mostlyclean mostlyclean-compile \
+-	mostlyclean-generic mostlyclean-libtool mostlyclean-recursive \
+-	tags tags-recursive uninstall uninstall-am uninstall-info-am \
+-	uninstall-info-recursive uninstall-man uninstall-mann \
+-	uninstall-pkglibLTLIBRARIES uninstall-recursive
++	clean-recursive distclean distclean-compile distclean-generic \
++	distclean-libtool distclean-recursive distclean-tags distdir \
++	dvi dvi-am dvi-recursive info info-am info-recursive install \
++	install-am install-data install-data-am install-data-recursive \
++	install-exec install-exec-am install-exec-recursive \
++	install-info install-info-am install-info-recursive install-man \
++	install-mann install-pkglibLTLIBRARIES install-recursive \
++	install-strip installcheck installcheck-am installdirs \
++	installdirs-am installdirs-recursive maintainer-clean \
++	maintainer-clean-generic maintainer-clean-recursive mostlyclean \
++	mostlyclean-compile mostlyclean-generic mostlyclean-libtool \
++	mostlyclean-recursive tags tags-recursive uninstall \
++	uninstall-am uninstall-info-am uninstall-info-recursive \
++	uninstall-man uninstall-mann uninstall-pkglibLTLIBRARIES \
++	uninstall-recursive
+ 
+ 
+ all-local: pkgIndex.tcl
diff --git a/graphics/graphviz/patches/patch-aj b/graphics/graphviz/patches/patch-aj
index ba99707eefa..212fedcd0b6 100644
--- a/graphics/graphviz/patches/patch-aj
+++ b/graphics/graphviz/patches/patch-aj
@@ -1,6 +1,6 @@
-$NetBSD: patch-aj,v 1.2 2002/08/28 13:49:37 seb Exp $
+$NetBSD: patch-aj,v 1.3 2003/03/03 11:35:00 seb Exp $
 
---- tcldgl/demo/Makefile.am.orig	Wed May 15 23:55:31 2002
+--- tcldgl/demo/Makefile.am.orig	2003-01-15 17:22:16.000000000 +0000
 +++ tcldgl/demo/Makefile.am
 @@ -2,7 +2,7 @@
  
@@ -10,4 +10,4 @@ $NetBSD: patch-aj,v 1.2 2002/08/28 13:49:37 seb Exp $
 +demodir = $(prefix)/share/examples/@PACKAGE@
  demo_SCRIPTS = dge
  demo_DATA = dge.README dge.example1.dot  dge.example2.dot
- EXTRA_DIST = $(demo_SCRIPTS) $(demo_DATA)
+ EXTRA_DIST = $(demo_SCRIPTS) $(demo_DATA) CVS/*
diff --git a/graphics/graphviz/patches/patch-ak b/graphics/graphviz/patches/patch-ak
index 524f2901d67..717400487a1 100644
--- a/graphics/graphviz/patches/patch-ak
+++ b/graphics/graphviz/patches/patch-ak
@@ -1,8 +1,8 @@
-$NetBSD: patch-ak,v 1.4 2002/08/28 13:49:37 seb Exp $
+$NetBSD: patch-ak,v 1.5 2003/03/03 11:35:00 seb Exp $
 
---- tcldgl/demo/Makefile.in.orig	Mon Aug  5 05:11:31 2002
+--- tcldgl/demo/Makefile.in.orig	2003-03-02 20:12:23.000000000 +0000
 +++ tcldgl/demo/Makefile.in
-@@ -185,7 +185,7 @@ Z_LIBS = @Z_LIBS@
+@@ -206,7 +206,7 @@ install_sh = @install_sh@
  
  AUTOMAKE_OPTIONS = 1.4
  
@@ -10,13 +10,21 @@ $NetBSD: patch-ak,v 1.4 2002/08/28 13:49:37 seb Exp $
 +demodir = $(prefix)/share/examples/@PACKAGE@
  demo_SCRIPTS = dge
  demo_DATA = dge.README dge.example1.dot  dge.example2.dot
- EXTRA_DIST = $(demo_SCRIPTS) $(demo_DATA)
-@@ -201,7 +201,7 @@ DIST_COMMON =  Makefile.am Makefile.in
+ EXTRA_DIST = $(demo_SCRIPTS) $(demo_DATA) CVS/*
+@@ -216,6 +216,7 @@ CONFIG_HEADER = $(top_builddir)/config.h
+ CONFIG_CLEAN_FILES =
+ SCRIPTS = $(demo_SCRIPTS)
  
- DISTFILES = $(DIST_COMMON) $(SOURCES) $(HEADERS) $(TEXINFOS) $(EXTRA_DIST)
++depcomp =
+ DIST_SOURCES =
+ DATA = $(demo_DATA)
  
--TAR = gtar
-+TAR = tar
- GZIP_ENV = --best
- all: all-redirect
- .SUFFIXES:
+@@ -234,7 +235,7 @@ distclean-libtool:
+ 	-rm -f libtool
+ $(srcdir)/Makefile.in:  Makefile.am  $(top_srcdir)/configure.in $(ACLOCAL_M4)
+ 	cd $(top_srcdir) && \
+-	  $(AUTOMAKE) --gnu  tcldgl/demo/Makefile
++	  $(AUTOMAKE) --foreign  --ignore-deps tcldgl/demo/Makefile
+ Makefile:  $(srcdir)/Makefile.in  $(top_builddir)/config.status
+ 	cd $(top_builddir) && \
+ 	  CONFIG_HEADERS= CONFIG_LINKS= \
diff --git a/graphics/graphviz/patches/patch-al b/graphics/graphviz/patches/patch-al
index af3ebaf323e..ff6bf5c5fd2 100644
--- a/graphics/graphviz/patches/patch-al
+++ b/graphics/graphviz/patches/patch-al
@@ -1,12 +1,12 @@
-$NetBSD: patch-al,v 1.2 2002/08/28 13:49:37 seb Exp $
+$NetBSD: patch-al,v 1.3 2003/03/03 11:35:00 seb Exp $
 
---- tcldgr/Makefile.am.orig	Thu Aug  1 17:43:31 2002
+--- tcldgr/Makefile.am.orig	2003-01-15 17:22:16.000000000 +0000
 +++ tcldgr/Makefile.am
-@@ -21,7 +21,7 @@ libtcldgr_la_LIBADD = \
- 	../tclhandle/libtclhandle.la \
- 	../agraph/libagraphconvenience.la \
- 	../cdt/libcdtconvenience.la \
--        ../tclstubs/libtclstubs.la
+@@ -23,7 +23,7 @@ libtcldgr_la_LIBADD = \
+ 	$(top_srcdir)/tclhandle/libtclhandle.la \
+ 	$(top_srcdir)/agraph/libagraphconvenience.la \
+ 	$(top_srcdir)/cdt/libcdtconvenience.la \
+-        $(top_srcdir)/tclstubs/libtclstubs.la
 +	${TCL_STUB_LIB_SPEC}
  
  all-local: pkgIndex.tcl
diff --git a/graphics/graphviz/patches/patch-am b/graphics/graphviz/patches/patch-am
index 265bee06c06..58a193522d7 100644
--- a/graphics/graphviz/patches/patch-am
+++ b/graphics/graphviz/patches/patch-am
@@ -1,56 +1,126 @@
-$NetBSD: patch-am,v 1.4 2002/08/28 13:49:37 seb Exp $
+$NetBSD: patch-am,v 1.5 2003/03/03 11:35:00 seb Exp $
 
---- tcldgr/Makefile.in.orig	Mon Aug  5 05:11:29 2002
+--- tcldgr/Makefile.in.orig	2003-03-02 20:12:23.000000000 +0000
 +++ tcldgr/Makefile.in
-@@ -185,10 +185,7 @@ Z_LIBS = @Z_LIBS@
+@@ -228,7 +228,7 @@ libtcldgr_la_LIBADD = \
+ 	$(top_srcdir)/tclhandle/libtclhandle.la \
+ 	$(top_srcdir)/agraph/libagraphconvenience.la \
+ 	$(top_srcdir)/cdt/libcdtconvenience.la \
+-        $(top_srcdir)/tclstubs/libtclstubs.la
++	${TCL_STUB_LIB_SPEC}
  
- AUTOMAKE_OPTIONS = 1.4
  
--INCLUDES = @TCL_CFLAGS@ @TCL_INCLUDES@ \
--	-I$(top_srcdir)/agraph \
--	-I$(top_srcdir)/cdt \
--	-I$(top_srcdir)/tclhandle
-+INCLUDES = @TCL_CFLAGS@ @TCL_INCLUDES@ 	-I$(top_srcdir)/agraph 	-I$(top_srcdir)/cdt 	-I$(top_srcdir)/tclhandle
+ CLEANFILES = pkgIndex.tcl
+@@ -243,8 +243,7 @@ LTLIBRARIES = $(pkglib_LTLIBRARIES)
+ libtcldgr_la_LDFLAGS =
+ libtcldgr_la_DEPENDENCIES = $(top_srcdir)/tclhandle/libtclhandle.la \
+ 	$(top_srcdir)/agraph/libagraphconvenience.la \
+-	$(top_srcdir)/cdt/libcdtconvenience.la \
+-	$(top_srcdir)/tclstubs/libtclstubs.la
++	$(top_srcdir)/cdt/libcdtconvenience.la
+ am_libtcldgr_la_OBJECTS = dgedge.lo dgnode.lo dgr.lo dgraph.lo \
+ 	dgrutil.lo
+ libtcldgr_la_OBJECTS = $(am_libtcldgr_la_OBJECTS)
+@@ -253,10 +252,7 @@ DEFS = @DEFS@
+ DEFAULT_INCLUDES =  -I. -I$(srcdir) -I$(top_builddir)
+ CPPFLAGS = @CPPFLAGS@
+ LDFLAGS = @LDFLAGS@
+-depcomp = $(SHELL) $(top_srcdir)/depcomp
+-@AMDEP_TRUE@DEP_FILES = $(DEPDIR)/dgedge.Plo $(DEPDIR)/dgnode.Plo \
+-@AMDEP_TRUE@	$(DEPDIR)/dgr.Plo $(DEPDIR)/dgraph.Plo \
+-@AMDEP_TRUE@	$(DEPDIR)/dgrutil.Plo
++depcomp =
+ COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
+ 	$(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
+ LTCOMPILE = $(LIBTOOL) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) \
+@@ -295,7 +291,7 @@ distclean-libtool:
+ 	-rm -f libtool
+ $(srcdir)/Makefile.in:  Makefile.am  $(top_srcdir)/configure.in $(ACLOCAL_M4)
+ 	cd $(top_srcdir) && \
+-	  $(AUTOMAKE) --gnu  tcldgr/Makefile
++	  $(AUTOMAKE) --foreign  --ignore-deps tcldgr/Makefile
+ Makefile:  $(srcdir)/Makefile.in  $(top_builddir)/config.status
+ 	cd $(top_builddir) && \
+ 	  CONFIG_HEADERS= CONFIG_LINKS= \
+@@ -328,33 +324,14 @@ mostlyclean-compile:
+ distclean-compile:
+ 	-rm -f *.tab.c
  
+-@AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/dgedge.Plo@am__quote@
+-@AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/dgnode.Plo@am__quote@
+-@AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/dgr.Plo@am__quote@
+-@AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/dgraph.Plo@am__quote@
+-@AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/dgrutil.Plo@am__quote@
+-
+-distclean-depend:
+-	-rm -rf $(DEPDIR)
+-
+ .c.o:
+-@AMDEP_TRUE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
+-@AMDEP_TRUE@	depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@
+-@AMDEP_TRUE@	$(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ 	$(COMPILE) -c `test -f $< || echo '$(srcdir)/'`$<
  
- LIBS = @LIBS@
-@@ -201,11 +198,7 @@ man_MANS = tcldgr.n
+ .c.obj:
+-@AMDEP_TRUE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
+-@AMDEP_TRUE@	depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@
+-@AMDEP_TRUE@	$(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ 	$(COMPILE) -c `cygpath -w $<`
  
- libtcldgr_la_SOURCES = dgedge.c dgnode.c dgr.c dgraph.c dgrutil.c dgr.h
+ .c.lo:
+-@AMDEP_TRUE@	source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
+-@AMDEP_TRUE@	depfile='$(DEPDIR)/$*.Plo' tmpdepfile='$(DEPDIR)/$*.TPlo' @AMDEPBACKSLASH@
+-@AMDEP_TRUE@	$(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ 	$(LTCOMPILE) -c -o $@ `test -f $< || echo '$(srcdir)/'`$<
+-CCDEPMODE = @CCDEPMODE@
+ uninstall-info-am:
  
--libtcldgr_la_LIBADD = \
--	../tclhandle/libtclhandle.la \
--	../agraph/libagraphconvenience.la \
--	../cdt/libcdtconvenience.la \
--        ../tclstubs/libtclstubs.la
-+libtcldgr_la_LIBADD =  	../tclhandle/libtclhandle.la 	../agraph/libagraphconvenience.la 	../cdt/libcdtconvenience.la 	${TCL_STUB_LIB_SPEC}
+ manndir = $(mandir)/mann
+@@ -561,8 +538,8 @@ clean-am: clean-generic clean-libtool cl
  
+ distclean: distclean-recursive
  
- CLEANFILES = pkgIndex.tcl
-@@ -226,8 +219,7 @@ X_EXTRA_LIBS = @X_EXTRA_LIBS@
- X_PRE_LIBS = @X_PRE_LIBS@
- libtcldgr_la_LDFLAGS = 
- libtcldgr_la_DEPENDENCIES =  ../tclhandle/libtclhandle.la \
--../agraph/libagraphconvenience.la ../cdt/libcdtconvenience.la \
--../tclstubs/libtclstubs.la
-+../agraph/libagraphconvenience.la ../cdt/libcdtconvenience.la
- libtcldgr_la_OBJECTS =  dgedge.lo dgnode.lo dgr.lo dgraph.lo dgrutil.lo
- CFLAGS = @CFLAGS@
- COMPILE = $(CC) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
-@@ -245,7 +237,7 @@ DIST_COMMON =  Makefile.am Makefile.in
- 
- DISTFILES = $(DIST_COMMON) $(SOURCES) $(HEADERS) $(TEXINFOS) $(EXTRA_DIST)
- 
--TAR = gtar
-+TAR = tar
- GZIP_ENV = --best
- SOURCES = $(libtcldgr_la_SOURCES)
- OBJECTS = $(libtcldgr_la_OBJECTS)
-@@ -486,7 +478,6 @@ distdir: $(DISTFILES)
- 	      || exit 1; \
- 	  fi; \
- 	done
--
- info-am:
- info: info-recursive
- dvi-am:
+-distclean-am: clean-am distclean-compile distclean-depend \
+-	distclean-generic distclean-libtool distclean-tags
++distclean-am: clean-am distclean-compile distclean-generic \
++	distclean-libtool distclean-tags
+ 
+ dvi: dvi-recursive
+ 
+@@ -600,21 +577,21 @@ uninstall-man: uninstall-mann
+ 
+ .PHONY: $(RECURSIVE_TARGETS) GTAGS all all-am all-local check check-am \
+ 	clean clean-generic clean-libtool clean-pkglibLTLIBRARIES \
+-	clean-recursive distclean distclean-compile distclean-depend \
+-	distclean-generic distclean-libtool distclean-recursive \
+-	distclean-tags distdir dvi dvi-am dvi-recursive info info-am \
+-	info-recursive install install-am install-data install-data-am \
+-	install-data-recursive install-exec install-exec-am \
+-	install-exec-recursive install-info install-info-am \
+-	install-info-recursive install-man install-mann \
+-	install-pkglibLTLIBRARIES install-recursive install-strip \
+-	installcheck installcheck-am installdirs installdirs-am \
+-	installdirs-recursive maintainer-clean maintainer-clean-generic \
+-	maintainer-clean-recursive mostlyclean mostlyclean-compile \
+-	mostlyclean-generic mostlyclean-libtool mostlyclean-recursive \
+-	tags tags-recursive uninstall uninstall-am uninstall-info-am \
+-	uninstall-info-recursive uninstall-man uninstall-mann \
+-	uninstall-pkglibLTLIBRARIES uninstall-recursive
++	clean-recursive distclean distclean-compile distclean-generic \
++	distclean-libtool distclean-recursive distclean-tags distdir \
++	dvi dvi-am dvi-recursive info info-am info-recursive install \
++	install-am install-data install-data-am install-data-recursive \
++	install-exec install-exec-am install-exec-recursive \
++	install-info install-info-am install-info-recursive install-man \
++	install-mann install-pkglibLTLIBRARIES install-recursive \
++	install-strip installcheck installcheck-am installdirs \
++	installdirs-am installdirs-recursive maintainer-clean \
++	maintainer-clean-generic maintainer-clean-recursive mostlyclean \
++	mostlyclean-compile mostlyclean-generic mostlyclean-libtool \
++	mostlyclean-recursive tags tags-recursive uninstall \
++	uninstall-am uninstall-info-am uninstall-info-recursive \
++	uninstall-man uninstall-mann uninstall-pkglibLTLIBRARIES \
++	uninstall-recursive
+ 
+ 
+ all-local: pkgIndex.tcl
diff --git a/graphics/graphviz/patches/patch-an b/graphics/graphviz/patches/patch-an
index fde3d1e5178..6a8cb4cd4e9 100644
--- a/graphics/graphviz/patches/patch-an
+++ b/graphics/graphviz/patches/patch-an
@@ -1,6 +1,6 @@
-$NetBSD: patch-an,v 1.2 2002/08/28 13:49:37 seb Exp $
+$NetBSD: patch-an,v 1.3 2003/03/03 11:35:00 seb Exp $
 
---- tcldgr/demo/Makefile.am.orig	Wed May 15 23:55:31 2002
+--- tcldgr/demo/Makefile.am.orig	2003-01-15 17:22:16.000000000 +0000
 +++ tcldgr/demo/Makefile.am
 @@ -2,7 +2,7 @@
  
@@ -10,4 +10,4 @@ $NetBSD: patch-an,v 1.2 2002/08/28 13:49:37 seb Exp $
 +demodir = $(prefix)/share/examples/@PACKAGE@
  demo_SCRIPTS = ihi
  demo_DATA = ihi.README ihi.testdata
- EXTRA_DIST = $(demo_SCRIPTS) $(demo_DATA)
+ EXTRA_DIST = $(demo_SCRIPTS) $(demo_DATA) CVS/*
diff --git a/graphics/graphviz/patches/patch-ao b/graphics/graphviz/patches/patch-ao
index 9cf395cd062..6f64755c71b 100644
--- a/graphics/graphviz/patches/patch-ao
+++ b/graphics/graphviz/patches/patch-ao
@@ -1,8 +1,8 @@
-$NetBSD: patch-ao,v 1.4 2002/08/28 13:49:37 seb Exp $
+$NetBSD: patch-ao,v 1.5 2003/03/03 11:35:00 seb Exp $
 
---- tcldgr/demo/Makefile.in.orig	Mon Aug  5 05:11:29 2002
+--- tcldgr/demo/Makefile.in.orig	2003-03-02 20:12:23.000000000 +0000
 +++ tcldgr/demo/Makefile.in
-@@ -185,7 +185,7 @@ Z_LIBS = @Z_LIBS@
+@@ -206,7 +206,7 @@ install_sh = @install_sh@
  
  AUTOMAKE_OPTIONS = 1.4
  
@@ -10,13 +10,21 @@ $NetBSD: patch-ao,v 1.4 2002/08/28 13:49:37 seb Exp $
 +demodir = $(prefix)/share/examples/@PACKAGE@
  demo_SCRIPTS = ihi
  demo_DATA = ihi.README ihi.testdata
- EXTRA_DIST = $(demo_SCRIPTS) $(demo_DATA)
-@@ -201,7 +201,7 @@ DIST_COMMON =  Makefile.am Makefile.in
+ EXTRA_DIST = $(demo_SCRIPTS) $(demo_DATA) CVS/*
+@@ -216,6 +216,7 @@ CONFIG_HEADER = $(top_builddir)/config.h
+ CONFIG_CLEAN_FILES =
+ SCRIPTS = $(demo_SCRIPTS)
  
- DISTFILES = $(DIST_COMMON) $(SOURCES) $(HEADERS) $(TEXINFOS) $(EXTRA_DIST)
++depcomp =
+ DIST_SOURCES =
+ DATA = $(demo_DATA)
  
--TAR = gtar
-+TAR = tar
- GZIP_ENV = --best
- all: all-redirect
- .SUFFIXES:
+@@ -234,7 +235,7 @@ distclean-libtool:
+ 	-rm -f libtool
+ $(srcdir)/Makefile.in:  Makefile.am  $(top_srcdir)/configure.in $(ACLOCAL_M4)
+ 	cd $(top_srcdir) && \
+-	  $(AUTOMAKE) --gnu  tcldgr/demo/Makefile
++	  $(AUTOMAKE) --foreign  --ignore-deps tcldgr/demo/Makefile
+ Makefile:  $(srcdir)/Makefile.in  $(top_builddir)/config.status
+ 	cd $(top_builddir) && \
+ 	  CONFIG_HEADERS= CONFIG_LINKS= \
diff --git a/graphics/graphviz/patches/patch-ap b/graphics/graphviz/patches/patch-ap
index 6c737931a7c..5c9e7f82936 100644
--- a/graphics/graphviz/patches/patch-ap
+++ b/graphics/graphviz/patches/patch-ap
@@ -1,12 +1,12 @@
-$NetBSD: patch-ap,v 1.2 2002/08/28 13:49:37 seb Exp $
+$NetBSD: patch-ap,v 1.3 2003/03/03 11:35:00 seb Exp $
 
---- tcldot/Makefile.am.orig	Fri Aug  2 22:54:46 2002
+--- tcldot/Makefile.am.orig	2003-01-15 17:35:46.000000000 +0000
 +++ tcldot/Makefile.am
 @@ -36,7 +36,7 @@ libtcldot_la_LIBADD = \
- 	../cdt/libcdtconvenience.la \
- 	../gd/libgdconvenience.la \
- 	../gdtclft/gdtclft.lo \
--	../tclstubs/libtclstubs.la
+ 	$(top_srcdir)/cdt/libcdtconvenience.la \
+ 	$(top_srcdir)/gd/libgdconvenience.la \
+ 	$(top_srcdir)/gdtclft/gdtclft.lo \
+-	$(top_srcdir)/tclstubs/libtclstubs.la
 +	${TCL_STUB_LIB_SPEC}
  
  all-local: pkgIndex.tcl
diff --git a/graphics/graphviz/patches/patch-aq b/graphics/graphviz/patches/patch-aq
index 27781f4f745..c0755bcf452 100644
--- a/graphics/graphviz/patches/patch-aq
+++ b/graphics/graphviz/patches/patch-aq
@@ -1,75 +1,121 @@
-$NetBSD: patch-aq,v 1.4 2002/08/28 13:49:38 seb Exp $
+$NetBSD: patch-aq,v 1.5 2003/03/03 11:35:00 seb Exp $
 
---- tcldot/Makefile.in.orig	Mon Aug  5 05:11:27 2002
+--- tcldot/Makefile.in.orig	2003-03-02 20:12:23.000000000 +0000
 +++ tcldot/Makefile.in
-@@ -185,15 +185,7 @@ Z_LIBS = @Z_LIBS@
+@@ -241,7 +241,7 @@ libtcldot_la_LIBADD = \
+ 	$(top_srcdir)/cdt/libcdtconvenience.la \
+ 	$(top_srcdir)/gd/libgdconvenience.la \
+ 	$(top_srcdir)/gdtclft/gdtclft.lo \
+-	$(top_srcdir)/tclstubs/libtclstubs.la
++	${TCL_STUB_LIB_SPEC}
  
- AUTOMAKE_OPTIONS = 1.4
  
--INCLUDES = @TCL_CFLAGS@ @TCL_INCLUDES@ \
--	-I$(top_srcdir)/dotneato/dotgen \
--	-I$(top_srcdir)/dotneato/neatogen \
--	-I$(top_srcdir)/dotneato/twopigen \
--	-I$(top_srcdir)/dotneato/common \
--	-I$(top_srcdir)/graph \
--	-I$(top_srcdir)/cdt \
--	-I$(top_srcdir)/pathplan \
--	-I$(top_srcdir)/tclhandle
-+INCLUDES = @TCL_CFLAGS@ @TCL_INCLUDES@ 	-I$(top_srcdir)/dotneato/dotgen 	-I$(top_srcdir)/dotneato/neatogen 	-I$(top_srcdir)/dotneato/twopigen 	-I$(top_srcdir)/dotneato/common 	-I$(top_srcdir)/graph 	-I$(top_srcdir)/cdt 	-I$(top_srcdir)/pathplan 	-I$(top_srcdir)/tclhandle
+ CLEANFILES = pkgIndex.tcl
+@@ -266,8 +266,7 @@ libtcldot_la_DEPENDENCIES = $(top_srcdir
+ 	$(top_srcdir)/graph/libgraphconvenience.la \
+ 	$(top_srcdir)/cdt/libcdtconvenience.la \
+ 	$(top_srcdir)/gd/libgdconvenience.la \
+-	$(top_srcdir)/gdtclft/gdtclft.lo \
+-	$(top_srcdir)/tclstubs/libtclstubs.la
++	$(top_srcdir)/gdtclft/gdtclft.lo
+ am_libtcldot_la_OBJECTS = tcldot.lo tkgen.lo
+ libtcldot_la_OBJECTS = $(am_libtcldot_la_OBJECTS)
  
+@@ -275,8 +274,7 @@ DEFS = @DEFS@
+ DEFAULT_INCLUDES =  -I. -I$(srcdir) -I$(top_builddir)
+ CPPFLAGS = @CPPFLAGS@
+ LDFLAGS = @LDFLAGS@
+-depcomp = $(SHELL) $(top_srcdir)/depcomp
+-@AMDEP_TRUE@DEP_FILES = $(DEPDIR)/tcldot.Plo $(DEPDIR)/tkgen.Plo
++depcomp =
+ COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
+ 	$(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
+ LTCOMPILE = $(LIBTOOL) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) \
+@@ -315,7 +313,7 @@ distclean-libtool:
+ 	-rm -f libtool
+ $(srcdir)/Makefile.in:  Makefile.am  $(top_srcdir)/configure.in $(ACLOCAL_M4)
+ 	cd $(top_srcdir) && \
+-	  $(AUTOMAKE) --gnu  tcldot/Makefile
++	  $(AUTOMAKE) --foreign  --ignore-deps tcldot/Makefile
+ Makefile:  $(srcdir)/Makefile.in  $(top_builddir)/config.status
+ 	cd $(top_builddir) && \
+ 	  CONFIG_HEADERS= CONFIG_LINKS= \
+@@ -348,30 +346,14 @@ mostlyclean-compile:
+ distclean-compile:
+ 	-rm -f *.tab.c
  
- LIBS = @LIBS@ -lc
-@@ -208,25 +200,12 @@ man_MANS = tcldot.n
+-@AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/tcldot.Plo@am__quote@
+-@AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/tkgen.Plo@am__quote@
+-
+-distclean-depend:
+-	-rm -rf $(DEPDIR)
+-
+ .c.o:
+-@AMDEP_TRUE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
+-@AMDEP_TRUE@	depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@
+-@AMDEP_TRUE@	$(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ 	$(COMPILE) -c `test -f $< || echo '$(srcdir)/'`$<
  
- libtcldot_la_SOURCES = tcldot.c tkgen.c tcldot.h
+ .c.obj:
+-@AMDEP_TRUE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
+-@AMDEP_TRUE@	depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@
+-@AMDEP_TRUE@	$(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ 	$(COMPILE) -c `cygpath -w $<`
  
--libtcldot_la_LIBADD = \
--	../tclhandle/libtclhandle.la \
--	../dotneato/common/libdotneato.la \
--        ../dotneato/dotgen/libdot.la \
--        ../dotneato/neatogen/libneato.la \
--        ../dotneato/twopigen/libtwopi.la \
--        ../dotneato/pack/libpackconvenience.la \
--        ../pathplan/libpathplanconvenience.la \
--        ../graph/libgraphconvenience.la \
--	../cdt/libcdtconvenience.la \
--	../gd/libgdconvenience.la \
--	../gdtclft/gdtclft.lo \
--	../tclstubs/libtclstubs.la
-+libtcldot_la_LIBADD =  	../tclhandle/libtclhandle.la 	../dotneato/common/libdotneato.la         ../dotneato/dotgen/libdot.la         ../dotneato/neatogen/libneato.la         ../dotneato/twopigen/libtwopi.la         ../dotneato/pack/libpackconvenience.la         ../pathplan/libpathplanconvenience.la         ../graph/libgraphconvenience.la 	../cdt/libcdtconvenience.la 	../gd/libgdconvenience.la 	../gdtclft/gdtclft.lo 	${TCL_STUB_LIB_SPEC}
+ .c.lo:
+-@AMDEP_TRUE@	source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
+-@AMDEP_TRUE@	depfile='$(DEPDIR)/$*.Plo' tmpdepfile='$(DEPDIR)/$*.TPlo' @AMDEPBACKSLASH@
+-@AMDEP_TRUE@	$(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ 	$(LTCOMPILE) -c -o $@ `test -f $< || echo '$(srcdir)/'`$<
+-CCDEPMODE = @CCDEPMODE@
+ uninstall-info-am:
  
+ manndir = $(mandir)/mann
+@@ -578,8 +560,8 @@ clean-am: clean-generic clean-libtool cl
  
- CLEANFILES = pkgIndex.tcl
+ distclean: distclean-recursive
  
--EXTRA_DIST = $(man_MANS) README README.Tkspline \
--	nmakefile Makefile.old
-+EXTRA_DIST = $(man_MANS) README README.Tkspline 	nmakefile Makefile.old
+-distclean-am: clean-am distclean-compile distclean-depend \
+-	distclean-generic distclean-libtool distclean-tags
++distclean-am: clean-am distclean-compile distclean-generic \
++	distclean-libtool distclean-tags
  
- mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
- CONFIG_HEADER = ../gvconfig.h
-@@ -248,7 +227,7 @@ libtcldot_la_DEPENDENCIES =  ../tclhandl
- ../dotneato/pack/libpackconvenience.la \
- ../pathplan/libpathplanconvenience.la ../graph/libgraphconvenience.la \
- ../cdt/libcdtconvenience.la ../gd/libgdconvenience.la \
--../gdtclft/gdtclft.lo ../tclstubs/libtclstubs.la
-+../gdtclft/gdtclft.lo
- libtcldot_la_OBJECTS =  tcldot.lo tkgen.lo
- COMPILE = $(CC) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
- LTCOMPILE = $(LIBTOOL) --mode=compile $(CC) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
-@@ -265,7 +244,7 @@ DIST_COMMON =  README Makefile.am Makefi
+ dvi: dvi-recursive
  
- DISTFILES = $(DIST_COMMON) $(SOURCES) $(HEADERS) $(TEXINFOS) $(EXTRA_DIST)
+@@ -617,21 +599,21 @@ uninstall-man: uninstall-mann
  
--TAR = gtar
-+TAR = tar
- GZIP_ENV = --best
- SOURCES = $(libtcldot_la_SOURCES)
- OBJECTS = $(libtcldot_la_OBJECTS)
-@@ -506,7 +485,6 @@ distdir: $(DISTFILES)
- 	      || exit 1; \
- 	  fi; \
- 	done
--
- info-am:
- info: info-recursive
- dvi-am:
+ .PHONY: $(RECURSIVE_TARGETS) GTAGS all all-am all-local check check-am \
+ 	clean clean-generic clean-libtool clean-pkglibLTLIBRARIES \
+-	clean-recursive distclean distclean-compile distclean-depend \
+-	distclean-generic distclean-libtool distclean-recursive \
+-	distclean-tags distdir dvi dvi-am dvi-recursive info info-am \
+-	info-recursive install install-am install-data install-data-am \
+-	install-data-recursive install-exec install-exec-am \
+-	install-exec-recursive install-info install-info-am \
+-	install-info-recursive install-man install-mann \
+-	install-pkglibLTLIBRARIES install-recursive install-strip \
+-	installcheck installcheck-am installdirs installdirs-am \
+-	installdirs-recursive maintainer-clean maintainer-clean-generic \
+-	maintainer-clean-recursive mostlyclean mostlyclean-compile \
+-	mostlyclean-generic mostlyclean-libtool mostlyclean-recursive \
+-	tags tags-recursive uninstall uninstall-am uninstall-info-am \
+-	uninstall-info-recursive uninstall-man uninstall-mann \
+-	uninstall-pkglibLTLIBRARIES uninstall-recursive
++	clean-recursive distclean distclean-compile distclean-generic \
++	distclean-libtool distclean-recursive distclean-tags distdir \
++	dvi dvi-am dvi-recursive info info-am info-recursive install \
++	install-am install-data install-data-am install-data-recursive \
++	install-exec install-exec-am install-exec-recursive \
++	install-info install-info-am install-info-recursive install-man \
++	install-mann install-pkglibLTLIBRARIES install-recursive \
++	install-strip installcheck installcheck-am installdirs \
++	installdirs-am installdirs-recursive maintainer-clean \
++	maintainer-clean-generic maintainer-clean-recursive mostlyclean \
++	mostlyclean-compile mostlyclean-generic mostlyclean-libtool \
++	mostlyclean-recursive tags tags-recursive uninstall \
++	uninstall-am uninstall-info-am uninstall-info-recursive \
++	uninstall-man uninstall-mann uninstall-pkglibLTLIBRARIES \
++	uninstall-recursive
+ 
+ 
+ all-local: pkgIndex.tcl
diff --git a/graphics/graphviz/patches/patch-ar b/graphics/graphviz/patches/patch-ar
index 676c83d3dee..de7eb7946f6 100644
--- a/graphics/graphviz/patches/patch-ar
+++ b/graphics/graphviz/patches/patch-ar
@@ -1,6 +1,6 @@
-$NetBSD: patch-ar,v 1.2 2002/08/28 13:49:38 seb Exp $
+$NetBSD: patch-ar,v 1.3 2003/03/03 11:35:01 seb Exp $
 
---- tcldot/demo/Makefile.am.orig	Wed May 15 23:55:31 2002
+--- tcldot/demo/Makefile.am.orig	2003-01-15 17:22:16.000000000 +0000
 +++ tcldot/demo/Makefile.am
 @@ -2,7 +2,7 @@
  
@@ -10,4 +10,4 @@ $NetBSD: patch-ar,v 1.2 2002/08/28 13:49:38 seb Exp $
 +demodir = $(prefix)/share/examples/@PACKAGE@
  demo_SCRIPTS = doted gcat
  demo_DATA = doted.README gcat.README
- EXTRA_DIST = $(demo_SCRIPTS) $(demo_DATA)
+ EXTRA_DIST = $(demo_SCRIPTS) $(demo_DATA) CVS/*
diff --git a/graphics/graphviz/patches/patch-as b/graphics/graphviz/patches/patch-as
index dbb7f508060..a59dfd38d4c 100644
--- a/graphics/graphviz/patches/patch-as
+++ b/graphics/graphviz/patches/patch-as
@@ -1,8 +1,8 @@
-$NetBSD: patch-as,v 1.4 2002/08/28 13:49:38 seb Exp $
+$NetBSD: patch-as,v 1.5 2003/03/03 11:35:01 seb Exp $
 
---- tcldot/demo/Makefile.in.orig	Mon Aug  5 05:11:28 2002
+--- tcldot/demo/Makefile.in.orig	2003-03-02 20:12:23.000000000 +0000
 +++ tcldot/demo/Makefile.in
-@@ -185,7 +185,7 @@ Z_LIBS = @Z_LIBS@
+@@ -206,7 +206,7 @@ install_sh = @install_sh@
  
  AUTOMAKE_OPTIONS = 1.4
  
@@ -10,13 +10,21 @@ $NetBSD: patch-as,v 1.4 2002/08/28 13:49:38 seb Exp $
 +demodir = $(prefix)/share/examples/@PACKAGE@
  demo_SCRIPTS = doted gcat
  demo_DATA = doted.README gcat.README
- EXTRA_DIST = $(demo_SCRIPTS) $(demo_DATA)
-@@ -201,7 +201,7 @@ DIST_COMMON =  Makefile.am Makefile.in
+ EXTRA_DIST = $(demo_SCRIPTS) $(demo_DATA) CVS/*
+@@ -216,6 +216,7 @@ CONFIG_HEADER = $(top_builddir)/config.h
+ CONFIG_CLEAN_FILES =
+ SCRIPTS = $(demo_SCRIPTS)
  
- DISTFILES = $(DIST_COMMON) $(SOURCES) $(HEADERS) $(TEXINFOS) $(EXTRA_DIST)
++depcomp =
+ DIST_SOURCES =
+ DATA = $(demo_DATA)
  
--TAR = gtar
-+TAR = tar
- GZIP_ENV = --best
- all: all-redirect
- .SUFFIXES:
+@@ -234,7 +235,7 @@ distclean-libtool:
+ 	-rm -f libtool
+ $(srcdir)/Makefile.in:  Makefile.am  $(top_srcdir)/configure.in $(ACLOCAL_M4)
+ 	cd $(top_srcdir) && \
+-	  $(AUTOMAKE) --gnu  tcldot/demo/Makefile
++	  $(AUTOMAKE) --foreign  --ignore-deps tcldot/demo/Makefile
+ Makefile:  $(srcdir)/Makefile.in  $(top_builddir)/config.status
+ 	cd $(top_builddir) && \
+ 	  CONFIG_HEADERS= CONFIG_LINKS= \
diff --git a/graphics/graphviz/patches/patch-at b/graphics/graphviz/patches/patch-at
index d9cd7c9f26b..53b406cab3b 100644
--- a/graphics/graphviz/patches/patch-at
+++ b/graphics/graphviz/patches/patch-at
@@ -1,12 +1,12 @@
-$NetBSD: patch-at,v 1.2 2002/08/28 13:49:38 seb Exp $
+$NetBSD: patch-at,v 1.3 2003/03/03 11:35:01 seb Exp $
 
---- tclpathplan/Makefile.am.orig	Thu Aug  1 17:43:31 2002
+--- tclpathplan/Makefile.am.orig	2003-01-15 17:22:16.000000000 +0000
 +++ tclpathplan/Makefile.am
-@@ -19,7 +19,7 @@ libtclplan_la_SOURCES = find_ints.c inte
+@@ -21,7 +21,7 @@ libtclplan_la_SOURCES = find_ints.c inte
  libtclplan_la_LIBADD = \
- 	../tclhandle/libtclhandle.la \
- 	../pathplan/libpathplanconvenience.la \
--	../tclstubs/libtclstubs.la
+ 	$(top_srcdir)/tclhandle/libtclhandle.la \
+ 	$(top_srcdir)/pathplan/libpathplanconvenience.la \
+-	$(top_srcdir)/tclstubs/libtclstubs.la
 +	${TCL_STUB_LIB_SPEC}
  
  all-local: pkgIndex.tcl
diff --git a/graphics/graphviz/patches/patch-au b/graphics/graphviz/patches/patch-au
index 281b8440ebe..1b5542a8746 100644
--- a/graphics/graphviz/patches/patch-au
+++ b/graphics/graphviz/patches/patch-au
@@ -1,58 +1,115 @@
-$NetBSD: patch-au,v 1.4 2002/08/28 13:49:38 seb Exp $
+$NetBSD: patch-au,v 1.5 2003/03/03 11:35:01 seb Exp $
 
---- tclpathplan/Makefile.in.orig	Mon Aug  5 05:11:31 2002
+--- tclpathplan/Makefile.in.orig	2003-03-02 20:12:24.000000000 +0000
 +++ tclpathplan/Makefile.in
-@@ -185,9 +185,7 @@ Z_LIBS = @Z_LIBS@
+@@ -227,7 +227,7 @@ libtclplan_la_SOURCES = find_ints.c inte
+ libtclplan_la_LIBADD = \
+ 	$(top_srcdir)/tclhandle/libtclhandle.la \
+ 	$(top_srcdir)/pathplan/libpathplanconvenience.la \
+-	$(top_srcdir)/tclstubs/libtclstubs.la
++	${TCL_STUB_LIB_SPEC}
  
- AUTOMAKE_OPTIONS = 1.4
  
--INCLUDES = @TCL_CFLAGS@ @TCL_INCLUDES@ \
--	-I$(top_srcdir)/tclhandle \
--	-I$(top_srcdir)/pathplan
-+INCLUDES = @TCL_CFLAGS@ @TCL_INCLUDES@ 	-I$(top_srcdir)/tclhandle 	-I$(top_srcdir)/pathplan
+ CLEANFILES = pkgIndex.tcl
+@@ -241,8 +241,7 @@ LTLIBRARIES = $(pkglib_LTLIBRARIES)
  
+ libtclplan_la_LDFLAGS =
+ libtclplan_la_DEPENDENCIES = $(top_srcdir)/tclhandle/libtclhandle.la \
+-	$(top_srcdir)/pathplan/libpathplanconvenience.la \
+-	$(top_srcdir)/tclstubs/libtclstubs.la
++	$(top_srcdir)/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)
+@@ -251,10 +250,7 @@ DEFS = @DEFS@
+ DEFAULT_INCLUDES =  -I. -I$(srcdir) -I$(top_builddir)
+ CPPFLAGS = @CPPFLAGS@
+ LDFLAGS = @LDFLAGS@
+-depcomp = $(SHELL) $(top_srcdir)/depcomp
+-@AMDEP_TRUE@DEP_FILES = $(DEPDIR)/find_ints.Plo $(DEPDIR)/intersect.Plo \
+-@AMDEP_TRUE@	$(DEPDIR)/makecw.Plo $(DEPDIR)/tclpathplan.Plo \
+-@AMDEP_TRUE@	$(DEPDIR)/wrapper.Plo
++depcomp =
+ COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
+ 	$(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
+ LTCOMPILE = $(LIBTOOL) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) \
+@@ -290,7 +286,7 @@ distclean-libtool:
+ 	-rm -f libtool
+ $(srcdir)/Makefile.in:  Makefile.am  $(top_srcdir)/configure.in $(ACLOCAL_M4)
+ 	cd $(top_srcdir) && \
+-	  $(AUTOMAKE) --gnu  tclpathplan/Makefile
++	  $(AUTOMAKE) --foreign  --ignore-deps tclpathplan/Makefile
+ Makefile:  $(srcdir)/Makefile.in  $(top_builddir)/config.status
+ 	cd $(top_builddir) && \
+ 	  CONFIG_HEADERS= CONFIG_LINKS= \
+@@ -323,33 +319,14 @@ mostlyclean-compile:
+ distclean-compile:
+ 	-rm -f *.tab.c
  
- LIBS = @LIBS@
-@@ -197,14 +195,10 @@ pkglib_LTLIBRARIES = libtclplan.la
+-@AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/find_ints.Plo@am__quote@
+-@AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/intersect.Plo@am__quote@
+-@AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/makecw.Plo@am__quote@
+-@AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/tclpathplan.Plo@am__quote@
+-@AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/wrapper.Plo@am__quote@
+-
+-distclean-depend:
+-	-rm -rf $(DEPDIR)
+-
+ .c.o:
+-@AMDEP_TRUE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
+-@AMDEP_TRUE@	depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@
+-@AMDEP_TRUE@	$(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ 	$(COMPILE) -c `test -f $< || echo '$(srcdir)/'`$<
  
- SUBDIRS = demo
+ .c.obj:
+-@AMDEP_TRUE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
+-@AMDEP_TRUE@	depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@
+-@AMDEP_TRUE@	$(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ 	$(COMPILE) -c `cygpath -w $<`
  
--libtclplan_la_SOURCES = find_ints.c intersect.c makecw.c \
--	tclpathplan.c wrapper.c simple.h
-+libtclplan_la_SOURCES = find_ints.c intersect.c makecw.c 	tclpathplan.c wrapper.c simple.h
+ .c.lo:
+-@AMDEP_TRUE@	source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
+-@AMDEP_TRUE@	depfile='$(DEPDIR)/$*.Plo' tmpdepfile='$(DEPDIR)/$*.TPlo' @AMDEPBACKSLASH@
+-@AMDEP_TRUE@	$(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ 	$(LTCOMPILE) -c -o $@ `test -f $< || echo '$(srcdir)/'`$<
+-CCDEPMODE = @CCDEPMODE@
+ uninstall-info-am:
  
+ # This directory's subdirectories are mostly independent; you can cd
+@@ -517,8 +494,8 @@ clean-am: clean-generic clean-libtool cl
  
--libtclplan_la_LIBADD = \
--	../tclhandle/libtclhandle.la \
--	../pathplan/libpathplanconvenience.la \
--	../tclstubs/libtclstubs.la
-+libtclplan_la_LIBADD =  	../tclhandle/libtclhandle.la 	../pathplan/libpathplanconvenience.la 	${TCL_STUB_LIB_SPEC}
+ distclean: distclean-recursive
  
+-distclean-am: clean-am distclean-compile distclean-depend \
+-	distclean-generic distclean-libtool distclean-tags
++distclean-am: clean-am distclean-compile distclean-generic \
++	distclean-libtool distclean-tags
  
- CLEANFILES = pkgIndex.tcl
-@@ -223,7 +217,7 @@ X_EXTRA_LIBS = @X_EXTRA_LIBS@
- X_PRE_LIBS = @X_PRE_LIBS@
- libtclplan_la_LDFLAGS = 
- libtclplan_la_DEPENDENCIES =  ../tclhandle/libtclhandle.la \
--../pathplan/libpathplanconvenience.la ../tclstubs/libtclstubs.la
-+../pathplan/libpathplanconvenience.la
- libtclplan_la_OBJECTS =  find_ints.lo intersect.lo makecw.lo \
- tclpathplan.lo wrapper.lo
- CFLAGS = @CFLAGS@
-@@ -238,7 +232,7 @@ DIST_COMMON =  Makefile.am Makefile.in
- 
- DISTFILES = $(DIST_COMMON) $(SOURCES) $(HEADERS) $(TEXINFOS) $(EXTRA_DIST)
- 
--TAR = gtar
-+TAR = tar
- GZIP_ENV = --best
- SOURCES = $(libtclplan_la_SOURCES)
- OBJECTS = $(libtclplan_la_OBJECTS)
-@@ -440,7 +434,6 @@ distdir: $(DISTFILES)
- 	      || exit 1; \
- 	  fi; \
- 	done
--
- info-am:
- info: info-recursive
- dvi-am:
+ dvi: dvi-recursive
+ 
+@@ -553,16 +530,15 @@ uninstall-info: uninstall-info-recursive
+ 
+ .PHONY: $(RECURSIVE_TARGETS) GTAGS all all-am all-local check check-am \
+ 	clean clean-generic clean-libtool clean-pkglibLTLIBRARIES \
+-	clean-recursive distclean distclean-compile distclean-depend \
+-	distclean-generic distclean-libtool distclean-recursive \
+-	distclean-tags distdir dvi dvi-am dvi-recursive info info-am \
+-	info-recursive install install-am install-data install-data-am \
+-	install-data-recursive install-exec install-exec-am \
+-	install-exec-recursive install-info install-info-am \
+-	install-info-recursive install-man install-pkglibLTLIBRARIES \
+-	install-recursive install-strip installcheck installcheck-am \
+-	installdirs installdirs-am installdirs-recursive \
+-	maintainer-clean maintainer-clean-generic \
++	clean-recursive distclean distclean-compile distclean-generic \
++	distclean-libtool distclean-recursive distclean-tags distdir \
++	dvi dvi-am dvi-recursive info info-am info-recursive install \
++	install-am install-data install-data-am install-data-recursive \
++	install-exec install-exec-am install-exec-recursive \
++	install-info install-info-am install-info-recursive install-man \
++	install-pkglibLTLIBRARIES install-recursive install-strip \
++	installcheck installcheck-am installdirs installdirs-am \
++	installdirs-recursive maintainer-clean maintainer-clean-generic \
+ 	maintainer-clean-recursive mostlyclean mostlyclean-compile \
+ 	mostlyclean-generic mostlyclean-libtool mostlyclean-recursive \
+ 	tags tags-recursive uninstall uninstall-am uninstall-info-am \
diff --git a/graphics/graphviz/patches/patch-aw b/graphics/graphviz/patches/patch-aw
index 5f7707acceb..7961a7fdfae 100644
--- a/graphics/graphviz/patches/patch-aw
+++ b/graphics/graphviz/patches/patch-aw
@@ -1,8 +1,8 @@
-$NetBSD: patch-aw,v 1.4 2002/08/28 13:49:38 seb Exp $
+$NetBSD: patch-aw,v 1.5 2003/03/03 11:35:01 seb Exp $
 
---- tclpathplan/demo/Makefile.in.orig	Mon Aug  5 05:11:33 2002
+--- tclpathplan/demo/Makefile.in.orig	2003-03-02 20:12:23.000000000 +0000
 +++ tclpathplan/demo/Makefile.in
-@@ -187,7 +187,7 @@ AUTOMAKE_OPTIONS = 1.4
+@@ -208,7 +208,7 @@ AUTOMAKE_OPTIONS = 1.4
  
  SUBDIRS = pathplan_data
  
@@ -11,12 +11,20 @@ $NetBSD: patch-aw,v 1.4 2002/08/28 13:49:38 seb Exp $
  demo_SCRIPTS = pathplan
  demo_DATA = pathplan.README 
  
-@@ -204,7 +204,7 @@ DIST_COMMON =  Makefile.am Makefile.in
+@@ -219,6 +219,7 @@ CONFIG_HEADER = $(top_builddir)/config.h
+ CONFIG_CLEAN_FILES =
+ SCRIPTS = $(demo_SCRIPTS)
  
- DISTFILES = $(DIST_COMMON) $(SOURCES) $(HEADERS) $(TEXINFOS) $(EXTRA_DIST)
++depcomp =
+ DIST_SOURCES =
+ DATA = $(demo_DATA)
  
--TAR = gtar
-+TAR = tar
- GZIP_ENV = --best
- all: all-redirect
- .SUFFIXES:
+@@ -243,7 +244,7 @@ distclean-libtool:
+ 	-rm -f libtool
+ $(srcdir)/Makefile.in:  Makefile.am  $(top_srcdir)/configure.in $(ACLOCAL_M4)
+ 	cd $(top_srcdir) && \
+-	  $(AUTOMAKE) --gnu  tclpathplan/demo/Makefile
++	  $(AUTOMAKE) --foreign  --ignore-deps tclpathplan/demo/Makefile
+ Makefile:  $(srcdir)/Makefile.in  $(top_builddir)/config.status
+ 	cd $(top_builddir) && \
+ 	  CONFIG_HEADERS= CONFIG_LINKS= \
diff --git a/graphics/graphviz/patches/patch-ax b/graphics/graphviz/patches/patch-ax
index 13fb1bad255..e36ce88adf5 100644
--- a/graphics/graphviz/patches/patch-ax
+++ b/graphics/graphviz/patches/patch-ax
@@ -1,6 +1,6 @@
-$NetBSD: patch-ax,v 1.2 2002/08/28 13:49:40 seb Exp $
+$NetBSD: patch-ax,v 1.3 2003/03/03 11:35:01 seb Exp $
 
---- tclpathplan/demo/pathplan_data/Makefile.am.orig	Wed May 15 23:55:31 2002
+--- tclpathplan/demo/pathplan_data/Makefile.am.orig	2003-01-15 17:22:17.000000000 +0000
 +++ tclpathplan/demo/pathplan_data/Makefile.am
 @@ -5,7 +5,7 @@ AUTOMAKE_OPTIONS = 1.4
  EXAMPLES = boxes.dat dpd.dat funny.dat maze.dat nested.dat northo.dat \
@@ -10,4 +10,4 @@ $NetBSD: patch-ax,v 1.2 2002/08/28 13:49:40 seb Exp $
 +pathplanexampledir = $(prefix)/share/examples/@PACKAGE@/pathplan_data
  
  pathplanexample_DATA = $(EXAMPLES)
- EXTRA_DIST = $(EXAMPLES)
+ EXTRA_DIST = $(EXAMPLES) CVS/*
diff --git a/graphics/graphviz/patches/patch-ay b/graphics/graphviz/patches/patch-ay
index cae30bafcb6..beae245d2af 100644
--- a/graphics/graphviz/patches/patch-ay
+++ b/graphics/graphviz/patches/patch-ay
@@ -1,27 +1,30 @@
-$NetBSD: patch-ay,v 1.4 2002/08/28 13:49:40 seb Exp $
+$NetBSD: patch-ay,v 1.5 2003/03/03 11:35:01 seb Exp $
 
---- tclpathplan/demo/pathplan_data/Makefile.in.orig	Mon Aug  5 05:11:33 2002
+--- tclpathplan/demo/pathplan_data/Makefile.in.orig	2003-03-02 20:12:23.000000000 +0000
 +++ tclpathplan/demo/pathplan_data/Makefile.in
-@@ -185,11 +185,10 @@ Z_LIBS = @Z_LIBS@
- 
- AUTOMAKE_OPTIONS = 1.4
- 
--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
-+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
+@@ -210,7 +210,7 @@ EXAMPLES = boxes.dat dpd.dat funny.dat m
+ 	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
  
  pathplanexample_DATA = $(EXAMPLES)
- EXTRA_DIST = $(EXAMPLES)
-@@ -203,7 +202,7 @@ DIST_COMMON =  Makefile.am Makefile.in
- 
- DISTFILES = $(DIST_COMMON) $(SOURCES) $(HEADERS) $(TEXINFOS) $(EXTRA_DIST)
+ EXTRA_DIST = $(EXAMPLES) CVS/*
+@@ -218,6 +218,7 @@ subdir = tclpathplan/demo/pathplan_data
+ mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
+ CONFIG_HEADER = $(top_builddir)/config.h
+ CONFIG_CLEAN_FILES =
++depcomp =
+ DIST_SOURCES =
+ DATA = $(pathplanexample_DATA)
  
--TAR = gtar
-+TAR = tar
- GZIP_ENV = --best
- all: all-redirect
- .SUFFIXES:
+@@ -236,7 +237,7 @@ distclean-libtool:
+ 	-rm -f libtool
+ $(srcdir)/Makefile.in:  Makefile.am  $(top_srcdir)/configure.in $(ACLOCAL_M4)
+ 	cd $(top_srcdir) && \
+-	  $(AUTOMAKE) --gnu  tclpathplan/demo/pathplan_data/Makefile
++	  $(AUTOMAKE) --foreign  --ignore-deps tclpathplan/demo/pathplan_data/Makefile
+ Makefile:  $(srcdir)/Makefile.in  $(top_builddir)/config.status
+ 	cd $(top_builddir) && \
+ 	  CONFIG_HEADERS= CONFIG_LINKS= \
diff --git a/graphics/graphviz/patches/patch-az b/graphics/graphviz/patches/patch-az
index 881b2d55c11..2da2cf9afca 100644
--- a/graphics/graphviz/patches/patch-az
+++ b/graphics/graphviz/patches/patch-az
@@ -1,13 +1,13 @@
-$NetBSD: patch-az,v 1.2 2002/08/28 13:49:40 seb Exp $
+$NetBSD: patch-az,v 1.3 2003/03/03 11:35:01 seb Exp $
 
---- tkspline/Makefile.am.orig	Thu Aug  1 02:19:11 2002
+--- tkspline/Makefile.am.orig	2003-01-15 17:22:17.000000000 +0000
 +++ tkspline/Makefile.am
-@@ -16,8 +16,8 @@ man_MANS = tkspline.n
+@@ -17,8 +17,8 @@ man_MANS = tkspline.n
  libtkspline_la_SOURCES = tkspline.c
  
  libtkspline_la_LIBADD = \
--	../tkstubs/libtkstubs.la \
--	../tclstubs/libtclstubs.la 
+-	$(top_srcdir)/tkstubs/libtkstubs.la \
+-	$(top_srcdir)/tclstubs/libtclstubs.la 
 +	${TK_STUB_LIB_SPEC} \
 +	${TCL_STUB_LIB_SPEC}
  
diff --git a/graphics/graphviz/patches/patch-ba b/graphics/graphviz/patches/patch-ba
index 659a29cda3b..69d5c3258a1 100644
--- a/graphics/graphviz/patches/patch-ba
+++ b/graphics/graphviz/patches/patch-ba
@@ -1,53 +1,122 @@
-$NetBSD: patch-ba,v 1.4 2002/08/28 13:49:40 seb Exp $
+$NetBSD: patch-ba,v 1.5 2003/03/03 11:35:01 seb Exp $
 
---- tkspline/Makefile.in.orig	Mon Aug  5 05:11:35 2002
+--- tkspline/Makefile.in.orig	2003-03-02 20:12:24.000000000 +0000
 +++ tkspline/Makefile.in
-@@ -183,9 +183,7 @@ YACC = @YACC@
- Z_INCLUDES = @Z_INCLUDES@
- Z_LIBS = @Z_LIBS@
- 
--INCLUDES = @X_CFLAGS@ \
--	@TCL_CFLAGS@ @TCL_INCLUDES@ @TCLINT_INCLUDES@ \
--	@TK_CFLAGS@ @TK_INCLUDES@ @TK_DEFS@ @TKINT_INCLUDES@
-+INCLUDES = @X_CFLAGS@ 	@TCL_CFLAGS@ @TCL_INCLUDES@ @TCLINT_INCLUDES@ 	@TK_CFLAGS@ @TK_INCLUDES@ @TK_DEFS@ @TKINT_INCLUDES@
+@@ -222,8 +222,8 @@ man_MANS = tkspline.n
+ libtkspline_la_SOURCES = tkspline.c
  
+ libtkspline_la_LIBADD = \
+-	$(top_srcdir)/tkstubs/libtkstubs.la \
+-	$(top_srcdir)/tclstubs/libtclstubs.la 
++	${TK_STUB_LIB_SPEC} \
++	${TCL_STUB_LIB_SPEC}
  
- LIBS = 
-@@ -199,9 +197,7 @@ man_MANS = tkspline.n
  
- libtkspline_la_SOURCES = tkspline.c
+ CLEANFILES = pkgIndex.tcl
+@@ -236,8 +236,7 @@ CONFIG_CLEAN_FILES =
+ LTLIBRARIES = $(pkglib_LTLIBRARIES)
  
--libtkspline_la_LIBADD = \
--	../tkstubs/libtkstubs.la \
--	../tclstubs/libtclstubs.la 
-+libtkspline_la_LIBADD =  	${TK_STUB_LIB_SPEC} 	${TCL_STUB_LIB_SPEC}
+ libtkspline_la_LDFLAGS =
+-libtkspline_la_DEPENDENCIES = $(top_srcdir)/tkstubs/libtkstubs.la \
+-	$(top_srcdir)/tclstubs/libtclstubs.la
++libtkspline_la_DEPENDENCIES =
+ am_libtkspline_la_OBJECTS = tkspline.lo
+ libtkspline_la_OBJECTS = $(am_libtkspline_la_OBJECTS)
  
+@@ -245,8 +244,7 @@ DEFS = @DEFS@
+ DEFAULT_INCLUDES =  -I. -I$(srcdir) -I$(top_builddir)
+ CPPFLAGS = @CPPFLAGS@
+ LDFLAGS = @LDFLAGS@
+-depcomp = $(SHELL) $(top_srcdir)/depcomp
+-@AMDEP_TRUE@DEP_FILES = $(DEPDIR)/tkspline.Plo
++depcomp =
+ COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
+ 	$(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
+ LTCOMPILE = $(LIBTOOL) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) \
+@@ -283,7 +281,7 @@ distclean-libtool:
+ 	-rm -f libtool
+ $(srcdir)/Makefile.in:  Makefile.am  $(top_srcdir)/configure.in $(ACLOCAL_M4)
+ 	cd $(top_srcdir) && \
+-	  $(AUTOMAKE) --gnu  tkspline/Makefile
++	  $(AUTOMAKE) --foreign  --ignore-deps tkspline/Makefile
+ Makefile:  $(srcdir)/Makefile.in  $(top_builddir)/config.status
+ 	cd $(top_builddir) && \
+ 	  CONFIG_HEADERS= CONFIG_LINKS= \
+@@ -316,29 +314,14 @@ mostlyclean-compile:
+ distclean-compile:
+ 	-rm -f *.tab.c
  
- CLEANFILES = pkgIndex.tcl
-@@ -221,8 +217,7 @@ X_LIBS = @X_LIBS@
- X_EXTRA_LIBS = @X_EXTRA_LIBS@
- X_PRE_LIBS = @X_PRE_LIBS@
- libtkspline_la_LDFLAGS = 
--libtkspline_la_DEPENDENCIES =  ../tkstubs/libtkstubs.la \
--../tclstubs/libtclstubs.la
-+libtkspline_la_DEPENDENCIES = 
- libtkspline_la_OBJECTS =  tkspline.lo
- CFLAGS = @CFLAGS@
- COMPILE = $(CC) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
-@@ -238,7 +233,7 @@ DIST_COMMON =  README Makefile.am Makefi
- 
- DISTFILES = $(DIST_COMMON) $(SOURCES) $(HEADERS) $(TEXINFOS) $(EXTRA_DIST)
- 
--TAR = gtar
-+TAR = tar
- GZIP_ENV = --best
- SOURCES = $(libtkspline_la_SOURCES)
- OBJECTS = $(libtkspline_la_OBJECTS)
-@@ -479,7 +474,6 @@ distdir: $(DISTFILES)
- 	      || exit 1; \
- 	  fi; \
- 	done
+-@AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/tkspline.Plo@am__quote@
+-
+-distclean-depend:
+-	-rm -rf $(DEPDIR)
 -
- info-am:
- info: info-recursive
- dvi-am:
+ .c.o:
+-@AMDEP_TRUE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
+-@AMDEP_TRUE@	depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@
+-@AMDEP_TRUE@	$(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ 	$(COMPILE) -c `test -f $< || echo '$(srcdir)/'`$<
+ 
+ .c.obj:
+-@AMDEP_TRUE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
+-@AMDEP_TRUE@	depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@
+-@AMDEP_TRUE@	$(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ 	$(COMPILE) -c `cygpath -w $<`
+ 
+ .c.lo:
+-@AMDEP_TRUE@	source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
+-@AMDEP_TRUE@	depfile='$(DEPDIR)/$*.Plo' tmpdepfile='$(DEPDIR)/$*.TPlo' @AMDEPBACKSLASH@
+-@AMDEP_TRUE@	$(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ 	$(LTCOMPILE) -c -o $@ `test -f $< || echo '$(srcdir)/'`$<
+-CCDEPMODE = @CCDEPMODE@
+ uninstall-info-am:
+ 
+ manndir = $(mandir)/mann
+@@ -545,8 +528,8 @@ clean-am: clean-generic clean-libtool cl
+ 
+ distclean: distclean-recursive
+ 
+-distclean-am: clean-am distclean-compile distclean-depend \
+-	distclean-generic distclean-libtool distclean-tags
++distclean-am: clean-am distclean-compile distclean-generic \
++	distclean-libtool distclean-tags
+ 
+ dvi: dvi-recursive
+ 
+@@ -584,21 +567,21 @@ uninstall-man: uninstall-mann
+ 
+ .PHONY: $(RECURSIVE_TARGETS) GTAGS all all-am all-local check check-am \
+ 	clean clean-generic clean-libtool clean-pkglibLTLIBRARIES \
+-	clean-recursive distclean distclean-compile distclean-depend \
+-	distclean-generic distclean-libtool distclean-recursive \
+-	distclean-tags distdir dvi dvi-am dvi-recursive info info-am \
+-	info-recursive install install-am install-data install-data-am \
+-	install-data-recursive install-exec install-exec-am \
+-	install-exec-recursive install-info install-info-am \
+-	install-info-recursive install-man install-mann \
+-	install-pkglibLTLIBRARIES install-recursive install-strip \
+-	installcheck installcheck-am installdirs installdirs-am \
+-	installdirs-recursive maintainer-clean maintainer-clean-generic \
+-	maintainer-clean-recursive mostlyclean mostlyclean-compile \
+-	mostlyclean-generic mostlyclean-libtool mostlyclean-recursive \
+-	tags tags-recursive uninstall uninstall-am uninstall-info-am \
+-	uninstall-info-recursive uninstall-man uninstall-mann \
+-	uninstall-pkglibLTLIBRARIES uninstall-recursive
++	clean-recursive distclean distclean-compile distclean-generic \
++	distclean-libtool distclean-recursive distclean-tags distdir \
++	dvi dvi-am dvi-recursive info info-am info-recursive install \
++	install-am install-data install-data-am install-data-recursive \
++	install-exec install-exec-am install-exec-recursive \
++	install-info install-info-am install-info-recursive install-man \
++	install-mann install-pkglibLTLIBRARIES install-recursive \
++	install-strip installcheck installcheck-am installdirs \
++	installdirs-am installdirs-recursive maintainer-clean \
++	maintainer-clean-generic maintainer-clean-recursive mostlyclean \
++	mostlyclean-compile mostlyclean-generic mostlyclean-libtool \
++	mostlyclean-recursive tags tags-recursive uninstall \
++	uninstall-am uninstall-info-am uninstall-info-recursive \
++	uninstall-man uninstall-mann uninstall-pkglibLTLIBRARIES \
++	uninstall-recursive
+ 
+ 
+ all-local: pkgIndex.tcl
diff --git a/graphics/graphviz/patches/patch-bb b/graphics/graphviz/patches/patch-bb
index 5b70ebe594d..acfa23d67da 100644
--- a/graphics/graphviz/patches/patch-bb
+++ b/graphics/graphviz/patches/patch-bb
@@ -1,6 +1,6 @@
-$NetBSD: patch-bb,v 1.2 2002/08/28 13:49:40 seb Exp $
+$NetBSD: patch-bb,v 1.3 2003/03/03 11:35:01 seb Exp $
 
---- tkspline/demo/Makefile.am.orig	Wed May 15 23:55:32 2002
+--- tkspline/demo/Makefile.am.orig	2003-01-15 17:22:17.000000000 +0000
 +++ tkspline/demo/Makefile.am
 @@ -2,7 +2,7 @@
  
@@ -10,4 +10,4 @@ $NetBSD: patch-bb,v 1.2 2002/08/28 13:49:40 seb Exp $
 +demodir = $(prefix)/share/examples/@PACKAGE@
  demo_SCRIPTS = spline
  demo_DATA = spline.README
- EXTRA_DIST = $(demo_SCRIPTS) $(demo_DATA)
+ EXTRA_DIST = $(demo_SCRIPTS) $(demo_DATA) CVS/*
diff --git a/graphics/graphviz/patches/patch-bc b/graphics/graphviz/patches/patch-bc
index ee308d7289c..244a43ebfd7 100644
--- a/graphics/graphviz/patches/patch-bc
+++ b/graphics/graphviz/patches/patch-bc
@@ -1,8 +1,8 @@
-$NetBSD: patch-bc,v 1.4 2002/08/28 13:49:41 seb Exp $
+$NetBSD: patch-bc,v 1.5 2003/03/03 11:35:02 seb Exp $
 
---- tkspline/demo/Makefile.in.orig	Mon Aug  5 05:11:35 2002
+--- tkspline/demo/Makefile.in.orig	2003-03-02 20:12:24.000000000 +0000
 +++ tkspline/demo/Makefile.in
-@@ -185,7 +185,7 @@ Z_LIBS = @Z_LIBS@
+@@ -206,7 +206,7 @@ install_sh = @install_sh@
  
  AUTOMAKE_OPTIONS = 1.4
  
@@ -10,13 +10,21 @@ $NetBSD: patch-bc,v 1.4 2002/08/28 13:49:41 seb Exp $
 +demodir = $(prefix)/share/examples/@PACKAGE@
  demo_SCRIPTS = spline
  demo_DATA = spline.README
- EXTRA_DIST = $(demo_SCRIPTS) $(demo_DATA)
-@@ -201,7 +201,7 @@ DIST_COMMON =  Makefile.am Makefile.in
+ EXTRA_DIST = $(demo_SCRIPTS) $(demo_DATA) CVS/*
+@@ -216,6 +216,7 @@ CONFIG_HEADER = $(top_builddir)/config.h
+ CONFIG_CLEAN_FILES =
+ SCRIPTS = $(demo_SCRIPTS)
  
- DISTFILES = $(DIST_COMMON) $(SOURCES) $(HEADERS) $(TEXINFOS) $(EXTRA_DIST)
++depcomp =
+ DIST_SOURCES =
+ DATA = $(demo_DATA)
  
--TAR = gtar
-+TAR = tar
- GZIP_ENV = --best
- all: all-redirect
- .SUFFIXES:
+@@ -234,7 +235,7 @@ distclean-libtool:
+ 	-rm -f libtool
+ $(srcdir)/Makefile.in:  Makefile.am  $(top_srcdir)/configure.in $(ACLOCAL_M4)
+ 	cd $(top_srcdir) && \
+-	  $(AUTOMAKE) --gnu  tkspline/demo/Makefile
++	  $(AUTOMAKE) --foreign  --ignore-deps tkspline/demo/Makefile
+ Makefile:  $(srcdir)/Makefile.in  $(top_builddir)/config.status
+ 	cd $(top_builddir) && \
+ 	  CONFIG_HEADERS= CONFIG_LINKS= \
author	seb <seb>	2003-03-03 11:34:57 +0000
committer	seb <seb>	2003-03-03 11:34:57 +0000
commit	48f5d9920e9146d31ea02d7273480af5060772a9 (patch)
tree	13f122fcfbe697d87f93995c69039357bda55f4f /graphics
parent	54e6192383d68f17f25250bfeb7bf838e6dd38a3 (diff)
download	pkgsrc-48f5d9920e9146d31ea02d7273480af5060772a9.tar.gz