Update to version 1.8.5.

Changes in version 1.8.5:
	- various portability fixes
	- various SVG fixes and optimizations

Changes in version 1.8.4:
	- SVG renderer:
		- make graph|node|edge ids unique, particularly for multiedges
		- put graph|node|edge names in <title>...</title>
		- use some property inheritance to reduce size of output
		- fix compile errors when no zlib
		- updated DTD reference
	- GD renderer:
		- Minimal Type1 font support
			- look in {${X11BASE},${X11PREFIX}}/lib/X11/fonts/Type1
			- look for .pfa or .pfb font files based on fontname
		- run gdgen.c through dos2unix - problems with gcc on SuSE
	- fix Mac-OSX build problems:
		- improve strto[u]ll configure tests
		- add -fno-common for extern problem
		- function renamed to avoid conflicts (vis -> visibility)
		- add configure tests for search.h, malloc.h, getopt.h, errno.h
		- improve configure tests for FILE struct features
		- add configure tests for lrand48
	- add new demo graphs:
		- graphs/undirected/Heawood.dot
		- graphs/undirected/Petersen.dot
	- neato:
		- fix for -x implementation in neato (Bug 77)
		- fix spline problem (Bug 87)
		- fix some divide-by-zero problems
	- twopi:
		- fix Bug 117
		- update man pages for disconnected graphs capability
	- added arrowhead or arrowtail = tee
	- add dotneato/pack code to twopi
	- add contrib/prune to gnu build and install

Changes in version 1.8.3:
	- fixed parse error for lines starting with '#' in .dot files
	- fixed a recently introduced bug that caused failure of:
		digraph G {  {rank = same;  A -> B; B -> A } }
	- updated DOCTYPE header in SVG outputs
	- added dotneato/common/xbuf.[ch] for dynamic string handling
	  to avoid sprintf buffer overruns.
	- twopigen - handle special case of graphs with < 3 nodes.
	- neato - handle point shapes
	- added fontcolor support to svg
	- Fixed bug 109
	- Removed duplicate definitions for str[n]casecmp
	- Added missing declarations needed for Windows
       - Cleaned up warning messages from set but unused variables
       - Removed use of DOS preprocessor variable; uniformly replaced by MSWIN32

15 files changed, 472 insertions, 891 deletions

diff --git a/graphics/graphviz/patches/patch-ab b/graphics/graphviz/patches/patch-ab
index 478cf9994ee..a39e7831067 100644
--- a/graphics/graphviz/patches/patch-ab
+++ b/graphics/graphviz/patches/patch-ab
@@ -1,20 +1,20 @@
-$NetBSD: patch-ab,v 1.3 2002/03/21 08:47:07 seb Exp $
+$NetBSD: patch-ab,v 1.4 2002/04/19 18:42:34 seb Exp $
 
---- configure.in.orig	Fri Mar  8 23:11:31 2002
+--- configure.in.orig	Fri Apr 12 00:09:14 2002
 +++ configure.in
 @@ -45,7 +45,10 @@
  PATHSEPARATOR=";"
  else
  # 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/share/fonts/TrueType:/usr/share/fonts/truetype:/usr/openwin/lib/X11/fonts/TrueType"
-+DEFAULT_FONTPATH="${X11PREFIX}/lib/X11/fonts/TrueType:${X11PREFIX}/lib/X11/fonts/truetype"
+-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"
++DEFAULT_FONTPATH="${X11PREFIX}/lib/X11/fonts/TrueType:${X11PREFIX}/lib/X11/fonts/truetype:${X11PREFIX}/lib/X11/fonts/Type1"
 +if test x"$X11PREFIX" != x"$X11BASE" ; then
-+DEFAULT_FONTPATH="${DEFAULT_FONTPATH}:${X11BASE}/lib/X11/fonts/TrueType:${X11BASE}/lib/X11/fonts/truetype"
++DEFAULT_FONTPATH="${DEFAULT_FONTPATH}:${X11BASE}/lib/X11/fonts/TrueType:${X11BASE}/lib/X11/fonts/truetype:${X11BASE}/lib/X11/fonts/Type1"
 +fi
  PATHSEPARATOR=":"
  fi
  fi
-@@ -144,12 +147,11 @@
+@@ -166,12 +169,11 @@
  
  # Some systems don't have Tcl.  Don't build
  # the Tcl products if we don't have the library.
@@ -28,7 +28,7 @@ $NetBSD: patch-ab,v 1.3 2002/03/21 08:47:07 seb Exp $
      TCL_PKGINDEX="gdtclft/pkgIndex.tcl tcldot/pkgIndex.tcl tcldgr/pkgIndex.tcl tcldgl/pkgIndex.tcl tclpathplan/pkgIndex.tcl"
  else
      AC_MSG_WARN([Unable to find tclConfig.sh. The packages: "gdtclft tcldot tcldgr tcldgl tclpathplan" will not be built])
-@@ -220,12 +222,11 @@
+@@ -242,12 +244,11 @@
  
  # Some systems have Tcl, but not TK.  Don't build
  # the Tk products if we don't have the library.
@@ -42,7 +42,7 @@ $NetBSD: patch-ab,v 1.3 2002/03/21 08:47:07 seb Exp $
      TK_PKGINDEX="tkspline/pkgIndex.tcl"
  else
      AC_MSG_WARN([Unable to find tkConfig.sh. The package "tkspline" will not be built])
-@@ -549,36 +550,12 @@
+@@ -568,36 +569,12 @@
  
  # -----------------------------------
  # tclInt.h
diff --git a/graphics/graphviz/patches/patch-ac b/graphics/graphviz/patches/patch-ac
index d4bffdf8eff..94beda500a5 100644
--- a/graphics/graphviz/patches/patch-ac
+++ b/graphics/graphviz/patches/patch-ac
@@ -1,86 +1,119 @@
-$NetBSD: patch-ac,v 1.3 2002/03/21 08:47:07 seb Exp $
+$NetBSD: patch-ac,v 1.4 2002/04/19 18:42:34 seb Exp $
 
---- configure.orig	Wed Mar 20 18:06:51 2002
+--- configure.orig	Fri Apr 12 00:09:37 2002
 +++ configure
-@@ -1388,7 +1388,7 @@
- echo "$as_me: WARNING: ${am_backtick}missing' script is too old or missing" >&2;}
+@@ -1475,60 +1475,9 @@
+   fi
  fi
  
