Update to 0.43.3:

Changes (adapted from debian/changelog):

0.43.3

  * fix compilation errors in xorg, and with versions of allegro which don't
    define GFX_XWINDOWS_FULLSCREEN. Also this one works with gcc-4, no more
    errors about movl.
  * Apply patch from Antiriad which adds fix eight bootleg
  * Basic dependencies support in the makefile, so that at least the
    compilation doesn't stop with 2 pages of error messages just because
    we forgot to install a lib (liballeg, sdl and allegro tested).

0.43.2

  * Haze added diverboy, mugsmash, cross pang.
  * I added Jumping pop, and Tetris 2+ (or fixed it since there was a
    preliminary driver in raine since 0.28, but it was really the begining).
    I also added the esd16 driver from mame, with multi champ, multi champ
    deluxe, and head panic. All of these are using lots of colors !
  * A few fixes for extreme video modes situations (linux console). WARNING:
    if you want to play with the frame buffer in linux, use allegro 4.2.0,
    frame buffer support has been broken for a very long time in
    allegro-4.1.x.
  * Also some fixes to really prevent raine from changing the current video
    mode if the user forbids it or if the current video driver can't give
    the list of supported video modes by the monitor (which is the case of
    frame buffer driver for linux).
  * Bezel fixes : when the video mode is not automatically changed, the bezel
    now adapts to the current mode (instead of not displaying anything).
    Also if you load a 2nd game which also uses a bezel, the 2nd bezel is now
    correctly handled.
  * The buffer for the history.dat is doubled (for dkong for example), I
    should probably use a dynamic buffer for that... maybe later.
  * Now raine supports multiple layouts / gfx layers, and is automatically
    calling make_solid_mask for a region when a layout is defined for it.
    gfx[n] always contains the nth layer in the layouts list, and gfx_solid[n]
    is the result of the call of make_solid_mask on this region, and
    max_sprites[n] contains the number of sprites for this area.
    Also the driver's loading function is now called BEFORE the layouts are
    applied, which allows to decrypt/convert the sprites and still use
    automatically the layers. This should have been added a long time ago, it
    became obvious just recently with all these drivers which needed manual
    graphics decoding.
  * raine does its own tests for svgalib in linux now. If it does not detect
    vga.h at the standard places when compiling, then svgalib support is
    disabled.
  * Fixed the fg layer of the 2nd tc100scn not updated in thundfox (thundfox
    seems to be the only game which uses a 2nd fg layer, so it escaped me !)
  * while testing stuff with the eeproms, fixed pang3j which never worked (!),
    and added service mode controls for the pirates driver.
  * fine tune the music of the hammer in donkey kong so that the other sounds
    can be heared while it's playing.

0.43.1

  * Haze added these new games :
    hyperpac driver : twinkle, Xess - The New Revolution (Semicom 3-in-1),
    more more, final tetris.
    cookbib driver : Cookie and Bibi, Hatch Catch, Choky Choky.
    I fixed the dipswitches, and for final tetris the sound and the inputs.

