Update to version 1.8.10.

XXX I was not able to make dynagraph working, hence it is still disabled.

Package changes: documentation distributed in two directories
i.e. $PREFIX/share/doc/{html/,}graphiz/.

ChangeLog entry since previous packaged version.

September 27, 2002
                - declare this version 1.8.10
        - general
            - various configure.in fixes and simplifications
            - change configure to now build dynagraph by default
                "--without-dynagraph" is supported
            - fix graphviz.spec.in to partition packages properly
                graphviz no longer depends on graphviz-tcl.
            -  Makefile.old cleanups
            - configure.old now set version number automatically from
              configure.in
        - dot, neato, twopi
            - Initial support for image node shapes + URL fetch.
            - Made number of dimensions a runtime variable in neato.
            - Bug fix in vrmlgen for degenerate splines.
            - Bug fix - ordering=in should now work
            - Bug fix - layers no numbered from 0 to match PS requirements
            - Bug fix - don't draw arrows on invisible edges
            - Bug fix - when pack=true and ratio is set
            - Bug fix - agraph/scan.l to work with latest flex beta

4 files changed, 41 insertions, 28 deletions

diff --git a/graphics/graphviz/Makefile b/graphics/graphviz/Makefile
index d7c547bde40..cd6b61d2b96 100644
--- a/graphics/graphviz/Makefile
+++ b/graphics/graphviz/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.6 2002/08/28 13:49:35 seb Exp $
+# $NetBSD: Makefile,v 1.7 2002/12/01 18:33:41 seb Exp $
 #
 
-DISTNAME=	graphviz-1.8.9
+DISTNAME=	graphviz-1.8.10
 CATEGORIES=	graphics
 MASTER_SITES=	http://www.graphviz.org/pub/graphviz/ARCHIVE/
 
@@ -23,9 +23,9 @@ CONFIGURE_ENV+=		X11PREFIX=${X11PREFIX} X11BASE=${X11BASE}
 CONFIGURE_ENV+=		BUILDLINK_PREFIX_TCL=${BUILDLINK_PREFIX.tcl}
 CONFIGURE_ENV+=		BUILDLINK_PREFIX_TK=${BUILDLINK_PREFIX.tk}
 
-# Not yet...
-#CONFIGURE_ARGS+=	--with-dynagraph
+# Dynagraph is left out for now
 #UNLIMIT_RESOURCES=	datasize stacksize memorysize
+CONFIGURE_ARGS+=	--without-dynagraph
 
 # clean up a bit to help package maintainer produce patch files
 post-extract:
@@ -34,13 +34,21 @@ post-extract:
 
 post-install:
 	${INSTALL_DATA_DIR} ${PREFIX}/share/doc/graphviz
-.for __f__ in Dot.ref FAQ.html dotguide.pdf dottyguide.pdf gd.html \
-		leftyguide.pdf neatoguide.pdf tcldot.html
+	${INSTALL_DATA_DIR} ${PREFIX}/share/doc/html/graphviz
+.for __f__ in Dot.ref dotguide.pdf dottyguide.pdf leftyguide.pdf \
+		 neatoguide.pdf
 	${INSTALL_DATA} ${WRKSRC}/doc/${__f__} ${PREFIX}/share/doc/graphviz
 .endfor
+.for __f__ in FAQ.html gd.html tcldot.html
+	${INSTALL_DATA} ${WRKSRC}/doc/${__f__} ${PREFIX}/share/doc/html/graphviz
+.endfor
+.if 0	# dynagraph "disabled"
+	${INSTALL_DATA} ${WRKSRC}/dynagraph/dynagraph.html ${PREFIX}/share/doc/html/graphviz	
+.endif
 	${INSTALL_DATA} ${WRKSRC}/COPYING ${PREFIX}/share/doc/graphviz
 	${INSTALL_DATA} ${WRKSRC}/MINTERMS.txt ${PREFIX}/share/doc/graphviz
 
+
 .include "../../devel/zlib/buildlink2.mk"
 .include "../../graphics/png/buildlink2.mk"
 .include "../../graphics/jpeg/buildlink2.mk"
diff --git a/graphics/graphviz/PLIST b/graphics/graphviz/PLIST
index 2054762e81d..82143ee0920 100644
--- a/graphics/graphviz/PLIST
+++ b/graphics/graphviz/PLIST
@@ -1,11 +1,13 @@
-@comment $NetBSD: PLIST,v 1.3 2002/08/28 13:49:35 seb Exp $
+@comment $NetBSD: PLIST,v 1.4 2002/12/01 18:33:41 seb Exp $
 bin/acyclic
 bin/ccomps
 bin/colorize
 bin/dot
 bin/dotty
