12 files changed, 82 insertions, 132 deletions

diff --git a/emulators/raine/Makefile b/emulators/raine/Makefile
index b0ebacfd56fc..6faf0f940c2c 100644
--- a/emulators/raine/Makefile
+++ b/emulators/raine/Makefile
@@ -2,41 +2,56 @@
 # $FreeBSD$
 
 PORTNAME=	raine
-PORTVERSION=	0.43.3
-PORTREVISION=	9
+PORTVERSION=	0.51.9
 CATEGORIES=	emulators games
-MASTER_SITES=	http://www.rainemu.com/html/archive/
+MASTER_SITES=	GENTOO/distfiles
 DISTNAME=	${PORTNAME}s-${PORTVERSION}
 
 MAINTAINER=	ports@FreeBSD.org
-COMMENT=	Arcade Emulator for M68000, M68020, and Z80 based hardware
+COMMENT=	Arcade Emulator for M68000| M68020| and Z80 based hardware
 
-BUILD_DEPENDS=	${LOCALBASE}/bin/nasm:${PORTSDIR}/devel/nasm
-LIB_DEPENDS=	liballeg.so:${PORTSDIR}/devel/allegro \
-		libpng15.so:${PORTSDIR}/graphics/png \
-		libvga.so:${PORTSDIR}/graphics/svgalib
+LICENSE=	ART10
+
+BUILD_DEPENDS=	nasm>0:${PORTSDIR}/devel/nasm
+LIB_DEPENDS=	libpng15.so:${PORTSDIR}/graphics/png
 
 WRKSRC=		${WRKDIR}/${PORTNAME}-${PORTVERSION}
 
-USES=		gmake tar:bzip2
-USE_SDL=	sdl
-USE_GNOME=	gnomehier
+USES=		gmake perl5 shebangfix tar:bzip2
+SHEBANG_FILES=	makedep
+USE_PERL5=	build
+USE_SDL=	image ttf sdl
+USE_GCC=	any
 MAKEFILE=	makefile
+MAKE_ARGS=	NEO="" VERBOSE=1 HAS_CONSOLE=""
 
 ONLY_FOR_ARCHS=	i386
 
-NO_STAGE=	yes
-.include <bsd.port.pre.mk>
-
 post-patch:
-	@${REINPLACE_CMD} -e "s, [$$]_mcpu,,g" ${WRKSRC}/detect-cpu
-	@${REINPLACE_CMD} -e "s,sdl-config,${SDL_CONFIG},g" -e "s,/usr/share/,/share/,g" \
-		${WRKSRC}/makefile
-	@${REINPLACE_CMD} -e "s,/usr/share/games/raine,${DATADIR},g" \
-		${WRKSRC}/source/raine.c
-	@${REINPLACE_CMD} -e "s,^#ifdef GFX_SVGA,#ifdef GFX_SVGALIB,g" \
-		${WRKSRC}/source/gui/rgui.c \
-		${WRKSRC}/source/alleg/display.c \
-		${WRKSRC}/source/config.c
-
-.include <bsd.port.post.mk>
+	@${REINPLACE_CMD} -e \
+		's| [$$]_mcpu||g' ${WRKSRC}/detect-cpu
+	@${REINPLACE_CMD} -e \
+		's|CC=|CC?=| ; \
+		 s|CXX=|CXX?=| ; \
+		 /LD/s|gcc|$$(CXX)| ; \
+		 s|$$(DESTDIR)/usr|$$(DESTDIR)$$(PREFIX)| ; \
+		 s|$$(prefix)/games|$$(prefix)/bin| ; \
+		 s|$$(prefix)/share/games|$$(prefix)/share| ; \
+		 s|-I.*/muParser|-I$${LOCALBASE}/include| ; \
+		 s|^CFLAGS =|CFLAGS ?=| ; \
+		 s|sdl-config|$${SDL_CONFIG}|g ; \
+		 /LFLAGS/s|-g || ; \
+		 /LFLAGS/s|-lstdc++|$$(LDFLAGS)|' ${WRKSRC}/makefile
+	@${REINPLACE_CMD} -e \
+		'/^Icon/s|=.*|=${PREFIX}/share/pixmaps/raine.png|' \
+		${WRKSRC}/raine.desktop
+	@${REINPLACE_CMD} -e \
+		's|/usr/share/games/raine|${DATADIR}|' ${WRKSRC}/source/raine.c
+
+post-install:
+.for i in artwork emudx roms scripts/raine
+	@${ECHO_CMD} -n > ${STAGEDIR}${DATADIR}/${i}/.keep_me
+.endfor
+	@${STRIP_CMD} ${STAGEDIR}${PREFIX}/bin/raine
+
+.include <bsd.port.mk>
diff --git a/emulators/raine/distinfo b/emulators/raine/distinfo
index 259367acbd71..3c2d6107b3e9 100644
--- a/emulators/raine/distinfo
+++ b/emulators/raine/distinfo
@@ -1,2 +1,2 @@
-SHA256 (raines-0.43.3.tar.bz2) = ab9d38e1a5a2e73b3ef914d780015a16cddea8194f479f65236a0f4ca088c4a9
-SIZE (raines-0.43.3.tar.bz2) = 1740971
+SHA256 (raines-0.51.9.tar.bz2) = 6d58f36790025e53aa0897f21cef845b9355081fd75c9a5ce4ef96f275dd0427
+SIZE (raines-0.51.9.tar.bz2) = 2095980
diff --git a/emulators/raine/files/patch-makefile b/emulators/raine/files/patch-makefile
deleted file mode 100644
index 9e4062cbd1dc..000000000000
--- a/emulators/raine/files/patch-makefile
+++ /dev/null
@@ -1,17 +0,0 @@
---- makefile.orig	Tue Sep 20 09:24:09 2005
-+++ makefile	Thu Nov 17 13:02:40 2005	
-@@ -215,1 +215,1 @@
-    AFLAGS = -f elf
-
--   PNG_CFLAGS = "$(shell libpng-config --cflags)"
--ifndef SDL
--   ALLEGRO_CFLAGS = "$(shell allegro-config --cflags)"
--endif
-   SDL_CFLAGS = "$(shell sdl-config --cflags)"
-
--   INCDIR += $(PNG_CFLAGS) $(ALLEGRO_CFLAGS) $(SDL_CFLAGS) -I$(X11BASE)/include -I$(LOCALBASE)/include 
-+   INCDIR += ` allegro-config --cflags` `libpng-config --cflags` -I$(LOCALBASE)/include
-
- 
-    DEFINE = -D__RAINE__ \
- 	   -DRAINE_UNIX \
diff --git a/emulators/raine/files/patch-source__alleg__blit.c b/emulators/raine/files/patch-source__alleg__blit.c
deleted file mode 100644
index 1ecda275b4ff..000000000000
--- a/emulators/raine/files/patch-source__alleg__blit.c
+++ /dev/null
@@ -1,11 +0,0 @@
---- source/alleg/blit.c.orig	Mon Jan 17 12:37:21 2005
-+++ source/alleg/blit.c	Mon Jan 17 12:38:10 2005
-@@ -1,1 +1,1 @@
- #ifdef RAINE_WIN32
- #include <allegro.h>
- #include <winalleg.h>
-+#elif defined(RAINE_UNIX)
-+#include <sys/time.h>
- #endif
- #include "blit_x2.h"
- #include "eagle.h"
diff --git a/emulators/raine/files/patch-source_png_loadpng.c b/emulators/raine/files/patch-source__alleg__png__loadpng.c
index 87bc1b566d0f..4fa3d7b5856a 100644
--- a/emulators/raine/files/patch-source_png_loadpng.c
+++ b/emulators/raine/files/patch-source__alleg__png__loadpng.c
@@ -1,6 +1,6 @@
---- source/png/loadpng.c.orig	2005-08-18 10:52:15.000000000 +0200
-+++ source/png/loadpng.c	2012-05-06 15:58:26.000000000 +0200
-@@ -275,7 +275,7 @@
+--- source/alleg/png/loadpng.c.orig
++++ source/alleg/png/loadpng.c
+@@ -322,7 +322,7 @@
       * the normal method of doing things with libpng).  REQUIRED unless you
       * set up your own error handlers in the png_create_read_struct() earlier.
       */
