Update to version 2.0.

Package changes: - use GD library from the graphics/gd package Changes since last packaged version (1.16): December 11, 2004 - release 2.0 - new CPL license - re indent all sources December 11, 2004 - release 1.18 dotneato - fix bugs: 451, 536, 545, 547, 548, 559, 561, 565, 572 - increase max size of HTML tables. - spline cluster edges in fdp - center userimages in nodes - support user images in HTML table cells - syntax extension for node:port:compass as well as node:compass - FreeBSD fixes - sync with gd-2.0.32 - attempt to catch some out-of-memory conditions with very large graphs - support background and node-fill partial transparency when truecolor=true
2004-12-24 18:26:56 +00:00 · 2004-12-24 18:26:56 +00:00 · 20ea5d562e
commit 20ea5d562e
parent ce7693c0ce
15 changed files with 261 additions and 231 deletions
--- a/graphics/graphviz/MESSAGE
+++ b/graphics/graphviz/MESSAGE
@ -1,9 +1,8 @@
 ===========================================================================
-$NetBSD: MESSAGE,v 1.2 2002/09/24 12:30:06 wiz Exp $
+$NetBSD: MESSAGE,v 1.3 2004/12/24 18:26:56 seb Exp $

 Please read graphviz license terms in:

-${PREFIX}/share/doc/graphviz/MINTERMS.txt
 ${PREFIX}/share/doc/graphviz/COPYING

 ===========================================================================
--- a/graphics/graphviz/Makefile
+++ b/graphics/graphviz/Makefile
@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.26 2004/12/03 11:42:57 seb Exp $
+# $NetBSD: Makefile,v 1.27 2004/12/24 18:26:56 seb Exp $
 #

-DISTNAME=	graphviz-1.16
+DISTNAME=	graphviz-2.0
 CATEGORIES=	graphics
 MASTER_SITES=	http://www.graphviz.org/pub/graphviz/ARCHIVE/

@ -23,7 +23,6 @@ PKGCONFIG_OVERRIDE_STAGE=	post-build

 .include "../../mk/bsd.prefs.mk"

-CONFIGURE_ARGS+=	--with-mylibgd
 CONFIGURE_ENV+=		TCLCONFIG=${TCLCONFIG_SH}
 CONFIGURE_ENV+=		TKCONFIG=${TKCONFIG_SH}
 CONFIGURE_ENV+=		X11PREFIX=${X11PREFIX} X11BASE=${X11BASE}
@ -40,10 +39,12 @@ post-extract:
 pre-build:
 	${TOUCH} ${WRKSRC}/Makefile

+.include "../../devel/gettext-lib/buildlink3.mk"
 .include "../../devel/pkgconfig/buildlink3.mk"
 .include "../../devel/zlib/buildlink3.mk"
 .include "../../fonts/fontconfig/buildlink3.mk"
 .include "../../graphics/freetype2/buildlink3.mk"
+.include "../../graphics/gd/buildlink3.mk"
 .include "../../graphics/jpeg/buildlink3.mk"
 .include "../../graphics/png/buildlink3.mk"
 .include "../../graphics/png/buildlink3.mk"
--- a/graphics/graphviz/PLIST
+++ b/graphics/graphviz/PLIST
@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.9 2004/11/29 22:11:51 seb Exp $
+@comment $NetBSD: PLIST,v 1.10 2004/12/24 18:26:56 seb Exp $
 bin/acyclic
 bin/bcomps
 bin/ccomps
@ -41,6 +41,7 @@ include/graphviz/circo.h
 include/graphviz/circpos.h
 include/graphviz/circular.h
 include/graphviz/closest.h
+include/graphviz/clusteredges.h
 include/graphviz/colortbl.h
 include/graphviz/comp.h
 include/graphviz/conjgrad.h
@ -56,21 +57,10 @@ include/graphviz/dthdr.h
 include/graphviz/edgelist.h
 include/graphviz/edges.h
 include/graphviz/embed_graph.h
-include/graphviz/entities.h
 include/graphviz/exgram.h
 include/graphviz/exlib.h
 include/graphviz/expr.h
 include/graphviz/fdp.h
-include/graphviz/gd.h
-include/graphviz/gd_io.h
-include/graphviz/gdcache.h
-include/graphviz/gdfontg.h
-include/graphviz/gdfontl.h
-include/graphviz/gdfontmb.h
-include/graphviz/gdfonts.h
-include/graphviz/gdfontt.h
-include/graphviz/gdfx.h
-include/graphviz/gdhelpers.h
 include/graphviz/geometry.h
 include/graphviz/globals.h
 include/graphviz/grammar.h
@ -84,7 +74,6 @@ include/graphviz/hedges.h
 include/graphviz/htmllex.h
 include/graphviz/htmltable.h
 include/graphviz/info.h
-include/graphviz/jisx0208.h
 include/graphviz/kkutils.h
 include/graphviz/libgraph.h
 include/graphviz/macros.h
@ -120,7 +109,6 @@ include/graphviz/vis.h
 include/graphviz/vispath.h
 include/graphviz/vmstub.h
 include/graphviz/voronoi.h
-include/graphviz/wbmp.h
 include/graphviz/xlayout.h
 lib/graphviz/libagraph.la
 lib/graphviz/libcdt.la
@ -132,7 +120,6 @@ lib/graphviz/libexpr.la
 lib/graphviz/libfdpgen.la
 lib/graphviz/libgdtclft.la
 lib/graphviz/libgraph.la
-lib/graphviz/libgvgd.la
 lib/graphviz/libgvrender.la
 lib/graphviz/libneatogen.la
 lib/graphviz/libpack.la
@ -193,15 +180,14 @@ share/doc/graphviz/COPYING
 share/doc/graphviz/ChangeLog
 share/doc/graphviz/Dot.ref
 share/doc/graphviz/FAQ.txt
-share/doc/graphviz/MINTERMS.txt
 share/doc/graphviz/NEWS
 share/doc/graphviz/latex_suggestions.txt
 share/doc/graphviz/pdf/dotguide.pdf
 share/doc/graphviz/pdf/dottyguide.pdf
 share/doc/graphviz/pdf/leftyguide.pdf
 share/doc/graphviz/pdf/neatoguide.pdf
+share/doc/html/graphviz/CPL.html
 share/doc/html/graphviz/FAQ.html
-share/doc/html/graphviz/LICENSE.html
 share/doc/html/graphviz/Mcircle.gif
 share/doc/html/graphviz/Mdiamond.gif
 share/doc/html/graphviz/Msquare.gif
--- a/graphics/graphviz/distinfo
+++ b/graphics/graphviz/distinfo
@ -1,10 +1,9 @@
-$NetBSD: distinfo,v 1.12 2004/11/29 22:11:51 seb Exp $
+$NetBSD: distinfo,v 1.13 2004/12/24 18:26:56 seb Exp $

-SHA1 (graphviz-1.16/graphviz-1.16.tar.gz) = f613884100c62fb409ec5a2571df46d9caafe5e0
-Size (graphviz-1.16/graphviz-1.16.tar.gz) = 4387670 bytes
-SHA1 (patch-aa) = 65d3092648d74ec2cbd4c4c685ae97048d6b8369
-SHA1 (patch-ab) = a0f006b1dfe0869a1faca7ff1152154bd39a62c1
-SHA1 (patch-ac) = 3322fce515598b9fddd6b87c84bb1973e15d37e4
+SHA1 (graphviz-2.0/graphviz-2.0.tar.gz) = f324c9010fedcc97bd65a880d83b645dbe6282ef
+Size (graphviz-2.0/graphviz-2.0.tar.gz) = 4384874 bytes
+SHA1 (patch-ab) = c04269613e3e7ecefe9492b075d3303a1f125515
+SHA1 (patch-ac) = a03e3427863b64735aeff895e0bd8dcb0e6714e1
 SHA1 (patch-ad) = 93c24f960bf5bfb405ab2d8751efc1e652cd92a0
 SHA1 (patch-ae) = 9255ba6000a7ebc3483d915ff8468e3a448200f8
 SHA1 (patch-af) = 37d2492fd95256fb7b4031d5013c068c89a27946
@ -19,8 +18,8 @@ SHA1 (patch-an) = 3b2f9afeb799c732c80d57526a82e52da70639f1
 SHA1 (patch-ao) = e165189a3e9c8e83a0fbb1c614b1e230f9919793
 SHA1 (patch-ap) = 157a1185fcfcc9376e08ec6392050d67890ade58
 SHA1 (patch-aq) = 1cb76e7209e080a934da091921061eddb704dd1a