+@comment bin/dynagraph
 bin/gc
 bin/gpr
+@comment bin/graphsearch
 bin/lefty
 bin/lneato
 bin/neato
@@ -17,6 +19,7 @@ bin/twopi
 bin/unflatten
 include/graphviz/aghdr.h
 include/graphviz/agraph.h
+include/graphviz/ast_common.h
 include/graphviz/cdt.h
 include/graphviz/dthdr.h
 include/graphviz/exgram.h
@@ -143,14 +146,15 @@ man/mann/tcldot.n
 man/mann/tkspline.n
 share/doc/graphviz/COPYING
 share/doc/graphviz/Dot.ref
-share/doc/graphviz/FAQ.html
 share/doc/graphviz/MINTERMS.txt
 share/doc/graphviz/dotguide.pdf
 share/doc/graphviz/dottyguide.pdf
-share/doc/graphviz/gd.html
 share/doc/graphviz/leftyguide.pdf
 share/doc/graphviz/neatoguide.pdf
-share/doc/graphviz/tcldot.html
+share/doc/html/graphviz/FAQ.html
+@comment share/doc/html/graphviz/dynagraph.html
+share/doc/html/graphviz/gd.html
+share/doc/html/graphviz/tcldot.html
 share/examples/graphviz/dge
 share/examples/graphviz/dge.README
 share/examples/graphviz/dge.example1.dot
@@ -253,6 +257,7 @@ share/graphviz/lefty/tree.lefty
 @dirrm share/graphviz
 @dirrm share/examples/graphviz/pathplan_data
 @dirrm share/examples/graphviz
+@dirrm share/doc/html/graphviz
 @dirrm share/doc/graphviz
 @dirrm lib/graphviz
 @dirrm include/graphviz
diff --git a/graphics/graphviz/distinfo b/graphics/graphviz/distinfo
index 90e605cc069..a54d3ca0842 100644
--- a/graphics/graphviz/distinfo
+++ b/graphics/graphviz/distinfo
@@ -1,10 +1,10 @@
-$NetBSD: distinfo,v 1.5 2002/08/28 13:49:35 seb Exp $
+$NetBSD: distinfo,v 1.6 2002/12/01 18:33:41 seb Exp $
 
-SHA1 (graphviz-1.8.9.tar.gz) = 0bee65fc6685947bd8ee8ecdb20f5c87eb9bee64
-Size (graphviz-1.8.9.tar.gz) = 2775329 bytes
+SHA1 (graphviz-1.8.10.tar.gz) = 2559795b6601d419890d2780803032d6504869fa
+Size (graphviz-1.8.10.tar.gz) = 2837389 bytes
 SHA1 (patch-aa) = d60925921fa7daa753ee04e267fce6f978644ea2
 SHA1 (patch-ab) = 4f726e7f8c5c61fd73b53c83e348b503ed2c5299
-SHA1 (patch-ac) = 8f9fb5adc0a9e3613766c5c7b073facd444f45ec
+SHA1 (patch-ac) = 08372eb70ad0040519dfe6ae32216976127e7d15
 SHA1 (patch-ad) = 81f77ec2d25c1c8e8c12f73891dcdcd67f260e17
 SHA1 (patch-ae) = 40c123397384368504d2d4930f1c52d4a4826350
 SHA1 (patch-af) = dcb086b86e33d534a462e3e82feb07153375b153
diff --git a/graphics/graphviz/patches/patch-ac b/graphics/graphviz/patches/patch-ac
index ddd165a4aab..a982793cc00 100644
--- a/graphics/graphviz/patches/patch-ac
+++ b/graphics/graphviz/patches/patch-ac
@@ -1,8 +1,8 @@
-$NetBSD: patch-ac,v 1.5 2002/08/28 13:49:36 seb Exp $
+$NetBSD: patch-ac,v 1.6 2002/12/01 18:33:42 seb Exp $
 
---- configure.orig	Mon Aug  5 05:08:48 2002
+--- configure.orig	Thu Nov 28 12:11:23 2002
 +++ configure
-@@ -1479,60 +1479,9 @@ else
+@@ -1483,60 +1483,9 @@ else
    fi
  fi
  
@@ -16,7 +16,7 @@ $NetBSD: patch-ac,v 1.5 2002/08/28 13:49:36 seb Exp $
 -   'void exit (int);'
 -do
 -  cat > conftest.$ac_ext <<EOF