--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
-@@ -3077,7 +3077,7 @@
+-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 1489 "configure"
+-#include "confdefs.h"
+-#include <stdlib.h>
+-$ac_declaration
+-int main() {
+-exit (42);
+-; return 0; }
+-EOF
+-if { (eval echo configure:1497: \"$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 1507 "configure"
+-#include "confdefs.h"
+-$ac_declaration
+-int main() {
+-exit (42);
+-; return 0; }
+-EOF
+-if { (eval echo configure:1514: \"$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:1532: checking for strerror in -lcposix" >&5
++echo "configure:1481: 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
+@@ -1860,7 +1809,7 @@
  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.
+ # Extract the first word of "$ac_prog", so it can be a program name with args.
  set dummy $ac_prog; ac_word=$2
-@@ -7527,7 +7527,10 @@
+@@ -5893,7 +5842,10 @@
  PATHSEPARATOR=";"
  else
  # 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/share/fonts/TrueType:/usr/share/fonts/truetype:/usr/openwin/lib/X11/fonts/TrueType"
-+DEFAULT_FONTPATH="${X11PREFIX}/lib/X11/fonts/TrueType:${X11PREFIX}/lib/X11/fonts/truetype"
+-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"
++DEFAULT_FONTPATH="${X11PREFIX}/lib/X11/fonts/TrueType:${X11PREFIX}/lib/X11/fonts/truetype:${X11PREFIX}/lib/X11/fonts/Type1"
 +if test x"$X11PREFIX" != x"$X11BASE" ; then
-+DEFAULT_FONTPATH="${DEFAULT_FONTPATH}:${X11BASE}/lib/X11/fonts/TrueType:${X11BASE}/lib/X11/fonts/truetype"
++DEFAULT_FONTPATH="${DEFAULT_FONTPATH}:${X11BASE}/lib/X11/fonts/TrueType:${X11BASE}/lib/X11/fonts/truetype:${X11BASE}/lib/X11/fonts/Type1"
 +fi
  PATHSEPARATOR=":"
  fi
  fi
-@@ -7725,9 +7728,8 @@
+@@ -6101,12 +6053,11 @@
  
  # Some systems don't have Tcl.  Don't build
  # the Tcl products if we don't have the library.
 -TCLCONFIG=${TCLSH_EXEC_PREFIX}/lib/tclConfig.sh
  if test -f $TCLCONFIG; then
--    echo "$as_me:7730: result: using $TCLCONFIG" >&5
-+    echo "$as_me:7732: result: using $TCLCONFIG" >&5
- echo "${ECHO_T}using $TCLCONFIG" >&6
-     file=${TCLCONFIG}
-     . $file
-@@ -7731,10 +7733,10 @@
- echo "${ECHO_T}using $TCLCONFIG" >&6
+     echo "$ac_t""using $TCLCONFIG" 1>&6
      file=${TCLCONFIG}
      . $file
 -    TCL_SUBDIRS="tclstubs tclhandle gdtclft tcldot tcldgr tcldgl tclpathplan"
 +    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 "$as_me:7737: WARNING: Unable to find tclConfig.sh. The packages: \"gdtclft tcldot tcldgr tcldgl tclpathplan\" will not be built" >&5
-+    { echo "$as_me:7739: WARNING: Unable to find tclConfig.sh. The packages: \"gdtclft tcldot tcldgr tcldgl tclpathplan\" will not be built" >&5
- echo "$as_me: WARNING: Unable to find tclConfig.sh. The packages: \"gdtclft tcldot tcldgr tcldgl tclpathplan\" will not be built" >&2;}
-     TCL_SUBDIRS=""
-     TCL_PKGINDEX=""
-@@ -7754,9 +7756,8 @@
+     echo "configure: warning: Unable to find tclConfig.sh. The packages: "gdtclft tcldot tcldgr tcldgl tclpathplan" will not be built" 1>&2
+@@ -6178,12 +6129,11 @@
  
  # Some systems have Tcl, but not TK.  Don't build
  # the Tk products if we don't have the library.
 -TKCONFIG=${WISH_EXEC_PREFIX}/lib/tkConfig.sh
  if test -f $TKCONFIG; then
--    echo "$as_me:7759: result: using $TKCONFIG" >&5
-+    echo "$as_me:7760: result: using $TKCONFIG" >&5
- echo "${ECHO_T}using $TKCONFIG" >&6
-     file=${TKCONFIG}
-     . $file
-@@ -7760,10 +7761,10 @@
- echo "${ECHO_T}using $TKCONFIG" >&6
+     echo "$ac_t""using $TKCONFIG" 1>&6
      file=${TKCONFIG}
      . $file
 -    TK_SUBDIRS="tkstubs tkspline"
 +    TK_SUBDIRS="tkspline"
      TK_PKGINDEX="tkspline/pkgIndex.tcl"
  else
--    { echo "$as_me:7766: WARNING: Unable to find tkConfig.sh. The package \"tkspline\" will not be built" >&5
-+    { echo "$as_me:7767: WARNING: Unable to find tkConfig.sh. The package \"tkspline\" will not be built" >&5
- echo "$as_me: WARNING: Unable to find tkConfig.sh. The package \"tkspline\" will not be built" >&2;}
-     TK_SUBDIRS=""
-     TK_PKGINDEX=""
-@@ -10978,35 +10979,11 @@
+     echo "configure: warning: Unable to find tkConfig.sh. The package "tkspline" will not be built" 1>&2
+@@ -8673,36 +8623,12 @@
  
  # -----------------------------------
  # tclInt.h
@@ -99,6 +132,7 @@ $NetBSD: patch-ac,v 1.3 2002/03/21 08:47:07 seb Exp $
 -fi
 +TCLINT_INCLUDES="-I${BUILDLINK_DIR}/include/tcl/generic"
  
+ 
  # -----------------------------------
  # tkInt.h
 -if test -f "$TK_SRC_DIR/generic/tkInt.h"; then
@@ -116,5 +150,5 @@ $NetBSD: patch-ac,v 1.3 2002/03/21 08:47:07 seb Exp $
 -fi
 +TKINT_INCLUDES="-I${BUILDLINK_DIR}/include/tk/generic"
  
+ 
  # -----------------------------------
- # Special checks
diff --git a/graphics/graphviz/patches/patch-ae b/graphics/graphviz/patches/patch-ae
index b666fc7b0b6..a43d4351301 100644
--- a/graphics/graphviz/patches/patch-ae
+++ b/graphics/graphviz/patches/patch-ae
@@ -1,130 +1,62 @@
-$NetBSD: patch-ae,v 1.2 2002/03/21 08:47:07 seb Exp $
+$NetBSD: patch-ae,v 1.3 2002/04/19 18:42:34 seb Exp $
 
---- gdtclft/Makefile.in.orig	Fri Mar  8 23:12:10 2002
+--- gdtclft/Makefile.in.orig	Fri Apr 19 14:31:38 2002
 +++ gdtclft/Makefile.in
-@@ -197,8 +197,7 @@
+@@ -183,17 +183,10 @@
  
- INCLUDES = @TCL_CFLAGS@ \
- 	-I$(top_srcdir)/tclhandle \
+ AUTOMAKE_OPTIONS = 1.4
+ 
+-INCLUDES = @TCL_CFLAGS@ \
+-	-I$(top_srcdir)/tclhandle \
 -	-I$(top_srcdir)/gd \
 -	-I@TCLSH_EXEC_PREFIX@/include
-+	-I$(top_srcdir)/gd
++INCLUDES = @TCL_CFLAGS@ 	-I$(top_srcdir)/tclhandle 	-I$(top_srcdir)/gd
  
  
- LIBS = ${FT_LIBS} \
-@@ -218,7 +217,7 @@
- libgdtclft_la_LIBADD = \
- 	../tclhandle/libtclhandle.la \
- 	../gd/libgd.la \
--	../tclstubs/libtclstubs.la
-+	${TCL_STUB_LIB_SPEC}
+-LIBS = ${FT_LIBS} \
+-	${PNG_LIBS} \
+-	${JPEG_LIBS} \
+-	${XPM_LIBS} \
+-	${Z_LIBS} -lc
++LIBS = ${FT_LIBS} 	${PNG_LIBS} 	${JPEG_LIBS} 	${XPM_LIBS} 	${Z_LIBS} -lc
  
  
- CLEANFILES = pkgIndex.tcl
-@@ -231,8 +230,7 @@
- LTLIBRARIES = $(pkglib_LTLIBRARIES)
+ SUBDIRS = demo
+@@ -203,10 +196,7 @@
+ 
+ libgdtclft_la_SOURCES = gdtclft.c
  
- libgdtclft_la_LDFLAGS =
--libgdtclft_la_DEPENDENCIES = ../tclhandle/libtclhandle.la ../gd/libgd.la \
+-libgdtclft_la_LIBADD = \
+-	../tclhandle/libtclhandle.la \
+-	../gd/libgd.la \
 -	../tclstubs/libtclstubs.la
-+libgdtclft_la_DEPENDENCIES = ../tclhandle/libtclhandle.la ../gd/libgd.la
- am_libgdtclft_la_OBJECTS = gdtclft.lo
- libgdtclft_la_OBJECTS = $(am_libgdtclft_la_OBJECTS)
++libgdtclft_la_LIBADD =  	../tclhandle/libtclhandle.la 	../gd/libgd.la 	${TCL_STUB_LIB_SPEC}
  
-@@ -240,8 +238,7 @@
- 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) \
-@@ -278,7 +275,7 @@
- 	-rm -f libtool
- $(srcdir)/Makefile.in:  Makefile.am  $(top_srcdir)/configure.in $(ACLOCAL_M4)
- 	cd $(top_srcdir) && \
--	  $(AUTOMAKE) --gnu  gdtclft/Makefile
-+	  $(AUTOMAKE) --gnu  --ignore-deps gdtclft/Makefile
- Makefile:  $(srcdir)/Makefile.in  $(top_builddir)/config.status
- 	cd $(top_builddir) && \
- 	  CONFIG_HEADERS= CONFIG_LINKS= \
-@@ -311,29 +308,14 @@
- distclean-compile:
- 	-rm -f *.tab.c
  
--@AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/gdtclft.Plo@am__quote@
--
--distclean-depend:
--	-rm -rf $(DEPDIR)
+ CLEANFILES = pkgIndex.tcl
+@@ -227,7 +217,7 @@
+ X_PRE_LIBS = @X_PRE_LIBS@
+ libgdtclft_la_LDFLAGS = 
+ libgdtclft_la_DEPENDENCIES =  ../tclhandle/libtclhandle.la \
+-../gd/libgd.la ../tclstubs/libtclstubs.la
++../gd/libgd.la
+ libgdtclft_la_OBJECTS =  gdtclft.lo
+ CFLAGS = @CFLAGS@
+ COMPILE = $(CC) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
+@@ -243,7 +233,7 @@
+ 
+ DISTFILES = $(DIST_COMMON) $(SOURCES) $(HEADERS) $(TEXINFOS) $(EXTRA_DIST)
+ 
+-TAR = gtar
++TAR = tar
+ GZIP_ENV = --best
+ SOURCES = $(libgdtclft_la_SOURCES)
+ OBJECTS = $(libgdtclft_la_OBJECTS)
+@@ -484,7 +474,6 @@
+ 	      || exit 1; \
+ 	  fi; \
+ 	done
 -
- .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
-@@ -539,8 +521,8 @@
- 
- 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
- 
-@@ -578,21 +560,21 @@
- 
- .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
+ info-am:
+ info: info-recursive
+ dvi-am:
diff --git a/graphics/graphviz/patches/patch-ag b/graphics/graphviz/patches/patch-ag
index 190829159bb..3c41f2521f9 100644
--- a/graphics/graphviz/patches/patch-ag
+++ b/graphics/graphviz/patches/patch-ag
@@ -1,8 +1,8 @@
-$NetBSD: patch-ag,v 1.2 2002/03/21 08:47:07 seb Exp $
+$NetBSD: patch-ag,v 1.3 2002/04/19 18:42:34 seb Exp $
 
---- gdtclft/demo/Makefile.in.orig	Fri Mar  8 23:12:10 2002
+--- gdtclft/demo/Makefile.in.orig	Fri Apr 19 14:31:38 2002
 +++ gdtclft/demo/Makefile.in
-@@ -195,7 +195,7 @@
+@@ -183,7 +183,7 @@
  
  AUTOMAKE_OPTIONS = 1.4
  
@@ -11,20 +11,12 @@ $NetBSD: patch-ag,v 1.2 2002/03/21 08:47:07 seb Exp $
  demo_SCRIPTS = entities
  demo_DATA = entities.README entities.html
  EXTRA_DIST = $(demo_SCRIPTS) $(demo_DATA)
-@@ -205,6 +205,7 @@
- CONFIG_CLEAN_FILES =
- SCRIPTS = $(demo_SCRIPTS)
+@@ -199,7 +199,7 @@
  
-+depcomp =
- DIST_SOURCES =
- DATA = $(demo_DATA)
+ DISTFILES = $(DIST_COMMON) $(SOURCES) $(HEADERS) $(TEXINFOS) $(EXTRA_DIST)
  
-@@ -223,7 +224,7 @@
- 	-rm -f libtool
- $(srcdir)/Makefile.in:  Makefile.am  $(top_srcdir)/configure.in $(ACLOCAL_M4)
- 	cd $(top_srcdir) && \
--	  $(AUTOMAKE) --gnu  gdtclft/demo/Makefile
-+	  $(AUTOMAKE) --gnu  --ignore-deps gdtclft/demo/Makefile
- Makefile:  $(srcdir)/Makefile.in  $(top_builddir)/config.status
- 	cd $(top_builddir) && \
- 	  CONFIG_HEADERS= CONFIG_LINKS= \
+-TAR = gtar
++TAR = tar
+ GZIP_ENV = --best
+ all: all-redirect
+ .SUFFIXES:
diff --git a/graphics/graphviz/patches/patch-ai b/graphics/graphviz/patches/patch-ai
index 1f3c37390e7..908e93086b7 100644
--- a/graphics/graphviz/patches/patch-ai
+++ b/graphics/graphviz/patches/patch-ai
@@ -1,134 +1,67 @@
-$NetBSD: patch-ai,v 1.2 2002/03/21 08:47:07 seb Exp $
+$NetBSD: patch-ai,v 1.3 2002/04/19 18:42:34 seb Exp $
 
---- tcldgl/Makefile.in.orig	Fri Mar  8 23:12:20 2002
+--- tcldgl/Makefile.in.orig	Fri Apr 19 14:31:38 2002
 +++ tcldgl/Makefile.in
-@@ -200,8 +200,7 @@
- 	-I$(top_srcdir)/cdt \
- 	-I$(top_srcdir)/tclhandle \
- 	-I$(top_srcdir)/incr \
+@@ -183,13 +183,7 @@
+ 
+ AUTOMAKE_OPTIONS = 1.4
+ 
+-INCLUDES = @TCL_CFLAGS@ \
+-	-I$(top_srcdir)/agraph \
+-	-I$(top_srcdir)/cdt \
+-	-I$(top_srcdir)/tclhandle \
+-	-I$(top_srcdir)/incr \
 -	-I$(top_srcdir)/shape \
 -	-I@TCLSH_EXEC_PREFIX@/include
-+	-I$(top_srcdir)/shape
++INCLUDES = @TCL_CFLAGS@ 	-I$(top_srcdir)/agraph 	-I$(top_srcdir)/cdt 	-I$(top_srcdir)/tclhandle 	-I$(top_srcdir)/incr 	-I$(top_srcdir)/shape
  
  
  LIBS = 
-@@ -226,7 +225,7 @@
- 	../agutil/libagutil.la \
- 	../shape/libshape.la \
- 	../ns/libns.la \
+@@ -202,20 +196,7 @@
+ 
+ libtcldgl_la_SOURCES = dgl.c dglayout.c dglshape.c dglutil.c dgl.h
+ 
+-libtcldgl_la_LIBADD = ../tclhandle/libtclhandle.la \
+-	../agraph/libagraph.la \
+-	../cdt/libcdt.la \
+-	../fdp/libfdp.la \
+-	../dag/libdag.la \
+-	../geo/libgeo.la \
+-	../grid/libgrid.la \
+-	../incr/libincr.la \
+-	../pathplan/libpathplan.la \
+-	../agutil/libagutil.la \
+-	../shape/libshape.la \
+-	../ns/libns.la \
 -        ../tclstubs/libtclstubs.la \
-+        ${TCL_STUB_LIB_SPEC} \
- 	-lc -lm
- 
- 
-@@ -244,8 +243,7 @@
- 	../agraph/libagraph.la ../cdt/libcdt.la ../fdp/libfdp.la \
- 	../dag/libdag.la ../geo/libgeo.la ../grid/libgrid.la \
- 	../incr/libincr.la ../pathplan/libpathplan.la \
--	../agutil/libagutil.la ../shape/libshape.la ../ns/libns.la \
--	../tclstubs/libtclstubs.la
-+	../agutil/libagutil.la ../shape/libshape.la ../ns/libns.la
- am_libtcldgl_la_OBJECTS = dgl.lo dglayout.lo dglshape.lo dglutil.lo
- libtcldgl_la_OBJECTS = $(am_libtcldgl_la_OBJECTS)
- 
-@@ -253,9 +251,7 @@
- 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) \
-@@ -294,7 +290,7 @@
- 	-rm -f libtool
- $(srcdir)/Makefile.in:  Makefile.am  $(top_srcdir)/configure.in $(ACLOCAL_M4)
- 	cd $(top_srcdir) && \
--	  $(AUTOMAKE) --gnu  tcldgl/Makefile
-+	  $(AUTOMAKE) --gnu  --ignore-deps tcldgl/Makefile
- Makefile:  $(srcdir)/Makefile.in  $(top_builddir)/config.status
- 	cd $(top_builddir) && \
- 	  CONFIG_HEADERS= CONFIG_LINKS= \
-@@ -327,32 +323,14 @@
- distclean-compile:
- 	-rm -f *.tab.c
- 
--@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)
+-	-lc -lm
++libtcldgl_la_LIBADD = ../tclhandle/libtclhandle.la 	../agraph/libagraph.la 	../cdt/libcdt.la 	../fdp/libfdp.la 	../dag/libdag.la 	../geo/libgeo.la 	../grid/libgrid.la 	../incr/libincr.la 	../pathplan/libpathplan.la 	../agutil/libagutil.la 	../shape/libshape.la 	../ns/libns.la         ${TCL_STUB_LIB_SPEC} 	-lc -lm
+ 
+ 
+ CLEANFILES = pkgIndex.tcl
+@@ -239,7 +220,7 @@
+ ../agraph/libagraph.la ../cdt/libcdt.la ../fdp/libfdp.la \
+ ../dag/libdag.la ../geo/libgeo.la ../grid/libgrid.la ../incr/libincr.la \
+ ../pathplan/libpathplan.la ../agutil/libagutil.la ../shape/libshape.la \
+-../ns/libns.la ../tclstubs/libtclstubs.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)
+@@ -257,7 +238,7 @@
+ 
+ DISTFILES = $(DIST_COMMON) $(SOURCES) $(HEADERS) $(TEXINFOS) $(EXTRA_DIST)
+ 
+-TAR = gtar
++TAR = tar
+ GZIP_ENV = --best
+ SOURCES = $(libtcldgl_la_SOURCES)
+ OBJECTS = $(libtcldgl_la_OBJECTS)
+@@ -498,7 +479,6 @@
+ 	      || exit 1; \
+ 	  fi; \
+ 	done
 -
- .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
-@@ -558,8 +536,8 @@
- 
- 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
- 
-@@ -597,21 +575,21 @@
- 
- .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
+ info-am:
+ info: info-recursive
+ dvi-am:
diff --git a/graphics/graphviz/patches/patch-ak b/graphics/graphviz/patches/patch-ak
index 5f2b4e69dbb..13d456cb3cd 100644
--- a/graphics/graphviz/patches/patch-ak
+++ b/graphics/graphviz/patches/patch-ak
@@ -1,8 +1,8 @@
-$NetBSD: patch-ak,v 1.2 2002/03/21 08:47:07 seb Exp $
+$NetBSD: patch-ak,v 1.3 2002/04/19 18:42:34 seb Exp $
 
---- tcldgl/demo/Makefile.in.orig	Fri Mar  8 23:12:20 2002
+--- tcldgl/demo/Makefile.in.orig	Fri Apr 19 14:31:38 2002
 +++ tcldgl/demo/Makefile.in
-@@ -195,7 +195,7 @@
+@@ -183,7 +183,7 @@
  
  AUTOMAKE_OPTIONS = 1.4
  
@@ -11,20 +11,12 @@ $NetBSD: patch-ak,v 1.2 2002/03/21 08:47:07 seb Exp $
  demo_SCRIPTS = dge
  demo_DATA = dge.README dge.example1.dot  dge.example2.dot
  EXTRA_DIST = $(demo_SCRIPTS) $(demo_DATA)
-@@ -205,6 +205,7 @@
- CONFIG_CLEAN_FILES =
- SCRIPTS = $(demo_SCRIPTS)
+@@ -199,7 +199,7 @@
  
-+depcomp =
- DIST_SOURCES =
- DATA = $(demo_DATA)
+ DISTFILES = $(DIST_COMMON) $(SOURCES) $(HEADERS) $(TEXINFOS) $(EXTRA_DIST)
  
-@@ -223,7 +224,7 @@
- 	-rm -f libtool
- $(srcdir)/Makefile.in:  Makefile.am  $(top_srcdir)/configure.in $(ACLOCAL_M4)
- 	cd $(top_srcdir) && \
--	  $(AUTOMAKE) --gnu  tcldgl/demo/Makefile
-+	  $(AUTOMAKE) --gnu  --ignore-deps tcldgl/demo/Makefile
- Makefile:  $(srcdir)/Makefile.in  $(top_builddir)/config.status
- 	cd $(top_builddir) && \
- 	  CONFIG_HEADERS= CONFIG_LINKS= \
+-TAR = gtar
++TAR = tar
+ GZIP_ENV = --best
+ all: all-redirect
+ .SUFFIXES:
diff --git a/graphics/graphviz/patches/patch-am b/graphics/graphviz/patches/patch-am
index 77c13ef229b..90d41d2ed56 100644
--- a/graphics/graphviz/patches/patch-am
+++ b/graphics/graphviz/patches/patch-am
@@ -1,136 +1,55 @@
-$NetBSD: patch-am,v 1.2 2002/03/21 08:47:07 seb Exp $
+$NetBSD: patch-am,v 1.3 2002/04/19 18:42:34 seb Exp $
 
---- tcldgr/Makefile.in.orig	Fri Mar  8 23:12:21 2002
+--- tcldgr/Makefile.in.orig	Fri Apr 19 14:31:38 2002
 +++ tcldgr/Makefile.in
-@@ -198,8 +198,7 @@
- INCLUDES = @TCL_CFLAGS@ \
- 	-I$(top_srcdir)/agraph \
- 	-I$(top_srcdir)/cdt \
+@@ -183,11 +183,7 @@
+ 
+ AUTOMAKE_OPTIONS = 1.4
+ 
+-INCLUDES = @TCL_CFLAGS@ \
+-	-I$(top_srcdir)/agraph \
+-	-I$(top_srcdir)/cdt \
 -	-I$(top_srcdir)/tclhandle \
 -	-I@TCLSH_EXEC_PREFIX@/include
-+	-I$(top_srcdir)/tclhandle
++INCLUDES = @TCL_CFLAGS@ 	-I$(top_srcdir)/agraph 	-I$(top_srcdir)/cdt 	-I$(top_srcdir)/tclhandle
  
  
  LIBS = 
-@@ -215,7 +214,7 @@
- libtcldgr_la_LIBADD = ../tclhandle/libtclhandle.la \
- 	../agraph/libagraph.la \
- 	../cdt/libcdt.la \
--        ../tclstubs/libtclstubs.la
-+        ${TCL_STUB_LIB_SPEC}
+@@ -200,10 +196,7 @@
  
+ libtcldgr_la_SOURCES = dgedge.c dgnode.c dgr.c dgraph.c dgrutil.c dgr.h
  
- CLEANFILES = pkgIndex.tcl
-@@ -229,8 +228,7 @@
+-libtcldgr_la_LIBADD = ../tclhandle/libtclhandle.la \
+-	../agraph/libagraph.la \
+-	../cdt/libcdt.la \
+-        ../tclstubs/libtclstubs.la
++libtcldgr_la_LIBADD = ../tclhandle/libtclhandle.la 	../agraph/libagraph.la 	../cdt/libcdt.la         ${TCL_STUB_LIB_SPEC}
  
- libtcldgr_la_LDFLAGS =
- libtcldgr_la_DEPENDENCIES = ../tclhandle/libtclhandle.la \
--	../agraph/libagraph.la ../cdt/libcdt.la \
--	../tclstubs/libtclstubs.la
-+	../agraph/libagraph.la ../cdt/libcdt.la
- am_libtcldgr_la_OBJECTS = dgedge.lo dgnode.lo dgr.lo dgraph.lo \
- 	dgrutil.lo
- libtcldgr_la_OBJECTS = $(am_libtcldgr_la_OBJECTS)
-@@ -239,10 +237,7 @@
- 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) \
-@@ -281,7 +276,7 @@
- 	-rm -f libtool
- $(srcdir)/Makefile.in:  Makefile.am  $(top_srcdir)/configure.in $(ACLOCAL_M4)
- 	cd $(top_srcdir) && \
--	  $(AUTOMAKE) --gnu  tcldgr/Makefile
-+	  $(AUTOMAKE) --gnu  --ignore-deps tcldgr/Makefile
- Makefile:  $(srcdir)/Makefile.in  $(top_builddir)/config.status
- 	cd $(top_builddir) && \
- 	  CONFIG_HEADERS= CONFIG_LINKS= \
-@@ -314,33 +309,14 @@
- 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)
+ CLEANFILES = pkgIndex.tcl
+@@ -224,7 +217,7 @@
+ X_PRE_LIBS = @X_PRE_LIBS@
+ libtcldgr_la_LDFLAGS = 
+ libtcldgr_la_DEPENDENCIES =  ../tclhandle/libtclhandle.la \
+-../agraph/libagraph.la ../cdt/libcdt.la ../tclstubs/libtclstubs.la
++../agraph/libagraph.la ../cdt/libcdt.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)
+@@ -242,7 +235,7 @@
+ 
+ DISTFILES = $(DIST_COMMON) $(SOURCES) $(HEADERS) $(TEXINFOS) $(EXTRA_DIST)
+ 
+-TAR = gtar
++TAR = tar
+ GZIP_ENV = --best
+ SOURCES = $(libtcldgr_la_SOURCES)
+ OBJECTS = $(libtcldgr_la_OBJECTS)
+@@ -483,7 +476,6 @@
+ 	      || exit 1; \
+ 	  fi; \
+ 	done
 -
