diff --git a/media-libs/allegro/allegro-4.3.10-haiku-4.diff b/media-libs/allegro/allegro-4.3.10-haiku-4.diff
index f97b0cdde..8d952f523 100644
--- a/media-libs/allegro/allegro-4.3.10-haiku-4.diff
+++ b/media-libs/allegro/allegro-4.3.10-haiku-4.diff
@@ -1,6 +1,6 @@
 diff -urN allegro-4.3.10/addons/allegrogl/fix.sh allegro-4.3.10-haiku/addons/allegrogl/fix.sh
 --- allegro-4.3.10/addons/allegrogl/fix.sh	2008-01-01 03:20:16.000000000 -0800
-+++ allegro-4.3.10-haiku/addons/allegrogl/fix.sh	2008-09-12 03:49:24.000000000 -0700
++++ allegro-4.3.10-haiku/addons/allegrogl/fix.sh	2008-09-12 07:32:18.000000000 -0700
 @@ -18,7 +18,7 @@
  echo "Compilation target adjustment."
  echo "  Usage: fix <platform> [--dtou|--utod|--quick]"
@@ -18,9 +18,21 @@ diff -urN allegro-4.3.10/addons/allegrogl/fix.sh allegro-4.3.10-haiku/addons/all
  	mingw	) proc_fix "Mingw32" "makefile.mgw";;
  	mingw32	) proc_fix "Mingw32" "makefile.mgw";;
  	# used only by allegro's zipup.sh in packaging process
+diff -urN allegro-4.3.10/addons/jpgalleg/makefile.be allegro-4.3.10-haiku/addons/jpgalleg/makefile.be
+--- allegro-4.3.10/addons/jpgalleg/makefile.be	2008-01-01 13:59:18.000000000 -0800
++++ allegro-4.3.10-haiku/addons/jpgalleg/makefile.be	2008-09-12 07:45:54.000000000 -0700
+@@ -38,7 +38,7 @@
+   endif
+ endif
+ 
+-LIBS = -lm `../../allegro-config --libs --addon`
++LIBS = `../../allegro-config --libs --addon`
+ LDFLAGS = -L../../lib/$(PLATFORM_PATH)
+ INSTALL_LIB_PATH = /boot/develop/lib/x86
+ INSTALL_HEADER_PATH = /boot/develop/headers
 diff -urN allegro-4.3.10/addons/loadpng/Makefile.be allegro-4.3.10-haiku/addons/loadpng/Makefile.be
 --- allegro-4.3.10/addons/loadpng/Makefile.be	1969-12-31 16:00:00.000000000 -0800
-+++ allegro-4.3.10-haiku/addons/loadpng/Makefile.be	2008-09-12 03:49:24.000000000 -0700
++++ allegro-4.3.10-haiku/addons/loadpng/Makefile.be	2008-09-12 07:32:18.000000000 -0700
 @@ -0,0 +1,57 @@
 +## Aux -*- Makefile -*- for BeOS/Haiku
 +
@@ -81,7 +93,7 @@ diff -urN allegro-4.3.10/addons/loadpng/Makefile.be allegro-4.3.10-haiku/addons/
 +	- rm -f $(EXAMPLES) examples/saved.png
 diff -urN allegro-4.3.10/addons/loadpng/fix.sh allegro-4.3.10-haiku/addons/loadpng/fix.sh
 --- allegro-4.3.10/addons/loadpng/fix.sh	2007-12-27 17:05:30.000000000 -0800
-+++ allegro-4.3.10-haiku/addons/loadpng/fix.sh	2008-09-12 03:49:24.000000000 -0700
++++ allegro-4.3.10-haiku/addons/loadpng/fix.sh	2008-09-12 07:32:18.000000000 -0700
 @@ -8,7 +8,7 @@
     echo
     echo "Usage: $0 <platform> [--quick|--dtou|--utod]"
@@ -103,7 +115,7 @@ diff -urN allegro-4.3.10/addons/loadpng/fix.sh allegro-4.3.10-haiku/addons/loadp
     "unix"    ) proc_fix "Unix"              "Makefile.unx";;
 diff -urN allegro-4.3.10/addons/logg/Makefile.be allegro-4.3.10-haiku/addons/logg/Makefile.be
 --- allegro-4.3.10/addons/logg/Makefile.be	1969-12-31 16:00:00.000000000 -0800
-+++ allegro-4.3.10-haiku/addons/logg/Makefile.be	2008-09-12 03:49:24.000000000 -0700
++++ allegro-4.3.10-haiku/addons/logg/Makefile.be	2008-09-12 07:32:18.000000000 -0700
 @@ -0,0 +1,43 @@
 +PREFIX=`/boot/common/bin/allegro-config --prefix`
 +CC=gcc
@@ -150,7 +162,7 @@ diff -urN allegro-4.3.10/addons/logg/Makefile.be allegro-4.3.10-haiku/addons/log
 +examples: play_ogg stream_ogg
 diff -urN allegro-4.3.10/addons/logg/fix.sh allegro-4.3.10-haiku/addons/logg/fix.sh
 --- allegro-4.3.10/addons/logg/fix.sh	2007-12-31 11:24:16.000000000 -0800
-+++ allegro-4.3.10-haiku/addons/logg/fix.sh	2008-09-12 03:49:24.000000000 -0700
++++ allegro-4.3.10-haiku/addons/logg/fix.sh	2008-09-12 07:32:18.000000000 -0700
 @@ -8,7 +8,7 @@
     echo
     echo "Usage: $0 <platform> [--quick|--dtou|--utod]"