0.43.0

  * Added new games : Pang, Super Pang, Poker ladies, Block Block.
    All of them playable with sound, adapted from mame.

  * Added sound support to these games based on the nmk004 findings in mame:
    macross, black heart, bio ship paladin, strahl, acrobat mission, mustang,
    thunder dragon, and even hacha mecha fighter but this one is still totally
    unplayable.

    For mustang, I switched to mustang original set instead of the bootleg
    version to avoid the infamous seibu sound system, so you'll have to update
    your romsets.
    Congratulations go to the mame team for that, everyone has been wondering
    how this sound emulation worked for YEARS !
  * Fixed the file size recorded in the wav files, when recording
    raine_soud.wav, and the alignement byte which prevented the sound to play
    in the microsoft media player ! The wav file format is probably one of the
    stupidest file formats ever invented !
  * add the ability to save screenshots in png (default now). You can set the
    compression level by editing the configuration file. Also you can now use
    a png file for the raine default background picture !
  * Add a new command to save a "video", or more exactly a sequence of
    screenshots (preferably in png), and at the same time a wav file. You will
    still need something like mplayer to merge everything together.
    See README.videos in the docs directory for the details.
  * fixed sound not starting when loading a saved game before qsound has been
    initalised in the capcom games (also fix a few stupid bank switches here
    and there).
  * When choosing the best video resolution if all the available resolutions
    where too small, then you got a ridiculously small resolution. Now you get
    the bigest one.
  * Added artwork bezel support - see README.bezels in the docs directory.
  * Fixed bad sound in bjtwin and sabotenb, now there are no cracks any more.
  * Fix a very old bug where the default directories for screen_dir
    (snapshots) and roms became "", translated to "/". I never noticed it
    because I always use the same config...
  * Fix a 1 pixel alignement issue for the text layer in do donpachi (I never
    noticed it before because I usually don't have time to read the text in
    dodonpachi ! I finally saw it because I recorded a video in dodonpachi!).
  * For windows choose a windowed default video mode to avoid any problem with
    weird setups which have vido sync problems. For the other OSes, choose a
    default resolution based on the video modes really available, take the 1st
    from 320x240.
  * dx2 emudx file format : graphics for emudx are now stored in .dx2 files,
    which should be available from rainemu.com. These files are smaller than
    the original .dx files (and it's more convinient to work with these). The
    emudx files can now be placed either in the main raine directory for
    compatibility or in the emudx sub directory. .dx files are not supported
    anymore for the graphics.
  * Added hammer music to donkey kong... It's generated from a midi file, oh
    well, if someone can do something better, let me know !
  * Unix behaviour : a long time ago I accepted a patch to make raine to use a
    personnal dir, and a system wide dir for its files in linux, but I never
    took the time to test this since I have always used only 1 dir for raine.
    Well, it didn't work, raine always used one of these 2 instead of trying
    the personnal dir first and then the system wide directory. It's now fixed
    for raine.dat, hiscore.dat, history.dat, the snapshots, the language
    files, and the bezels.

0.42.5

  * make raine gcc-4.0 compatible : still quite a few warnings in the end,
  especially when compiling the 6502 emulator, but most of them are gone now,
  and the build works.

0.42.4

  * add progear (cps2)
  * add pzloop2j (with speed hack)
  * Fixed 1944.

0.42.3

  * Fixed toki sound (ym3812)
  * Improved priority bitmap emulation (faster and more precise) for cps2 and
    the cave driver.
  * Add rom region switches for mshh and mpangj (translated), and vhunt2r1
    and vsav2 (only partially translated, but the service mode is translated
    at least).
  * Added a speed hack for mpangj
  * Fix bad color palette for snapshots in the gui in 16bpp sometimes

0.42.2

  * Handle priority bitmap for cps2 when needed, transparency effect in capcom
    sports club attract mode is emulated.
  * Fix annoying gui corrupted colors after loading some games.
  * Added the cps2 games from mame with a non working parent

0.42.1

  * Fixed REGION_EMPTY not supported anymore for games like arkanoid bootleg.
    This bug was probably due to the new way of handling clones when loading
    roms (added in 0.40.5) (helped from loading the rom).
  * Save a little more memory for cps1 & cps2 (on scroll1).
  * Try much harder to reset game hardware when a f3 game hangs after its
    eeprom has been reseted. With this we should definetely get rid of the
    "game xyz hangs when I launch it" messages in the forums.
  * Fix levels order in dkong us (this should be the last time !).
  * Add speed hacks for 19xx and dimahoo (not sure if it's usefull or not, but
    now these games won't be limited by the cpu power...).
  * Fix music speed for cps2 (it was slightly too slow, check sgemf when it
    displays "no mercy"...).
  * Fix a very old bug in the speed hack allocations for cps1 & cps2, it
    showed only in an sgemf background during attract mode afaik.
  * Try a new way of handling the priorities for cps2. This is not the mame
    way. It's faster, but I am not sure it works everywhere, it's much better
    than what we had in 0.42.0 anyway.
  * Fixed compilation with allegro-4.0.x for fedora core (linux).
  * Added new game : nostradamus, fully playable (it was to test the oddities
    of the mcatadv driver...).

0.42.0

  * Fixed the last sound issues in cps2 (in fact it was just the data bank of
    the z80 which was not loaded correctly), and added a few cps2 games to
    play with. Video priorities are still not emulated, but the result is
    quite good actually !!!
  * Improved the starscream patch for gigawing, and add all the real cps2
    games from mame (no clones).
  * Improve sprites decoding in cps1/cps2 to save memory. The memory saved is
    quite impressive, but 19xx and dimahoo still require about 70 Mb (120 Mb
    before !!!).
  * Fix a possible buffer overflow in history.dat handling (there was one for
    mvsc) and expand the history.dat buffer to 8kb.

0.41.4

  * Fix air gallet special bg2 layer (8x8 layer displayed as 16x16).
  * Fix layer alignement in air gallet
  * cps2 becomes runnable now (no video priorities yet, and still some
   sound synchronization issues on some games)

0.41.3

  * Fix the stupid forgoten bug in the patch of starscream (byte inversion).
    The fixes *LOTS* of problems especially with cps1 games.

0.41.2

  * Fixed flames glowing in dkong (quick fix, using the allegro alpha blending
    functions - can probably be improved).
  * Fixed sprites not showing in late stages of mazinger
  * Fixed sprites priorities in cave driver (in fact rewrote the whole
    priority code for the cave driver, now using only the priority bitmap).
    Now you can finally read the text in the end of dodonpachi and see
    some new gfx effects in the intro of dfeveron, and feversos, and there
    are probably some more changes...
  * Fixed inputs not working for player 2 in guwange (quite a shame that this
    one was never finden earlier !!!).
  * Fixed a crash when launching "Bobble Bobble" (not Bubble Bobble).
  * frogger samples updates :
     - coin sample is now louder
     - game over and all home sound now much better thanks to old original
     files found by Mike.
     - Added a new tune when you loose a life, from one of these old files.

0.41.1

  * When loading dkongjp after dkong, the levels were still drawn for dkong.
    It's fixed now.
  * pacman and mspacman now have big flashing power pills ! :)
  * pacman/mspacman : fruits on the bottom of screen match fruits in the
    level!
  * Applied patch from Ville Skytta to have language files in lower case
    (after all only dos/windows is case insensitive, all the serious OS in the
    world are case sensitive ! :))
  * Fixed the colour of the gun in opwolf and zombie raid (and every game
    actually using the gun) for color depths > 8 (bug related to changes for
    the sdl video driver).
  * Fixed sound card name (SDL <Not initialised yet> was displayed in the
    sound driver selection dialog).