- .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
-@@ -546,8 +522,8 @@
- 
- 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
- 
-@@ -585,21 +561,21 @@
- 
- .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
+ info-am:
+ info: info-recursive
+ dvi-am:
diff --git a/graphics/graphviz/patches/patch-ao b/graphics/graphviz/patches/patch-ao
index ae345454f6b..3ba29be3036 100644
--- a/graphics/graphviz/patches/patch-ao
+++ b/graphics/graphviz/patches/patch-ao
@@ -1,8 +1,8 @@
-$NetBSD: patch-ao,v 1.2 2002/03/21 08:47:07 seb Exp $
+$NetBSD: patch-ao,v 1.3 2002/04/19 18:42:34 seb Exp $
 
---- tcldgr/demo/Makefile.in.orig	Fri Mar  8 23:12:21 2002
+--- tcldgr/demo/Makefile.in.orig	Fri Apr 19 14:31:38 2002
 +++ tcldgr/demo/Makefile.in
-@@ -195,7 +195,7 @@
+@@ -183,7 +183,7 @@
  
  AUTOMAKE_OPTIONS = 1.4
  
@@ -11,20 +11,12 @@ $NetBSD: patch-ao,v 1.2 2002/03/21 08:47:07 seb Exp $
  demo_SCRIPTS = ihi
  demo_DATA = ihi.README ihi.testdata
  EXTRA_DIST = $(demo_SCRIPTS) $(demo_DATA)
