6 files changed, 53 insertions, 8 deletions
diff --git a/graphics/graphviz/files/patch-ae b/graphics/graphviz/files/patch-ae
index a517e4c..65bb2b4 100644
--- a/graphics/graphviz/files/patch-ae
+++ b/graphics/graphviz/files/patch-ae
@@ -1,11 +1,14 @@
---- 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 @@
+--- lefty/lefty.c.orig	Mon Oct  9 09:19:43 2000
++++ lefty/lefty.c	Fri Nov  3 04:20:09 2000
+@@ -44,7 +44,11 @@
+ #define canread(fp) ((fp)->_IO_read_end > (fp)->_IO_read_ptr)
  #else
- #ifdef _CNT_IN_FILESTRUCT
- #define canread(fp) ((fp)->_cnt > 0)
-+#elif __FreeBSD__
+ #ifdef NO_CNT_IN_FILESTRUCT
++#ifdef __FreeBSD__
 +#define canread(fp) ((fp)->_r > 0)
- #else
++#else
  #define canread(fp) ((fp)->_IO_read_end > (fp)->_IO_read_ptr)
++#endif
+ #else
+ #define canread(fp) ((fp)->_cnt > 0)
  #endif
diff --git a/graphics/graphviz/files/patch-doc:Makefile.am b/graphics/graphviz/files/patch-doc:Makefile.am
index 626acfe..acad5c2 100644
--- a/graphics/graphviz/files/patch-doc:Makefile.am
+++ b/graphics/graphviz/files/patch-doc:Makefile.am
@@ -5,6 +5,6 @@
  DOCS = dotguide.ps dotty.ps gd.html lefty.ps neatoguide.ps tcldot.html
  
 -docdir = $(prefix)/doc
-+docdir = $(datadir)/doc/graphviz
++docdir = $(datadir)/doc/@PACKAGE@
  doc_DATA = $(DOCS)
  EXTRA_DIST = $(DOCS)
diff --git a/graphics/graphviz/files/patch-lefty:Makefile.am b/graphics/graphviz/files/patch-lefty:Makefile.am
new file mode 100644
index 0000000..55f9914
--- /dev/null
+++ b/graphics/graphviz/files/patch-lefty:Makefile.am
@@ -0,0 +1,10 @@
+--- lefty/Makefile.am.orig	Sun Oct 15 16:53:05 2000
++++ lefty/Makefile.am	Fri Nov  3 03:24:02 2000
+@@ -21,6 +21,7 @@
+ 	nmakefile makefile.old
+ 
+ INCLUDES = \
++	@X_CFLAGS@ \
+ 	-I$(srcdir)/ws/x11 \
+ 	-I$(srcdir)/os/unix \
+ 	-I$(srcdir)/dot2l
diff --git a/graphics/graphviz/files/patch-lefty:ws:x11:Makefile.am b/graphics/graphviz/files/patch-lefty:ws:x11:Makefile.am
new file mode 100644
index 0000000..3d21611
--- /dev/null
+++ b/graphics/graphviz/files/patch-lefty:ws:x11:Makefile.am
@@ -0,0 +1,11 @@
+--- lefty/ws/x11/Makefile.am.orig	Sat May 27 03:07:57 2000
++++ lefty/ws/x11/Makefile.am	Fri Nov  3 03:25:30 2000
+@@ -9,7 +9,7 @@
+ noinst_HEADERS = gcommon.h
+ noinst_LTLIBRARIES = libws.la
+ 
+-INCLUDES = -I../..
++INCLUDES = @X_CFLAGS@ -I../..
+ 
+ libws_la_SOURCES = garray.c gbutton.c gcanvas.c gcommon.c glabel.c \
+ 	gmenu.c gpcanvas.c gquery.c gscroll.c gtext.c gview.c gcommon.h
diff --git a/graphics/graphviz/files/patch-lefty:ws:x11:libfilereq:Makefile.am b/graphics/graphviz/files/patch-lefty:ws:x11:libfilereq:Makefile.am
new file mode 100644
index 0000000..bb3c72c
--- /dev/null
+++ b/graphics/graphviz/files/patch-lefty:ws:x11:libfilereq:Makefile.am
@@ -0,0 +1,11 @@
+--- lefty/ws/x11/libfilereq/Makefile.am.orig	Sun Oct 15 14:31:01 2000
++++ lefty/ws/x11/libfilereq/Makefile.am	Fri Nov  3 03:27:59 2000
+@@ -7,6 +7,8 @@
+ noinst_HEADERS = SFinternal.h xstat.h
+ noinst_LTLIBRARIES = libfilereq.la
+ 
++INCLUDES = @X_CFLAGS@
++
+ libfilereq_la_SOURCES = Dir.c Draw.c Path.c SelFile.c SFinternal.h xstat.h
+ 
+ EXTRA_DIST = README.selfile
diff --git a/graphics/graphviz/files/patch-tkspline:Makefile.am b/graphics/graphviz/files/patch-tkspline:Makefile.am
new file mode 100644
index 0000000..a558f9d
--- /dev/null
+++ b/graphics/graphviz/files/patch-tkspline:Makefile.am
@@ -0,0 +1,10 @@
+--- tkspline/Makefile.am.orig	Sat May 27 03:07:57 2000
++++ tkspline/Makefile.am	Fri Nov  3 03:22:50 2000
+@@ -10,6 +10,7 @@
+ man_MANS = tkspline.n
+ 
+ INCLUDES = \
++	@X_CFLAGS@ \
+ 	@TCL_CFLAGS@ \
+ 	@TK_CFLAGS@ \
+ 	-I@TK_EXEC_PREFIX@/include \