0.41.0

  * Move the handling of dx samples to a new sound driver (dxsmp.c). It was
    necessary to have a precision of 1 frame with buggy windows sound drivers
    which must work with big sound buffers for the updates.
  * Fixed a bug when loading dkong after mspacmab.
  * Fixed the missing sprite of the purple frog in frogger
  * the roars at when the game starts and when a level ends are now emulated
    in dkong (2 roars instead of 3 because dx roars last longer !).
  * dx samples status is now saved in savegames, and they stop when you reset
    the game hardware.
  * added donkey kong (us and japan versions), with dx samples and dx graphics.
  * Fixed arpro search on games using a Z80 as cpu 0, and removed the
    obligation to have -1,-1 in the z80 memory map for the searches to work
    (-1,-1 serves nothing by itself, whereas 0,0xffff, DefBadReadByte is
    always there).
  * emudx samples now work in sdl, and I took back the musics from the dx
    samples with volume adustements.
  * Change the synchronisation method for the sdl sound driver. The new method
    uses more efficiently the callback, better results in windows and shorter
    and much easier code.
  * Fixed a problem with cheats/hiscore on games using exactly 2 z80s frogger,
    for example
  * Prevent emudx to change resolution when it's not necessary (related to
    color depth)
  * Finally converted the dx characters in frogger to retrieve their originol
    colours. Quite crazy !
  * Add a "Pac-man/Pengo" driver name in the driver selection menu for the
    game selection dialog (it allows to quickly spot the new pacman hacks).
  * Took back the fix for the allegro gui bug where the menu is frozen if
    raine is linked with allegro-4.0.x. But this time test allegro version we
    were compiled with before applying the work around (usefull in debian
    where they use allegro 4.0.x which is supposed to be stable).
    This work around disables dialog solid movements (no blits).
  * Frogger : fix layer alignement and replacement of layer tiles by big 32x32
    sprites.
  * Disable ansi sequences in windows (stupid windows still does not support
    ansi sequences natively, what a shame !!!).
  * Added emudx support for frogger (graphics and sound). Kept the ay8910 for
    music.
  * Added frogger, playable without sound (will try to add only emudx sound,
    these filters used by frogger for sound look like a real mess !)
  * Added sstriker, european translation of mahoudai (toaplan2)
  * Fixed a few default intialisations the first time raine is launched,
    especially for win32. Now :
     - the displayed video mode is correct in windows (there was a bug with
     the autodetect video driver...)
     - switch to 16bpp by default for xwindows and windows.
     - chooses allegmix sound driver by default in win32 (back to allegro)
     - the list of displayed games is "available" by default.
     - emudx init now always forces 16bpp (allegro was wrongly reporting 8bpp
     as the depth of the bitmaps in the archive if the current video mode was
     in 8bpp !)
     - Games which now request 16bpp switch color depth to 16bpp if they are
     currently in 32bpp (it's for emudx support which absolutely requires
     16bpp and can't work in 32bpp).
  * Added complete alpha blending support (mmx code based on an article found
    on the web). For now it works only for 32x32 sprites but it can easily be
    adapted to any size.
  * Put back windows to allegmix sound driver, and put the linux sound driver
    to its normal defaults as in 0.40.4. Windows sound drivers (at least those
    from creative) do not respect specs, which makes sdl sound delay
    corrections very hard. And on the other hand the allegro sound driver is
    unreliable in linux. So this is the easiest solution.
  * Bugs found : when raine is first installed in windows, it wrongly believes
    it's using the accelerated driver when it uses the autodetect driver which
    makes color depth changes impossible. I should really remove completely
    this autodetect thing one day. The autodetect driver in sdl is a miracle,
    and in allegro it's a nightmare !!! But this bug will probably stay where
    it is for quite a while, I hate windows, and I don't want to spend time on
    it.
  * Added some preliminary alpha blending drawing functions for the ghosts in
    pacman ! For now the alpha blending is locked at 50%, which makes the
    ghosts a little dark... but at least it's fast !!!

0.40.5

  * Added emudx support for pacman/puckman and mspacmab :-) !
  * Fixed pacman savestates to save irq status (it allows to load a game
    without having to wait for the machine to initialize).
  * added yet another hack : Xen's revenge (very hard !)
    Fixed pacman dsw, and improved the "2x speed cheat" from mame's idea
    (using button 1 to enable it or not, after having enabled the cheat from
    the dsw).
  * Added new game hacks : mspacpls, mspac6m, pacman3d, and namcosil.
    Also raine now uses clones of clones as it should always have (since it's
    the main purpose of the DIR_INFO struct : allowing recursion !). It makes
    the ROM_INFO structs even shorter now !
  * Applied patches from Ville Skytta (optional svgalib build in linux + ansi
    colors slightly different)
  * Try to detect when stdout is redirected to a file and disable ansi colors
    in this case (use isatty, but isatty does not seem to be available in
    windows... what a surprise !)
  * The clones do not repeat the regions of the parent anymore.
    When a region is the same it is simply not listed, and raine checks the
    parent automatically now. If you want the region to be empty, you have to
    tell it explicitely by using REGION_EMPTY (see arkanoid.c for an example).
    It makes shorter source code, and makes it easier to maintain too. It
    fixes the bad snowbros clones in 0.40.5 by the way.
  * Enough of fixes for raine-0.40.5

0.40.4

  * Lots of games which are requiring 8bpp now automtically set the screen to
    8bpp if it is in a different color depth when you load them.
  * Buble Boble is now playable in any color depth.
  * Running Pulirula and then loading rastan does not crash raine anymore.
    Also this fix will probably improve the stability when loading a few games
    which are using the tc100scn video chip.
  * Running a toaplan2 game like dogyuun, and then a cave game like donpachi
    works normally now.
  * Fix ym3812 timer. Now demon's world, snow bros and quite a few others are
    playable again... By the way snowbros now uses the new mame set.
  * Upgrade Chuka Taisen to use the latest mame set (b44.12 was changed to
    b44.12w, but I ignore the reason).
  * fixed ballbros/twinhawk when raine was compiled in debug mode (there was a
    ++ in a print_debug, what a shame !!!)
  * Fix tc0100scn emulation for "asuka & asuka", and opwolf.
  * Fixed c-chip for opwolf (ingame and reset game).
  * Fixed a few drivers with sound too loud in sdl (matmania, arkanoid...)
  * Fixed noise channel not working for the ay8910 (in matmania for example).
  * The SDL video is starting to work. No gui yet, but already hardware
    accelerated overlays when supported.
  * Raine now uses ANSI sequences to write text in color to the console.
    It allows to get RAINE in the colors of the old dos version in any linux
    or windows terminal !
  * Fixed cpu capabilities detection, and add rdtsc detection.
  * Forced sound buffer length to 2048 samples for sdl, since this is all
    what quite a few soundblaster windows drivers can handle (a pity).
    Anyway, it does not seem to create any bad delay, but it needs more
    testing.
  * Improved again sound synchronization for SDL (it's just more responsive,
    which can be helpfull on slow systems which drop frames). There is still a
    bug with some win2k versions though wich seem to require transfers of 4096
    bytes in my_callback, which represents about 6 sound frams, and which
    makes synchronization very hard. For now the only reliable solution with
    this win2k problem is to use the allegro sound driver.
  * Also improved sound emulation speed : the stream_update function in
    streams.c does not seem to make the emulation more precise, but it
    definetely makes it slower, so I just reverted to the old behaviour, it
    does nothing anymore.
  * Fixed controls in sf2ce clones (sf2m4, m5, m6, etc...).
  * Improved sound synchronization, it now can jump or drop more than 1 frame,
  and it can follow when one of the points is at the begin of the buffer while
  the other is at the end. It fixes the sound in all taito f3 games.

