Update to graphviz version 2.2

This should take care of PR pkg/28596.

Changes since last packaged version (2.0)
January 19 2005
        - release 2.2
        - fix bugs: 86, 345, 517, 579, 580, 597, 600, 601, 604
        - use the original cpl1.0.txt as the license master, instead of CPL.html
        - fix for bug generating in memory bitmaps that was affecting webdot
        - fixes for windows builds
        - documenttion updates

8 files changed, 50 insertions, 56 deletions

diff --git a/graphics/graphviz/Makefile b/graphics/graphviz/Makefile
index 3bc05a03d94..4c2693c5687 100644
--- a/graphics/graphviz/Makefile
+++ b/graphics/graphviz/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.28 2005/02/23 04:09:51 minskim Exp $
+# $NetBSD: Makefile,v 1.29 2005/03/19 09:13:57 seb Exp $
 #
 
-DISTNAME=	graphviz-2.0
+DISTNAME=	graphviz-2.2
 CATEGORIES=	graphics
 MASTER_SITES=	http://www.graphviz.org/pub/graphviz/ARCHIVE/
 
diff --git a/graphics/graphviz/PLIST b/graphics/graphviz/PLIST
index b5386e1f91a..093b2ba0db1 100644
--- a/graphics/graphviz/PLIST
+++ b/graphics/graphviz/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.10 2004/12/24 18:26:56 seb Exp $
+@comment $NetBSD: PLIST,v 1.11 2005/03/19 09:13:57 seb Exp $
 bin/acyclic
 bin/bcomps
 bin/ccomps
@@ -179,14 +179,13 @@ share/doc/graphviz/AUTHORS
 share/doc/graphviz/COPYING
 share/doc/graphviz/ChangeLog
 share/doc/graphviz/Dot.ref
-share/doc/graphviz/FAQ.txt
 share/doc/graphviz/NEWS
+share/doc/graphviz/cpl1.0.txt
 share/doc/graphviz/latex_suggestions.txt
 share/doc/graphviz/pdf/dotguide.pdf
 share/doc/graphviz/pdf/dottyguide.pdf
 share/doc/graphviz/pdf/leftyguide.pdf
 share/doc/graphviz/pdf/neatoguide.pdf
-share/doc/html/graphviz/CPL.html
 share/doc/html/graphviz/FAQ.html
 share/doc/html/graphviz/Mcircle.gif
 share/doc/html/graphviz/Mdiamond.gif
@@ -250,7 +249,6 @@ share/doc/html/graphviz/aa_tee.gif
 share/doc/html/graphviz/aa_vee.gif
 share/doc/html/graphviz/attrs.html
 share/doc/html/graphviz/back.gif
-share/doc/html/graphviz/binlicense.htm
 share/doc/html/graphviz/both.gif
 share/doc/html/graphviz/box.gif
 share/doc/html/graphviz/build.html
diff --git a/graphics/graphviz/distinfo b/graphics/graphviz/distinfo
index b38463b87df..be07bb6c9e5 100644
--- a/graphics/graphviz/distinfo
+++ b/graphics/graphviz/distinfo
@@ -1,10 +1,10 @@
-$NetBSD: distinfo,v 1.14 2005/02/24 08:45:07 agc Exp $
+$NetBSD: distinfo,v 1.15 2005/03/19 09:13:57 seb Exp $
 
-SHA1 (graphviz-2.0/graphviz-2.0.tar.gz) = f324c9010fedcc97bd65a880d83b645dbe6282ef
-RMD160 (graphviz-2.0/graphviz-2.0.tar.gz) = 128e9d381cc34515864bab2c967dc0d8ac1c55d6
-Size (graphviz-2.0/graphviz-2.0.tar.gz) = 4384874 bytes
+SHA1 (graphviz-2.2/graphviz-2.2.tar.gz) = 2583bdd3ff082bf3a93ad7313b3261bea23a0f90
+RMD160 (graphviz-2.2/graphviz-2.2.tar.gz) = d1f97c236d045a43f8369f2fba3e4167b778eda7
+Size (graphviz-2.2/graphviz-2.2.tar.gz) = 4379295 bytes
 SHA1 (patch-ab) = c04269613e3e7ecefe9492b075d3303a1f125515
