Update to version 1.8.2.

No proper changes information available since version 1.8.1. However browsing Graphviz's CVS logs and diff'ing with previous version one can found: - bug fixes - code cleanup - buffer overflow in dot/neato output generation fixed - memory leaks fixed (??)
author: seb <seb@pkgsrc.org> 2002-03-21 08:47:06 +0000
committer: seb <seb@pkgsrc.org> 2002-03-21 08:47:06 +0000
commit: c6fd3e8d8774230744b2e6b00843ced6da0cb2eb (patch)
tree: 0432e41b9bb1e567daaa58a9b39984192bdb0203 /graphics/graphviz
parent: c792fdf1e1c1ebcde4216755ab68c68bc5dac2b0 (diff)
download: pkgsrc-c6fd3e8d8774230744b2e6b00843ced6da0cb2eb.tar.gz
17 files changed, 905 insertions, 486 deletions
diff --git a/graphics/graphviz/Makefile b/graphics/graphviz/Makefile
index 53094865cdc..4a50a0e1f48 100644
--- a/graphics/graphviz/Makefile
+++ b/graphics/graphviz/Makefile
@@ -1,8 +1,7 @@
-# $NetBSD: Makefile,v 1.3 2002/03/13 17:37:09 fredb Exp $
+# $NetBSD: Makefile,v 1.4 2002/03/21 08:47:06 seb Exp $
 #
 
-DISTNAME=	graphviz-1.8.1
-PKGREVISION=	2
+DISTNAME=	graphviz-1.8.2
 CATEGORIES=	graphics
 MASTER_SITES=	http://www.research.att.com/sw/tools/graphviz/dist/
 EXTRACT_SUFX=	.tgz
diff --git a/graphics/graphviz/distinfo b/graphics/graphviz/distinfo
index 8199f1e4e16..133b9f980aa 100644
--- a/graphics/graphviz/distinfo
+++ b/graphics/graphviz/distinfo
@@ -1,33 +1,33 @@
-$NetBSD: distinfo,v 1.2 2002/03/10 23:58:41 seb Exp $
+$NetBSD: distinfo,v 1.3 2002/03/21 08:47:06 seb Exp $
 
-SHA1 (graphviz-1.8.1.tgz) = a9ec14be381b7dca36b83c321f5115884ce58cec
-Size (graphviz-1.8.1.tgz) = 2648185 bytes
+SHA1 (graphviz-1.8.2.tgz) = ba13448010d273736d69d3cde62151bc7fef999e
+Size (graphviz-1.8.2.tgz) = 2703996 bytes
 SHA1 (patch-aa) = 1284ea4e38bdf2022bc9e270668f57b4f2953f03
-SHA1 (patch-ab) = 00dff60ee8292690b3b3e88159eaa675295733a6
-SHA1 (patch-ac) = 17c6502dd76bb3920f430539b2fb3d397710472b
+SHA1 (patch-ab) = 6a280334d978926e363eb3aa74f1730a344edf89
+SHA1 (patch-ac) = 7bc0927cffa0ffec1491930e611a1876a453816c
 SHA1 (patch-ad) = 10926226514d44eb653d4a2006a14dc60e72f143
-SHA1 (patch-ae) = 50b26b99624d5d0dbe6d77af00115d753bccb6c4
+SHA1 (patch-ae) = ae71f6a75cfb34bd1c3a5561c6ae8765e212c173
 SHA1 (patch-af) = 96c1f98a5b1fce31c596435c879af326604da077
-SHA1 (patch-ag) = ab16434324414efbfda3ec9c762bc1f377dbaa0e
+SHA1 (patch-ag) = e5ae16ad9470bd94822aef016b9518a2a9a68dbb
 SHA1 (patch-ah) = 4177be8269252663a3bedb4b243ce77de6f8f444
-SHA1 (patch-ai) = 0ff0279812e4b003c45f6bd64aacd39854f20847
+SHA1 (patch-ai) = b0d7a9821b0b08a53c0661a074d3304d5840eece
 SHA1 (patch-aj) = 25f1dff8fe277346bdd44b540cf559a4f8809ac5
-SHA1 (patch-ak) = 895aa1cae2a2c1b85ee304bd4a495309cf52cf3f
+SHA1 (patch-ak) = ddb503a5773ad13c92ce15522280d07553800e13
 SHA1 (patch-al) = ecb44648b9887d11d39488dd558f53586701fb4c
-SHA1 (patch-am) = 4489519aeef7ad42b7d71d084ceb8809867d7957
+SHA1 (patch-am) = 5518f173d0f4b203d282a1fab7443f2370d4762c
 SHA1 (patch-an) = 8102be5b12b374b041ca5a41665cc4a47a33d13f
-SHA1 (patch-ao) = 7bbdb822dd55319559a3206909e85dc2251b66fa
+SHA1 (patch-ao) = f8a2263f7d5d3dae9c7303197640c8e65de1a2c5
 SHA1 (patch-ap) = bc9e733bfdbbde196f1f851aa8943453430d5dea