0.40.3

  * Unix version now uses its shared path (/usr/shar/games/raine) as the
    default location to load the hiscore.dat and history.dat file.
  * SDL sound support, bug fixes

12 files changed, 152 insertions, 209 deletions

diff --git a/emulators/raine/Makefile b/emulators/raine/Makefile
index 2a64f0662f6..91476e3e50b 100644
--- a/emulators/raine/Makefile
+++ b/emulators/raine/Makefile
@@ -1,9 +1,8 @@
-# $NetBSD: Makefile,v 1.13 2006/03/04 21:29:35 jlam Exp $
+# $NetBSD: Makefile,v 1.14 2006/07/17 20:21:35 wiz Exp $
 #
 
-DISTNAME=	raines-0.40.2
+DISTNAME=	raines-0.43.3
 PKGNAME=	${DISTNAME:S/raines/raine/}
-PKGREVISION=	2
 CATEGORIES=	emulators
 MASTER_SITES=	http://www.rainemu.com/html/archive/
 EXTRACT_SUFX=	.tar.bz2
@@ -14,27 +13,31 @@ COMMENT=	680x0 Arcade Emulator
 
 BUILD_DEPENDS+=	nasm-[0-9]*:../../devel/nasm
 
-WRKSRC=		${WRKDIR}/raine
-USE_TOOLS+=	gmake perl:run
+WRKSRC=		${WRKDIR}/${PKGNAME_NOREV}
+USE_TOOLS+=	gmake perl:run pkg-config
 MAKEFILE=	makefile
 MAKE_ENV+=	OSTYPE=linux
 REPLACE_PERL=	makedep
 PTHREAD_OPTS+=	require
 
+USE_DIRS+=	xdg-1.1
+
 # XXX Really?
 ONLY_FOR_PLATFORM=  *-*-i386
 
 post-build:
-	@(							\
-	${ECHO} "#!${SH}";					\
-	${ECHO} "cd ${PREFIX}/share/raine && ./raine $$@"	\
-	) > ${WRKSRC}/raine.sh
+	(${ECHO} "#!${SH}";					\
+	 ${ECHO} "cd ${PREFIX}/share/raine && ./raine $$@")	\
+		> ${WRKSRC}/raine.sh
 
-pre-install:
-	@${INSTALL_SCRIPT} ${WRKSRC}/raine.sh ${PREFIX}/bin/raine
+post-install:
+	${MV} ${PREFIX}/bin/raine ${PREFIX}/share/raine
+	${INSTALL_SCRIPT} ${WRKSRC}/raine.sh ${PREFIX}/bin/raine
 
+.include "../../devel/SDL/buildlink3.mk"
 .include "../../devel/allegro/buildlink3.mk"
 .include "../../devel/zlib/buildlink3.mk"
+.include "../../graphics/png/buildlink3.mk"
 .include "../../mk/pthread.buildlink3.mk"
 .include "../../mk/x11.buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/emulators/raine/PLIST b/emulators/raine/PLIST
index afb2450e48e..81defa4cf25 100644
--- a/emulators/raine/PLIST
+++ b/emulators/raine/PLIST
@@ -1,29 +1,38 @@
-@comment $NetBSD: PLIST,v 1.1.1.1 2004/04/05 05:05:28 xtraeme Exp $
+@comment $NetBSD: PLIST,v 1.2 2006/07/17 20:21:35 wiz Exp $
 bin/raine
-share/raine/languages/Brasil.cfg
-share/raine/languages/CZECH.CFG
-share/raine/languages/Catala.cfg
-share/raine/languages/Dansk.cfg
-share/raine/languages/Dutch.cfg
-share/raine/languages/English.cfg
-share/raine/languages/Espaņol.cfg
-share/raine/languages/Euskera.cfg
-share/raine/languages/Finnish.cfg
-share/raine/languages/French.cfg
-share/raine/languages/French2.cfg
-share/raine/languages/German.cfg
-share/raine/languages/German2.cfg
-share/raine/languages/Italian.cfg
-share/raine/languages/Japanese.cfg
-share/raine/languages/POLISH.CFG
-share/raine/languages/Portugal.cfg
-share/raine/languages/Spanish.cfg
-share/raine/languages/Svenska.cfg
-share/raine/languages/Template.cfg
-share/raine/languages/Turkish.cfg
+share/applications/raine.desktop
+share/pixmaps/raine.png
+share/raine/cheats.cfg
+share/raine/hiscore.dat
+share/raine/languages/brasil.cfg
+share/raine/languages/catala.cfg
+share/raine/languages/czech.cfg
+share/raine/languages/dansk.cfg
+share/raine/languages/dutch.cfg
+share/raine/languages/english.cfg
+share/raine/languages/espanol.cfg
+share/raine/languages/euskera.cfg
+share/raine/languages/finnish.cfg
+share/raine/languages/french.cfg
+share/raine/languages/french2.cfg
 share/raine/languages/galego.cfg