-SHA1 (patch-ac) = a03e3427863b64735aeff895e0bd8dcb0e6714e1
+SHA1 (patch-ac) = 6c48703788578a30473ceb079b286cbfeb2974f8
 SHA1 (patch-ad) = 93c24f960bf5bfb405ab2d8751efc1e652cd92a0
 SHA1 (patch-ae) = 9255ba6000a7ebc3483d915ff8468e3a448200f8
 SHA1 (patch-af) = 37d2492fd95256fb7b4031d5013c068c89a27946
@@ -23,8 +23,8 @@ SHA1 (patch-ar) = fc3892b5a70f2e22d45f4af6abab40895384be24
 SHA1 (patch-as) = 5a44b60202f70746efacfc6cf2d6d808f40a0f92
 SHA1 (patch-at) = 31057001f25260b72da8f8617c24627d721cf413
 SHA1 (patch-au) = 1b47f17ba332918378ab72750ca6d5a8fb510555
-SHA1 (patch-av) = b6f3789262b1df0004deba32a960e5aa26373b2d
-SHA1 (patch-aw) = 19bd5db29bde4fdb90d5f42dd86e1cbffee4350e
+SHA1 (patch-av) = 0ff41e9a005f47a52ea223480d635924a78110eb
+SHA1 (patch-aw) = 1510bf7d0675733ec88b7e40d035149213d11175
 SHA1 (patch-ax) = b290d89d881904f804d7a426aaa4510fb7e371bf
 SHA1 (patch-ay) = 7c12461a5429a66c426d868c3115e0f3422f59b9
 SHA1 (patch-az) = 65cc7e6820fcef2a65280c8f2f0f3ea6dfccab7c
@@ -51,8 +51,8 @@ SHA1 (patch-bt) = 301fec1d5c7b6879f71c7f89663ca313834611ff
 SHA1 (patch-bu) = af47727c3a1dd592f5d0b4f006ba7452b8f44da8
 SHA1 (patch-bv) = 7d6dc89a1ee5da5cbefe437cf8ffed62108d276c
 SHA1 (patch-bw) = 1912e141b9ef60be69099c94f9aa4342bcc18d80
-SHA1 (patch-bx) = 00d43b4790b9849a2ee89d93456af22784a9b8b5
-SHA1 (patch-by) = 25306d179e069581ada7ddb6f55607cfb1ab1512
+SHA1 (patch-bx) = 892e92417c3c8fb8e5d8995c7f2f547c98b25e4f
+SHA1 (patch-by) = fb4d9c2caf06709505d53f640becfb00ddac7ded
 SHA1 (patch-bz) = 988f3c93b6eeb2bd0efdf486e18189ec558d3769
 SHA1 (patch-ca) = 3a15d19801a946330a08ad1ffd2da4e95c0feb11
 SHA1 (patch-cb) = 50210dc6f6e0676df267af54422aab240feded78
diff --git a/graphics/graphviz/patches/patch-ac b/graphics/graphviz/patches/patch-ac
index 8c92e593f4c..9e0790ebb2f 100644
--- a/graphics/graphviz/patches/patch-ac
+++ b/graphics/graphviz/patches/patch-ac
@@ -1,25 +1,25 @@
-$NetBSD: patch-ac,v 1.11 2004/12/24 18:26:57 seb Exp $
+$NetBSD: patch-ac,v 1.12 2005/03/19 09:13:57 seb Exp $
 
---- configure.orig	2004-12-24 13:06:51.000000000 +0000
+--- configure.orig	2005-03-18 11:35:11.000000000 +0000
 +++ configure
 @@ -464,7 +464,7 @@ ac_includes_default="\
  # include <unistd.h>
  #endif"
  
--ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix program_transform_name bindir sbindir libexecdir datadir sysconfdir sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS build build_cpu build_vendor build_os host host_cpu host_vendor host_os target target_cpu target_vendor target_os CYGWIN MINGW32 DARWIN INSTALL_PROGRAM INSTALL_SCRIPT INSTALL_DATA CYGPATH_W PACKAGE VERSION ACLOCAL AUTOCONF AUTOMAKE AUTOHEADER MAKEINFO install_sh STRIP ac_ct_STRIP INSTALL_STRIP_PROGRAM mkdir_p AWK SET_MAKE am__leading_dot AMTAR am__tar am__untar BUILDDATE CC CFLAGS LDFLAGS CPPFLAGS ac_ct_CC EXEEXT OBJEXT DEPDIR am__include am__quote AMDEP_TRUE AMDEP_FALSE AMDEPBACKSLASH CCDEPMODE am__fastdepCC_TRUE am__fastdepCC_FALSE CXX CXXFLAGS ac_ct_CXX CXXDEPMODE am__fastdepCXX_TRUE am__fastdepCXX_FALSE LEX LEXLIB LEX_OUTPUT_ROOT YACC EGREP LN_S ECHO AR ac_ct_AR RANLIB ac_ct_RANLIB CPP CXXCPP F77 FFLAGS ac_ct_F77 LIBTOOL SED SORT KSH TOP_DIR BUILD_DIR ENABLE_DYNAGRAPH_TRUE ENABLE_DYNAGRAPH_FALSE ENABLE_GVRENDER_TRUE ENABLE_GVRENDER_FALSE ENABLE_CODEGENS_TRUE ENABLE_CODEGENS_FALSE TCLSH TCL_INCLUDES HAVE_TCL WITH_TCL_TRUE WITH_TCL_FALSE TCL_PKGINDEX TCL_VERSION TCL_MAJOR_VERSION TCL_MINOR_VERSION TCL_PATCH_LEVEL TCL_CFLAGS TCL_DEFS TCL_SHLIB_SUFFIX TCL_SRC_DIR TCL_STUB_LIB_SPEC WISH TK_INCLUDES HAVE_TK WITH_TK_TRUE WITH_TK_FALSE TK_PKGINDEX TK_VERSION TK_MAJOR_VERSION TK_MINOR_VERSION TK_PATCH_LEVEL TK_DEFS TK_XINCLUDES TK_SRC_DIR TK_CFLAGS TK_STUB_LIB_SPEC MATH_LIBS SOCKET_LIBS X_CFLAGS X_PRE_LIBS X_LIBS X_EXTRA_LIBS WITH_X_TRUE WITH_X_FALSE EXPAT_CONFIG EXPAT_INCLUDES EXPAT_LIBS XPM_INCLUDES XPM_LIBS XAW_INCLUDES XAW_LIBS Z_INCLUDES Z_LIBS GDLIB_CONFIG GD_INCLUDES GD_LIBS WITH_MYLIBGD_TRUE WITH_MYLIBGD_FALSE LIBICONV LTLIBICONV ICONV_INCLUDES ICONV_LIBS FREETYPE_CONFIG FT_INCLUDES FT_LIBS FONTCONFIG_CONFIG FC_INCLUDES FC_LIBS LIBPNG_CONFIG PNG_INCLUDES PNG_LIBS JPEG_INCLUDES JPEG_LIBS PKG_CONFIG LIBSVG_CAIRO_CFLAGS LIBSVG_CAIRO_LIBS ALLOCA LIBOBJS TCLINT_INCLUDES TKINT_INCLUDES LTLIBOBJS'
-+ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix program_transform_name bindir sbindir libexecdir datadir sysconfdir sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS build build_cpu build_vendor build_os host host_cpu host_vendor host_os target target_cpu target_vendor target_os CYGWIN MINGW32 DARWIN INSTALL_PROGRAM INSTALL_SCRIPT INSTALL_DATA CYGPATH_W PACKAGE VERSION ACLOCAL AUTOCONF AUTOMAKE AUTOHEADER MAKEINFO install_sh STRIP ac_ct_STRIP INSTALL_STRIP_PROGRAM mkdir_p AWK SET_MAKE am__leading_dot AMTAR am__tar am__untar BUILDDATE CC CFLAGS LDFLAGS CPPFLAGS ac_ct_CC EXEEXT OBJEXT DEPDIR am__include am__quote AMDEP_TRUE AMDEP_FALSE AMDEPBACKSLASH CCDEPMODE am__fastdepCC_TRUE am__fastdepCC_FALSE CXX CXXFLAGS ac_ct_CXX CXXDEPMODE am__fastdepCXX_TRUE am__fastdepCXX_FALSE LEX LEXLIB LEX_OUTPUT_ROOT YACC EGREP LN_S ECHO AR ac_ct_AR RANLIB ac_ct_RANLIB CPP CXXCPP F77 FFLAGS ac_ct_F77 LIBTOOL SED SORT KSH TOP_DIR BUILD_DIR ENABLE_DYNAGRAPH_TRUE ENABLE_DYNAGRAPH_FALSE ENABLE_GVRENDER_TRUE ENABLE_GVRENDER_FALSE ENABLE_CODEGENS_TRUE ENABLE_CODEGENS_FALSE TCL_INCLUDES HAVE_TCL WITH_TCL_TRUE WITH_TCL_FALSE TCL_PKGINDEX TCL_VERSION TCL_MAJOR_VERSION TCL_MINOR_VERSION TCL_PATCH_LEVEL TCL_CFLAGS TCL_DEFS TCL_SHLIB_SUFFIX TCL_SRC_DIR TCL_STUB_LIB_SPEC TK_INCLUDES HAVE_TK WITH_TK_TRUE WITH_TK_FALSE TK_PKGINDEX TK_VERSION TK_MAJOR_VERSION TK_MINOR_VERSION TK_PATCH_LEVEL TK_DEFS TK_XINCLUDES TK_SRC_DIR TK_CFLAGS TK_STUB_LIB_SPEC MATH_LIBS SOCKET_LIBS X_CFLAGS X_PRE_LIBS X_LIBS X_EXTRA_LIBS WITH_X_TRUE WITH_X_FALSE EXPAT_CONFIG EXPAT_INCLUDES EXPAT_LIBS XPM_INCLUDES XPM_LIBS XAW_INCLUDES XAW_LIBS Z_INCLUDES Z_LIBS GDLIB_CONFIG GD_INCLUDES GD_LIBS WITH_MYLIBGD_TRUE WITH_MYLIBGD_FALSE LIBICONV LTLIBICONV ICONV_INCLUDES ICONV_LIBS FREETYPE_CONFIG FT_INCLUDES FT_LIBS FONTCONFIG_CONFIG FC_INCLUDES FC_LIBS LIBPNG_CONFIG PNG_INCLUDES PNG_LIBS JPEG_INCLUDES JPEG_LIBS PKG_CONFIG LIBSVG_CAIRO_CFLAGS LIBSVG_CAIRO_LIBS ALLOCA LIBOBJS TCLINT_INCLUDES TKINT_INCLUDES LTLIBOBJS'
+-ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix program_transform_name bindir sbindir libexecdir datadir sysconfdir sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS build build_cpu build_vendor build_os host host_cpu host_vendor host_os target target_cpu target_vendor target_os CYGWIN MINGW32 DARWIN INSTALL_PROGRAM INSTALL_SCRIPT INSTALL_DATA CYGPATH_W PACKAGE VERSION ACLOCAL AUTOCONF AUTOMAKE AUTOHEADER MAKEINFO install_sh STRIP ac_ct_STRIP INSTALL_STRIP_PROGRAM mkdir_p AWK SET_MAKE am__leading_dot AMTAR am__tar am__untar BUILDDATE CC CFLAGS LDFLAGS CPPFLAGS ac_ct_CC EXEEXT OBJEXT DEPDIR am__include am__quote AMDEP_TRUE AMDEP_FALSE AMDEPBACKSLASH CCDEPMODE am__fastdepCC_TRUE am__fastdepCC_FALSE CXX CXXFLAGS ac_ct_CXX CXXDEPMODE am__fastdepCXX_TRUE am__fastdepCXX_FALSE LEX LEXLIB LEX_OUTPUT_ROOT YACC EGREP LN_S ECHO AR ac_ct_AR RANLIB ac_ct_RANLIB CPP CXXCPP F77 FFLAGS ac_ct_F77 LIBTOOL SED SORT KSH TOP_DIR BUILD_DIR ENABLE_DYNAGRAPH_TRUE ENABLE_DYNAGRAPH_FALSE ENABLE_GVRENDER_TRUE ENABLE_GVRENDER_FALSE ENABLE_CODEGENS_TRUE ENABLE_CODEGENS_FALSE X_CFLAGS X_PRE_LIBS X_LIBS X_EXTRA_LIBS WITH_X_TRUE WITH_X_FALSE TCLSH TCL_INCLUDES HAVE_TCL WITH_TCL_TRUE WITH_TCL_FALSE TCL_PKGINDEX TCL_VERSION TCL_MAJOR_VERSION TCL_MINOR_VERSION TCL_PATCH_LEVEL TCL_CFLAGS TCL_DEFS TCL_SHLIB_SUFFIX TCL_SRC_DIR TCL_STUB_LIB_SPEC WISH TK_INCLUDES HAVE_TK WITH_TK_TRUE WITH_TK_FALSE TK_PKGINDEX TK_VERSION TK_MAJOR_VERSION TK_MINOR_VERSION TK_PATCH_LEVEL TK_DEFS TK_XINCLUDES TK_SRC_DIR TK_CFLAGS TK_STUB_LIB_SPEC MATH_LIBS SOCKET_LIBS EXPAT_CONFIG EXPAT_INCLUDES EXPAT_LIBS XPM_INCLUDES XPM_LIBS XAW_INCLUDES XAW_LIBS Z_INCLUDES Z_LIBS GDLIB_CONFIG GD_INCLUDES GD_LIBS WITH_MYLIBGD_TRUE WITH_MYLIBGD_FALSE LIBICONV LTLIBICONV ICONV_INCLUDES ICONV_LIBS FREETYPE_CONFIG FT_INCLUDES FT_LIBS FONTCONFIG_CONFIG FC_INCLUDES FC_LIBS LIBPNG_CONFIG PNG_INCLUDES PNG_LIBS JPEG_INCLUDES JPEG_LIBS PKG_CONFIG LIBSVG_CAIRO_CFLAGS LIBSVG_CAIRO_LIBS ALLOCA LIBOBJS TCLINT_INCLUDES TKINT_INCLUDES LTLIBOBJS'
++ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix program_transform_name bindir sbindir libexecdir datadir sysconfdir sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS build build_cpu build_vendor build_os host host_cpu host_vendor host_os target target_cpu target_vendor target_os CYGWIN MINGW32 DARWIN INSTALL_PROGRAM INSTALL_SCRIPT INSTALL_DATA CYGPATH_W PACKAGE VERSION ACLOCAL AUTOCONF AUTOMAKE AUTOHEADER MAKEINFO install_sh STRIP ac_ct_STRIP INSTALL_STRIP_PROGRAM mkdir_p AWK SET_MAKE am__leading_dot AMTAR am__tar am__untar BUILDDATE CC CFLAGS LDFLAGS CPPFLAGS ac_ct_CC EXEEXT OBJEXT DEPDIR am__include am__quote AMDEP_TRUE AMDEP_FALSE AMDEPBACKSLASH CCDEPMODE am__fastdepCC_TRUE am__fastdepCC_FALSE CXX CXXFLAGS ac_ct_CXX CXXDEPMODE am__fastdepCXX_TRUE am__fastdepCXX_FALSE LEX LEXLIB LEX_OUTPUT_ROOT YACC EGREP LN_S ECHO AR ac_ct_AR RANLIB ac_ct_RANLIB CPP CXXCPP F77 FFLAGS ac_ct_F77 LIBTOOL SED SORT KSH TOP_DIR BUILD_DIR ENABLE_DYNAGRAPH_TRUE ENABLE_DYNAGRAPH_FALSE ENABLE_GVRENDER_TRUE ENABLE_GVRENDER_FALSE ENABLE_CODEGENS_TRUE ENABLE_CODEGENS_FALSE X_CFLAGS X_PRE_LIBS X_LIBS X_EXTRA_LIBS WITH_X_TRUE WITH_X_FALSE TCL_INCLUDES HAVE_TCL WITH_TCL_TRUE WITH_TCL_FALSE TCL_PKGINDEX TCL_VERSION TCL_MAJOR_VERSION TCL_MINOR_VERSION TCL_PATCH_LEVEL TCL_CFLAGS TCL_DEFS TCL_SHLIB_SUFFIX TCL_SRC_DIR TCL_STUB_LIB_SPEC TK_INCLUDES HAVE_TK WITH_TK_TRUE WITH_TK_FALSE TK_PKGINDEX TK_VERSION TK_MAJOR_VERSION TK_MINOR_VERSION TK_PATCH_LEVEL TK_DEFS TK_XINCLUDES TK_SRC_DIR TK_CFLAGS TK_STUB_LIB_SPEC MATH_LIBS SOCKET_LIBS EXPAT_CONFIG EXPAT_INCLUDES EXPAT_LIBS XPM_INCLUDES XPM_LIBS XAW_INCLUDES XAW_LIBS Z_INCLUDES Z_LIBS GDLIB_CONFIG GD_INCLUDES GD_LIBS WITH_MYLIBGD_TRUE WITH_MYLIBGD_FALSE LIBICONV LTLIBICONV ICONV_INCLUDES ICONV_LIBS FREETYPE_CONFIG FT_INCLUDES FT_LIBS FONTCONFIG_CONFIG FC_INCLUDES FC_LIBS LIBPNG_CONFIG PNG_INCLUDES PNG_LIBS JPEG_INCLUDES JPEG_LIBS PKG_CONFIG LIBSVG_CAIRO_CFLAGS LIBSVG_CAIRO_LIBS ALLOCA LIBOBJS TCLINT_INCLUDES TKINT_INCLUDES LTLIBOBJS'
  ac_subst_files=''
  
  # Initialize some variables set by options.