-SHA1 (patch-ar) = 7c8ac4768071cbc4554da3f27ca4bcc8538229ab
-SHA1 (patch-as) = 05b2f1721ed181b0f12daf32700c96c74e00658f
+SHA1 (patch-ar) = fc3892b5a70f2e22d45f4af6abab40895384be24
+SHA1 (patch-as) = 5a44b60202f70746efacfc6cf2d6d808f40a0f92
 SHA1 (patch-at) = 31057001f25260b72da8f8617c24627d721cf413
 SHA1 (patch-au) = 1b47f17ba332918378ab72750ca6d5a8fb510555
 SHA1 (patch-av) = b6f3789262b1df0004deba32a960e5aa26373b2d
@ -49,12 +48,12 @@ SHA1 (patch-br) = f417a5545b1e019f8c769b22ffcd79091030fb67
 SHA1 (patch-bs) = f9e0a38cb1113129ccf801bfb3347adb3827686a
 SHA1 (patch-bt) = 301fec1d5c7b6879f71c7f89663ca313834611ff
 SHA1 (patch-bu) = af47727c3a1dd592f5d0b4f006ba7452b8f44da8
-SHA1 (patch-bv) = 69d8265ae78b376faf6c500960e0c2a823ce9ee0
-SHA1 (patch-bw) = 20eaaa7c849db653f7486e7ac9626455a0704ce4
-SHA1 (patch-bx) = 8f59d965eab1671ec238ed33f81734a6ef22c6ed
-SHA1 (patch-by) = d0dc92ad3680e2c6845c8600281da5e4d3a1f365
-SHA1 (patch-bz) = ca697013c8c3b95990d2c99b256646287e199bdd
-SHA1 (patch-ca) = b6bcf483ee384bd8a51383a49dda8b61a437bdb6
+SHA1 (patch-bv) = 7d6dc89a1ee5da5cbefe437cf8ffed62108d276c
+SHA1 (patch-bw) = 1912e141b9ef60be69099c94f9aa4342bcc18d80
+SHA1 (patch-bx) = 00d43b4790b9849a2ee89d93456af22784a9b8b5
+SHA1 (patch-by) = 25306d179e069581ada7ddb6f55607cfb1ab1512
+SHA1 (patch-bz) = 988f3c93b6eeb2bd0efdf486e18189ec558d3769
+SHA1 (patch-ca) = 3a15d19801a946330a08ad1ffd2da4e95c0feb11
 SHA1 (patch-cb) = 50210dc6f6e0676df267af54422aab240feded78
 SHA1 (patch-cc) = ee35c991c06e09ec21b83fbf3d9ecdb8fdfaaf8f
 SHA1 (patch-cd) = d1ea0b21b4fc6806c7437becc608644436424306
--- a/graphics/graphviz/patches/patch-aa
+++ b/graphics/graphviz/patches/patch-aa
@ -1,13 +0,0 @@
-$NetBSD: patch-aa,v 1.3 2004/11/29 22:11:51 seb Exp $
-
--- MINTERMS.txt.orig	2002-04-16 20:37:02.000000000 +0000
-+++ MINTERMS.txt
-@@ -2,7 +2,7 @@
- Appendix A - Minimum Terms
- --------------------------
- 
-LICENSOR: ______________
-+LICENSOR: The NetBSD Project
- 
- LICENSE AGREEMENT
- 
--- a/graphics/graphviz/patches/patch-ab
+++ b/graphics/graphviz/patches/patch-ab
@ -1,8 +1,8 @@
-$NetBSD: patch-ab,v 1.8 2004/11/29 22:11:51 seb Exp $
+$NetBSD: patch-ab,v 1.9 2004/12/24 18:26:57 seb Exp $

--- configure.ac.orig	2004-09-14 22:04:08.000000000 +0000
+--- configure.ac.orig	2004-12-11 20:38:20.000000000 +0000
 +++ configure.ac
-@@ -25,7 +25,10 @@ case "${target_os}" in
+@@ -36,7 +36,10 @@ case "${target_os}" in
 	PATHSEPARATOR=":"
 	;;
   * ) # This sucks!  Whatever happened to standards for file system layout?
@ -14,7 +14,7 @@ $NetBSD: patch-ab,v 1.8 2004/11/29 22:11:51 seb Exp $
 	PATHSEPARATOR=":"
 	;;
 esac
-@@ -206,71 +209,12 @@ dnl INCLUDES and LIBS for TCL
+@@ -217,75 +220,12 @@ dnl INCLUDES and LIBS for TCL
 # start by assuming we have it
 HAVE_TCL=1 
 
@ -55,12 +55,11 @@ $NetBSD: patch-ab,v 1.8 2004/11/29 22:11:51 seb Exp $
 -    if test "x$TCL_INCLUDES" != "x" ; then
 -        AC_MSG_RESULT([using tcl headers from $TCL_INCLUDES])
 -    fi
-    AC_SUBST(TCL_INCLUDES)
-    save_CPPFLAGS=$CPPFLAGS
-    CPPFLAGS="$CPPFLAGS $TCL_INCLUDES"
 +. ${TCLCONFIG}
 +TCL_INCLUDES=${TCL_INCLUDE_SPEC}
-+AC_SUBST(TCL_INCLUDES)
+     AC_SUBST(TCL_INCLUDES)
+-    save_CPPFLAGS=$CPPFLAGS
+-    CPPFLAGS="$CPPFLAGS $TCL_INCLUDES"
     AC_CHECK_HEADER(tcl.h,,[
         AC_MSG_WARN([Unable to find header tcl.h. The Tcl packages will not be built])
         HAVE_TCL=0])
@ -70,11 +69,15 @@ $NetBSD: patch-ab,v 1.8 2004/11/29 22:11:51 seb Exp $
 -if test "$HAVE_TCL" = "1"; then
 -    # Some systems don't have Tcl.  Don't build
 -    # the Tcl products if we don't have the library.
-    if test -f ${TCLSH_EXEC_PREFIX}/lib/tcl${TCL_VERSION_FOUND}/tclConfig.sh; then
-        TCLCONFIG=${TCLSH_EXEC_PREFIX}/lib/tcl${TCL_VERSION_FOUND}/tclConfig.sh
+-    if test -f ${TCLSH_EXEC_PREFIX}/lib${LIBPOSTFIX}/tcl${TCL_VERSION_FOUND}/tclConfig.sh; then
+-        TCLCONFIG=${TCLSH_EXEC_PREFIX}/lib${LIBPOSTFIX}/tcl${TCL_VERSION_FOUND}/tclConfig.sh
 -    else
-        if test -f ${TCLSH_EXEC_PREFIX}/lib/tclConfig.sh; then
-            TCLCONFIG=${TCLSH_EXEC_PREFIX}/lib/tclConfig.sh
+-        if test -f ${TCLSH_EXEC_PREFIX}/lib${LIBPOSTFIX}/tclConfig.sh; then
+-            TCLCONFIG=${TCLSH_EXEC_PREFIX}/lib${LIBPOSTFIX}/tclConfig.sh
+-        else
+-            if test -f ${TCLSH_EXEC_PREFIX}/lib/tclConfig.sh; then
+-                TCLCONFIG=${TCLSH_EXEC_PREFIX}/lib/tclConfig.sh
+-            fi
 -        fi
 -    fi
 -    if test "x$TCLCONFIG" != "x"; then
@ -89,11 +92,10 @@ $NetBSD: patch-ab,v 1.8 2004/11/29 22:11:51 seb Exp $
 
 if test "$HAVE_TCL" = "1"; then
     # TCL STUBS support is required
-@@ -353,77 +297,13 @@ if test "$HAVE_TCL" = "0"; then
- fi
+@@ -369,80 +309,13 @@ fi
 
 HAVE_TK=$HAVE_TCL
