15 files changed, 20 insertions, 335 deletions

diff --git a/emulators/raine/Makefile b/emulators/raine/Makefile
index 87fea229eb06..fe4f327c8533 100644
--- a/emulators/raine/Makefile
+++ b/emulators/raine/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	raine
-PORTVERSION=	0.43.2
+PORTVERSION=	0.43.3
 CATEGORIES=	emulators games
 MASTER_SITES=	http://www.rainemu.com/html/archive/
 DISTNAME=	${PORTNAME}s-${PORTVERSION}
@@ -19,6 +19,7 @@ LIB_DEPENDS=	alleg.42:${PORTSDIR}/devel/allegro \
 		png.5:${PORTSDIR}/graphics/png
 
 WRKSRC=		${WRKDIR}/${PORTNAME}-${PORTVERSION}
+USE_GCC=	3.2+
 USE_BZIP2=	yes
 USE_GMAKE=	yes
 USE_X_PREFIX=	yes
diff --git a/emulators/raine/distinfo b/emulators/raine/distinfo
index 07fb1bdfff57..06c679225b05 100644
--- a/emulators/raine/distinfo
+++ b/emulators/raine/distinfo
@@ -1,3 +1,3 @@
-MD5 (raines-0.43.2.tar.bz2) = 57bfd8c87b68242545d1ce8e50014e5e
-SHA256 (raines-0.43.2.tar.bz2) = b3bb0743b27d8353e2d25c6fa70bd0460ef4cee0fde161a67eac86ce55eaa30f
-SIZE (raines-0.43.2.tar.bz2) = 1740105
+MD5 (raines-0.43.3.tar.bz2) = 9e39a99b45e7c6d1b0d04c9ebc579b02
+SHA256 (raines-0.43.3.tar.bz2) = ab9d38e1a5a2e73b3ef914d780015a16cddea8194f479f65236a0f4ca088c4a9
+SIZE (raines-0.43.3.tar.bz2) = 1740971
diff --git a/emulators/raine/files/patch-makefile b/emulators/raine/files/patch-makefile
index 73fd5ee1b7cc..7794091e6965 100644
--- a/emulators/raine/files/patch-makefile
+++ b/emulators/raine/files/patch-makefile
@@ -1,39 +1,17 @@
 --- makefile.orig	Tue Sep 20 09:24:09 2005
-+++ makefile	Thu Nov 17 13:02:40 2005
-@@ -32,6 +32,10 @@
- OSTYPE=linux-gnu
- endif
- 
-+ifeq ("$(shell uname)","FreeBSD")
-+OSTYPE=linux-gnu
-+endif
-+
- ifeq ("$(OSTYPE)","msys")
- MINGDIR=1
- OSTYPE=mingw32
-@@ -181,11 +185,11 @@
- 
- #	SDL = 1
- 
--   prefix = $(DESTDIR)
--   bindir = $(prefix)/usr/games
--   sharedir = $(prefix)/usr/share
--   mandir = $(sharedir)/man/man6
--   rainedata = $(sharedir)/games/raine
-+   prefix = $(PREFIX)
-+   bindir = $(prefix)/bin
-+   sharedir = $(prefix)/share
-+   mandir = $(prefix)/man/man6
-+   rainedata = $(sharedir)/raine
-    langdir = $(rainedata)/languages
-    romdir = $(rainedata)/roms
-    artdir = $(rainedata)/artwork
-@@ -205,7 +209,7 @@
- 
++++ makefile	Thu Nov 17 13:02:40 2005	
+@@ -215,1 +215,1 @@
     AFLAGS = -f elf
- 
--   INCDIR += ` allegro-config --cflags` `libpng-config --cflags`
+
+-   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$(X11BASE)/include -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
index f027252d131d..1ecda275b4ff 100644
--- a/emulators/raine/files/patch-source::alleg::blit.c
+++ b/emulators/raine/files/patch-source::alleg::blit.c
@@ -1,6 +1,6 @@
 --- source/alleg/blit.c.orig	Mon Jan 17 12:37:21 2005
 +++ source/alleg/blit.c	Mon Jan 17 12:38:10 2005
-@@ -1,6 +1,8 @@
+@@ -1,1 +1,1 @@
  #ifdef RAINE_WIN32
  #include <allegro.h>
  #include <winalleg.h>