-SHA1 (patch-aq) = 83f9bc67029594fb8e4d663bb247ac59550f4d14
+SHA1 (patch-aq) = c1a9ac2ef2ac8074458da38ed9a3e2361998dea6
 SHA1 (patch-ar) = cf60597ae99232500da469762f979dc3a2e6073e
-SHA1 (patch-as) = c3ea77929a51617616b24f018ea8661b14d4b623
+SHA1 (patch-as) = c7838e66ee9f630ceff336a8dfcf030835e9ce5d
 SHA1 (patch-at) = 121bbd25a83967aaf976a23c818e7526c2a91ff2
-SHA1 (patch-au) = f11ad65ad5da967588ffce2bb1cdc88c3946d79f
+SHA1 (patch-au) = 98245e0dc7e62862f9a8cfdae46a2db53d701b5a
 SHA1 (patch-av) = bfcb35ddc2814d304bb2c31923335ea3757bd6ff
-SHA1 (patch-aw) = d9437eb239bcf413a6f6f4b516d276e99be990cb
+SHA1 (patch-aw) = 3abc92ff00cf190b310f2818609fcde8b8e201ca
 SHA1 (patch-ax) = 7ed8b5e8cfce5bed4c764e8f4855b774f3bfa519
-SHA1 (patch-ay) = ae7630889e67cdd05034c845c8137f0128c050dd
+SHA1 (patch-ay) = 3e52377e4569c55fb41a1a097c3627e146f40aac
 SHA1 (patch-az) = ddbe55931ab479c30cd7d3ec52ea6f4d61df6d98
-SHA1 (patch-ba) = 14fedc672638ce31a189b6c5e908f231953d701b
+SHA1 (patch-ba) = 68b4b864ade62877659f6216e506c1a53f401bd6
 SHA1 (patch-bb) = 4ea6f919c39c05923ef2312cc3de78d9ea21ec7a
-SHA1 (patch-bc) = 3bbc6d3feefba22fe893e7ba553798f48a71fee5
+SHA1 (patch-bc) = 0e74adece203eef247fa158459513fafc96a7540
diff --git a/graphics/graphviz/patches/patch-ab b/graphics/graphviz/patches/patch-ab
index 3fe9a348fa3..478cf9994ee 100644
--- a/graphics/graphviz/patches/patch-ab
+++ b/graphics/graphviz/patches/patch-ab
@@ -1,12 +1,12 @@
-$NetBSD: patch-ab,v 1.2 2002/03/10 23:58:41 seb Exp $
+$NetBSD: patch-ab,v 1.3 2002/03/21 08:47:07 seb Exp $
 
---- configure.in.orig	Fri Mar  1 03:47:55 2002
+--- configure.in.orig	Fri Mar  8 23:11:31 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:/usr/openwin/lib/X11/fonts/TrueType"
+-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"
 +if test x"$X11PREFIX" != x"$X11BASE" ; then
 +DEFAULT_FONTPATH="${DEFAULT_FONTPATH}:${X11BASE}/lib/X11/fonts/TrueType:${X11BASE}/lib/X11/fonts/truetype"
@@ -42,7 +42,7 @@ $NetBSD: patch-ab,v 1.2 2002/03/10 23:58:41 seb Exp $
      TK_PKGINDEX="tkspline/pkgIndex.tcl"
  else
      AC_MSG_WARN([Unable to find tkConfig.sh. The package "tkspline" will not be built])
-@@ -529,36 +530,12 @@
+@@ -549,36 +550,12 @@
  
  # -----------------------------------
  # tclInt.h
diff --git a/graphics/graphviz/patches/patch-ac b/graphics/graphviz/patches/patch-ac
index 09996964ed4..d4bffdf8eff 100644
--- a/graphics/graphviz/patches/patch-ac
+++ b/graphics/graphviz/patches/patch-ac
@@ -1,83 +1,30 @@
-$NetBSD: patch-ac,v 1.2 2002/03/10 23:58:41 seb Exp $
+$NetBSD: patch-ac,v 1.3 2002/03/21 08:47:07 seb Exp $
 
---- configure.orig	Fri Mar  1 22:34:05 2002
+--- configure.orig	Wed Mar 20 18:06:51 2002
 +++ configure
-@@ -1475,60 +1475,9 @@
-   fi
+@@ -1388,7 +1388,7 @@
+ echo "$as_me: WARNING: ${am_backtick}missing' script is too old or missing" >&2;}
  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 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 @@
+-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 @@
  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
-@@ -5893,7 +5842,10 @@
+@@ -7527,7 +7527,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:/usr/openwin/lib/X11/fonts/TrueType"
+-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"
 +if test x"$X11PREFIX" != x"$X11BASE" ; then
 +DEFAULT_FONTPATH="${DEFAULT_FONTPATH}:${X11BASE}/lib/X11/fonts/TrueType:${X11BASE}/lib/X11/fonts/truetype"