@@ -171,7 +183,7 @@ diff -urN allegro-4.3.10/addons/logg/fix.sh allegro-4.3.10-haiku/addons/logg/fix
     "unix"    ) proc_fix "Unix"              "Makefile.unix";;
 diff -urN allegro-4.3.10/fix.sh allegro-4.3.10-haiku/fix.sh
 --- allegro-4.3.10/fix.sh	2008-01-01 13:59:18.000000000 -0800
-+++ allegro-4.3.10-haiku/fix.sh	2008-09-12 03:49:24.000000000 -0700
++++ allegro-4.3.10-haiku/fix.sh	2008-09-12 07:32:18.000000000 -0700
 @@ -9,7 +9,7 @@
     echo
     echo "Usage: $0 <platform> [--quick|--dtou|--utod|--utom|--mtou]"
@@ -191,7 +203,7 @@ diff -urN allegro-4.3.10/fix.sh allegro-4.3.10-haiku/fix.sh
     # The 'msvc' target is undocumented in the help message, but is used
 diff -urN allegro-4.3.10/include/allegro/internal/aintern.h allegro-4.3.10-haiku/include/allegro/internal/aintern.h
 --- allegro-4.3.10/include/allegro/internal/aintern.h	2008-01-05 14:37:14.000000000 -0800
-+++ allegro-4.3.10-haiku/include/allegro/internal/aintern.h	2008-09-12 03:49:24.000000000 -0700
++++ allegro-4.3.10-haiku/include/allegro/internal/aintern.h	2008-09-12 07:32:18.000000000 -0700
 @@ -189,7 +189,7 @@
  
  
@@ -203,7 +215,7 @@ diff -urN allegro-4.3.10/include/allegro/internal/aintern.h allegro-4.3.10-haiku
  
 diff -urN allegro-4.3.10/include/allegro/internal/alconfig.h allegro-4.3.10-haiku/include/allegro/internal/alconfig.h
 --- allegro-4.3.10/include/allegro/internal/alconfig.h	2007-06-24 01:13:22.000000000 -0700
-+++ allegro-4.3.10-haiku/include/allegro/internal/alconfig.h	2008-09-12 03:49:24.000000000 -0700
++++ allegro-4.3.10-haiku/include/allegro/internal/alconfig.h	2008-09-12 07:32:18.000000000 -0700
 @@ -48,6 +48,8 @@
        #include "allegro/platform/albcc32.h"
     #elif defined ALLEGRO_MSVC
@@ -215,7 +227,7 @@ diff -urN allegro-4.3.10/include/allegro/internal/alconfig.h allegro-4.3.10-haik
     #elif defined ALLEGRO_MPW
 diff -urN allegro-4.3.10/include/allegro/platform/albecfg.h allegro-4.3.10-haiku/include/allegro/platform/albecfg.h
 --- allegro-4.3.10/include/allegro/platform/albecfg.h	2007-06-15 19:52:28.000000000 -0700
-+++ allegro-4.3.10-haiku/include/allegro/platform/albecfg.h	2008-09-12 04:28:30.000000000 -0700
++++ allegro-4.3.10-haiku/include/allegro/platform/albecfg.h	2008-09-12 06:58:19.000000000 -0700
 @@ -31,7 +31,13 @@
  #define ALLEGRO_HAVE_SYS_TIME_H 1
  
@@ -231,9 +243,20 @@ diff -urN allegro-4.3.10/include/allegro/platform/albecfg.h allegro-4.3.10-haiku
  #define ALLEGRO_LITTLE_ENDIAN
  #define ALLEGRO_CONSOLE_OK
  #define ALLEGRO_USE_CONSTRUCTOR
+diff -urN allegro-4.3.10/include/allegro/platform/albeos.h allegro-4.3.10-haiku/include/allegro/platform/albeos.h
+--- allegro-4.3.10/include/allegro/platform/albeos.h	2002-10-01 11:05:12.000000000 -0700
++++ allegro-4.3.10-haiku/include/allegro/platform/albeos.h	2008-09-12 07:10:56.000000000 -0700
+@@ -74,3 +74,7 @@
+ #define JOYSTICK_DRIVER_BEOS                                            \
+    {  JOYSTICK_BEOS,   &joystick_beos,  TRUE  },
+ 
++#if defined __HAIKU__
++#define TIMERDRV_UNIX_PTHREADS        AL_ID('P','T','H','R')
++#endif
++
 diff -urN allegro-4.3.10/include/allegro/platform/alunixac.hin allegro-4.3.10-haiku/include/allegro/platform/alunixac.hin
 --- allegro-4.3.10/include/allegro/platform/alunixac.hin	2007-07-14 22:28:14.000000000 -0700
-+++ allegro-4.3.10-haiku/include/allegro/platform/alunixac.hin	2008-09-12 04:39:53.000000000 -0700
++++ allegro-4.3.10-haiku/include/allegro/platform/alunixac.hin	2008-09-12 07:32:18.000000000 -0700
 @@ -68,7 +68,7 @@
  #undef ALLEGRO_DARWIN
  
@@ -254,7 +277,7 @@ diff -urN allegro-4.3.10/include/allegro/platform/alunixac.hin allegro-4.3.10-ha
  #undef const
 diff -urN allegro-4.3.10/include/allegro/system.h allegro-4.3.10-haiku/include/allegro/system.h
 --- allegro-4.3.10/include/allegro/system.h	2008-01-02 02:39:24.000000000 -0800
-+++ allegro-4.3.10-haiku/include/allegro/system.h	2008-09-12 05:18:17.000000000 -0700
++++ allegro-4.3.10-haiku/include/allegro/system.h	2008-09-12 07:32:18.000000000 -0700
 @@ -61,6 +61,7 @@
  #define OSTYPE_QNX         AL_ID('Q','N','X',' ')
  #define OSTYPE_UNIX        AL_ID('U','N','I','X')