--#line 1493 "configure"
+-#line 1497 "configure"
 -#include "confdefs.h"
 -#include <stdlib.h>
 -$ac_declaration
@@ -24,7 +24,7 @@ $NetBSD: patch-ac,v 1.5 2002/08/28 13:49:36 seb Exp $
 -exit (42);
 -; return 0; }
 -EOF
--if { (eval echo configure:1501: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+-if { (eval echo configure:1505: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
 -  :
 -else
 -  echo "configure: failed program was:" >&5
@@ -34,14 +34,14 @@ $NetBSD: patch-ac,v 1.5 2002/08/28 13:49:36 seb Exp $
 -fi
 -rm -f conftest*
 -  cat > conftest.$ac_ext <<EOF
--#line 1511 "configure"
+-#line 1515 "configure"
 -#include "confdefs.h"
 -$ac_declaration
 -int main() {
 -exit (42);
 -; return 0; }
 -EOF
--if { (eval echo configure:1518: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+-if { (eval echo configure:1522: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
 -  rm -rf conftest*
 -  break
 -else
@@ -59,12 +59,12 @@ $NetBSD: patch-ac,v 1.5 2002/08/28 13:49:36 seb Exp $
 -
  
          echo $ac_n "checking for strerror in -lcposix""... $ac_c" 1>&6
--echo "configure:1536: checking for strerror in -lcposix" >&5
-+echo "configure:1485: checking for strerror in -lcposix" >&5
+-echo "configure:1540: checking for strerror in -lcposix" >&5
++echo "configure:1489: checking for strerror in -lcposix" >&5
  ac_lib_var=`echo cposix'_'strerror | sed 'y%./+-%__p_%'`
  if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
    echo $ac_n "(cached) $ac_c" 1>&6
-@@ -1864,7 +1813,7 @@ test -n "$YACC" && break
+@@ -1868,7 +1817,7 @@ test -n "$YACC" && break
  done
  test -n "$YACC" || YACC="yacc"
  
@@ -73,7 +73,7 @@ $NetBSD: patch-ac,v 1.5 2002/08/28 13:49:36 seb Exp $
  do
  # Extract the first word of "$ac_prog", so it can be a program name with args.
  set dummy $ac_prog; ac_word=$2
-@@ -5897,7 +5846,10 @@ DEFAULT_FONTPATH="C:/WINDOWS/FONTS;C:/WI
+@@ -5901,7 +5850,10 @@ DEFAULT_FONTPATH="C:/WINDOWS/FONTS;C:/WI
  PATHSEPARATOR=";"
  else
  # This sucks!  Whatever happened to standards for file system layout?
@@ -85,7 +85,7 @@ $NetBSD: patch-ac,v 1.5 2002/08/28 13:49:36 seb Exp $
  PATHSEPARATOR=":"
  fi
  fi
-@@ -6113,7 +6065,7 @@ if test -f $TCLCONFIG; then
+@@ -6124,7 +6076,7 @@ if test -f $TCLCONFIG; then
      . $file
      # TCL STUBS support is required
      if test "${TCL_SUPPORTS_STUBS}" = "1"; then
@@ -94,7 +94,7 @@ $NetBSD: patch-ac,v 1.5 2002/08/28 13:49:36 seb Exp $
          TCL_PKGINDEX="gdtclft/pkgIndex.tcl tcldot/pkgIndex.tcl tcldgr/pkgIndex.tcl tcldgl/pkgIndex.tcl tclpathplan/pkgIndex.tcl"
      else
          echo "configure: warning: Tcl does not have STUBs support, perhaps it is too old? The packages: "gdtclft tcldot tcldgr tcldgl tclpathplan" will not be built" 1>&2
-@@ -6203,7 +6155,7 @@ if test -f $TKCONFIG; then
+@@ -6214,7 +6166,7 @@ if test -f $TKCONFIG; then
      file=${TKCONFIG}
      . $file
      if test "${TCL_SUPPORTS_STUBS}" = "1"; then
@@ -103,7 +103,7 @@ $NetBSD: patch-ac,v 1.5 2002/08/28 13:49:36 seb Exp $
          TK_PKGINDEX="tkspline/pkgIndex.tcl"
      else
          echo "configure: warning: Tcl does not have STUBs support, so neither does Tk. The packages: "tkspline" will not be built" 1>&2
-@@ -8736,36 +8688,12 @@ rm -f conftest*
+@@ -8885,36 +8837,12 @@ rm -f conftest*
  
  # -----------------------------------
  # tclInt.h