@@ -85,35 +32,55 @@ $NetBSD: patch-ac,v 1.2 2002/03/10 23:58:41 seb Exp $
  PATHSEPARATOR=":"
  fi
  fi
-@@ -6079,12 +6031,11 @@
+@@ -7725,9 +7728,8 @@
  
  # 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 "$ac_t""using $TCLCONFIG" 1>&6
+-    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
      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 "configure: warning: Unable to find tclConfig.sh. The packages: "gdtclft tcldot tcldgr tcldgl tclpathplan" will not be built" 1>&2
-@@ -6156,12 +6107,11 @@
+-    { 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 @@
  
  # 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 "$ac_t""using $TKCONFIG" 1>&6
+-    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
      file=${TKCONFIG}
      . $file
 -    TK_SUBDIRS="tkstubs tkspline"
 +    TK_SUBDIRS="tkspline"
      TK_PKGINDEX="tkspline/pkgIndex.tcl"
  else
-     echo "configure: warning: Unable to find tkConfig.sh. The package "tkspline" will not be built" 1>&2
-@@ -8710,36 +8660,12 @@
+-    { 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 @@
  
  # -----------------------------------
  # tclInt.h
@@ -132,7 +99,6 @@ $NetBSD: patch-ac,v 1.2 2002/03/10 23:58:41 seb Exp $
 -fi
 +TCLINT_INCLUDES="-I${BUILDLINK_DIR}/include/tcl/generic"
  
- 
  # -----------------------------------
  # tkInt.h
 -if test -f "$TK_SRC_DIR/generic/tkInt.h"; then
@@ -150,5 +116,5 @@ $NetBSD: patch-ac,v 1.2 2002/03/10 23:58:41 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 20e1862336f..b666fc7b0b6 100644
--- a/graphics/graphviz/patches/patch-ae
+++ b/graphics/graphviz/patches/patch-ae
@@ -1,62 +1,130 @@
-$NetBSD: patch-ae,v 1.1.1.1 2002/03/05 13:37:29 seb Exp $
+$NetBSD: patch-ae,v 1.2 2002/03/21 08:47:07 seb Exp $
 
---- gdtclft/Makefile.in.orig	Fri Mar  1 22:35:34 2002
+--- gdtclft/Makefile.in.orig	Fri Mar  8 23:12:10 2002
 +++ gdtclft/Makefile.in
-@@ -187,17 +187,10 @@
+@@ -197,8 +197,7 @@
  
- AUTOMAKE_OPTIONS = 1.4
- 
--INCLUDES = @TCL_CFLAGS@ \
--	-I$(top_srcdir)/tclhandle \
+ INCLUDES = @TCL_CFLAGS@ \
+ 	-I$(top_srcdir)/tclhandle \
 -	-I$(top_srcdir)/gd \
 -	-I@TCLSH_EXEC_PREFIX@/include
-+INCLUDES = @TCL_CFLAGS@ 	-I$(top_srcdir)/tclhandle 	-I$(top_srcdir)/gd
- 
++	-I$(top_srcdir)/gd
  
--LIBS = ${FT_LIBS} \
--	${PNG_LIBS} \
--	${JPEG_LIBS} \
--	${XPM_LIBS} \
--	${Z_LIBS} -lc
-+LIBS = ${FT_LIBS} 	${PNG_LIBS} 	${JPEG_LIBS} 	${XPM_LIBS} 	${Z_LIBS} -lc
  
+ LIBS = ${FT_LIBS} \
+@@ -218,7 +217,7 @@
+ libgdtclft_la_LIBADD = \
+ 	../tclhandle/libtclhandle.la \
+ 	../gd/libgd.la \
+-	../tclstubs/libtclstubs.la
++	${TCL_STUB_LIB_SPEC}
  
- SUBDIRS = demo
-@@ -207,10 +200,7 @@
  
- libgdtclft_la_SOURCES = gdtclft.c
+ CLEANFILES = pkgIndex.tcl
+@@ -231,8 +230,7 @@
+ LTLIBRARIES = $(pkglib_LTLIBRARIES)
  
--libgdtclft_la_LIBADD = \
--	../tclhandle/libtclhandle.la \
--	../gd/libgd.la \
+ libgdtclft_la_LDFLAGS =
+-libgdtclft_la_DEPENDENCIES = ../tclhandle/libtclhandle.la ../gd/libgd.la \
 -	../tclstubs/libtclstubs.la
-+libgdtclft_la_LIBADD =  	../tclhandle/libtclhandle.la 	../gd/libgd.la 	${TCL_STUB_LIB_SPEC}
++libgdtclft_la_DEPENDENCIES = ../tclhandle/libtclhandle.la ../gd/libgd.la
+ am_libgdtclft_la_OBJECTS = gdtclft.lo
+ libgdtclft_la_OBJECTS = $(am_libgdtclft_la_OBJECTS)
  
+@@ -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
  
- CLEANFILES = pkgIndex.tcl
-@@ -231,7 +221,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)
-@@ -247,7 +237,7 @@
- 
- DISTFILES = $(DIST_COMMON) $(SOURCES) $(HEADERS) $(TEXINFOS) $(EXTRA_DIST)
- 
--TAR = gtar
-+TAR = tar
- GZIP_ENV = --best
- SOURCES = $(libgdtclft_la_SOURCES)
- OBJECTS = $(libgdtclft_la_OBJECTS)
-@@ -488,7 +478,6 @@
- 	      || exit 1; \
- 	  fi; \
- 	done
+-@AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/gdtclft.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
+@@ -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
diff --git a/graphics/graphviz/patches/patch-ag b/graphics/graphviz/patches/patch-ag
index c1a16cfe580..190829159bb 100644
--- a/graphics/graphviz/patches/patch-ag
+++ b/graphics/graphviz/patches/patch-ag
@@ -1,8 +1,8 @@
-$NetBSD: patch-ag,v 1.1.1.1 2002/03/05 13:37:29 seb Exp $
+$NetBSD: patch-ag,v 1.2 2002/03/21 08:47:07 seb Exp $
 
---- gdtclft/demo/Makefile.in.orig	Fri Mar  1 22:35:35 2002
+--- gdtclft/demo/Makefile.in.orig	Fri Mar  8 23:12:10 2002
 +++ gdtclft/demo/Makefile.in
-@@ -187,7 +187,7 @@
+@@ -195,7 +195,7 @@
  
  AUTOMAKE_OPTIONS = 1.4
  
@@ -11,12 +11,20 @@ $NetBSD: patch-ag,v 1.1.1.1 2002/03/05 13:37:29 seb Exp $
  demo_SCRIPTS = entities
  demo_DATA = entities.README entities.html
  EXTRA_DIST = $(demo_SCRIPTS) $(demo_DATA)
-@@ -203,7 +203,7 @@
+@@ -205,6 +205,7 @@
+ 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:
+@@ -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= \
diff --git a/graphics/graphviz/patches/patch-ai b/graphics/graphviz/patches/patch-ai
index 5246139cc1d..1f3c37390e7 100644
--- a/graphics/graphviz/patches/patch-ai
+++ b/graphics/graphviz/patches/patch-ai
@@ -1,67 +1,134 @@
-$NetBSD: patch-ai,v 1.1.1.1 2002/03/05 13:37:29 seb Exp $
+$NetBSD: patch-ai,v 1.2 2002/03/21 08:47:07 seb Exp $
 
---- tcldgl/Makefile.in.orig	Fri Mar  1 22:35:39 2002
+--- tcldgl/Makefile.in.orig	Fri Mar  8 23:12:20 2002
 +++ tcldgl/Makefile.in
-@@ -187,13 +187,7 @@
- 
- AUTOMAKE_OPTIONS = 1.4
- 
--INCLUDES = @TCL_CFLAGS@ \
--	-I$(top_srcdir)/agraph \
--	-I$(top_srcdir)/cdt \
--	-I$(top_srcdir)/tclhandle \
--	-I$(top_srcdir)/incr \
+@@ -200,8 +200,7 @@
+ 	-I$(top_srcdir)/cdt \
+ 	-I$(top_srcdir)/tclhandle \
+ 	-I$(top_srcdir)/incr \
 -	-I$(top_srcdir)/shape \
 -	-I@TCLSH_EXEC_PREFIX@/include
-+INCLUDES = @TCL_CFLAGS@ 	-I$(top_srcdir)/agraph 	-I$(top_srcdir)/cdt 	-I$(top_srcdir)/tclhandle 	-I$(top_srcdir)/incr 	-I$(top_srcdir)/shape
++	-I$(top_srcdir)/shape
  
  
  LIBS = 
-@@ -206,20 +200,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 \
+@@ -226,7 +225,7 @@
+ 	../agutil/libagutil.la \
+ 	../shape/libshape.la \
+ 	../ns/libns.la \
 -        ../tclstubs/libtclstubs.la \
--	-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
-@@ -243,7 +224,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)
-@@ -261,7 +242,7 @@
- 
- DISTFILES = $(DIST_COMMON) $(SOURCES) $(HEADERS) $(TEXINFOS) $(EXTRA_DIST)
- 
--TAR = gtar
-+TAR = tar
- GZIP_ENV = --best
- SOURCES = $(libtcldgl_la_SOURCES)
- OBJECTS = $(libtcldgl_la_OBJECTS)
-@@ -502,7 +483,6 @@
- 	      || exit 1; \
- 	  fi; \
- 	done
++        ${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)
 -