-@@ -1054,8 +1054,6 @@ Optional Packages:
-   --with-tags[=TAGS]
+@@ -1055,8 +1055,6 @@ Optional Packages:
                            include additional configurations [automatic]
    --with-efence           use efence for debugging memory use
+   --with-x                use the X Window System
 -  --with-tclsh=PROG       build graphviz for specific tclsh
 -  --with-wish=PROG        build graphviz for specific wish
    --with-extraincludedir=DIR use extra includes from DIR
    --with-extralibdir=DIR  use extra libraries from DIR
-   --with-x                use the X Window System
+   --with-expatincludedir=DIR use EXPAT includes from DIR
 @@ -1687,7 +1685,10 @@ case "${target_os}" in
  	PATHSEPARATOR=":"
  	;;
@@ -32,7 +32,7 @@ $NetBSD: patch-ac,v 1.11 2004/12/24 18:26:57 seb Exp $
  	PATHSEPARATOR=":"
  	;;
  esac
-@@ -20356,165 +20357,9 @@ fi
+@@ -21761,165 +21762,9 @@ fi
  # start by assuming we have it
  HAVE_TCL=1
  
@@ -200,7 +200,7 @@ $NetBSD: patch-ac,v 1.11 2004/12/24 18:26:57 seb Exp $
      if test "${ac_cv_header_tcl_h+set}" = set; then
    echo "$as_me:$LINENO: checking for tcl.h" >&5
  echo $ECHO_N "checking for tcl.h... $ECHO_C" >&6
