- let configure pick up sdl

- make portlint happier

12 files changed, 43 insertions, 45 deletions

diff --git a/emulators/frodo/Makefile b/emulators/frodo/Makefile
index 55b8bdd1a768..92d7282a2f85 100644
--- a/emulators/frodo/Makefile
+++ b/emulators/frodo/Makefile
@@ -32,10 +32,6 @@ USE_SDL=	sdl
 post-patch:
 	${REINPLACE_CMD} -e "s|%%LOCALBASE%%|${LOCALBASE}|g" \
 		${INSTALL_WRKSRC}/TkGui.tcl
-.if ${PORT_OPTIONS:MSDL}
-	${REINPLACE_CMD} -e "s|sdl-config|${SDL_CONFIG}|g" \
-		${WRKSRC}/configure
-.endif
 
 do-install:
 	${SED} -e 's=\$${PREFIX}=${PREFIX}=g' \
diff --git a/emulators/frodo/files/patch-C64_x.i b/emulators/frodo/files/patch-C64_x.i
index b0948fc6dd93..84232b7fd7d0 100644
--- a/emulators/frodo/files/patch-C64_x.i
+++ b/emulators/frodo/files/patch-C64_x.i
@@ -1,6 +1,6 @@
---- C64_x.i.orig	Wed Aug  6 20:56:25 1997
-+++ C64_x.i	Mon Apr 26 21:50:36 1999
-@@ -100,7 +100,7 @@
+--- C64_x.i.orig	2002-01-02 21:16:45 UTC
++++ C64_x.i
+@@ -100,7 +100,7 @@ void C64::c64_ctor1(void)
  	gui = 0;
  #else
  	// try to start up Tk gui.
diff --git a/emulators/frodo/files/patch-CmdPipe.cpp b/emulators/frodo/files/patch-CmdPipe.cpp
index 50ee390a8da5..e8860ce8ff6d 100644
--- a/emulators/frodo/files/patch-CmdPipe.cpp
+++ b/emulators/frodo/files/patch-CmdPipe.cpp
@@ -1,6 +1,6 @@
---- CmdPipe.cpp.orig	Wed Jan  2 22:19:34 2002
-+++ CmdPipe.cpp	Fri Sep  5 21:13:34 2003
-@@ -17,9 +17,11 @@
+--- CmdPipe.cpp.orig	2002-01-02 21:19:34 UTC
++++ CmdPipe.cpp
+@@ -17,9 +17,11 @@ extern "C" {
  	#include <string.h>
  	#include <signal.h>
  
@@ -12,13 +12,13 @@
  
  #if defined(AIX)
  	#include <sys/select.h>
-@@ -28,6 +30,9 @@
- #endif
- 
+@@ -30,6 +32,9 @@ extern "C" {
  #if defined(__linux__)
-+	#include <sys/time.h>
-+#endif
-+#if defined(__FreeBSD__)
  	#include <sys/time.h>
  #endif
++#if defined(__FreeBSD__)
++	#include <sys/time.h>
++#endif
  
+ 	#include <time.h>
+ 	#include <errno.h>
diff --git a/emulators/frodo/files/patch-Display.h b/emulators/frodo/files/patch-Display.h
index a81ab61245ba..5f6228cfd321 100644
--- a/emulators/frodo/files/patch-Display.h
+++ b/emulators/frodo/files/patch-Display.h
@@ -1,6 +1,6 @@
---- Display.h.orig	Sat Nov 30 01:14:14 2002
-+++ Display.h	Sat Nov 30 01:14:37 2002
-@@ -112,7 +112,7 @@
+--- Display.h.orig	2002-01-02 21:31:34 UTC
++++ Display.h
+@@ -121,7 +121,7 @@ private:
  
  #ifdef __unix
  	void draw_led(int num, int state);	// Draw one LED
diff --git a/emulators/frodo/files/patch-Display_SDL.i b/emulators/frodo/files/patch-Display_SDL.i
index 7beeb88748a0..f6f8924660f9 100644
--- a/emulators/frodo/files/patch-Display_SDL.i
+++ b/emulators/frodo/files/patch-Display_SDL.i
@@ -1,6 +1,6 @@
---- Display_SDL.i.orig	Wed Jan  2 22:42:42 2002
-+++ Display_SDL.i	Sat Sep  6 07:54:35 2003
-@@ -213,7 +213,7 @@
+--- Display_SDL.i.orig	2002-01-02 21:42:42 UTC
++++ Display_SDL.i
+@@ -213,7 +213,7 @@ void C64Display::draw_string(SDL_Surface
   *  LED error blink
   */
  
diff --git a/emulators/frodo/files/patch-Display__x.i b/emulators/frodo/files/patch-Display_x.i
index 05c9cd66ecbd..1883e55a2f72 100644
--- a/emulators/frodo/files/patch-Display__x.i
+++ b/emulators/frodo/files/patch-Display_x.i
@@ -1,6 +1,6 @@
---- Display_x.i.orig	Sat Nov 30 01:11:07 2002
-+++ Display_x.i	Sat Nov 30 01:11:41 2002
-@@ -525,7 +525,7 @@
+--- Display_x.i.orig	2002-01-02 21:17:29 UTC
++++ Display_x.i
+@@ -519,7 +519,7 @@ void C64Display::draw_led(int num, int s
   *  LED error blink
   */
  
diff --git a/emulators/frodo/files/patch-SAM.cpp b/emulators/frodo/files/patch-SAM.cpp
index c1c814fd4349..69cd5648f962 100644
--- a/emulators/frodo/files/patch-SAM.cpp
+++ b/emulators/frodo/files/patch-SAM.cpp
@@ -1,6 +1,6 @@
---- SAM.cpp.orig	Sat Nov 30 01:25:40 2002
-+++ SAM.cpp	Sat Nov 30 01:26:38 2002
-@@ -205,7 +205,7 @@
+--- SAM.cpp.orig	2002-01-02 21:20:16 UTC
++++ SAM.cpp
+@@ -205,7 +205,7 @@ static const char adr_length[] = {1, 1, 
  
  // Prototypes
  static void error(char *s);
@@ -9,7 +9,7 @@
  static void init_abort(void);
  static void exit_abort(void);
  static bool aborted(void);
-@@ -470,7 +470,7 @@
+@@ -470,7 +470,7 @@ static bool WasAborted;
  struct sigaction my_sa;
  #endif
  
diff --git a/emulators/frodo/files/patch-SID.cpp b/emulators/frodo/files/patch-SID.cpp
index 1b340e4795d7..02858fe6ba03 100644
--- a/emulators/frodo/files/patch-SID.cpp
+++ b/emulators/frodo/files/patch-SID.cpp
@@ -1,6 +1,6 @@
---- SID.cpp.orig	2002-01-02 21:18:59.000000000 +0000
-+++ SID.cpp	2004-11-27 15:51:44.000000000 +0000
-@@ -428,7 +428,7 @@
+--- SID.cpp.orig	2002-01-02 21:18:59 UTC
++++ SID.cpp
+@@ -428,7 +428,7 @@ private:
  	int play_buf;					// Number of buffer currently playing
  #endif
  
@@ -9,7 +9,7 @@
  	int devfd, sndbufsize, buffer_rate;
  	int16 *sound_buffer;
  #endif
-@@ -1351,7 +1351,7 @@
+@@ -1351,7 +1351,7 @@ void DigitalRenderer::calc_buffer(int16 
  #elif defined(AMIGA)
  #include "SID_Amiga.i"
  
diff --git a/emulators/frodo/files/patch-SID_linux.i b/emulators/frodo/files/patch-SID_linux.i
index d31e0c966e23..59325ae6da52 100644
--- a/emulators/frodo/files/patch-SID_linux.i
+++ b/emulators/frodo/files/patch-SID_linux.i
@@ -1,5 +1,5 @@
---- SID_linux.i.orig	2002-01-02 21:17:00.000000000 +0000
-+++ SID_linux.i	2004-11-27 15:54:36.000000000 +0000
+--- SID_linux.i.orig	2002-01-02 21:17:00 UTC
++++ SID_linux.i
 @@ -8,7 +8,12 @@
  #include <unistd.h>
  #include <fcntl.h>
@@ -13,3 +13,4 @@
 +#endif
  
  #include "VIC.h"
+ 
diff --git a/emulators/frodo/files/patch-TkGui.tcl b/emulators/frodo/files/patch-TkGui.tcl
index 4a22eb3379ca..0148179de63f 100644
--- a/emulators/frodo/files/patch-TkGui.tcl
+++ b/emulators/frodo/files/patch-TkGui.tcl
@@ -1,5 +1,5 @@
---- ../TkGui.tcl.orig	Wed May 30 19:03:47 2001
-+++ ../TkGui.tcl	Fri Sep  5 21:19:11 2003
+--- ../TkGui.tcl.orig	2001-05-30 17:03:47 UTC
++++ ../TkGui.tcl
 @@ -1,4 +1,4 @@
 -#!/usr/bin/wish
 +#!%%LOCALBASE%%/bin/wish8.4 -f
diff --git a/emulators/frodo/files/patch-configure b/emulators/frodo/files/patch-configure
index 4c674adfcba6..95ec160f243b 100644
--- a/emulators/frodo/files/patch-configure
+++ b/emulators/frodo/files/patch-configure
@@ -1,6 +1,6 @@
---- configure.orig	Wed Jan  2 17:44:11 2002
-+++ configure	Fri Sep  5 21:39:45 2003
-@@ -1602,15 +1602,15 @@
+--- configure.orig	2002-01-02 16:44:11 UTC
++++ configure
+@@ -1602,15 +1602,15 @@ if test "$ac_test_CFLAGS" = set; then
    CFLAGS=$ac_save_CFLAGS
  elif test $ac_cv_prog_cc_g = yes; then
    if test "$GCC" = yes; then
@@ -20,7 +20,7 @@
    fi
  fi
  # Some people use a C++ compiler to compile C.  Since we use `exit',
-@@ -2283,7 +2283,7 @@
+@@ -2283,7 +2283,7 @@ echo "${ECHO_T}no" >&6
  fi
  
  if [ x"$GXX" = "xyes" ]; then
diff --git a/emulators/frodo/files/patch-sysdeps.h b/emulators/frodo/files/patch-sysdeps.h
index ee1b2d7efc31..5d7bdd0a327a 100644
--- a/emulators/frodo/files/patch-sysdeps.h
+++ b/emulators/frodo/files/patch-sysdeps.h
@@ -1,12 +1,13 @@
---- sysdeps.h.orig	Wed Jan  2 22:15:27 2002
-+++ sysdeps.h	Fri Sep  5 21:24:44 2003
-@@ -25,7 +25,9 @@
+--- sysdeps.h.orig	2002-01-02 21:15:27 UTC
++++ sysdeps.h
+@@ -25,8 +25,10 @@ extern "C"
  #endif
  
  #ifdef HAVE_VALUES_H
 +#if !defined(__FreeBSD__)
  #include <values.h>
-+#endif
  #endif
++#endif
  
  #ifdef HAVE_STRINGS_H
+ #include <strings.h>