5 files changed, 52 insertions, 34 deletions
diff --git a/emulators/frodo/files/patch-CmdPipe.cpp b/emulators/frodo/files/patch-CmdPipe.cpp
index cc32fba3b77e..50ee390a8da5 100644
--- a/emulators/frodo/files/patch-CmdPipe.cpp
+++ b/emulators/frodo/files/patch-CmdPipe.cpp
@@ -1,21 +1,10 @@
-
-$FreeBSD$
-
---- CmdPipe.cpp.orig	Wed Aug  6 20:56:26 1997
-+++ CmdPipe.cpp	Sat Nov 30 01:29:18 2002
-@@ -9,16 +9,18 @@
- 
- 
- extern "C" {
--	#include <string.h>
-+	#include <stdlib.h>
- 	#include <unistd.h>
- 	#include <sys/wait.h>
- 	#include <sys/types.h>
+--- CmdPipe.cpp.orig	Wed Jan  2 22:19:34 2002
++++ CmdPipe.cpp	Fri Sep  5 21:13:34 2003
+@@ -17,9 +17,11 @@
  	#include <string.h>
  	#include <signal.h>
  
-+#if ! defined(__FreeBSD__)
++#if !defined(__FreeBSD__)
  #if defined(__alpha__)
  	#include <cma.h>
  #endif
@@ -23,7 +12,7 @@ $FreeBSD$
  
  #if defined(AIX)
  	#include <sys/select.h>
-@@ -27,6 +29,9 @@
+@@ -28,6 +30,9 @@
  #endif
  
  #if defined(__linux__)
diff --git a/emulators/frodo/files/patch-CmdPipe.h b/emulators/frodo/files/patch-CmdPipe.h
deleted file mode 100644
index 352b8c87d750..000000000000
--- a/emulators/frodo/files/patch-CmdPipe.h
+++ /dev/null
@@ -1,8 +0,0 @@
---- CmdPipe.h.orig	Wed Aug  6 20:56:26 1997
-+++ CmdPipe.h	Mon Nov 18 05:31:41 2002
-@@ -82,4 +82,4 @@
- 
- };
- 
--#endif CmdPipe_h
-+#endif // CmdPipe_h
diff --git a/emulators/frodo/files/patch-TkGui.tcl b/emulators/frodo/files/patch-TkGui.tcl
index cf8c2d7d675a..4a22eb3379ca 100644
--- a/emulators/frodo/files/patch-TkGui.tcl
+++ b/emulators/frodo/files/patch-TkGui.tcl
@@ -1,14 +1,8 @@
---- ../TkGui.tcl.orig	Wed Aug  6 20:56:34 1997
-+++ ../TkGui.tcl	Mon Apr 26 21:49:18 1999
-@@ -1,9 +1,9 @@
--#!/usr/local/bin/X11/wish
+--- ../TkGui.tcl.orig	Wed May 30 19:03:47 2001
++++ ../TkGui.tcl	Fri Sep  5 21:19:11 2003
+@@ -1,4 +1,4 @@
+-#!/usr/bin/wish
 +#!%%LOCALBASE%%/bin/wish8.4 -f
  
  # Frodo Tk GUI by Lutz Vieweg <lkv@mania.robin.de>
  # requires Tk >= 4.1
- 
--package require Tk 4.1
-+## package require Tk 4.1
- 
- set prefname "$env(HOME)/.frodorc"
- 
diff --git a/emulators/frodo/files/patch-configure b/emulators/frodo/files/patch-configure
new file mode 100644
index 000000000000..4c674adfcba6
--- /dev/null
+++ b/emulators/frodo/files/patch-configure
@@ -0,0 +1,31 @@
+--- configure.orig	Wed Jan  2 17:44:11 2002
++++ configure	Fri Sep  5 21:39:45 2003
+@@ -1602,15 +1602,15 @@
+   CFLAGS=$ac_save_CFLAGS
+ elif test $ac_cv_prog_cc_g = yes; then
+   if test "$GCC" = yes; then
+-    CFLAGS="-g -O2"
++    CFLAGS="${CFLAGS} -g -O2"
+   else
+-    CFLAGS="-g"
++    CFLAGS="${CFLAGS} -g"
+   fi
+ else
+   if test "$GCC" = yes; then
+-    CFLAGS="-O2"
++    CFLAGS="${CFLAGS} -O2"
+   else
+-    CFLAGS=
++    CFLAGS="${CFLAGS}"
+   fi
+ fi
+ # Some people use a C++ compiler to compile C.  Since we use `exit',
+@@ -2283,7 +2283,7 @@
+ fi
+ 
+ if [ x"$GXX" = "xyes" ]; then
+-  CFLAGS="-O2 -g -fomit-frame-pointer -Wall -Wno-unused -Wno-format"
++  CFLAGS="${CFLAGS} -O2 -g -fomit-frame-pointer -Wall -Wno-unused -Wno-format"
+ fi
+ 
+ UNAME_RELEASE=`(uname -r) 2>/dev/null` || UNAME_RELEASE=unknown
diff --git a/emulators/frodo/files/patch-sysdeps.h b/emulators/frodo/files/patch-sysdeps.h
new file mode 100644
index 000000000000..ee1b2d7efc31
--- /dev/null
+++ b/emulators/frodo/files/patch-sysdeps.h
@@ -0,0 +1,12 @@
+--- sysdeps.h.orig	Wed Jan  2 22:15:27 2002
++++ sysdeps.h	Fri Sep  5 21:24:44 2003
+@@ -25,7 +25,9 @@
+ #endif
+ 
+ #ifdef HAVE_VALUES_H
++#if !defined(__FreeBSD__)
+ #include <values.h>
++#endif
+ #endif
+ 
+ #ifdef HAVE_STRINGS_H