@@ -265,7 +288,7 @@ diff -urN allegro-4.3.10/include/allegro/system.h allegro-4.3.10-haiku/include/a
  
 diff -urN allegro-4.3.10/makefile.all allegro-4.3.10-haiku/makefile.all
 --- allegro-4.3.10/makefile.all	2008-01-14 03:55:28.000000000 -0800
-+++ allegro-4.3.10-haiku/makefile.all	2008-09-12 03:49:24.000000000 -0700
++++ allegro-4.3.10-haiku/makefile.all	2008-09-12 07:32:18.000000000 -0700
 @@ -8,7 +8,7 @@
  #        DEBUGMODE=2        selects a build intended to debug Allegro itself.
  #        PROFILEMODE=1      selects a profiling build.
@@ -286,7 +309,7 @@ diff -urN allegro-4.3.10/makefile.all allegro-4.3.10-haiku/makefile.all
  DOCS  = $(addprefix docs/txt/,$(addsuffix .txt,$(filter-out changes thanks readme, $(DOCBASEFILES))))
 diff -urN allegro-4.3.10/makefile.be allegro-4.3.10-haiku/makefile.be
 --- allegro-4.3.10/makefile.be	2008-01-11 03:30:16.000000000 -0800
-+++ allegro-4.3.10-haiku/makefile.be	2008-09-12 03:49:24.000000000 -0700
++++ allegro-4.3.10-haiku/makefile.be	2008-09-12 07:32:18.000000000 -0700
 @@ -10,7 +10,15 @@
  
  # -------- define some variables that the primary makefile will use --------
@@ -334,7 +357,7 @@ diff -urN allegro-4.3.10/makefile.be allegro-4.3.10-haiku/makefile.be
  
 diff -urN allegro-4.3.10/misc/mkunixdists.sh allegro-4.3.10-haiku/misc/mkunixdists.sh
 --- allegro-4.3.10/misc/mkunixdists.sh	2008-01-10 13:45:48.000000000 -0800
-+++ allegro-4.3.10-haiku/misc/mkunixdists.sh	2008-09-12 04:05:22.000000000 -0700
++++ allegro-4.3.10-haiku/misc/mkunixdists.sh	2008-09-12 07:32:18.000000000 -0700
 @@ -73,9 +73,9 @@
  # Hack'n'slash
  echo "Stripping to form end-user distribution"
@@ -361,7 +384,7 @@ diff -urN allegro-4.3.10/misc/mkunixdists.sh allegro-4.3.10-haiku/misc/mkunixdis
  	(cd addons/logg && rm -f Makefile.mingw play_ogg.c stream_ogg.c fix.bat)
 diff -urN allegro-4.3.10/misc/zipup.sh allegro-4.3.10-haiku/misc/zipup.sh
 --- allegro-4.3.10/misc/zipup.sh	2008-01-19 04:16:56.000000000 -0800
-+++ allegro-4.3.10-haiku/misc/zipup.sh	2008-09-12 03:44:23.000000000 -0700
++++ allegro-4.3.10-haiku/misc/zipup.sh	2008-09-12 07:32:18.000000000 -0700
 @@ -125,6 +125,12 @@
  
  make depend UNIX_TOOLS=1 CC=gcc
@@ -386,7 +409,7 @@ diff -urN allegro-4.3.10/misc/zipup.sh allegro-4.3.10-haiku/misc/zipup.sh
  
 diff -urN allegro-4.3.10/setup/keyconf.c allegro-4.3.10-haiku/setup/keyconf.c
 --- allegro-4.3.10/setup/keyconf.c	2005-04-07 16:37:20.000000000 -0700
-+++ allegro-4.3.10-haiku/setup/keyconf.c	2008-09-12 03:49:24.000000000 -0700
++++ allegro-4.3.10-haiku/setup/keyconf.c	2008-09-12 07:32:18.000000000 -0700
 @@ -25,8 +25,8 @@
  
  
@@ -400,7 +423,7 @@ diff -urN allegro-4.3.10/setup/keyconf.c allegro-4.3.10-haiku/setup/keyconf.c
  char *ascii_name[32] = 
 diff -urN allegro-4.3.10/src/beos/baccel.cpp allegro-4.3.10-haiku/src/beos/baccel.cpp
 --- allegro-4.3.10/src/beos/baccel.cpp	2002-09-01 16:18:56.000000000 -0700
-+++ allegro-4.3.10-haiku/src/beos/baccel.cpp	2008-09-12 03:49:24.000000000 -0700
++++ allegro-4.3.10-haiku/src/beos/baccel.cpp	2008-09-12 07:32:18.000000000 -0700
 @@ -20,7 +20,7 @@
  #include "allegro/internal/aintern.h"
  #include "allegro/platform/aintbeos.h"
@@ -412,7 +435,7 @@ diff -urN allegro-4.3.10/src/beos/baccel.cpp allegro-4.3.10-haiku/src/beos/bacce
  
 diff -urN allegro-4.3.10/src/beos/bdispsw.cpp allegro-4.3.10-haiku/src/beos/bdispsw.cpp
 --- allegro-4.3.10/src/beos/bdispsw.cpp	2002-04-06 07:18:16.000000000 -0800
-+++ allegro-4.3.10-haiku/src/beos/bdispsw.cpp	2008-09-12 03:49:24.000000000 -0700
++++ allegro-4.3.10-haiku/src/beos/bdispsw.cpp	2008-09-12 07:32:19.000000000 -0700
 @@ -19,7 +19,7 @@
  #include "allegro/internal/aintern.h"
  #include "allegro/platform/aintbeos.h"
@@ -424,7 +447,7 @@ diff -urN allegro-4.3.10/src/beos/bdispsw.cpp allegro-4.3.10-haiku/src/beos/bdis
  
 diff -urN allegro-4.3.10/src/beos/bdwindow.cpp allegro-4.3.10-haiku/src/beos/bdwindow.cpp
 --- allegro-4.3.10/src/beos/bdwindow.cpp	2005-10-27 13:57:00.000000000 -0700
