9 files changed, 57 insertions, 93 deletions

diff --git a/emulators/yape/Makefile b/emulators/yape/Makefile
index 5e323e6d20e5..fe6c9c68bd90 100644
--- a/emulators/yape/Makefile
+++ b/emulators/yape/Makefile
@@ -6,8 +6,7 @@
 #
 
 PORTNAME=	yape
-PORTVERSION=	0.32.4
-PORTREVISION=	3
+PORTVERSION=	0.32.5
 CATEGORIES=	emulators
 MASTER_SITES=	http://yape.homeserver.hu/download/
 DISTNAME=	${PORTNAME}SDL-${PORTVERSION}
@@ -23,14 +22,6 @@ ALL_TARGET=	yape
 PLIST_FILES=	bin/yape
 PORTDOCS=	*
 
-.include <bsd.port.pre.mk>
-
-.if ${OSVERSION} >= 700042
-.if ${ARCH} == "amd64" || ${ARCH} == "sparc64"
-BROKEN=		Does not compile with GCC 4.2
-.endif
-.endif
-
 post-extract:
 	@${FIND} -E ${WRKDIR} -type f -iregex ".*\.(c|cpp|h|txt)" -print0 | \
 		${XARGS} -0 ${REINPLACE_CMD} -e 's/[[:cntrl:]]*$$//'
@@ -49,4 +40,4 @@ post-install:
 	${INSTALL_DATA} ${WRKSRC}/README.SDL ${DOCSDIR}
 .endif
 
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
diff --git a/emulators/yape/distinfo b/emulators/yape/distinfo
index 7c621f762a74..42498a9ee588 100644
--- a/emulators/yape/distinfo
+++ b/emulators/yape/distinfo
@@ -1,3 +1,3 @@
-MD5 (yapeSDL-0.32.4.tar.gz) = b2b7a180d2c7893805f820f80f59ad30
-SHA256 (yapeSDL-0.32.4.tar.gz) = 10238e52ccdf35f17fbc5cfe15c3cc3d45bd2a9de067cf00b4309f41959d8634
-SIZE (yapeSDL-0.32.4.tar.gz) = 127195
+MD5 (yapeSDL-0.32.5.tar.gz) = 2d37d720975dc6a0fd9ec4e7964cafb1
+SHA256 (yapeSDL-0.32.5.tar.gz) = 2944a42ac8beb1735f839e82f57d94e9dbd1a0b33e64891c88d1374e4d953830
+SIZE (yapeSDL-0.32.5.tar.gz) = 135478
diff --git a/emulators/yape/files/patch-Makefile b/emulators/yape/files/patch-Makefile
index 8824aa979bc5..e83905aad362 100644
--- a/emulators/yape/files/patch-Makefile
+++ b/emulators/yape/files/patch-Makefile
@@ -1,16 +1,26 @@
 
 $FreeBSD$
 
---- Makefile.orig	Thu Oct 13 00:09:50 2005
-+++ Makefile	Thu Oct 13 00:10:03 2005
-@@ -12,8 +12,8 @@
- 
- headers = $(objects:.o=.h)
+--- Makefile.orig
++++ Makefile
+@@ -23,8 +23,8 @@
+ hasnoheader = main.h dos.h
+ sourcefiles = $(filter-out $(hasnoheader),$(allfiles)) device.h mem.h roms.h types.h
  
 -CC = g++
--cflags = -O3 -finline -frerun-loop-opt -Winline `sdl-config --cflags`
+-cflags = -O3 -finline -frerun-loop-opt -Winline -fomit-frame-pointer `sdl-config --cflags`
 +CC = $(CXX)
-+cflags = $(CFLAGS) -finline -frerun-loop-opt -Winline `sdl-config --cflags`
++cflags = $(CFLAGS) -finline -frerun-loop-opt -Winline -fomit-frame-pointer `sdl-config --cflags`
  libs = `sdl-config --libs` 
  
  #SDL_CFLAGS := $(shell sdl-config --cflags)
+@@ -72,6 +72,9 @@
+ prg.o : prg.cpp prg.h
+ 	$(CC) $(cflags) -c $< 
+ 
++serial.o : serial.cpp serial.h
++	$(CC) $(cflags) -c $< 
++
+ sound.o : sound.cpp sound.h
+ 	$(CC) $(cflags) -c $< 
+ 
diff --git a/emulators/yape/files/patch-README.SDL b/emulators/yape/files/patch-README.SDL
index 17b5b49ed87f..b94b374fb268 100644
--- a/emulators/yape/files/patch-README.SDL
+++ b/emulators/yape/files/patch-README.SDL
@@ -3,12 +3,12 @@ $FreeBSD$
 
 --- README.SDL.orig
 +++ README.SDL
-@@ -78,7 +78,7 @@
+@@ -80,7 +80,7 @@
    LALT + W	: toggle between unlimited speed and 50 Hz frame rate (original speed)
    
    Internal disk LOAD/SAVE operations are supported to the current
 -  file system directory, which is usually '/home/<username>/yape'.
 +  file system directory, which is usually '/home/<username>/.yape'.
-   Any PRG files you may wish to load, should go there.
+   Any PRG files you may wish to load, should go there, although you can browse the directory tree
+   from the user interface, too.
     
-   This means that an exact filename match will load
diff --git a/emulators/yape/files/patch-archdep.cpp b/emulators/yape/files/patch-archdep.cpp
index 739221b2fc8e..da56d8d8327c 100644
--- a/emulators/yape/files/patch-archdep.cpp
+++ b/emulators/yape/files/patch-archdep.cpp
@@ -3,7 +3,7 @@ $FreeBSD$
 
 --- archdep.cpp.orig
 +++ archdep.cpp