-                                                                                
+                                                                                 
 -if test "$HAVE_TK" = "1"; then
 -    AC_ARG_WITH(wish,
 -        [  --with-wish=PROG        build graphviz for specific wish],
@ -134,12 +136,11 @@ $NetBSD: patch-ab,v 1.8 2004/11/29 22:11:51 seb Exp $
 -    if test "x$TK_INCLUDES" != "x" ; then
 -	AC_MSG_RESULT([using tk headers from $TK_INCLUDES])
 -    fi
-    AC_SUBST(TK_INCLUDES)
-    save_CPPFLAGS=$CPPFLAGS
-    CPPFLAGS="$CPPFLAGS $TCL_INCLUDES $TK_INCLUDES"
 +. ${TKCONFIG}
 +TK_INCLUDES="-I${TK_PREFIX}/include"
-+AC_SUBST(TK_INCLUDES)
+     AC_SUBST(TK_INCLUDES)
+-    save_CPPFLAGS=$CPPFLAGS
+-    CPPFLAGS="$CPPFLAGS $TCL_INCLUDES $TK_INCLUDES $X_CFLAGS"
     AC_CHECK_HEADER(tk.h,,[
         AC_MSG_WARN([Unable to find header tk.h. The Tk packages will not be built])
         HAVE_TK=0])
@ -148,13 +149,17 @@ $NetBSD: patch-ab,v 1.8 2004/11/29 22:11:51 seb Exp $
 
 -if test "$HAVE_TK" = "1"; then
 -    # Some systems don't have Tcl.  Don't build
-    # Some systems have Tcl, but not TK.  Don't build
+-    # Some systems have Tcl, but not Tk.  Don't build
 -    # the Tk products if we don't have the library.
-    if test -f ${WISH_EXEC_PREFIX}/lib/tk${TK_VERSION_FOUND}/tkConfig.sh; then
-        TKCONFIG=${WISH_EXEC_PREFIX}/lib/tk${TK_VERSION_FOUND}/tkConfig.sh
+-    if test -f ${WISH_EXEC_PREFIX}/lib${LIBPOSTFIX}/tk${TK_VERSION_FOUND}/tkConfig.sh; then
+-        TKCONFIG=${WISH_EXEC_PREFIX}/lib${LIBPOSTFIX}/tk${TK_VERSION_FOUND}/tkConfig.sh
 -    else
-        if test -f ${WISH_EXEC_PREFIX}/lib/tkConfig.sh; then
-	    TKCONFIG=${WISH_EXEC_PREFIX}/lib/tkConfig.sh
+-        if test -f ${WISH_EXEC_PREFIX}/lib${LIBPOSTFIX}/tkConfig.sh; then
+-	    TKCONFIG=${WISH_EXEC_PREFIX}/lib${LIBPOSTFIX}/tkConfig.sh
+-	else
+-            if test -f ${WISH_EXEC_PREFIX}/lib/tkConfig.sh; then
+-	        TKCONFIG=${WISH_EXEC_PREFIX}/lib/tkConfig.sh
+-            fi
 -        fi
 -    fi
 -    if test "x$TKCONFIG" != "x"; then
@ -170,7 +175,7 @@ $NetBSD: patch-ab,v 1.8 2004/11/29 22:11:51 seb Exp $
 #if test "$HAVE_TK" = "1"; then
 #    # TK STUBS support is required (but support is indicated by TCL_SUPPORTS_STUBS)
 #    if test "x${TCL_SUPPORTS_STUBS}" != "x1"; then
-@@ -1014,36 +894,12 @@ AC_MSG_RESULT(no)])
+@@ -1050,36 +923,12 @@ AC_MSG_RESULT(no)])
 
 # -----------------------------------
 # tclInt.h
--- a/graphics/graphviz/patches/patch-ac
+++ b/graphics/graphviz/patches/patch-ac
@ -1,6 +1,6 @@
-$NetBSD: patch-ac,v 1.10 2004/11/29 22:11:51 seb Exp $
+$NetBSD: patch-ac,v 1.11 2004/12/24 18:26:57 seb Exp $

--- configure.orig	2004-09-14 22:12:44.000000000 +0000
+--- configure.orig	2004-12-24 13:06:51.000000000 +0000
 +++ configure
@@ -464,7 +464,7 @@ ac_includes_default="\
 # include <unistd.h>
@ -20,7 +20,7 @@ $NetBSD: patch-ac,v 1.10 2004/11/29 22:11:51 seb Exp $
   --with-extraincludedir=DIR use extra includes from DIR
   --with-extralibdir=DIR  use extra libraries from DIR
   --with-x                use the X Window System
-@@ -1676,7 +1674,10 @@ case "${target_os}" in
+@@ -1687,7 +1685,10 @@ case "${target_os}" in
 	PATHSEPARATOR=":"
 	;;
   * ) # This sucks!  Whatever happened to standards for file system layout?
@ -32,7 +32,7 @@ $NetBSD: patch-ac,v 1.10 2004/11/29 22:11:51 seb Exp $
 	PATHSEPARATOR=":"
 	;;
 esac
-@@ -20354,165 +20355,9 @@ fi
+@@ -20356,165 +20357,9 @@ fi
 # start by assuming we have it
 HAVE_TCL=1
 
@ -200,7 +200,7 @@ $NetBSD: patch-ac,v 1.10 2004/11/29 22:11:51 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
-@@ -20660,30 +20505,6 @@ echo "$as_me: WARNING: Unable to find he
+@@ -20662,34 +20507,6 @@ echo "$as_me: WARNING: Unable to find he
 fi
 
 
@ -210,11 +210,15 @@ $NetBSD: patch-ac,v 1.10 2004/11/29 22:11:51 seb Exp $
 -if test "$HAVE_TCL" = "1"; then
 -    # Some systems don't have Tcl.  Don't build
 -    # the Tcl products if we don't have the library.
-    if test -f ${TCLSH_EXEC_PREFIX}/lib/tcl${TCL_VERSION_FOUND}/tclConfig.sh; then
-        TCLCONFIG=${TCLSH_EXEC_PREFIX}/lib/tcl${TCL_VERSION_FOUND}/tclConfig.sh
+-    if test -f ${TCLSH_EXEC_PREFIX}/lib${LIBPOSTFIX}/tcl${TCL_VERSION_FOUND}/tclConfig.sh; then
+-        TCLCONFIG=${TCLSH_EXEC_PREFIX}/lib${LIBPOSTFIX}/tcl${TCL_VERSION_FOUND}/tclConfig.sh
 -    else
-        if test -f ${TCLSH_EXEC_PREFIX}/lib/tclConfig.sh; then
-            TCLCONFIG=${TCLSH_EXEC_PREFIX}/lib/tclConfig.sh
+-        if test -f ${TCLSH_EXEC_PREFIX}/lib${LIBPOSTFIX}/tclConfig.sh; then
+-            TCLCONFIG=${TCLSH_EXEC_PREFIX}/lib${LIBPOSTFIX}/tclConfig.sh
+-        else
+-            if test -f ${TCLSH_EXEC_PREFIX}/lib/tclConfig.sh; then
+-                TCLCONFIG=${TCLSH_EXEC_PREFIX}/lib/tclConfig.sh
+-            fi
 -        fi
 -    fi
 -    if test "x$TCLCONFIG" != "x"; then
@ -231,15 +235,14 @@ $NetBSD: patch-ac,v 1.10 2004/11/29 22:11:51 seb Exp $
 
 if test "$HAVE_TCL" = "1"; then
     # TCL STUBS support is required
-@@ -20775,169 +20596,9 @@ echo "$as_me: WARNING: No Tcl. The Tk pa
- fi
+@@ -20782,168 +20599,9 @@ fi
 
 HAVE_TK=$HAVE_TCL
+ 
+-if test "$HAVE_TK" = "1"; then
 +. ${TKCONFIG}
 +TK_INCLUDES="-I${TK_PREFIX}/include"
 
-if test "$HAVE_TK" = "1"; then
-
 -# Check whether --with-wish or --without-wish was given.
 -if test "${with_wish+set}" = set; then
 -  withval="$with_wish"
@ -399,11 +402,11 @@ $NetBSD: patch-ac,v 1.10 2004/11/29 22:11:51 seb Exp $
 -    fi
 -
 -    save_CPPFLAGS=$CPPFLAGS
-    CPPFLAGS="$CPPFLAGS $TCL_INCLUDES $TK_INCLUDES"
+-    CPPFLAGS="$CPPFLAGS $TCL_INCLUDES $TK_INCLUDES $X_CFLAGS"
     if test "${ac_cv_header_tk_h+set}" = set; then
   echo "$as_me:$LINENO: checking for tk.h" >&5
 echo $ECHO_N "checking for tk.h... $ECHO_C" >&6
-@@ -21085,31 +20746,6 @@ echo "$as_me: WARNING: Unable to find he
+@@ -21091,35 +20749,6 @@ echo "$as_me: WARNING: Unable to find he
 fi
 
 
@ -412,13 +415,17 @@ $NetBSD: patch-ac,v 1.10 2004/11/29 22:11:51 seb Exp $
 -
 -if test "$HAVE_TK" = "1"; then
 -    # Some systems don't have Tcl.  Don't build
-    # Some systems have Tcl, but not TK.  Don't build
+-    # Some systems have Tcl, but not Tk.  Don't build
 -    # the Tk products if we don't have the library.
-    if test -f ${WISH_EXEC_PREFIX}/lib/tk${TK_VERSION_FOUND}/tkConfig.sh; then
-        TKCONFIG=${WISH_EXEC_PREFIX}/lib/tk${TK_VERSION_FOUND}/tkConfig.sh
+-    if test -f ${WISH_EXEC_PREFIX}/lib${LIBPOSTFIX}/tk${TK_VERSION_FOUND}/tkConfig.sh; then
+-        TKCONFIG=${WISH_EXEC_PREFIX}/lib${LIBPOSTFIX}/tk${TK_VERSION_FOUND}/tkConfig.sh
 -    else