-@@ -205,6 +205,7 @@
- CONFIG_CLEAN_FILES =
- SCRIPTS = $(demo_SCRIPTS)
+@@ -199,7 +199,7 @@
  
-+depcomp =
- DIST_SOURCES =
- DATA = $(demo_DATA)
+ DISTFILES = $(DIST_COMMON) $(SOURCES) $(HEADERS) $(TEXINFOS) $(EXTRA_DIST)
  
-@@ -223,7 +224,7 @@
- 	-rm -f libtool
- $(srcdir)/Makefile.in:  Makefile.am  $(top_srcdir)/configure.in $(ACLOCAL_M4)
- 	cd $(top_srcdir) && \
--	  $(AUTOMAKE) --gnu  tcldgr/demo/Makefile
-+	  $(AUTOMAKE) --gnu  --ignore-deps tcldgr/demo/Makefile
- Makefile:  $(srcdir)/Makefile.in  $(top_builddir)/config.status
- 	cd $(top_builddir) && \
- 	  CONFIG_HEADERS= CONFIG_LINKS= \
+-TAR = gtar
++TAR = tar
+ GZIP_ENV = --best
+ all: all-redirect
+ .SUFFIXES:
diff --git a/graphics/graphviz/patches/patch-aq b/graphics/graphviz/patches/patch-aq
index 7ca1f017add..797464a7c53 100644
--- a/graphics/graphviz/patches/patch-aq
+++ b/graphics/graphviz/patches/patch-aq
@@ -1,130 +1,85 @@
-$NetBSD: patch-aq,v 1.2 2002/03/21 08:47:07 seb Exp $
+$NetBSD: patch-aq,v 1.3 2002/04/19 18:42:34 seb Exp $
 