diff --git a/emulators/raine/files/patch-source::emumain.c b/emulators/raine/files/patch-source::emumain.c
index 40fa5142b735..3293c4321044 100644
--- a/emulators/raine/files/patch-source::emumain.c
+++ b/emulators/raine/files/patch-source::emumain.c
@@ -1,6 +1,6 @@
 --- source/emumain.c.orig	Wed Aug 17 13:14:36 2005
 +++ source/emumain.c	Thu Nov 17 18:04:37 2005
-@@ -9,6 +9,10 @@
+@@ -9,1 +9,1 @@
  #include <winalleg.h>
  #endif
  
@@ -11,18 +11,3 @@
  #include "raine.h"              // General defines and stuff
  #include "gui.h"                // Interface stuff
  #include "sasound.h"            // Sound Sample stuff
-@@ -286,13 +290,13 @@
-       } else if (recording_video) { // if draw_screen
- 	int current_video_frame = cpu_frame_count*video_fps / fps;
- 	if (current_video_frame != last_video_frame) {
--	  last_video_frame = current_video_frame;
- 	  char full_name1[256],full_name2[256];
- 	  FILE *f,*f2;
- 	  char buffer[1024];
- 	  int lus,n;
- 	  char *extension = (display_cfg.screenshot_png ? "png" : "pcx");
- 
-+	  last_video_frame = current_video_frame;
- 	  fprintf(stderr,"drop frame\n");
- 	  sprintf(full_name2,"%s%s_%06d.%s",dir_cfg.screen_dir, current_game->main_name,cpu_frame_count,extension);
- 	  n = 1;
diff --git a/emulators/raine/files/patch-source::games::cps1.c b/emulators/raine/files/patch-source::games::cps1.c
deleted file mode 100644
index c07a2057a832..000000000000
--- a/emulators/raine/files/patch-source::games::cps1.c
+++ /dev/null
@@ -1,20 +0,0 @@
---- source/games/cps1.c.orig	Mon Jan 17 10:56:50 2005
-+++ source/games/cps1.c	Mon Jan 17 11:35:07 2005
-@@ -1437,11 +1437,13 @@
-
- void load_cps2() {
-   UINT16 *rom = (UINT16*)load_region[REGION_ROM1];
--  xor = (UINT16*)load_region[REGION_USER1];
-+  UINT8 *tmp;
-+  int i, size_code, size_user1;
- /*   int size = get_region_size(REGION_USER1)/2,i,size_code; */
--  int size_code = get_region_size(REGION_ROM1),i;
--  int size_user1 = get_region_size(REGION_USER1);
--  UINT8 *tmp = AllocateMem(size_user1);
-+  xor = (UINT16*)load_region[REGION_USER1];
-+  size_code = get_region_size(REGION_ROM1);
-+  size_user1 = get_region_size(REGION_USER1);
-+  tmp = AllocateMem(size_user1);
-   if (!init_tilequeue()) return;
-   init_pbitmap();
-
diff --git a/emulators/raine/files/patch-source::games::dkong.c b/emulators/raine/files/patch-source::games::dkong.c
deleted file mode 100644
index 26d12a34281a..000000000000
--- a/emulators/raine/files/patch-source::games::dkong.c
+++ /dev/null
@@ -1,68 +0,0 @@
---- source/games/dkong.c.orig	Mon Jan 17 10:04:09 2005
-+++ source/games/dkong.c	Mon Jan 17 10:33:14 2005
-@@ -479,7 +479,7 @@
-
- static void draw_emudx() {
-   UINT8 code, color;
--  SCROLL_REGS;
-+  SCROLL_REGS
-   UINT8 *map,*gfx;
-   int offs;
-   int curlev = 0;
-@@ -517,8 +517,8 @@
-     gfx = gfx_ram;
-
-   if( check_layer_enabled(layer_id_data[0])) {
--    MAKE_SCROLL_n_16(512,512,1,0, 0);
--    START_SCROLL_16(BORDER,BORDER,512,512);
-+    MAKE_SCROLL_n_16(512,512,1,0, 0)
-+    START_SCROLL_16(BORDER,BORDER,512,512)
-
-     int sy = y-16*2;
-     if (sy < 0 || sy > 224*2+BORDER)
-@@ -716,20 +716,21 @@
-   /* As always for the color prom, great thanks go to mame for their decoding work */
-   for (i=0; i<256; i++) {
-     UINT8 bit0, bit1, bit2;
-+    int r,g,b;
-     /* red component */
-     bit0 = (color_prom[256] >> 1) & 1;
-     bit1 = (color_prom[256] >> 2) & 1;
-     bit2 = (color_prom[256] >> 3) & 1;
--    int r = 7 - (bit0 | (bit1<<1) | (bit2 << 2));
-+    r = 7 - (bit0 | (bit1<<1) | (bit2 << 2));
-     /* green component */
-     bit0 = (color_prom[0] >> 2) & 1;
-     bit1 = (color_prom[0] >> 3) & 1;
-     bit2 = (color_prom[256] >> 0) & 1;
--    int g = 7 - (bit0 | (bit1<<1) | (bit2 << 2));
-+    g = 7 - (bit0 | (bit1<<1) | (bit2 << 2));
-     /* blue component */
-     bit0 = (color_prom[0] >> 0) & 1;
-     bit1 = (color_prom[0] >> 1) & 1;
--    int b = 7 - ((bit0<<1) | (bit1 << 2));
-+    b = 7 - ((bit0<<1) | (bit1 << 2));
-     RAM_PAL[i] = (b) | (g<<3) | (r<<6);
-     color_prom++;
-   }
-@@ -800,9 +801,9 @@
-
- static void draw_dkong() {
-   UINT8 code, color;
--  SCROLL_REGS;
-+  SCROLL_REGS
-   UINT8 *map,*gfx;
--  int offs;
-+  int offs,sy;
-
-   if (*gfx_bank) {
-     gfx = gfx_ram + 0x100;
-@@ -813,7 +814,7 @@
-     MAKE_SCROLL_n_8(256,256,1,0, 0);
-     START_SCROLL_8(BORDER,BORDER,256,256);
-
--    int sy = y-16;
-+    sy = y-16;
-     if (sy < 0 || sy > 224+BORDER)
-       continue;
-     code = gfx[tile_index];
diff --git a/emulators/raine/files/patch-source::games::frogger.c b/emulators/raine/files/patch-source::games::frogger.c
deleted file mode 100644
index 9319fc698acd..000000000000
--- a/emulators/raine/files/patch-source::games::frogger.c
+++ /dev/null
@@ -1,30 +0,0 @@
---- source/games/frogger.c.orig	Sat Sep 17 10:35:38 2005
-+++ source/games/frogger.c	Thu Nov 17 16:52:10 2005
-@@ -438,7 +438,7 @@
- 
- static void draw_emudx() {
-   UINT8 code,color;
--  SCROLL_REGS;
-+  SCROLL_REGS
-   UINT8 *map,*solid;
-   int coul1, coul2;
- 
-@@ -796,7 +796,7 @@
-      rotated you call it either col or row scroll ! */
- 
-   UINT8 code, color;
--  SCROLL_REGS;
-+  SCROLL_REGS
-   UINT8 *map,*solid;
-   int coul1, coul2;
-   UINT8 *gfx = load_region[REGION_GFX1];
-@@ -868,8 +868,8 @@
-   }
- 
-   if( check_layer_enabled(layer_id_data[1])) {
--    solid = gfx_solid[1];
-     int offs;
-+    solid = gfx_solid[1];
-     for (offs = 0x20 - 4;offs >= 0;offs -= 4) {
-       UINT8 sx,sy,color;
-       int flipx,flipy,code;
diff --git a/emulators/raine/files/patch-source::games::pengo.c b/emulators/raine/files/patch-source::games::pengo.c
deleted file mode 100644
index 8806cd2c79ff..000000000000
--- a/emulators/raine/files/patch-source::games::pengo.c
+++ /dev/null
@@ -1,28 +0,0 @@
---- source/games/pengo.c.orig	Sat Sep 17 19:16:59 2005
-+++ source/games/pengo.c	Thu Nov 17 13:07:59 2005
-@@ -446,11 +446,12 @@
- static int tile_cache_init;
- 
- static void load_pengo() {
--  RAMSize = 0x1032+0x8000;
-   UINT8 *color_prom = load_region[REGION_PROMS];
-   UINT8 palette[32*2];
-   int i;
- 
-+  RAMSize = 0x1032+0x8000;
-+
-   if(!(RAM=AllocateMem(RAMSize))) return;
- 
-   if (!strcmp(current_game->main_name,"pengo")) {// normal
-@@ -1498,10 +1499,10 @@
- {
-   // quite different from pengo for the init : no encoding, different memory map,
-   // different palette...
--  RAMSize = 0x103a;
-   UINT8 *color_prom = load_region[REGION_PROMS];
-   UINT8 palette[32*2];
-   int i;
-+  RAMSize = 0x103a;
- 
-   if (!strcmp(current_game->main_name,"pacplus")) {
-     for (i = 0; i < 0x4000; i++)
diff --git a/emulators/raine/files/patch-source::gui::rgui.c b/emulators/raine/files/patch-source::gui::rgui.c
index cba39aea3a71..11576063bd5d 100644
--- a/emulators/raine/files/patch-source::gui::rgui.c
+++ b/emulators/raine/files/patch-source::gui::rgui.c
@@ -1,6 +1,6 @@
 --- source/gui/rgui.c.orig	Mon Jan 17 12:07:21 2005
 +++ source/gui/rgui.c	Mon Jan 17 12:23:46 2005
-@@ -9,6 +9,10 @@
+@@ -9,1 +9,1 @@
  #include <winalleg.h>
  #endif
 
@@ -11,22 +11,3 @@
  #include "raine.h"
  #include "rgui.h"
  #include "rguiproc.h"
-@@ -1507,6 +1511,10 @@
- void dialog_oxygen(void)
- {
-
-+#ifdef RAINE_UNIX
-+  struct timeval timeout;
-+#endif
-+
- #ifdef BUFFER_GUI
-    static int z,z1,z2,z3;
-    int ta;
-@@ -1560,7 +1568,6 @@
-   // its sleep function has a 1ms resolution instead of 1us. Too bad...
-    Sleep(1000/60);
- #elif defined(RAINE_UNIX)
--  struct timeval timeout;
-   timeout.tv_sec = 0;
-   timeout.tv_usec = 1000000/60;
-   select(0, NULL, NULL, NULL, &timeout);
diff --git a/emulators/raine/files/patch-source_bezel.c b/emulators/raine/files/patch-source_bezel.c
index a9ff757faf4e..5956dca4c362 100644
--- a/emulators/raine/files/patch-source_bezel.c
+++ b/emulators/raine/files/patch-source_bezel.c
@@ -1,6 +1,6 @@
 --- source/bezel.c.orig	Thu Nov 17 18:24:59 2005
 +++ source/bezel.c	Thu Nov 17 18:49:28 2005
-@@ -18,7 +18,7 @@
+@@ -18,1 +18,1 @@
  #define __USE_ISOC99 1
  #include <math.h>
  
@@ -9,20 +9,3 @@
  // djgpp seems to have specificities for rounding...
  // why on earth non one implements cleanly such basic function ???
  #define round rint
-@@ -296,6 +296,7 @@
-     int w = bezel_width, h = bezel_height;
-     int multw =1, multh = 1;
-     int xoff2,yoff2,destx,desty,xxx,yyy;
-+    BITMAP *scaled_bezel;
- 
-     if (!w || !h) {
- 	    // if wants_switch_res = 0, then the bezel is not initalised when arriving here...
-@@ -316,7 +317,7 @@
- 
-     w *= multw; h *= multh;
-     print_debug("bezel: create bitmap %dx%d\n",w,h);
--    BITMAP *scaled_bezel = create_bitmap_ex(bitmap_color_depth(bezel_bitmap),w,h);
-+    scaled_bezel = create_bitmap_ex(bitmap_color_depth(bezel_bitmap),w,h);
-     stretch_blit(bezel_bitmap,scaled_bezel,0,0,bezel_bitmap->w-1,bezel_bitmap->h-1,0,0,w,h);
- 
-     if (rotate_screen == 3 || rotate_screen == 1) { // 270
diff --git a/emulators/raine/files/patch-source_games_diverboy.c b/emulators/raine/files/patch-source_games_diverboy.c
deleted file mode 100644
index 519dbd00935c..000000000000
--- a/emulators/raine/files/patch-source_games_diverboy.c
+++ /dev/null
@@ -1,22 +0,0 @@
---- source/games/diverboy.c	Tue Sep 20 08:37:39 2005
-+++ source/games/diverboy.c.new	Thu Nov 17 16:26:26 2005
-@@ -138,6 +138,8 @@
- {
- 	static int framecounter = 0;
- 	UINT8* map;
-+	UINT8 *source;
-+	UINT8 *finish;
- 
- 	framecounter++;
- 
-@@ -147,8 +149,8 @@
- 	MAP_PALETTE_MAPPED_NEW(0x0,16,map);
- 	clear_game_screen(ReadLong(&map[0]));
- 
--	UINT8 *source = RAM_SPRITE;
--	UINT8 *finish = source + 0x4000;
-+	source = RAM_SPRITE;
-+	finish = source + 0x4000;
- 
- 	while (source < finish)
- 	{
diff --git a/emulators/raine/files/patch-source_games_esd16.c b/emulators/raine/files/patch-source_games_esd16.c
deleted file mode 100644
index 1ff24ecfbd08..000000000000
--- a/emulators/raine/files/patch-source_games_esd16.c
+++ /dev/null
@@ -1,17 +0,0 @@
---- source/games/esd16.c.orig	Thu Nov 17 16:34:24 2005
-+++ source/games/esd16.c	Thu Nov 17 16:34:48 2005
-@@ -552,12 +552,13 @@
- }
- 
- static void draw_multchmp() {
--  ClearPaletteMap();
-   int x16,y16,zzz,zzzz;
-   int zz;
-   int x,y;
-   UINT16 code;
-   UINT8 *map;
-+
-+  ClearPaletteMap();
- 
-   // 1 layer is opaque 1024x512, 8x8 sprites
-   if (check_layer_enabled(layer_id_data[1])) {
diff --git a/emulators/raine/files/patch-source_games_mitchell.c b/emulators/raine/files/patch-source_games_mitchell.c
deleted file mode 100644
index 33782ccf055c..000000000000
--- a/emulators/raine/files/patch-source_games_mitchell.c
+++ /dev/null
@@ -1,19 +0,0 @@
---- source/games/mitchell.c.orig	Thu Nov 17 17:41:02 2005
-+++ source/games/mitchell.c	Thu Nov 17 17:41:34 2005
-@@ -451,6 +451,7 @@
- 
- static UINT8  pang_port5_r (UINT32 offset) {
-   int bit;
-+  UINT8 res;
- 
-   bit = EEPROM_read_bit() << 7;
-   // 2 bits are togled in the cpu frame, 1 for the vblank, the other unknown
-@@ -458,7 +459,7 @@
- /* if (Machine->gamedrv == &driver_mgakuen2)	/\* hack... music doesn't work otherwise *\/ */
- /* 	bit ^= 0x08; */
- 
--  UINT8 res = (input_buffer[0] & 0x7f) | bit;
-+  res = (input_buffer[0] & 0x7f) | bit;
-   return res;
- }
- 
diff --git a/emulators/raine/files/patch-source_raine.c b/emulators/raine/files/patch-source_raine.c
deleted file mode 100644
index 7cfc040154ad..000000000000
--- a/emulators/raine/files/patch-source_raine.c
+++ /dev/null
@@ -1,39 +0,0 @@
---- source/raine.c.bak	Thu Nov 17 17:58:51 2005
-+++ source/raine.c	Thu Nov 17 17:57:32 2005
-@@ -92,6 +92,17 @@
- {
-    int i,ta,version_id;
-    char str[256],*s;
-+   char *dirs[] = {
-+		 "config",
-+		 "savegame",
-+		 "savedata",
-+		 "roms",
-+		 "demos",
-+		 "snapshot",
-+		 "artwork",
-+		 NULL
-+		 };
-+   char **dirp = dirs;
- #ifdef GFX_FBCON
-    FILE *f;
- #endif
-@@ -241,18 +252,6 @@
-    raine_cfg.hide = 0;
-    raine_cfg.req_load_game = 0;
-    raine_cfg.req_game_index = 0;
--
--   char *dirs[] = {
--		 "config",
--		 "savegame",
--		 "savedata",
--		 "roms",
--		 "demos",
--		 "snapshot",
--		 "artwork",
--		 NULL
--		 };
--   char **dirp = dirs;
- 
-    mkdir_rwx(dir_cfg.exe_path);
-    while (*dirp) {