-        if test -f ${WISH_EXEC_PREFIX}/lib/tkConfig.sh; then
-	    TKCONFIG=${WISH_EXEC_PREFIX}/lib/tkConfig.sh
+-        if test -f ${WISH_EXEC_PREFIX}/lib${LIBPOSTFIX}/tkConfig.sh; then
+-	    TKCONFIG=${WISH_EXEC_PREFIX}/lib${LIBPOSTFIX}/tkConfig.sh
+-	else
+-            if test -f ${WISH_EXEC_PREFIX}/lib/tkConfig.sh; then
+-	        TKCONFIG=${WISH_EXEC_PREFIX}/lib/tkConfig.sh
+-            fi
 -        fi
 -    fi
 -    if test "x$TKCONFIG" != "x"; then
@ -435,7 +442,7 @@ $NetBSD: patch-ac,v 1.10 2004/11/29 22:11:51 seb Exp $
 
 #if test "$HAVE_TK" = "1"; then
 #    # TK STUBS support is required (but support is indicated by TCL_SUPPORTS_STUBS)
-@@ -27946,36 +27582,12 @@ rm -f conftest.err conftest.$ac_objext c
+@@ -27985,36 +27614,12 @@ rm -f conftest.err conftest.$ac_objext c
 
 # -----------------------------------
 # tclInt.h
@ -474,7 +481,7 @@ $NetBSD: patch-ac,v 1.10 2004/11/29 22:11:51 seb Exp $
 
 
 # -----------------------------------
-@@ -29395,7 +29007,6 @@ s,@ENABLE_GVRENDER_TRUE@,$ENABLE_GVRENDE
+@@ -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
@ -482,7 +489,7 @@ $NetBSD: patch-ac,v 1.10 2004/11/29 22:11:51 seb Exp $
 s,@TCL_INCLUDES@,$TCL_INCLUDES,;t t
 s,@HAVE_TCL@,$HAVE_TCL,;t t
 s,@WITH_TCL_TRUE@,$WITH_TCL_TRUE,;t t
-@@ -29410,7 +29021,6 @@ s,@TCL_DEFS@,$TCL_DEFS,;t t
+@@ -29449,7 +29053,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
--- a/graphics/graphviz/patches/patch-ar
+++ b/graphics/graphviz/patches/patch-ar
@ -1,6 +1,6 @@
-$NetBSD: patch-ar,v 1.5 2004/11/29 22:11:51 seb Exp $
+$NetBSD: patch-ar,v 1.6 2004/12/24 18:26:57 seb Exp $

--- dotneato/Makefile.am.orig	2004-09-02 15:06:01.000000000 +0000
+--- dotneato/Makefile.am.orig	2004-11-24 23:45:55.000000000 +0000
 +++ dotneato/Makefile.am
@@ -2,8 +2,7 @@
 
@ -12,11 +12,26 @@ $NetBSD: patch-ar,v 1.5 2004/11/29 22:11:51 seb Exp $
 
 linkedman = neato.1 twopi.1 fdp.1 circo.1
 linkedpdf = neato.pdf twopi.pdf fdp.pdf circo.pdf
-@@ -31,7 +30,6 @@ bin_SCRIPTS = dotneato-config
+@@ -29,7 +28,6 @@ bin_SCRIPTS = dotneato-config
 bin_PROGRAMS = dot neato twopi fdp circo
 noinst_PROGRAMS = dotmemtest neatomemtest twopimemtest fdpmemtest
- man_MANS = $(man)
-pdf_DATA = $(pdf)
+ man_MANS = dot.1 dotneato-config.1
+-pdf_DATA = dot.pdf dotneato-config.pdf
 
 libdotneato_la_SOURCES = dotneato.c
 libdotneato_la_LIBADD = \
+@@ -85,14 +83,12 @@ fdpmemtest_LDADD = $(fdp_LDADD)
+ 
+ install-data-hook:
+ 	(cd $(DESTDIR)$(man1dir); for i in $(linkedman); do rm -f $$i; $(LN_S) dot.1 $$i; done;)
+-	(cd $(DESTDIR)$(pdfdir); for i in $(linkedpdf); do rm -f $$i; $(LN_S) dot.pdf $$i; done;)
+ 
+ #install-exec-hook:
+ #	(cd $(DESTDIR)$(bindir); for i in $(linkedprogram); do rm -f $$i; $(LN_S) dot $$i; done;)
+ 
+ uninstall-hook:
+ 	(cd $(DESTDIR)$(man1dir); for i in $(linkedman); do rm -f $$i; done;)
+-	(cd $(DESTDIR)$(pdfdir); for i in $(linkedpdf); do rm -f $$i; done;)
+ #	(cd $(DESTDIR)$(bindir); for i in $(linkedprogram); do rm -f $$i; done;)
+ 
+ dot.pdf: $(top_srcdir)/dotneato/dot.1
--- a/graphics/graphviz/patches/patch-as
+++ b/graphics/graphviz/patches/patch-as
@ -1,8 +1,8 @@
-$NetBSD: patch-as,v 1.7 2004/11/29 22:11:51 seb Exp $
+$NetBSD: patch-as,v 1.8 2004/12/24 18:26:57 seb Exp $

--- dotneato/Makefile.in.orig	2004-09-14 22:13:02.000000000 +0000
+--- dotneato/Makefile.in.orig	2004-12-11 20:43:23.000000000 +0000
 +++ dotneato/Makefile.in
-@@ -66,8 +66,7 @@ am__vpath_adj = case $$p in \
+@@ -68,8 +68,7 @@ am__vpath_adj = case $$p in \
 am__strip_dir = `echo $$p | sed -e 's|^.*/||'`;
 am__installdirs = "$(DESTDIR)$(pkglibdir)" "$(DESTDIR)$(bindir)" \
 	"$(DESTDIR)$(bindir)" "$(DESTDIR)$(man1dir)" \
@ -12,7 +12,7 @@ $NetBSD: patch-as,v 1.7 2004/11/29 22:11:51 seb Exp $
 pkglibLTLIBRARIES_INSTALL = $(INSTALL)
 LTLIBRARIES = $(pkglib_LTLIBRARIES)
 libdotneato_la_DEPENDENCIES =  \
-@@ -161,9 +160,8 @@ RECURSIVE_TARGETS = all-recursive check-
+@@ -163,9 +162,8 @@ RECURSIVE_TARGETS = all-recursive check-
 man1dir = $(mandir)/man1
 NROFF = nroff
 MANS = $(man_MANS)
@ -23,7 +23,7 @@ $NetBSD: patch-as,v 1.7 2004/11/29 22:11:51 seb Exp $
 pkgincludeHEADERS_INSTALL = $(INSTALL_HEADER)
 HEADERS = $(pkginclude_HEADERS)
 ETAGS = etags
-@@ -269,7 +267,6 @@ SOCKET_LIBS = @SOCKET_LIBS@
+@@ -271,7 +269,6 @@ SOCKET_LIBS = @SOCKET_LIBS@
 SORT = @SORT@
 STRIP = @STRIP@
 TCLINT_INCLUDES = @TCLINT_INCLUDES@
@ -31,7 +31,7 @@ $NetBSD: patch-as,v 1.7 2004/11/29 22:11:51 seb Exp $
 TCL_CFLAGS = @TCL_CFLAGS@
 TCL_DEFS = @TCL_DEFS@
 TCL_INCLUDES = @TCL_INCLUDES@
-@@ -295,7 +292,6 @@ TK_VERSION = @TK_VERSION@
+@@ -297,7 +294,6 @@ TK_VERSION = @TK_VERSION@
 TK_XINCLUDES = @TK_XINCLUDES@
 TOP_DIR = @TOP_DIR@
 VERSION = @VERSION@
@ -39,7 +39,7 @@ $NetBSD: patch-as,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@
-@@ -363,8 +359,7 @@ target_cpu = @target_cpu@
+@@ -365,8 +361,7 @@ target_cpu = @target_cpu@
 target_os = @target_os@
 target_vendor = @target_vendor@
 SUBDIRS = common gvrender pack dotgen neatogen twopigen fdpgen circogen gvre_svg
@ -48,16 +48,16 @@ $NetBSD: patch-as,v 1.7 2004/11/29 22:11:51 seb Exp $
 +pkgconfigdir = $(libdir)/pkgconfig
 linkedman = neato.1 twopi.1 fdp.1 circo.1
 linkedpdf = neato.pdf twopi.pdf fdp.pdf circo.pdf
