3 files changed, 33 insertions, 49 deletions

diff --git a/graphics/graphviz/files/patch-aclocal.m4 b/graphics/graphviz/files/patch-aclocal.m4
index d90b04c106c7..64ee7d0e9a84 100644
--- a/graphics/graphviz/files/patch-aclocal.m4
+++ b/graphics/graphviz/files/patch-aclocal.m4
@@ -1,26 +1,23 @@
-
-$FreeBSD$
-
---- aclocal.m4.orig	Fri Apr 12 01:09:26 2002
-+++ aclocal.m4	Thu Apr 25 13:37:28 2002
-@@ -59,10 +59,10 @@
- AC_REQUIRE([AC_ARG_PROGRAM])
- dnl FIXME This is truly gross.
- missing_dir=`cd $ac_aux_dir && pwd`
--AM_MISSING_PROG(ACLOCAL, aclocal, $missing_dir)
--AM_MISSING_PROG(AUTOCONF, autoconf, $missing_dir)
--AM_MISSING_PROG(AUTOMAKE, automake, $missing_dir)
--AM_MISSING_PROG(AUTOHEADER, autoheader, $missing_dir)
-+AM_MISSING_PROG(ACLOCAL, ${ACLOCAL}, $missing_dir)
-+AM_MISSING_PROG(AUTOCONF, ${AUTOCONF}, $missing_dir)
-+AM_MISSING_PROG(AUTOMAKE, ${AUTOMAKE}, $missing_dir)
-+AM_MISSING_PROG(AUTOHEADER, ${AUTOHEADER}, $missing_dir)
- AM_MISSING_PROG(MAKEINFO, makeinfo, $missing_dir)
- AC_REQUIRE([AC_PROG_MAKE_SET])])
- 
-@@ -129,10 +129,13 @@
- 
+--- aclocal.m4.orig	Tue Feb 18 18:22:38 2003
++++ aclocal.m4	Tue Feb 18 18:24:43 2003
+@@ -144,10 +144,10 @@
+ # Some tools Automake needs.
+ AC_REQUIRE([AM_SANITY_CHECK])dnl
+ AC_REQUIRE([AC_ARG_PROGRAM])dnl
+-AM_MISSING_PROG(ACLOCAL, aclocal)
+-AM_MISSING_PROG(AUTOCONF, autoconf)
+-AM_MISSING_PROG(AUTOMAKE, automake)
+-AM_MISSING_PROG(AUTOHEADER, autoheader)
++AM_MISSING_PROG(ACLOCAL, ${ACLOCAL})
++AM_MISSING_PROG(AUTOCONF, ${AUTOCONF})
++AM_MISSING_PROG(AUTOMAKE, ${AUTOMAKE})
++AM_MISSING_PROG(AUTOHEADER, ${AUTOHEADER})
+ AM_MISSING_PROG(MAKEINFO, makeinfo)
+ AM_MISSING_PROG(AMTAR, tar)
+ AM_PROG_INSTALL_SH
+@@ -563,10 +563,13 @@
  # serial 46 AC_PROG_LIBTOOL
+ 
  AC_DEFUN([AC_PROG_LIBTOOL],
 -[AC_REQUIRE([AC_LIBTOOL_SETUP])dnl
 +[
diff --git a/graphics/graphviz/files/patch-configure.in b/graphics/graphviz/files/patch-configure.in
deleted file mode 100644
index b51d4b20bc10..000000000000
--- a/graphics/graphviz/files/patch-configure.in
+++ /dev/null
@@ -1,24 +0,0 @@
---- configure.in.orig	Sat Jul  6 12:56:52 2002
-+++ configure.in	Thu Jul 25 07:49:22 2002
-@@ -166,7 +166,9 @@
- 
- # Some systems don't have Tcl.  Don't build
- # the Tcl products if we don't have the library.
--TCLCONFIG=${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])
-     file=${TCLCONFIG}
-@@ -242,7 +244,9 @@
- 
- # Some systems have Tcl, but not TK.  Don't build
- # the Tk products if we don't have the library.
--TKCONFIG=${WISH_EXEC_PREFIX}/lib/tkConfig.sh
-+if test -z $TKCONFIG; then
-+    TKCONFIG=${WISH_EXEC_PREFIX}/lib/tkConfig.sh
-+fi
- if test -f $TKCONFIG; then
-     AC_MSG_RESULT([using $TKCONFIG])
-     file=${TKCONFIG}
diff --git a/graphics/graphviz/files/patch-tools::sfio::sfhdr.h b/graphics/graphviz/files/patch-tools::sfio::sfhdr.h
index dee4a6c658aa..efdc60a1cad5 100644
--- a/graphics/graphviz/files/patch-tools::sfio::sfhdr.h
+++ b/graphics/graphviz/files/patch-tools::sfio::sfhdr.h
@@ -1,6 +1,17 @@
---- tools/sfio/sfhdr.h.orig	Thu Apr 18 10:28:45 2002
-+++ tools/sfio/sfhdr.h	Thu Apr 18 10:29:17 2002
-@@ -230,7 +230,9 @@
+--- tools/sfio/sfhdr.h.orig	Fri Apr 27 04:17:42 2001
++++ tools/sfio/sfhdr.h	Tue Feb 18 19:26:37 2003
+@@ -122,6 +122,10 @@
+ #include	<errno.h>
+ #include	<ctype.h>
+ 
++#ifndef va_copy
++#define va_copy(to,fr) ((to)=(fr))
++#endif
++
+ #if vt_threaded
+ 
+ /* initialization */
+@@ -230,7 +234,9 @@
  #endif
  
  #if _hdr_values