-@@ -20662,34 +20507,6 @@ echo "$as_me: WARNING: Unable to find he
+@@ -22067,34 +21912,6 @@ echo "$as_me: WARNING: Unable to find he
  fi
  
  
@@ -235,7 +235,7 @@ $NetBSD: patch-ac,v 1.11 2004/12/24 18:26:57 seb Exp $
  
  if test "$HAVE_TCL" = "1"; then
      # TCL STUBS support is required
-@@ -20782,168 +20599,9 @@ fi
+@@ -22187,168 +22004,9 @@ fi
  
  HAVE_TK=$HAVE_TCL
  
@@ -406,7 +406,7 @@ $NetBSD: patch-ac,v 1.11 2004/12/24 18:26:57 seb Exp $
      if test "${ac_cv_header_tk_h+set}" = set; then
    echo "$as_me:$LINENO: checking for tk.h" >&5
  echo $ECHO_N "checking for tk.h... $ECHO_C" >&6
-@@ -21091,35 +20749,6 @@ echo "$as_me: WARNING: Unable to find he
+@@ -22496,35 +22154,6 @@ echo "$as_me: WARNING: Unable to find he
  fi
  
  
@@ -481,15 +481,15 @@ $NetBSD: patch-ac,v 1.11 2004/12/24 18:26:57 seb Exp $
  
  
  # -----------------------------------