@@ -8,8 +8,8 @@
 +    if (setjmp(png_jmpbuf(png_ptr))) {
  	/* Free all of the memory associated with the png_ptr and info_ptr */
  	png_destroy_read_struct(&png_ptr, &info_ptr, (png_infopp)NULL);
- 	pack_fclose(fp);
-@@ -337,7 +337,7 @@
+ 	fclose(fp);
+@@ -384,7 +384,7 @@
       * the normal method of doing things with libpng).  REQUIRED unless you
       * set up your own error handlers in the png_create_read_struct() earlier.
       */
@@ -18,7 +18,7 @@
  	/* Free all of the memory associated with the png_ptr and info_ptr */
  	png_destroy_read_struct(&png_ptr, &info_ptr, (png_infopp)NULL);
  	/* If we get here, we had a problem reading the file */
-@@ -435,7 +435,7 @@
+@@ -482,7 +482,7 @@
       * the normal method of doing things with libpng).  REQUIRED unless you
       * set up your own error handlers in the png_create_read_struct() earlier.
       */
diff --git a/emulators/raine/files/patch-source__emumain.c b/emulators/raine/files/patch-source__emumain.c
deleted file mode 100644
index 3293c4321044..000000000000
--- a/emulators/raine/files/patch-source__emumain.c
+++ /dev/null
@@ -1,13 +0,0 @@
---- source/emumain.c.orig	Wed Aug 17 13:14:36 2005
-+++ source/emumain.c	Thu Nov 17 18:04:37 2005
-@@ -9,1 +9,1 @@
- #include <winalleg.h>
- #endif
- 
-+#ifdef RAINE_UNIX
-+#include <sys/time.h>
-+#endif
-+
- #include "raine.h"              // General defines and stuff
- #include "gui.h"                // Interface stuff
- #include "sasound.h"            // Sound Sample stuff
diff --git a/emulators/raine/files/patch-source__gui__rgui.c b/emulators/raine/files/patch-source__gui__rgui.c
deleted file mode 100644
index 11576063bd5d..000000000000
--- a/emulators/raine/files/patch-source__gui__rgui.c
+++ /dev/null
@@ -1,13 +0,0 @@
---- source/gui/rgui.c.orig	Mon Jan 17 12:07:21 2005
-+++ source/gui/rgui.c	Mon Jan 17 12:23:46 2005
-@@ -9,1 +9,1 @@
- #include <winalleg.h>
- #endif
-
-+#ifdef RAINE_UNIX
-+#include <sys/time.h>
-+#endif
-+
- #include "raine.h"
- #include "rgui.h"
- #include "rguiproc.h"
diff --git a/emulators/raine/files/patch-patch-source_png_savepng.c b/emulators/raine/files/patch-source__savepng.c
index 110b12470e39..728aabadc8d3 100644
--- a/emulators/raine/files/patch-patch-source_png_savepng.c
+++ b/emulators/raine/files/patch-source__savepng.c
@@ -1,6 +1,6 @@
---- source/png/savepng.c.orig	2005-08-17 12:20:36.000000000 +0200
-+++ source/png/savepng.c	2012-05-06 17:19:09.000000000 +0200
-@@ -188,7 +188,7 @@
+--- source/savepng.c.orig
++++ source/savepng.c
+@@ -203,7 +203,7 @@
  	goto Error;
  
      /* Set error handling. */