+share/raine/languages/german.cfg
+share/raine/languages/german2.cfg
+share/raine/languages/italian.cfg
+share/raine/languages/japanese.cfg
+share/raine/languages/polish.cfg
+share/raine/languages/portugal.cfg
+share/raine/languages/spanish.cfg
+share/raine/languages/svenska.cfg
+share/raine/languages/template.cfg
+share/raine/languages/turkish.cfg
 share/raine/raine
 share/raine/raine.dat
-@dirrm share/raine/languages
+@exec ${MKDIR} %D/share/raine/roms
 @dirrm share/raine/roms
+@dirrm share/raine/languages
+@exec ${MKDIR} %D/share/raine/emudx
+@dirrm share/raine/emudx
+@exec ${MKDIR} %D/share/raine/artwork
+@dirrm share/raine/artwork
 @dirrm share/raine
diff --git a/emulators/raine/distinfo b/emulators/raine/distinfo
index e854f35a13d..2254ebc1b69 100644
--- a/emulators/raine/distinfo
+++ b/emulators/raine/distinfo
@@ -1,14 +1,8 @@
-$NetBSD: distinfo,v 1.5 2006/01/12 21:35:09 joerg Exp $
+$NetBSD: distinfo,v 1.6 2006/07/17 20:21:35 wiz Exp $
 
-SHA1 (raines-0.40.2.tar.bz2) = 1fbd0c108d60f53806a03f86693faf9ffdb6e60b
-RMD160 (raines-0.40.2.tar.bz2) = e2c169ebcc69f617717b68272dca203658893a70
-Size (raines-0.40.2.tar.bz2) = 1513190 bytes
-SHA1 (patch-aa) = 977bf37619aac97dff4bd11c2f28726faa219154
-SHA1 (patch-ab) = 3fc85718ec2079fbbb7a59d06f782e2832889d0a
-SHA1 (patch-ac) = 40ec161397eed474a1274ea8f0e802eb5e687608
-SHA1 (patch-ad) = 5ad5f4f60a8f22e55100fa0604fd08594f659510
-SHA1 (patch-ae) = 6ce2adccb6bded8cd4034ad314ce1856db95871c
-SHA1 (patch-af) = 4978139a0d0f0e4c92c7a3dd2084167785fdf524
-SHA1 (patch-ag) = d79a11f6162895f5ef844c60ac36e4f0a22bf544
-SHA1 (patch-ah) = 9e7296cb7619fbbecd5380d021cb319d66806ef5
-SHA1 (patch-ai) = 86f682d1ae41e75a283c8f7c0474a8b03271b2fa
+SHA1 (raines-0.43.3.tar.bz2) = a6c9fa7b63aadca8f5a76ba71532c0502854188b
+RMD160 (raines-0.43.3.tar.bz2) = c245930880cada5f965caf7a9f2d4d9301912b82
+Size (raines-0.43.3.tar.bz2) = 1740971 bytes
+SHA1 (patch-aa) = ee9d56cfc6b157b3b4a8d77547cf093688b6079e
+SHA1 (patch-ab) = 9143d9f43150ec033d7a72d288256d0c759665d6
+SHA1 (patch-ac) = 82f0bc91dc840b250ec45899306c19b56f98a7ed
diff --git a/emulators/raine/patches/patch-aa b/emulators/raine/patches/patch-aa
index ada9805a1c6..f12dc307efc 100644
--- a/emulators/raine/patches/patch-aa
+++ b/emulators/raine/patches/patch-aa
@@ -1,15 +1,19 @@
-$NetBSD: patch-aa,v 1.2 2004/06/05 17:14:14 xtraeme Exp $
+$NetBSD: patch-aa,v 1.3 2006/07/17 20:21:35 wiz Exp $
 
---- makefile.orig	2004-06-05 18:53:01.000000000 +0200
-+++ makefile	2004-06-05 18:58:51.000000000 +0200
-@@ -27,30 +27,7 @@
+--- makefile.orig	2006-05-26 12:12:22.000000000 +0000
++++ makefile
+@@ -25,35 +25,6 @@ VERSION = "0.43.3"
  # Use asm video core ? (comment to use C core)
  ASM_VIDEO_CORE = 1
  
 -# Try to detect mingw... If you want to build the dos and the mingw
 -# version on the same system you should unset djdir before making
 -# the mingw version.
--ifeq ($(shell uname -o),GNU/Linux)
+-ifeq ("$(shell uname)","Linux")
+-OSTYPE=linux-gnu
+-endif
+-
+-ifeq ("$(shell uname)","FreeBSD")
 -OSTYPE=linux-gnu
 -endif
 -
@@ -24,45 +28,79 @@ $NetBSD: patch-aa,v 1.2 2004/06/05 17:14:14 xtraeme Exp $
 -endif
 -else
 -ifdef VERBOSE
- ASM=nasm
+-ASM=nasm
 -else
 -ASM=@nasm
 -endif
 -endif
 -endif
- 
+-
  ifdef mingdir
  MINGDIR=1