-+++ allegro-4.3.10-haiku/src/beos/bdwindow.cpp	2008-09-12 03:49:24.000000000 -0700
++++ allegro-4.3.10-haiku/src/beos/bdwindow.cpp	2008-09-12 07:32:19.000000000 -0700
 @@ -21,7 +21,7 @@
  #include "allegro/internal/aintern.h"
  #include "allegro/platform/aintbeos.h"
@@ -436,7 +459,7 @@ diff -urN allegro-4.3.10/src/beos/bdwindow.cpp allegro-4.3.10-haiku/src/beos/bdw
  
 diff -urN allegro-4.3.10/src/beos/bgfx.c allegro-4.3.10-haiku/src/beos/bgfx.c
 --- allegro-4.3.10/src/beos/bgfx.c	2004-11-26 08:05:12.000000000 -0800
-+++ allegro-4.3.10-haiku/src/beos/bgfx.c	2008-09-12 03:49:24.000000000 -0700
++++ allegro-4.3.10-haiku/src/beos/bgfx.c	2008-09-12 07:32:19.000000000 -0700
 @@ -19,9 +19,9 @@
  #include "allegro/internal/aintern.h"
  #include "allegro/platform/aintbeos.h"
@@ -451,7 +474,7 @@ diff -urN allegro-4.3.10/src/beos/bgfx.c allegro-4.3.10-haiku/src/beos/bgfx.c
  
 diff -urN allegro-4.3.10/src/beos/bgfxapi.cpp allegro-4.3.10-haiku/src/beos/bgfxapi.cpp
 --- allegro-4.3.10/src/beos/bgfxapi.cpp	2002-12-07 13:12:30.000000000 -0800
-+++ allegro-4.3.10-haiku/src/beos/bgfxapi.cpp	2008-09-12 03:49:24.000000000 -0700
++++ allegro-4.3.10-haiku/src/beos/bgfxapi.cpp	2008-09-12 07:32:19.000000000 -0700
 @@ -19,7 +19,7 @@
  #include "allegro/internal/aintern.h"
  #include "allegro/platform/aintbeos.h"
@@ -463,7 +486,7 @@ diff -urN allegro-4.3.10/src/beos/bgfxapi.cpp allegro-4.3.10-haiku/src/beos/bgfx
  
 diff -urN allegro-4.3.10/src/beos/bgfxdrv.c allegro-4.3.10-haiku/src/beos/bgfxdrv.c
 --- allegro-4.3.10/src/beos/bgfxdrv.c	2001-11-06 07:30:48.000000000 -0800
-+++ allegro-4.3.10-haiku/src/beos/bgfxdrv.c	2008-09-12 03:49:24.000000000 -0700
++++ allegro-4.3.10-haiku/src/beos/bgfxdrv.c	2008-09-12 07:32:19.000000000 -0700
 @@ -18,9 +18,9 @@
  #include "allegro.h"
  #include "allegro/internal/aintern.h"
@@ -478,7 +501,7 @@ diff -urN allegro-4.3.10/src/beos/bgfxdrv.c allegro-4.3.10-haiku/src/beos/bgfxdr
  GFX_DRIVER_BEOS 
 diff -urN allegro-4.3.10/src/beos/bjoy.c allegro-4.3.10-haiku/src/beos/bjoy.c
 --- allegro-4.3.10/src/beos/bjoy.c	2001-11-06 09:16:42.000000000 -0800
-+++ allegro-4.3.10-haiku/src/beos/bjoy.c	2008-09-12 03:49:24.000000000 -0700
++++ allegro-4.3.10-haiku/src/beos/bjoy.c	2008-09-12 07:32:19.000000000 -0700
 @@ -19,7 +19,7 @@
  #include "allegro/internal/aintern.h"
  #include "allegro/platform/aintbeos.h"
@@ -490,7 +513,7 @@ diff -urN allegro-4.3.10/src/beos/bjoy.c allegro-4.3.10-haiku/src/beos/bjoy.c
  
 diff -urN allegro-4.3.10/src/beos/bjoyapi.cpp allegro-4.3.10-haiku/src/beos/bjoyapi.cpp
 --- allegro-4.3.10/src/beos/bjoyapi.cpp	2004-07-04 07:44:50.000000000 -0700
-+++ allegro-4.3.10-haiku/src/beos/bjoyapi.cpp	2008-09-12 03:49:24.000000000 -0700
++++ allegro-4.3.10-haiku/src/beos/bjoyapi.cpp	2008-09-12 07:32:19.000000000 -0700
 @@ -19,9 +19,9 @@
  #include "allegro/internal/aintern.h"
  #include "allegro/platform/aintbeos.h"
@@ -505,7 +528,7 @@ diff -urN allegro-4.3.10/src/beos/bjoyapi.cpp allegro-4.3.10-haiku/src/beos/bjoy
  static int32 num_devices, num_axes, num_hats, num_buttons;
 diff -urN allegro-4.3.10/src/beos/bjoydrv.c allegro-4.3.10-haiku/src/beos/bjoydrv.c
 --- allegro-4.3.10/src/beos/bjoydrv.c	2001-11-06 07:30:48.000000000 -0800
-+++ allegro-4.3.10-haiku/src/beos/bjoydrv.c	2008-09-12 03:49:24.000000000 -0700
++++ allegro-4.3.10-haiku/src/beos/bjoydrv.c	2008-09-12 07:32:19.000000000 -0700
 @@ -18,9 +18,9 @@
  #include "allegro.h"
  #include "allegro/internal/aintern.h"