- man = dot.1 $(linkedman) dotneato-config.1
+ AM_CPPFLAGS = \
@@ -388,7 +383,6 @@ pkglib_LTLIBRARIES = libdotneato.la
 pkgconfig_DATA = libdotneato.pc
 bin_SCRIPTS = dotneato-config
- man_MANS = $(man)
-pdf_DATA = $(pdf)
+ man_MANS = dot.1 dotneato-config.1
+-pdf_DATA = dot.pdf dotneato-config.pdf
 libdotneato_la_SOURCES = dotneato.c
 libdotneato_la_LIBADD = \
 	$(top_builddir)/dotneato/common/libcommon.la \
-@@ -681,23 +675,6 @@ uninstall-man1:
+@@ -679,23 +673,6 @@ uninstall-man1:
 	  echo " rm -f '$(DESTDIR)$(man1dir)/$$inst'"; \
 	  rm -f "$(DESTDIR)$(man1dir)/$$inst"; \
 	done
@ -81,7 +81,7 @@ $NetBSD: patch-as,v 1.7 2004/11/29 22:11:51 seb Exp $
 install-pkgconfigDATA: $(pkgconfig_DATA)
 	@$(NORMAL_INSTALL)
 	test -z "$(pkgconfigdir)" || $(mkdir_p) "$(DESTDIR)$(pkgconfigdir)"