---- tcldot/Makefile.in.orig	Fri Mar  8 23:12:22 2002
+--- tcldot/Makefile.in.orig	Fri Apr 19 14:31:38 2002
 +++ tcldot/Makefile.in
-@@ -203,8 +203,7 @@
- 	-I$(top_srcdir)/graph \
- 	-I$(top_srcdir)/cdt \
- 	-I$(top_srcdir)/pathplan \
+@@ -183,23 +183,10 @@
+ 
+ AUTOMAKE_OPTIONS = 1.4
+ 
+-INCLUDES = @TCL_CFLAGS@ \
+-	-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 \
 -	-I@TCLSH_EXEC_PREFIX@/include
-+	-I$(top_srcdir)/tclhandle
- 
- 
- LIBS = ${FT_LIBS} \
-@@ -234,7 +233,7 @@
-         ../cdt/libcdt.la \
-         ../gd/libgd.la \
- 	../gdtclft/gdtclft.lo \
+-
+-
+-LIBS = ${FT_LIBS} \
+-	${PNG_LIBS} \
+-	${JPEG_LIBS} \
+-	${XPM_LIBS} \
+-	${Z_LIBS} -lc
++INCLUDES = @TCL_CFLAGS@ 	-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
++
++
++LIBS = ${FT_LIBS} 	${PNG_LIBS} 	${JPEG_LIBS} 	${XPM_LIBS} 	${Z_LIBS} -lc
+ 
+ 
+ CFLAGS = @CFLAGS@ -DDATE="\"`date`\"" 
+@@ -212,24 +199,12 @@
+ 
+ libtcldot_la_SOURCES = tcldot.c tkgen.c tcldot.h
+ 
+-libtcldot_la_LIBADD = ../tclhandle/libtclhandle.la \
+-	../dotneato/common/libdotneato.la \
+-        ../dotneato/dotgen/libdot.la \
+-        ../dotneato/neatogen/libneato.la \
+-        ../dotneato/twopigen/libtwopi.la \
+-        ../dotneato/pack/libpack.la \
+-        ../pathplan/libpathplan.la \
+-        ../graph/libgraph.la \
+-        ../cdt/libcdt.la \
+-        ../gd/libgd.la \
+-	../gdtclft/gdtclft.lo \
 -	../tclstubs/libtclstubs.la