@@ -520,7 +543,7 @@ diff -urN allegro-4.3.10/src/beos/bjoydrv.c allegro-4.3.10-haiku/src/beos/bjoydr
  JOYSTICK_DRIVER_BEOS
 diff -urN allegro-4.3.10/src/beos/bkey.c allegro-4.3.10-haiku/src/beos/bkey.c
 --- allegro-4.3.10/src/beos/bkey.c	2004-12-03 12:56:28.000000000 -0800
-+++ allegro-4.3.10-haiku/src/beos/bkey.c	2008-09-12 03:49:24.000000000 -0700
++++ allegro-4.3.10-haiku/src/beos/bkey.c	2008-09-12 07:32:19.000000000 -0700
 @@ -19,9 +19,9 @@
  #include "allegro/internal/aintern.h"
  #include "allegro/platform/aintbeos.h"
@@ -535,7 +558,7 @@ diff -urN allegro-4.3.10/src/beos/bkey.c allegro-4.3.10-haiku/src/beos/bkey.c
  
 diff -urN allegro-4.3.10/src/beos/bkeyapi.cpp allegro-4.3.10-haiku/src/beos/bkeyapi.cpp
 --- allegro-4.3.10/src/beos/bkeyapi.cpp	2005-10-27 13:57:00.000000000 -0700
-+++ allegro-4.3.10-haiku/src/beos/bkeyapi.cpp	2008-09-12 03:49:24.000000000 -0700
++++ allegro-4.3.10-haiku/src/beos/bkeyapi.cpp	2008-09-12 07:32:19.000000000 -0700
 @@ -22,9 +22,9 @@
  #include "allegro/internal/aintern.h"
  #include "allegro/platform/aintbeos.h"
@@ -550,7 +573,7 @@ diff -urN allegro-4.3.10/src/beos/bkeyapi.cpp allegro-4.3.10-haiku/src/beos/bkey
  
 diff -urN allegro-4.3.10/src/beos/bkeydrv.c allegro-4.3.10-haiku/src/beos/bkeydrv.c
 --- allegro-4.3.10/src/beos/bkeydrv.c	2001-11-06 07:30:48.000000000 -0800
-+++ allegro-4.3.10-haiku/src/beos/bkeydrv.c	2008-09-12 03:49:24.000000000 -0700
++++ allegro-4.3.10-haiku/src/beos/bkeydrv.c	2008-09-12 07:32:19.000000000 -0700
 @@ -18,9 +18,9 @@
  #include "allegro.h"
  #include "allegro/internal/aintern.h"