-@@ -176,10 +153,10 @@
- #	SDL = 1
- 
-    prefix = $(DESTDIR)
--   bindir = $(prefix)/usr/games
--   sharedir = $(prefix)/usr/share
--   mandir = $(sharedir)/man/man6
--   rainedata = $(sharedir)/games/raine
-+   bindir = $(PREFIX)/bin
-+   sharedir = $(PREFIX)/share
-+   mandir = $(PREFIX)/man/man6
-+   rainedata = $(sharedir)/raine
-    langdir = $(rainedata)/languages
-    romdir = $(rainedata)/roms
- 
-@@ -202,10 +179,10 @@
+ endif
+@@ -123,8 +94,8 @@ RAINE32 = 1
+ DEFINE = -D__RAINE__ \
+ 	   -DRAINE_WIN32 \
+ 
+-   PNG_LFLAGS = "$(shell libpng-config --ldflags)"
+-   PNG_STATIC_LFLAGS = "$(shell libpng-config --static --ldflags)"
++   PNG_LFLAGS = "$(shell pkg-config --libs libpng12)"
++   PNG_STATIC_LFLAGS = "$(shell pkg-config --libs --static libpng12)"
+    LIBS = -lz -lalleg $(PNG_LFAGS)
+    LIBS_STATIC = -lz -lalleg_s -lkernel32 -luser32 -lgdi32 -lcomdlg32 \
+    -lole32 -ldinput -lddraw -ldxguid -lwinmm -ldsound \
+@@ -153,9 +124,9 @@ endif
+ 
+    AFLAGS = -f coff
+ 
+-   PNG_CFLAGS = "$(shell libpng-config --cflags)"
+-   PNG_LFAGS = "$(shell libpng-config --ldflags)"
+-   PNG_STATIC_LFLAGS = "$(shell libpng-config --static --ldflags)"
++   PNG_CFLAGS = "$(shell pkg-config --cflags libpng12)"
++   PNG_LFAGS = "$(shell pkg-config --cflags libpng12)"
++   PNG_STATIC_LFLAGS = "$(shell pkg-config --cflags --static libpng12)"
+    INCDIR += $(PNG_CFLAGS)
+    DEFINE = -D__RAINE__ \
+ 	   -DRAINE_WIN32 \
+@@ -214,7 +185,7 @@ else
+ 
+    AFLAGS = -f elf
+ 
+-   PNG_CFLAGS = "$(shell libpng-config --cflags)"
++   PNG_CFLAGS = "$(shell pkg-config --cflags libpng12)"
+ ifndef SDL
+ ALLEGRO_CFLAGS = "$(shell allegro-config --cflags)"
+ endif
+@@ -226,9 +197,9 @@ endif
     DEFINE = -D__RAINE__ \
  	   -DRAINE_UNIX \
  
--   LIBS = -lz `allegro-config --libs` -lvga # -lefence
--   LIBS_DEBUG = -lz -lvga `allegro-config --libs debug`
-+   LIBS = -lz `allegro-config --libs`
-+   LIBS_DEBUG = -lz `allegro-config --libs debug`
+-   LIBS = -lz `allegro-config --libs` `libpng-config --ldflags`
+-   LIBS_DEBUG = -lz `allegro-config --libs ` `libpng-config --ldflags` # -lefence
+-   LIBS_STATIC = -lz `allegro-config --static` `libpng-config --static --ldflags`
++   LIBS = -lz `allegro-config --libs` `pkg-config --libs libpng12`
++   LIBS_DEBUG = -lz `allegro-config --libs ` `pkg-config --libs libpng12` # -lefence
++   LIBS_STATIC = -lz `allegro-config --static` `pkg-config --static --libs libpng12`
+ 
+ ifeq ("$(shell if [ -e /usr/include/vga.h ] || [ -e /usr/local/include/vga.h ]; then echo yes; fi)","yes")
+ GFX_SVGALIB=1
+@@ -838,13 +809,13 @@ LIBS += `sdl-config --libs`
+ endif
+ endif
  
--   LIBS_STATIC = -lz -lvga `allegro-config --static`
-+   LIBS_STATIC = -lz `allegro-config --static`
+-all:	cpuinfo message maketree depend $(RAINE_EXE)
++all:	message maketree depend $(RAINE_EXE)
  
- endif # linux / mingw32
- endif # djgpp
-@@ -942,11 +919,7 @@
+ depend:
+ 	@echo dependencies : if you get an error here, install the required dev package
+ ifndef RAINE_DOS
+ 	@echo -n libpng:
+-	@libpng-config --version
++	@pkg-config --version libpng12
+ 	@echo -n sdl:
+ 	@sdl-config --version
+ endif
+@@ -1048,11 +1019,7 @@ dep: make.dep
  make.dep:
  	./makedep $(OBJDIR) $(OBJS) > make.dep
  
@@ -74,20 +112,29 @@ $NetBSD: patch-aa,v 1.2 2004/06/05 17:14:14 xtraeme Exp $
  
  # create directories
  
-@@ -984,14 +957,16 @@
- install: install_dirs $(RAINE_LNG)
- ifdef RAINE_LINUX
+@@ -1090,18 +1057,22 @@ vclean:
+ install: install_dirs $(RAINE_LNG) $(RAINE_EXE)
+ ifdef RAINE_UNIX
  
 -	$(INSTALL_BIN) $(RAINE_EXE) $(bindir)
 -	$(INSTALL_DATA) $(RAINE_DAT) $(rainedata)
-+	$(BSD_INSTALL_PROGRAM) $(RAINE_EXE) $(rainedata)
++	$(BSD_INSTALL_PROGRAM) $(RAINE_EXE) $(bindir)
 +	$(BSD_INSTALL_DATA) $(RAINE_DAT) $(rainedata)
+ 	sh -c "if [ -f hiscore.dat ]; then $(INSTALL_DATA) hiscore.dat $(rainedata); fi"
+-	$(INSTALL_DATA) config/cheats.cfg $(rainedata)
+-	$(INSTALL_DATA) raine.desktop $(prefix)/usr/share/applications
+-	$(INSTALL_DATA) raine.png $(prefix)/usr/share/pixmaps
++	$(BSD_INSTALL_DATA) config/cheats.cfg $(rainedata)
++	$(BSD_INSTALL_DATA) raine.desktop $(PREFIX)/share/applications
++	$(BSD_INSTALL_DATA) raine.png $(PREFIX)/share/pixmaps
  
  install_dirs:
--	$(MD) -pv $(bindir) $(rainedata) $(langdir) $(romdir)
+-	$(MD) -pv $(bindir) $(rainedata) $(langdir) $(romdir) $(artdir) $(emudxdir) $(prefix)/usr/share/applications $(prefix)/usr/share/pixmaps
 +	$(BSD_INSTALL_DATA_DIR) $(rainedata)
 +	$(BSD_INSTALL_DATA_DIR) $(langdir)
 +	$(BSD_INSTALL_DATA_DIR) $(romdir)
++	$(BSD_INSTALL_DATA_DIR) $(artdir)
++	$(BSD_INSTALL_DATA_DIR) $(emudxdir)
  
  $(RAINE_LNG):
 -	$(INSTALL_DATA) config/language/$@ $(langdir)
diff --git a/emulators/raine/patches/patch-ab b/emulators/raine/patches/patch-ab
index 07040b05809..fc7f218e2e6 100644
--- a/emulators/raine/patches/patch-ab
+++ b/emulators/raine/patches/patch-ab
@@ -1,8 +1,8 @@
-$NetBSD: patch-ab,v 1.1.1.1 2004/04/05 05:05:29 xtraeme Exp $
+$NetBSD: patch-ab,v 1.2 2006/07/17 20:21:35 wiz Exp $
 
---- source/unzip.h.orig	2004-04-05 05:50:54.000000000 +0200
-+++ source/unzip.h	2004-04-05 05:53:19.000000000 +0200
-@@ -142,9 +142,9 @@
+--- source/unzip.h.orig	2004-08-17 16:44:40.000000000 +0200
++++ source/unzip.h
+@@ -142,9 +142,9 @@ typedef struct unz_file_info_s
      tm_unz tmu_date;
  } unz_file_info;
  
@@ -14,7 +14,7 @@ $NetBSD: patch-ab,v 1.1.1.1 2004/04/05 05:05:29 xtraeme Exp $
  /*
     Compare two filename (fileName1,fileName2).
     If iCaseSenisivity = 1, comparision is case sensitivity (like strcmp)
-@@ -155,7 +155,7 @@
+@@ -155,7 +155,7 @@ extern int ZEXPORT unzStringFileNameComp
  */
  
  
@@ -23,7 +23,7 @@ $NetBSD: patch-ab,v 1.1.1.1 2004/04/05 05:05:29 xtraeme Exp $
  /*
    Open a Zip file. path contain the full pathname (by example,
       on a Windows NT computer "c:\\zlib\\zlib111.zip" or on an Unix computer
-@@ -166,24 +166,24 @@
+@@ -166,24 +166,24 @@ extern unzFile ZEXPORT unzOpen OF((const
  	   of this unzip package.
  */
  
@@ -53,7 +53,7 @@ $NetBSD: patch-ab,v 1.1.1.1 2004/04/05 05:05:29 xtraeme Exp $
  /*
    Get the global comment string of the ZipFile, in the szComment buffer.
    uSizeBuf is the size of the szComment buffer.
-@@ -194,22 +194,22 @@
+@@ -194,22 +194,22 @@ extern int ZEXPORT unzGetGlobalComment O
  /***************************************************************************/
  /* Unzip package allow you browse the directory of the zipfile */
  
@@ -80,7 +80,7 @@ $NetBSD: patch-ab,v 1.1.1.1 2004/04/05 05:05:29 xtraeme Exp $
  /*
    Try locate the file szFileName in the zipfile.
    For the iCaseSensitivity signification, see unzStringFileNameCompare
-@@ -220,14 +220,14 @@
+@@ -220,14 +220,14 @@ extern int ZEXPORT unzLocateFile OF((unz
  */
  
  
@@ -97,7 +97,7 @@ $NetBSD: patch-ab,v 1.1.1.1 2004/04/05 05:05:29 xtraeme Exp $
  /*
    Get Info about the current file
    if pfile_info!=NULL, the *pfile_info structure will contain somes info about
-@@ -246,22 +246,22 @@
+@@ -246,22 +246,22 @@ extern int ZEXPORT unzGetCurrentFileInfo
     from it, and close it (you can close it before reading all the file)
     */
  
@@ -124,7 +124,7 @@ $NetBSD: patch-ab,v 1.1.1.1 2004/04/05 05:05:29 xtraeme Exp $
  /*
    Read bytes from the current file (opened by unzOpenCurrentFile)
    buf contain buffer where data must be copied
-@@ -273,19 +273,19 @@
+@@ -273,19 +273,19 @@ extern int ZEXPORT unzReadCurrentFile OF
      (UNZ_ERRNO for IO error, or zLib error for uncompress error)
  */
  
diff --git a/emulators/raine/patches/patch-ac b/emulators/raine/patches/patch-ac
index b7e33929117..c0a9279487f 100644
--- a/emulators/raine/patches/patch-ac
+++ b/emulators/raine/patches/patch-ac
@@ -1,8 +1,8 @@
-$NetBSD: patch-ac,v 1.1.1.1 2004/04/05 05:05:29 xtraeme Exp $
+$NetBSD: patch-ac,v 1.2 2006/07/17 20:21:35 wiz Exp $
 
---- source/unzip.c.orig	2004-04-05 05:55:28.000000000 +0200
-+++ source/unzip.c	2004-04-05 05:55:54.000000000 +0200
-@@ -493,7 +493,7 @@
+--- source/unzip.c.orig	2004-08-17 16:44:40.000000000 +0200
++++ source/unzip.c
+@@ -493,7 +493,7 @@ local void unzlocal_DosDateToTmuDate (ul
  /*
    Get Info about the current file in the zipfile, with internal only info
  */
@@ -11,7 +11,7 @@ $NetBSD: patch-ac,v 1.1.1.1 2004/04/05 05:05:29 xtraeme Exp $
                                                    unz_file_info *pfile_info,
                                                    unz_file_info_internal 
                                                    *pfile_info_internal,
-@@ -502,7 +502,7 @@
+@@ -502,7 +502,7 @@ local int unzlocal_GetCurrentFileInfoInt
                                                    void *extraField,
  												  uLong extraFieldBufferSize,
                                                    char *szComment,
diff --git a/emulators/raine/patches/patch-ad b/emulators/raine/patches/patch-ad
deleted file mode 100644
index 0310a86c36a..00000000000
--- a/emulators/raine/patches/patch-ad
+++ /dev/null
@@ -1,26 +0,0 @@
-$NetBSD: patch-ad,v 1.2 2006/01/12 21:35:09 joerg Exp $
-
---- source/gui/rgui.c.orig	Sat Apr 17 02:38:41 2004
-+++ source/gui/rgui.c	Sat Apr 17 02:39:11 2004
-@@ -9,6 +9,8 @@
- #include <winalleg.h>
- #endif
- 
-+#include <sys/time.h>
-+
- #include "raine.h"
- #include "rgui.h"
- #include "rguiproc.h"
-@@ -1723,10 +1725,12 @@ void dialog_oxygen(void)
-   // 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);
-+  }
- #endif
-   // Nothing in dos to put the cpu in sleep mode, AFAIK
- 
diff --git a/emulators/raine/patches/patch-ae b/emulators/raine/patches/patch-ae
deleted file mode 100644
index 37b8c8fb896..00000000000
--- a/emulators/raine/patches/patch-ae
+++ /dev/null
@@ -1,14 +0,0 @@
-$NetBSD: patch-ae,v 1.1 2004/04/17 00:58:42 kristerw Exp $
-
---- source/video/c/lscroll/16_16.c.orig	Sat Apr 17 02:36:55 2004
-+++ source/video/c/lscroll/16_16.c	Sat Apr 17 02:37:17 2004
-@@ -26,8 +26,8 @@
-    UINT16 *line;
-    INT16 xx,yy,dy;
-    UINT32 w;
--   w = GameBitmap->w;
-    UINT8 *spr;
-+   w = GameBitmap->w;
- 
- #if 1
-    for(xx=0; xx<=15; xx++){
diff --git a/emulators/raine/patches/patch-af b/emulators/raine/patches/patch-af
deleted file mode 100644
index 31ae7f9ac19..00000000000
--- a/emulators/raine/patches/patch-af
+++ /dev/null
@@ -1,14 +0,0 @@
-$NetBSD: patch-af,v 1.1 2004/04/17 00:58:42 kristerw Exp $
-
---- source/video/c/lscroll/16_32.c.orig	Sat Apr 17 02:37:32 2004
-+++ source/video/c/lscroll/16_32.c	Sat Apr 17 02:37:49 2004
-@@ -25,8 +25,8 @@
-    UINT32 *line;
-    INT16 xx,yy,dy;
-    UINT32 w;
--   w = GameBitmap->w;
-    UINT8 *spr;
-+   w = GameBitmap->w;
- 
- #if 1
-    for(xx=0; xx<=15; xx++){
diff --git a/emulators/raine/patches/patch-ag b/emulators/raine/patches/patch-ag
deleted file mode 100644
index 94d0ab8ee6b..00000000000
--- a/emulators/raine/patches/patch-ag
+++ /dev/null
@@ -1,29 +0,0 @@
-$NetBSD: patch-ag,v 1.1 2004/04/17 00:58:42 kristerw Exp $
-
---- source/games/pengo.c.orig	Sat Apr 17 02:33:38 2004
-+++ source/games/pengo.c	Sat Apr 17 02:35:06 2004
-@@ -451,11 +451,11 @@
- }
- 
- static void load_pengo() {
--  RAMSize = 0x1031+0x8000;
-   UINT8 *color_prom = load_region[REGION_PROMS];
-   UINT8 *decode1,*decode2,palette[32*2];
-   UINT32 dest_size;
-   int i;
-+  RAMSize = 0x1031+0x8000;
- 
-   if(!(RAM=AllocateMem(RAMSize))) return;
- 
-@@ -1182,10 +1182,10 @@
- {
-   // quite different from pengo for the init : no encoding, different memory map,
-   // different palette...
--  RAMSize = 0x1031;
-   UINT8 *color_prom = load_region[REGION_PROMS];
-   UINT8 palette[32*2];
-   int i;
-+  RAMSize = 0x1031;
- 
-   if (!strcmp(current_game->main_name,"pacplus")) {
-     for (i = 0; i < 0x4000; i++)
diff --git a/emulators/raine/patches/patch-ah b/emulators/raine/patches/patch-ah
deleted file mode 100644
index 76a6795617f..00000000000
--- a/emulators/raine/patches/patch-ah
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-ah,v 1.1 2006/01/12 21:35:09 joerg Exp $
-
---- source/emumain.c.orig	2006-01-12 21:04:11.000000000 +0000
-+++ source/emumain.c
-@@ -9,6 +9,8 @@
- #include <winalleg.h>
- #endif
- 
-+#include <sys/time.h>
-+
- #include "raine.h"              // General defines and stuff
- #include "emumain.h"            // main loops
- #include "gui.h"                // Interface stuff
diff --git a/emulators/raine/patches/patch-ai b/emulators/raine/patches/patch-ai
deleted file mode 100644
index b09277b3975..00000000000
--- a/emulators/raine/patches/patch-ai
+++ /dev/null
@@ -1,14 +0,0 @@
-$NetBSD: patch-ai,v 1.1 2006/01/12 21:35:09 joerg Exp $
-
---- source/alleg/blit.c.orig	2006-01-12 21:09:13.000000000 +0000
-+++ source/alleg/blit.c
-@@ -2,6 +2,9 @@
- #include <allegro.h>
- #include <winalleg.h>
- #endif
-+
-+#include <sys/time.h>
-+
- #include "blit_x2.h"
- #include "eagle.h"
- #include "games.h" // current_game for save_screen