-@@ -29434,7 +29039,6 @@ s,@ENABLE_GVRENDER_TRUE@,$ENABLE_GVRENDE
- s,@ENABLE_GVRENDER_FALSE@,$ENABLE_GVRENDER_FALSE,;t t
- s,@ENABLE_CODEGENS_TRUE@,$ENABLE_CODEGENS_TRUE,;t t
- s,@ENABLE_CODEGENS_FALSE@,$ENABLE_CODEGENS_FALSE,;t t
+@@ -29440,7 +29045,6 @@ s,@X_LIBS@,$X_LIBS,;t t
+ s,@X_EXTRA_LIBS@,$X_EXTRA_LIBS,;t t
+ s,@WITH_X_TRUE@,$WITH_X_TRUE,;t t
+ s,@WITH_X_FALSE@,$WITH_X_FALSE,;t t
 -s,@TCLSH@,$TCLSH,;t t
  s,@TCL_INCLUDES@,$TCL_INCLUDES,;t t
  s,@HAVE_TCL@,$HAVE_TCL,;t t
  s,@WITH_TCL_TRUE@,$WITH_TCL_TRUE,;t t
-@@ -29449,7 +29053,6 @@ s,@TCL_DEFS@,$TCL_DEFS,;t t
+@@ -29455,7 +29059,6 @@ s,@TCL_DEFS@,$TCL_DEFS,;t t
  s,@TCL_SHLIB_SUFFIX@,$TCL_SHLIB_SUFFIX,;t t
  s,@TCL_SRC_DIR@,$TCL_SRC_DIR,;t t
  s,@TCL_STUB_LIB_SPEC@,$TCL_STUB_LIB_SPEC,;t t