diff --git a/emulators/raine/files/patch-source__sdl__compat.h b/emulators/raine/files/patch-source__sdl__compat.h
new file mode 100644
index 000000000000..b7c084f664b7
--- /dev/null
+++ b/emulators/raine/files/patch-source__sdl__compat.h
@@ -0,0 +1,11 @@
+--- source/sdl/compat.h.orig
++++ source/sdl/compat.h
+@@ -61,7 +61,7 @@
+ #define stricmp strcasecmp
+ #define strnicmp strncasecmp
+ #endif
+-#elif defined(DARWIN)
++#elif defined(DARWIN) || defined(__FreeBSD__)
+ #define stricmp strcasecmp
+ #define strnicmp strncasecmp
+ #endif
diff --git a/emulators/raine/files/patch-source_bezel.c b/emulators/raine/files/patch-source_bezel.c
deleted file mode 100644
index 5956dca4c362..000000000000
--- a/emulators/raine/files/patch-source_bezel.c
+++ /dev/null
@@ -1,11 +0,0 @@
---- source/bezel.c.orig	Thu Nov 17 18:24:59 2005
-+++ source/bezel.c	Thu Nov 17 18:49:28 2005
-@@ -18,1 +18,1 @@
- #define __USE_ISOC99 1
- #include <math.h>
- 
--#ifdef RAINE_DOS
-+#if defined(RAINE_DOS) || __FreeBSD_version < 500300
- // djgpp seems to have specificities for rounding...
- // why on earth non one implements cleanly such basic function ???
- #define round rint
diff --git a/emulators/raine/pkg-descr b/emulators/raine/pkg-descr
index 566a3fca990f..89e08b7da35b 100644
--- a/emulators/raine/pkg-descr
+++ b/emulators/raine/pkg-descr
@@ -1,3 +1,3 @@
 Arcade Emulator for M68000, M68020 and Z80 based hardware.
 
-WWW: http://www.rainemu.com/
+WWW: http://rainemu.swishparty.co.uk/
diff --git a/emulators/raine/pkg-plist b/emulators/raine/pkg-plist
index 0fa26a831577..d9b85f140465 100644
--- a/emulators/raine/pkg-plist
+++ b/emulators/raine/pkg-plist
@@ -1,33 +1,22 @@
 bin/raine
-%%DATADIR%%/cheats.cfg
-%%DATADIR%%/hiscore.dat
-%%DATADIR%%/languages/brasil.cfg
-%%DATADIR%%/languages/czech.cfg
-%%DATADIR%%/languages/catala.cfg
-%%DATADIR%%/languages/dansk.cfg
-%%DATADIR%%/languages/dutch.cfg
-%%DATADIR%%/languages/english.cfg
-%%DATADIR%%/languages/espanol.cfg
-%%DATADIR%%/languages/euskera.cfg
-%%DATADIR%%/languages/finnish.cfg
-%%DATADIR%%/languages/french.cfg
-%%DATADIR%%/languages/french2.cfg
-%%DATADIR%%/languages/german.cfg
-%%DATADIR%%/languages/german2.cfg
-%%DATADIR%%/languages/italian.cfg
-%%DATADIR%%/languages/japanese.cfg
-%%DATADIR%%/languages/polish.cfg
-%%DATADIR%%/languages/portugal.cfg
-%%DATADIR%%/languages/spanish.cfg
-%%DATADIR%%/languages/svenska.cfg
-%%DATADIR%%/languages/template.cfg
-%%DATADIR%%/languages/turkish.cfg
-%%DATADIR%%/languages/galego.cfg
-%%DATADIR%%/raine.dat
 share/applications/raine.desktop
 share/pixmaps/raine.png
-@dirrmtry %%DATADIR%%/roms
-@dirrmtry %%DATADIR%%/emudx
-@dirrmtry %%DATADIR%%/artwork
-@dirrm %%DATADIR%%/languages
-@dirrmtry %%DATADIR%%
+%%DATADIR%%/artwork/.keep_me
+%%DATADIR%%/bitmaps/cursor.png
+%%DATADIR%%/bitmaps/raine_logo.png
+%%DATADIR%%/cheats.cfg
+%%DATADIR%%/emudx/.keep_me
+%%DATADIR%%/fonts/Vera.ttf
+%%DATADIR%%/fonts/VeraMono.ttf
+%%DATADIR%%/fonts/font6x8.bin
+%%DATADIR%%/hiscore.dat
+%%DATADIR%%/roms/.keep_me
+%%DATADIR%%/scripts/raine/.keep_me
+@dirrm %%DATADIR%%/scripts/raine
+@dirrm %%DATADIR%%/scripts
+@dirrm %%DATADIR%%/roms
+@dirrm %%DATADIR%%/fonts
+@dirrm %%DATADIR%%/emudx
+@dirrm %%DATADIR%%/bitmaps
+@dirrm %%DATADIR%%/artwork
+@dirrm %%DATADIR%%