@@ -565,7 +588,7 @@ diff -urN allegro-4.3.10/src/beos/bkeydrv.c allegro-4.3.10-haiku/src/beos/bkeydr
  {
 diff -urN allegro-4.3.10/src/beos/bmidi.c allegro-4.3.10-haiku/src/beos/bmidi.c
 --- allegro-4.3.10/src/beos/bmidi.c	2006-03-18 07:05:34.000000000 -0800
-+++ allegro-4.3.10-haiku/src/beos/bmidi.c	2008-09-12 03:49:24.000000000 -0700
++++ allegro-4.3.10-haiku/src/beos/bmidi.c	2008-09-12 07:32:19.000000000 -0700
 @@ -19,9 +19,9 @@
  #include "allegro/internal/aintern.h"
  #include "allegro/platform/aintbeos.h"
@@ -580,7 +603,7 @@ diff -urN allegro-4.3.10/src/beos/bmidi.c allegro-4.3.10-haiku/src/beos/bmidi.c
  {
 diff -urN allegro-4.3.10/src/beos/bmidiapi.cpp allegro-4.3.10-haiku/src/beos/bmidiapi.cpp
 --- allegro-4.3.10/src/beos/bmidiapi.cpp	2007-08-09 14:48:38.000000000 -0700
-+++ allegro-4.3.10-haiku/src/beos/bmidiapi.cpp	2008-09-12 03:49:24.000000000 -0700
++++ allegro-4.3.10-haiku/src/beos/bmidiapi.cpp	2008-09-12 07:32:19.000000000 -0700
 @@ -19,9 +19,9 @@
  #include "allegro/internal/aintern.h"
  #include "allegro/platform/aintbeos.h"
@@ -595,7 +618,7 @@ diff -urN allegro-4.3.10/src/beos/bmidiapi.cpp allegro-4.3.10-haiku/src/beos/bmi
  BMidiSynth *_be_midisynth = NULL;
 diff -urN allegro-4.3.10/src/beos/bmididrv.c allegro-4.3.10-haiku/src/beos/bmididrv.c
 --- allegro-4.3.10/src/beos/bmididrv.c	2001-11-06 07:30:48.000000000 -0800
-+++ allegro-4.3.10-haiku/src/beos/bmididrv.c	2008-09-12 03:49:24.000000000 -0700
++++ allegro-4.3.10-haiku/src/beos/bmididrv.c	2008-09-12 07:32:19.000000000 -0700
 @@ -18,9 +18,9 @@
  #include "allegro.h"
  #include "allegro/internal/aintern.h"
@@ -610,7 +633,7 @@ diff -urN allegro-4.3.10/src/beos/bmididrv.c allegro-4.3.10-haiku/src/beos/bmidi
  MIDI_DRIVER_BEOS
 diff -urN allegro-4.3.10/src/beos/bmousapi.cpp allegro-4.3.10-haiku/src/beos/bmousapi.cpp
 --- allegro-4.3.10/src/beos/bmousapi.cpp	2005-10-27 13:57:00.000000000 -0700
-+++ allegro-4.3.10-haiku/src/beos/bmousapi.cpp	2008-09-12 03:49:24.000000000 -0700
++++ allegro-4.3.10-haiku/src/beos/bmousapi.cpp	2008-09-12 07:32:19.000000000 -0700
 @@ -23,9 +23,9 @@
  #include "allegro/internal/aintern.h"
  #include "allegro/platform/aintbeos.h"
@@ -625,7 +648,7 @@ diff -urN allegro-4.3.10/src/beos/bmousapi.cpp allegro-4.3.10-haiku/src/beos/bmo
  #define MOUSE_THREAD_PRIORITY 60
 diff -urN allegro-4.3.10/src/beos/bmousdrv.c allegro-4.3.10-haiku/src/beos/bmousdrv.c
 --- allegro-4.3.10/src/beos/bmousdrv.c	2001-11-06 07:30:48.000000000 -0800
-+++ allegro-4.3.10-haiku/src/beos/bmousdrv.c	2008-09-12 03:49:24.000000000 -0700
++++ allegro-4.3.10-haiku/src/beos/bmousdrv.c	2008-09-12 07:32:19.000000000 -0700
 @@ -18,9 +18,9 @@
  #include "allegro.h"
  #include "allegro/internal/aintern.h"
@@ -640,7 +663,7 @@ diff -urN allegro-4.3.10/src/beos/bmousdrv.c allegro-4.3.10-haiku/src/beos/bmous
  
 diff -urN allegro-4.3.10/src/beos/bmouse.c allegro-4.3.10-haiku/src/beos/bmouse.c
 --- allegro-4.3.10/src/beos/bmouse.c	2004-12-04 05:24:16.000000000 -0800
-+++ allegro-4.3.10-haiku/src/beos/bmouse.c	2008-09-12 03:49:24.000000000 -0700
++++ allegro-4.3.10-haiku/src/beos/bmouse.c	2008-09-12 07:32:19.000000000 -0700
 @@ -19,9 +19,9 @@
  #include "allegro/internal/aintern.h"
  #include "allegro/platform/aintbeos.h"
@@ -655,7 +678,7 @@ diff -urN allegro-4.3.10/src/beos/bmouse.c allegro-4.3.10-haiku/src/beos/bmouse.
  
 diff -urN allegro-4.3.10/src/beos/boverlay.cpp allegro-4.3.10-haiku/src/beos/boverlay.cpp
 --- allegro-4.3.10/src/beos/boverlay.cpp	2002-11-15 03:53:40.000000000 -0800
-+++ allegro-4.3.10-haiku/src/beos/boverlay.cpp	2008-09-12 03:49:24.000000000 -0700
++++ allegro-4.3.10-haiku/src/beos/boverlay.cpp	2008-09-12 07:32:19.000000000 -0700
 @@ -19,7 +19,7 @@
  #include "allegro/internal/aintern.h"
  #include "allegro/platform/aintbeos.h"
@@ -667,7 +690,7 @@ diff -urN allegro-4.3.10/src/beos/boverlay.cpp allegro-4.3.10-haiku/src/beos/bov
  
 diff -urN allegro-4.3.10/src/beos/bsnd.c allegro-4.3.10-haiku/src/beos/bsnd.c
 --- allegro-4.3.10/src/beos/bsnd.c	2006-03-18 07:05:34.000000000 -0800
-+++ allegro-4.3.10-haiku/src/beos/bsnd.c	2008-09-12 03:49:24.000000000 -0700
++++ allegro-4.3.10-haiku/src/beos/bsnd.c	2008-09-12 07:32:19.000000000 -0700
 @@ -19,9 +19,9 @@
  #include "allegro/internal/aintern.h"
  #include "allegro/platform/aintbeos.h"
@@ -682,7 +705,7 @@ diff -urN allegro-4.3.10/src/beos/bsnd.c allegro-4.3.10-haiku/src/beos/bsnd.c
  {
 diff -urN allegro-4.3.10/src/beos/bsndapi.cpp allegro-4.3.10-haiku/src/beos/bsndapi.cpp
 --- allegro-4.3.10/src/beos/bsndapi.cpp	2006-03-18 07:05:34.000000000 -0800
-+++ allegro-4.3.10-haiku/src/beos/bsndapi.cpp	2008-09-12 03:49:24.000000000 -0700
++++ allegro-4.3.10-haiku/src/beos/bsndapi.cpp	2008-09-12 07:32:19.000000000 -0700
 @@ -20,7 +20,7 @@
  #include "allegro/internal/aintern.h"
  #include "allegro/platform/aintbeos.h"
@@ -694,7 +717,7 @@ diff -urN allegro-4.3.10/src/beos/bsndapi.cpp allegro-4.3.10-haiku/src/beos/bsnd
  
 diff -urN allegro-4.3.10/src/beos/bsnddrv.c allegro-4.3.10-haiku/src/beos/bsnddrv.c
 --- allegro-4.3.10/src/beos/bsnddrv.c	2001-11-06 07:30:48.000000000 -0800
-+++ allegro-4.3.10-haiku/src/beos/bsnddrv.c	2008-09-12 03:49:24.000000000 -0700
++++ allegro-4.3.10-haiku/src/beos/bsnddrv.c	2008-09-12 07:32:19.000000000 -0700
 @@ -19,9 +19,9 @@
  #include "allegro/internal/aintern.h"
  
@@ -709,7 +732,7 @@ diff -urN allegro-4.3.10/src/beos/bsnddrv.c allegro-4.3.10-haiku/src/beos/bsnddr
  DIGI_DRIVER_BEOS
 diff -urN allegro-4.3.10/src/beos/bsysapi.cpp allegro-4.3.10-haiku/src/beos/bsysapi.cpp
 --- allegro-4.3.10/src/beos/bsysapi.cpp	2005-10-27 13:57:00.000000000 -0700
-+++ allegro-4.3.10-haiku/src/beos/bsysapi.cpp	2008-09-12 03:49:24.000000000 -0700
++++ allegro-4.3.10-haiku/src/beos/bsysapi.cpp	2008-09-12 07:32:19.000000000 -0700
 @@ -27,9 +27,9 @@
  #include <sys/utsname.h>
  #endif
@@ -724,7 +747,7 @@ diff -urN allegro-4.3.10/src/beos/bsysapi.cpp allegro-4.3.10-haiku/src/beos/bsys
  #define SYS_THREAD_NAME     "system driver"
 diff -urN allegro-4.3.10/src/beos/bsysdrv.c allegro-4.3.10-haiku/src/beos/bsysdrv.c
 --- allegro-4.3.10/src/beos/bsysdrv.c	2001-11-06 07:30:48.000000000 -0800
-+++ allegro-4.3.10-haiku/src/beos/bsysdrv.c	2008-09-12 03:49:24.000000000 -0700
++++ allegro-4.3.10-haiku/src/beos/bsysdrv.c	2008-09-12 07:32:19.000000000 -0700
 @@ -18,9 +18,9 @@
  #include "allegro.h"
  #include "allegro/internal/aintern.h"
@@ -739,7 +762,7 @@ diff -urN allegro-4.3.10/src/beos/bsysdrv.c allegro-4.3.10-haiku/src/beos/bsysdr
  {
 diff -urN allegro-4.3.10/src/beos/bsystem.c allegro-4.3.10-haiku/src/beos/bsystem.c
 --- allegro-4.3.10/src/beos/bsystem.c	2002-12-07 13:10:58.000000000 -0800
-+++ allegro-4.3.10-haiku/src/beos/bsystem.c	2008-09-12 03:49:24.000000000 -0700
++++ allegro-4.3.10-haiku/src/beos/bsystem.c	2008-09-12 07:32:19.000000000 -0700
 @@ -19,11 +19,9 @@
  #include "allegro/internal/aintern.h"
  #include "allegro/platform/aintbeos.h"
@@ -756,7 +779,7 @@ diff -urN allegro-4.3.10/src/beos/bsystem.c allegro-4.3.10-haiku/src/beos/bsyste
     SYSTEM_BEOS,
 diff -urN allegro-4.3.10/src/beos/btimeapi.cpp allegro-4.3.10-haiku/src/beos/btimeapi.cpp
 --- allegro-4.3.10/src/beos/btimeapi.cpp	2004-07-27 04:33:22.000000000 -0700
-+++ allegro-4.3.10-haiku/src/beos/btimeapi.cpp	2008-09-12 03:49:24.000000000 -0700
++++ allegro-4.3.10-haiku/src/beos/btimeapi.cpp	2008-09-12 07:32:19.000000000 -0700
 @@ -19,7 +19,7 @@
  #include "allegro/internal/aintern.h"
  #include "allegro/platform/aintbeos.h"
@@ -768,7 +791,7 @@ diff -urN allegro-4.3.10/src/beos/btimeapi.cpp allegro-4.3.10-haiku/src/beos/bti
  
 diff -urN allegro-4.3.10/src/beos/btimedrv.c allegro-4.3.10-haiku/src/beos/btimedrv.c
 --- allegro-4.3.10/src/beos/btimedrv.c	2001-11-06 07:30:48.000000000 -0800
-+++ allegro-4.3.10-haiku/src/beos/btimedrv.c	2008-09-12 03:49:24.000000000 -0700
++++ allegro-4.3.10-haiku/src/beos/btimedrv.c	2008-09-12 07:32:19.000000000 -0700
 @@ -18,9 +18,9 @@
  #include "allegro.h"
  #include "allegro/internal/aintern.h"
@@ -783,7 +806,7 @@ diff -urN allegro-4.3.10/src/beos/btimedrv.c allegro-4.3.10-haiku/src/beos/btime
     {TIMER_BEOS, &timer_beos, TRUE},
 diff -urN allegro-4.3.10/src/beos/btimer.c allegro-4.3.10-haiku/src/beos/btimer.c
 --- allegro-4.3.10/src/beos/btimer.c	2004-08-21 19:57:14.000000000 -0700
-+++ allegro-4.3.10-haiku/src/beos/btimer.c	2008-09-12 03:49:24.000000000 -0700
++++ allegro-4.3.10-haiku/src/beos/btimer.c	2008-09-12 07:32:19.000000000 -0700
 @@ -19,7 +19,7 @@
  #include "allegro/internal/aintern.h"
  #include "allegro/platform/aintbeos.h"
@@ -795,7 +818,7 @@ diff -urN allegro-4.3.10/src/beos/btimer.c allegro-4.3.10-haiku/src/beos/btimer.
  
 diff -urN allegro-4.3.10/src/beos/bwindow.cpp allegro-4.3.10-haiku/src/beos/bwindow.cpp
 --- allegro-4.3.10/src/beos/bwindow.cpp	2002-11-15 03:53:40.000000000 -0800
-+++ allegro-4.3.10-haiku/src/beos/bwindow.cpp	2008-09-12 03:49:24.000000000 -0700
++++ allegro-4.3.10-haiku/src/beos/bwindow.cpp	2008-09-12 07:32:19.000000000 -0700
 @@ -19,7 +19,7 @@
  #include "allegro/internal/aintern.h"
  #include "allegro/platform/aintbeos.h"
@@ -807,7 +830,7 @@ diff -urN allegro-4.3.10/src/beos/bwindow.cpp allegro-4.3.10-haiku/src/beos/bwin
  
 diff -urN allegro-4.3.10/src/beos/bwscreen.cpp allegro-4.3.10-haiku/src/beos/bwscreen.cpp
 --- allegro-4.3.10/src/beos/bwscreen.cpp	2004-11-26 09:27:02.000000000 -0800
-+++ allegro-4.3.10-haiku/src/beos/bwscreen.cpp	2008-09-12 03:49:24.000000000 -0700
++++ allegro-4.3.10-haiku/src/beos/bwscreen.cpp	2008-09-12 07:32:19.000000000 -0700
 @@ -19,7 +19,7 @@
  #include "allegro/internal/aintern.h"
  #include "allegro/platform/aintbeos.h"
@@ -819,7 +842,7 @@ diff -urN allegro-4.3.10/src/beos/bwscreen.cpp allegro-4.3.10-haiku/src/beos/bws
  
 diff -urN allegro-4.3.10/src/i386/asmdefs.inc allegro-4.3.10-haiku/src/i386/asmdefs.inc
 --- allegro-4.3.10/src/i386/asmdefs.inc	2007-06-15 19:52:28.000000000 -0700
-+++ allegro-4.3.10-haiku/src/i386/asmdefs.inc	2008-09-12 03:49:24.000000000 -0700
++++ allegro-4.3.10-haiku/src/i386/asmdefs.inc	2008-09-12 07:32:19.000000000 -0700
 @@ -31,6 +31,8 @@
     #include "obj/msvc/asmdef.inc"
  #elif defined ALLEGRO_WATCOM
@@ -831,7 +854,7 @@ diff -urN allegro-4.3.10/src/i386/asmdefs.inc allegro-4.3.10-haiku/src/i386/asmd
  #elif defined ALLEGRO_QNX
 diff -urN allegro-4.3.10/src/midi.c allegro-4.3.10-haiku/src/midi.c
 --- allegro-4.3.10/src/midi.c	2007-04-12 09:19:54.000000000 -0700
-+++ allegro-4.3.10-haiku/src/midi.c	2008-09-12 03:49:24.000000000 -0700
++++ allegro-4.3.10-haiku/src/midi.c	2008-09-12 07:32:19.000000000 -0700
 @@ -1122,7 +1122,7 @@
        running_status = 0;
  
@@ -841,36 +864,9 @@ diff -urN allegro-4.3.10/src/midi.c allegro-4.3.10-haiku/src/midi.c
           /* Is there a bug in this routine, or in gcc under BeOS/x86? --PW */
           { int i; for (i=1; i; i--); }
  #endif
-diff -urN allegro-4.3.10/src/unix/usigalrm.c allegro-4.3.10-haiku/src/unix/usigalrm.c
---- allegro-4.3.10/src/unix/usigalrm.c	2007-06-15 19:52:28.000000000 -0700
-+++ allegro-4.3.10-haiku/src/unix/usigalrm.c	2008-09-12 04:57:53.000000000 -0700
-@@ -27,6 +27,10 @@
- #include "allegro/platform/aintunix.h"
- #endif
- 
-+#ifdef ALLEGRO_HAIKU
-+#define ALLEGRO_HAVE_LIBPTHREAD 1
-+#endif
-+
- 
- #ifndef ALLEGRO_HAVE_LIBPTHREAD
- 
-diff -urN allegro-4.3.10/src/unix/ustimer.c allegro-4.3.10-haiku/src/unix/ustimer.c
---- allegro-4.3.10/src/unix/ustimer.c	2007-06-15 19:52:28.000000000 -0700
-+++ allegro-4.3.10-haiku/src/unix/ustimer.c	2008-09-12 04:59:13.000000000 -0700
-@@ -20,6 +20,9 @@
- #include "allegro/internal/aintern.h"
- #include "allegro/platform/aintunix.h"
- 
-+#ifdef ALLEGRO_HAIKU
-+#define ALLEGRO_HAVE_LIBPTHREAD 1
-+#endif
- 
- 
- #ifndef ALLEGRO_HAVE_LIBPTHREAD
 diff -urN allegro-4.3.10/tools/dat2c.c allegro-4.3.10-haiku/tools/dat2c.c
 --- allegro-4.3.10/tools/dat2c.c	2005-04-28 02:53:38.000000000 -0700
-+++ allegro-4.3.10-haiku/tools/dat2c.c	2008-09-12 03:49:24.000000000 -0700
++++ allegro-4.3.10-haiku/tools/dat2c.c	2008-09-12 07:32:19.000000000 -0700
 @@ -342,7 +342,7 @@
     }
  
@@ -882,7 +878,7 @@ diff -urN allegro-4.3.10/tools/dat2c.c allegro-4.3.10-haiku/tools/dat2c.c
        dat2c->lformat = lineformat_dos;
 diff -urN allegro-4.3.10/tools/datedit.c allegro-4.3.10-haiku/tools/datedit.c
 --- allegro-4.3.10/tools/datedit.c	2007-10-08 09:23:36.000000000 -0700
-+++ allegro-4.3.10-haiku/tools/datedit.c	2008-09-12 03:49:24.000000000 -0700
++++ allegro-4.3.10-haiku/tools/datedit.c	2008-09-12 07:32:19.000000000 -0700
 @@ -121,6 +121,8 @@
        #include "obj/dmc/plugins.h"
     #elif defined ALLEGRO_BEOS
@@ -894,7 +890,7 @@ diff -urN allegro-4.3.10/tools/datedit.c allegro-4.3.10-haiku/tools/datedit.c
     #elif defined ALLEGRO_MPW
 diff -urN allegro-4.3.10/tools/grabber.c allegro-4.3.10-haiku/tools/grabber.c
 --- allegro-4.3.10/tools/grabber.c	2006-07-24 06:09:26.000000000 -0700
-+++ allegro-4.3.10-haiku/tools/grabber.c	2008-09-12 03:49:24.000000000 -0700
++++ allegro-4.3.10-haiku/tools/grabber.c	2008-09-12 07:32:19.000000000 -0700
 @@ -3132,6 +3132,7 @@
        case OSTYPE_QNX:        s = "QNX";                        break;
        case OSTYPE_UNIX:       s = "Unix";                       break;