diff --git a/graphics/graphviz/patches/patch-av b/graphics/graphviz/patches/patch-av
index 2dd7a4bca3c..b2a31d631e6 100644
--- a/graphics/graphviz/patches/patch-av
+++ b/graphics/graphviz/patches/patch-av
@@ -1,9 +1,9 @@
-$NetBSD: patch-av,v 1.4 2004/11/29 22:11:51 seb Exp $
+$NetBSD: patch-av,v 1.5 2005/03/19 09:13:57 seb Exp $
 
---- doc/Makefile.am.orig	2004-09-14 18:10:11.000000000 +0000
+--- doc/Makefile.am.orig	2005-01-19 03:09:20.000000000 +0000
 +++ doc/Makefile.am
 @@ -7,9 +7,9 @@ pdf = dotguide.pdf dottyguide.pdf leftyg
- html = build.html FAQ.html binlicense.htm
+ html = build.html FAQ.html index.html
  txt = Dot.ref latex_suggestions.txt
  
 -pdfdir = $(pkgdatadir)/doc/pdf
diff --git a/graphics/graphviz/patches/patch-aw b/graphics/graphviz/patches/patch-aw
index 74c0f2bd178..372833d93a4 100644
--- a/graphics/graphviz/patches/patch-aw
+++ b/graphics/graphviz/patches/patch-aw
@@ -1,8 +1,8 @@
-$NetBSD: patch-aw,v 1.7 2004/11/29 22:11:51 seb Exp $
+$NetBSD: patch-aw,v 1.8 2005/03/19 09:13:57 seb Exp $
 
---- doc/Makefile.in.orig	2004-09-14 22:13:00.000000000 +0000
+--- doc/Makefile.in.orig	2005-03-18 11:36:02.000000000 +0000
 +++ doc/Makefile.in
-@@ -169,7 +169,6 @@ SOCKET_LIBS = @SOCKET_LIBS@
+@@ -171,7 +171,6 @@ SOCKET_LIBS = @SOCKET_LIBS@
  SORT = @SORT@
  STRIP = @STRIP@
  TCLINT_INCLUDES = @TCLINT_INCLUDES@
@@ -10,7 +10,7 @@ $NetBSD: patch-aw,v 1.7 2004/11/29 22:11:51 seb Exp $
  TCL_CFLAGS = @TCL_CFLAGS@
  TCL_DEFS = @TCL_DEFS@
  TCL_INCLUDES = @TCL_INCLUDES@
-@@ -195,7 +194,6 @@ TK_VERSION = @TK_VERSION@
+@@ -197,7 +196,6 @@ TK_VERSION = @TK_VERSION@
  TK_XINCLUDES = @TK_XINCLUDES@
  TOP_DIR = @TOP_DIR@
  VERSION = @VERSION@
@@ -18,9 +18,9 @@ $NetBSD: patch-aw,v 1.7 2004/11/29 22:11:51 seb Exp $
  WITH_MYLIBGD_FALSE = @WITH_MYLIBGD_FALSE@
  WITH_MYLIBGD_TRUE = @WITH_MYLIBGD_TRUE@
  WITH_TCL_FALSE = @WITH_TCL_FALSE@
-@@ -268,9 +266,9 @@ SUBDIRS = info
+@@ -270,9 +268,9 @@ SUBDIRS = info
  pdf = dotguide.pdf dottyguide.pdf leftyguide.pdf neatoguide.pdf
- html = build.html FAQ.html binlicense.htm
+ html = build.html FAQ.html index.html
  txt = Dot.ref latex_suggestions.txt
 -pdfdir = $(pkgdatadir)/doc/pdf
 -htmldir = $(pkgdatadir)/doc/html
diff --git a/graphics/graphviz/patches/patch-bx b/graphics/graphviz/patches/patch-bx
index 43f6d19461f..e5fa2e862c9 100644
--- a/graphics/graphviz/patches/patch-bx
+++ b/graphics/graphviz/patches/patch-bx
@@ -1,15 +1,13 @@
-$NetBSD: patch-bx,v 1.2 2004/12/24 18:26:57 seb Exp $
+$NetBSD: patch-bx,v 1.3 2005/03/19 09:13:57 seb Exp $
 