-@@ -49,7 +49,7 @@
+@@ -75,7 +75,7 @@
  int ad_makedirs(char *path)
  {
    strcpy(temp,path);
@@ -12,30 +12,21 @@ $FreeBSD$
    CreateDirectory(temp, NULL);
  
    return 1;
-@@ -108,7 +108,7 @@
+@@ -296,7 +296,7 @@
+ 	// Possible buffer overflow fixed.
+ 	strncpy(temp, path, 512);
+ 	if (strlen(temp) > 506) return 0;
+-	strcat(temp, "/yape");
++	strcat(temp, "/.yape");
+ 	mkdir(temp, 0777);
  
-   strcpy( homedir , getenv( "HOME" ));
-   //strcpy( filter, filefilter);
--  strcat( homedir, "/yape" );
-+  strcat( homedir, "/.yape" );
-   chdir ( homedir );
-   dirp = opendir( homedir );
-   //fprintf( stderr, "reading from %s\n", homedir);
-@@ -136,7 +136,7 @@
- int ad_makedirs(char *path)
- {
-   strcpy(temp,path);
--  strcat(temp, "/yape");
-+  strcat(temp, "/.yape");
-   mkdir(temp, 0777);
- 
-   return 1;
-@@ -146,7 +146,7 @@
- {
- 
- 	strcpy( temp, tmpchr);
+ 	return 1;
+@@ -307,7 +307,7 @@
+ 	// Possible buffer overflow fixed.
+ 	strncpy(temp, tmpchr, 512);
+ 	if (strlen(temp) > 496) return NULL;
 -	strcat( temp, "/yape/yape.conf");
 +	strcat( temp, "/.yape/yape.conf");
- 
  	return temp;
  }
+ 
diff --git a/emulators/yape/files/patch-main.cpp b/emulators/yape/files/patch-main.cpp
deleted file mode 100644
index 3c087e3b71b2..000000000000
--- a/emulators/yape/files/patch-main.cpp
+++ /dev/null
@@ -1,28 +0,0 @@
-
-$FreeBSD$
-
---- main.cpp.orig
-+++ main.cpp
-@@ -12,6 +12,7 @@
- 
- #include "main.h"
- #include "interface.h"
-+#include <math.h>
- 
- 
- // SDL stuff
-@@ -210,11 +211,11 @@
- 			Yc = (luma[j+1] - 2.0)* 255.0 / (5.0 - 2.0); // 5V is the base voltage
- 			// RED, GREEN and BLUE component
- 			colorindex = (j)*16*3 + i*3;
--			col = (Uint8) max(min((Yc + 1.367 * Vc),255.0),0);
-+			col = (Uint8) fmax(fmin((Yc + 1.367 * Vc),255.0),0);
- 			p4col_calc[ colorindex ] = p4col_calc[ 384 + colorindex ] = col;
--			col = (Uint8) max(min((Yc - 0.336 * Uc - 0.698 * Vc ),255.0),0);
-+			col = (Uint8) fmax(fmin((Yc - 0.336 * Uc - 0.698 * Vc ),255.0),0);
- 			p4col_calc[ colorindex + 1] = p4col_calc[ 384 + colorindex + 1] = col;
--			col = (Uint8) max(min((Yc + 1.732 * Uc),255.0),0);
-+			col = (Uint8) fmax(fmin((Yc + 1.732 * Uc),255.0),0);
- 			p4col_calc[ colorindex + 2] = p4col_calc[ 384 + colorindex + 2] = col;
- 		}
- 
diff --git a/emulators/yape/files/patch-main.h b/emulators/yape/files/patch-main.h
deleted file mode 100644
index 9b375a3fb67f..000000000000
--- a/emulators/yape/files/patch-main.h
+++ /dev/null
@@ -1,14 +0,0 @@
-
-$FreeBSD$
-
---- main.h.orig
-+++ main.h
-@@ -17,7 +17,7 @@
- #include <string.h>
- #include <ctype.h>
- #include <math.h>
--#include "SDL/SDL.h"
-+#include "SDL.h"
- 
- #include "keyboard.h"
- #include "cpu.h"
diff --git a/emulators/yape/files/patch-serial.h b/emulators/yape/files/patch-serial.h
new file mode 100644
index 000000000000..9a5a6f214feb
--- /dev/null
+++ b/emulators/yape/files/patch-serial.h
@@ -0,0 +1,14 @@
+
+$FreeBSD$
+
+--- serial.h.orig
++++ serial.h
+@@ -1,7 +1,7 @@
+ #ifndef _SERIAL_H
+ #define _SERIAL_H
+ 
+-#include "SDL/SDL.h"
++#include "SDL.h"
+ 
+ class CSerial {
+ 
diff --git a/emulators/yape/files/patch-sound.h b/emulators/yape/files/patch-sound.h
index 136b745ece51..3773737d7601 100644
--- a/emulators/yape/files/patch-sound.h
+++ b/emulators/yape/files/patch-sound.h
@@ -7,8 +7,8 @@ $FreeBSD$
  #ifndef _SOUND_H
  #define _SOUND_H
  
--#include "SDL/SDL.h"
-+#include "SDL.h"
+-#include <SDL/SDL.h>
++#include <SDL.h>
+ #include "types.h"
  
- 
- class MEM;
+ extern void init_audio(unsigned int sampleFrq = 48000);