- 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
+@@ -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
diff --git a/graphics/graphviz/patches/patch-ak b/graphics/graphviz/patches/patch-ak
index a265348956d..5f2b4e69dbb 100644
--- a/graphics/graphviz/patches/patch-ak
+++ b/graphics/graphviz/patches/patch-ak
@@ -1,8 +1,8 @@
-$NetBSD: patch-ak,v 1.1.1.1 2002/03/05 13:37:29 seb Exp $
+$NetBSD: patch-ak,v 1.2 2002/03/21 08:47:07 seb Exp $
 
---- tcldgl/demo/Makefile.in.orig	Fri Mar  1 22:35:39 2002
+--- tcldgl/demo/Makefile.in.orig	Fri Mar  8 23:12:20 2002
 +++ tcldgl/demo/Makefile.in
-@@ -187,7 +187,7 @@
+@@ -195,7 +195,7 @@
  
  AUTOMAKE_OPTIONS = 1.4
  
@@ -11,12 +11,20 @@ $NetBSD: patch-ak,v 1.1.1.1 2002/03/05 13:37:29 seb Exp $
  demo_SCRIPTS = dge
  demo_DATA = dge.README dge.example1.dot  dge.example2.dot
  EXTRA_DIST = $(demo_SCRIPTS) $(demo_DATA)
-@@ -203,7 +203,7 @@
+@@ -205,6 +205,7 @@
+ 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:
+@@ -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= \
diff --git a/graphics/graphviz/patches/patch-am b/graphics/graphviz/patches/patch-am
index 1fd956b3404..77c13ef229b 100644
--- a/graphics/graphviz/patches/patch-am
+++ b/graphics/graphviz/patches/patch-am
@@ -1,55 +1,136 @@
-$NetBSD: patch-am,v 1.1.1.1 2002/03/05 13:37:29 seb Exp $
+$NetBSD: patch-am,v 1.2 2002/03/21 08:47:07 seb Exp $
 
---- tcldgr/Makefile.in.orig	Fri Mar  1 22:35:37 2002
+--- tcldgr/Makefile.in.orig	Fri Mar  8 23:12:21 2002
 +++ tcldgr/Makefile.in
-@@ -187,11 +187,7 @@
- 
- AUTOMAKE_OPTIONS = 1.4
- 
--INCLUDES = @TCL_CFLAGS@ \
--	-I$(top_srcdir)/agraph \
--	-I$(top_srcdir)/cdt \
+@@ -198,8 +198,7 @@
+ INCLUDES = @TCL_CFLAGS@ \
+ 	-I$(top_srcdir)/agraph \
+ 	-I$(top_srcdir)/cdt \
 -	-I$(top_srcdir)/tclhandle \
 -	-I@TCLSH_EXEC_PREFIX@/include
-+INCLUDES = @TCL_CFLAGS@ 	-I$(top_srcdir)/agraph 	-I$(top_srcdir)/cdt 	-I$(top_srcdir)/tclhandle
++	-I$(top_srcdir)/tclhandle
  
  
  LIBS = 
-@@ -204,10 +200,7 @@
- 
- libtcldgr_la_SOURCES = dgedge.c dgnode.c dgr.c dgraph.c dgrutil.c dgr.h
- 
--libtcldgr_la_LIBADD = ../tclhandle/libtclhandle.la \
--	../agraph/libagraph.la \
--	../cdt/libcdt.la \
+@@ -215,7 +214,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}
++        ${TCL_STUB_LIB_SPEC}
  
  
  CLEANFILES = pkgIndex.tcl
-@@ -228,7 +221,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)
-@@ -246,7 +239,7 @@
- 
- DISTFILES = $(DIST_COMMON) $(SOURCES) $(HEADERS) $(TEXINFOS) $(EXTRA_DIST)
- 
--TAR = gtar
-+TAR = tar
- GZIP_ENV = --best
- SOURCES = $(libtcldgr_la_SOURCES)
- OBJECTS = $(libtcldgr_la_OBJECTS)
-@@ -487,7 +480,6 @@
- 	      || exit 1; \
- 	  fi; \
- 	done
+@@ -229,8 +228,7 @@
+ 
+ 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)
 -
- 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
+@@ -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
diff --git a/graphics/graphviz/patches/patch-ao b/graphics/graphviz/patches/patch-ao
index 41eb3524b67..ae345454f6b 100644
--- a/graphics/graphviz/patches/patch-ao
+++ b/graphics/graphviz/patches/patch-ao
@@ -1,8 +1,8 @@
-$NetBSD: patch-ao,v 1.1.1.1 2002/03/05 13:37:29 seb Exp $
+$NetBSD: patch-ao,v 1.2 2002/03/21 08:47:07 seb Exp $
 
---- tcldgr/demo/Makefile.in.orig	Fri Mar  1 22:35:38 2002
+--- tcldgr/demo/Makefile.in.orig	Fri Mar  8 23:12:21 2002
 +++ tcldgr/demo/Makefile.in
-@@ -187,7 +187,7 @@
+@@ -195,7 +195,7 @@
  
  AUTOMAKE_OPTIONS = 1.4
  
@@ -11,12 +11,20 @@ $NetBSD: patch-ao,v 1.1.1.1 2002/03/05 13:37:29 seb Exp $
  demo_SCRIPTS = ihi
  demo_DATA = ihi.README ihi.testdata
  EXTRA_DIST = $(demo_SCRIPTS) $(demo_DATA)
-@@ -203,7 +203,7 @@
+@@ -205,6 +205,7 @@
+ 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:
+@@ -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= \
diff --git a/graphics/graphviz/patches/patch-aq b/graphics/graphviz/patches/patch-aq
index b6d0c2b7c77..7ca1f017add 100644
--- a/graphics/graphviz/patches/patch-aq
+++ b/graphics/graphviz/patches/patch-aq
@@ -1,84 +1,130 @@
-$NetBSD: patch-aq,v 1.1.1.1 2002/03/05 13:37:29 seb Exp $
+$NetBSD: patch-aq,v 1.2 2002/03/21 08:47:07 seb Exp $
 
---- tcldot/Makefile.in.orig	Fri Mar  1 22:35:36 2002
+--- tcldot/Makefile.in.orig	Fri Mar  8 23:12:22 2002
 +++ tcldot/Makefile.in
-@@ -187,23 +187,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 \
+@@ -203,8 +203,7 @@
+ 	-I$(top_srcdir)/graph \
+ 	-I$(top_srcdir)/cdt \
+ 	-I$(top_srcdir)/pathplan \
 -	-I$(top_srcdir)/tclhandle \
 -	-I@TCLSH_EXEC_PREFIX@/include
--
--
--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`\"" 
-@@ -216,23 +203,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 \
--        ../pathplan/libpathplan.la \
--        ../graph/libgraph.la \
--        ../cdt/libcdt.la \
--        ../gd/libgd.la \
--	../gdtclft/gdtclft.lo \
++	-I$(top_srcdir)/tclhandle
+ 
+ 
+ LIBS = ${FT_LIBS} \
+@@ -234,7 +233,7 @@
+         ../cdt/libcdt.la \
+         ../gd/libgd.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         ../pathplan/libpathplan.la         ../graph/libgraph.la         ../cdt/libcdt.la         ../gd/libgd.la 	../gdtclft/gdtclft.lo 	${TCL_STUB_LIB_SPEC}
++	${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)
  
--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
-@@ -252,7 +228,7 @@
- ../dotneato/common/libdotneato.la ../dotneato/dotgen/libdot.la \
- ../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
-+../gd/libgd.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)
-@@ -269,7 +245,7 @@
- 
- DISTFILES = $(DIST_COMMON) $(SOURCES) $(HEADERS) $(TEXINFOS) $(EXTRA_DIST)
- 
--TAR = gtar
-+TAR = tar
- GZIP_ENV = --best
- SOURCES = $(libtcldot_la_SOURCES)
- OBJECTS = $(libtcldot_la_OBJECTS)
-@@ -510,7 +486,6 @@
- 	      || exit 1; \
- 	  fi; \
- 	done
+@@ -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)
 -
- 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
+@@ -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
diff --git a/graphics/graphviz/patches/patch-as b/graphics/graphviz/patches/patch-as
index 03eb9612896..160401c1bb9 100644
--- a/graphics/graphviz/patches/patch-as
+++ b/graphics/graphviz/patches/patch-as
@@ -1,8 +1,8 @@
-$NetBSD: patch-as,v 1.1.1.1 2002/03/05 13:37:29 seb Exp $
+$NetBSD: patch-as,v 1.2 2002/03/21 08:47:07 seb Exp $
 
---- tcldot/demo/Makefile.in.orig	Fri Mar  1 22:35:36 2002
+--- tcldot/demo/Makefile.in.orig	Fri Mar  8 23:12:22 2002
 +++ tcldot/demo/Makefile.in
-@@ -187,7 +187,7 @@
+@@ -195,7 +195,7 @@
  
  AUTOMAKE_OPTIONS = 1.4
  
@@ -11,12 +11,20 @@ $NetBSD: patch-as,v 1.1.1.1 2002/03/05 13:37:29 seb Exp $
  demo_SCRIPTS = doted gcat
  demo_DATA = doted.README gcat.README
  EXTRA_DIST = $(demo_SCRIPTS) $(demo_DATA)
-@@ -203,7 +203,7 @@
+@@ -205,6 +205,7 @@
+ 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:
+@@ -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= \
diff --git a/graphics/graphviz/patches/patch-au b/graphics/graphviz/patches/patch-au
index 738eab50699..bdfccd216fd 100644
--- a/graphics/graphviz/patches/patch-au
+++ b/graphics/graphviz/patches/patch-au
@@ -1,59 +1,124 @@
-$NetBSD: patch-au,v 1.1.1.1 2002/03/05 13:37:29 seb Exp $
+$NetBSD: patch-au,v 1.2 2002/03/21 08:47:07 seb Exp $
 
---- tclpathplan/Makefile.in.orig	Fri Mar  1 22:35:40 2002
+--- tclpathplan/Makefile.in.orig	Fri Mar  8 23:12:23 2002
 +++ tclpathplan/Makefile.in
-@@ -187,10 +187,7 @@
+@@ -197,8 +197,7 @@
  
- AUTOMAKE_OPTIONS = 1.4
- 
--INCLUDES = @TCL_CFLAGS@ \
--	-I$(top_srcdir)/tclhandle \
+ INCLUDES = @TCL_CFLAGS@ \
+ 	-I$(top_srcdir)/tclhandle \
 -	-I$(top_srcdir)/pathplan \
 -	-I@TCLSH_EXEC_PREFIX@/include
-+INCLUDES = @TCL_CFLAGS@ 	-I$(top_srcdir)/tclhandle 	-I$(top_srcdir)/pathplan
++	-I$(top_srcdir)/pathplan
  
  
  LIBS = 
-@@ -200,14 +197,10 @@
+@@ -215,7 +214,7 @@
+ libtclplan_la_LIBADD = \
+ 	../tclhandle/libtclhandle.la \
+ 	../pathplan/libpathplan.la \
+-        ../tclstubs/libtclstubs.la -lm
++        ${TCL_STUB_LIB_SPEC} -lm
  
- SUBDIRS = demo
  
--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
+ 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
  
--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
+-@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 $<`
  
- CLEANFILES = pkgIndex.tcl
-@@ -226,7 +219,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@
-@@ -241,7 +234,7 @@
- 
- DISTFILES = $(DIST_COMMON) $(SOURCES) $(HEADERS) $(TEXINFOS) $(EXTRA_DIST)
- 
--TAR = gtar
-+TAR = tar
- GZIP_ENV = --best
- SOURCES = $(libtclplan_la_SOURCES)
- OBJECTS = $(libtclplan_la_OBJECTS)
-@@ -443,7 +436,6 @@
- 	      || exit 1; \
- 	  fi; \
- 	done
--
- info-am:
- info: info-recursive
- dvi-am:
+ .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
+@@ -501,8 +478,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
+ 
+@@ -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 \
diff --git a/graphics/graphviz/patches/patch-aw b/graphics/graphviz/patches/patch-aw
index 7d3adf479c9..d34d03db89b 100644
--- a/graphics/graphviz/patches/patch-aw
+++ b/graphics/graphviz/patches/patch-aw
@@ -1,8 +1,8 @@
-$NetBSD: patch-aw,v 1.1.1.1 2002/03/05 13:37:29 seb Exp $
+$NetBSD: patch-aw,v 1.2 2002/03/21 08:47:07 seb Exp $
 
---- tclpathplan/demo/Makefile.in.orig	Fri Mar  1 22:35:41 2002
+--- tclpathplan/demo/Makefile.in.orig	Fri Mar  8 23:12:24 2002
 +++ tclpathplan/demo/Makefile.in
-@@ -189,7 +189,7 @@
+@@ -197,7 +197,7 @@
  
  SUBDIRS = pathplan_data
  
@@ -11,12 +11,20 @@ $NetBSD: patch-aw,v 1.1.1.1 2002/03/05 13:37:29 seb Exp $
  demo_SCRIPTS = pathplan
  demo_DATA = pathplan.README 
  
-@@ -206,7 +206,7 @@
+@@ -208,6 +208,7 @@
+ 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:
+@@ -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= \
diff --git a/graphics/graphviz/patches/patch-ay b/graphics/graphviz/patches/patch-ay
index e74629fd96f..ba427897ddc 100644
--- a/graphics/graphviz/patches/patch-ay
+++ b/graphics/graphviz/patches/patch-ay
@@ -1,14 +1,9 @@
-$NetBSD: patch-ay,v 1.1.1.1 2002/03/05 13:37:29 seb Exp $
+$NetBSD: patch-ay,v 1.2 2002/03/21 08:47:08 seb Exp $
 
---- tclpathplan/demo/pathplan_data/Makefile.in.orig	Fri Mar  1 22:35:41 2002
+--- tclpathplan/demo/pathplan_data/Makefile.in.orig	Fri Mar  8 23:12:24 2002
 +++ tclpathplan/demo/pathplan_data/Makefile.in
-@@ -187,11 +187,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
+@@ -199,7 +199,7 @@
+ 	obs.dat other.dat paths.dat rotor.dat u.dat unknown.dat
  
  
 -pathplanexampledir = $(libdir)/@PACKAGE@/demo/pathplan_data
@@ -16,12 +11,20 @@ $NetBSD: patch-ay,v 1.1.1.1 2002/03/05 13:37:29 seb Exp $
  
  pathplanexample_DATA = $(EXAMPLES)
  EXTRA_DIST = $(EXAMPLES)
-@@ -205,7 +204,7 @@
- 
- DISTFILES = $(DIST_COMMON) $(SOURCES) $(HEADERS) $(TEXINFOS) $(EXTRA_DIST)
+@@ -207,6 +207,7 @@
+ mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
+ CONFIG_HEADER = $(top_builddir)/gvconfig.h
+ CONFIG_CLEAN_FILES =
++depcomp =
+ DIST_SOURCES =
+ DATA = $(pathplanexample_DATA)
  
--TAR = gtar
-+TAR = tar
- GZIP_ENV = --best
- all: all-redirect
- .SUFFIXES:
+@@ -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= \
diff --git a/graphics/graphviz/patches/patch-ba b/graphics/graphviz/patches/patch-ba
index 85ecd88fe10..8accca85eca 100644
--- a/graphics/graphviz/patches/patch-ba
+++ b/graphics/graphviz/patches/patch-ba
@@ -1,57 +1,133 @@
-$NetBSD: patch-ba,v 1.1.1.1 2002/03/05 13:37:29 seb Exp $
+$NetBSD: patch-ba,v 1.2 2002/03/21 08:47:08 seb Exp $
 
---- tkspline/Makefile.in.orig	Fri Mar  1 22:35:43 2002
+--- tkspline/Makefile.in.orig	Fri Mar  8 23:12:25 2002
 +++ tkspline/Makefile.in
-@@ -185,13 +185,7 @@
- Z_INCLUDES = @Z_INCLUDES@
- Z_LIBS = @Z_LIBS@
- 
--INCLUDES = @X_CFLAGS@ \
--	@TCL_CFLAGS@ \
--	@TK_CFLAGS@ @TK_DEFS@ \
--	@TCLINT_INCLUDES@ \
+@@ -197,9 +197,7 @@
+ 	@TCL_CFLAGS@ \
+ 	@TK_CFLAGS@ @TK_DEFS@ \
+ 	@TCLINT_INCLUDES@ \
 -	@TKINT_INCLUDES@ \
 -	-I@TK_EXEC_PREFIX@/include \
 -	-I@TCLSH_EXEC_PREFIX@/include
-+INCLUDES = @X_CFLAGS@ 	@TCL_CFLAGS@ 	@TK_CFLAGS@ @TK_DEFS@ 	@TCLINT_INCLUDES@ 	@TKINT_INCLUDES@
++	@TKINT_INCLUDES@
  
  
  LIBS = 
-@@ -205,9 +199,7 @@
- 
+@@ -214,8 +212,8 @@
  libtkspline_la_SOURCES = tkspline.c
  
--libtkspline_la_LIBADD = \
+ libtkspline_la_LIBADD = \
 -	../tkstubs/libtkstubs.la \
 -	../tclstubs/libtclstubs.la 
-+libtkspline_la_LIBADD =  	${TK_STUB_LIB_SPEC} 	${TCL_STUB_LIB_SPEC}
++	${TK_STUB_LIB_SPEC} \
++	${TCL_STUB_LIB_SPEC}
  
  
  CLEANFILES = pkgIndex.tcl
-@@ -227,8 +219,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)
-@@ -244,7 +235,7 @@
- 
- DISTFILES = $(DIST_COMMON) $(SOURCES) $(HEADERS) $(TEXINFOS) $(EXTRA_DIST)
- 
--TAR = gtar
-+TAR = tar
- GZIP_ENV = --best
- SOURCES = $(libtkspline_la_SOURCES)
- OBJECTS = $(libtkspline_la_OBJECTS)
-@@ -485,7 +476,6 @@
- 	      || exit 1; \
- 	  fi; \
- 	done
+@@ -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@
 -
- info-am:
- info: info-recursive
- dvi-am:
+-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
diff --git a/graphics/graphviz/patches/patch-bc b/graphics/graphviz/patches/patch-bc
index dc1797be513..79d5d28f985 100644
--- a/graphics/graphviz/patches/patch-bc
+++ b/graphics/graphviz/patches/patch-bc
@@ -1,8 +1,8 @@
-$NetBSD: patch-bc,v 1.1.1.1 2002/03/05 13:37:29 seb Exp $
+$NetBSD: patch-bc,v 1.2 2002/03/21 08:47:08 seb Exp $
 
---- tkspline/demo/Makefile.in.orig	Fri Mar  1 22:35:43 2002
+--- tkspline/demo/Makefile.in.orig	Fri Mar  8 23:12:26 2002
 +++ tkspline/demo/Makefile.in
-@@ -187,7 +187,7 @@
+@@ -195,7 +195,7 @@
  
  AUTOMAKE_OPTIONS = 1.4
  
@@ -11,12 +11,20 @@ $NetBSD: patch-bc,v 1.1.1.1 2002/03/05 13:37:29 seb Exp $
  demo_SCRIPTS = spline
  demo_DATA = spline.README
  EXTRA_DIST = $(demo_SCRIPTS) $(demo_DATA)
-@@ -203,7 +203,7 @@
+@@ -205,6 +205,7 @@
+ 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:
+@@ -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= \
author	seb <seb@pkgsrc.org>	2002-03-21 08:47:06 +0000
committer	seb <seb@pkgsrc.org>	2002-03-21 08:47:06 +0000
commit	c6fd3e8d8774230744b2e6b00843ced6da0cb2eb (patch)
tree	0432e41b9bb1e567daaa58a9b39984192bdb0203 /graphics/graphviz
parent	c792fdf1e1c1ebcde4216755ab68c68bc5dac2b0 (diff)
download	pkgsrc-c6fd3e8d8774230744b2e6b00843ced6da0cb2eb.tar.gz