---- Makefile.am.orig	2004-12-11 19:26:04.000000000 +0000
+--- Makefile.am.orig	2005-01-19 03:09:19.000000000 +0000
 +++ Makefile.am
-@@ -5,8 +5,8 @@ ACLOCAL_AMFLAGS = -I m4
+@@ -5,7 +5,7 @@ ACLOCAL_AMFLAGS = -I m4
  pkgindexdir = $(libdir)/@PACKAGE@
  pkgindex_DATA = pkgIndex.tcl
  
 -txtdir = $(pkgdatadir)/doc
--htmldir = $(pkgdatadir)/doc/html
 +txtdir = $(prefix)/share/doc/graphviz
-+htmldir = $(prefix)/share/doc/html/graphviz
  
- txt = AUTHORS COPYING ChangeLog NEWS FAQ.txt
- html = CPL.html
+ txt = AUTHORS COPYING ChangeLog NEWS cpl1.0.txt
+ 
diff --git a/graphics/graphviz/patches/patch-by b/graphics/graphviz/patches/patch-by
index 86cf4f666b4..9512d557032 100644
--- a/graphics/graphviz/patches/patch-by
+++ b/graphics/graphviz/patches/patch-by
@@ -1,6 +1,6 @@
-$NetBSD: patch-by,v 1.2 2004/12/24 18:26:57 seb Exp $
+$NetBSD: patch-by,v 1.3 2005/03/19 09:13:57 seb Exp $
 
---- Makefile.in.orig	2004-12-24 13:13:35.000000000 +0000
+--- Makefile.in.orig	2005-03-18 11:36:51.000000000 +0000
 +++ Makefile.in
 @@ -41,9 +41,9 @@ DIST_COMMON = README $(am__configure_dep
  	$(srcdir)/Makefile.in $(srcdir)/ast_common.h.in \
@@ -15,7 +15,7 @@ $NetBSD: patch-by,v 1.2 2004/12/24 18:26:57 seb Exp $
  subdir = .
  ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
  am__aclocal_m4_deps = $(top_srcdir)/m4/iconv.m4 \
-@@ -189,7 +189,6 @@ SOCKET_LIBS = @SOCKET_LIBS@
+@@ -187,7 +187,6 @@ SOCKET_LIBS = @SOCKET_LIBS@
  SORT = @SORT@
  STRIP = @STRIP@
  TCLINT_INCLUDES = @TCLINT_INCLUDES@
@@ -23,7 +23,7 @@ $NetBSD: patch-by,v 1.2 2004/12/24 18:26:57 seb Exp $
  TCL_CFLAGS = @TCL_CFLAGS@
  TCL_DEFS = @TCL_DEFS@
  TCL_INCLUDES = @TCL_INCLUDES@
-@@ -215,7 +214,6 @@ TK_VERSION = @TK_VERSION@
+@@ -213,7 +212,6 @@ TK_VERSION = @TK_VERSION@
  TK_XINCLUDES = @TK_XINCLUDES@
  TOP_DIR = @TOP_DIR@
  VERSION = @VERSION@
@@ -31,14 +31,12 @@ $NetBSD: patch-by,v 1.2 2004/12/24 18:26:57 seb Exp $
  WITH_MYLIBGD_FALSE = @WITH_MYLIBGD_FALSE@
  WITH_MYLIBGD_TRUE = @WITH_MYLIBGD_TRUE@
  WITH_TCL_FALSE = @WITH_TCL_FALSE@
-@@ -285,8 +283,8 @@ target_vendor = @target_vendor@
+@@ -283,7 +281,7 @@ target_vendor = @target_vendor@
  ACLOCAL_AMFLAGS = -I m4
  pkgindexdir = $(libdir)/@PACKAGE@
  pkgindex_DATA = pkgIndex.tcl
 -txtdir = $(pkgdatadir)/doc
--htmldir = $(pkgdatadir)/doc/html
 +txtdir = $(prefix)/share/doc/graphviz
-+htmldir = $(prefix)/share/doc/html/graphviz
- txt = AUTHORS COPYING ChangeLog NEWS FAQ.txt
- html = CPL.html
+ txt = AUTHORS COPYING ChangeLog NEWS cpl1.0.txt
  txt_DATA = $(txt)
+ SUBDIRS = cdt agraph agutil doc pathplan graph gd dotneato \