-@@ -901,7 +878,7 @@ all-am: Makefile $(LTLIBRARIES) $(PROGRA
+@@ -899,7 +876,7 @@ all-am: Makefile $(LTLIBRARIES) $(PROGRA
 		$(HEADERS)
 installdirs: installdirs-recursive
 installdirs-am:
@ -90,15 +90,15 @@ $NetBSD: patch-as,v 1.7 2004/11/29 22:11:51 seb Exp $
 	  test -z "$$dir" || $(mkdir_p) "$$dir"; \
 	done
 install: install-recursive
-@@ -950,7 +927,7 @@ info: info-recursive
+@@ -948,7 +925,7 @@ info: info-recursive
 
 info-am:
 
 -install-data-am: install-man install-pdfDATA install-pkgconfigDATA \
 +install-data-am: install-man install-pkgconfigDATA \
 	install-pkgincludeHEADERS
- 
- install-exec-am: install-binPROGRAMS install-binSCRIPTS \
+ 	@$(NORMAL_INSTALL)
+ 	$(MAKE) $(AM_MAKEFLAGS) install-data-hook
@@ -981,9 +958,8 @@ ps: ps-recursive
 ps-am:
 
@ -108,33 +108,45 @@ $NetBSD: patch-as,v 1.7 2004/11/29 22:11:51 seb Exp $
 -	uninstall-pkglibLTLIBRARIES
 +	uninstall-info-am uninstall-man uninstall-pkgconfigDATA \
 +	uninstall-pkgincludeHEADERS uninstall-pkglibLTLIBRARIES
+ 	@$(NORMAL_INSTALL)
+ 	$(MAKE) $(AM_MAKEFLAGS) uninstall-hook
 
- uninstall-info: uninstall-info-recursive
- 
-@@ -998,17 +974,16 @@ uninstall-man: uninstall-man1
+@@ -1000,29 +976,27 @@ uninstall-man: uninstall-man1
 	install install-am install-binPROGRAMS install-binSCRIPTS \
- 	install-data install-data-am install-exec install-exec-am \
- 	install-info install-info-am install-man install-man1 \
-	install-pdfDATA install-pkgconfigDATA \
+ 	install-data install-data-am install-data-hook install-exec \
+ 	install-exec-am install-info install-info-am install-man \
+-	install-man1 install-pdfDATA install-pkgconfigDATA \
 -	install-pkgincludeHEADERS install-pkglibLTLIBRARIES \
 -	install-strip installcheck installcheck-am installdirs \
 -	installdirs-am maintainer-clean maintainer-clean-generic \
 -	maintainer-clean-recursive mostlyclean mostlyclean-compile \
 -	mostlyclean-generic mostlyclean-libtool mostlyclean-recursive \
 -	pdf pdf-am ps ps-am tags tags-recursive uninstall uninstall-am \
-+	install-pkgconfigDATA install-pkgincludeHEADERS \
+	install-man1 install-pkgconfigDATA install-pkgincludeHEADERS \
 +	install-pkglibLTLIBRARIES install-strip installcheck \
 +	installcheck-am installdirs installdirs-am maintainer-clean \
 +	maintainer-clean-generic maintainer-clean-recursive \
 +	mostlyclean mostlyclean-compile mostlyclean-generic \
 +	mostlyclean-libtool mostlyclean-recursive pdf pdf-am ps ps-am \
 +	tags tags-recursive uninstall uninstall-am \
- 	uninstall-binPROGRAMS uninstall-binSCRIPTS uninstall-info-am \
-	uninstall-man uninstall-man1 uninstall-pdfDATA \
-	uninstall-pkgconfigDATA uninstall-pkgincludeHEADERS \
-	uninstall-pkglibLTLIBRARIES
-+	uninstall-man uninstall-man1 uninstall-pkgconfigDATA \
-+	uninstall-pkgincludeHEADERS uninstall-pkglibLTLIBRARIES
+ 	uninstall-binPROGRAMS uninstall-binSCRIPTS uninstall-hook \
+ 	uninstall-info-am uninstall-man uninstall-man1 \
+-	uninstall-pdfDATA uninstall-pkgconfigDATA \
+-	uninstall-pkgincludeHEADERS uninstall-pkglibLTLIBRARIES
+	uninstall-pkgconfigDATA uninstall-pkgincludeHEADERS \
+	uninstall-pkglibLTLIBRARIES
 
 
- $(linkedman): $(top_srcdir)/dotneato/dot.1
+ install-data-hook:
+ 	(cd $(DESTDIR)$(man1dir); for i in $(linkedman); do rm -f $$i; $(LN_S) dot.1 $$i; done;)
+-	(cd $(DESTDIR)$(pdfdir); for i in $(linkedpdf); do rm -f $$i; $(LN_S) dot.pdf $$i; done;)
+ 
+ #install-exec-hook:
+ #	(cd $(DESTDIR)$(bindir); for i in $(linkedprogram); do rm -f $$i; $(LN_S) dot $$i; done;)
+ 
+ uninstall-hook:
+ 	(cd $(DESTDIR)$(man1dir); for i in $(linkedman); do rm -f $$i; done;)
+-	(cd $(DESTDIR)$(pdfdir); for i in $(linkedpdf); do rm -f $$i; done;)
+ #	(cd $(DESTDIR)$(bindir); for i in $(linkedprogram); do rm -f $$i; done;)
+ 
+ dot.pdf: $(top_srcdir)/dotneato/dot.1
--- a/graphics/graphviz/patches/patch-bv
+++ b/graphics/graphviz/patches/patch-bv
@ -1,6 +1,6 @@
-$NetBSD: patch-bv,v 1.1 2004/11/29 22:11:51 seb Exp $
+$NetBSD: patch-bv,v 1.2 2004/12/24 18:26:57 seb Exp $

--- tools/src/Makefile.am.orig	2004-07-26 16:52:15.000000000 +0000
+--- tools/src/Makefile.am.orig	2004-11-19 13:39:56.000000000 +0000
 +++ tools/src/Makefile.am
@@ -11,7 +11,6 @@ AM_CPPFLAGS = \
 	-I$(top_srcdir)/dotneato/gvrender \
@ -10,13 +10,23 @@ $NetBSD: patch-bv,v 1.1 2004/11/29 22:11:51 seb Exp $
 
 noinst_HEADERS = ingraphs.h colortbl.h convert.h
 noinst_LTLIBRARIES = libingraphs.la
-@@ -22,9 +21,6 @@ bin_SCRIPTS = dot2gxl
- man_MANS = gc.1 gvcolor.1 gxl2dot.1 dot2gxl.1 acyclic.1 nop.1 \
- 	ccomps.1 sccmap.1 tred.1 unflatten.1 gvpack.1 \
- 	dijkstra.1 bcomps.1
-pdf_DATA = gc.pdf gvcolor.pdf gxl2dot.pdf dot2gxl.pdf acyclic.pdf nop.pdf \
-	ccomps.pdf sccmap.pdf tred.pdf unflatten.pdf gvpack.pdf \
-	dijkstra.pdf bcomps.pdf
+@@ -19,19 +18,15 @@ bin_PROGRAMS = gc gvcolor gxl2dot acycli
+ 	unflatten gvpack dijkstra bcomps
+ man_MANS = gc.1 gvcolor.1 gxl2dot.1 acyclic.1 nop.1 ccomps.1 sccmap.1 \
+ 	tred.1 unflatten.1 gvpack.1 dijkstra.1 bcomps.1
+-pdf_DATA = gc.pdf gvcolor.pdf gxl2dot.pdf acyclic.pdf nop.pdf ccomps.pdf \
+-	sccmap.pdf tred.pdf unflatten.pdf gvpack.pdf dijkstra.pdf bcomps.pdf
 
- dot2gxl.1: $(top_srcdir)/tools/src/gxl2dot.1
- 	rm -f $@
+ install-data-hook:
+ 	(cd $(DESTDIR)$(man1dir); rm -f dot2gxl.1; $(LN_S) gxl2dot.1 dot2gxl.1;)
+-	(cd $(DESTDIR)$(pdfdir); rm -f dot2gxl.pdf; $(LN_S) gxl2dot.pdf dot2gxl.pdf;)
+ 
+ install-exec-hook:
+ 	(cd $(DESTDIR)$(bindir); rm -f dot2gxl; $(LN_S) gxl2dot dot2gxl;)
+ 
+ uninstall-hook:
+ 	(cd $(DESTDIR)$(man1dir); rm -f dot2gxl.1;)
+-	(cd $(DESTDIR)$(pdfdir); rm -f dot2gxl.pdf;)
+ 	(cd $(DESTDIR)$(bindir); rm -f dot2gxl;)
+ 
+ libingraphs_la_SOURCES = ingraphs.c ingraphs.h
--- a/graphics/graphviz/patches/patch-bw
+++ b/graphics/graphviz/patches/patch-bw
@ -1,8 +1,8 @@
-$NetBSD: patch-bw,v 1.1 2004/11/29 22:11:51 seb Exp $
+$NetBSD: patch-bw,v 1.2 2004/12/24 18:26:57 seb Exp $

--- tools/src/Makefile.in.orig	2004-09-14 22:13:39.000000000 +0000
+--- tools/src/Makefile.in.orig	2004-12-11 20:44:04.000000000 +0000
 +++ tools/src/Makefile.in
-@@ -17,7 +17,6 @@
+@@ -16,7 +16,6 @@
 
 
 
@ -10,16 +10,17 @@ $NetBSD: patch-bw,v 1.1 2004/11/29 22:11:51 seb Exp $
 SOURCES = $(libingraphs_la_SOURCES) $(acyclic_SOURCES) $(bcomps_SOURCES) $(ccomps_SOURCES) $(dijkstra_SOURCES) $(gc_SOURCES) $(gvcolor_SOURCES) $(gvpack_SOURCES) $(gxl2dot_SOURCES) $(nop_SOURCES) $(sccmap_SOURCES) $(tred_SOURCES) $(unflatten_SOURCES)
 
 srcdir = @srcdir@
-@@ -62,7 +61,7 @@ libingraphs_la_LIBADD =
+@@ -62,8 +61,7 @@ LTLIBRARIES = $(noinst_LTLIBRARIES)
+ libingraphs_la_LIBADD =
 am_libingraphs_la_OBJECTS = ingraphs.lo
 libingraphs_la_OBJECTS = $(am_libingraphs_la_OBJECTS)
- am__installdirs = "$(DESTDIR)$(bindir)" "$(DESTDIR)$(bindir)" \
-	"$(DESTDIR)$(man1dir)" "$(DESTDIR)$(pdfdir)"
-+	"$(DESTDIR)$(man1dir)"
+-am__installdirs = "$(DESTDIR)$(bindir)" "$(DESTDIR)$(man1dir)" \
+-	"$(DESTDIR)$(pdfdir)"
+am__installdirs = "$(DESTDIR)$(bindir)" "$(DESTDIR)$(man1dir)"
 binPROGRAMS_INSTALL = $(INSTALL_PROGRAM)
 PROGRAMS = $(bin_PROGRAMS)
 am_acyclic_OBJECTS = acyclic.$(OBJEXT)
-@@ -153,14 +152,6 @@ DIST_SOURCES = $(libingraphs_la_SOURCES)
+@@ -152,14 +150,6 @@ DIST_SOURCES = $(libingraphs_la_SOURCES)
 man1dir = $(mandir)/man1
 NROFF = nroff
 MANS = $(man_MANS)
@ -34,7 +35,7 @@ $NetBSD: patch-bw,v 1.1 2004/11/29 22:11:51 seb Exp $
 HEADERS = $(noinst_HEADERS)
 ETAGS = etags
 CTAGS = ctags
-@@ -264,7 +255,6 @@ SOCKET_LIBS = @SOCKET_LIBS@
+@@ -263,7 +253,6 @@ SOCKET_LIBS = @SOCKET_LIBS@
 SORT = @SORT@
 STRIP = @STRIP@
 TCLINT_INCLUDES = @TCLINT_INCLUDES@
@ -42,7 +43,7 @@ $NetBSD: patch-bw,v 1.1 2004/11/29 22:11:51 seb Exp $
 TCL_CFLAGS = @TCL_CFLAGS@
 TCL_DEFS = @TCL_DEFS@
 TCL_INCLUDES = @TCL_INCLUDES@
-@@ -290,7 +280,6 @@ TK_VERSION = @TK_VERSION@
+@@ -289,7 +278,6 @@ TK_VERSION = @TK_VERSION@
 TK_XINCLUDES = @TK_XINCLUDES@
 TOP_DIR = @TOP_DIR@
 VERSION = @VERSION@
@ -50,26 +51,23 @@ $NetBSD: patch-bw,v 1.1 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@
-@@ -368,7 +357,6 @@ AM_CPPFLAGS = \
+@@ -367,15 +355,11 @@ AM_CPPFLAGS = \
 	-I$(top_srcdir)/dotneato/gvrender \
 	-I$(top_srcdir)/dotneato/common @EXPAT_INCLUDES@
 
 -pdfdir = $(pkgdatadir)/doc/pdf
 noinst_HEADERS = ingraphs.h colortbl.h convert.h
 noinst_LTLIBRARIES = libingraphs.la
- bin_SCRIPTS = dot2gxl
-@@ -376,10 +364,6 @@ man_MANS = gc.1 gvcolor.1 gxl2dot.1 dot2
- 	ccomps.1 sccmap.1 tred.1 unflatten.1 gvpack.1 \
- 	dijkstra.1 bcomps.1
+ man_MANS = gc.1 gvcolor.1 gxl2dot.1 acyclic.1 nop.1 ccomps.1 sccmap.1 \
+ 	tred.1 unflatten.1 gvpack.1 dijkstra.1 bcomps.1
 
-pdf_DATA = gc.pdf gvcolor.pdf gxl2dot.pdf dot2gxl.pdf acyclic.pdf nop.pdf \
-	ccomps.pdf sccmap.pdf tred.pdf unflatten.pdf gvpack.pdf \
-	dijkstra.pdf bcomps.pdf
+-pdf_DATA = gc.pdf gvcolor.pdf gxl2dot.pdf acyclic.pdf nop.pdf ccomps.pdf \
+-	sccmap.pdf tred.pdf unflatten.pdf gvpack.pdf dijkstra.pdf bcomps.pdf
 -
 libingraphs_la_SOURCES = ingraphs.c ingraphs.h
 gxl2dot_SOURCES = cvtgxl.c dot2gxl.c gxl2dot.c
 gxl2dot_LDADD = \
-@@ -688,23 +672,6 @@ uninstall-man1:
+@@ -665,23 +649,6 @@ uninstall-man1:
 	  echo " rm -f '$(DESTDIR)$(man1dir)/$$inst'"; \
 	  rm -f "$(DESTDIR)$(man1dir)/$$inst"; \
 	done
@ -93,54 +91,63 @@ $NetBSD: patch-bw,v 1.1 2004/11/29 22:11:51 seb Exp $
 
 ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
 	list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
-@@ -783,10 +750,10 @@ distdir: $(DISTFILES)
+@@ -760,9 +727,9 @@ distdir: $(DISTFILES)
 	done
 check-am: all-am
 check: check-am
-all-am: Makefile $(LTLIBRARIES) $(PROGRAMS) $(SCRIPTS) $(MANS) $(DATA) \
-+all-am: Makefile $(LTLIBRARIES) $(PROGRAMS) $(SCRIPTS) $(MANS) \
- 		$(HEADERS)
+-all-am: Makefile $(LTLIBRARIES) $(PROGRAMS) $(MANS) $(DATA) $(HEADERS)
+all-am: Makefile $(LTLIBRARIES) $(PROGRAMS) $(MANS) $(HEADERS)
 installdirs:
-	for dir in "$(DESTDIR)$(bindir)" "$(DESTDIR)$(bindir)" "$(DESTDIR)$(man1dir)" "$(DESTDIR)$(pdfdir)"; do \
-+	for dir in "$(DESTDIR)$(bindir)" "$(DESTDIR)$(bindir)" "$(DESTDIR)$(man1dir)"; do \
+-	for dir in "$(DESTDIR)$(bindir)" "$(DESTDIR)$(man1dir)" "$(DESTDIR)$(pdfdir)"; do \
+	for dir in "$(DESTDIR)$(bindir)" "$(DESTDIR)$(man1dir)"; do \
 	  test -z "$$dir" || $(mkdir_p) "$$dir"; \
 	done
 install: install-am
-@@ -836,7 +803,7 @@ info: info-am
+@@ -812,7 +779,7 @@ info: info-am
 
 info-am:
 
 -install-data-am: install-man install-pdfDATA
 +install-data-am: install-man
+ 	@$(NORMAL_INSTALL)
+ 	$(MAKE) $(AM_MAKEFLAGS) install-data-hook
 
- install-exec-am: install-binPROGRAMS install-binSCRIPTS
+@@ -844,8 +811,7 @@ ps: ps-am
 
-@@ -865,7 +832,7 @@ ps: ps-am
 ps-am:
 
- uninstall-am: uninstall-binPROGRAMS uninstall-binSCRIPTS \
-	uninstall-info-am uninstall-man uninstall-pdfDATA
-+	uninstall-info-am uninstall-man
+-uninstall-am: uninstall-binPROGRAMS uninstall-info-am uninstall-man \
+-	uninstall-pdfDATA
+uninstall-am: uninstall-binPROGRAMS uninstall-info-am uninstall-man
+ 	@$(NORMAL_INSTALL)
+ 	$(MAKE) $(AM_MAKEFLAGS) uninstall-hook
 
- uninstall-man: uninstall-man1
- 
-@@ -876,13 +843,12 @@ uninstall-man: uninstall-man1
+@@ -858,25 +824,22 @@ uninstall-man: uninstall-man1
 	html-am info info-am install install-am install-binPROGRAMS \
- 	install-binSCRIPTS install-data install-data-am install-exec \
- 	install-exec-am install-info install-info-am install-man \
-	install-man1 install-pdfDATA install-strip installcheck \
-	installcheck-am installdirs maintainer-clean \
-	maintainer-clean-generic mostlyclean mostlyclean-compile \
-	mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \
-	tags uninstall uninstall-am uninstall-binPROGRAMS \
-	uninstall-binSCRIPTS uninstall-info-am uninstall-man \
-	uninstall-man1 uninstall-pdfDATA
-+	install-man1 install-strip installcheck installcheck-am \
-+	installdirs maintainer-clean maintainer-clean-generic \
-+	mostlyclean mostlyclean-compile mostlyclean-generic \
-+	mostlyclean-libtool pdf pdf-am ps ps-am tags uninstall \
-+	uninstall-am uninstall-binPROGRAMS uninstall-binSCRIPTS \
-+	uninstall-info-am uninstall-man uninstall-man1
+ 	install-data install-data-am install-data-hook install-exec \
+ 	install-exec-am install-exec-hook install-info install-info-am \
+-	install-man install-man1 install-pdfDATA install-strip \
+-	installcheck installcheck-am installdirs maintainer-clean \
+	install-man install-man1 install-strip installcheck \
+	installcheck-am installdirs maintainer-clean \
+ 	maintainer-clean-generic mostlyclean mostlyclean-compile \
+ 	mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \
+ 	tags uninstall uninstall-am uninstall-binPROGRAMS \
+-	uninstall-hook uninstall-info-am uninstall-man uninstall-man1 \
+-	uninstall-pdfDATA
+	uninstall-hook uninstall-info-am uninstall-man uninstall-man1
 
 
- dot2gxl.1: $(top_srcdir)/tools/src/gxl2dot.1
+ install-data-hook:
+ 	(cd $(DESTDIR)$(man1dir); rm -f dot2gxl.1; $(LN_S) gxl2dot.1 dot2gxl.1;)
+-	(cd $(DESTDIR)$(pdfdir); rm -f dot2gxl.pdf; $(LN_S) gxl2dot.pdf dot2gxl.pdf;)
+ 
+ install-exec-hook:
+ 	(cd $(DESTDIR)$(bindir); rm -f dot2gxl; $(LN_S) gxl2dot dot2gxl;)
+ 
+ uninstall-hook:
+ 	(cd $(DESTDIR)$(man1dir); rm -f dot2gxl.1;)
+-	(cd $(DESTDIR)$(pdfdir); rm -f dot2gxl.pdf;)
+ 	(cd $(DESTDIR)$(bindir); rm -f dot2gxl;)
+ 
+ .1.pdf:
--- a/graphics/graphviz/patches/patch-bx
+++ b/graphics/graphviz/patches/patch-bx
@ -1,8 +1,8 @@
-$NetBSD: patch-bx,v 1.1 2004/11/29 22:11:51 seb Exp $
+$NetBSD: patch-bx,v 1.2 2004/12/24 18:26:57 seb Exp $

--- Makefile.am.orig	2004-08-23 13:49:11.000000000 +0000
+--- Makefile.am.orig	2004-12-11 19:26:04.000000000 +0000
 +++ Makefile.am
-@@ -3,8 +3,8 @@
+@@ -5,8 +5,8 @@ ACLOCAL_AMFLAGS = -I m4
 pkgindexdir = $(libdir)/@PACKAGE@
 pkgindex_DATA = pkgIndex.tcl
 
@ -11,5 +11,5 @@ $NetBSD: patch-bx,v 1.1 2004/11/29 22:11:51 seb Exp $
 +txtdir = $(prefix)/share/doc/graphviz
 +htmldir = $(prefix)/share/doc/html/graphviz
 
- txt = AUTHORS COPYING ChangeLog NEWS FAQ.txt MINTERMS.txt
- html = LICENSE.html
+ txt = AUTHORS COPYING ChangeLog NEWS FAQ.txt
+ html = CPL.html
--- a/graphics/graphviz/patches/patch-by
+++ b/graphics/graphviz/patches/patch-by
@ -1,6 +1,6 @@
-$NetBSD: patch-by,v 1.1 2004/11/29 22:11:51 seb Exp $
+$NetBSD: patch-by,v 1.2 2004/12/24 18:26:57 seb Exp $

--- Makefile.in.orig	2004-09-14 22:13:40.000000000 +0000
+--- Makefile.in.orig	2004-12-24 13:13:35.000000000 +0000
 +++ Makefile.in
@@ -41,9 +41,9 @@ DIST_COMMON = README $(am__configure_dep
 	$(srcdir)/Makefile.in $(srcdir)/ast_common.h.in \
@ -14,8 +14,8 @@ $NetBSD: patch-by,v 1.1 2004/11/29 22:11:51 seb Exp $
 +	config/missing config/ylwrap
 subdir = .
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
- am__aclocal_m4_deps = $(top_srcdir)/configure.ac
-@@ -187,7 +187,6 @@ SOCKET_LIBS = @SOCKET_LIBS@
+ am__aclocal_m4_deps = $(top_srcdir)/m4/iconv.m4 \
+@@ -189,7 +189,6 @@ SOCKET_LIBS = @SOCKET_LIBS@
 SORT = @SORT@
 STRIP = @STRIP@
 TCLINT_INCLUDES = @TCLINT_INCLUDES@
@ -23,7 +23,7 @@ $NetBSD: patch-by,v 1.1 2004/11/29 22:11:51 seb Exp $
 TCL_CFLAGS = @TCL_CFLAGS@
 TCL_DEFS = @TCL_DEFS@
 TCL_INCLUDES = @TCL_INCLUDES@
-@@ -213,7 +212,6 @@ TK_VERSION = @TK_VERSION@
+@@ -215,7 +214,6 @@ TK_VERSION = @TK_VERSION@
 TK_XINCLUDES = @TK_XINCLUDES@
 TOP_DIR = @TOP_DIR@
 VERSION = @VERSION@
@ -31,14 +31,14 @@ $NetBSD: patch-by,v 1.1 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@
-@@ -282,8 +280,8 @@ target_os = @target_os@
- target_vendor = @target_vendor@
+@@ -285,8 +283,8 @@ 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 MINTERMS.txt
- html = LICENSE.html
+ txt = AUTHORS COPYING ChangeLog NEWS FAQ.txt
+ html = CPL.html
 txt_DATA = $(txt)
--- a/graphics/graphviz/patches/patch-bz
+++ b/graphics/graphviz/patches/patch-bz
@ -1,19 +1,21 @@
-$NetBSD: patch-bz,v 1.1 2004/11/29 22:11:51 seb Exp $
+$NetBSD: patch-bz,v 1.2 2004/12/24 18:26:57 seb Exp $

--- gd/Makefile.am.orig	2004-08-13 16:41:39.000000000 +0000
+--- gd/Makefile.am.orig	2004-11-02 14:58:00.000000000 +0000
 +++ gd/Makefile.am
-@@ -4,14 +4,12 @@ html = gd.html
+@@ -4,8 +4,6 @@ html = gd.html
 
 AM_CPPFLAGS = @FT_INCLUDES@ @FC_INCLUDES@ @PNG_INCLUDES@ @JPEG_INCLUDES@ @Z_INCLUDES@
 
 -htmldir = $(pkgdatadir)/doc/html
- 
+-
 if WITH_MYLIBGD
 pkginclude_HEADERS = gd.h gd_io.h gdcache.h gdfontg.h gdfontl.h gdfontmb.h \
 	gdfonts.h gdfontt.h gdhelpers.h jisx0208.h wbmp.h gdfx.h entities.h
- pkglib_LTLIBRARIES = libgvgd.la
- noinst_PROGRAMS = fontwheeltest fontsizetest gdtestft gddemo circletexttest
+@@ -14,7 +12,6 @@ noinst_PROGRAMS = annotate gdparttopng g
+ 	pngtogd2 webpng gd2togif gdcmpgif giftogd2 \
+ 	fontsizetest fontwheeltest gdtest gddemo gd2time gdtestft \
+ 	testac circletexttest testtr fontconfigtest gifanimtest
 -html_DATA = $(html)
 endif
 
- libgvgd_la_SOURCES = gd.c gd_gd.c gd_gd2.c gd_io.c gd_io_dp.c gd_io_file.c \
+ libgvgd_la_SOURCES = gd.c gdfx.c gd_security.c gd_gd.c gd_gd2.c gd_io.c gd_io_dp.c \
--- a/graphics/graphviz/patches/patch-ca
+++ b/graphics/graphviz/patches/patch-ca
@ -1,16 +1,16 @@
-$NetBSD: patch-ca,v 1.1 2004/11/29 22:11:51 seb Exp $
+$NetBSD: patch-ca,v 1.2 2004/12/24 18:26:57 seb Exp $

--- gd/Makefile.in.orig	2004-09-14 22:13:15.000000000 +0000
+--- gd/Makefile.in.orig	2004-12-24 16:19:36.000000000 +0000
 +++ gd/Makefile.in
@@ -16,7 +16,6 @@
 
 
 
 -
- SOURCES = $(libgvgd_la_SOURCES) $(circletexttest_SOURCES) $(fontsizetest_SOURCES) $(fontwheeltest_SOURCES) $(gddemo_SOURCES) $(gdtestft_SOURCES)
+ SOURCES = $(libgvgd_la_SOURCES) annotate.c circletexttest.c fontconfigtest.c fontsizetest.c fontwheeltest.c gd2copypal.c gd2time.c gd2togif.c gd2topng.c gdcmpgif.c gddemo.c gdparttopng.c gdtest.c gdtestft.c gdtopng.c gifanimtest.c giftogd2.c pngtogd.c pngtogd2.c testac.c testtr.c webpng.c
 
 srcdir = @srcdir@
-@@ -62,7 +61,7 @@ am__vpath_adj = case $$p in \
+@@ -74,7 +73,7 @@ am__vpath_adj = case $$p in \
     *) f=$$p;; \
   esac;
 am__strip_dir = `echo $$p | sed -e 's|^.*/||'`;
@ -19,16 +19,16 @@ $NetBSD: patch-ca,v 1.1 2004/11/29 22:11:51 seb Exp $
 	"$(DESTDIR)$(pkgincludedir)"
 pkglibLTLIBRARIES_INSTALL = $(INSTALL)
 LTLIBRARIES = $(pkglib_LTLIBRARIES)
-@@ -108,8 +107,6 @@ SOURCES = $(libgvgd_la_SOURCES) $(circle
- DIST_SOURCES = $(libgvgd_la_SOURCES) $(circletexttest_SOURCES) \
- 	$(fontsizetest_SOURCES) $(fontwheeltest_SOURCES) \
- 	$(gddemo_SOURCES) $(gdtestft_SOURCES)
+@@ -197,8 +196,6 @@ DIST_SOURCES = $(libgvgd_la_SOURCES) ann
+ 	gd2time.c gd2togif.c gd2topng.c gdcmpgif.c gddemo.c \
+ 	gdparttopng.c gdtest.c gdtestft.c gdtopng.c gifanimtest.c \
+ 	giftogd2.c pngtogd.c pngtogd2.c testac.c testtr.c webpng.c
 -htmlDATA_INSTALL = $(INSTALL_DATA)
 -DATA = $(html_DATA)
 am__pkginclude_HEADERS_DIST = gd.h gd_io.h gdcache.h gdfontg.h \
 	gdfontl.h gdfontmb.h gdfonts.h gdfontt.h gdhelpers.h \
 	jisx0208.h wbmp.h gdfx.h entities.h
-@@ -217,7 +214,6 @@ SOCKET_LIBS = @SOCKET_LIBS@
+@@ -306,7 +303,6 @@ SOCKET_LIBS = @SOCKET_LIBS@
 SORT = @SORT@
 STRIP = @STRIP@
 TCLINT_INCLUDES = @TCLINT_INCLUDES@
@ -36,7 +36,7 @@ $NetBSD: patch-ca,v 1.1 2004/11/29 22:11:51 seb Exp $
 TCL_CFLAGS = @TCL_CFLAGS@
 TCL_DEFS = @TCL_DEFS@
 TCL_INCLUDES = @TCL_INCLUDES@
-@@ -243,7 +239,6 @@ TK_VERSION = @TK_VERSION@
+@@ -332,7 +328,6 @@ TK_VERSION = @TK_VERSION@
 TK_XINCLUDES = @TK_XINCLUDES@
 TOP_DIR = @TOP_DIR@
 VERSION = @VERSION@
@ -44,7 +44,7 @@ $NetBSD: patch-ca,v 1.1 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@
-@@ -312,12 +307,10 @@ target_os = @target_os@
+@@ -401,12 +396,10 @@ target_os = @target_os@
 target_vendor = @target_vendor@
 html = gd.html
 AM_CPPFLAGS = @FT_INCLUDES@ @FC_INCLUDES@ @PNG_INCLUDES@ @JPEG_INCLUDES@ @Z_INCLUDES@
@ -54,10 +54,10 @@ $NetBSD: patch-ca,v 1.1 2004/11/29 22:11:51 seb Exp $
 
 @WITH_MYLIBGD_TRUE@pkglib_LTLIBRARIES = libgvgd.la
 -@WITH_MYLIBGD_TRUE@html_DATA = $(html)
- libgvgd_la_SOURCES = gd.c gd_gd.c gd_gd2.c gd_io.c gd_io_dp.c gd_io_file.c \
- 	gd_ss.c gd_io_ss.c gd_gif_in.c gd_gif_out.c gd_jpeg.c gd_png.c \
- 	gdcache.c gdfontg.c gdfontl.c gdfontmb.c gdfonts.c gdfontt.c \
-@@ -504,23 +497,6 @@ clean-libtool:
+ libgvgd_la_SOURCES = gd.c gdfx.c gd_security.c gd_gd.c gd_gd2.c gd_io.c gd_io_dp.c \
+ 	gd_gif_in.c gd_gif_out.c gd_io_file.c gd_io_ss.c gd_jpeg.c gd_png.c \
+ 	gd_ss.c gd_topal.c gd_wbmp.c gdcache.c gdfontg.c gdfontl.c gdfontmb.c \
+@@ -647,23 +640,6 @@ clean-libtool:
 distclean-libtool:
 	-rm -f libtool
 uninstall-info-am:
@ -81,7 +81,7 @@ $NetBSD: patch-ca,v 1.1 2004/11/29 22:11:51 seb Exp $
 install-pkgincludeHEADERS: $(pkginclude_HEADERS)
 	@$(NORMAL_INSTALL)
 	test -z "$(pkgincludedir)" || $(mkdir_p) "$(DESTDIR)$(pkgincludedir)"
-@@ -616,9 +592,9 @@ distdir: $(DISTFILES)
+@@ -759,9 +735,9 @@ distdir: $(DISTFILES)
 	done
 check-am: all-am
 check: check-am
@ -93,7 +93,7 @@ $NetBSD: patch-ca,v 1.1 2004/11/29 22:11:51 seb Exp $
 	  test -z "$$dir" || $(mkdir_p) "$$dir"; \
 	done
 install: install-am
-@@ -667,7 +643,7 @@ info: info-am
+@@ -810,7 +786,7 @@ info: info-am
 
 info-am:
 
@ -102,7 +102,7 @@ $NetBSD: patch-ca,v 1.1 2004/11/29 22:11:51 seb Exp $
 
 install-exec-am: install-pkglibLTLIBRARIES
 
-@@ -695,22 +671,21 @@ ps: ps-am
+@@ -838,22 +814,21 @@ ps: ps-am
 
 ps-am: