Upgrade to 1.6.

10 files changed, 210 insertions, 61 deletions

diff --git a/graphics/graphviz/Makefile b/graphics/graphviz/Makefile
index 0360ef5fef7b..9b633ee2df0f 100644
--- a/graphics/graphviz/Makefile
+++ b/graphics/graphviz/Makefile
@@ -6,33 +6,28 @@
 #
 
 PORTNAME=	graphviz
-PORTVERSION=	1.5.1
-CATEGORIES=	graphics tk82
-MASTER_SITES=	http://www.research.att.com/sw/tools/graphviz/
-DISTNAME=	gviz15
-EXTRACT_SUFX=	.tgz
+PORTVERSION=	1.6
+CATEGORIES=	graphics tk83
+MASTER_SITES=	http://www.graphviz.org/pub/graphviz/
 
 MAINTAINER=	ports@FreeBSD.org
 
-LIB_DEPENDS=	tk82.1:${PORTSDIR}/x11-toolkits/tk82
-
-FETCH_ARGS=	-b
-WRKSRC=		${WRKDIR}/gv1.5
-MAKEFILE=	makefile
-MAN1=		dot.1 dotty.1 lefty.1 neato.1
-MANN=		tcldot.n
-
-DOCDIR=		${PREFIX}/share/doc/graphviz
-
-post-extract:
-	@${CP} ${FILESDIR}/freebsd.generic ${WRKSRC}/makearch
-
-post-install:
-	@${MKDIR} ${DOCDIR}
-	${INSTALL_DATA} ${WRKSRC}/*.htm* ${DOCDIR}
-	${INSTALL_DATA} ${WRKSRC}/*.txt ${DOCDIR}
-	${INSTALL_DATA} ${WRKSRC}/doc/*.ps ${DOCDIR}
-	${INSTALL_DATA} ${WRKSRC}/doc/*.html ${DOCDIR}
-	@${GZIP_CMD} ${DOCDIR}/*.ps
+LIB_DEPENDS=	jpeg.9:${PORTSDIR}/graphics/jpeg \
+		png.4:${PORTSDIR}/graphics/png \
+		tk83.1:${PORTSDIR}/x11-toolkits/tk83 \
+		ttf.4:${PORTSDIR}/print/freetype \
+		Xpm.4:${PORTSDIR}/graphics/xpm
+
+USE_AUTOCONF=	yes
+USE_LIBTOOL=	yes
+CONFIGURE_ENV=	CFLAGS="${CFLAGS} -I${LOCALBASE}/include -I${LOCALBASE}/include/tcl8.3 -I${LOCALBASE}/include/tk8.3 -DHAVE_TERMIOS" \
+		LDFLAGS="${LDFLAGS} -L${LOCALBASE}/lib" \
+		TCLCONFIG=${LOCALBASE}/lib/tcl8.3/tclConfig.sh \
+		TKCONFIG=${LOCALBASE}/lib/tk8.3/tkConfig.sh
+USE_GMAKE=	yes
+
+MAN1=	dot.1 dotty.1 lefty.1 neato.1
+MAN3=	agraph.3 cdt.3 graph.3 pathplan.3
+MANN=	gdtclft.n tcldgl.n tcldgr.n tcldot.n tkspline.n
 
 .include <bsd.port.mk>
diff --git a/graphics/graphviz/distinfo b/graphics/graphviz/distinfo
index 11aa0a732987..4260992877a2 100644
--- a/graphics/graphviz/distinfo
+++ b/graphics/graphviz/distinfo
@@ -1 +1 @@
-MD5 (gviz15.tgz) = cac20849481cfff4c41341f3437fdf6e
+MD5 (graphviz-1.6.tar.gz) = bad03a6a1bee4c2bb0928dd017d61f2b
diff --git a/graphics/graphviz/files/patch-ac b/graphics/graphviz/files/patch-ac
index 7fa623e54a42..c60a65d1e500 100644
--- a/graphics/graphviz/files/patch-ac
+++ b/graphics/graphviz/files/patch-ac
@@ -1,5 +1,5 @@
---- src/cmd/lefty/os/unix/io.c.orig	Mon Mar 10 21:45:50 1997
-+++ src/cmd/lefty/os/unix/io.c	Tue Jan 27 20:45:50 1998
+--- lefty/os/unix/io.c.orig	Tue Apr 18 05:56:10 2000
++++ lefty/os/unix/io.c	Tue Oct 17 18:40:25 2000
 @@ -10,7 +10,11 @@
  #include <fcntl.h>
  #include <signal.h>
@@ -12,7 +12,7 @@
  #include <sys/time.h>
  #include <sys/socket.h>
  #include <netinet/in.h>
-@@ -271,7 +267,11 @@
+@@ -271,7 +275,11 @@
  static int findpty (int *fd) {
      char *majorp, *minorp;
      char pty[32], tty[32];
@@ -24,7 +24,7 @@
  
      static char ptymajor[] = "pqrs";
      static char ptyminor[] = "0123456789abcdefghijklmnopqrstuvwxyz";
-@@ -286,9 +278,15 @@
+@@ -282,9 +290,15 @@
              if ((fd[0] = open (pty, O_RDWR)) >= 0) {
                  sprintf (tty, "/dev/tty%c%c", *majorp, *minorp);
                  if ((fd[1] = open (tty, O_RDWR)) >= 0) {
diff --git a/graphics/graphviz/files/patch-ae b/graphics/graphviz/files/patch-ae
index 8dd43091121c..a517e4cfdf27 100644
--- a/graphics/graphviz/files/patch-ae
+++ b/graphics/graphviz/files/patch-ae
@@ -1,14 +1,11 @@
---- src/cmd/lefty/lefty.c.orig	Mon Mar 24 18:01:54 1997
-+++ src/cmd/lefty/lefty.c	Tue Jan 27 20:25:04 1998
-@@ -29,7 +29,11 @@
- #ifdef GNU
- #define canread(fp) ((fp)->_IO_read_end > (fp)->_IO_read_ptr)
+--- lefty/lefty.c.orig	Tue Apr 18 05:55:50 2000
++++ lefty/lefty.c	Tue Oct 17 18:47:51 2000
+@@ -32,6 +32,8 @@
  #else
-+#ifdef __FreeBSD__
-+#define canread(fp) ((fp)->_r >0)
-+#else
+ #ifdef _CNT_IN_FILESTRUCT
  #define canread(fp) ((fp)->_cnt > 0)
-+#endif
- #endif
++#elif __FreeBSD__
++#define canread(fp) ((fp)->_r > 0)
+ #else
+ #define canread(fp) ((fp)->_IO_read_end > (fp)->_IO_read_ptr)
  #endif
- 
diff --git a/graphics/graphviz/files/patch-agraph:agraph.h b/graphics/graphviz/files/patch-agraph:agraph.h
new file mode 100644
index 000000000000..bd3cd84d494b
--- /dev/null
+++ b/graphics/graphviz/files/patch-agraph:agraph.h
@@ -0,0 +1,11 @@
+--- agraph/agraph.h.orig	Tue Apr 18 05:54:03 2000
++++ agraph/agraph.h	Tue Oct 17 17:51:06 2000
+@@ -45,6 +45,8 @@
+ #define NILsym			NIL(Agsym_t*)
+ #endif
+ 
++typedef unsigned long 		ulong;
++
+ /* forward struct type declarations */
+ typedef struct Agtag_s		Agtag_t;
+ typedef struct Agobj_s		Agobj_t;	/* generic object header */
diff --git a/graphics/graphviz/files/patch-configure.in b/graphics/graphviz/files/patch-configure.in
new file mode 100644
index 000000000000..49fbd9a880a4
--- /dev/null
+++ b/graphics/graphviz/files/patch-configure.in
@@ -0,0 +1,44 @@
+--- configure.in.orig	Tue Oct 17 17:19:22 2000
++++ configure.in	Tue Oct 17 17:23:32 2000
+@@ -44,13 +44,17 @@
+ 
+ AC_ARG_WITH(tcl, [  --with-tcl=DIR          use Tcl binaries from DIR], TCLSH_EXEC_PREFIX=$withval,)
+ 
+-if test -f $TCLSH_EXEC_PREFIX/lib/tclConfig.sh; then
+-    AC_MSG_RESULT([using $TCLSH_EXEC_PREFIX/lib/tclConfig.sh])
++if test -z ${TCLCONFIG}; then
++    TCLCONFIG=${TCLSH_EXEC_PREFIX}/lib/tclConfig.sh
++fi
++
++if test -f $TCLCONFIG; then
++    AC_MSG_RESULT([using $TCLCONFIG])
+ else
+     AC_MSG_ERROR([Unable to find tclConfig.sh.])
+ fi
+ 
+-file=${TCLSH_EXEC_PREFIX}/lib/tclConfig.sh
++file=${TCLCONFIG}
+ . $file
+ if test "${TCL_SUPPORTS_STUBS}" = "1"; then
+     TCL_CFLAGS="${TCL_CFLAGS} -DUSE_TCL_STUBS"
+@@ -104,13 +108,17 @@
+ AC_SUBST(TCL_BUILD_STUB_LIB_PATH)
+ AC_SUBST(TCL_STUB_LIB_PATH)
+ 
+-if test -f $TCLSH_EXEC_PREFIX/lib/tkConfig.sh; then
+-    AC_MSG_RESULT([using $TCLSH_EXEC_PREFIX/lib/tkConfig.sh])
++if test -z ${TKCONFIG}; then
++    TKCONFIG=${TCLSH_EXEC_PREFIX}/lib/tkConfig.sh
++fi
++
++if test -f $TKCONFIG; then
++    AC_MSG_RESULT([using $TKCONFIG])
+ else
+     AC_MSG_ERROR([Unable find tkConfig.sh.])
+ fi
+ 
+-file=${TCLSH_EXEC_PREFIX}/lib/tkConfig.sh
++file=${TKCONFIG}
+ . $file
+ 
+ # NB. No TK_SUPPORTS_STUBS set by tkConfig.sh
diff --git a/graphics/graphviz/files/patch-doc:Makefile.am b/graphics/graphviz/files/patch-doc:Makefile.am
new file mode 100644
index 000000000000..626acfef99f3
--- /dev/null
+++ b/graphics/graphviz/files/patch-doc:Makefile.am
@@ -0,0 +1,10 @@
+--- doc/Makefile.am.orig	Thu May  4 02:31:24 2000
++++ doc/Makefile.am	Tue Oct 17 19:10:01 2000
+@@ -4,6 +4,6 @@
+ 
+ DOCS = dotguide.ps dotty.ps gd.html lefty.ps neatoguide.ps tcldot.html
+ 
+-docdir = $(prefix)/doc
++docdir = $(datadir)/doc/graphviz
+ doc_DATA = $(DOCS)
+ EXTRA_DIST = $(DOCS)
diff --git a/graphics/graphviz/files/patch-lefty:ws:x11:libfilereq:Dir.c b/graphics/graphviz/files/patch-lefty:ws:x11:libfilereq:Dir.c
new file mode 100644
index 000000000000..818a0ee7c348
--- /dev/null
+++ b/graphics/graphviz/files/patch-lefty:ws:x11:libfilereq:Dir.c
@@ -0,0 +1,11 @@
+--- lefty/ws/x11/libfilereq/Dir.c.orig	Tue Apr 18 05:56:34 2000
++++ lefty/ws/x11/libfilereq/Dir.c	Tue Oct 17 18:29:35 2000
+@@ -32,7 +32,7 @@
+ 
+ #include "SFinternal.h"
+ 
+-#if defined(SVR4) || defined(SYSV) || defined(USG) || defined(__osf__) || defined (__svr4__)
++#if defined(SVR4) || defined(SYSV) || defined(USG) || defined(__osf__) || defined (__svr4__) || defined (__FreeBSD__)
+ #include <dirent.h>
+ #else /* defined(SVR4) || defined(SYSV) || defined(USG) */
+ #include <sys/dir.h>
diff --git a/graphics/graphviz/files/patch-lefty:ws:x11:libfilereq:SFinternal.h b/graphics/graphviz/files/patch-lefty:ws:x11:libfilereq:SFinternal.h
new file mode 100644
index 000000000000..cf039634d6ba
--- /dev/null
+++ b/graphics/graphviz/files/patch-lefty:ws:x11:libfilereq:SFinternal.h
@@ -0,0 +1,10 @@
+--- lefty/ws/x11/libfilereq/SFinternal.h.orig	Tue Apr 18 05:56:37 2000
++++ lefty/ws/x11/libfilereq/SFinternal.h	Tue Oct 17 18:27:51 2000
+@@ -29,6 +29,7 @@
+ #include <X11/Xos.h>
+ #include <X11/Xaw/Text.h>
+ #include <X11/Xaw/AsciiText.h>
++#include <sys/types.h>
+ 
+ #define SEL_FILE_CANCEL		-1
+ #define SEL_FILE_OK		0
diff --git a/graphics/graphviz/pkg-plist b/graphics/graphviz/pkg-plist
index a80e06da0d5d..83163a498be6 100644
--- a/graphics/graphviz/pkg-plist
+++ b/graphics/graphviz/pkg-plist
@@ -1,26 +1,97 @@
-bin/dot
+bin/dotneato
 bin/dotty
 bin/lefty
 bin/lneato
-bin/neato
-lib/Tcldot/Tcldot.so.1.5
-lib/Tcldot/pkgIndex.tcl
-share/graphviz/lefty/dotty.lefty
-share/graphviz/lefty/dotty_draw.lefty
-share/graphviz/lefty/dotty_edit.lefty
-share/graphviz/lefty/dotty_layout.lefty
-share/graphviz/lefty/dotty_ui.lefty
-share/doc/graphviz/FAQ.html
-share/doc/graphviz/FAQ.txt
-share/doc/graphviz/LICENSE.html
-share/doc/graphviz/LICENSE.txt
-share/doc/graphviz/MINTERMS.txt
-share/doc/graphviz/dotguide.ps.gz
-share/doc/graphviz/dotty.ps.gz
+lib/graphviz/demo/dge
+lib/graphviz/demo/dge.README
+lib/graphviz/demo/dge.example1.dot
+lib/graphviz/demo/dge.example2.dot
+lib/graphviz/demo/doted
+lib/graphviz/demo/doted.README
+lib/graphviz/demo/entities
+lib/graphviz/demo/entities.README
+lib/graphviz/demo/entities.html
+lib/graphviz/demo/ihi
+lib/graphviz/demo/ihi.README
+lib/graphviz/demo/ihi.testdata
+lib/graphviz/demo/pathplan
+lib/graphviz/demo/pathplan.README
+lib/graphviz/demo/spline
+lib/graphviz/demo/spline.README
+lib/graphviz/graphs/directed/KW91.dot
+lib/graphviz/graphs/directed/NaN.dot
+lib/graphviz/graphs/directed/abstract.dot
+lib/graphviz/graphs/directed/alf.dot
+lib/graphviz/graphs/directed/awilliams.dot
+lib/graphviz/graphs/directed/clust.dot
+lib/graphviz/graphs/directed/clust1.dot
+lib/graphviz/graphs/directed/clust2.dot
+lib/graphviz/graphs/directed/clust3.dot
+lib/graphviz/graphs/directed/clust4.dot
+lib/graphviz/graphs/directed/clust5.dot
+lib/graphviz/graphs/directed/crazy.dot
+lib/graphviz/graphs/directed/ctext.dot
+lib/graphviz/graphs/directed/dfa.dot
+lib/graphviz/graphs/directed/fig6.dot
+lib/graphviz/graphs/directed/fsm.dot
+lib/graphviz/graphs/directed/grammar.dot
+lib/graphviz/graphs/directed/hashtable.dot
+lib/graphviz/graphs/directed/jcctree.dot
+lib/graphviz/graphs/directed/jsort.dot
+lib/graphviz/graphs/directed/ldbxtried.dot
+lib/graphviz/graphs/directed/mike.dot
+lib/graphviz/graphs/directed/newarrows.dot
+lib/graphviz/graphs/directed/nhg.dot
+lib/graphviz/graphs/directed/pgram.dot
+lib/graphviz/graphs/directed/pm2way.dot
+lib/graphviz/graphs/directed/pmpipe.dot
+lib/graphviz/graphs/directed/polypoly.dot
+lib/graphviz/graphs/directed/proc3d.dot
+lib/graphviz/graphs/directed/records.dot
+lib/graphviz/graphs/directed/rowe.dot
+lib/graphviz/graphs/directed/shells.dot
+lib/graphviz/graphs/directed/states.dot
+lib/graphviz/graphs/directed/structs.dot
+lib/graphviz/graphs/directed/train11.dot
+lib/graphviz/graphs/directed/trapeziumlr.dot
+lib/graphviz/graphs/directed/tree.dot
+lib/graphviz/graphs/directed/triedds.dot
+lib/graphviz/graphs/directed/try.dot
+lib/graphviz/graphs/directed/unix.dot
+lib/graphviz/graphs/directed/unix2.dot
+lib/graphviz/graphs/directed/viewfile.dot
+lib/graphviz/graphs/directed/world.dot
+lib/graphviz/graphs/undirected/ER.dot
+lib/graphviz/graphs/undirected/ngk10_4.dot
+lib/graphviz/graphs/undirected/process.dot
+lib/graphviz/lefty/dotty.lefty
+lib/graphviz/lefty/dotty_draw.lefty
+lib/graphviz/lefty/dotty_edit.lefty
+lib/graphviz/lefty/dotty_layout.lefty
+lib/graphviz/lefty/dotty_ui.lefty
+lib/graphviz/libgdtclft.so
+lib/graphviz/libgdtclft.so.0
+lib/graphviz/libtcldgl.so
+lib/graphviz/libtcldgl.so.0
+lib/graphviz/libtcldgr.so
+lib/graphviz/libtcldgr.so.0
+lib/graphviz/libtcldot.so
+lib/graphviz/libtcldot.so.0
+lib/graphviz/libtclpathplan.so
+lib/graphviz/libtclpathplan.so.0
+lib/graphviz/libtkspline.so
+lib/graphviz/libtkspline.so.0
+lib/graphviz/pkgIndex.tcl
+share/doc/graphviz/dotguide.ps
+share/doc/graphviz/dotty.ps
 share/doc/graphviz/gd.html
-share/doc/graphviz/lefty.ps.gz
-share/doc/graphviz/neatoguide.ps.gz
+share/doc/graphviz/lefty.ps
+share/doc/graphviz/neatoguide.ps
 share/doc/graphviz/tcldot.html
 @dirrm share/doc/graphviz
-@dirrm share/graphviz/lefty
-@dirrm lib/Tcldot
+@dirrm lib/graphviz/lefty
+@dirrm lib/graphviz/graphs/undirected
+@dirrm lib/graphviz/graphs/directed
+@dirrm lib/graphviz/graphs
+@dirrm lib/graphviz/demo
+@dirrm lib/graphviz