-+	${TCL_STUB_LIB_SPEC}
++libtcldot_la_LIBADD = ../tclhandle/libtclhandle.la 	../dotneato/common/libdotneato.la         ../dotneato/dotgen/libdot.la         ../dotneato/neatogen/libneato.la         ../dotneato/twopigen/libtwopi.la         ../dotneato/pack/libpack.la         ../pathplan/libpathplan.la         ../graph/libgraph.la         ../cdt/libcdt.la         ../gd/libgd.la 	../gdtclft/gdtclft.lo 	${TCL_STUB_LIB_SPEC}
  
  
  CLEANFILES = pkgIndex.tcl
-@@ -254,7 +253,7 @@
- 	../dotneato/neatogen/libneato.la \
- 	../dotneato/twopigen/libtwopi.la ../pathplan/libpathplan.la \
- 	../graph/libgraph.la ../cdt/libcdt.la ../gd/libgd.la \
--	../gdtclft/gdtclft.lo ../tclstubs/libtclstubs.la
-+	../gdtclft/gdtclft.lo
- am_libtcldot_la_OBJECTS = tcldot.lo tkgen.lo
- libtcldot_la_OBJECTS = $(am_libtcldot_la_OBJECTS)
  
-@@ -262,8 +261,7 @@
- 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) \
-@@ -301,7 +299,7 @@
- 	-rm -f libtool
- $(srcdir)/Makefile.in:  Makefile.am  $(top_srcdir)/configure.in $(ACLOCAL_M4)
- 	cd $(top_srcdir) && \
--	  $(AUTOMAKE) --gnu  tcldot/Makefile
-+	  $(AUTOMAKE) --gnu  --ignore-deps tcldot/Makefile
- Makefile:  $(srcdir)/Makefile.in  $(top_builddir)/config.status
- 	cd $(top_builddir) && \
- 	  CONFIG_HEADERS= CONFIG_LINKS= \
-@@ -334,30 +332,14 @@
- distclean-compile:
- 	-rm -f *.tab.c
- 
--@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)
+-EXTRA_DIST = $(man_MANS) README README.Tkspline \
+-	nmakefile Makefile.old
++EXTRA_DIST = $(man_MANS) README README.Tkspline 	nmakefile Makefile.old
+ 
+ mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
+ CONFIG_HEADER = ../gvconfig.h
+@@ -250,7 +225,7 @@
+ ../dotneato/neatogen/libneato.la ../dotneato/twopigen/libtwopi.la \
+ ../dotneato/pack/libpack.la ../pathplan/libpathplan.la \
+ ../graph/libgraph.la ../cdt/libcdt.la ../gd/libgd.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)
+@@ -267,7 +242,7 @@
+ 
+ DISTFILES = $(DIST_COMMON) $(SOURCES) $(HEADERS) $(TEXINFOS) $(EXTRA_DIST)
+ 
+-TAR = gtar
++TAR = tar
+ GZIP_ENV = --best
+ SOURCES = $(libtcldot_la_SOURCES)
+ OBJECTS = $(libtcldot_la_OBJECTS)
+@@ -508,7 +483,6 @@
+ 	      || exit 1; \
+ 	  fi; \
+ 	done
 -
- .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
-@@ -563,8 +545,8 @@
- 
- 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
- 
-@@ -602,21 +584,21 @@
- 
- .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
+ info-am:
+ info: info-recursive
+ dvi-am:
diff --git a/graphics/graphviz/patches/patch-as b/graphics/graphviz/patches/patch-as
index 160401c1bb9..7260c6769e8 100644
--- a/graphics/graphviz/patches/patch-as
+++ b/graphics/graphviz/patches/patch-as
@@ -1,8 +1,8 @@
-$NetBSD: patch-as,v 1.2 2002/03/21 08:47:07 seb Exp $
+$NetBSD: patch-as,v 1.3 2002/04/19 18:42:34 seb Exp $
 
---- tcldot/demo/Makefile.in.orig	Fri Mar  8 23:12:22 2002
+--- tcldot/demo/Makefile.in.orig	Fri Apr 19 14:31:38 2002
 +++ tcldot/demo/Makefile.in
-@@ -195,7 +195,7 @@
+@@ -183,7 +183,7 @@
  
  AUTOMAKE_OPTIONS = 1.4
  
@@ -11,20 +11,12 @@ $NetBSD: patch-as,v 1.2 2002/03/21 08:47:07 seb Exp $
  demo_SCRIPTS = doted gcat
  demo_DATA = doted.README gcat.README
  EXTRA_DIST = $(demo_SCRIPTS) $(demo_DATA)
-@@ -205,6 +205,7 @@
- CONFIG_CLEAN_FILES =
- SCRIPTS = $(demo_SCRIPTS)
+@@ -199,7 +199,7 @@
  
-+depcomp =
- DIST_SOURCES =
- DATA = $(demo_DATA)
+ DISTFILES = $(DIST_COMMON) $(SOURCES) $(HEADERS) $(TEXINFOS) $(EXTRA_DIST)
  
-@@ -223,7 +224,7 @@
- 	-rm -f libtool
- $(srcdir)/Makefile.in:  Makefile.am  $(top_srcdir)/configure.in $(ACLOCAL_M4)
- 	cd $(top_srcdir) && \
--	  $(AUTOMAKE) --gnu  tcldot/demo/Makefile
-+	  $(AUTOMAKE) --gnu  --ignore-deps tcldot/demo/Makefile
- Makefile:  $(srcdir)/Makefile.in  $(top_builddir)/config.status
- 	cd $(top_builddir) && \
- 	  CONFIG_HEADERS= CONFIG_LINKS= \
+-TAR = gtar
++TAR = tar
+ GZIP_ENV = --best
+ all: all-redirect
+ .SUFFIXES:
diff --git a/graphics/graphviz/patches/patch-au b/graphics/graphviz/patches/patch-au
index bdfccd216fd..06b85f4b357 100644
--- a/graphics/graphviz/patches/patch-au
+++ b/graphics/graphviz/patches/patch-au
@@ -1,124 +1,59 @@
-$NetBSD: patch-au,v 1.2 2002/03/21 08:47:07 seb Exp $
+$NetBSD: patch-au,v 1.3 2002/04/19 18:42:35 seb Exp $
 
---- tclpathplan/Makefile.in.orig	Fri Mar  8 23:12:23 2002
+--- tclpathplan/Makefile.in.orig	Fri Apr 19 14:31:38 2002
 +++ tclpathplan/Makefile.in
-@@ -197,8 +197,7 @@
+@@ -183,10 +183,7 @@
  
- INCLUDES = @TCL_CFLAGS@ \
- 	-I$(top_srcdir)/tclhandle \
+ AUTOMAKE_OPTIONS = 1.4
+ 
+-INCLUDES = @TCL_CFLAGS@ \
+-	-I$(top_srcdir)/tclhandle \
 -	-I$(top_srcdir)/pathplan \
 -	-I@TCLSH_EXEC_PREFIX@/include
-+	-I$(top_srcdir)/pathplan
++INCLUDES = @TCL_CFLAGS@ 	-I$(top_srcdir)/tclhandle 	-I$(top_srcdir)/pathplan
  
  
  LIBS = 
-@@ -215,7 +214,7 @@
- libtclplan_la_LIBADD = \
- 	../tclhandle/libtclhandle.la \
- 	../pathplan/libpathplan.la \
--        ../tclstubs/libtclstubs.la -lm
-+        ${TCL_STUB_LIB_SPEC} -lm
- 
- 
- CLEANFILES = pkgIndex.tcl
-@@ -227,7 +226,7 @@
- 
- libtclplan_la_LDFLAGS =
- libtclplan_la_DEPENDENCIES = ../tclhandle/libtclhandle.la \
--	../pathplan/libpathplan.la ../tclstubs/libtclstubs.la
-+	../pathplan/libpathplan.la
- am_libtclplan_la_OBJECTS = find_ints.lo intersect.lo makecw.lo \
- 	tclpathplan.lo wrapper.lo
- libtclplan_la_OBJECTS = $(am_libtclplan_la_OBJECTS)
-@@ -236,10 +235,7 @@
- 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) \
-@@ -275,7 +271,7 @@
- 	-rm -f libtool
- $(srcdir)/Makefile.in:  Makefile.am  $(top_srcdir)/configure.in $(ACLOCAL_M4)
- 	cd $(top_srcdir) && \
--	  $(AUTOMAKE) --gnu  tclpathplan/Makefile
-+	  $(AUTOMAKE) --gnu  --ignore-deps tclpathplan/Makefile
- Makefile:  $(srcdir)/Makefile.in  $(top_builddir)/config.status
- 	cd $(top_builddir) && \
- 	  CONFIG_HEADERS= CONFIG_LINKS= \
-@@ -308,33 +304,14 @@
- distclean-compile:
- 	-rm -f *.tab.c
- 
--@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)/'`$<
- 
- .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:
+@@ -196,14 +193,10 @@
  
- # This directory's subdirectories are mostly independent; you can cd
-@@ -501,8 +478,8 @@
+ SUBDIRS = demo
  
- distclean: distclean-recursive
+-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
  
--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
+-libtclplan_la_LIBADD = \
+-	../tclhandle/libtclhandle.la \
+-	../pathplan/libpathplan.la \
+-        ../tclstubs/libtclstubs.la -lm
++libtclplan_la_LIBADD =  	../tclhandle/libtclhandle.la 	../pathplan/libpathplan.la         ${TCL_STUB_LIB_SPEC} -lm
  
-@@ -537,16 +514,15 @@
  
- .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 \
+ CLEANFILES = pkgIndex.tcl
+@@ -222,7 +215,7 @@
+ X_PRE_LIBS = @X_PRE_LIBS@
+ libtclplan_la_LDFLAGS = 
+ libtclplan_la_DEPENDENCIES =  ../tclhandle/libtclhandle.la \
+-../pathplan/libpathplan.la ../tclstubs/libtclstubs.la
++../pathplan/libpathplan.la
+ libtclplan_la_OBJECTS =  find_ints.lo intersect.lo makecw.lo \
+ tclpathplan.lo wrapper.lo
+ CFLAGS = @CFLAGS@
+@@ -237,7 +230,7 @@
+ 
+ DISTFILES = $(DIST_COMMON) $(SOURCES) $(HEADERS) $(TEXINFOS) $(EXTRA_DIST)
+ 
+-TAR = gtar
++TAR = tar
+ GZIP_ENV = --best
+ SOURCES = $(libtclplan_la_SOURCES)
+ OBJECTS = $(libtclplan_la_OBJECTS)
+@@ -439,7 +432,6 @@
+ 	      || exit 1; \
+ 	  fi; \
+ 	done
+-
+ info-am:
+ info: info-recursive
+ dvi-am:
diff --git a/graphics/graphviz/patches/patch-aw b/graphics/graphviz/patches/patch-aw
index d34d03db89b..2035666d89d 100644
--- a/graphics/graphviz/patches/patch-aw
+++ b/graphics/graphviz/patches/patch-aw
@@ -1,8 +1,8 @@
-$NetBSD: patch-aw,v 1.2 2002/03/21 08:47:07 seb Exp $
+$NetBSD: patch-aw,v 1.3 2002/04/19 18:42:35 seb Exp $
 
---- tclpathplan/demo/Makefile.in.orig	Fri Mar  8 23:12:24 2002
+--- tclpathplan/demo/Makefile.in.orig	Fri Apr 19 14:31:38 2002
 +++ tclpathplan/demo/Makefile.in
-@@ -197,7 +197,7 @@
+@@ -185,7 +185,7 @@
  
  SUBDIRS = pathplan_data
  
@@ -11,20 +11,12 @@ $NetBSD: patch-aw,v 1.2 2002/03/21 08:47:07 seb Exp $
  demo_SCRIPTS = pathplan
  demo_DATA = pathplan.README 
  
-@@ -208,6 +208,7 @@
- CONFIG_CLEAN_FILES =
- SCRIPTS = $(demo_SCRIPTS)
+@@ -202,7 +202,7 @@
  
-+depcomp =
- DIST_SOURCES =
- DATA = $(demo_DATA)
+ DISTFILES = $(DIST_COMMON) $(SOURCES) $(HEADERS) $(TEXINFOS) $(EXTRA_DIST)
  
-@@ -232,7 +233,7 @@
- 	-rm -f libtool
- $(srcdir)/Makefile.in:  Makefile.am  $(top_srcdir)/configure.in $(ACLOCAL_M4)
- 	cd $(top_srcdir) && \
--	  $(AUTOMAKE) --gnu  tclpathplan/demo/Makefile
-+	  $(AUTOMAKE) --gnu  --ignore-deps tclpathplan/demo/Makefile
- Makefile:  $(srcdir)/Makefile.in  $(top_builddir)/config.status
- 	cd $(top_builddir) && \
- 	  CONFIG_HEADERS= CONFIG_LINKS= \
+-TAR = gtar
++TAR = tar
+ GZIP_ENV = --best
+ all: all-redirect
+ .SUFFIXES:
diff --git a/graphics/graphviz/patches/patch-ay b/graphics/graphviz/patches/patch-ay
index ba427897ddc..62efb46b0e6 100644
--- a/graphics/graphviz/patches/patch-ay
+++ b/graphics/graphviz/patches/patch-ay
@@ -1,9 +1,14 @@
-$NetBSD: patch-ay,v 1.2 2002/03/21 08:47:08 seb Exp $
+$NetBSD: patch-ay,v 1.3 2002/04/19 18:42:35 seb Exp $
 
---- tclpathplan/demo/pathplan_data/Makefile.in.orig	Fri Mar  8 23:12:24 2002
+--- tclpathplan/demo/pathplan_data/Makefile.in.orig	Fri Apr 19 14:31:38 2002
 +++ tclpathplan/demo/pathplan_data/Makefile.in
-@@ -199,7 +199,7 @@
- 	obs.dat other.dat paths.dat rotor.dat u.dat unknown.dat
+@@ -183,11 +183,10 @@
+ 
+ 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
  
  
 -pathplanexampledir = $(libdir)/@PACKAGE@/demo/pathplan_data
@@ -11,20 +16,12 @@ $NetBSD: patch-ay,v 1.2 2002/03/21 08:47:08 seb Exp $
  
  pathplanexample_DATA = $(EXAMPLES)
  EXTRA_DIST = $(EXAMPLES)
-@@ -207,6 +207,7 @@
- mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
- CONFIG_HEADER = $(top_builddir)/gvconfig.h
- CONFIG_CLEAN_FILES =
-+depcomp =
- DIST_SOURCES =
- DATA = $(pathplanexample_DATA)
+@@ -201,7 +200,7 @@
+ 
+ DISTFILES = $(DIST_COMMON) $(SOURCES) $(HEADERS) $(TEXINFOS) $(EXTRA_DIST)
  
-@@ -225,7 +226,7 @@
- 	-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) --gnu  --ignore-deps tclpathplan/demo/pathplan_data/Makefile
- Makefile:  $(srcdir)/Makefile.in  $(top_builddir)/config.status
- 	cd $(top_builddir) && \
- 	  CONFIG_HEADERS= CONFIG_LINKS= \
+-TAR = gtar
++TAR = tar
+ GZIP_ENV = --best
+ all: all-redirect
+ .SUFFIXES:
diff --git a/graphics/graphviz/patches/patch-ba b/graphics/graphviz/patches/patch-ba
index 8accca85eca..b7e17e24b28 100644
--- a/graphics/graphviz/patches/patch-ba
+++ b/graphics/graphviz/patches/patch-ba
@@ -1,133 +1,57 @@
-$NetBSD: patch-ba,v 1.2 2002/03/21 08:47:08 seb Exp $
+$NetBSD: patch-ba,v 1.3 2002/04/19 18:42:35 seb Exp $
 
---- tkspline/Makefile.in.orig	Fri Mar  8 23:12:25 2002
+--- tkspline/Makefile.in.orig	Fri Apr 19 14:31:38 2002
 +++ tkspline/Makefile.in
-@@ -197,9 +197,7 @@
- 	@TCL_CFLAGS@ \
- 	@TK_CFLAGS@ @TK_DEFS@ \
- 	@TCLINT_INCLUDES@ \
+@@ -181,13 +181,7 @@
+ Z_INCLUDES = @Z_INCLUDES@
+ Z_LIBS = @Z_LIBS@
+ 
+-INCLUDES = @X_CFLAGS@ \
+-	@TCL_CFLAGS@ \
+-	@TK_CFLAGS@ @TK_DEFS@ \
+-	@TCLINT_INCLUDES@ \
 -	@TKINT_INCLUDES@ \
 -	-I@TK_EXEC_PREFIX@/include \
 -	-I@TCLSH_EXEC_PREFIX@/include
-+	@TKINT_INCLUDES@
++INCLUDES = @X_CFLAGS@ 	@TCL_CFLAGS@ 	@TK_CFLAGS@ @TK_DEFS@ 	@TCLINT_INCLUDES@ 	@TKINT_INCLUDES@
  
  
  LIBS = 
-@@ -214,8 +212,8 @@
+@@ -201,9 +195,7 @@
+ 
  libtkspline_la_SOURCES = tkspline.c
  
- libtkspline_la_LIBADD = \
+-libtkspline_la_LIBADD = \
 -	../tkstubs/libtkstubs.la \
 -	../tclstubs/libtclstubs.la 
-+	${TK_STUB_LIB_SPEC} \
-+	${TCL_STUB_LIB_SPEC}
++libtkspline_la_LIBADD =  	${TK_STUB_LIB_SPEC} 	${TCL_STUB_LIB_SPEC}
  
  
  CLEANFILES = pkgIndex.tcl
-@@ -228,8 +226,7 @@
- LTLIBRARIES = $(pkglib_LTLIBRARIES)
- 
- libtkspline_la_LDFLAGS =
--libtkspline_la_DEPENDENCIES = ../tkstubs/libtkstubs.la \
--	../tclstubs/libtclstubs.la
-+libtkspline_la_DEPENDENCIES =
- am_libtkspline_la_OBJECTS = tkspline.lo
- libtkspline_la_OBJECTS = $(am_libtkspline_la_OBJECTS)
- 
-@@ -237,8 +234,7 @@
- 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) \
-@@ -275,7 +271,7 @@
- 	-rm -f libtool
- $(srcdir)/Makefile.in:  Makefile.am  $(top_srcdir)/configure.in $(ACLOCAL_M4)
- 	cd $(top_srcdir) && \
--	  $(AUTOMAKE) --gnu  tkspline/Makefile
-+	  $(AUTOMAKE) --gnu  --ignore-deps tkspline/Makefile
- Makefile:  $(srcdir)/Makefile.in  $(top_builddir)/config.status
- 	cd $(top_builddir) && \
- 	  CONFIG_HEADERS= CONFIG_LINKS= \
-@@ -308,29 +304,14 @@
- distclean-compile:
- 	-rm -f *.tab.c
- 
--@AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/tkspline.Plo@am__quote@
+@@ -223,8 +215,7 @@
+ 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)
+@@ -240,7 +231,7 @@
+ 
+ DISTFILES = $(DIST_COMMON) $(SOURCES) $(HEADERS) $(TEXINFOS) $(EXTRA_DIST)
+ 
+-TAR = gtar
++TAR = tar
+ GZIP_ENV = --best
+ SOURCES = $(libtkspline_la_SOURCES)
+ OBJECTS = $(libtkspline_la_OBJECTS)
+@@ -481,7 +472,6 @@
+ 	      || exit 1; \
+ 	  fi; \
+ 	done
 -
--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)/'`$<
- 
- .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
-@@ -536,8 +517,8 @@
- 
- 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
- 
-@@ -575,21 +556,21 @@
- 
- .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
+ info-am:
+ info: info-recursive
+ dvi-am:
diff --git a/graphics/graphviz/patches/patch-bc b/graphics/graphviz/patches/patch-bc
index 79d5d28f985..5ac9c98ca09 100644
--- a/graphics/graphviz/patches/patch-bc
+++ b/graphics/graphviz/patches/patch-bc
@@ -1,8 +1,8 @@
-$NetBSD: patch-bc,v 1.2 2002/03/21 08:47:08 seb Exp $
+$NetBSD: patch-bc,v 1.3 2002/04/19 18:42:35 seb Exp $
 
---- tkspline/demo/Makefile.in.orig	Fri Mar  8 23:12:26 2002
+--- tkspline/demo/Makefile.in.orig	Fri Apr 19 14:31:38 2002
 +++ tkspline/demo/Makefile.in
-@@ -195,7 +195,7 @@
+@@ -183,7 +183,7 @@
  
  AUTOMAKE_OPTIONS = 1.4
  
@@ -11,20 +11,12 @@ $NetBSD: patch-bc,v 1.2 2002/03/21 08:47:08 seb Exp $
  demo_SCRIPTS = spline
  demo_DATA = spline.README
  EXTRA_DIST = $(demo_SCRIPTS) $(demo_DATA)
-@@ -205,6 +205,7 @@
- CONFIG_CLEAN_FILES =
- SCRIPTS = $(demo_SCRIPTS)
+@@ -199,7 +199,7 @@
  
-+depcomp =
- DIST_SOURCES =
- DATA = $(demo_DATA)
+ DISTFILES = $(DIST_COMMON) $(SOURCES) $(HEADERS) $(TEXINFOS) $(EXTRA_DIST)
  
-@@ -223,7 +224,7 @@
- 	-rm -f libtool
- $(srcdir)/Makefile.in:  Makefile.am  $(top_srcdir)/configure.in $(ACLOCAL_M4)
- 	cd $(top_srcdir) && \
--	  $(AUTOMAKE) --gnu  tkspline/demo/Makefile
-+	  $(AUTOMAKE) --gnu  --ignore-deps tkspline/demo/Makefile
- Makefile:  $(srcdir)/Makefile.in  $(top_builddir)/config.status
- 	cd $(top_builddir) && \
- 	  CONFIG_HEADERS= CONFIG_LINKS= \
+-TAR = gtar
++TAR = tar
+ GZIP_ENV = --best
+ all: all-redirect
+ .SUFFIXES: