7 files changed, 98 insertions, 15 deletions

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