Update to 0.32.4 [1]

Mark IGNORE when system < 5.3 (don't have fmin(3) and fmax(3) functions)

PR:		87269 [1]
Submitted by:	Janos Mohacsi <janos.mohacsi@niif.hu> (maintainer)

10 files changed, 109 insertions, 20 deletions

diff --git a/emulators/yape/Makefile b/emulators/yape/Makefile
index ffeacafdaf6a..5b25e9509463 100644
--- a/emulators/yape/Makefile
+++ b/emulators/yape/Makefile
@@ -6,21 +6,34 @@
 #
 
 PORTNAME=	yape
-PORTVERSION=	0.32.3
-PORTREVISION=	2
+PORTVERSION=	0.32.4
 CATEGORIES=	emulators
 MASTER_SITES=	http://yape.homeserver.hu/download/
-DISTNAME=	yapeSDL-${PORTVERSION}
+DISTNAME=	${PORTNAME}SDL-${PORTVERSION}
 
 MAINTAINER=	janos.mohacsi@bsd.hu
 COMMENT=	Yet Another Commodore +4 Emulator
 
-USE_SDL=	sdl
-NO_WRKSUBDIR=	yes
 USE_REINPLACE=	yes
+USE_SDL=	sdl
 USE_GMAKE=	yes
+NO_WRKSUBDIR=	yes
 ALL_TARGET=	yape
 
+PLIST_FILES=	bin/yape
+PORTDOCS=	*
+
+.include <bsd.port.pre.mk>
+
+.if ${OSVERSION} < 503001
+IGNORE=	Build only in 5.3 or uppper (Need fmax(3) and fmin(3) function)
+.endif
+
+post-extract:
+	@${FIND} -E ${WRKDIR} -type f -iregex ".*\.(c|cpp|h|txt)" -print0 | \
+		${XARGS} -0 ${REINPLACE_CMD} -e 's/[[:cntrl:]]*$$//'
+	@${REINPLACE_CMD} -e 's/[[:cntrl:]]*$$//' ${WRKSRC}/Makefile
+
 post-patch:
 	@${REINPLACE_CMD} -e "s|sdl-config|${SDL_CONFIG}|" ${WRKSRC}/Makefile
 
@@ -30,7 +43,7 @@ do-install:
 post-install:
 .ifndef(NOPORTDOCS)
 	@${MKDIR} ${DOCSDIR}
-	${INSTALL_DATA} ${WRKSRC}/README.Linux ${DOCSDIR}
+	${INSTALL_DATA} ${WRKSRC}/README.SDL ${DOCSDIR}
 .endif
 
-.include <bsd.port.mk>
+.include <bsd.port.post.mk>
diff --git a/emulators/yape/distinfo b/emulators/yape/distinfo
index 4ca5bbce4051..0100d6e694e8 100644
--- a/emulators/yape/distinfo
+++ b/emulators/yape/distinfo
@@ -1,2 +1,2 @@
-MD5 (yapeSDL-0.32.3.tar.gz) = 454c538dc29c78d3bd0c8523d04da137
-SIZE (yapeSDL-0.32.3.tar.gz) = 129145
+MD5 (yapeSDL-0.32.4.tar.gz) = b2b7a180d2c7893805f820f80f59ad30
+SIZE (yapeSDL-0.32.4.tar.gz) = 127195
diff --git a/emulators/yape/files/patch-Makefile b/emulators/yape/files/patch-Makefile
new file mode 100644
index 000000000000..8824aa979bc5
--- /dev/null
+++ b/emulators/yape/files/patch-Makefile
@@ -0,0 +1,16 @@
+
+$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)
+ 
+-CC = g++
+-cflags = -O3 -finline -frerun-loop-opt -Winline `sdl-config --cflags`
++CC = $(CXX)
++cflags = $(CFLAGS) -finline -frerun-loop-opt -Winline `sdl-config --cflags`
+ libs = `sdl-config --libs` 
+ 
+ #SDL_CFLAGS := $(shell sdl-config --cflags)
diff --git a/emulators/yape/files/patch-README.SDL b/emulators/yape/files/patch-README.SDL
new file mode 100644
index 000000000000..17b5b49ed87f
--- /dev/null
+++ b/emulators/yape/files/patch-README.SDL
@@ -0,0 +1,14 @@
+
+$FreeBSD$
+
+--- README.SDL.orig
++++ README.SDL
+@@ -78,7 +78,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.
+    
+   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 dd22b3ad3a9a..739221b2fc8e 100644
--- a/emulators/yape/files/patch-archdep.cpp
+++ b/emulators/yape/files/patch-archdep.cpp
@@ -1,5 +1,17 @@
---- archdep.cpp.orig	Thu Oct 31 23:47:54 2002
-+++ archdep.cpp	Thu Oct 31 23:48:53 2002
+
+$FreeBSD$
+
+--- archdep.cpp.orig
++++ archdep.cpp
+@@ -49,7 +49,7 @@
+ int ad_makedirs(char *path)
+ {
+   strcpy(temp,path);
+-  strcat(temp, "/yape");
++  strcat(temp, "/.yape");
+   CreateDirectory(temp, NULL);
+ 
+   return 1;
 @@ -108,7 +108,7 @@
  
    strcpy( homedir , getenv( "HOME" ));
diff --git a/emulators/yape/files/patch-interface.cpp b/emulators/yape/files/patch-interface.cpp
index 3e2e1501dae7..5178295f3ee7 100644
--- a/emulators/yape/files/patch-interface.cpp
+++ b/emulators/yape/files/patch-interface.cpp
@@ -1,5 +1,8 @@
---- interface.cpp.orig	Thu Oct 31 23:43:08 2002
-+++ interface.cpp	Thu Oct 31 23:43:35 2002
+
+$FreeBSD$
+
+--- interface.cpp.orig
++++ interface.cpp
 @@ -10,7 +10,7 @@
  	(c) 2000, 2001 Attila Grósz
  */
diff --git a/emulators/yape/files/patch-main.cpp b/emulators/yape/files/patch-main.cpp
new file mode 100644
index 000000000000..3c087e3b71b2
--- /dev/null
+++ b/emulators/yape/files/patch-main.cpp
@@ -0,0 +1,28 @@
+
+$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
index f75fcff2aaef..9b375a3fb67f 100644
--- a/emulators/yape/files/patch-main.h
+++ b/emulators/yape/files/patch-main.h
@@ -1,5 +1,8 @@
---- main.h.orig	Thu Oct 31 23:44:51 2002
-+++ main.h	Thu Oct 31 23:45:12 2002
+
+$FreeBSD$
+
+--- main.h.orig
++++ main.h
 @@ -17,7 +17,7 @@
  #include <string.h>
  #include <ctype.h>
diff --git a/emulators/yape/files/patch-sound.h b/emulators/yape/files/patch-sound.h
index 1b33377f7f49..136b745ece51 100644
--- a/emulators/yape/files/patch-sound.h
+++ b/emulators/yape/files/patch-sound.h
@@ -1,5 +1,8 @@
---- sound.h.orig	Thu Oct 31 23:44:15 2002
-+++ sound.h	Thu Oct 31 23:44:25 2002
+
+$FreeBSD$
+
+--- sound.h.orig
++++ sound.h
 @@ -1,7 +1,7 @@
  #ifndef _SOUND_H
  #define _SOUND_H
diff --git a/emulators/yape/pkg-plist b/emulators/yape/pkg-plist
deleted file mode 100644
index 3e822cd0b468..000000000000
--- a/emulators/yape/pkg-plist
+++ /dev/null
@@ -1,3 +0,0 @@
-bin/yape
-%%PORTDOCS%%share/doc/yape/README.Linux
-%%PORTDOCS%%@dirrm share/doc/yape