From aec3652b011664a609d7c3d78c2df706f5d1778f Mon Sep 17 00:00:00 2001
From: Oliver Tappe <zooey@hirschkaefer.de>
Date: Sun, 25 Aug 2013 23:47:39 +0200
Subject: [PATCH] Cleanup: fix names of recipe and patch files.

* this fixes the wrong recipe names introduced by myself in #d525fee
* adjust patch names to match corresponding recipes
* additionally: create 'additional-files' folders as hint to some
  ports that do not have a proper recipe yet
---
 app-admin/pwgen/pwgen-2.06.sh                 |  26 -
 app-arch/fastjar/fastjar-0.97.sh              |  38 -
 app-arch/gzip/gzip-1.3.12.sh                  |  39 -
 .../gzip-1.3.12-downstream.patch              |   0
 .../{ffsb-6.0_rc2 => ffsb-6.0_rc2.recipe}     |   0
 .../jed/{jed-0.99_19 => jed-0.99_19.recipe}   |   0
 .../joe/{joe-3.8_hg => joe-3.8_hg.recipe}     |   0
 ...ev-cvs.patch => qemacs-0.3.2dev_cvs.patch} |   0
 ....3.2dev_cvs => qemacs-0.3.2dev_cvs.recipe} |   0
 ...ym-0.9.11_cvs => aranym-0.9.11_cvs.recipe} |   0
 ...utron-0.9_svn => oricutron-0.9_svn.recipe} |   0
 ...arpc-0.5.0_cvs => pearpc-0.5.0_cvs.recipe} |   0
 ...fish-1.23.1_git => fish-1.23.1_git.recipe} |   0
 ...1.23.1-git.patch => fish-1.23.1_git.patch} |   0
 ...k_tools-0.2.1 => ebook_tools-0.2.1.recipe} |   0
 ...eract-3.x_svn => tesseract-3.x_svn.recipe} |   0
 ...mm_common-0.9.2 => mm_common-0.9.2.recipe} |   0
 ...-2.9.0-git.patch => redis-2.9.0_git.patch} |   0
 ...redis-2.9.0_git => redis-2.9.0_git.recipe} |   0
 ...12.10.patch => u_boot_tools-2012.10.patch} |   0
 ...ls-2012.10 => u_boot_tools-2012.10.recipe} |   0
 ...asspath-0.98 => gnu_classpath-0.98.recipe} |   0
 ...th-0.98.patch => gnu_classpath-0.98.patch} |   0
 .../{dmd_bin-1.064 => dmd_bin-1.064.recipe}   |   0
 ...md-bin-1.064.patch => dmd_bin-1.064.patch} |   0
 dev-lang/lua/lua-5.1.4_3                      |  23 -
 dev-lang/lua/patches/lua-5.1.4-3.patch        | 276 ------
 dev-lang/lua/patches/lua-5.1.4.patch          | 212 +++-
 ...-2.03.01-haiku.diff => nasm-2.03.01.patch} |   0
 ...log-6.0.2.patch => swi_prolog-6.0.2.patch} |   0
 ...log-6.2.0.patch => swi_prolog-6.2.0.patch} |   0
 ...i_prolog-6.0.2 => swi_prolog-6.0.2.recipe} |   0
 ...i_prolog-6.2.0 => swi_prolog-6.2.0.recipe} |   0
 ...-7.2_alpha6 => boehm_gc-7.2_alpha6.recipe} |   0
 .../{boehm_gc-7.2d => boehm_gc-7.2d.recipe}   |   0
 ...alpha6.patch => boehm_gc-7.2_alpha6.patch} |   0
 ...oehm-gc-7.2d.patch => boehm_gc-7.2d.patch} |   0
 .../json_c/{json_c-0.9 => json_c-0.9.recipe}  |   0
 ...pg_error-1.10 => libgpg_error-1.10.recipe} |   0
 ...bgpg_error-1.7 => libgpg_error-1.7.recipe} |   0
 ...ror-1.10.patch => libgpg_error-1.10.patch} |   0
 ...error-1.7.patch => libgpg_error-1.7.patch} |   0
 ...tubs-0.3 => libpthread_stubs-0.3.2.recipe} |   0
 ...tubs-0.3.2 => libpthread_stubs-0.3.recipe} |   0
 ....1_HEAD => libwapcaplet-0.1.1_HEAD.recipe} |   0
 ...edir-1.1.1 => libxdg_basedir-1.1.1.recipe} |   0
 ...1.1.1.patch => libxdg_basedir-1.1.1.patch} |   0
 dev-libs/mpfr/mpfr-3.0.0_7047                 |  27 -
 .../{xerces_c-3.1.1 => xerces_c-3.1.1.recipe} |   0
 ...XML_Parser-2.36 => XML_Parser-2.36.recipe} |   0
 .../cnf/{cnf-1.0_git => cnf-1.0_git.recipe}   |   0
 ...chart-1.39_bzr => pychart-1.39_bzr.recipe} |   0
 dev-qt/qtcore/qtcore-4.8.x_git                |  26 -
 ...3 => abi_compliance_checker-1.98.3.recipe} |   0
 .../{automoc-4_git => automoc-4_git.recipe}   |   0
 dev-util/cmake/cmake-2.6.4.recipe             |  21 -
 dev-util/cmake/cmake-2.8.0.recipe             |  21 -
 dev-util/cmake/cmake-2.8.1.recipe             |  21 -
 dev-util/cmake/cmake-2.8.2.recipe             |  21 -
 dev-util/cmake/cmake-2.8.3.recipe             |  21 -
 dev-util/cmake/cmake-2.8.4.recipe             |  30 -
 dev-util/cmake/cmake-2.8_git                  |  36 -
 dev-util/cmake/patches/cmake-2.6.0-haiku.diff | 300 ------
 .../cmake/patches/cmake-2.6.1-haiku-2.diff    | 474 ---------
 dev-util/cmake/patches/cmake-2.6.1-haiku.diff | 449 ---------
 dev-util/cmake/patches/cmake-2.8-git.patch    | 229 -----
 dev-util/cmake/patches/cmake-2.8.1.patch      |  14 -
 dev-util/cmake/patches/cmake-2.8.2.patch      |  14 -
 dev-util/cmake/patches/cmake-2.8.3.patch      | 116 ---
 dev-util/cmake/patches/cmake-2.8.4.patch      | 116 ---
 .../{gtk_doc-1.15 => gtk_doc-1.15.recipe}     |   0
 ...{gtk-doc-1.15.patch => gtk_doc-1.15.patch} |   0
 dev-vcs/fossil/fossil-1.22_fossil             |  26 -
 ...-1.7.0_rc2 => subversion-1.7.0_rc2.recipe} |   0
 dev-vcs/subversion/subversion-1.7.xx_svn      |  30 -
 ...dosbox-0.74_svn => dosbox-0.74_svn.recipe} |   0
 .../dosbox-0.74_svn.patch}                    |   0
 .../{ => patches}/freesci-0.6.4_beos.patch    |   0
 ...s-0.2_157 => numptyphysics-0.2_157.recipe} |   0
 ...e_common-2.28 => gnome_common-2.28.recipe} |   0
 haiku-apps/armyknife/armyknife-999_git        |  21 -
 ...wser-1.1.1_cvs => bowser-1.1.1_cvs.recipe} |   0
 haiku-apps/burnitnow/burnitnow-2_svn          |  26 -
 ...w-beta5_svn => burnitnow-beta5_svn.recipe} |   0
 haiku-apps/burnitnow/burnitnow-beta6_git      |  35 -
 ...a5-svn.patch => burnitnow-beta5_svn.patch} |   0
 ....HEAD => caya_gpl_protocols-0.HEAD.recipe} |   0
 ...tocols-19 => caya_gpl_protocols-19.recipe} |   0
 ...tocols-24 => caya_gpl_protocols-24.recipe} |   0
 ...tocols-35 => caya_gpl_protocols-35.recipe} |   0
 ...tocols-36 => caya_gpl_protocols-36.recipe} |   0
 ....patch => caya_gpl_protocols-0.HEAD.patch} |   0
 .../{friss-0.7_svn => friss-0.7_svn.recipe}   |   0
 haiku-apps/haikutwitter/haikutwitter-1.0_svn  |  20 -
 .../{hare-beta1_git => hare-beta1_git.recipe} |   0
 ...open_sum_it-108 => open_sum_it-108.recipe} |   0
 .../{paladin-1.3_hg => paladin-1.3_hg.recipe} |   0
 ...anager-0_svn => thememanager-0_svn.recipe} |   0
 ...es_fonts-1.1 => arabeyes_fonts-1.1.recipe} |   0
 ...ier_prime-1.0 => courier_prime-1.0.recipe} |   0
 ...farsi_fonts-0.4 => farsi_fonts-0.4.recipe} |   0
 ...kacst_fonts-5.0 => kacst_fonts-5.0.recipe} |   0
 ...ef_font-1.001 => lateef_font-1.001.recipe} |   0
 ...> liberation_fonts-1.06.0.20100721.recipe} |   0
 ...leeq-1.02 => nafees_nastaleeq-1.02.recipe} |   0
 ...fees_riqa-1.00 => nafees_riqa-1.00.recipe} |   0
 ...t-1.005 => scheherazade_font-1.005.recipe} |   0
 ...es_fonts-2.0 => x_series_fonts-2.0.recipe} |   0
 ...k-6.6.1_10 => imagemagick-6.6.1_10.recipe} |   0
 ....0.21.patch => sane_backends-1.0.21.patch} |   0
 ...-0.9.2x_cvs => tuxpaint-0.9.2x_cvs.recipe} |   0
 ...gro-4.4.x_svn => allegro-4.4.x_svn.recipe} |   0
 .../patches/allegro-4.3.10-haiku-1.diff       | 736 --------------
 .../patches/allegro-4.3.10-haiku-2.diff       | 657 -------------
 .../patches/allegro-4.3.10-haiku-3.diff       | 325 ------
 .../patches/allegro-4.3.10-haiku-4.diff       | 792 ---------------
 .../patches/allegro-4.3.10-haiku-5.diff       | 792 ---------------
 .../allegro/patches/allegro-4.3.10-lm.diff    | 190 ----
 .../patches/allegro-4.3.10plus-haiku.diff     | 922 ------------------
 ....4.x-svn.patch => allegro-4.4.x_svn.patch} |   0
 ...type_with_subpixel_rendering-2.4.9.recipe} |   0
 ...4.9_with_subpixel_rendering_enabled.patch} |   0
 media-libs/ftgl/ftgl-2.1-svn                  |  27 -
 ...ladspa_sdk-1.13 => ladspa_sdk-1.13.recipe} |   0
 media-libs/libnsbmp/libnsbmp_0.0.3-HEAD       |  21 -
 .../libsdl/{ => additional-files}/sdl-config  |   0
 .../{libsdl-1.2_hg => libsdl-1.2_hg.recipe}   |   0
 ...libsdl-1.3_gsoc => libsdl-1.3_gsoc.recipe} |   0
 .../{libsdl-2.0_hg => libsdl-2.0_hg.recipe}   |   0
 ....0_hg_cmake => libsdl-2.0_hg_cmake.recipe} |   0
 ...ibsdl-1.2-hg.patch => libsdl-1.2_hg.patch} |   0
 ...vgtiny-0_HEAD => libsvgtiny-0_HEAD.recipe} |   0
 ...ebm-0.9.2_git => libwebm-0.9.2_git.recipe} |   0
 ...ebp-0.1.2_git => libwebp-0.1.2_git.recipe} |   0
 media-libs/openal/openal-1.12_git             |  25 -
 ...-gfx-2.0.20.patch => sdl_gfx-2.0.20.patch} |   0
 .../{sdl_gfx-2.0.20 => sdl_gfx-2.0.20.recipe} |   0
 .../{sdl_gfx-2.0.22 => sdl_gfx-2.0.22.recipe} |   0
 .../{sdl_gfx-2.0.23 => sdl_gfx-2.0.23.recipe} |   0
 .../sdl-image.OptionalPackageDescription      |   5 -
 ...l_image-1.2.10 => sdl_image-1.2.10.recipe} |   0
 ...l_image-1.2.12 => sdl_image-1.2.12.recipe} |   0
 ...sdl_image-1.2.6 => sdl_image-1.2.6.recipe} |   0
 ...sdl_image-1.2.8 => sdl_image-1.2.8.recipe} |   0
 ...sdl_image-1.2.9 => sdl_image-1.2.9.recipe} |   0
 ...l_image-1.2_hg => sdl_image-1.2_hg.recipe} |   0
 ...er-1.2.11.patch => sdl_mixer-1.2.11.patch} |   0
 ...l_mixer-1.2.10 => sdl_mixer-1.2.10.recipe} |   0
 ...l_mixer-1.2.11 => sdl_mixer-1.2.11.recipe} |   0
 ...l_mixer-1.2.12 => sdl_mixer-1.2.12.recipe} |   0
 ...sdl_mixer-1.2.9 => sdl_mixer-1.2.9.recipe} |   0
 ...l_mixer-1.2_hg => sdl_mixer-1.2_hg.recipe} |   0
 ...dl-net-1.2.7.patch => sdl_net-1.2.7.patch} |   0
 ...dl-net-1.2.8.patch => sdl_net-1.2.8.patch} |   0
 .../{sdl_net-1.2.7 => sdl_net-1.2.7.recipe}   |   0
 .../{sdl_net-1.2.8 => sdl_net-1.2.8.recipe}   |   0
 .../{sdl_net-1.2_hg => sdl_net-1.2_hg.recipe} |   0
 .../{sdl_rtf-0.1.0 => sdl_rtf-0.1.0.recipe}   |   0
 ...sdl_sound-1.0.3 => sdl_sound-1.0.3.recipe} |   0
 ...l_sound-1.0_hg => sdl_sound-1.0_hg.recipe} |   0
 .../{sdl_ttf-2.0.10 => sdl_ttf-2.0.10.recipe} |   0
 .../{sdl_ttf-2.0.11 => sdl_ttf-2.0.11.recipe} |   0
 .../{sdl_ttf-2.0.9 => sdl_ttf-2.0.9.recipe}   |   0
 .../{sdl_ttf-2.0_ => sdl_ttf-2.0_.recipe}     |   0
 media-libs/speex/speex-1.2_git                |  35 -
 ...ffer => fluidsynth-1.1_midi_buffer.recipe} |   0
 ...patch => fluidsynth-1.1_midi_buffer.patch} |   0
 ..._no_coda-3.13 => gogo_no_coda-3.13.recipe} |   0
 ...oda-3.13.patch => gogo_no_coda-3.13.patch} |   0
 media-sound/lame/lame-398_2                   |  25 -
 media-sound/lame/patches/lame-398-2.patch     |  41 -
 ...naspro-0.2.9_hg => naspro-0.2.9_hg.recipe} |   0
 .../{ocp_0.1.21_git => ocp-0.1.21_git.recipe} |   0
 ...s-1.2.0.patch => vorbis_tools-1.2.0.patch} |   0
 ...s-1.4.0.patch => vorbis_tools-1.4.0.patch} |   0
 ..._tools-1.2.0 => vorbis_tools-1.2.0.recipe} |   0
 ..._tools-1.4.0 => vorbis_tools-1.4.0.recipe} |   0
 media-video/ffmpeg/ffmpeg-0.10.2_vlc          |  29 -
 media-video/ffmpeg/ffmpeg-0.10.recipe         |  29 -
 .../ffmpeg/patches/ffmpeg-0.10-gcc2.patch     | 268 -----
 .../gnash/{ => additional-files}/gnash.hvif   | Bin
 .../gnash/{ => additional-files}/mime.zip     | Bin
 media-video/gnash/gnash-0.recipe              |   2 +-
 media-video/vlc/patches/vlc-0.8.6i.patch.old  | 529 ----------
 ...1.5_20101107 => vlc-1.1.5_20101107.recipe} |   0
 ...c-0.28b.patch => rhapsody_irc-0.28b.patch} |   0
 ...dy_irc-0.28b => rhapsody_irc-0.28b.recipe} |   0
 ...ub-0.1.2_HEAD => hubbub-0.1.2_HEAD.recipe} |   0
 .../{seeks-0.x_git => seeks-0.x_git.recipe}   |   0
 ...3_fwcutter-012 => b43_fwcutter-012.recipe} |   0
 ...utter-012.patch => b43_fwcutter-012.patch} |   0
 .../{dtc-1.3.0_git => dtc-1.3.0_git.recipe}   |   0
 ...tc-1.3.0-git.patch => dtc-1.3.0_git.patch} |   0
 sys-apps/hgrep/hgrep                          |  10 -
 sys-apps/lgrep/lgrep                          |  50 -
 ...ogs-1.43_git => e2fsprogs-1.43_git.recipe} |   0
 ....43-git.patch => e2fsprogs-1.43_git.patch} |   0
 ...netsurf-2.7_svn => netsurf-2.7_svn.recipe} |   0
 .../libX11/libX11.OptionalPackageDescription  |  65 --
 ...-master.patch => pixman-0.19_master.patch} |   0
 .../patches/pixman-patch-2009-03-06.diff      |  10 -
 ...-0.19_master => pixman-0.19_master.recipe} |   0
 ...e_info-1.0 => shared_mime_info-1.0.recipe} |   0
 ...17.0_git => util_macros-1.17.0_git.recipe} |   0
 ..._macros-1.7.0 => util_macros-1.7.0.recipe} |   0
 .../{xcb_proto-1.6 => xcb_proto-1.6.recipe}   |   0
 ...0.23-git.patch => xproto-7.0.23_git.patch} |   0
 ...to-7.0.23_git => xproto-7.0.23_git.recipe} |   0
 208 files changed, 199 insertions(+), 8094 deletions(-)
 delete mode 100755 app-admin/pwgen/pwgen-2.06.sh
 delete mode 100755 app-arch/fastjar/fastjar-0.97.sh
 delete mode 100755 app-arch/gzip/gzip-1.3.12.sh
 rename app-arch/gzip/{ => patches}/gzip-1.3.12-downstream.patch (100%)
 rename app-benchmarks/ffsb/{ffsb-6.0_rc2 => ffsb-6.0_rc2.recipe} (100%)
 rename app-editors/jed/{jed-0.99_19 => jed-0.99_19.recipe} (100%)
 rename app-editors/joe/{joe-3.8_hg => joe-3.8_hg.recipe} (100%)
 rename app-editors/qemacs/patches/{qemacs-0.3.2dev-cvs.patch => qemacs-0.3.2dev_cvs.patch} (100%)
 rename app-editors/qemacs/{qemacs-0.3.2dev_cvs => qemacs-0.3.2dev_cvs.recipe} (100%)
 rename app-emulation/aranym/{aranym-0.9.11_cvs => aranym-0.9.11_cvs.recipe} (100%)
 rename app-emulation/oricutron/{oricutron-0.9_svn => oricutron-0.9_svn.recipe} (100%)
 rename app-emulation/pearpc/{pearpc-0.5.0_cvs => pearpc-0.5.0_cvs.recipe} (100%)
 rename app-shells/fish/{fish-1.23.1_git => fish-1.23.1_git.recipe} (100%)
 rename app-shells/fish/patches/{fish-1.23.1-git.patch => fish-1.23.1_git.patch} (100%)
 rename app-text/ebook_tools/{ebook_tools-0.2.1 => ebook_tools-0.2.1.recipe} (100%)
 rename app-text/tesseract/{tesseract-3.x_svn => tesseract-3.x_svn.recipe} (100%)
 rename dev-cpp/mm_common/{mm_common-0.9.2 => mm_common-0.9.2.recipe} (100%)
 rename dev-db/redis/patches/{redis-2.9.0-git.patch => redis-2.9.0_git.patch} (100%)
 rename dev-db/redis/{redis-2.9.0_git => redis-2.9.0_git.recipe} (100%)
 rename dev-embedded/u_boot_tools/patches/{u-boot-tools-2012.10.patch => u_boot_tools-2012.10.patch} (100%)
 rename dev-embedded/u_boot_tools/{u_boot_tools-2012.10 => u_boot_tools-2012.10.recipe} (100%)
 rename dev-java/gnu_classpath/{gnu_classpath-0.98 => gnu_classpath-0.98.recipe} (100%)
 rename dev-java/gnu_classpath/patches/{gnu-classpath-0.98.patch => gnu_classpath-0.98.patch} (100%)
 rename dev-lang/dmd_bin/{dmd_bin-1.064 => dmd_bin-1.064.recipe} (100%)
 rename dev-lang/dmd_bin/patches/{dmd-bin-1.064.patch => dmd_bin-1.064.patch} (100%)
 delete mode 100644 dev-lang/lua/lua-5.1.4_3
 delete mode 100644 dev-lang/lua/patches/lua-5.1.4-3.patch
 rename dev-lang/nasm/patches/{nasm-2.03.01-haiku.diff => nasm-2.03.01.patch} (100%)
 rename dev-lang/swi_prolog/patches/{swi-prolog-6.0.2.patch => swi_prolog-6.0.2.patch} (100%)
 rename dev-lang/swi_prolog/patches/{swi-prolog-6.2.0.patch => swi_prolog-6.2.0.patch} (100%)
 rename dev-lang/swi_prolog/{swi_prolog-6.0.2 => swi_prolog-6.0.2.recipe} (100%)
 rename dev-lang/swi_prolog/{swi_prolog-6.2.0 => swi_prolog-6.2.0.recipe} (100%)
 rename dev-libs/boehm_gc/{boehm_gc-7.2_alpha6 => boehm_gc-7.2_alpha6.recipe} (100%)
 rename dev-libs/boehm_gc/{boehm_gc-7.2d => boehm_gc-7.2d.recipe} (100%)
 rename dev-libs/boehm_gc/patches/{boehm-gc-7.2_alpha6.patch => boehm_gc-7.2_alpha6.patch} (100%)
 rename dev-libs/boehm_gc/patches/{boehm-gc-7.2d.patch => boehm_gc-7.2d.patch} (100%)
 rename dev-libs/json_c/{json_c-0.9 => json_c-0.9.recipe} (100%)
 rename dev-libs/libgpg_error/{libgpg_error-1.10 => libgpg_error-1.10.recipe} (100%)
 rename dev-libs/libgpg_error/{libgpg_error-1.7 => libgpg_error-1.7.recipe} (100%)
 rename dev-libs/libgpg_error/patches/{libgpg-error-1.10.patch => libgpg_error-1.10.patch} (100%)
 rename dev-libs/libgpg_error/patches/{libgpg-error-1.7.patch => libgpg_error-1.7.patch} (100%)
 rename dev-libs/libpthread_stubs/{libpthread_stubs-0.3 => libpthread_stubs-0.3.2.recipe} (100%)
 rename dev-libs/libpthread_stubs/{libpthread_stubs-0.3.2 => libpthread_stubs-0.3.recipe} (100%)
 rename dev-libs/libwapcaplet/{libwapcaplet-0.1.1_HEAD => libwapcaplet-0.1.1_HEAD.recipe} (100%)
 rename dev-libs/libxdg_basedir/{libxdg_basedir-1.1.1 => libxdg_basedir-1.1.1.recipe} (100%)
 rename dev-libs/libxdg_basedir/patches/{libxdg-basedir-1.1.1.patch => libxdg_basedir-1.1.1.patch} (100%)
 delete mode 100644 dev-libs/mpfr/mpfr-3.0.0_7047
 rename dev-libs/xerces_c/{xerces_c-3.1.1 => xerces_c-3.1.1.recipe} (100%)
 rename dev-perl/XML_Parser/{XML_Parser-2.36 => XML_Parser-2.36.recipe} (100%)
 rename dev-python/cnf/{cnf-1.0_git => cnf-1.0_git.recipe} (100%)
 rename dev-python/pychart/{pychart-1.39_bzr => pychart-1.39_bzr.recipe} (100%)
 delete mode 100644 dev-qt/qtcore/qtcore-4.8.x_git
 rename dev-util/abi_compliance_checker/{abi_compliance_checker-1.98.3 => abi_compliance_checker-1.98.3.recipe} (100%)
 rename dev-util/automoc/{automoc-4_git => automoc-4_git.recipe} (100%)
 delete mode 100644 dev-util/cmake/cmake-2.6.4.recipe
 delete mode 100644 dev-util/cmake/cmake-2.8.0.recipe
 delete mode 100644 dev-util/cmake/cmake-2.8.1.recipe
 delete mode 100644 dev-util/cmake/cmake-2.8.2.recipe
 delete mode 100644 dev-util/cmake/cmake-2.8.3.recipe
 delete mode 100644 dev-util/cmake/cmake-2.8.4.recipe
 delete mode 100644 dev-util/cmake/cmake-2.8_git
 delete mode 100644 dev-util/cmake/patches/cmake-2.6.0-haiku.diff
 delete mode 100644 dev-util/cmake/patches/cmake-2.6.1-haiku-2.diff
 delete mode 100644 dev-util/cmake/patches/cmake-2.6.1-haiku.diff
 delete mode 100644 dev-util/cmake/patches/cmake-2.8-git.patch
 delete mode 100644 dev-util/cmake/patches/cmake-2.8.1.patch
 delete mode 100644 dev-util/cmake/patches/cmake-2.8.2.patch
 delete mode 100644 dev-util/cmake/patches/cmake-2.8.3.patch
 delete mode 100644 dev-util/cmake/patches/cmake-2.8.4.patch
 rename dev-util/gtk_doc/{gtk_doc-1.15 => gtk_doc-1.15.recipe} (100%)
 rename dev-util/gtk_doc/patches/{gtk-doc-1.15.patch => gtk_doc-1.15.patch} (100%)
 delete mode 100644 dev-vcs/fossil/fossil-1.22_fossil
 rename dev-vcs/subversion/{subversion-1.7.0_rc2 => subversion-1.7.0_rc2.recipe} (100%)
 delete mode 100644 dev-vcs/subversion/subversion-1.7.xx_svn
 rename games-emulation/dosbox/{dosbox-0.74_svn => dosbox-0.74_svn.recipe} (100%)
 rename games-emulation/dosbox/{dosbox-0.74-svn.patch => patches/dosbox-0.74_svn.patch} (100%)
 rename games-engines/freesci/{ => patches}/freesci-0.6.4_beos.patch (100%)
 rename games-puzzle/numptyphysics/{numptyphysics-0.2_157 => numptyphysics-0.2_157.recipe} (100%)
 rename gnome-base/gnome_common/{gnome_common-2.28 => gnome_common-2.28.recipe} (100%)
 delete mode 100644 haiku-apps/armyknife/armyknife-999_git
 rename haiku-apps/bowser/{bowser-1.1.1_cvs => bowser-1.1.1_cvs.recipe} (100%)
 delete mode 100644 haiku-apps/burnitnow/burnitnow-2_svn
 rename haiku-apps/burnitnow/{burnitnow-beta5_svn => burnitnow-beta5_svn.recipe} (100%)
 delete mode 100644 haiku-apps/burnitnow/burnitnow-beta6_git
 rename haiku-apps/burnitnow/patches/{burnitnow-beta5-svn.patch => burnitnow-beta5_svn.patch} (100%)
 rename haiku-apps/caya_gpl_protocols/{caya_gpl_protocols-0.HEAD => caya_gpl_protocols-0.HEAD.recipe} (100%)
 rename haiku-apps/caya_gpl_protocols/{caya_gpl_protocols-19 => caya_gpl_protocols-19.recipe} (100%)
 rename haiku-apps/caya_gpl_protocols/{caya_gpl_protocols-24 => caya_gpl_protocols-24.recipe} (100%)
 rename haiku-apps/caya_gpl_protocols/{caya_gpl_protocols-35 => caya_gpl_protocols-35.recipe} (100%)
 rename haiku-apps/caya_gpl_protocols/{caya_gpl_protocols-36 => caya_gpl_protocols-36.recipe} (100%)
 rename haiku-apps/caya_gpl_protocols/patches/{caya-gpl-protocols-0.HEAD.patch => caya_gpl_protocols-0.HEAD.patch} (100%)
 rename haiku-apps/friss/{friss-0.7_svn => friss-0.7_svn.recipe} (100%)
 delete mode 100644 haiku-apps/haikutwitter/haikutwitter-1.0_svn
 rename haiku-apps/hare/{hare-beta1_git => hare-beta1_git.recipe} (100%)
 rename haiku-apps/open_sum_it/{open_sum_it-108 => open_sum_it-108.recipe} (100%)
 rename haiku-apps/paladin/{paladin-1.3_hg => paladin-1.3_hg.recipe} (100%)
 rename haiku-apps/thememanager/{thememanager-0_svn => thememanager-0_svn.recipe} (100%)
 rename media-fonts/arabeyes_fonts/{arabeyes_fonts-1.1 => arabeyes_fonts-1.1.recipe} (100%)
 rename media-fonts/courier_prime/{courier_prime-1.0 => courier_prime-1.0.recipe} (100%)
 rename media-fonts/farsi_fonts/{farsi_fonts-0.4 => farsi_fonts-0.4.recipe} (100%)
 rename media-fonts/kacst_fonts/{kacst_fonts-5.0 => kacst_fonts-5.0.recipe} (100%)
 rename media-fonts/lateef_font/{lateef_font-1.001 => lateef_font-1.001.recipe} (100%)
 rename media-fonts/liberation_fonts/{liberation_fonts-1.06.0.20100721 => liberation_fonts-1.06.0.20100721.recipe} (100%)
 rename media-fonts/nafees_nastaleeq/{nafees_nastaleeq-1.02 => nafees_nastaleeq-1.02.recipe} (100%)
 rename media-fonts/nafees_riqa/{nafees_riqa-1.00 => nafees_riqa-1.00.recipe} (100%)
 rename media-fonts/scheherazade_font/{scheherazade_font-1.005 => scheherazade_font-1.005.recipe} (100%)
 rename media-fonts/x_series_fonts/{x_series_fonts-2.0 => x_series_fonts-2.0.recipe} (100%)
 rename media-gfx/imagemagick/{imagemagick-6.6.1_10 => imagemagick-6.6.1_10.recipe} (100%)
 rename media-gfx/sane_backends/patches/{sane-backends-1.0.21.patch => sane_backends-1.0.21.patch} (100%)
 rename media-gfx/tuxpaint/{tuxpaint-0.9.2x_cvs => tuxpaint-0.9.2x_cvs.recipe} (100%)
 rename media-libs/allegro/{allegro-4.4.x_svn => allegro-4.4.x_svn.recipe} (100%)
 delete mode 100644 media-libs/allegro/patches/allegro-4.3.10-haiku-1.diff
 delete mode 100644 media-libs/allegro/patches/allegro-4.3.10-haiku-2.diff
 delete mode 100644 media-libs/allegro/patches/allegro-4.3.10-haiku-3.diff
 delete mode 100644 media-libs/allegro/patches/allegro-4.3.10-haiku-4.diff
 delete mode 100644 media-libs/allegro/patches/allegro-4.3.10-haiku-5.diff
 delete mode 100644 media-libs/allegro/patches/allegro-4.3.10-lm.diff
 delete mode 100644 media-libs/allegro/patches/allegro-4.3.10plus-haiku.diff
 rename media-libs/allegro/patches/{allegro-4.4.x-svn.patch => allegro-4.4.x_svn.patch} (100%)
 rename media-libs/freetype/{freetype_with_subpixel_rendering-2.4.9 => freetype_with_subpixel_rendering-2.4.9.recipe} (100%)
 rename media-libs/freetype/patches/{freetype-2.4.9-with-subpixel-rendering-enabled.patch => freetype-2.4.9_with_subpixel_rendering_enabled.patch} (100%)
 delete mode 100644 media-libs/ftgl/ftgl-2.1-svn
 rename media-libs/ladspa_sdk/{ladspa_sdk-1.13 => ladspa_sdk-1.13.recipe} (100%)
 delete mode 100644 media-libs/libnsbmp/libnsbmp_0.0.3-HEAD
 rename media-libs/libsdl/{ => additional-files}/sdl-config (100%)
 rename media-libs/libsdl/{libsdl-1.2_hg => libsdl-1.2_hg.recipe} (100%)
 rename media-libs/libsdl/{libsdl-1.3_gsoc => libsdl-1.3_gsoc.recipe} (100%)
 rename media-libs/libsdl/{libsdl-2.0_hg => libsdl-2.0_hg.recipe} (100%)
 rename media-libs/libsdl/{libsdl-2.0_hg_cmake => libsdl-2.0_hg_cmake.recipe} (100%)
 rename media-libs/libsdl/patches/{libsdl-1.2-hg.patch => libsdl-1.2_hg.patch} (100%)
 rename media-libs/libsvgtiny/{libsvgtiny-0_HEAD => libsvgtiny-0_HEAD.recipe} (100%)
 rename media-libs/libwebm/{libwebm-0.9.2_git => libwebm-0.9.2_git.recipe} (100%)
 rename media-libs/libwebp/{libwebp-0.1.2_git => libwebp-0.1.2_git.recipe} (100%)
 delete mode 100644 media-libs/openal/openal-1.12_git
 rename media-libs/sdl_gfx/patches/{sdl-gfx-2.0.20.patch => sdl_gfx-2.0.20.patch} (100%)
 rename media-libs/sdl_gfx/{sdl_gfx-2.0.20 => sdl_gfx-2.0.20.recipe} (100%)
 rename media-libs/sdl_gfx/{sdl_gfx-2.0.22 => sdl_gfx-2.0.22.recipe} (100%)
 rename media-libs/sdl_gfx/{sdl_gfx-2.0.23 => sdl_gfx-2.0.23.recipe} (100%)
 delete mode 100644 media-libs/sdl_image/sdl-image.OptionalPackageDescription
 rename media-libs/sdl_image/{sdl_image-1.2.10 => sdl_image-1.2.10.recipe} (100%)
 rename media-libs/sdl_image/{sdl_image-1.2.12 => sdl_image-1.2.12.recipe} (100%)
 rename media-libs/sdl_image/{sdl_image-1.2.6 => sdl_image-1.2.6.recipe} (100%)
 rename media-libs/sdl_image/{sdl_image-1.2.8 => sdl_image-1.2.8.recipe} (100%)
 rename media-libs/sdl_image/{sdl_image-1.2.9 => sdl_image-1.2.9.recipe} (100%)
 rename media-libs/sdl_image/{sdl_image-1.2_hg => sdl_image-1.2_hg.recipe} (100%)
 rename media-libs/sdl_mixer/patches/{sdl-mixer-1.2.11.patch => sdl_mixer-1.2.11.patch} (100%)
 rename media-libs/sdl_mixer/{sdl_mixer-1.2.10 => sdl_mixer-1.2.10.recipe} (100%)
 rename media-libs/sdl_mixer/{sdl_mixer-1.2.11 => sdl_mixer-1.2.11.recipe} (100%)
 rename media-libs/sdl_mixer/{sdl_mixer-1.2.12 => sdl_mixer-1.2.12.recipe} (100%)
 rename media-libs/sdl_mixer/{sdl_mixer-1.2.9 => sdl_mixer-1.2.9.recipe} (100%)
 rename media-libs/sdl_mixer/{sdl_mixer-1.2_hg => sdl_mixer-1.2_hg.recipe} (100%)
 rename media-libs/sdl_net/patches/{sdl-net-1.2.7.patch => sdl_net-1.2.7.patch} (100%)
 rename media-libs/sdl_net/patches/{sdl-net-1.2.8.patch => sdl_net-1.2.8.patch} (100%)
 rename media-libs/sdl_net/{sdl_net-1.2.7 => sdl_net-1.2.7.recipe} (100%)
 rename media-libs/sdl_net/{sdl_net-1.2.8 => sdl_net-1.2.8.recipe} (100%)
 rename media-libs/sdl_net/{sdl_net-1.2_hg => sdl_net-1.2_hg.recipe} (100%)
 rename media-libs/sdl_rtf/{sdl_rtf-0.1.0 => sdl_rtf-0.1.0.recipe} (100%)
 rename media-libs/sdl_sound/{sdl_sound-1.0.3 => sdl_sound-1.0.3.recipe} (100%)
 rename media-libs/sdl_sound/{sdl_sound-1.0_hg => sdl_sound-1.0_hg.recipe} (100%)
 rename media-libs/sdl_ttf/{sdl_ttf-2.0.10 => sdl_ttf-2.0.10.recipe} (100%)
 rename media-libs/sdl_ttf/{sdl_ttf-2.0.11 => sdl_ttf-2.0.11.recipe} (100%)
 rename media-libs/sdl_ttf/{sdl_ttf-2.0.9 => sdl_ttf-2.0.9.recipe} (100%)
 rename media-libs/sdl_ttf/{sdl_ttf-2.0_ => sdl_ttf-2.0_.recipe} (100%)
 delete mode 100644 media-libs/speex/speex-1.2_git
 rename media-sound/fluidsynth/{fluidsynth_1.1_midi_buffer => fluidsynth-1.1_midi_buffer.recipe} (100%)
 rename media-sound/fluidsynth/patches/{fluidsynth-1.1-midi-buffer.patch => fluidsynth-1.1_midi_buffer.patch} (100%)
 rename media-sound/gogo_no_coda/{gogo_no_coda-3.13 => gogo_no_coda-3.13.recipe} (100%)
 rename media-sound/gogo_no_coda/patches/{gogo-no-coda-3.13.patch => gogo_no_coda-3.13.patch} (100%)
 delete mode 100644 media-sound/lame/lame-398_2
 delete mode 100644 media-sound/lame/patches/lame-398-2.patch
 rename media-sound/naspro/{naspro-0.2.9_hg => naspro-0.2.9_hg.recipe} (100%)
 rename media-sound/ocp/{ocp_0.1.21_git => ocp-0.1.21_git.recipe} (100%)
 rename media-sound/vorbis_tools/patches/{vorbis-tools-1.2.0.patch => vorbis_tools-1.2.0.patch} (100%)
 rename media-sound/vorbis_tools/patches/{vorbis-tools-1.4.0.patch => vorbis_tools-1.4.0.patch} (100%)
 rename media-sound/vorbis_tools/{vorbis_tools-1.2.0 => vorbis_tools-1.2.0.recipe} (100%)
 rename media-sound/vorbis_tools/{vorbis_tools-1.4.0 => vorbis_tools-1.4.0.recipe} (100%)
 delete mode 100644 media-video/ffmpeg/ffmpeg-0.10.2_vlc
 delete mode 100644 media-video/ffmpeg/ffmpeg-0.10.recipe
 delete mode 100644 media-video/ffmpeg/patches/ffmpeg-0.10-gcc2.patch
 rename media-video/gnash/{ => additional-files}/gnash.hvif (100%)
 rename media-video/gnash/{ => additional-files}/mime.zip (100%)
 delete mode 100644 media-video/vlc/patches/vlc-0.8.6i.patch.old
 rename media-video/vlc/{vlc-1.1.5_20101107 => vlc-1.1.5_20101107.recipe} (100%)
 rename net-irc/rhapsody_irc/patches/{rhapsody-irc-0.28b.patch => rhapsody_irc-0.28b.patch} (100%)
 rename net-irc/rhapsody_irc/{rhapsody_irc-0.28b => rhapsody_irc-0.28b.recipe} (100%)
 rename net-libs/hubbub/{hubbub-0.1.2_HEAD => hubbub-0.1.2_HEAD.recipe} (100%)
 rename net-p2p/seeks/{seeks-0.x_git => seeks-0.x_git.recipe} (100%)
 rename net-wireless/b43_fwcutter/{b43_fwcutter-012 => b43_fwcutter-012.recipe} (100%)
 rename net-wireless/b43_fwcutter/patches/{b43-fwcutter-012.patch => b43_fwcutter-012.patch} (100%)
 rename sys-apps/dtc/{dtc-1.3.0_git => dtc-1.3.0_git.recipe} (100%)
 rename sys-apps/dtc/patches/{dtc-1.3.0-git.patch => dtc-1.3.0_git.patch} (100%)
 delete mode 100755 sys-apps/hgrep/hgrep
 delete mode 100755 sys-apps/lgrep/lgrep
 rename sys-fs/e2fsprogs/{e2fsprogs-1.43_git => e2fsprogs-1.43_git.recipe} (100%)
 rename sys-fs/e2fsprogs/patches/{e2fsprogs-1.43-git.patch => e2fsprogs-1.43_git.patch} (100%)
 rename www-client/netsurf/{netsurf-2.7_svn => netsurf-2.7_svn.recipe} (100%)
 delete mode 100644 x11-libs/libX11/libX11.OptionalPackageDescription
 rename x11-libs/pixman/patches/{pixman-0.19-master.patch => pixman-0.19_master.patch} (100%)
 delete mode 100644 x11-libs/pixman/patches/pixman-patch-2009-03-06.diff
 rename x11-libs/pixman/{pixman-0.19_master => pixman-0.19_master.recipe} (100%)
 rename x11-misc/shared_mime_info/{shared_mime_info-1.0 => shared_mime_info-1.0.recipe} (100%)
 rename x11-misc/util_macros/{util_macros-1.17.0_git => util_macros-1.17.0_git.recipe} (100%)
 rename x11-misc/util_macros/{util_macros-1.7.0 => util_macros-1.7.0.recipe} (100%)
 rename x11-proto/xcb_proto/{xcb_proto-1.6 => xcb_proto-1.6.recipe} (100%)
 rename x11-proto/xproto/patches/{xproto-7.0.23-git.patch => xproto-7.0.23_git.patch} (100%)
 rename x11-proto/xproto/{xproto-7.0.23_git => xproto-7.0.23_git.recipe} (100%)

diff --git a/app-admin/pwgen/pwgen-2.06.sh b/app-admin/pwgen/pwgen-2.06.sh
deleted file mode 100755
index 030f4ada5..000000000
--- a/app-admin/pwgen/pwgen-2.06.sh
+++ /dev/null
@@ -1,26 +0,0 @@
-#!/bin/sh
-
-PACKAGE="app-admin/pwgen"
-VERSION="2.06"
-HOMEPAGE="http://sourceforge.net/projects/pwgen/"
-URL="http://voxel.dl.sourceforge.net/sourceforge/pwgen/"
-FILE="pwgen-2.06.tar.gz"
-
-PREFIX=--prefix=/boot/common
-HAIKUPORTS="http://ports.haiku-files.org/wiki"
-CWD=`pwd`
-
-if [ ! -d ${PACKAGE}/${VERSION} ] ; then
-	mkdir -p ${PACKAGE}/${VERSION}
-fi
-if [ ! -e ${FILE} ] ; then
-	wget ${URL}${FILE}
-fi
-cd ${PACKAGE}/${VERSION}
-tar xvf ${CWD}/${FILE}
-cd pwgen-2.06
-configure ${PREFIX}
-`make && make install && echo  && echo "  Installation complete."` || echo "  Installation FAILED !"
-
-echo "  For more information, see ${HAIKUPORTS}/${PACKAGE}"
-echo
\ No newline at end of file
diff --git a/app-arch/fastjar/fastjar-0.97.sh b/app-arch/fastjar/fastjar-0.97.sh
deleted file mode 100755
index bfa0b84b4..000000000
--- a/app-arch/fastjar/fastjar-0.97.sh
+++ /dev/null
@@ -1,38 +0,0 @@
-#!/bin/sh
-
-HOMEPAGE="https://savannah.nongnu.org/projects/fastjar/"
-PACKAGE="app-arch/fastjar/"
-VERSION="0.97"
-URL="http://mirror.its.uidaho.edu/pub/savannah/fastjar/"
-FILE="fastjar-0.97.tar.gz"
-
-# ------- This should not be edited ------- 
-PFX=/boot/common/
-HAIKUPORTS="http://ports.haiku-files.org/wiki/"
-CWD=`pwd`/
-if [ ! -d ${PACKAGE}${VERSION} ] ; then
-	mkdir -p ${PACKAGE}${VERSION}
-fi
-if [ ! -e ${FILE} ] ; then
-	wget ${URL}${FILE}
-fi
-cd ${PACKAGE}${VERSION}
-if [ ${FILE:(-7)} = "tar.bz2" ] ; then
-	tar -jxvf ${CWD}${FILE}
-elif [ ${FILE:(-7)} = ".tar.gz" ] ; then
-	tar xvf ${CWD}${FILE}
-fi
-# ------- Begin Instructions ------- 
-cd fastjar-0.97
-libtoolize --force --install
-aclocal --force 
-automake --force-missing
-autoconf --force
-configure --prefix=${PREFIX} 
-make && make install && echo  && echo "  Installation complete." || echo "  Installation FAILED !"
-
-echo "  For more information, see:"
-echo "    ${HAIKUPORTS}${PACKAGE}"
-echo "    ${HOMEPAGE}"
-echo
-
diff --git a/app-arch/gzip/gzip-1.3.12.sh b/app-arch/gzip/gzip-1.3.12.sh
deleted file mode 100755
index 13285332d..000000000
--- a/app-arch/gzip/gzip-1.3.12.sh
+++ /dev/null
@@ -1,39 +0,0 @@
-#!/bin/sh
-
-HOMEPAGE="http://www.gnu.org/software/gzip/"
-PACKAGE="app-arch/gzip/"
-VERSION="1.3.12"
-URL="http://ftp.gnu.org/gnu/gzip/"
-FILE="gzip-1.3.12.tar.gz"
-PATCH_URL="http://ports.haiku-files.org/svn/haikuports/trunk/"
-PATCH_FILE="gzip-1.3.12-downstream.patch"
-
-# ------- This should not be edited ------- 
-PFX=/boot/common/
-HAIKUPORTS="http://ports.haiku-files.org/wiki/"
-CWD=`pwd`/
-if [ ! -d ${PACKAGE}${VERSION} ] ; then
-	mkdir -p ${PACKAGE}${VERSION}
-fi
-if [ ! -e ${FILE} ] ; then
-	wget ${URL}${FILE}
-fi
-cd ${PACKAGE}${VERSION}
-if [ ${FILE:(-7)} = "tar.bz2" ] ; then
-	tar -jxvf ${CWD}${FILE}
-elif [ ${FILE:(-7)} = ".tar.gz" ] ; then
-	tar xvf ${CWD}${FILE}
-fi
-# ------- Begin Instructions ------- 
-cd gzip-1.3.12
-wget ${PATCH_URL}${PACKAGE}/${PATCH_FILE}
-patch -p1 -i ${PATCH_FILE}
-libtoolize --force --install
-configure --prefix=${PFX}
-make && make install && echo  && echo "  Installation complete." || echo "  Installation FAILED !"
-
-echo "  For more information, see:"
-echo "    ${HAIKUPORTS}${PACKAGE}"
-echo "    ${HOMEPAGE}"
-echo
-
diff --git a/app-arch/gzip/gzip-1.3.12-downstream.patch b/app-arch/gzip/patches/gzip-1.3.12-downstream.patch
similarity index 100%
rename from app-arch/gzip/gzip-1.3.12-downstream.patch
rename to app-arch/gzip/patches/gzip-1.3.12-downstream.patch
diff --git a/app-benchmarks/ffsb/ffsb-6.0_rc2 b/app-benchmarks/ffsb/ffsb-6.0_rc2.recipe
similarity index 100%
rename from app-benchmarks/ffsb/ffsb-6.0_rc2
rename to app-benchmarks/ffsb/ffsb-6.0_rc2.recipe
diff --git a/app-editors/jed/jed-0.99_19 b/app-editors/jed/jed-0.99_19.recipe
similarity index 100%
rename from app-editors/jed/jed-0.99_19
rename to app-editors/jed/jed-0.99_19.recipe
diff --git a/app-editors/joe/joe-3.8_hg b/app-editors/joe/joe-3.8_hg.recipe
similarity index 100%
rename from app-editors/joe/joe-3.8_hg
rename to app-editors/joe/joe-3.8_hg.recipe
diff --git a/app-editors/qemacs/patches/qemacs-0.3.2dev-cvs.patch b/app-editors/qemacs/patches/qemacs-0.3.2dev_cvs.patch
similarity index 100%
rename from app-editors/qemacs/patches/qemacs-0.3.2dev-cvs.patch
rename to app-editors/qemacs/patches/qemacs-0.3.2dev_cvs.patch
diff --git a/app-editors/qemacs/qemacs-0.3.2dev_cvs b/app-editors/qemacs/qemacs-0.3.2dev_cvs.recipe
similarity index 100%
rename from app-editors/qemacs/qemacs-0.3.2dev_cvs
rename to app-editors/qemacs/qemacs-0.3.2dev_cvs.recipe
diff --git a/app-emulation/aranym/aranym-0.9.11_cvs b/app-emulation/aranym/aranym-0.9.11_cvs.recipe
similarity index 100%
rename from app-emulation/aranym/aranym-0.9.11_cvs
rename to app-emulation/aranym/aranym-0.9.11_cvs.recipe
diff --git a/app-emulation/oricutron/oricutron-0.9_svn b/app-emulation/oricutron/oricutron-0.9_svn.recipe
similarity index 100%
rename from app-emulation/oricutron/oricutron-0.9_svn
rename to app-emulation/oricutron/oricutron-0.9_svn.recipe
diff --git a/app-emulation/pearpc/pearpc-0.5.0_cvs b/app-emulation/pearpc/pearpc-0.5.0_cvs.recipe
similarity index 100%
rename from app-emulation/pearpc/pearpc-0.5.0_cvs
rename to app-emulation/pearpc/pearpc-0.5.0_cvs.recipe
diff --git a/app-shells/fish/fish-1.23.1_git b/app-shells/fish/fish-1.23.1_git.recipe
similarity index 100%
rename from app-shells/fish/fish-1.23.1_git
rename to app-shells/fish/fish-1.23.1_git.recipe
diff --git a/app-shells/fish/patches/fish-1.23.1-git.patch b/app-shells/fish/patches/fish-1.23.1_git.patch
similarity index 100%
rename from app-shells/fish/patches/fish-1.23.1-git.patch
rename to app-shells/fish/patches/fish-1.23.1_git.patch
diff --git a/app-text/ebook_tools/ebook_tools-0.2.1 b/app-text/ebook_tools/ebook_tools-0.2.1.recipe
similarity index 100%
rename from app-text/ebook_tools/ebook_tools-0.2.1
rename to app-text/ebook_tools/ebook_tools-0.2.1.recipe
diff --git a/app-text/tesseract/tesseract-3.x_svn b/app-text/tesseract/tesseract-3.x_svn.recipe
similarity index 100%
rename from app-text/tesseract/tesseract-3.x_svn
rename to app-text/tesseract/tesseract-3.x_svn.recipe
diff --git a/dev-cpp/mm_common/mm_common-0.9.2 b/dev-cpp/mm_common/mm_common-0.9.2.recipe
similarity index 100%
rename from dev-cpp/mm_common/mm_common-0.9.2
rename to dev-cpp/mm_common/mm_common-0.9.2.recipe
diff --git a/dev-db/redis/patches/redis-2.9.0-git.patch b/dev-db/redis/patches/redis-2.9.0_git.patch
similarity index 100%
rename from dev-db/redis/patches/redis-2.9.0-git.patch
rename to dev-db/redis/patches/redis-2.9.0_git.patch
diff --git a/dev-db/redis/redis-2.9.0_git b/dev-db/redis/redis-2.9.0_git.recipe
similarity index 100%
rename from dev-db/redis/redis-2.9.0_git
rename to dev-db/redis/redis-2.9.0_git.recipe
diff --git a/dev-embedded/u_boot_tools/patches/u-boot-tools-2012.10.patch b/dev-embedded/u_boot_tools/patches/u_boot_tools-2012.10.patch
similarity index 100%
rename from dev-embedded/u_boot_tools/patches/u-boot-tools-2012.10.patch
rename to dev-embedded/u_boot_tools/patches/u_boot_tools-2012.10.patch
diff --git a/dev-embedded/u_boot_tools/u_boot_tools-2012.10 b/dev-embedded/u_boot_tools/u_boot_tools-2012.10.recipe
similarity index 100%
rename from dev-embedded/u_boot_tools/u_boot_tools-2012.10
rename to dev-embedded/u_boot_tools/u_boot_tools-2012.10.recipe
diff --git a/dev-java/gnu_classpath/gnu_classpath-0.98 b/dev-java/gnu_classpath/gnu_classpath-0.98.recipe
similarity index 100%
rename from dev-java/gnu_classpath/gnu_classpath-0.98
rename to dev-java/gnu_classpath/gnu_classpath-0.98.recipe
diff --git a/dev-java/gnu_classpath/patches/gnu-classpath-0.98.patch b/dev-java/gnu_classpath/patches/gnu_classpath-0.98.patch
similarity index 100%
rename from dev-java/gnu_classpath/patches/gnu-classpath-0.98.patch
rename to dev-java/gnu_classpath/patches/gnu_classpath-0.98.patch
diff --git a/dev-lang/dmd_bin/dmd_bin-1.064 b/dev-lang/dmd_bin/dmd_bin-1.064.recipe
similarity index 100%
rename from dev-lang/dmd_bin/dmd_bin-1.064
rename to dev-lang/dmd_bin/dmd_bin-1.064.recipe
diff --git a/dev-lang/dmd_bin/patches/dmd-bin-1.064.patch b/dev-lang/dmd_bin/patches/dmd_bin-1.064.patch
similarity index 100%
rename from dev-lang/dmd_bin/patches/dmd-bin-1.064.patch
rename to dev-lang/dmd_bin/patches/dmd_bin-1.064.patch
diff --git a/dev-lang/lua/lua-5.1.4_3 b/dev-lang/lua/lua-5.1.4_3
deleted file mode 100644
index 1ac5dddbe..000000000
--- a/dev-lang/lua/lua-5.1.4_3
+++ /dev/null
@@ -1,23 +0,0 @@
-DESCRIPTION="Lua is a powerful, fast, light-weight, embeddable scripting language."
-HOMEPAGE="http://www.lua.org"
-SRC_URI="http://www.lua.org/ftp/lua-5.1.4.tar.gz"
-CHECKSUM_MD5="d0870f2de55d59c1c8419f36e8fac150"
-REVISION="3"
-STATUS_HAIKU="stable"
-DEPEND="pkgconfig >= 0.25"
-BUILD()
-{
-	cd lua-5.1.4
-	make haiku
-}
-
-INSTALL()
-{
-	cd lua-5.1.4
-	make install INSTALL_TOP="${DESTDIR}`finddir B_COMMON_DIRECTORY`" \
-		INSTALL_MAN="${DESTDIR}`finddir B_COMMON_DOCUMENTATION_DIRECTORY`/man"
-	mkdir -p ${DESTDIR}`finddir B_COMMON_LIB_DIRECTORY`/pkgconfig
-	cp etc/lua.pc ${DESTDIR}`finddir B_COMMON_LIB_DIRECTORY`/pkgconfig/lua.pc
-}
-LICENSE="MIT"
-COPYRIGHT="1994-2009, Lua.org, PUC-Rio"
diff --git a/dev-lang/lua/patches/lua-5.1.4-3.patch b/dev-lang/lua/patches/lua-5.1.4-3.patch
deleted file mode 100644
index 38b6ddd2a..000000000
--- a/dev-lang/lua/patches/lua-5.1.4-3.patch
+++ /dev/null
@@ -1,276 +0,0 @@
-diff -urN lua-5.1.4/Makefile lua-5.1.4-haiku/Makefile
---- lua-5.1.4/Makefile	2008-08-12 00:40:48.066322432 +0000
-+++ lua-5.1.4-haiku/Makefile	2011-05-03 22:29:07.568328192 +0000
-@@ -13,11 +13,11 @@
- INSTALL_BIN= $(INSTALL_TOP)/bin
- INSTALL_INC= $(INSTALL_TOP)/include
- INSTALL_LIB= $(INSTALL_TOP)/lib
--INSTALL_MAN= $(INSTALL_TOP)/man/man1
-+INSTALL_MAN= `finddir B_COMMON_DOCUMENTATION_DIRECTORY`/man/man1
- #
- # You probably want to make INSTALL_LMOD and INSTALL_CMOD consistent with
- # LUA_ROOT, LUA_LDIR, and LUA_CDIR in luaconf.h (and also with etc/lua.pc).
--INSTALL_LMOD= $(INSTALL_TOP)/share/lua/$V
-+INSTALL_LMOD= `finddir B_COMMON_DATA_DIRECTORY`/lua/$V
- INSTALL_CMOD= $(INSTALL_TOP)/lib/lua/$V
- 
- # How to install. If your install program does not support "-p", then you
-@@ -38,12 +38,12 @@
- # == END OF USER SETTINGS. NO NEED TO CHANGE ANYTHING BELOW THIS LINE =========
- 
- # Convenience platforms targets.
--PLATS= aix ansi bsd freebsd generic linux macosx mingw posix solaris
-+PLATS= aix ansi bsd freebsd generic haiku linux macosx mingw posix solaris
- 
- # What to install.
- TO_BIN= lua luac
- TO_INC= lua.h luaconf.h lualib.h lauxlib.h ../etc/lua.hpp
--TO_LIB= liblua.a
-+TO_LIB= liblua.a liblua.so
- TO_MAN= lua.1 luac.1
- 
- # Lua version and release.
-diff -urN lua-5.1.4/src/Makefile lua-5.1.4-haiku/src/Makefile
---- lua-5.1.4/src/Makefile	2008-01-19 19:37:58.066584576 +0000
-+++ lua-5.1.4-haiku/src/Makefile	2011-05-03 22:08:17.191627264 +0000
-@@ -20,9 +20,10 @@
- 
- # == END OF USER SETTINGS. NO NEED TO CHANGE ANYTHING BELOW THIS LINE =========
- 
--PLATS= aix ansi bsd freebsd generic linux macosx mingw posix solaris
-+PLATS= aix ansi bsd freebsd generic haiku linux macosx mingw posix solaris
- 
- LUA_A=	liblua.a
-+LUA_SO=	liblua.so
- CORE_O=	lapi.o lcode.o ldebug.o ldo.o ldump.o lfunc.o lgc.o llex.o lmem.o \
- 	lobject.o lopcodes.o lparser.o lstate.o lstring.o ltable.o ltm.o  \
- 	lundump.o lvm.o lzio.o
-@@ -36,7 +37,7 @@
- LUAC_O=	luac.o print.o
- 
- ALL_O= $(CORE_O) $(LIB_O) $(LUA_O) $(LUAC_O)
--ALL_T= $(LUA_A) $(LUA_T) $(LUAC_T)
-+ALL_T= $(LUA_A) $(LUA_T) $(LUAC_T) $(LUA_SO)
- ALL_A= $(LUA_A)
- 
- default: $(PLAT)
-@@ -57,6 +58,9 @@
- $(LUAC_T): $(LUAC_O) $(LUA_A)
- 	$(CC) -o $@ $(MYLDFLAGS) $(LUAC_O) $(LUA_A) $(LIBS)
- 
-+$(LUA_SO): $(CORE_O) $(LIB_O)
-+	$(CC) -o $@ -shared -fPIC $(MYLDFLAGS) $? $(LIBS)
-+
- clean:
- 	$(RM) $(ALL_T) $(ALL_O)
- 
-@@ -95,6 +99,9 @@
- generic:
- 	$(MAKE) all MYCFLAGS=
- 
-+haiku:
-+	$(MAKE) all MYCFLAGS=-DLUA_USE_HAIKU LIBS=
-+
- linux:
- 	$(MAKE) all MYCFLAGS=-DLUA_USE_LINUX MYLIBS="-Wl,-E -ldl -lreadline -lhistory -lncurses"
- 
-diff -urN lua-5.1.4/src/lcode.c lua-5.1.4-haiku/src/lcode.c
---- lua-5.1.4/src/lcode.c	2007-12-28 15:32:23.000262144 +0000
-+++ lua-5.1.4-haiku/src/lcode.c	2011-05-03 22:06:13.312999936 +0000
-@@ -1,5 +1,5 @@
- /*
--** $Id: lcode.c,v 2.25.1.3 2007/12/28 15:32:23 roberto Exp $
-+** $Id: lcode.c,v 2.25.1.5 2011/01/31 14:53:16 roberto Exp $
- ** Code generator for Lua
- ** See Copyright Notice in lua.h
- */
-@@ -544,10 +544,6 @@
-       pc = NO_JUMP;  /* always true; do nothing */
-       break;
-     }
--    case VFALSE: {
--      pc = luaK_jump(fs);  /* always jump */
--      break;
--    }
-     case VJMP: {
-       invertjump(fs, e);
-       pc = e->u.s.info;
-@@ -572,10 +568,6 @@
-       pc = NO_JUMP;  /* always false; do nothing */
-       break;
-     }
--    case VTRUE: {
--      pc = luaK_jump(fs);  /* always jump */
--      break;
--    }
-     case VJMP: {
-       pc = e->u.s.info;
-       break;
-diff -urN lua-5.1.4/src/ldblib.c lua-5.1.4-haiku/src/ldblib.c
---- lua-5.1.4/src/ldblib.c	2008-01-21 13:11:21.000262144 +0000
-+++ lua-5.1.4-haiku/src/ldblib.c	2011-05-03 22:06:13.322699264 +0000
-@@ -1,5 +1,5 @@
- /*
--** $Id: ldblib.c,v 1.104.1.3 2008/01/21 13:11:21 roberto Exp $
-+** $Id: ldblib.c,v 1.104.1.4 2009/08/04 18:50:18 roberto Exp $
- ** Interface from Lua to its debug API
- ** See Copyright Notice in lua.h
- */
-@@ -45,6 +45,7 @@
- 
- 
- static int db_getfenv (lua_State *L) {
-+  luaL_checkany(L, 1);
-   lua_getfenv(L, 1);
-   return 1;
- }
-diff -urN lua-5.1.4/src/liolib.c lua-5.1.4-haiku/src/liolib.c
---- lua-5.1.4/src/liolib.c	2008-01-18 17:47:43.001572864 +0000
-+++ lua-5.1.4-haiku/src/liolib.c	2011-05-03 22:06:13.346292224 +0000
-@@ -1,5 +1,5 @@
- /*
--** $Id: liolib.c,v 2.73.1.3 2008/01/18 17:47:43 roberto Exp $
-+** $Id: liolib.c,v 2.73.1.4 2010/05/14 15:33:51 roberto Exp $
- ** Standard I/O (and system) library
- ** See Copyright Notice in lua.h
- */
-@@ -276,7 +276,10 @@
-     lua_pushnumber(L, d);
-     return 1;
-   }
--  else return 0;  /* read fails */
-+  else {
-+    lua_pushnil(L);  /* "result" to be removed */
-+    return 0;  /* read fails */
-+  }
- }
- 
- 
-diff -urN lua-5.1.4/src/llex.c lua-5.1.4-haiku/src/llex.c
---- lua-5.1.4/src/llex.c	2007-12-27 13:02:25.001835008 +0000
-+++ lua-5.1.4-haiku/src/llex.c	2011-05-03 22:06:13.368050176 +0000
-@@ -1,5 +1,5 @@
- /*
--** $Id: llex.c,v 2.20.1.1 2007/12/27 13:02:25 roberto Exp $
-+** $Id: llex.c,v 2.20.1.2 2009/11/23 14:58:22 roberto Exp $
- ** Lexical Analyzer
- ** See Copyright Notice in lua.h
- */
-@@ -118,8 +118,10 @@
-   lua_State *L = ls->L;
-   TString *ts = luaS_newlstr(L, str, l);
-   TValue *o = luaH_setstr(L, ls->fs->h, ts);  /* entry for `str' */
--  if (ttisnil(o))
-+  if (ttisnil(o)) {
-     setbvalue(o, 1);  /* make sure `str' will not be collected */
-+    luaC_checkGC(L);
-+  }
-   return ts;
- }
- 
-diff -urN lua-5.1.4/src/loadlib.c lua-5.1.4-haiku/src/loadlib.c
---- lua-5.1.4/src/loadlib.c	2008-08-06 13:29:28.002621440 +0000
-+++ lua-5.1.4-haiku/src/loadlib.c	2011-05-03 22:06:13.391380992 +0000
-@@ -1,5 +1,5 @@
- /*
--** $Id: loadlib.c,v 1.52.1.3 2008/08/06 13:29:28 roberto Exp $
-+** $Id: loadlib.c,v 1.52.1.4 2009/09/09 13:17:16 roberto Exp $
- ** Dynamic library loader for Lua
- ** See Copyright Notice in lua.h
- **
-@@ -639,7 +639,7 @@
-   lua_pushvalue(L, -1);
-   lua_replace(L, LUA_ENVIRONINDEX);
-   /* create `loaders' table */
--  lua_createtable(L, 0, sizeof(loaders)/sizeof(loaders[0]) - 1);
-+  lua_createtable(L, sizeof(loaders)/sizeof(loaders[0]) - 1, 0);
-   /* fill it with pre-defined loaders */
-   for (i=0; loaders[i] != NULL; i++) {
-     lua_pushcfunction(L, loaders[i]);
-diff -urN lua-5.1.4/src/lstrlib.c lua-5.1.4-haiku/src/lstrlib.c
---- lua-5.1.4/src/lstrlib.c	2008-07-11 17:27:21.004194304 +0000
-+++ lua-5.1.4-haiku/src/lstrlib.c	2011-05-03 22:06:13.411303936 +0000
-@@ -1,5 +1,5 @@
- /*
--** $Id: lstrlib.c,v 1.132.1.4 2008/07/11 17:27:21 roberto Exp $
-+** $Id: lstrlib.c,v 1.132.1.5 2010/05/14 15:34:19 roberto Exp $
- ** Standard library for string operations and pattern-matching
- ** See Copyright Notice in lua.h
- */
-@@ -754,6 +754,7 @@
- 
- 
- static int str_format (lua_State *L) {
-+  int top = lua_gettop(L);
-   int arg = 1;
-   size_t sfl;
-   const char *strfrmt = luaL_checklstring(L, arg, &sfl);
-@@ -768,7 +769,8 @@
-     else { /* format item */
-       char form[MAX_FORMAT];  /* to store the format (`%...') */
-       char buff[MAX_ITEM];  /* to store the formatted item */
--      arg++;
-+      if (++arg > top)
-+        luaL_argerror(L, arg, "no value");
-       strfrmt = scanformat(L, strfrmt, form);
-       switch (*strfrmt++) {
-         case 'c': {
-diff -urN lua-5.1.4/src/luaconf.h lua-5.1.4-haiku/src/luaconf.h
---- lua-5.1.4/src/luaconf.h	2008-02-11 16:25:08.004980736 +0000
-+++ lua-5.1.4-haiku/src/luaconf.h	2011-05-03 22:08:17.243793920 +0000
-@@ -33,6 +33,13 @@
- #define LUA_WIN
- #endif
- 
-+#if defined(LUA_USE_HAIKU)
-+#define LUA_USE_MKSTEMP
-+#define LUA_USE_ISATTY
-+#define LUA_USE_POPEN
-+#define LUA_USE_DLOPEN
-+#endif
-+
- #if defined(LUA_USE_LINUX)
- #define LUA_USE_POSIX
- #define LUA_USE_DLOPEN		/* needs an extra library: -ldl */
-@@ -94,7 +101,11 @@
- 	".\\?.dll;"  LUA_CDIR"?.dll;" LUA_CDIR"loadall.dll"
- 
- #else
--#define LUA_ROOT	"/usr/local/"
-+# if defined(LUA_USE_HAIKU)
-+#  define LUA_ROOT	"/boot/common/"
-+# else
-+#  define LUA_ROOT	"/usr/local/"
-+# endif
- #define LUA_LDIR	LUA_ROOT "share/lua/5.1/"
- #define LUA_CDIR	LUA_ROOT "lib/lua/5.1/"
- #define LUA_PATH_DEFAULT  \
-diff -urN lua-5.1.4/src/lvm.c lua-5.1.4-haiku/src/lvm.c
---- lua-5.1.4/src/lvm.c	2007-12-28 15:32:23.005242880 +0000
-+++ lua-5.1.4-haiku/src/lvm.c	2011-05-03 22:06:13.432537600 +0000
-@@ -1,5 +1,5 @@
- /*
--** $Id: lvm.c,v 2.63.1.3 2007/12/28 15:32:23 roberto Exp $
-+** $Id: lvm.c,v 2.63.1.4 2009/07/01 21:10:33 roberto Exp $
- ** Lua virtual machine
- ** See Copyright Notice in lua.h
- */
-@@ -133,6 +133,7 @@
- 
- void luaV_settable (lua_State *L, const TValue *t, TValue *key, StkId val) {
-   int loop;
-+  TValue temp;
-   for (loop = 0; loop < MAXTAGLOOP; loop++) {
-     const TValue *tm;
-     if (ttistable(t)) {  /* `t' is a table? */
-@@ -152,7 +153,9 @@
-       callTM(L, tm, t, key, val);
-       return;
-     }
--    t = tm;  /* else repeat with `tm' */ 
-+    /* else repeat with `tm' */
-+    setobj(L, &temp, tm);  /* avoid pointing inside table (may rehash) */
-+    t = &temp;
-   }
-   luaG_runerror(L, "loop in settable");
- }
diff --git a/dev-lang/lua/patches/lua-5.1.4.patch b/dev-lang/lua/patches/lua-5.1.4.patch
index 5a6957180..38b6ddd2a 100644
--- a/dev-lang/lua/patches/lua-5.1.4.patch
+++ b/dev-lang/lua/patches/lua-5.1.4.patch
@@ -1,7 +1,21 @@
-diff -up lua-5.1.4/Makefile.orig lua-5.1.4/Makefile
---- lua-5.1.4/Makefile.orig	2010-04-27 22:29:15.068419584 -0600
-+++ lua-5.1.4/Makefile	2010-04-27 22:29:20.697303040 -0600
-@@ -38,12 +38,12 @@ RANLIB= ranlib
+diff -urN lua-5.1.4/Makefile lua-5.1.4-haiku/Makefile
+--- lua-5.1.4/Makefile	2008-08-12 00:40:48.066322432 +0000
++++ lua-5.1.4-haiku/Makefile	2011-05-03 22:29:07.568328192 +0000
+@@ -13,11 +13,11 @@
+ INSTALL_BIN= $(INSTALL_TOP)/bin
+ INSTALL_INC= $(INSTALL_TOP)/include
+ INSTALL_LIB= $(INSTALL_TOP)/lib
+-INSTALL_MAN= $(INSTALL_TOP)/man/man1
++INSTALL_MAN= `finddir B_COMMON_DOCUMENTATION_DIRECTORY`/man/man1
+ #
+ # You probably want to make INSTALL_LMOD and INSTALL_CMOD consistent with
+ # LUA_ROOT, LUA_LDIR, and LUA_CDIR in luaconf.h (and also with etc/lua.pc).
+-INSTALL_LMOD= $(INSTALL_TOP)/share/lua/$V
++INSTALL_LMOD= `finddir B_COMMON_DATA_DIRECTORY`/lua/$V
+ INSTALL_CMOD= $(INSTALL_TOP)/lib/lua/$V
+ 
+ # How to install. If your install program does not support "-p", then you
+@@ -38,12 +38,12 @@
  # == END OF USER SETTINGS. NO NEED TO CHANGE ANYTHING BELOW THIS LINE =========
  
  # Convenience platforms targets.
@@ -16,10 +30,10 @@ diff -up lua-5.1.4/Makefile.orig lua-5.1.4/Makefile
  TO_MAN= lua.1 luac.1
  
  # Lua version and release.
-diff -up lua-5.1.4/src/Makefile.orig lua-5.1.4/src/Makefile
---- lua-5.1.4/src/Makefile.orig	2010-04-27 22:29:26.027787264 -0600
-+++ lua-5.1.4/src/Makefile	2010-04-27 22:29:38.680525824 -0600
-@@ -20,9 +20,10 @@ MYLIBS=
+diff -urN lua-5.1.4/src/Makefile lua-5.1.4-haiku/src/Makefile
+--- lua-5.1.4/src/Makefile	2008-01-19 19:37:58.066584576 +0000
++++ lua-5.1.4-haiku/src/Makefile	2011-05-03 22:08:17.191627264 +0000
+@@ -20,9 +20,10 @@
  
  # == END OF USER SETTINGS. NO NEED TO CHANGE ANYTHING BELOW THIS LINE =========
  
@@ -31,7 +45,7 @@ diff -up lua-5.1.4/src/Makefile.orig lua-5.1.4/src/Makefile
  CORE_O=	lapi.o lcode.o ldebug.o ldo.o ldump.o lfunc.o lgc.o llex.o lmem.o \
  	lobject.o lopcodes.o lparser.o lstate.o lstring.o ltable.o ltm.o  \
  	lundump.o lvm.o lzio.o
-@@ -36,7 +37,7 @@ LUAC_T=	luac
+@@ -36,7 +37,7 @@
  LUAC_O=	luac.o print.o
  
  ALL_O= $(CORE_O) $(LIB_O) $(LUA_O) $(LUAC_O)
@@ -40,7 +54,7 @@ diff -up lua-5.1.4/src/Makefile.orig lua-5.1.4/src/Makefile
  ALL_A= $(LUA_A)
  
  default: $(PLAT)
-@@ -57,6 +58,9 @@ $(LUA_T): $(LUA_O) $(LUA_A)
+@@ -57,6 +58,9 @@
  $(LUAC_T): $(LUAC_O) $(LUA_A)
  	$(CC) -o $@ $(MYLDFLAGS) $(LUAC_O) $(LUA_A) $(LIBS)
  
@@ -50,7 +64,7 @@ diff -up lua-5.1.4/src/Makefile.orig lua-5.1.4/src/Makefile
  clean:
  	$(RM) $(ALL_T) $(ALL_O)
  
-@@ -95,6 +99,9 @@ freebsd:
+@@ -95,6 +99,9 @@
  generic:
  	$(MAKE) all MYCFLAGS=
  
@@ -60,9 +74,150 @@ diff -up lua-5.1.4/src/Makefile.orig lua-5.1.4/src/Makefile
  linux:
  	$(MAKE) all MYCFLAGS=-DLUA_USE_LINUX MYLIBS="-Wl,-E -ldl -lreadline -lhistory -lncurses"
  
-diff -up lua-5.1.4/src/luaconf.h.orig lua-5.1.4/src/luaconf.h
---- lua-5.1.4/src/luaconf.h.orig	2010-04-27 22:29:48.387448832 -0600
-+++ lua-5.1.4/src/luaconf.h	2010-04-27 22:29:58.184025088 -0600
+diff -urN lua-5.1.4/src/lcode.c lua-5.1.4-haiku/src/lcode.c
+--- lua-5.1.4/src/lcode.c	2007-12-28 15:32:23.000262144 +0000
++++ lua-5.1.4-haiku/src/lcode.c	2011-05-03 22:06:13.312999936 +0000
+@@ -1,5 +1,5 @@
+ /*
+-** $Id: lcode.c,v 2.25.1.3 2007/12/28 15:32:23 roberto Exp $
++** $Id: lcode.c,v 2.25.1.5 2011/01/31 14:53:16 roberto Exp $
+ ** Code generator for Lua
+ ** See Copyright Notice in lua.h
+ */
+@@ -544,10 +544,6 @@
+       pc = NO_JUMP;  /* always true; do nothing */
+       break;
+     }
+-    case VFALSE: {
+-      pc = luaK_jump(fs);  /* always jump */
+-      break;
+-    }
+     case VJMP: {
+       invertjump(fs, e);
+       pc = e->u.s.info;
+@@ -572,10 +568,6 @@
+       pc = NO_JUMP;  /* always false; do nothing */
+       break;
+     }
+-    case VTRUE: {
+-      pc = luaK_jump(fs);  /* always jump */
+-      break;
+-    }
+     case VJMP: {
+       pc = e->u.s.info;
+       break;
+diff -urN lua-5.1.4/src/ldblib.c lua-5.1.4-haiku/src/ldblib.c
+--- lua-5.1.4/src/ldblib.c	2008-01-21 13:11:21.000262144 +0000
++++ lua-5.1.4-haiku/src/ldblib.c	2011-05-03 22:06:13.322699264 +0000
+@@ -1,5 +1,5 @@
+ /*
+-** $Id: ldblib.c,v 1.104.1.3 2008/01/21 13:11:21 roberto Exp $
++** $Id: ldblib.c,v 1.104.1.4 2009/08/04 18:50:18 roberto Exp $
+ ** Interface from Lua to its debug API
+ ** See Copyright Notice in lua.h
+ */
+@@ -45,6 +45,7 @@
+ 
+ 
+ static int db_getfenv (lua_State *L) {
++  luaL_checkany(L, 1);
+   lua_getfenv(L, 1);
+   return 1;
+ }
+diff -urN lua-5.1.4/src/liolib.c lua-5.1.4-haiku/src/liolib.c
+--- lua-5.1.4/src/liolib.c	2008-01-18 17:47:43.001572864 +0000
++++ lua-5.1.4-haiku/src/liolib.c	2011-05-03 22:06:13.346292224 +0000
+@@ -1,5 +1,5 @@
+ /*
+-** $Id: liolib.c,v 2.73.1.3 2008/01/18 17:47:43 roberto Exp $
++** $Id: liolib.c,v 2.73.1.4 2010/05/14 15:33:51 roberto Exp $
+ ** Standard I/O (and system) library
+ ** See Copyright Notice in lua.h
+ */
+@@ -276,7 +276,10 @@
+     lua_pushnumber(L, d);
+     return 1;
+   }
+-  else return 0;  /* read fails */
++  else {
++    lua_pushnil(L);  /* "result" to be removed */
++    return 0;  /* read fails */
++  }
+ }
+ 
+ 
+diff -urN lua-5.1.4/src/llex.c lua-5.1.4-haiku/src/llex.c
+--- lua-5.1.4/src/llex.c	2007-12-27 13:02:25.001835008 +0000
++++ lua-5.1.4-haiku/src/llex.c	2011-05-03 22:06:13.368050176 +0000
+@@ -1,5 +1,5 @@
+ /*
+-** $Id: llex.c,v 2.20.1.1 2007/12/27 13:02:25 roberto Exp $
++** $Id: llex.c,v 2.20.1.2 2009/11/23 14:58:22 roberto Exp $
+ ** Lexical Analyzer
+ ** See Copyright Notice in lua.h
+ */
+@@ -118,8 +118,10 @@
+   lua_State *L = ls->L;
+   TString *ts = luaS_newlstr(L, str, l);
+   TValue *o = luaH_setstr(L, ls->fs->h, ts);  /* entry for `str' */
+-  if (ttisnil(o))
++  if (ttisnil(o)) {
+     setbvalue(o, 1);  /* make sure `str' will not be collected */
++    luaC_checkGC(L);
++  }
+   return ts;
+ }
+ 
+diff -urN lua-5.1.4/src/loadlib.c lua-5.1.4-haiku/src/loadlib.c
+--- lua-5.1.4/src/loadlib.c	2008-08-06 13:29:28.002621440 +0000
++++ lua-5.1.4-haiku/src/loadlib.c	2011-05-03 22:06:13.391380992 +0000
+@@ -1,5 +1,5 @@
+ /*
+-** $Id: loadlib.c,v 1.52.1.3 2008/08/06 13:29:28 roberto Exp $
++** $Id: loadlib.c,v 1.52.1.4 2009/09/09 13:17:16 roberto Exp $
+ ** Dynamic library loader for Lua
+ ** See Copyright Notice in lua.h
+ **
+@@ -639,7 +639,7 @@
+   lua_pushvalue(L, -1);
+   lua_replace(L, LUA_ENVIRONINDEX);
+   /* create `loaders' table */
+-  lua_createtable(L, 0, sizeof(loaders)/sizeof(loaders[0]) - 1);
++  lua_createtable(L, sizeof(loaders)/sizeof(loaders[0]) - 1, 0);
+   /* fill it with pre-defined loaders */
+   for (i=0; loaders[i] != NULL; i++) {
+     lua_pushcfunction(L, loaders[i]);
+diff -urN lua-5.1.4/src/lstrlib.c lua-5.1.4-haiku/src/lstrlib.c
+--- lua-5.1.4/src/lstrlib.c	2008-07-11 17:27:21.004194304 +0000
++++ lua-5.1.4-haiku/src/lstrlib.c	2011-05-03 22:06:13.411303936 +0000
+@@ -1,5 +1,5 @@
+ /*
+-** $Id: lstrlib.c,v 1.132.1.4 2008/07/11 17:27:21 roberto Exp $
++** $Id: lstrlib.c,v 1.132.1.5 2010/05/14 15:34:19 roberto Exp $
+ ** Standard library for string operations and pattern-matching
+ ** See Copyright Notice in lua.h
+ */
+@@ -754,6 +754,7 @@
+ 
+ 
+ static int str_format (lua_State *L) {
++  int top = lua_gettop(L);
+   int arg = 1;
+   size_t sfl;
+   const char *strfrmt = luaL_checklstring(L, arg, &sfl);
+@@ -768,7 +769,8 @@
+     else { /* format item */
+       char form[MAX_FORMAT];  /* to store the format (`%...') */
+       char buff[MAX_ITEM];  /* to store the formatted item */
+-      arg++;
++      if (++arg > top)
++        luaL_argerror(L, arg, "no value");
+       strfrmt = scanformat(L, strfrmt, form);
+       switch (*strfrmt++) {
+         case 'c': {
+diff -urN lua-5.1.4/src/luaconf.h lua-5.1.4-haiku/src/luaconf.h
+--- lua-5.1.4/src/luaconf.h	2008-02-11 16:25:08.004980736 +0000
++++ lua-5.1.4-haiku/src/luaconf.h	2011-05-03 22:08:17.243793920 +0000
 @@ -33,6 +33,13 @@
  #define LUA_WIN
  #endif
@@ -90,3 +245,32 @@ diff -up lua-5.1.4/src/luaconf.h.orig lua-5.1.4/src/luaconf.h
  #define LUA_LDIR	LUA_ROOT "share/lua/5.1/"
  #define LUA_CDIR	LUA_ROOT "lib/lua/5.1/"
  #define LUA_PATH_DEFAULT  \
+diff -urN lua-5.1.4/src/lvm.c lua-5.1.4-haiku/src/lvm.c
+--- lua-5.1.4/src/lvm.c	2007-12-28 15:32:23.005242880 +0000
++++ lua-5.1.4-haiku/src/lvm.c	2011-05-03 22:06:13.432537600 +0000
+@@ -1,5 +1,5 @@
+ /*
+-** $Id: lvm.c,v 2.63.1.3 2007/12/28 15:32:23 roberto Exp $
++** $Id: lvm.c,v 2.63.1.4 2009/07/01 21:10:33 roberto Exp $
+ ** Lua virtual machine
+ ** See Copyright Notice in lua.h
+ */
+@@ -133,6 +133,7 @@
+ 
+ void luaV_settable (lua_State *L, const TValue *t, TValue *key, StkId val) {
+   int loop;
++  TValue temp;
+   for (loop = 0; loop < MAXTAGLOOP; loop++) {
+     const TValue *tm;
+     if (ttistable(t)) {  /* `t' is a table? */
+@@ -152,7 +153,9 @@
+       callTM(L, tm, t, key, val);
+       return;
+     }
+-    t = tm;  /* else repeat with `tm' */ 
++    /* else repeat with `tm' */
++    setobj(L, &temp, tm);  /* avoid pointing inside table (may rehash) */
++    t = &temp;
+   }
+   luaG_runerror(L, "loop in settable");
+ }
diff --git a/dev-lang/nasm/patches/nasm-2.03.01-haiku.diff b/dev-lang/nasm/patches/nasm-2.03.01.patch
similarity index 100%
rename from dev-lang/nasm/patches/nasm-2.03.01-haiku.diff
rename to dev-lang/nasm/patches/nasm-2.03.01.patch
diff --git a/dev-lang/swi_prolog/patches/swi-prolog-6.0.2.patch b/dev-lang/swi_prolog/patches/swi_prolog-6.0.2.patch
similarity index 100%
rename from dev-lang/swi_prolog/patches/swi-prolog-6.0.2.patch
rename to dev-lang/swi_prolog/patches/swi_prolog-6.0.2.patch
diff --git a/dev-lang/swi_prolog/patches/swi-prolog-6.2.0.patch b/dev-lang/swi_prolog/patches/swi_prolog-6.2.0.patch
similarity index 100%
rename from dev-lang/swi_prolog/patches/swi-prolog-6.2.0.patch
rename to dev-lang/swi_prolog/patches/swi_prolog-6.2.0.patch
diff --git a/dev-lang/swi_prolog/swi_prolog-6.0.2 b/dev-lang/swi_prolog/swi_prolog-6.0.2.recipe
similarity index 100%
rename from dev-lang/swi_prolog/swi_prolog-6.0.2
rename to dev-lang/swi_prolog/swi_prolog-6.0.2.recipe
diff --git a/dev-lang/swi_prolog/swi_prolog-6.2.0 b/dev-lang/swi_prolog/swi_prolog-6.2.0.recipe
similarity index 100%
rename from dev-lang/swi_prolog/swi_prolog-6.2.0
rename to dev-lang/swi_prolog/swi_prolog-6.2.0.recipe
diff --git a/dev-libs/boehm_gc/boehm_gc-7.2_alpha6 b/dev-libs/boehm_gc/boehm_gc-7.2_alpha6.recipe
similarity index 100%
rename from dev-libs/boehm_gc/boehm_gc-7.2_alpha6
rename to dev-libs/boehm_gc/boehm_gc-7.2_alpha6.recipe
diff --git a/dev-libs/boehm_gc/boehm_gc-7.2d b/dev-libs/boehm_gc/boehm_gc-7.2d.recipe
similarity index 100%
rename from dev-libs/boehm_gc/boehm_gc-7.2d
rename to dev-libs/boehm_gc/boehm_gc-7.2d.recipe
diff --git a/dev-libs/boehm_gc/patches/boehm-gc-7.2_alpha6.patch b/dev-libs/boehm_gc/patches/boehm_gc-7.2_alpha6.patch
similarity index 100%
rename from dev-libs/boehm_gc/patches/boehm-gc-7.2_alpha6.patch
rename to dev-libs/boehm_gc/patches/boehm_gc-7.2_alpha6.patch
diff --git a/dev-libs/boehm_gc/patches/boehm-gc-7.2d.patch b/dev-libs/boehm_gc/patches/boehm_gc-7.2d.patch
similarity index 100%
rename from dev-libs/boehm_gc/patches/boehm-gc-7.2d.patch
rename to dev-libs/boehm_gc/patches/boehm_gc-7.2d.patch
diff --git a/dev-libs/json_c/json_c-0.9 b/dev-libs/json_c/json_c-0.9.recipe
similarity index 100%
rename from dev-libs/json_c/json_c-0.9
rename to dev-libs/json_c/json_c-0.9.recipe
diff --git a/dev-libs/libgpg_error/libgpg_error-1.10 b/dev-libs/libgpg_error/libgpg_error-1.10.recipe
similarity index 100%
rename from dev-libs/libgpg_error/libgpg_error-1.10
rename to dev-libs/libgpg_error/libgpg_error-1.10.recipe
diff --git a/dev-libs/libgpg_error/libgpg_error-1.7 b/dev-libs/libgpg_error/libgpg_error-1.7.recipe
similarity index 100%
rename from dev-libs/libgpg_error/libgpg_error-1.7
rename to dev-libs/libgpg_error/libgpg_error-1.7.recipe
diff --git a/dev-libs/libgpg_error/patches/libgpg-error-1.10.patch b/dev-libs/libgpg_error/patches/libgpg_error-1.10.patch
similarity index 100%
rename from dev-libs/libgpg_error/patches/libgpg-error-1.10.patch
rename to dev-libs/libgpg_error/patches/libgpg_error-1.10.patch
diff --git a/dev-libs/libgpg_error/patches/libgpg-error-1.7.patch b/dev-libs/libgpg_error/patches/libgpg_error-1.7.patch
similarity index 100%
rename from dev-libs/libgpg_error/patches/libgpg-error-1.7.patch
rename to dev-libs/libgpg_error/patches/libgpg_error-1.7.patch
diff --git a/dev-libs/libpthread_stubs/libpthread_stubs-0.3 b/dev-libs/libpthread_stubs/libpthread_stubs-0.3.2.recipe
similarity index 100%
rename from dev-libs/libpthread_stubs/libpthread_stubs-0.3
rename to dev-libs/libpthread_stubs/libpthread_stubs-0.3.2.recipe
diff --git a/dev-libs/libpthread_stubs/libpthread_stubs-0.3.2 b/dev-libs/libpthread_stubs/libpthread_stubs-0.3.recipe
similarity index 100%
rename from dev-libs/libpthread_stubs/libpthread_stubs-0.3.2
rename to dev-libs/libpthread_stubs/libpthread_stubs-0.3.recipe
diff --git a/dev-libs/libwapcaplet/libwapcaplet-0.1.1_HEAD b/dev-libs/libwapcaplet/libwapcaplet-0.1.1_HEAD.recipe
similarity index 100%
rename from dev-libs/libwapcaplet/libwapcaplet-0.1.1_HEAD
rename to dev-libs/libwapcaplet/libwapcaplet-0.1.1_HEAD.recipe
diff --git a/dev-libs/libxdg_basedir/libxdg_basedir-1.1.1 b/dev-libs/libxdg_basedir/libxdg_basedir-1.1.1.recipe
similarity index 100%
rename from dev-libs/libxdg_basedir/libxdg_basedir-1.1.1
rename to dev-libs/libxdg_basedir/libxdg_basedir-1.1.1.recipe
diff --git a/dev-libs/libxdg_basedir/patches/libxdg-basedir-1.1.1.patch b/dev-libs/libxdg_basedir/patches/libxdg_basedir-1.1.1.patch
similarity index 100%
rename from dev-libs/libxdg_basedir/patches/libxdg-basedir-1.1.1.patch
rename to dev-libs/libxdg_basedir/patches/libxdg_basedir-1.1.1.patch
diff --git a/dev-libs/mpfr/mpfr-3.0.0_7047 b/dev-libs/mpfr/mpfr-3.0.0_7047
deleted file mode 100644
index c72947f57..000000000
--- a/dev-libs/mpfr/mpfr-3.0.0_7047
+++ /dev/null
@@ -1,27 +0,0 @@
-DESCRIPTION="library for multiple-precision floating-point computations with exact rounding" 
-HOMEPAGE="www.mpfr.org" 
-SRC_URI="svn://scm.gforge.inria.fr/svn/mpfr/branches/3.0#7047"
-REVISION="1"
-STATUS_HAIKU="broken"
-DEPEND="dev-libs/gmp = ?.?.?"
-#CHECKSUM_MD5=""
-BUILD()
-{
-	cd mpfr-3.0.0-7047
-	libtoolize --force --copy --install
-	aclocal -I m4
-	automake --add-missing
-	autoconf
-	./configure --prefix=`finddir B_COMMON_DIRECTORY`
-	make
-}
-
-INSTALL()
-{
-	cd mpfr-3.0.0-7047
-	make install
-	make check
-}
-
-LICENSE="GNU LGPL v3"
-#COPYRIGHT=""
diff --git a/dev-libs/xerces_c/xerces_c-3.1.1 b/dev-libs/xerces_c/xerces_c-3.1.1.recipe
similarity index 100%
rename from dev-libs/xerces_c/xerces_c-3.1.1
rename to dev-libs/xerces_c/xerces_c-3.1.1.recipe
diff --git a/dev-perl/XML_Parser/XML_Parser-2.36 b/dev-perl/XML_Parser/XML_Parser-2.36.recipe
similarity index 100%
rename from dev-perl/XML_Parser/XML_Parser-2.36
rename to dev-perl/XML_Parser/XML_Parser-2.36.recipe
diff --git a/dev-python/cnf/cnf-1.0_git b/dev-python/cnf/cnf-1.0_git.recipe
similarity index 100%
rename from dev-python/cnf/cnf-1.0_git
rename to dev-python/cnf/cnf-1.0_git.recipe
diff --git a/dev-python/pychart/pychart-1.39_bzr b/dev-python/pychart/pychart-1.39_bzr.recipe
similarity index 100%
rename from dev-python/pychart/pychart-1.39_bzr
rename to dev-python/pychart/pychart-1.39_bzr.recipe
diff --git a/dev-qt/qtcore/qtcore-4.8.x_git b/dev-qt/qtcore/qtcore-4.8.x_git
deleted file mode 100644
index 5eddfd99a..000000000
--- a/dev-qt/qtcore/qtcore-4.8.x_git
+++ /dev/null
@@ -1,26 +0,0 @@
-DESCRIPTION="The Qt toolkit is a comprehensive C++ application development framework" 
-HOMEPAGE="http://qt-haiku.ru" 
-SRC_URI="git://gitorious.org/+qt-haiku/qt/qt-haiku-port.git"
-REVISION="1"
-STATUS_HAIKU="stable"
-DEPEND=""
-#CHECKSUM_MD5=""
-MESSAGE="This port only builds with gcc4. Use 'setgcc gcc4' before building."
-BUILD()
-{
-	cd qtcore-4.8.x-git
-	configure --prefix-install=no -no-pch -no-opengl -no-largefile \
-		-fast -nomake examples -nomake demos -release -opensource \
-		-confirm-license -no-iconv -phonon -no-phonon-backend \
-		-multimedia -no-audio-backend
-	make
-}
-
-INSTALL()
-{
-	cd qtcore-4.8.x-git
-	make install INSTALL_ROOT=${DESTDIR}
-}
-
-LICENSE="GNU LGPL v2.1"
-COPYRIGHT="2010 Nokia Corporation and/or its subsidiary(-ies)."
diff --git a/dev-util/abi_compliance_checker/abi_compliance_checker-1.98.3 b/dev-util/abi_compliance_checker/abi_compliance_checker-1.98.3.recipe
similarity index 100%
rename from dev-util/abi_compliance_checker/abi_compliance_checker-1.98.3
rename to dev-util/abi_compliance_checker/abi_compliance_checker-1.98.3.recipe
diff --git a/dev-util/automoc/automoc-4_git b/dev-util/automoc/automoc-4_git.recipe
similarity index 100%
rename from dev-util/automoc/automoc-4_git
rename to dev-util/automoc/automoc-4_git.recipe
diff --git a/dev-util/cmake/cmake-2.6.4.recipe b/dev-util/cmake/cmake-2.6.4.recipe
deleted file mode 100644
index e56b75190..000000000
--- a/dev-util/cmake/cmake-2.6.4.recipe
+++ /dev/null
@@ -1,21 +0,0 @@
-DESCRIPTION="cmake - Cross platform Make" 
-HOMEPAGE="http://www.cmake.org" 
-SRC_URI="http://www.cmake.org/files/v2.6/cmake-2.6.4.tar.gz"
-CHECKSUM_MD5="50f387d0436696c4a68b5512a72c9cde"
-REVISION="1"
-STATUS_HAIKU="stable"
-DEPEND=""
-BUILD()
-{
-	cd cmake-2.6.4
-	./configure --prefix=`finddir B_COMMON_DIRECTORY`
-	make
-}
-
-INSTALL()
-{
-	cd cmake-2.6.4
-	make install
-}
-LICENSE="CMake"
-COPYRIGHT="2002-2010 Kitware, Inc., Insight Consortium, All rights reserved."
diff --git a/dev-util/cmake/cmake-2.8.0.recipe b/dev-util/cmake/cmake-2.8.0.recipe
deleted file mode 100644
index 4c7fdcbbf..000000000
--- a/dev-util/cmake/cmake-2.8.0.recipe
+++ /dev/null
@@ -1,21 +0,0 @@
-DESCRIPTION="cmake - Cross platform Make" 
-HOMEPAGE="http://www.cmake.org" 
-SRC_URI="http://www.cmake.org/files/v2.8/cmake-2.8.0.tar.gz"
-CHECKSUM_MD5="3b3679b8a6afaedc38a8c15dd7ff4fcf"
-REVISION="1"
-STATUS_HAIKU="stable"
-DEPEND=""
-BUILD()
-{
-	cd cmake-2.8.0
-	./configure --prefix=`finddir B_COMMON_DIRECTORY`
-	make
-}
-
-INSTALL()
-{
-	cd cmake-2.8.0
-	make install
-}
-LICENSE="CMake"
-COPYRIGHT="2002-2010 Kitware, Inc., Insight Consortium, All rights reserved."
diff --git a/dev-util/cmake/cmake-2.8.1.recipe b/dev-util/cmake/cmake-2.8.1.recipe
deleted file mode 100644
index 80d31865e..000000000
--- a/dev-util/cmake/cmake-2.8.1.recipe
+++ /dev/null
@@ -1,21 +0,0 @@
-DESCRIPTION="cmake - Cross platform Make" 
-HOMEPAGE="http://www.cmake.org" 
-SRC_URI="http://www.cmake.org/files/v2.8/cmake-2.8.1.tar.gz"
-CHECKSUM_MD5="feadc2e5ebbfed0efc90178583503725"
-REVISION="1"
-STATUS_HAIKU="stable"
-DEPEND=""
-BUILD()
-{
-	cd cmake-2.8.1
-	./configure --prefix=`finddir B_COMMON_DIRECTORY`
-	make
-}
-
-INSTALL()
-{
-	cd cmake-2.8.1
-	make install
-}
-LICENSE="CMake"
-COPYRIGHT="2002-2010 Kitware, Inc., Insight Consortium, All rights reserved."
diff --git a/dev-util/cmake/cmake-2.8.2.recipe b/dev-util/cmake/cmake-2.8.2.recipe
deleted file mode 100644
index 34695a63f..000000000
--- a/dev-util/cmake/cmake-2.8.2.recipe
+++ /dev/null
@@ -1,21 +0,0 @@
-DESCRIPTION="cmake - Cross platform Make" 
-HOMEPAGE="http://www.cmake.org" 
-SRC_URI="http://www.cmake.org/files/v2.8/cmake-2.8.2.tar.gz"
-CHECKSUM_MD5="8c967d5264657a798f22ee23976ff0d9"
-REVISION="1"
-STATUS_HAIKU="stable"
-DEPEND=""
-BUILD()
-{
-	cd cmake-2.8.2
-	./configure --prefix=`finddir B_COMMON_DIRECTORY`
-	make
-}
-
-INSTALL()
-{
-	cd cmake-2.8.2
-	make install
-}
-LICENSE="CMake"
-COPYRIGHT="2002-2010 Kitware, Inc., Insight Consortium, All rights reserved."
diff --git a/dev-util/cmake/cmake-2.8.3.recipe b/dev-util/cmake/cmake-2.8.3.recipe
deleted file mode 100644
index 2b2f007af..000000000
--- a/dev-util/cmake/cmake-2.8.3.recipe
+++ /dev/null
@@ -1,21 +0,0 @@
-DESCRIPTION="cmake - Cross platform Make" 
-HOMEPAGE="http://www.cmake.org" 
-SRC_URI="http://www.cmake.org/files/v2.8/cmake-2.8.3.tar.gz"
-CHECKSUM_MD5="a76a44b93acf5e3badda9de111385921"
-REVISION="1"
-STATUS_HAIKU="stable"
-DEPEND=""
-BUILD()
-{
-	cd cmake-2.8.3
-	./configure --prefix=`finddir B_COMMON_DIRECTORY`
-	make
-}
-
-INSTALL()
-{
-	cd cmake-2.8.3
-	make install
-}
-LICENSE="CMake"
-COPYRIGHT="2002-2010 Kitware, Inc., Insight Consortium, All rights reserved."
diff --git a/dev-util/cmake/cmake-2.8.4.recipe b/dev-util/cmake/cmake-2.8.4.recipe
deleted file mode 100644
index 628922d88..000000000
--- a/dev-util/cmake/cmake-2.8.4.recipe
+++ /dev/null
@@ -1,30 +0,0 @@
-DESCRIPTION="cmake - Cross platform Make" 
-HOMEPAGE="http://www.cmake.org" 
-SRC_URI="http://www.cmake.org/files/v2.8/cmake-2.8.4.tar.gz"
-CHECKSUM_MD5="209b7d1d04b2e00986538d74ba764fcf"
-REVISION="1"
-STATUS_HAIKU="stable"
-DEPEND=""
-BUILD()
-{
-	cd cmake-2.8.4
-	# cmake appends the prefix to mandir and datadir 
-	# so using ../../ to back that part out but for some reason
-	# the doc was also picking up /boot, so had to back it out 3 times
-	# this seems to work but might still need some further adjusting
-#	sed -i 's/${CMAKE_DATA_DIR}\/include cmCPluginAPI.h/${CMAKE_PREFIX_DIR}\/include cmCPluginAPI.h/g' Source/CMakeLists.txt
-	./configure --prefix=`finddir B_COMMON_DIRECTORY` \
-		--datadir=/data/cmake \
-		--docdir=/documentation/doc/CMake \
-		--mandir=/documentation/man
-	make
-}
-
-INSTALL()
-{
-	cd cmake-2.8.4
-	make install
-}
-
-LICENSE="CMake"
-COPYRIGHT="2002-2011 Kitware, Inc., Insight Consortium, All rights reserved."
diff --git a/dev-util/cmake/cmake-2.8_git b/dev-util/cmake/cmake-2.8_git
deleted file mode 100644
index 6916936fb..000000000
--- a/dev-util/cmake/cmake-2.8_git
+++ /dev/null
@@ -1,36 +0,0 @@
-DESCRIPTION="cmake - Cross platform Make" 
-HOMEPAGE="http://www.cmake.org" 
-SRC_URI="git+http://cmake.org/cmake.git"
-#CHECKSUM_MD5=""
-REVISION="1"
-STATUS_HAIKU="broken"
-DEPEND=""
-BUILD()
-{
-	cd cmake-2.8-git
-	# cmake appends the prefix to mandir and datadir 
-	# so using ../../ to back that part out but for some reason
-	# the doc was also picking up /boot, so had to back it out 3 times
-	# this seems to work but might still need some further adjusting
-#	sed -i 's/${CMAKE_DATA_DIR}\/include cmCPluginAPI.h/${CMAKE_PREFIX_DIR}\/include cmCPluginAPI.h/g' Source/CMakeLists.txt
-	./configure --prefix=`finddir B_COMMON_DIRECTORY` \
-		--datadir=/data/cmake \
-		--docdir=/documentation/doc/CMake \
-		--mandir=/documentation/man
-	make
-}
-
-INSTALL()
-{
-	cd cmake-2.8-git
-	make install
-}
-
-TEST()
-{
-	cd cmake-2.8-git
-	make test
-}
-
-LICENSE="CMake"
-COPYRIGHT="2002-2012 Kitware, Inc., Insight Consortium, All rights reserved."
diff --git a/dev-util/cmake/patches/cmake-2.6.0-haiku.diff b/dev-util/cmake/patches/cmake-2.6.0-haiku.diff
deleted file mode 100644
index c4cd61e23..000000000
--- a/dev-util/cmake/patches/cmake-2.6.0-haiku.diff
+++ /dev/null
@@ -1,300 +0,0 @@
-diff -ur cmake-2.6.0/Modules/CMakeFortranCompilerId.F90.in cmake-2.6.0-haiku/Modules/CMakeFortranCompilerId.F90.in
---- cmake-2.6.0/Modules/CMakeFortranCompilerId.F90.in	2008-05-05 18:26:04.000000000 +0000
-+++ cmake-2.6.0-haiku/Modules/CMakeFortranCompilerId.F90.in	2008-06-19 11:16:50.000000000 +0000
-@@ -48,6 +48,10 @@
-    PRINT *, 'INFO:platform[IRIX]'
- #elif defined(__hpux) || defined(__hpux__)
-    PRINT *, 'INFO:platform[HP-UX]'
-+#elif defined(__HAIKU) || defined(__HAIKU__) || defined(_HAIKU)
-+   PRINT *, 'INFO:platform[Haiku]'
-+! Haiku also defines __BEOS__ so we must 
-+! put it prior to the check for __BEOS__
- #elif defined(__BeOS) || defined(__BEOS__) || defined(_BEOS)
-    PRINT *, 'INFO:platform[BeOS]'
- #elif defined(__QNX__) || defined(__QNXNTO__)
-diff -ur cmake-2.6.0/Modules/CMakePlatformId.h.in cmake-2.6.0-haiku/Modules/CMakePlatformId.h.in
---- cmake-2.6.0/Modules/CMakePlatformId.h.in	2008-05-05 18:26:04.000000000 +0000
-+++ cmake-2.6.0-haiku/Modules/CMakePlatformId.h.in	2008-06-19 11:16:50.000000000 +0000
-@@ -35,6 +35,11 @@
- #elif defined(__hpux) || defined(__hpux__)
- # define PLATFORM_ID "HP-UX"
- 
-+#elif defined(__HAIKU) || defined(__HAIKU__) || defined(_HAIKU)
-+# define PLATFORM_ID "Haiku"
-+! Haiku also defines __BEOS__ so we must 
-+! put it prior to the check for __BEOS__
-+
- #elif defined(__BeOS) || defined(__BEOS__) || defined(_BEOS)
- # define PLATFORM_ID "BeOS"
- 
-diff -ur cmake-2.6.0/Modules/CheckForPthreads.c cmake-2.6.0-haiku/Modules/CheckForPthreads.c
---- cmake-2.6.0/Modules/CheckForPthreads.c	2008-05-05 18:26:04.000000000 +0000
-+++ cmake-2.6.0-haiku/Modules/CheckForPthreads.c	2008-06-19 11:16:50.000000000 +0000
-@@ -16,7 +16,7 @@
-   pthread_create(&tid[0], 0, runner, (void*)1);
-   pthread_create(&tid[1], 0, runner, (void*)2);
-   
--#if defined(__BEOS__) && !defined(__ZETA__)  // (no usleep on BeOS 5.)
-+#if defined(__BEOS__) && !defined(__ZETA__)  && !defined(__HAIKU__) // (no usleep on BeOS 5.)
-   usleep(1); // for strange behavior on single-processor sun
- #endif
- 
-Only in cmake-2.6.0-haiku/Modules/Platform: Haiku.cmake
-diff -ur cmake-2.6.0/Source/CPack/cmCPackGeneratorFactory.cxx cmake-2.6.0-haiku/Source/CPack/cmCPackGeneratorFactory.cxx
---- cmake-2.6.0/Source/CPack/cmCPackGeneratorFactory.cxx	2008-05-05 18:26:05.000000000 +0000
-+++ cmake-2.6.0-haiku/Source/CPack/cmCPackGeneratorFactory.cxx	2008-06-19 11:16:50.000000000 +0000
-@@ -35,7 +35,7 @@
- #endif
- 
- #if !defined(_WIN32) && !defined(__APPLE__) \
-- && !defined(__QNXNTO__) && !defined(__BEOS__)
-+ && !defined(__QNXNTO__) && !defined(__BEOS__) && !defined(__HAIKU__)
- #  include "cmCPackDebGenerator.h"
- #  include "cmCPackRPMGenerator.h"
- #endif
-@@ -72,7 +72,8 @@
-     cmCPackOSXX11Generator::CreateGenerator);
- #endif
- #if !defined(_WIN32) && !defined(__APPLE__) \
--  && !defined(__QNXNTO__) && !defined(__BEOS__)
-+  && !defined(__QNXNTO__) && !defined(__BEOS__)\
-+  && !defined(__HAIKU__)
-   this->RegisterGenerator("DEB", "Debian packages",
-     cmCPackDebGenerator::CreateGenerator);
-   this->RegisterGenerator("RPM", "RPM packages",
-diff -ur cmake-2.6.0/Source/cmCTest.cxx cmake-2.6.0-haiku/Source/cmCTest.cxx
---- cmake-2.6.0/Source/cmCTest.cxx	2008-05-05 18:26:04.000000000 +0000
-+++ cmake-2.6.0-haiku/Source/cmCTest.cxx	2008-06-19 11:16:50.000000000 +0000
-@@ -49,10 +49,15 @@
- 
- #include <memory> // auto_ptr
- 
--#if defined(__BEOS__)
-+#if defined(__BEOS__) && !defined(__HAIKU__)
- #include <be/kernel/OS.h>   /* disable_debugger() API. */
- #endif
- 
-+#if defined(__HAIKU__)
-+#include <os/kernel/OS.h>   /* disable_debugger() API. */
-+#endif
-+
-+
- #define DEBUGOUT std::cout << __LINE__ << " "; std::cout
- #define DEBUGERR std::cerr << __LINE__ << " "; std::cerr
- 
-diff -ur cmake-2.6.0/Source/kwsys/DynamicLoader.cxx cmake-2.6.0-haiku/Source/kwsys/DynamicLoader.cxx
---- cmake-2.6.0/Source/kwsys/DynamicLoader.cxx	2008-05-05 18:26:05.000000000 +0000
-+++ cmake-2.6.0-haiku/Source/kwsys/DynamicLoader.cxx	2008-06-20 14:08:23.000000000 +0000
-@@ -331,7 +331,7 @@
- 
- // ---------------------------------------------------------------
- // 4. Implementation for BeOS
--#ifdef __BEOS__
-+#if defined __BEOS__ && !defined(__HAIKU__)
- #include <string.h> // for strerror()
- #include <be/kernel/image.h>
- #include <be/support/Errors.h>
-diff -ur cmake-2.6.0/Source/kwsys/ProcessUNIX.c cmake-2.6.0-haiku/Source/kwsys/ProcessUNIX.c
---- cmake-2.6.0/Source/kwsys/ProcessUNIX.c	2008-05-05 18:26:05.000000000 +0000
-+++ cmake-2.6.0-haiku/Source/kwsys/ProcessUNIX.c	2008-06-20 14:06:56.000000000 +0000
-@@ -75,7 +75,7 @@
- typedef int kwsysProcess_ssize_t;
- #endif
- 
--#if defined(__BEOS__) && !defined(__ZETA__)
-+#if defined(__BEOS__) && !defined(__ZETA__) && !defined(__HAIKU__)
- /* BeOS 5 doesn't have usleep(), but it has snooze(), which is identical. */
- # include <be/kernel/OS.h>
- static inline void kwsysProcess_usleep(unsigned int msec)
-diff -ur cmake-2.6.0/Source/kwsys/SystemTools.cxx cmake-2.6.0-haiku/Source/kwsys/SystemTools.cxx
---- cmake-2.6.0/Source/kwsys/SystemTools.cxx	2008-05-05 18:26:05.000000000 +0000
-+++ cmake-2.6.0-haiku/Source/kwsys/SystemTools.cxx	2008-06-19 15:49:33.000000000 +0000
-@@ -131,7 +131,12 @@
- #define _chdir chdir
- #endif
- 
--#if defined(__BEOS__) && !defined(__ZETA__)
-+#ifdef (__HAIKU__)
-+#include <os/kernel.OS.h>
-+#include <os/storage/Path.h>
-+#endif
-+
-+#if defined(__BEOS__) && !defined(__ZETA__) && !defined(__HAIKU__)
- #include <be/kernel/OS.h>
- #include <be/storage/Path.h>
- 
-diff -ur cmake-2.6.0/Source/kwsys/testProcess.c cmake-2.6.0-haiku/Source/kwsys/testProcess.c
---- cmake-2.6.0/Source/kwsys/testProcess.c	2008-05-05 18:26:05.000000000 +0000
-+++ cmake-2.6.0-haiku/Source/kwsys/testProcess.c	2008-06-19 11:16:51.000000000 +0000
-@@ -34,7 +34,7 @@
- # pragma warn -8060 /* possibly incorrect assignment */
- #endif
- 
--#if defined(__BEOS__) && !defined(__ZETA__)
-+#if defined(__BEOS__) && !defined(__ZETA__) && !defined(__HAIKU__)
- /* BeOS 5 doesn't have usleep(), but it has snooze(), which is identical. */
- # include <be/kernel/OS.h>
- static inline void testProcess_usleep(unsigned int msec)
-diff -ur cmake-2.6.0/Tests/Complex/Library/CMakeLists.txt cmake-2.6.0-haiku/Tests/Complex/Library/CMakeLists.txt
---- cmake-2.6.0/Tests/Complex/Library/CMakeLists.txt	2008-05-05 18:26:05.000000000 +0000
-+++ cmake-2.6.0-haiku/Tests/Complex/Library/CMakeLists.txt	2008-06-19 11:16:51.000000000 +0000
-@@ -53,7 +53,9 @@
-   )
- SET_TARGET_PROPERTIES(CMakeTestCLibraryShared PROPERTIES FOO BAR)
- IF(NOT BEOS)  # No libm on BeOS.
--  SET_TARGET_PROPERTIES(CMakeTestCLibraryShared PROPERTIES LINK_FLAGS "-lm")
-+  IF(NOT HAIKU) # libm in included in libroot on Haiku
-+    SET_TARGET_PROPERTIES(CMakeTestCLibraryShared PROPERTIES LINK_FLAGS "-lm")
-+  ENDIF(NOT HAIKU)
- ENDIF(NOT BEOS)
- GET_TARGET_PROPERTY(FOO_BAR_VAR CMakeTestCLibraryShared FOO)
- IF(${FOO_BAR_VAR} MATCHES "BAR")
-diff -ur cmake-2.6.0/Utilities/cmcurl/CMake/CurlTests.c cmake-2.6.0-haiku/Utilities/cmcurl/CMake/CurlTests.c
---- cmake-2.6.0/Utilities/cmcurl/CMake/CurlTests.c	2008-05-05 18:26:06.000000000 +0000
-+++ cmake-2.6.0-haiku/Utilities/cmcurl/CMake/CurlTests.c	2008-06-19 11:16:51.000000000 +0000
-@@ -38,6 +38,12 @@
- # define PLATFORM_AIX_V3
- #endif
- 
-+/* Haiku defines both __HAIKU__ and __BEOS__ (for now) */
-+/* many BeOS workarounds are no longer needed in Haiku */
-+#if defined(__HAIKU__) && defined(__BEOS__)
-+undef (__BEOS__)
-+#endif
-+
- #if defined(PLATFORM_SUNOS4) || defined(PLATFORM_AIX_V3) || defined(__BEOS__)
- #error "O_NONBLOCK does not work on this platform"
- #endif
-diff -ur cmake-2.6.0/Utilities/cmcurl/curl/curl.h cmake-2.6.0-haiku/Utilities/cmcurl/curl/curl.h
---- cmake-2.6.0/Utilities/cmcurl/curl/curl.h	2008-05-05 18:26:06.000000000 +0000
-+++ cmake-2.6.0-haiku/Utilities/cmcurl/curl/curl.h	2008-06-19 11:16:51.000000000 +0000
-@@ -1133,7 +1133,7 @@
- }
- #endif
- 
--#ifdef __BEOS__
-+#if defined __BEOS__ || defined __HAIKU__
- #include <support/SupportDefs.h>
- #endif
- 
-diff -ur cmake-2.6.0/Utilities/cmcurl/if2ip.c cmake-2.6.0-haiku/Utilities/cmcurl/if2ip.c
---- cmake-2.6.0/Utilities/cmcurl/if2ip.c	2008-05-05 18:26:06.000000000 +0000
-+++ cmake-2.6.0-haiku/Utilities/cmcurl/if2ip.c	2008-06-19 11:16:51.000000000 +0000
-@@ -39,7 +39,7 @@
-  */
- #if !defined(WIN32) && !defined(__BEOS__) && !defined(__CYGWIN__) && \
-     !defined(__riscos__) && !defined(__INTERIX) && !defined(NETWARE) && \
--    !defined(_AMIGASF) && !defined(__minix)
-+    !defined(_AMIGASF) && !defined(__minix) && !defined(__HAIKU__)
- 
- #ifdef HAVE_SYS_SOCKET_H
- #include <sys/socket.h>
-diff -ur cmake-2.6.0/Utilities/cmcurl/select.c cmake-2.6.0-haiku/Utilities/cmcurl/select.c
---- cmake-2.6.0/Utilities/cmcurl/select.c	2008-05-05 18:26:06.000000000 +0000
-+++ cmake-2.6.0-haiku/Utilities/cmcurl/select.c	2008-06-19 11:16:51.000000000 +0000
-@@ -39,7 +39,7 @@
- #error "We can't compile without select() support!"
- #endif
- 
--#ifdef __BEOS__
-+#if defined __BEOS__ && !defined __HAIKU__
- /* BeOS has FD_SET defined in socket.h */
- #include <socket.h>
- #endif
-diff -ur cmake-2.6.0/Utilities/cmcurl/setup.h cmake-2.6.0-haiku/Utilities/cmcurl/setup.h
---- cmake-2.6.0/Utilities/cmcurl/setup.h	2008-05-05 18:26:06.000000000 +0000
-+++ cmake-2.6.0-haiku/Utilities/cmcurl/setup.h	2008-06-19 11:16:51.000000000 +0000
-@@ -264,7 +264,7 @@
- 
- #else /* MSDOS */
- 
--#ifdef __BEOS__
-+#if defined __BEOS__ && !defined __HAIKU__
- #define sclose(x) closesocket(x)
- #else /* __BEOS__ */
- #define sclose(x) close(x)
-diff -ur cmake-2.6.0/Utilities/cmtar/libtar.c cmake-2.6.0-haiku/Utilities/cmtar/libtar.c
---- cmake-2.6.0/Utilities/cmtar/libtar.c	2008-05-05 18:26:07.000000000 +0000
-+++ cmake-2.6.0-haiku/Utilities/cmtar/libtar.c	2008-06-19 11:16:51.000000000 +0000
-@@ -98,8 +98,8 @@
-     {
-     return -1;
-     }
--
--#if defined(__BEOS__) && !defined(__ZETA__)  /* no fchmod on BeOS...do pathname instead. */
-+/* no fchmod on BeOS...do pathname instead. */
-+#if defined(__BEOS__) && !defined(__ZETA__) && !defined(__HAIKU__)
-   if ((oflags & O_CREAT) && chmod(pathname, mode & 07777))
-     {
-     return -1;
-diff -ur cmake-2.6.0/Utilities/cmxmlrpc/xmlrpc_curl_transport.c cmake-2.6.0-haiku/Utilities/cmxmlrpc/xmlrpc_curl_transport.c
---- cmake-2.6.0/Utilities/cmxmlrpc/xmlrpc_curl_transport.c	2008-05-05 18:26:07.000000000 +0000
-+++ cmake-2.6.0-haiku/Utilities/cmxmlrpc/xmlrpc_curl_transport.c	2008-06-19 11:16:51.000000000 +0000
-@@ -10,7 +10,7 @@
- 
- #include "xmlrpc_config.h"
- 
--#if defined(__BEOS__)
-+#if defined(__BEOS__) && !defined(__HAIKU__)
- /* Some helpful system header has char==bool, then bool.h does int==bool. */
- #define HAVE_BOOL 1
- #endif
-diff -ur cmake-2.6.0/Utilities/cmzlib/zconf.h cmake-2.6.0-haiku/Utilities/cmzlib/zconf.h
---- cmake-2.6.0/Utilities/cmzlib/zconf.h	2008-05-05 18:26:07.000000000 +0000
-+++ cmake-2.6.0-haiku/Utilities/cmzlib/zconf.h	2008-06-19 11:16:51.000000000 +0000
-@@ -237,7 +237,7 @@
- #  endif
- #endif
- 
--#if defined (__BEOS__)
-+#if defined (__BEOS__) && !defined (__HAIKU__)
- #  ifdef ZLIB_DLL
- #    ifdef ZLIB_INTERNAL
- #      define ZEXPORT   __declspec(dllexport)
-diff -ur cmake-2.6.0/Utilities/cmzlib/zutil.h cmake-2.6.0-haiku/Utilities/cmzlib/zutil.h
---- cmake-2.6.0/Utilities/cmzlib/zutil.h	2008-05-05 18:26:07.000000000 +0000
-+++ cmake-2.6.0-haiku/Utilities/cmzlib/zutil.h	2008-06-19 11:16:51.000000000 +0000
-@@ -147,7 +147,13 @@
- #  define OS_CODE  0x0f
- #endif
- 
--#if defined(_BEOS_) || defined(RISCOS)
-+/* Haiku defines both __HAIKU__ and __BEOS__ (for now) */
-+/* many BeOS workarounds are no longer needed in Haiku */
-+#if defined(__HAIKU__) && defined(__BEOS__)
-+undef (__BEOS__)
-+#endif
-+
-+#if defined(_BEOS_) || defined(RISCOS) 
- #  define fdopen(fd,mode) NULL /* No fdopen() */
- #endif
- 
-diff -ur cmake-2.6.0/bootstrap cmake-2.6.0-haiku/bootstrap
---- cmake-2.6.0/bootstrap	2008-05-05 18:26:04.000000000 +0000
-+++ cmake-2.6.0-haiku/bootstrap	2008-06-19 11:16:51.000000000 +0000
-@@ -73,6 +73,13 @@
-   cmake_system_beos=false
- fi
- 
-+# Determine whether this is Haiku 
-+if echo "${cmake_system}" | grep Haiku >/dev/null 2>&1; then
-+  cmake_system_haiku=true
-+else
-+  cmake_system_haiku=false
-+fi
-+
- # Choose the generator to use for bootstrapping.
- if ${cmake_system_mingw}; then
-   # Bootstrapping from an MSYS prompt.
-@@ -603,6 +610,11 @@
-   cmake_ld_flags="${LDFLAGS} -lroot -lbe"
- fi
- 
-+# Add Haiku toolkits...
-+if ${cmake_system_haiku}; then
-+  cmake_ld_flags="${LDFLAGS} -lroot -lbe"
-+fi
-+
- # Test C compiler
- cmake_c_compiler=
- 
diff --git a/dev-util/cmake/patches/cmake-2.6.1-haiku-2.diff b/dev-util/cmake/patches/cmake-2.6.1-haiku-2.diff
deleted file mode 100644
index 8529c3285..000000000
--- a/dev-util/cmake/patches/cmake-2.6.1-haiku-2.diff
+++ /dev/null
@@ -1,474 +0,0 @@
-diff -urN cmake-2.6.1/Modules/CMakeFortranCompilerId.F90.in cmake-2.6.1-haiku/Modules/CMakeFortranCompilerId.F90.in
---- cmake-2.6.1/Modules/CMakeFortranCompilerId.F90.in	2008-08-01 15:34:50.000000000 +0000
-+++ cmake-2.6.1-haiku/Modules/CMakeFortranCompilerId.F90.in	2008-09-12 15:11:49.000000000 +0000
-@@ -50,6 +50,8 @@
-    PRINT *, 'INFO:platform[IRIX]'
- #elif defined(__hpux) || defined(__hpux__)
-    PRINT *, 'INFO:platform[HP-UX]'
-+#elif defined(__HAIKU) || defined(__HAIKU__) || defined(_HAIKU)
-+   PRINT *, 'INFO:platform[Haiku]'
- #elif defined(__BeOS) || defined(__BEOS__) || defined(_BEOS)
-    PRINT *, 'INFO:platform[BeOS]'
- #elif defined(__QNX__) || defined(__QNXNTO__)
-diff -urN cmake-2.6.1/Modules/CMakePlatformId.h.in cmake-2.6.1-haiku/Modules/CMakePlatformId.h.in
---- cmake-2.6.1/Modules/CMakePlatformId.h.in	2008-08-01 15:34:50.000000000 +0000
-+++ cmake-2.6.1-haiku/Modules/CMakePlatformId.h.in	2008-09-12 15:12:47.000000000 +0000
-@@ -35,6 +35,9 @@
- #elif defined(__hpux) || defined(__hpux__)
- # define PLATFORM_ID "HP-UX"
- 
-+#elif defined(__HAIKU) || defined(__HAIKU__) || defined(_HAIKU)
-+# define PLATFORM_ID "Haiku"
-+
- #elif defined(__BeOS) || defined(__BEOS__) || defined(_BEOS)
- # define PLATFORM_ID "BeOS"
- 
-diff -urN cmake-2.6.1/Modules/CheckForPthreads.c cmake-2.6.1-haiku/Modules/CheckForPthreads.c
---- cmake-2.6.1/Modules/CheckForPthreads.c	2008-08-01 15:34:50.000000000 +0000
-+++ cmake-2.6.1-haiku/Modules/CheckForPthreads.c	2008-09-12 15:07:32.000000000 +0000
-@@ -16,7 +16,7 @@
-   pthread_create(&tid[0], 0, runner, (void*)1);
-   pthread_create(&tid[1], 0, runner, (void*)2);
-   
--#if defined(__BEOS__) && !defined(__ZETA__)  // (no usleep on BeOS 5.)
-+#if defined(__BEOS__) && !defined(__ZETA__)  && !defined(__HAIKU__) // (no usleep on BeOS 5.)
-   usleep(1); // for strange behavior on single-processor sun
- #endif
- 
-diff -urN cmake-2.6.1/Modules/Platform/Haiku.cmake cmake-2.6.1-haiku/Modules/Platform/Haiku.cmake
---- cmake-2.6.1/Modules/Platform/Haiku.cmake	1970-01-01 00:00:00.000000000 +0000
-+++ cmake-2.6.1-haiku/Modules/Platform/Haiku.cmake	2008-09-12 15:07:32.000000000 +0000
-@@ -0,0 +1,14 @@
-+SET(BEOS 1)
-+
-+# GCC is the default compiler on Haiku.
-+INCLUDE(${CMAKE_ROOT}/Modules/Platform/gcc.cmake)
-+
-+SET(CMAKE_DL_LIBS root be)
-+SET(CMAKE_SHARED_LIBRARY_C_FLAGS "-fPIC")
-+SET(CMAKE_SHARED_LIBRARY_CREATE_C_FLAGS "-nostart")
-+SET(CMAKE_SHARED_LIBRARY_RUNTIME_C_FLAG "-Wl,-rpath,")
-+SET(CMAKE_SHARED_LIBRARY_RUNTIME_C_FLAG_SEP ":")
-+SET(CMAKE_SHARED_LIBRARY_SONAME_C_FLAG "-Wl,-soname,")
-+SET(CMAKE_SHARED_LIBRARY_SONAME_CXX_FLAG "-Wl,-soname,")
-+
-+INCLUDE(Platform/UnixPaths)
-diff -urN cmake-2.6.1/Source/CPack/cmCPackGeneratorFactory.cxx cmake-2.6.1-haiku/Source/CPack/cmCPackGeneratorFactory.cxx
---- cmake-2.6.1/Source/CPack/cmCPackGeneratorFactory.cxx	2008-08-01 15:34:53.000000000 +0000
-+++ cmake-2.6.1-haiku/Source/CPack/cmCPackGeneratorFactory.cxx	2008-09-12 15:07:32.000000000 +0000
-@@ -36,7 +36,7 @@
- #endif
- 
- #if !defined(_WIN32) && !defined(__APPLE__) \
-- && !defined(__QNXNTO__) && !defined(__BEOS__)
-+ && !defined(__QNXNTO__) && !defined(__BEOS__) && !defined(__HAIKU__)
- #  include "cmCPackDebGenerator.h"
- #  include "cmCPackRPMGenerator.h"
- #endif
-@@ -75,7 +75,8 @@
-     cmCPackOSXX11Generator::CreateGenerator);
- #endif
- #if !defined(_WIN32) && !defined(__APPLE__) \
--  && !defined(__QNXNTO__) && !defined(__BEOS__)
-+  && !defined(__QNXNTO__) && !defined(__BEOS__)\
-+  && !defined(__HAIKU__)
-   this->RegisterGenerator("DEB", "Debian packages",
-     cmCPackDebGenerator::CreateGenerator);
-   this->RegisterGenerator("RPM", "RPM packages",
-diff -urN cmake-2.6.1/Source/cmCTest.cxx cmake-2.6.1-haiku/Source/cmCTest.cxx
---- cmake-2.6.1/Source/cmCTest.cxx	2008-08-01 15:34:51.000000000 +0000
-+++ cmake-2.6.1-haiku/Source/cmCTest.cxx	2008-09-12 15:07:32.000000000 +0000
-@@ -49,10 +49,15 @@
- 
- #include <memory> // auto_ptr
- 
--#if defined(__BEOS__)
-+#if defined(__BEOS__) && !defined(__HAIKU__)
- #include <be/kernel/OS.h>   /* disable_debugger() API. */
- #endif
- 
-+#if defined(__HAIKU__)
-+#include <os/kernel/OS.h>   /* disable_debugger() API. */
-+#endif
-+
-+
- #define DEBUGOUT std::cout << __LINE__ << " "; std::cout
- #define DEBUGERR std::cerr << __LINE__ << " "; std::cerr
- 
-@@ -607,7 +612,7 @@
-   cmSystemTools::PutEnv("DASHBOARD_TEST_FROM_CTEST=" CMake_VERSION);
- #if defined(_WIN32)
-   SetErrorMode(SEM_FAILCRITICALERRORS | SEM_NOGPFAULTERRORBOX);
--#elif defined(__BEOS__)
-+#elif defined(__BEOS__) || defined(__HAIKU__)
-   disable_debugger(1);
- #endif
- }
-diff -urN cmake-2.6.1/Source/cmDependsJavaLexer.cxx cmake-2.6.1-haiku/Source/cmDependsJavaLexer.cxx
---- cmake-2.6.1/Source/cmDependsJavaLexer.cxx	2008-08-01 15:34:51.000000000 +0000
-+++ cmake-2.6.1-haiku/Source/cmDependsJavaLexer.cxx	2008-09-12 15:07:33.000000000 +0000
-@@ -23,7 +23,7 @@
- #include <errno.h>
- #include <stdlib.h>
- 
--#if defined(__BEOS__)
-+#if defined(__BEOS__) || defined (__HAIKU__)
- #include <unistd.h>   /* prevents a conflict with a #define later on... */
- #endif
- 
-diff -urN cmake-2.6.1/Source/cmDependsJavaLexer.h cmake-2.6.1-haiku/Source/cmDependsJavaLexer.h
---- cmake-2.6.1/Source/cmDependsJavaLexer.h	2008-08-01 15:34:51.000000000 +0000
-+++ cmake-2.6.1-haiku/Source/cmDependsJavaLexer.h	2008-09-12 15:07:33.000000000 +0000
-@@ -38,7 +38,7 @@
- #include <errno.h>
- #include <stdlib.h>
- 
--#if defined(__BEOS__)
-+#if defined(__BEOS__) || defined(__HAIKU__)
- #include <unistd.h>   /* prevents a conflict with a #define later on... */
- #endif
- 
-diff -urN cmake-2.6.1/Source/cmSystemTools.cxx cmake-2.6.1-haiku/Source/cmSystemTools.cxx
---- cmake-2.6.1/Source/cmSystemTools.cxx	2008-08-01 15:34:53.000000000 +0000
-+++ cmake-2.6.1-haiku/Source/cmSystemTools.cxx	2008-09-12 15:10:22.000000000 +0000
-@@ -910,7 +910,7 @@
-   fflush(stdout);
-   fflush(stderr);
- 
--#ifdef __BEOS__
-+#if defined __BEOS__ && !defined __HAIKU__
-   beos_seen_signal = false;
-   signal(SIGCHLD, beos_popen_workaround);
- #endif
-@@ -918,7 +918,7 @@
-   FILE* cpipe = popen(command, "r");
-   if(!cpipe)
-     {
--#ifdef __BEOS__
-+#if defined __BEOS__ && !defined __HAIKU__
-     signal(SIGCHLD, SIG_DFL);
- #endif
-     return false;
-@@ -931,12 +931,13 @@
-       cmSystemTools::Stdout(buffer);
-       }
-     output += buffer;
-+    buffer[0] = 0;
-     fgets(buffer, BUFFER_SIZE, cpipe);
-     }
- 
-   retVal = pclose(cpipe);
- 
--#ifdef __BEOS__
-+#if defined __BEOS__ && !defined __HAIKU__
-   for (int i = 0; (!beos_seen_signal) && (i < 3); i++)
-     {
-     ::sleep(1);   // signals should interrupt this...
-@@ -970,11 +971,13 @@
-         error << "SIGFPE";
-         break;
- #endif
-+#ifndef __HAIKU__
- #ifdef SIGBUS
-       case SIGBUS:
-         error << "SIGBUS";
-         break;
- #endif
-+#endif
- #ifdef SIGSEGV
-       case SIGSEGV:
-         error << "SIGSEGV";
-@@ -1696,7 +1699,7 @@
-     }
- 
- // no fchmod on BeOS 5...do pathname instead.
--#if defined(__BEOS__) && !defined(__ZETA__) 
-+#if defined(__BEOS__) && !defined(__ZETA__) && !defined(__HAIKU__)
-   if ((oflags & O_CREAT) && chmod(pathname, mode))
-     {
-     return -1;
-diff -urN cmake-2.6.1/Source/kwsys/DynamicLoader.cxx cmake-2.6.1-haiku/Source/kwsys/DynamicLoader.cxx
---- cmake-2.6.1/Source/kwsys/DynamicLoader.cxx	2008-08-01 15:34:54.000000000 +0000
-+++ cmake-2.6.1-haiku/Source/kwsys/DynamicLoader.cxx	2008-09-12 15:07:33.000000000 +0000
-@@ -335,11 +335,21 @@
- #endif //_WIN32
- 
- // ---------------------------------------------------------------
--// 4. Implementation for BeOS
--#ifdef __BEOS__
-+// 4. Implementation for BeOS / Haiku
-+#if defined __BEOS__ || defined(__HAIKU__)
-+
- #include <string.h> // for strerror()
-+
-+#ifdef __BEOS__
- #include <be/kernel/image.h>
- #include <be/support/Errors.h>
-+#endif
-+
-+#ifdef __HAIKU__
-+#include <os/kernel/image.h>
-+#include <os/support/Errors.h>
-+#endif
-+
- #define DYNAMICLOADER_DEFINED 1
- 
- namespace KWSYS_NAMESPACE
-diff -urN cmake-2.6.1/Source/kwsys/ProcessUNIX.c cmake-2.6.1-haiku/Source/kwsys/ProcessUNIX.c
---- cmake-2.6.1/Source/kwsys/ProcessUNIX.c	2008-08-01 15:34:54.000000000 +0000
-+++ cmake-2.6.1-haiku/Source/kwsys/ProcessUNIX.c	2008-09-12 15:07:33.000000000 +0000
-@@ -75,7 +75,7 @@
- typedef int kwsysProcess_ssize_t;
- #endif
- 
--#if defined(__BEOS__) && !defined(__ZETA__)
-+#if defined(__BEOS__) && !defined(__ZETA__) && !defined(__HAIKU__)
- /* BeOS 5 doesn't have usleep(), but it has snooze(), which is identical. */
- # include <be/kernel/OS.h>
- static inline void kwsysProcess_usleep(unsigned int msec)
-diff -urN cmake-2.6.1/Source/kwsys/SystemTools.cxx cmake-2.6.1-haiku/Source/kwsys/SystemTools.cxx
---- cmake-2.6.1/Source/kwsys/SystemTools.cxx	2008-08-01 15:34:55.000000000 +0000
-+++ cmake-2.6.1-haiku/Source/kwsys/SystemTools.cxx	2008-09-12 15:07:33.000000000 +0000
-@@ -131,7 +131,12 @@
- #define _chdir chdir
- #endif
- 
--#if defined(__BEOS__) && !defined(__ZETA__)
-+#if defined(__HAIKU__)
-+#include <os/kernel/OS.h>
-+#include <os/storage/Path.h>
-+#endif
-+
-+#if defined(__BEOS__) && !defined(__ZETA__) && !defined(__HAIKU__)
- #include <be/kernel/OS.h>
- #include <be/storage/Path.h>
- 
-diff -urN cmake-2.6.1/Source/kwsys/testDynamicLoader.cxx cmake-2.6.1-haiku/Source/kwsys/testDynamicLoader.cxx
---- cmake-2.6.1/Source/kwsys/testDynamicLoader.cxx	2008-08-01 15:34:55.000000000 +0000
-+++ cmake-2.6.1-haiku/Source/kwsys/testDynamicLoader.cxx	2008-09-12 15:07:33.000000000 +0000
-@@ -17,10 +17,14 @@
- #include KWSYS_HEADER(ios/iostream)
- #include KWSYS_HEADER(stl/string)
- 
--#if defined(__BEOS__)
-+#if defined(__BEOS__) && !defined(__HAIKU__)
- #include <be/kernel/OS.h>  /* disable_debugger() API. */
- #endif
- 
-+#if defined(__HAIKU__)
-+#include <os/kernel/OS.h>  /* disable_debugger() API. */
-+#endif
-+
- // Work-around CMake dependency scanning limitation.  This must
- // duplicate the above list of headers.
- #if 0
-diff -urN cmake-2.6.1/Source/kwsys/testProcess.c cmake-2.6.1-haiku/Source/kwsys/testProcess.c
---- cmake-2.6.1/Source/kwsys/testProcess.c	2008-08-01 15:34:55.000000000 +0000
-+++ cmake-2.6.1-haiku/Source/kwsys/testProcess.c	2008-09-12 15:07:33.000000000 +0000
-@@ -34,7 +34,7 @@
- # pragma warn -8060 /* possibly incorrect assignment */
- #endif
- 
--#if defined(__BEOS__) && !defined(__ZETA__)
-+#if defined(__BEOS__) && !defined(__ZETA__) && !defined(__HAIKU__)
- /* BeOS 5 doesn't have usleep(), but it has snooze(), which is identical. */
- # include <be/kernel/OS.h>
- static inline void testProcess_usleep(unsigned int msec)
-diff -urN cmake-2.6.1/Tests/Complex/Library/CMakeLists.txt cmake-2.6.1-haiku/Tests/Complex/Library/CMakeLists.txt
---- cmake-2.6.1/Tests/Complex/Library/CMakeLists.txt	2008-08-01 15:34:55.000000000 +0000
-+++ cmake-2.6.1-haiku/Tests/Complex/Library/CMakeLists.txt	2008-09-12 15:07:33.000000000 +0000
-@@ -53,7 +53,9 @@
-   )
- SET_TARGET_PROPERTIES(CMakeTestCLibraryShared PROPERTIES FOO BAR)
- IF(NOT BEOS)  # No libm on BeOS.
--  SET_TARGET_PROPERTIES(CMakeTestCLibraryShared PROPERTIES LINK_FLAGS "-lm")
-+  IF(NOT HAIKU) # libm in included in libroot on Haiku
-+    SET_TARGET_PROPERTIES(CMakeTestCLibraryShared PROPERTIES LINK_FLAGS "-lm")
-+  ENDIF(NOT HAIKU)
- ENDIF(NOT BEOS)
- GET_TARGET_PROPERTY(FOO_BAR_VAR CMakeTestCLibraryShared FOO)
- IF(${FOO_BAR_VAR} MATCHES "BAR")
-diff -urN cmake-2.6.1/Tests/ComplexOneConfig/Library/CMakeLists.txt cmake-2.6.1-haiku/Tests/ComplexOneConfig/Library/CMakeLists.txt
---- cmake-2.6.1/Tests/ComplexOneConfig/Library/CMakeLists.txt	2008-08-01 15:34:56.000000000 +0000
-+++ cmake-2.6.1-haiku/Tests/ComplexOneConfig/Library/CMakeLists.txt	2008-09-12 15:07:33.000000000 +0000
-@@ -53,7 +53,9 @@
-   )
- SET_TARGET_PROPERTIES(CMakeTestCLibraryShared PROPERTIES FOO BAR)
- IF(NOT BEOS)  # No libm on BeOS.
-+  IF(NOT HAIKU) # No limb on Haiku.
-   SET_TARGET_PROPERTIES(CMakeTestCLibraryShared PROPERTIES LINK_FLAGS "-lm")
-+  ENDIF(NOT HAIKU)
- ENDIF(NOT BEOS)
- GET_TARGET_PROPERTY(FOO_BAR_VAR CMakeTestCLibraryShared FOO)
- IF(${FOO_BAR_VAR} MATCHES "BAR")
-diff -urN cmake-2.6.1/Tests/ComplexRelativePaths/Library/CMakeLists.txt cmake-2.6.1-haiku/Tests/ComplexRelativePaths/Library/CMakeLists.txt
---- cmake-2.6.1/Tests/ComplexRelativePaths/Library/CMakeLists.txt	2008-08-01 15:34:56.000000000 +0000
-+++ cmake-2.6.1-haiku/Tests/ComplexRelativePaths/Library/CMakeLists.txt	2008-09-12 15:07:33.000000000 +0000
-@@ -53,7 +53,9 @@
-   )
- SET_TARGET_PROPERTIES(CMakeTestCLibraryShared PROPERTIES FOO BAR)
- IF(NOT BEOS)  # No libm on BeOS.
-+  IF(NOT HAIKU) # No libm on Haiku.
-   SET_TARGET_PROPERTIES(CMakeTestCLibraryShared PROPERTIES LINK_FLAGS "-lm")
-+  ENDIF(NOT HAIKU)
- ENDIF(NOT BEOS)
- GET_TARGET_PROPERTY(FOO_BAR_VAR CMakeTestCLibraryShared FOO)
- IF(${FOO_BAR_VAR} MATCHES "BAR")
-diff -urN cmake-2.6.1/Utilities/cmcurl/CMake/CurlTests.c cmake-2.6.1-haiku/Utilities/cmcurl/CMake/CurlTests.c
---- cmake-2.6.1/Utilities/cmcurl/CMake/CurlTests.c	2008-08-01 15:34:57.000000000 +0000
-+++ cmake-2.6.1-haiku/Utilities/cmcurl/CMake/CurlTests.c	2008-09-12 15:07:34.000000000 +0000
-@@ -38,7 +38,7 @@
- # define PLATFORM_AIX_V3
- #endif
- 
--#if defined(PLATFORM_SUNOS4) || defined(PLATFORM_AIX_V3) || defined(__BEOS__)
-+#if defined(PLATFORM_SUNOS4) || defined(PLATFORM_AIX_V3) || (defined(__BEOS__) && !defined(__HAIKU__))
- #error "O_NONBLOCK does not work on this platform"
- #endif
-   int socket;
-diff -urN cmake-2.6.1/Utilities/cmcurl/CMakeLists.txt cmake-2.6.1-haiku/Utilities/cmcurl/CMakeLists.txt
---- cmake-2.6.1/Utilities/cmcurl/CMakeLists.txt	2008-08-01 15:34:57.000000000 +0000
-+++ cmake-2.6.1-haiku/Utilities/cmcurl/CMakeLists.txt	2008-09-12 15:07:34.000000000 +0000
-@@ -165,6 +165,8 @@
-   CHECK_LIBRARY_EXISTS_CONCAT("bnetapi" closesocket HAVE_LIBBNETAPI)
- ENDIF(BEOS)
- 
-+CHECK_LIBRARY_EXISTS_CONCAT("network" recv HAVE_LIBNETWORK)
-+
- IF(NOT NOT_NEED_LIBNSL)
-   CHECK_LIBRARY_EXISTS_CONCAT("nsl"    gethostbyname  HAVE_LIBNSL)
- ENDIF(NOT NOT_NEED_LIBNSL)
-diff -urN cmake-2.6.1/Utilities/cmcurl/curl/curl.h cmake-2.6.1-haiku/Utilities/cmcurl/curl/curl.h
---- cmake-2.6.1/Utilities/cmcurl/curl/curl.h	2008-08-01 15:34:57.000000000 +0000
-+++ cmake-2.6.1-haiku/Utilities/cmcurl/curl/curl.h	2008-09-12 15:07:34.000000000 +0000
-@@ -1133,7 +1133,7 @@
- }
- #endif
- 
--#ifdef __BEOS__
-+#if defined __BEOS__ || defined __HAIKU__
- #include <support/SupportDefs.h>
- #endif
- 
-diff -urN cmake-2.6.1/Utilities/cmcurl/if2ip.c cmake-2.6.1-haiku/Utilities/cmcurl/if2ip.c
---- cmake-2.6.1/Utilities/cmcurl/if2ip.c	2008-08-01 15:34:57.000000000 +0000
-+++ cmake-2.6.1-haiku/Utilities/cmcurl/if2ip.c	2008-09-12 15:07:34.000000000 +0000
-@@ -39,7 +39,7 @@
-  */
- #if !defined(WIN32) && !defined(__BEOS__) && !defined(__CYGWIN__) && \
-     !defined(__riscos__) && !defined(__INTERIX) && !defined(NETWARE) && \
--    !defined(_AMIGASF) && !defined(__minix)
-+    !defined(_AMIGASF) && !defined(__minix) && !defined(__HAIKU__)
- 
- #ifdef HAVE_SYS_SOCKET_H
- #include <sys/socket.h>
-diff -urN cmake-2.6.1/Utilities/cmcurl/select.c cmake-2.6.1-haiku/Utilities/cmcurl/select.c
---- cmake-2.6.1/Utilities/cmcurl/select.c	2008-08-01 15:34:57.000000000 +0000
-+++ cmake-2.6.1-haiku/Utilities/cmcurl/select.c	2008-09-12 15:07:34.000000000 +0000
-@@ -39,7 +39,7 @@
- #error "We can't compile without select() support!"
- #endif
- 
--#ifdef __BEOS__
-+#if defined __BEOS__ && !defined __HAIKU__
- /* BeOS has FD_SET defined in socket.h */
- #include <socket.h>
- #endif
-diff -urN cmake-2.6.1/Utilities/cmcurl/setup.h cmake-2.6.1-haiku/Utilities/cmcurl/setup.h
---- cmake-2.6.1/Utilities/cmcurl/setup.h	2008-08-01 15:34:57.000000000 +0000
-+++ cmake-2.6.1-haiku/Utilities/cmcurl/setup.h	2008-09-12 15:07:34.000000000 +0000
-@@ -264,7 +264,7 @@
- 
- #else /* MSDOS */
- 
--#ifdef __BEOS__
-+#if defined __BEOS__ && !defined __HAIKU__
- #define sclose(x) closesocket(x)
- #else /* __BEOS__ */
- #define sclose(x) close(x)
-diff -urN cmake-2.6.1/Utilities/cmtar/libtar.c cmake-2.6.1-haiku/Utilities/cmtar/libtar.c
---- cmake-2.6.1/Utilities/cmtar/libtar.c	2008-08-01 15:34:58.000000000 +0000
-+++ cmake-2.6.1-haiku/Utilities/cmtar/libtar.c	2008-09-12 15:07:34.000000000 +0000
-@@ -98,8 +98,8 @@
-     {
-     return -1;
-     }
--
--#if defined(__BEOS__) && !defined(__ZETA__)  /* no fchmod on BeOS...do pathname instead. */
-+/* no fchmod on BeOS...do pathname instead. */
-+#if defined(__BEOS__) && !defined(__ZETA__) && !defined(__HAIKU__)
-   if ((oflags & O_CREAT) && chmod(pathname, mode & 07777))
-     {
-     return -1;
-diff -urN cmake-2.6.1/Utilities/cmxmlrpc/xmlrpc_curl_transport.c cmake-2.6.1-haiku/Utilities/cmxmlrpc/xmlrpc_curl_transport.c
---- cmake-2.6.1/Utilities/cmxmlrpc/xmlrpc_curl_transport.c	2008-08-01 15:34:58.000000000 +0000
-+++ cmake-2.6.1-haiku/Utilities/cmxmlrpc/xmlrpc_curl_transport.c	2008-09-12 15:07:34.000000000 +0000
-@@ -10,7 +10,7 @@
- 
- #include "xmlrpc_config.h"
- 
--#if defined(__BEOS__)
-+#if defined(__BEOS__) && !defined(__HAIKU__)
- /* Some helpful system header has char==bool, then bool.h does int==bool. */
- #define HAVE_BOOL 1
- #endif
-diff -urN cmake-2.6.1/Utilities/cmzlib/zconf.h cmake-2.6.1-haiku/Utilities/cmzlib/zconf.h
---- cmake-2.6.1/Utilities/cmzlib/zconf.h	2008-08-01 15:34:58.000000000 +0000
-+++ cmake-2.6.1-haiku/Utilities/cmzlib/zconf.h	2008-09-12 15:07:34.000000000 +0000
-@@ -237,7 +237,7 @@
- #  endif
- #endif
- 
--#if defined (__BEOS__)
-
-+#if defined (__BEOS__) && !defined (__HAIKU__)
- #  ifdef ZLIB_DLL
- #    ifdef ZLIB_INTERNAL
- #      define ZEXPORT   __declspec(dllexport)
-diff -urN cmake-2.6.1/Utilities/cmzlib/zutil.h cmake-2.6.1-haiku/Utilities/cmzlib/zutil.h
---- cmake-2.6.1/Utilities/cmzlib/zutil.h	2008-08-01 15:34:59.000000000 +0000
-+++ cmake-2.6.1-haiku/Utilities/cmzlib/zutil.h	2008-09-12 15:07:34.000000000 +0000
-@@ -147,7 +147,13 @@
- #  define OS_CODE  0x0f
- #endif
- 
--#if defined(_BEOS_) || defined(RISCOS)
-+/* Haiku defines both __HAIKU__ and __BEOS__ (for now) */
-+/* many BeOS workarounds are no longer needed in Haiku */
-+#if defined(__HAIKU__) && defined(__BEOS__)
-+#undef __BEOS__
-+#endif
-+
-+#if defined(_BEOS_) || defined(RISCOS) 
- #  define fdopen(fd,mode) NULL /* No fdopen() */
- #endif
- 
-diff -urN cmake-2.6.1/bootstrap cmake-2.6.1-haiku/bootstrap
---- cmake-2.6.1/bootstrap	2008-08-01 15:34:50.000000000 +0000
-+++ cmake-2.6.1-haiku/bootstrap	2008-09-12 15:07:34.000000000 +0000
-@@ -73,6 +73,13 @@
-   cmake_system_beos=false
- fi
- 
-+# Determine whether this is Haiku 
-+if echo "${cmake_system}" | grep Haiku >/dev/null 2>&1; then
-+  cmake_system_haiku=true
-+else
-+  cmake_system_haiku=false
-+fi
-+
- # Choose the generator to use for bootstrapping.
- if ${cmake_system_mingw}; then
-   # Bootstrapping from an MSYS prompt.
-@@ -603,6 +610,11 @@
-   cmake_ld_flags="${LDFLAGS} -lroot -lbe"
- fi
- 
-+# Add Haiku toolkits...
-+if ${cmake_system_haiku}; then
-+  cmake_ld_flags="${LDFLAGS} -lroot -lbe"
-+fi
-+
- # Test C compiler
- cmake_c_compiler=
- 
diff --git a/dev-util/cmake/patches/cmake-2.6.1-haiku.diff b/dev-util/cmake/patches/cmake-2.6.1-haiku.diff
deleted file mode 100644
index 1ce790b13..000000000
--- a/dev-util/cmake/patches/cmake-2.6.1-haiku.diff
+++ /dev/null
@@ -1,449 +0,0 @@
-diff -urN cmake-2.6.1/Modules/CMakeFortranCompilerId.F90.in cmake-2.6.1-haiku/Modules/CMakeFortranCompilerId.F90.in
---- cmake-2.6.1/Modules/CMakeFortranCompilerId.F90.in	2008-08-01 15:34:50.000000000 +0000
-+++ cmake-2.6.1-haiku/Modules/CMakeFortranCompilerId.F90.in	2008-08-20 13:49:06.000000000 +0000
-@@ -50,6 +50,10 @@
-    PRINT *, 'INFO:platform[IRIX]'
- #elif defined(__hpux) || defined(__hpux__)
-    PRINT *, 'INFO:platform[HP-UX]'
-+#elif defined(__HAIKU) || defined(__HAIKU__) || defined(_HAIKU)
-+   PRINT *, 'INFO:platform[Haiku]'
-+! Haiku also defines __BEOS__ so we must 
-+! put it prior to the check for __BEOS__
- #elif defined(__BeOS) || defined(__BEOS__) || defined(_BEOS)
-    PRINT *, 'INFO:platform[BeOS]'
- #elif defined(__QNX__) || defined(__QNXNTO__)
-diff -urN cmake-2.6.1/Modules/CMakePlatformId.h.in cmake-2.6.1-haiku/Modules/CMakePlatformId.h.in
---- cmake-2.6.1/Modules/CMakePlatformId.h.in	2008-08-01 15:34:50.000000000 +0000
-+++ cmake-2.6.1-haiku/Modules/CMakePlatformId.h.in	2008-08-20 13:49:06.000000000 +0000
-@@ -35,6 +35,11 @@
- #elif defined(__hpux) || defined(__hpux__)
- # define PLATFORM_ID "HP-UX"
- 
-+#elif defined(__HAIKU) || defined(__HAIKU__) || defined(_HAIKU)
-+# define PLATFORM_ID "Haiku"
-+! Haiku also defines __BEOS__ so we must 
-+! put it prior to the check for __BEOS__
-+
- #elif defined(__BeOS) || defined(__BEOS__) || defined(_BEOS)
- # define PLATFORM_ID "BeOS"
- 
-diff -urN cmake-2.6.1/Modules/CheckForPthreads.c cmake-2.6.1-haiku/Modules/CheckForPthreads.c
---- cmake-2.6.1/Modules/CheckForPthreads.c	2008-08-01 15:34:50.000000000 +0000
-+++ cmake-2.6.1-haiku/Modules/CheckForPthreads.c	2008-08-20 13:49:06.000000000 +0000
-@@ -16,7 +16,7 @@
-   pthread_create(&tid[0], 0, runner, (void*)1);
-   pthread_create(&tid[1], 0, runner, (void*)2);
-   
--#if defined(__BEOS__) && !defined(__ZETA__)  // (no usleep on BeOS 5.)
-+#if defined(__BEOS__) && !defined(__ZETA__)  && !defined(__HAIKU__) // (no usleep on BeOS 5.)
-   usleep(1); // for strange behavior on single-processor sun
- #endif
- 
-diff -urN cmake-2.6.1/Modules/Platform/Haiku.cmake cmake-2.6.1-haiku/Modules/Platform/Haiku.cmake
---- cmake-2.6.1/Modules/Platform/Haiku.cmake	1970-01-01 00:00:00.000000000 +0000
-+++ cmake-2.6.1-haiku/Modules/Platform/Haiku.cmake	2008-08-20 13:49:06.000000000 +0000
-@@ -0,0 +1,14 @@
-+SET(BEOS 1)
-+
-+# GCC is the default compiler on Haiku.
-+INCLUDE(${CMAKE_ROOT}/Modules/Platform/gcc.cmake)
-+
-+SET(CMAKE_DL_LIBS root be)
-+SET(CMAKE_SHARED_LIBRARY_C_FLAGS "-fPIC")
-+SET(CMAKE_SHARED_LIBRARY_CREATE_C_FLAGS "-nostart")
-+SET(CMAKE_SHARED_LIBRARY_RUNTIME_C_FLAG "-Wl,-rpath,")
-+SET(CMAKE_SHARED_LIBRARY_RUNTIME_C_FLAG_SEP ":")
-+SET(CMAKE_SHARED_LIBRARY_SONAME_C_FLAG "-Wl,-soname,")
-+SET(CMAKE_SHARED_LIBRARY_SONAME_CXX_FLAG "-Wl,-soname,")
-+
-+INCLUDE(Platform/UnixPaths)
-diff -urN cmake-2.6.1/Source/CPack/cmCPackGeneratorFactory.cxx cmake-2.6.1-haiku/Source/CPack/cmCPackGeneratorFactory.cxx
---- cmake-2.6.1/Source/CPack/cmCPackGeneratorFactory.cxx	2008-08-01 15:34:53.000000000 +0000
-+++ cmake-2.6.1-haiku/Source/CPack/cmCPackGeneratorFactory.cxx	2008-08-20 13:49:06.000000000 +0000
-@@ -36,7 +36,7 @@
- #endif
- 
- #if !defined(_WIN32) && !defined(__APPLE__) \
-- && !defined(__QNXNTO__) && !defined(__BEOS__)
-+ && !defined(__QNXNTO__) && !defined(__BEOS__) && !defined(__HAIKU__)
- #  include "cmCPackDebGenerator.h"
- #  include "cmCPackRPMGenerator.h"
- #endif
-@@ -75,7 +75,8 @@
-     cmCPackOSXX11Generator::CreateGenerator);
- #endif
- #if !defined(_WIN32) && !defined(__APPLE__) \
--  && !defined(__QNXNTO__) && !defined(__BEOS__)
-+  && !defined(__QNXNTO__) && !defined(__BEOS__)\
-+  && !defined(__HAIKU__)
-   this->RegisterGenerator("DEB", "Debian packages",
-     cmCPackDebGenerator::CreateGenerator);
-   this->RegisterGenerator("RPM", "RPM packages",
-diff -urN cmake-2.6.1/Source/cmCTest.cxx cmake-2.6.1-haiku/Source/cmCTest.cxx
---- cmake-2.6.1/Source/cmCTest.cxx	2008-08-01 15:34:51.000000000 +0000
-+++ cmake-2.6.1-haiku/Source/cmCTest.cxx	2008-08-20 13:49:06.000000000 +0000
-@@ -49,10 +49,15 @@
- 
- #include <memory> // auto_ptr
- 
--#if defined(__BEOS__)
-+#if defined(__BEOS__) && !defined(__HAIKU__)
- #include <be/kernel/OS.h>   /* disable_debugger() API. */
- #endif
- 
-+#if defined(__HAIKU__)
-+#include <os/kernel/OS.h>   /* disable_debugger() API. */
-+#endif
-+
-+
- #define DEBUGOUT std::cout << __LINE__ << " "; std::cout
- #define DEBUGERR std::cerr << __LINE__ << " "; std::cerr
- 
-@@ -607,7 +612,7 @@
-   cmSystemTools::PutEnv("DASHBOARD_TEST_FROM_CTEST=" CMake_VERSION);
- #if defined(_WIN32)
-   SetErrorMode(SEM_FAILCRITICALERRORS | SEM_NOGPFAULTERRORBOX);
--#elif defined(__BEOS__)
-+#elif defined(__BEOS__) || defined(__HAIKU__)
-   disable_debugger(1);
- #endif
- }
-diff -urN cmake-2.6.1/Source/cmDependsJavaLexer.cxx cmake-2.6.1-haiku/Source/cmDependsJavaLexer.cxx
---- cmake-2.6.1/Source/cmDependsJavaLexer.cxx	2008-08-01 15:34:51.000000000 +0000
-+++ cmake-2.6.1-haiku/Source/cmDependsJavaLexer.cxx	2008-08-20 13:49:06.000000000 +0000
-@@ -23,7 +23,7 @@
- #include <errno.h>
- #include <stdlib.h>
- 
--#if defined(__BEOS__)
-+#if defined(__BEOS__) || defined (__HAIKU__)
- #include <unistd.h>   /* prevents a conflict with a #define later on... */
- #endif
- 
-diff -urN cmake-2.6.1/Source/cmDependsJavaLexer.h cmake-2.6.1-haiku/Source/cmDependsJavaLexer.h
---- cmake-2.6.1/Source/cmDependsJavaLexer.h	2008-08-01 15:34:51.000000000 +0000
-+++ cmake-2.6.1-haiku/Source/cmDependsJavaLexer.h	2008-08-20 13:49:06.000000000 +0000
-@@ -38,7 +38,7 @@
- #include <errno.h>
- #include <stdlib.h>
- 
--#if defined(__BEOS__)
-+#if defined(__BEOS__) || defined(__HAIKU__)
- #include <unistd.h>   /* prevents a conflict with a #define later on... */
- #endif
- 
-diff -urN cmake-2.6.1/Source/cmSystemTools.cxx cmake-2.6.1-haiku/Source/cmSystemTools.cxx
---- cmake-2.6.1/Source/cmSystemTools.cxx	2008-08-01 15:34:53.000000000 +0000
-+++ cmake-2.6.1-haiku/Source/cmSystemTools.cxx	2008-08-20 13:49:06.000000000 +0000
-@@ -970,11 +970,13 @@
-         error << "SIGFPE";
-         break;
- #endif
-+#ifndef __HAIKU__
- #ifdef SIGBUS
-       case SIGBUS:
-         error << "SIGBUS";
-         break;
- #endif
-+#endif
- #ifdef SIGSEGV
-       case SIGSEGV:
-         error << "SIGSEGV";
-@@ -1696,7 +1698,7 @@
-     }
- 
- // no fchmod on BeOS 5...do pathname instead.
--#if defined(__BEOS__) && !defined(__ZETA__) 
-+#if defined(__BEOS__) && !defined(__ZETA__) && !defined(__HAIKU__)
-   if ((oflags & O_CREAT) && chmod(pathname, mode))
-     {
-     return -1;
-diff -urN cmake-2.6.1/Source/kwsys/DynamicLoader.cxx cmake-2.6.1-haiku/Source/kwsys/DynamicLoader.cxx
---- cmake-2.6.1/Source/kwsys/DynamicLoader.cxx	2008-08-01 15:34:54.000000000 +0000
-+++ cmake-2.6.1-haiku/Source/kwsys/DynamicLoader.cxx	2008-08-20 13:49:06.000000000 +0000
-@@ -335,11 +335,21 @@
- #endif //_WIN32
- 
- // ---------------------------------------------------------------
--// 4. Implementation for BeOS
--#ifdef __BEOS__
-+// 4. Implementation for BeOS / Haiku
-+#if defined __BEOS__ || defined(__HAIKU__)
-+
- #include <string.h> // for strerror()
-+
-+#ifdef __BEOS__
- #include <be/kernel/image.h>
- #include <be/support/Errors.h>
-+#endif
-+
-+#ifdef __HAIKU__
-+#include <os/kernel/image.h>
-+#include <os/support/Errors.h>
-+#endif
-+
- #define DYNAMICLOADER_DEFINED 1
- 
- namespace KWSYS_NAMESPACE
-diff -urN cmake-2.6.1/Source/kwsys/ProcessUNIX.c cmake-2.6.1-haiku/Source/kwsys/ProcessUNIX.c
---- cmake-2.6.1/Source/kwsys/ProcessUNIX.c	2008-08-01 15:34:54.000000000 +0000
-+++ cmake-2.6.1-haiku/Source/kwsys/ProcessUNIX.c	2008-08-20 13:49:06.000000000 +0000
-@@ -75,7 +75,7 @@
- typedef int kwsysProcess_ssize_t;
- #endif
- 
--#if defined(__BEOS__) && !defined(__ZETA__)
-+#if defined(__BEOS__) && !defined(__ZETA__) && !defined(__HAIKU__)
- /* BeOS 5 doesn't have usleep(), but it has snooze(), which is identical. */
- # include <be/kernel/OS.h>
- static inline void kwsysProcess_usleep(unsigned int msec)
-@@ -2534,6 +2534,7 @@
-     }
- 
-   /* If this is the first process, enable the signal handler.  */
-+#ifndef __HAIKU__
-   if(newProcesses.Count == 1)
-     {
-     /* Install our handler for SIGCHLD.  Repeat call until it is not
-@@ -2554,6 +2555,7 @@
-                      &kwsysProcessesOldSigChldAction) < 0) &&
-           (errno == EINTR));
-     }
-+#endif
-   }
- 
-   return 1;
-
-diff -urN cmake-2.6.1/Source/kwsys/SystemTools.cxx cmake-2.6.1-haiku/Source/kwsys/SystemTools.cxx
---- cmake-2.6.1/Source/kwsys/SystemTools.cxx	2008-08-01 15:34:55.000000000 +0000
-+++ cmake-2.6.1-haiku/Source/kwsys/SystemTools.cxx	2008-08-20 13:49:06.000000000 +0000
-@@ -131,7 +131,12 @@
- #define _chdir chdir
- #endif
- 
--#if defined(__BEOS__) && !defined(__ZETA__)
-+#if defined(__HAIKU__)
-+#include <os/kernel/OS.h>
-+#include <os/storage/Path.h>
-+#endif
-+
-+#if defined(__BEOS__) && !defined(__ZETA__) && !defined(__HAIKU__)
- #include <be/kernel/OS.h>
- #include <be/storage/Path.h>
- 
-diff -urN cmake-2.6.1/Source/kwsys/testDynamicLoader.cxx cmake-2.6.1-haiku/Source/kwsys/testDynamicLoader.cxx
---- cmake-2.6.1/Source/kwsys/testDynamicLoader.cxx	2008-08-01 15:34:55.000000000 +0000
-+++ cmake-2.6.1-haiku/Source/kwsys/testDynamicLoader.cxx	2008-08-20 13:49:06.000000000 +0000
-@@ -17,10 +17,14 @@
- #include KWSYS_HEADER(ios/iostream)
- #include KWSYS_HEADER(stl/string)
- 
--#if defined(__BEOS__)
-+#if defined(__BEOS__) && !defined(__HAIKU__)
- #include <be/kernel/OS.h>  /* disable_debugger() API. */
- #endif
- 
-+#if defined(__HAIKU__)
-+#include <os/kernel/OS.h>  /* disable_debugger() API. */
-+#endif
-+
- // Work-around CMake dependency scanning limitation.  This must
- // duplicate the above list of headers.
- #if 0
-diff -urN cmake-2.6.1/Source/kwsys/testProcess.c cmake-2.6.1-haiku/Source/kwsys/testProcess.c
---- cmake-2.6.1/Source/kwsys/testProcess.c	2008-08-01 15:34:55.000000000 +0000
-+++ cmake-2.6.1-haiku/Source/kwsys/testProcess.c	2008-08-20 13:49:06.000000000 +0000
-@@ -34,7 +34,7 @@
- # pragma warn -8060 /* possibly incorrect assignment */
- #endif
- 
--#if defined(__BEOS__) && !defined(__ZETA__)
-+#if defined(__BEOS__) && !defined(__ZETA__) && !defined(__HAIKU__)
- /* BeOS 5 doesn't have usleep(), but it has snooze(), which is identical. */
- # include <be/kernel/OS.h>
- static inline void testProcess_usleep(unsigned int msec)
-diff -urN cmake-2.6.1/Tests/Complex/Library/CMakeLists.txt cmake-2.6.1-haiku/Tests/Complex/Library/CMakeLists.txt
---- cmake-2.6.1/Tests/Complex/Library/CMakeLists.txt	2008-08-01 15:34:55.000000000 +0000
-+++ cmake-2.6.1-haiku/Tests/Complex/Library/CMakeLists.txt	2008-08-20 13:49:06.000000000 +0000
-@@ -53,7 +53,9 @@
-   )
- SET_TARGET_PROPERTIES(CMakeTestCLibraryShared PROPERTIES FOO BAR)
- IF(NOT BEOS)  # No libm on BeOS.
--  SET_TARGET_PROPERTIES(CMakeTestCLibraryShared PROPERTIES LINK_FLAGS "-lm")
-+  IF(NOT HAIKU) # libm in included in libroot on Haiku
-+    SET_TARGET_PROPERTIES(CMakeTestCLibraryShared PROPERTIES LINK_FLAGS "-lm")
-+  ENDIF(NOT HAIKU)
- ENDIF(NOT BEOS)
- GET_TARGET_PROPERTY(FOO_BAR_VAR CMakeTestCLibraryShared FOO)
- IF(${FOO_BAR_VAR} MATCHES "BAR")
-diff -urN cmake-2.6.1/Tests/ComplexOneConfig/Library/CMakeLists.txt cmake-2.6.1-haiku/Tests/ComplexOneConfig/Library/CMakeLists.txt
---- cmake-2.6.1/Tests/ComplexOneConfig/Library/CMakeLists.txt	2008-08-01 15:34:56.000000000 +0000
-+++ cmake-2.6.1-haiku/Tests/ComplexOneConfig/Library/CMakeLists.txt	2008-08-20 13:49:06.000000000 +0000
-@@ -53,7 +53,9 @@
-   )
- SET_TARGET_PROPERTIES(CMakeTestCLibraryShared PROPERTIES FOO BAR)
- IF(NOT BEOS)  # No libm on BeOS.
-+  IF(NOT HAIKU) # No limb on Haiku.
-   SET_TARGET_PROPERTIES(CMakeTestCLibraryShared PROPERTIES LINK_FLAGS "-lm")
-+  ENDIF(NOT HAIKU)
- ENDIF(NOT BEOS)
- GET_TARGET_PROPERTY(FOO_BAR_VAR CMakeTestCLibraryShared FOO)
- IF(${FOO_BAR_VAR} MATCHES "BAR")
-diff -urN cmake-2.6.1/Tests/ComplexRelativePaths/Library/CMakeLists.txt cmake-2.6.1-haiku/Tests/ComplexRelativePaths/Library/CMakeLists.txt
---- cmake-2.6.1/Tests/ComplexRelativePaths/Library/CMakeLists.txt	2008-08-01 15:34:56.000000000 +0000
-+++ cmake-2.6.1-haiku/Tests/ComplexRelativePaths/Library/CMakeLists.txt	2008-08-20 13:49:07.000000000 +0000
-@@ -53,7 +53,9 @@
-   )
- SET_TARGET_PROPERTIES(CMakeTestCLibraryShared PROPERTIES FOO BAR)
- IF(NOT BEOS)  # No libm on BeOS.
-+  IF(NOT HAIKU) # No libm on Haiku.
-   SET_TARGET_PROPERTIES(CMakeTestCLibraryShared PROPERTIES LINK_FLAGS "-lm")
-+  ENDIF(NOT HAIKU)
- ENDIF(NOT BEOS)
- GET_TARGET_PROPERTY(FOO_BAR_VAR CMakeTestCLibraryShared FOO)
- IF(${FOO_BAR_VAR} MATCHES "BAR")
-diff -urN cmake-2.6.1/Utilities/cmcurl/CMake/CurlTests.c cmake-2.6.1-haiku/Utilities/cmcurl/CMake/CurlTests.c
---- cmake-2.6.1/Utilities/cmcurl/CMake/CurlTests.c	2008-08-01 15:34:57.000000000 +0000
-+++ cmake-2.6.1-haiku/Utilities/cmcurl/CMake/CurlTests.c	2008-08-20 13:49:07.000000000 +0000
-@@ -38,7 +38,7 @@
- # define PLATFORM_AIX_V3
- #endif
- 
--#if defined(PLATFORM_SUNOS4) || defined(PLATFORM_AIX_V3) || defined(__BEOS__)
-+#if defined(PLATFORM_SUNOS4) || defined(PLATFORM_AIX_V3) || (defined(__BEOS__) && !defined(__HAIKU__))
- #error "O_NONBLOCK does not work on this platform"
- #endif
-   int socket;
-diff -urN cmake-2.6.1/Utilities/cmcurl/curl/curl.h cmake-2.6.1-haiku/Utilities/cmcurl/curl/curl.h
---- cmake-2.6.1/Utilities/cmcurl/curl/curl.h	2008-08-01 15:34:57.000000000 +0000
-+++ cmake-2.6.1-haiku/Utilities/cmcurl/curl/curl.h	2008-08-20 13:49:07.000000000 +0000
-@@ -1133,7 +1133,7 @@
- }
- #endif
- 
--#ifdef __BEOS__
-+#if defined __BEOS__ || defined __HAIKU__
- #include <support/SupportDefs.h>
- #endif
- 
-diff -urN cmake-2.6.1/Utilities/cmcurl/if2ip.c cmake-2.6.1-haiku/Utilities/cmcurl/if2ip.c
---- cmake-2.6.1/Utilities/cmcurl/if2ip.c	2008-08-01 15:34:57.000000000 +0000
-+++ cmake-2.6.1-haiku/Utilities/cmcurl/if2ip.c	2008-08-20 13:49:07.000000000 +0000
-@@ -39,7 +39,7 @@
-  */
- #if !defined(WIN32) && !defined(__BEOS__) && !defined(__CYGWIN__) && \
-     !defined(__riscos__) && !defined(__INTERIX) && !defined(NETWARE) && \
--    !defined(_AMIGASF) && !defined(__minix)
-+    !defined(_AMIGASF) && !defined(__minix) && !defined(__HAIKU__)
- 
- #ifdef HAVE_SYS_SOCKET_H
- #include <sys/socket.h>
-diff -urN cmake-2.6.1/Utilities/cmcurl/select.c cmake-2.6.1-haiku/Utilities/cmcurl/select.c
---- cmake-2.6.1/Utilities/cmcurl/select.c	2008-08-01 15:34:57.000000000 +0000
-+++ cmake-2.6.1-haiku/Utilities/cmcurl/select.c	2008-08-20 13:49:07.000000000 +0000
-@@ -39,7 +39,7 @@
- #error "We can't compile without select() support!"
- #endif
- 
--#ifdef __BEOS__
-+#if defined __BEOS__ && !defined __HAIKU__
- /* BeOS has FD_SET defined in socket.h */
- #include <socket.h>
- #endif
-diff -urN cmake-2.6.1/Utilities/cmcurl/setup.h cmake-2.6.1-haiku/Utilities/cmcurl/setup.h
---- cmake-2.6.1/Utilities/cmcurl/setup.h	2008-08-01 15:34:57.000000000 +0000
-+++ cmake-2.6.1-haiku/Utilities/cmcurl/setup.h	2008-08-20 13:49:07.000000000 +0000
-@@ -264,7 +264,7 @@
- 
- #else /* MSDOS */
- 
--#ifdef __BEOS__
-+#if defined __BEOS__ && !defined __HAIKU__
- #define sclose(x) closesocket(x)
- #else /* __BEOS__ */
- #define sclose(x) close(x)
-diff -urN cmake-2.6.1/Utilities/cmtar/libtar.c cmake-2.6.1-haiku/Utilities/cmtar/libtar.c
---- cmake-2.6.1/Utilities/cmtar/libtar.c	2008-08-01 15:34:58.000000000 +0000
-+++ cmake-2.6.1-haiku/Utilities/cmtar/libtar.c	2008-08-20 13:49:07.000000000 +0000
-@@ -98,8 +98,8 @@
-     {
-     return -1;
-     }
--
--#if defined(__BEOS__) && !defined(__ZETA__)  /* no fchmod on BeOS...do pathname instead. */
-+/* no fchmod on BeOS...do pathname instead. */
-+#if defined(__BEOS__) && !defined(__ZETA__) && !defined(__HAIKU__)
-   if ((oflags & O_CREAT) && chmod(pathname, mode & 07777))
-     {
-     return -1;
-diff -urN cmake-2.6.1/Utilities/cmxmlrpc/xmlrpc_curl_transport.c cmake-2.6.1-haiku/Utilities/cmxmlrpc/xmlrpc_curl_transport.c
---- cmake-2.6.1/Utilities/cmxmlrpc/xmlrpc_curl_transport.c	2008-08-01 15:34:58.000000000 +0000
-+++ cmake-2.6.1-haiku/Utilities/cmxmlrpc/xmlrpc_curl_transport.c	2008-08-20 13:49:07.000000000 +0000
-@@ -10,7 +10,7 @@
- 
- #include "xmlrpc_config.h"
- 
--#if defined(__BEOS__)
-+#if defined(__BEOS__) && !defined(__HAIKU__)
- /* Some helpful system header has char==bool, then bool.h does int==bool. */
- #define HAVE_BOOL 1
- #endif
-diff -urN cmake-2.6.1/Utilities/cmzlib/zconf.h cmake-2.6.1-haiku/Utilities/cmzlib/zconf.h
---- cmake-2.6.1/Utilities/cmzlib/zconf.h	2008-08-01 15:34:58.000000000 +0000
-+++ cmake-2.6.1-haiku/Utilities/cmzlib/zconf.h	2008-08-20 13:49:07.000000000 +0000
-@@ -237,7 +237,7 @@
- #  endif
- #endif
- 
--#if defined (__BEOS__)
-+#if defined (__BEOS__) && !defined (__HAIKU__)
- #  ifdef ZLIB_DLL
- #    ifdef ZLIB_INTERNAL
- #      define ZEXPORT   __declspec(dllexport)
-diff -urN cmake-2.6.1/Utilities/cmzlib/zutil.h cmake-2.6.1-haiku/Utilities/cmzlib/zutil.h
---- cmake-2.6.1/Utilities/cmzlib/zutil.h	2008-08-01 15:34:59.000000000 +0000
-+++ cmake-2.6.1-haiku/Utilities/cmzlib/zutil.h	2008-08-20 13:49:07.000000000 +0000
-@@ -147,7 +147,13 @@
- #  define OS_CODE  0x0f
- #endif
- 
--#if defined(_BEOS_) || defined(RISCOS)
-+/* Haiku defines both __HAIKU__ and __BEOS__ (for now) */
-+/* many BeOS workarounds are no longer needed in Haiku */
-+#if defined(__HAIKU__) && defined(__BEOS__)
-+undef (__BEOS__)
-+#endif
-+
-+#if defined(_BEOS_) || defined(RISCOS) 
- #  define fdopen(fd,mode) NULL /* No fdopen() */
- #endif
- 
-diff -urN cmake-2.6.1/bootstrap cmake-2.6.1-haiku/bootstrap
---- cmake-2.6.1/bootstrap	2008-08-01 15:34:50.000000000 +0000
-+++ cmake-2.6.1-haiku/bootstrap	2008-08-20 13:49:07.000000000 +0000
-@@ -73,6 +73,13 @@
-   cmake_system_beos=false
- fi
- 
-+# Determine whether this is Haiku 
-+if echo "${cmake_system}" | grep Haiku >/dev/null 2>&1; then
-+  cmake_system_haiku=true
-+else
-+  cmake_system_haiku=false
-+fi
-+
- # Choose the generator to use for bootstrapping.
- if ${cmake_system_mingw}; then
-   # Bootstrapping from an MSYS prompt.
-@@ -603,6 +610,11 @@
-   cmake_ld_flags="${LDFLAGS} -lroot -lbe"
- fi
- 
-+# Add Haiku toolkits...
-+if ${cmake_system_haiku}; then
-+  cmake_ld_flags="${LDFLAGS} -lroot -lbe"
-+fi
-+
- # Test C compiler
- cmake_c_compiler=
- 
diff --git a/dev-util/cmake/patches/cmake-2.8-git.patch b/dev-util/cmake/patches/cmake-2.8-git.patch
deleted file mode 100644
index cf4523c08..000000000
--- a/dev-util/cmake/patches/cmake-2.8-git.patch
+++ /dev/null
@@ -1,229 +0,0 @@
-diff -urN cmake-2.8-git-orig/Modules/Platform/Haiku.cmake cmake-2.8-git/Modules/Platform/Haiku.cmake
---- cmake-2.8-git-orig/Modules/Platform/Haiku.cmake	2012-12-03 12:11:47.804519936 -0800
-+++ cmake-2.8-git/Modules/Platform/Haiku.cmake	2012-12-03 12:02:17.652738560 -0800
-@@ -1,20 +1,25 @@
-+set(HAIKU 1)
-+set(UNIX 1)
-+  
-+set(CMAKE_DL_LIBS "")
--set(BEOS 1)
--
--set(CMAKE_DL_LIBS root be)
--set(CMAKE_C_COMPILE_OPTIONS_PIC "-fPIC")
--set(CMAKE_C_COMPILE_OPTIONS_PIE "-fPIE")
- set(CMAKE_SHARED_LIBRARY_C_FLAGS "-fPIC")
-+set(CMAKE_SHARED_LIBRARY_CREATE_C_FLAGS "-shared")
--set(CMAKE_SHARED_LIBRARY_CREATE_C_FLAGS "-nostart")
- set(CMAKE_SHARED_LIBRARY_RUNTIME_C_FLAG "-Wl,-rpath,")
- set(CMAKE_SHARED_LIBRARY_RUNTIME_C_FLAG_SEP ":")
-+set(CMAKE_SHARED_LIBRARY_RPATH_LINK_C_FLAG "-Wl,-rpath-link,")
- set(CMAKE_SHARED_LIBRARY_SONAME_C_FLAG "-Wl,-soname,")
-+set(CMAKE_EXE_EXPORTS_C_FLAG "-Wl,--export-dynamic")
-+  
-+list(APPEND CMAKE_SYSTEM_PREFIX_PATH
-+  /boot/common/non-packaged
-+  /boot/common
-+  /boot/system
-+  )
-+list(APPEND CMAKE_PLATFORM_IMPLICIT_LINK_DIRECTORIES
-+  /boot/common/non-packaged/lib
-+  /boot/common/lib
-+  /boot/develop/lib/x86
-+  )
--
--include(Platform/UnixPaths)
--list(APPEND CMAKE_SYSTEM_PREFIX_PATH /boot/common)
--list(APPEND CMAKE_SYSTEM_INCLUDE_PATH /boot/common/include)
--list(APPEND CMAKE_SYSTEM_LIBRARY_PATH /boot/common/lib)
--list(APPEND CMAKE_SYSTEM_PROGRAM_PATH /boot/common/bin)
--list(APPEND CMAKE_PLATFORM_IMPLICIT_LINK_DIRECTORIES /boot/common/lib)
- list(APPEND CMAKE_SYSTEM_INCLUDE_PATH /boot/develop/headers/3rdparty)
- list(APPEND CMAKE_SYSTEM_LIBRARY_PATH /boot/develop/lib/x86)
- 
-diff -urN cmake-2.8-git-orig/Source/cmExportCommand.cxx cmake-2.8-git/Source/cmExportCommand.cxx
---- cmake-2.8-git-orig/Source/cmExportCommand.cxx	2012-11-27 05:26:33.039059456 -0800
-+++ cmake-2.8-git/Source/cmExportCommand.cxx	2012-12-03 12:02:17.665059328 -0800
-@@ -20,7 +20,8 @@
- #include "cmExportBuildFileGenerator.h"
- 
- #if defined(__HAIKU__)
--#include <StorageKit.h>
-+#include <FindDirectory.h>
-+#include <StorageDefs.h>
- #endif
- 
- cmExportCommand::cmExportCommand()
-@@ -305,14 +306,15 @@
-                                               const char* hash)
- {
- #if defined(__HAIKU__)
--  BPath dir;
--  if (find_directory(B_USER_SETTINGS_DIRECTORY, &dir) != B_OK)
-+  char dir[B_PATH_NAME_LENGTH];
-+  if (find_directory(B_USER_SETTINGS_DIRECTORY, -1, false, dir, sizeof(dir)) !=
-+      B_OK)
-     {
-     return;
-     }
--  dir.Append("cmake/packages");
--  dir.Append(package.c_str());
--  std::string fname = dir.Path();
-+  std::string fname = dir;
-+  fname += "/cmake/packages/";
-+  fname += package;
- #else
-   const char* home = cmSystemTools::GetEnv("HOME");
-   if(!home)
-diff -urN cmake-2.8-git-orig/Source/cmFindPackageCommand.cxx cmake-2.8-git/Source/cmFindPackageCommand.cxx
---- cmake-2.8-git-orig/Source/cmFindPackageCommand.cxx	2012-11-27 05:26:33.059768832 -0800
-+++ cmake-2.8-git/Source/cmFindPackageCommand.cxx	2012-12-03 12:02:17.666107904 -0800
-@@ -19,7 +19,9 @@
- #endif
- 
- #if defined(__HAIKU__)
--#include <StorageKit.h>
-+#include <string.h>
-+#include <FindDirectory.h>
-+#include <StorageDefs.h>
- #endif
- 
- void cmFindPackageNeedBackwardsCompatibility(const std::string& variable,
-@@ -1583,12 +1585,13 @@
- #if defined(_WIN32) && !defined(__CYGWIN__)
-   this->LoadPackageRegistryWinUser();
- #elif defined(__HAIKU__)
--  BPath dir;
--  if (find_directory(B_USER_SETTINGS_DIRECTORY, &dir) == B_OK)
-+  char dir[B_PATH_NAME_LENGTH];
-+  if (find_directory(B_USER_SETTINGS_DIRECTORY, -1, false, dir, sizeof(dir)) ==
-+      B_OK)
-     {
--    dir.Append("cmake/packages");
--    dir.Append(this->Name.c_str());
--    this->LoadPackageRegistryDir(dir.Path());
-+    strlcat(dir, "/cmake/packages/", sizeof(dir));
-+    strlcat(dir, this->Name.c_str(), sizeof(dir));
-+    this->LoadPackageRegistryDir(dir);
-     }
- #else
-   if(const char* home = cmSystemTools::GetEnv("HOME"))
-diff -urN cmake-2.8-git-orig/Source/cmLocalGenerator.cxx cmake-2.8-git/Source/cmLocalGenerator.cxx
---- cmake-2.8-git-orig/Source/cmLocalGenerator.cxx	2012-11-27 05:26:33.035389440 -0800
-+++ cmake-2.8-git/Source/cmLocalGenerator.cxx	2012-12-03 12:02:17.672399360 -0800
-@@ -37,7 +37,8 @@
- #include <assert.h>
- 
- #if defined(__HAIKU__)
--#include <StorageKit.h>
-+#include <FindDirectory.h>
-+#include <StorageDefs.h>
- #endif
- 
- cmLocalGenerator::cmLocalGenerator()
-@@ -354,12 +355,12 @@
-     prefix = prefix_win32.c_str();
-     }
- #elif defined(__HAIKU__)
-+  char dir[B_PATH_NAME_LENGTH];
-   if (!prefix)
-     {
--    BPath dir;
--    if (find_directory(B_COMMON_DIRECTORY, &dir) == B_OK)
-+    if (find_directory(B_COMMON_DIRECTORY, -1, false, dir, sizeof(dir)) == B_OK)
-       {
--      prefix = dir.Path();
-+      prefix = dir;
-       }
-     else
-       {
-diff -urN cmake-2.8-git-orig/Source/CPack/cmCPackGenerator.cxx cmake-2.8-git/Source/CPack/cmCPackGenerator.cxx
---- cmake-2.8-git-orig/Source/CPack/cmCPackGenerator.cxx	2012-11-27 05:26:32.015466496 -0800
-+++ cmake-2.8-git/Source/CPack/cmCPackGenerator.cxx	2012-12-03 12:02:17.677904384 -0800
-@@ -27,7 +27,8 @@
- #include <algorithm>
- 
- #if defined(__HAIKU__)
--#include <StorageKit.h>
-+#include <FindDirectory.h>
-+#include <StorageDefs.h>
- #endif
- 
- //----------------------------------------------------------------------
-@@ -1265,10 +1266,10 @@
-   this->InstallPath += "-";
-   this->InstallPath += this->GetOption("CPACK_PACKAGE_VERSION");
- #elif defined(__HAIKU__)
--  BPath dir;
--  if (find_directory(B_COMMON_DIRECTORY, &dir) == B_OK)
-+  char dir[B_PATH_NAME_LENGTH];
-+  if (find_directory(B_COMMON_DIRECTORY, -1, false, dir, sizeof(dir)) == B_OK)
-     {
--    this->InstallPath = dir.Path();
-+    this->InstallPath = dir;
-     }
-   else
-     {
-diff -urN cmake-2.8-git-orig/Tests/ComplexOneConfig/Library/CMakeLists.txt cmake-2.8-git/Tests/ComplexOneConfig/Library/CMakeLists.txt
---- cmake-2.8-git-orig/Tests/ComplexOneConfig/Library/CMakeLists.txt	2012-11-27 05:26:34.013369344 -0800
-+++ cmake-2.8-git/Tests/ComplexOneConfig/Library/CMakeLists.txt	2012-12-03 12:02:42.181665792 -0800
-@@ -51,7 +51,7 @@
-   FULL_DOCS "A simple etst proerty that means nothign and is used for nothing"
-   )
- set_target_properties(CMakeTestCLibraryShared PROPERTIES FOO BAR)
--if(NOT BEOS AND NOT WIN32)  # No libm on BeOS.
-+if(NOT BEOS AND NOT WIN32 AND NOT HAIKU)  # No libm on BeOS.
-   set_target_properties(CMakeTestCLibraryShared PROPERTIES LINK_FLAGS "-lm")
- endif()
- get_target_property(FOO_BAR_VAR CMakeTestCLibraryShared FOO)
-diff -urN cmake-2.8-git-orig/Utilities/cmcurl/CMake/CurlTests.c cmake-2.8-git/Utilities/cmcurl/CMake/CurlTests.c
---- cmake-2.8-git-orig/Utilities/cmcurl/CMake/CurlTests.c	2012-11-27 05:26:34.045350912 -0800
-+++ cmake-2.8-git/Utilities/cmcurl/CMake/CurlTests.c	2012-12-03 12:02:42.189005824 -0800
-@@ -38,7 +38,7 @@
- # define PLATFORM_AIX_V3
- #endif
- 
--#if defined(PLATFORM_SUNOS4) || defined(PLATFORM_AIX_V3) || (defined(__BEOS__) && !defined(__HAIKU__))
-+#if defined(PLATFORM_SUNOS4) || defined(PLATFORM_AIX_V3) || defined(__BEOS__)
- #error "O_NONBLOCK does not work on this platform"
- #endif
-   int socket;
-diff -urN cmake-2.8-git-orig/Utilities/cmcurl/select.c cmake-2.8-git/Utilities/cmcurl/select.c
---- cmake-2.8-git-orig/Utilities/cmcurl/select.c	2012-11-27 05:26:34.055312384 -0800
-+++ cmake-2.8-git/Utilities/cmcurl/select.c	2012-12-03 12:02:42.189792256 -0800
-@@ -39,7 +39,7 @@
- #error "We can't compile without select() support!"
- #endif
- 
--#if defined(__BEOS__) && !defined(__HAIKU__)
-+#if defined(__BEOS__)
- /* BeOS has FD_SET defined in socket.h */
- #include <socket.h>
- #endif
-diff -urN cmake-2.8-git-orig/Utilities/cmzlib/zconf.h cmake-2.8-git/Utilities/cmzlib/zconf.h
---- cmake-2.8-git-orig/Utilities/cmzlib/zconf.h	2012-11-27 05:26:34.022020096 -0800
-+++ cmake-2.8-git/Utilities/cmzlib/zconf.h	2012-12-03 12:02:42.190578688 -0800
-@@ -237,7 +237,7 @@
- #  endif
- #endif
- 
--#if defined (__BEOS__) && !defined (__HAIKU__)
-+#if defined (__BEOS__)
- #  ifdef ZLIB_DLL
- #    ifdef ZLIB_INTERNAL
- #      define ZEXPORT   __declspec(dllexport)
-diff -urN cmake-2.8-git-orig/Utilities/cmzlib/zutil.h cmake-2.8-git/Utilities/cmzlib/zutil.h
---- cmake-2.8-git-orig/Utilities/cmzlib/zutil.h	2012-11-27 05:26:34.022806528 -0800
-+++ cmake-2.8-git/Utilities/cmzlib/zutil.h	2012-12-03 12:02:42.195559424 -0800
-@@ -147,12 +147,6 @@
- #  define OS_CODE  0x0f
- #endif
- 
--/* Haiku defines both __HAIKU__ and __BEOS__ (for now) */
--/* many BeOS workarounds are no longer needed in Haiku */
--#if defined(__HAIKU__) && defined(__BEOS__)
--#undef __BEOS__
--#endif
--
- #if defined(_BEOS_) || defined(RISCOS) 
- #  define fdopen(fd,mode) NULL /* No fdopen() */
- #endif
diff --git a/dev-util/cmake/patches/cmake-2.8.1.patch b/dev-util/cmake/patches/cmake-2.8.1.patch
deleted file mode 100644
index 2f5f11180..000000000
--- a/dev-util/cmake/patches/cmake-2.8.1.patch
+++ /dev/null
@@ -1,14 +0,0 @@
-diff -urN cmake-2.8.1/bootstrap cmake-2.8.1-haiku/bootstrap
---- cmake-2.8.1/bootstrap	2010-04-06 14:45:29.040370176 +0000
-+++ cmake-2.8.1-haiku/bootstrap	2010-08-31 05:39:55.518520832 +0000
-@@ -132,7 +132,9 @@
-     cmake_default_prefix="c:/Program Files/CMake"
-   fi
- elif ${cmake_system_haiku}; then
--  cmake_default_prefix=`/bin/finddir B_COMMON_DIRECTORY`
-+  cmake_default_prefix=`finddir B_COMMON_DIRECTORY`
-+  cmake_man_dir="/documentation/man"
-+  cmake_doc_dir="/documentation/doc/cmake-${cmake_version}"
- else
-   cmake_default_prefix="/usr/local"
- fi
diff --git a/dev-util/cmake/patches/cmake-2.8.2.patch b/dev-util/cmake/patches/cmake-2.8.2.patch
deleted file mode 100644
index 9384e05a9..000000000
--- a/dev-util/cmake/patches/cmake-2.8.2.patch
+++ /dev/null
@@ -1,14 +0,0 @@
-diff -urN cmake-2.8.2/bootstrap cmake-2.8.2-haiku/bootstrap
---- cmake-2.8.2/bootstrap	2010-04-06 14:45:29.040370176 +0000
-+++ cmake-2.8.2-haiku/bootstrap	2010-08-31 05:39:55.518520832 +0000
-@@ -132,7 +132,9 @@
-     cmake_default_prefix="c:/Program Files/CMake"
-   fi
- elif ${cmake_system_haiku}; then
--  cmake_default_prefix=`/bin/finddir B_COMMON_DIRECTORY`
-+  cmake_default_prefix=`finddir B_COMMON_DIRECTORY`
-+  cmake_man_dir="/documentation/man"
-+  cmake_doc_dir="/documentation/doc/cmake-${cmake_version}"
- else
-   cmake_default_prefix="/usr/local"
- fi
diff --git a/dev-util/cmake/patches/cmake-2.8.3.patch b/dev-util/cmake/patches/cmake-2.8.3.patch
deleted file mode 100644
index 68f6a1303..000000000
--- a/dev-util/cmake/patches/cmake-2.8.3.patch
+++ /dev/null
@@ -1,116 +0,0 @@
-diff -urN cmake-2.8.3/Modules/FindGLUT.cmake cmake-2.8.3-haiku/Modules/FindGLUT.cmake
---- cmake-2.8.3/Modules/FindGLUT.cmake	2010-11-03 19:58:27.020971520 +0000
-+++ cmake-2.8.3-haiku/Modules/FindGLUT.cmake	2011-01-29 10:22:22.032505856 +0000
-@@ -46,12 +46,15 @@
-       /usr/openwin/include
-       /opt/graphics/OpenGL/include
-       /opt/graphics/OpenGL/contrib/libglut
-+      /boot/develop/headers/os/opengl
-       )
-   
-     FIND_LIBRARY( GLUT_glut_LIBRARY glut
-       /usr/openwin/lib
-+      /boot/develop/lib/x86/ 
-       )
--    
-+  
-+  IF(NOT BEOS)
-     FIND_LIBRARY( GLUT_Xi_LIBRARY Xi
-       /usr/openwin/lib
-       )
-@@ -59,6 +62,7 @@
-     FIND_LIBRARY( GLUT_Xmu_LIBRARY Xmu
-       /usr/openwin/lib
-       )
-+  ENDIF(NOT BEOS)
-     
-   ENDIF (APPLE)
-   
-@@ -69,12 +73,18 @@
-   IF(GLUT_glut_LIBRARY)
-     # Is -lXi and -lXmu required on all platforms that have it?
-     # If not, we need some way to figure out what platform we are on.
-+    IF(BEOS)
-+    SET( GLUT_LIBRARIES
-+      ${GLUT_glut_LIBRARY}
-+      )
-+    ELSE(BEOS)
-     SET( GLUT_LIBRARIES
-       ${GLUT_glut_LIBRARY}
-       ${GLUT_Xmu_LIBRARY}
-       ${GLUT_Xi_LIBRARY} 
-       ${GLUT_cocoa_LIBRARY}
-       )
-+  	ENDIF(BEOS)
-     SET( GLUT_FOUND "YES" )
-     
-     #The following deprecated settings are for backwards compatibility with CMake1.4
-@@ -84,9 +94,16 @@
-   ENDIF(GLUT_glut_LIBRARY)
- ENDIF(GLUT_INCLUDE_DIR)
- 
-+IF(BEOS)
-+MARK_AS_ADVANCED(
-+  GLUT_INCLUDE_DIR
-+  GLUT_glut_LIBRARY
-+  )
-+ELSE(BEOS)
- MARK_AS_ADVANCED(
-   GLUT_INCLUDE_DIR
-   GLUT_glut_LIBRARY
-   GLUT_Xmu_LIBRARY
-   GLUT_Xi_LIBRARY
-   )
-+ENDIF(BEOS)
-diff -urN cmake-2.8.3/Modules/FindLua51.cmake cmake-2.8.3-haiku/Modules/FindLua51.cmake
---- cmake-2.8.3/Modules/FindLua51.cmake	2010-11-03 19:58:27.023330816 +0000
-+++ cmake-2.8.3-haiku/Modules/FindLua51.cmake	2011-01-29 10:22:22.035127296 +0000
-@@ -57,13 +57,13 @@
- 
- IF(LUA_LIBRARY)
-   # include the math library for Unix
--  IF(UNIX AND NOT APPLE)
-+  IF(UNIX AND NOT APPLE AND NOT BEOS)
-     FIND_LIBRARY(LUA_MATH_LIBRARY m)
-     SET( LUA_LIBRARIES "${LUA_LIBRARY};${LUA_MATH_LIBRARY}" CACHE STRING "Lua Libraries")
-   # For Windows and Mac, don't need to explicitly include the math library
-   ELSE(UNIX AND NOT APPLE)
-     SET( LUA_LIBRARIES "${LUA_LIBRARY}" CACHE STRING "Lua Libraries")
--  ENDIF(UNIX AND NOT APPLE)
-+  ENDIF(UNIX AND NOT APPLE AND NOT BEOS)
- ENDIF(LUA_LIBRARY)
- 
- INCLUDE("${CMAKE_CURRENT_LIST_DIR}/FindPackageHandleStandardArgs.cmake")
-diff -urN cmake-2.8.3/Modules/FindOpenGL.cmake cmake-2.8.3-haiku/Modules/FindOpenGL.cmake
---- cmake-2.8.3/Modules/FindOpenGL.cmake	2010-11-03 19:58:27.024117248 +0000
-+++ cmake-2.8.3-haiku/Modules/FindOpenGL.cmake	2011-01-29 10:22:22.035913728 +0000
-@@ -80,6 +80,7 @@
-       /usr/share/doc/NVIDIA_GLX-1.0/include
-       /usr/openwin/share/include
-       /opt/graphics/OpenGL/include /usr/X11R6/include
-+      /boot/develop/headers/os/opengl
-     )
- 
-     FIND_PATH(OPENGL_xmesa_INCLUDE_DIR GL/xmesa.h
-@@ -94,6 +95,7 @@
-             /usr/openwin/lib
-             /usr/shlib /usr/X11R6/lib
-             ${HPUX_IA_OPENGL_LIB_PATH}
-+            /boot/develop/lib/x86/
-     )
- 
-     # On Unix OpenGL most certainly always requires X11.
-diff -urN cmake-2.8.3/bootstrap cmake-2.8.3-haiku/bootstrap
---- cmake-2.8.3/bootstrap	2010-11-03 19:58:26.058720256 +0000
-+++ cmake-2.8.3-haiku/bootstrap	2011-01-29 10:22:22.031981568 +0000
-@@ -137,7 +137,9 @@
-     cmake_default_prefix="c:/Program Files/CMake"
-   fi
- elif ${cmake_system_haiku}; then
--  cmake_default_prefix=`/bin/finddir B_COMMON_DIRECTORY`
-+  cmake_default_prefix=`finddir B_COMMON_DIRECTORY`
-+  cmake_man_dir="/documentation/man"
-+  cmake_doc_dir="/documentation/doc/cmake-${cmake_version}"
- else
-   cmake_default_prefix="/usr/local"
- fi
diff --git a/dev-util/cmake/patches/cmake-2.8.4.patch b/dev-util/cmake/patches/cmake-2.8.4.patch
deleted file mode 100644
index 910b48e92..000000000
--- a/dev-util/cmake/patches/cmake-2.8.4.patch
+++ /dev/null
@@ -1,116 +0,0 @@
-diff -urN cmake-2.8.4/Modules/FindGLUT.cmake cmake-2.8.4-haiku/Modules/FindGLUT.cmake
---- cmake-2.8.4/Modules/FindGLUT.cmake	2011-02-15 17:47:27.017301504 +0000
-+++ cmake-2.8.4-haiku/Modules/FindGLUT.cmake	2011-04-26 07:50:24.890241024 +0000
-@@ -46,12 +46,14 @@
-       /usr/openwin/include
-       /opt/graphics/OpenGL/include
-       /opt/graphics/OpenGL/contrib/libglut
-+      /boot/develop/headers/os/opengl
-       )
-   
-     FIND_LIBRARY( GLUT_glut_LIBRARY glut
-       /usr/openwin/lib
-+      /boot/develop/lib/x86/
-       )
--    
-+    IF(NOT BEOS)
-     FIND_LIBRARY( GLUT_Xi_LIBRARY Xi
-       /usr/openwin/lib
-       )
-@@ -59,7 +61,7 @@
-     FIND_LIBRARY( GLUT_Xmu_LIBRARY Xmu
-       /usr/openwin/lib
-       )
--    
-+    ENDIF(NOT BEOS)
-   ENDIF (APPLE)
-   
- ENDIF (WIN32)
-@@ -69,12 +71,18 @@
-   IF(GLUT_glut_LIBRARY)
-     # Is -lXi and -lXmu required on all platforms that have it?
-     # If not, we need some way to figure out what platform we are on.
-+    IF(BEOS)
-+    SET( GLUT_LIBRARIES
-+      ${GLUT_glut_LIBRARY}
-+      )
-+    ELSE(BEOS)
-     SET( GLUT_LIBRARIES
-       ${GLUT_glut_LIBRARY}
-       ${GLUT_Xmu_LIBRARY}
-       ${GLUT_Xi_LIBRARY} 
-       ${GLUT_cocoa_LIBRARY}
-       )
-+    ENDIF(BEOS)
-     SET( GLUT_FOUND "YES" )
-     
-     #The following deprecated settings are for backwards compatibility with CMake1.4
-@@ -84,9 +92,16 @@
-   ENDIF(GLUT_glut_LIBRARY)
- ENDIF(GLUT_INCLUDE_DIR)
- 
-+IF(BEOS)
-+MARK_AS_ADVANCED(
-+  GLUT_INCLUDE_DIR
-+  GLUT_glut_LIBRARY
-+  )
-+ELSE(BEOS)
- MARK_AS_ADVANCED(
-   GLUT_INCLUDE_DIR
-   GLUT_glut_LIBRARY
-   GLUT_Xmu_LIBRARY
-   GLUT_Xi_LIBRARY
-   )
-+ENDIF(BEOS)
-diff -urN cmake-2.8.4/Modules/FindLua51.cmake cmake-2.8.4-haiku/Modules/FindLua51.cmake
---- cmake-2.8.4/Modules/FindLua51.cmake	2011-02-15 17:47:27.019660800 +0000
-+++ cmake-2.8.4-haiku/Modules/FindLua51.cmake	2011-04-26 07:50:24.944504832 +0000
-@@ -57,13 +57,13 @@
- 
- IF(LUA_LIBRARY)
-   # include the math library for Unix
--  IF(UNIX AND NOT APPLE)
-+  IF(UNIX AND NOT APPLE AND NOT BEOS)
-     FIND_LIBRARY(LUA_MATH_LIBRARY m)
-     SET( LUA_LIBRARIES "${LUA_LIBRARY};${LUA_MATH_LIBRARY}" CACHE STRING "Lua Libraries")
-   # For Windows and Mac, don't need to explicitly include the math library
-   ELSE(UNIX AND NOT APPLE)
-     SET( LUA_LIBRARIES "${LUA_LIBRARY}" CACHE STRING "Lua Libraries")
--  ENDIF(UNIX AND NOT APPLE)
-+  ENDIF(UNIX AND NOT APPLE AND NOT BEOS)
- ENDIF(LUA_LIBRARY)
- 
- INCLUDE(${CMAKE_CURRENT_LIST_DIR}/FindPackageHandleStandardArgs.cmake)
-diff -urN cmake-2.8.4/Modules/FindOpenGL.cmake cmake-2.8.4-haiku/Modules/FindOpenGL.cmake
---- cmake-2.8.4/Modules/FindOpenGL.cmake	2011-02-15 17:47:27.020447232 +0000
-+++ cmake-2.8.4-haiku/Modules/FindOpenGL.cmake	2011-04-26 07:50:25.026214400 +0000
-@@ -80,6 +80,7 @@
-       /usr/share/doc/NVIDIA_GLX-1.0/include
-       /usr/openwin/share/include
-       /opt/graphics/OpenGL/include /usr/X11R6/include
-+      /boot/develop/headers/os/opengl
-     )
- 
-     FIND_PATH(OPENGL_xmesa_INCLUDE_DIR GL/xmesa.h
-@@ -94,6 +95,7 @@
-             /usr/openwin/lib
-             /usr/shlib /usr/X11R6/lib
-             ${HPUX_IA_OPENGL_LIB_PATH}
-+            /boot/develop/lib/x86/
-     )
- 
-     # On Unix OpenGL most certainly always requires X11.
-diff -urN cmake-2.8.4/bootstrap cmake-2.8.4-haiku/bootstrap
---- cmake-2.8.4/bootstrap	2011-02-15 17:47:26.054001664 +0000
-+++ cmake-2.8.4-haiku/bootstrap	2011-04-26 07:50:25.222035968 +0000
-@@ -142,7 +142,9 @@
-     cmake_default_prefix="c:/Program Files/CMake"
-   fi
- elif ${cmake_system_haiku}; then
--  cmake_default_prefix=`/bin/finddir B_COMMON_DIRECTORY`
-+  cmake_default_prefix=`finddir B_COMMON_DIRECTORY`
-+  cmake_man_dir="/documentation/man"
-+  cmake_doc_dir="/documentation/doc/cmake-${cmake_version}"
- else
-   cmake_default_prefix="/usr/local"
- fi
diff --git a/dev-util/gtk_doc/gtk_doc-1.15 b/dev-util/gtk_doc/gtk_doc-1.15.recipe
similarity index 100%
rename from dev-util/gtk_doc/gtk_doc-1.15
rename to dev-util/gtk_doc/gtk_doc-1.15.recipe
diff --git a/dev-util/gtk_doc/patches/gtk-doc-1.15.patch b/dev-util/gtk_doc/patches/gtk_doc-1.15.patch
similarity index 100%
rename from dev-util/gtk_doc/patches/gtk-doc-1.15.patch
rename to dev-util/gtk_doc/patches/gtk_doc-1.15.patch
diff --git a/dev-vcs/fossil/fossil-1.22_fossil b/dev-vcs/fossil/fossil-1.22_fossil
deleted file mode 100644
index fbf764793..000000000
--- a/dev-vcs/fossil/fossil-1.22_fossil
+++ /dev/null
@@ -1,26 +0,0 @@
-DESCRIPTION="Simple, high-reliability, distributed software configuration management" 
-HOMEPAGE="http://www.fossil-scm.org/" 
-SRC_URI="fossil+http://www.fossil-scm.org/"
-#CHECKSUM_MD5=""
-REVISION="3"
-STATUS_HAIKU="stable"
-DEPEND=""
-
-BUILD()
-{
-	./configure --prefix=`finddir B_COMMON_DIRECTORY`
-	make
-}
-
-INSTALL()
-{
-	make install
-}
-
-TEST()
-{
-	make test
-}
-
-LICENSE="BSD (2-clause)"
-COPYRIGHT="2007 D. Richard Hipp"
diff --git a/dev-vcs/subversion/subversion-1.7.0_rc2 b/dev-vcs/subversion/subversion-1.7.0_rc2.recipe
similarity index 100%
rename from dev-vcs/subversion/subversion-1.7.0_rc2
rename to dev-vcs/subversion/subversion-1.7.0_rc2.recipe
diff --git a/dev-vcs/subversion/subversion-1.7.xx_svn b/dev-vcs/subversion/subversion-1.7.xx_svn
deleted file mode 100644
index 3a6829236..000000000
--- a/dev-vcs/subversion/subversion-1.7.xx_svn
+++ /dev/null
@@ -1,30 +0,0 @@
-DESCRIPTION="Subversion is an open source version control system" 
-HOMEPAGE="http://subversion.apache.org" 
-SRC_URI="svn+http://svn.apache.org/repos/asf/subversion/trunk"
-#CHECKSUM_MD5=""
-REVISION="1"
-STATUS_HAIKU="stable"
-DEPEND=""
-BUILD()
-{
-	cd subversion-1.7.xx-svn
-	libtoolize --force --copy --install
-	aclocal -I build -I build/ac-macros
-	autoconf
-	./autogen.sh
-	./configure --prefix=`finddir B_COMMON_DIRECTORY` \
-	--with-apr=`finddir B_COMMON_BIN_DIRECTORY`/apr-1-config \
-	--with-apr-util=`finddir B_COMMON_BIN_DIRECTORY`/apu-1-config \
-	--with-neon=/boot/common \
-	--with-editor=nano \
-	--with-zlib=/boot/common
-	make
-}
-
-INSTALL()
-{
-	cd subversion-1.7.xx-svn
-	make install
-}
-LICENSE="Apache-Subversion"
-COPYRIGHT="2010 The Apache Software Foundation"
diff --git a/games-emulation/dosbox/dosbox-0.74_svn b/games-emulation/dosbox/dosbox-0.74_svn.recipe
similarity index 100%
rename from games-emulation/dosbox/dosbox-0.74_svn
rename to games-emulation/dosbox/dosbox-0.74_svn.recipe
diff --git a/games-emulation/dosbox/dosbox-0.74-svn.patch b/games-emulation/dosbox/patches/dosbox-0.74_svn.patch
similarity index 100%
rename from games-emulation/dosbox/dosbox-0.74-svn.patch
rename to games-emulation/dosbox/patches/dosbox-0.74_svn.patch
diff --git a/games-engines/freesci/freesci-0.6.4_beos.patch b/games-engines/freesci/patches/freesci-0.6.4_beos.patch
similarity index 100%
rename from games-engines/freesci/freesci-0.6.4_beos.patch
rename to games-engines/freesci/patches/freesci-0.6.4_beos.patch
diff --git a/games-puzzle/numptyphysics/numptyphysics-0.2_157 b/games-puzzle/numptyphysics/numptyphysics-0.2_157.recipe
similarity index 100%
rename from games-puzzle/numptyphysics/numptyphysics-0.2_157
rename to games-puzzle/numptyphysics/numptyphysics-0.2_157.recipe
diff --git a/gnome-base/gnome_common/gnome_common-2.28 b/gnome-base/gnome_common/gnome_common-2.28.recipe
similarity index 100%
rename from gnome-base/gnome_common/gnome_common-2.28
rename to gnome-base/gnome_common/gnome_common-2.28.recipe
diff --git a/haiku-apps/armyknife/armyknife-999_git b/haiku-apps/armyknife/armyknife-999_git
deleted file mode 100644
index cd2190074..000000000
--- a/haiku-apps/armyknife/armyknife-999_git
+++ /dev/null
@@ -1,21 +0,0 @@
-DESCRIPTION="ArmyKnife is an application that lets you edit the metadata of audio files." 
-HOMEPAGE="http://dev.osdrawer.net/projects/armyknife" 
-SRC_URI="git+https://github.com/scottmc/ArmyKnife.git"
-REVISION="1"
-STATUS_HAIKU="stable"
-DEPEND="media-libs/taglib >= 1.6.3"
-#CHECKSUM_MD5=""
-BUILD()
-{
-	cd armyknife-999-git
-	make
-}
-
-INSTALL()
-{
-	cd armyknife-999-git
-	make zipfile
-	mkdir -p ${DESTDIR}/boot/apps
-	unzip release/ArmyKnife-*.zip -d ${DESTDIR}/boot/apps
-}
-
diff --git a/haiku-apps/bowser/bowser-1.1.1_cvs b/haiku-apps/bowser/bowser-1.1.1_cvs.recipe
similarity index 100%
rename from haiku-apps/bowser/bowser-1.1.1_cvs
rename to haiku-apps/bowser/bowser-1.1.1_cvs.recipe
diff --git a/haiku-apps/burnitnow/burnitnow-2_svn b/haiku-apps/burnitnow/burnitnow-2_svn
deleted file mode 100644
index 85423e314..000000000
--- a/haiku-apps/burnitnow/burnitnow-2_svn
+++ /dev/null
@@ -1,26 +0,0 @@
-DESCRIPTION="BurnItNow - GUI CD burning app for Haiku" 
-HOMEPAGE="http://dev.osdrawer.net/projects/burnitnow" 
-SRC_URI="svn+http://svn.osdrawer.net/burnitnow/trunk"
-REVISION="1"
-STATUS_HAIKU="stable"
-DEPEND="dev-util/cmake >= 2.8.0
-	app-cdr/cdrtools > 3.00"
-#CHECKSUM_MD5=""
-BUILD()
-{
-	cd burnitnow-2-svn
-	cmake .
-	make
-}
-
-INSTALL()
-{
-       cd burnitnow-2-svn
-       mkdir -p ${DESTDIR}/boot/apps/BurnItNow
-       cp -a BurnItNow ${DESTDIR}/boot/apps/BurnItNow
-       if [ -z ${DESTDIR} ];then
-               find /boot/apps/BurnItNow -type d -name ".svn" | xargs rm -rf
-       fi
-}
-LICENSE="MIT"
-COPYRIGHT="Copyright 2010-2011 BurnItNow Team"
diff --git a/haiku-apps/burnitnow/burnitnow-beta5_svn b/haiku-apps/burnitnow/burnitnow-beta5_svn.recipe
similarity index 100%
rename from haiku-apps/burnitnow/burnitnow-beta5_svn
rename to haiku-apps/burnitnow/burnitnow-beta5_svn.recipe
diff --git a/haiku-apps/burnitnow/burnitnow-beta6_git b/haiku-apps/burnitnow/burnitnow-beta6_git
deleted file mode 100644
index 9a3fe6948..000000000
--- a/haiku-apps/burnitnow/burnitnow-beta6_git
+++ /dev/null
@@ -1,35 +0,0 @@
-DESCRIPTION="BurnItNow - GUI CD burning app for Haiku" 
-HOMEPAGE="http://github.com/scottmc/burnitnow" 
-SRC_URI="git://github.com/scottmc/BurnItNow.git"
-REVISION="1"
-STATUS_HAIKU="stable"
-DEPEND="app-cdr/cdrtools > 3.00"
-#CHECKSUM_MD5=""
-
-BUILD()
-{
-	cd burnitnow-beta6-git/legacy
-	cmake .
-	make
-}
-
-INSTALL()
-{
-	cd burnitnow-beta6-git/legacy
-	BURNITNOWDIR=${DESTDIR}/`finddir B_APPS_DIRECTORY`/BurnItNow
-	mkdir -p ${BURNITNOWDIR}/Docs
-	cp -a BurnItNow ${BURNITNOWDIR}
-	cp -a LICENSE ${BURNITNOWDIR}/LICENSE
-	cp -a TODO ${BURNITNOWDIR}/TODO
-	cp -a README ${BURNITNOWDIR}/README
-	cp -a AUTHORS ${BURNITNOWDIR}/AUTHORS
-	cp -a Changes ${BURNITNOWDIR}/Changes
-	cp -a Docs ${BURNITNOWDIR}/
-	if [ -z ${DESTDIR} ];then
-		find /boot/apps/BurnItNow -type d -name ".svn" | xargs rm -rf
-	fi
-}
-
-LICENSE="MIT"
-COPYRIGHT="2000-2002 Johan Nilsson
-	2010-2013 BurnItNow Maintainers"
diff --git a/haiku-apps/burnitnow/patches/burnitnow-beta5-svn.patch b/haiku-apps/burnitnow/patches/burnitnow-beta5_svn.patch
similarity index 100%
rename from haiku-apps/burnitnow/patches/burnitnow-beta5-svn.patch
rename to haiku-apps/burnitnow/patches/burnitnow-beta5_svn.patch
diff --git a/haiku-apps/caya_gpl_protocols/caya_gpl_protocols-0.HEAD b/haiku-apps/caya_gpl_protocols/caya_gpl_protocols-0.HEAD.recipe
similarity index 100%
rename from haiku-apps/caya_gpl_protocols/caya_gpl_protocols-0.HEAD
rename to haiku-apps/caya_gpl_protocols/caya_gpl_protocols-0.HEAD.recipe
diff --git a/haiku-apps/caya_gpl_protocols/caya_gpl_protocols-19 b/haiku-apps/caya_gpl_protocols/caya_gpl_protocols-19.recipe
similarity index 100%
rename from haiku-apps/caya_gpl_protocols/caya_gpl_protocols-19
rename to haiku-apps/caya_gpl_protocols/caya_gpl_protocols-19.recipe
diff --git a/haiku-apps/caya_gpl_protocols/caya_gpl_protocols-24 b/haiku-apps/caya_gpl_protocols/caya_gpl_protocols-24.recipe
similarity index 100%
rename from haiku-apps/caya_gpl_protocols/caya_gpl_protocols-24
rename to haiku-apps/caya_gpl_protocols/caya_gpl_protocols-24.recipe
diff --git a/haiku-apps/caya_gpl_protocols/caya_gpl_protocols-35 b/haiku-apps/caya_gpl_protocols/caya_gpl_protocols-35.recipe
similarity index 100%
rename from haiku-apps/caya_gpl_protocols/caya_gpl_protocols-35
rename to haiku-apps/caya_gpl_protocols/caya_gpl_protocols-35.recipe
diff --git a/haiku-apps/caya_gpl_protocols/caya_gpl_protocols-36 b/haiku-apps/caya_gpl_protocols/caya_gpl_protocols-36.recipe
similarity index 100%
rename from haiku-apps/caya_gpl_protocols/caya_gpl_protocols-36
rename to haiku-apps/caya_gpl_protocols/caya_gpl_protocols-36.recipe
diff --git a/haiku-apps/caya_gpl_protocols/patches/caya-gpl-protocols-0.HEAD.patch b/haiku-apps/caya_gpl_protocols/patches/caya_gpl_protocols-0.HEAD.patch
similarity index 100%
rename from haiku-apps/caya_gpl_protocols/patches/caya-gpl-protocols-0.HEAD.patch
rename to haiku-apps/caya_gpl_protocols/patches/caya_gpl_protocols-0.HEAD.patch
diff --git a/haiku-apps/friss/friss-0.7_svn b/haiku-apps/friss/friss-0.7_svn.recipe
similarity index 100%
rename from haiku-apps/friss/friss-0.7_svn
rename to haiku-apps/friss/friss-0.7_svn.recipe
diff --git a/haiku-apps/haikutwitter/haikutwitter-1.0_svn b/haiku-apps/haikutwitter/haikutwitter-1.0_svn
deleted file mode 100644
index 0696c3811..000000000
--- a/haiku-apps/haikutwitter/haikutwitter-1.0_svn
+++ /dev/null
@@ -1,20 +0,0 @@
-DESCRIPTION="Twitter client for Haiku OS"
-HOMEPAGE="http://code.google.com/p/haikutwitter/"
-SRC_URI="svn+http://haikutwitter.googlecode.com/svn/trunk/HaikuTwitter"
-REVISION="1"
-STATUS_HAIKUE="broken"
-MESSAGE="This port only builds with gcc4. Use 'setgcc gcc4' before building."
-DEPEND="net-misc/curl >= 7.26.0"
-BUILD()
-{
-	cd haikutwitter-1.0-svn
-	make
-}
-
-INSTALL()
-{
-	cd haikutwitter-1.0-svn
-	make install
-}
-LICENSE="MIT"
-COPYRIGHT="2010-2012 Martin Hebnes Pedersen"
diff --git a/haiku-apps/hare/hare-beta1_git b/haiku-apps/hare/hare-beta1_git.recipe
similarity index 100%
rename from haiku-apps/hare/hare-beta1_git
rename to haiku-apps/hare/hare-beta1_git.recipe
diff --git a/haiku-apps/open_sum_it/open_sum_it-108 b/haiku-apps/open_sum_it/open_sum_it-108.recipe
similarity index 100%
rename from haiku-apps/open_sum_it/open_sum_it-108
rename to haiku-apps/open_sum_it/open_sum_it-108.recipe
diff --git a/haiku-apps/paladin/paladin-1.3_hg b/haiku-apps/paladin/paladin-1.3_hg.recipe
similarity index 100%
rename from haiku-apps/paladin/paladin-1.3_hg
rename to haiku-apps/paladin/paladin-1.3_hg.recipe
diff --git a/haiku-apps/thememanager/thememanager-0_svn b/haiku-apps/thememanager/thememanager-0_svn.recipe
similarity index 100%
rename from haiku-apps/thememanager/thememanager-0_svn
rename to haiku-apps/thememanager/thememanager-0_svn.recipe
diff --git a/media-fonts/arabeyes_fonts/arabeyes_fonts-1.1 b/media-fonts/arabeyes_fonts/arabeyes_fonts-1.1.recipe
similarity index 100%
rename from media-fonts/arabeyes_fonts/arabeyes_fonts-1.1
rename to media-fonts/arabeyes_fonts/arabeyes_fonts-1.1.recipe
diff --git a/media-fonts/courier_prime/courier_prime-1.0 b/media-fonts/courier_prime/courier_prime-1.0.recipe
similarity index 100%
rename from media-fonts/courier_prime/courier_prime-1.0
rename to media-fonts/courier_prime/courier_prime-1.0.recipe
diff --git a/media-fonts/farsi_fonts/farsi_fonts-0.4 b/media-fonts/farsi_fonts/farsi_fonts-0.4.recipe
similarity index 100%
rename from media-fonts/farsi_fonts/farsi_fonts-0.4
rename to media-fonts/farsi_fonts/farsi_fonts-0.4.recipe
diff --git a/media-fonts/kacst_fonts/kacst_fonts-5.0 b/media-fonts/kacst_fonts/kacst_fonts-5.0.recipe
similarity index 100%
rename from media-fonts/kacst_fonts/kacst_fonts-5.0
rename to media-fonts/kacst_fonts/kacst_fonts-5.0.recipe
diff --git a/media-fonts/lateef_font/lateef_font-1.001 b/media-fonts/lateef_font/lateef_font-1.001.recipe
similarity index 100%
rename from media-fonts/lateef_font/lateef_font-1.001
rename to media-fonts/lateef_font/lateef_font-1.001.recipe
diff --git a/media-fonts/liberation_fonts/liberation_fonts-1.06.0.20100721 b/media-fonts/liberation_fonts/liberation_fonts-1.06.0.20100721.recipe
similarity index 100%
rename from media-fonts/liberation_fonts/liberation_fonts-1.06.0.20100721
rename to media-fonts/liberation_fonts/liberation_fonts-1.06.0.20100721.recipe
diff --git a/media-fonts/nafees_nastaleeq/nafees_nastaleeq-1.02 b/media-fonts/nafees_nastaleeq/nafees_nastaleeq-1.02.recipe
similarity index 100%
rename from media-fonts/nafees_nastaleeq/nafees_nastaleeq-1.02
rename to media-fonts/nafees_nastaleeq/nafees_nastaleeq-1.02.recipe
diff --git a/media-fonts/nafees_riqa/nafees_riqa-1.00 b/media-fonts/nafees_riqa/nafees_riqa-1.00.recipe
similarity index 100%
rename from media-fonts/nafees_riqa/nafees_riqa-1.00
rename to media-fonts/nafees_riqa/nafees_riqa-1.00.recipe
diff --git a/media-fonts/scheherazade_font/scheherazade_font-1.005 b/media-fonts/scheherazade_font/scheherazade_font-1.005.recipe
similarity index 100%
rename from media-fonts/scheherazade_font/scheherazade_font-1.005
rename to media-fonts/scheherazade_font/scheherazade_font-1.005.recipe
diff --git a/media-fonts/x_series_fonts/x_series_fonts-2.0 b/media-fonts/x_series_fonts/x_series_fonts-2.0.recipe
similarity index 100%
rename from media-fonts/x_series_fonts/x_series_fonts-2.0
rename to media-fonts/x_series_fonts/x_series_fonts-2.0.recipe
diff --git a/media-gfx/imagemagick/imagemagick-6.6.1_10 b/media-gfx/imagemagick/imagemagick-6.6.1_10.recipe
similarity index 100%
rename from media-gfx/imagemagick/imagemagick-6.6.1_10
rename to media-gfx/imagemagick/imagemagick-6.6.1_10.recipe
diff --git a/media-gfx/sane_backends/patches/sane-backends-1.0.21.patch b/media-gfx/sane_backends/patches/sane_backends-1.0.21.patch
similarity index 100%
rename from media-gfx/sane_backends/patches/sane-backends-1.0.21.patch
rename to media-gfx/sane_backends/patches/sane_backends-1.0.21.patch
diff --git a/media-gfx/tuxpaint/tuxpaint-0.9.2x_cvs b/media-gfx/tuxpaint/tuxpaint-0.9.2x_cvs.recipe
similarity index 100%
rename from media-gfx/tuxpaint/tuxpaint-0.9.2x_cvs
rename to media-gfx/tuxpaint/tuxpaint-0.9.2x_cvs.recipe
diff --git a/media-libs/allegro/allegro-4.4.x_svn b/media-libs/allegro/allegro-4.4.x_svn.recipe
similarity index 100%
rename from media-libs/allegro/allegro-4.4.x_svn
rename to media-libs/allegro/allegro-4.4.x_svn.recipe
diff --git a/media-libs/allegro/patches/allegro-4.3.10-haiku-1.diff b/media-libs/allegro/patches/allegro-4.3.10-haiku-1.diff
deleted file mode 100644
index 8c1ce789b..000000000
--- a/media-libs/allegro/patches/allegro-4.3.10-haiku-1.diff
+++ /dev/null
@@ -1,736 +0,0 @@
-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-08-23 17:29:03.000000000 -0700
-@@ -9,7 +9,7 @@
-    echo
-    echo "Usage: $0 <platform> [--quick|--dtou|--utod|--utom|--mtou]"
-    echo
--   echo "Where platform is one of: bcc32, beos, djgpp, mingw, qnx, unix"
-+   echo "Where platform is one of: bcc32, beos, djgpp, haiku, mingw, qnx, unix"
-    echo "mac, macosx, macosx-universal and watcom."
-    echo "The --quick parameter turns off text file conversion, --dtou converts from"
-    echo "DOS/Win32 format to Unix, --utod converts from Unix to DOS/Win32 format,"
-@@ -140,6 +140,7 @@
-    "bcc32"   ) proc_fix "Windows (BCC32)"   "makefile.bcc" "ALLEGRO_BCC32";;
-    "beos"    ) proc_fix "BeOS"              "makefile.be"  "ALLEGRO_BEOS";;
-    "djgpp"   ) proc_fix "DOS (djgpp)"       "makefile.dj"  "ALLEGRO_DJGPP";;
-+   "haiku"    ) proc_fix "Haiku"              "makefile.haiku"  "ALLEGRO_HAIKU";;
-    "mingw"   ) proc_fix "Windows (MinGW)"   "makefile.mgw" "ALLEGRO_MINGW32";;
-    "mingw32" ) proc_fix "Windows (MinGW)"   "makefile.mgw" "ALLEGRO_MINGW32";;
-    # The 'msvc' target is undocumented in the help message, but is used
-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-08-25 22:04:47.000000000 -0700
-@@ -48,6 +48,8 @@
-       #include "allegro/platform/albcc32.h"
-    #elif defined ALLEGRO_MSVC
-       #include "allegro/platform/almsvc.h"
-+   #elif defined ALLEGRO_HAIKU
-+      #include "allegro/platform/alhakcfg.h"
-    #elif defined ALLEGRO_BEOS
-       #include "allegro/platform/albecfg.h"
-    #elif defined ALLEGRO_MPW
-diff -urN allegro-4.3.10/include/allegro/platform/ainthaiku.h allegro-4.3.10-haiku/include/allegro/platform/ainthaiku.h
---- allegro-4.3.10/include/allegro/platform/ainthaiku.h	1969-12-31 16:00:00.000000000 -0800
-+++ allegro-4.3.10-haiku/include/allegro/platform/ainthaiku.h	2006-03-18 07:05:34.000000000 -0800
-@@ -0,0 +1,151 @@
-+/*         ______   ___    ___ 
-+ *        /\  _  \ /\_ \  /\_ \ 
-+ *        \ \ \L\ \\//\ \ \//\ \      __     __   _ __   ___ 
-+ *         \ \  __ \ \ \ \  \ \ \   /'__`\ /'_ `\/\`'__\/ __`\
-+ *          \ \ \/\ \ \_\ \_ \_\ \_/\  __//\ \L\ \ \ \//\ \L\ \
-+ *           \ \_\ \_\/\____\/\____\ \____\ \____ \ \_\\ \____/
-+ *            \/_/\/_/\/____/\/____/\/____/\/___L\ \/_/ \/___/
-+ *                                           /\____/
-+ *                                           \_/__/
-+ *
-+ *      Definitions for internal use by the BeOS configuration.
-+ *
-+ *      By Jason Wilkins.
-+ *
-+ *      See readme.txt for copyright information.
-+ */
-+
-+
-+#include "bealleg.h"
-+
-+#ifdef __cplusplus
-+extern status_t       ignore_result;
-+
-+extern volatile int32 focus_count;
-+#endif
-+
-+#ifdef __cplusplus
-+extern "C" {
-+#endif
-+
-+#define WND_TITLE_SIZE  128
-+
-+AL_ARRAY(char, wnd_title);
-+
-+int  be_key_init(void);
-+void be_key_exit(void);
-+void be_key_set_leds(int leds);
-+void be_key_set_rate(int delay, int repeat);
-+void be_key_wait_for_input(void);
-+void be_key_stop_waiting_for_input(void);
-+void be_key_suspend(void);
-+void be_key_resume(void);
-+
-+int  be_sys_init(void);
-+void be_sys_exit(void);
-+void _be_sys_get_executable_name(char *output, int size);
-+void be_sys_get_executable_name(char *output, int size);
-+int be_sys_find_resource(char *dest, AL_CONST char *resource, int size);
-+void be_sys_set_window_title(AL_CONST char *name);
-+int be_sys_set_close_button_callback(void (*proc)(void));
-+void be_sys_message(AL_CONST char *msg);
-+int be_sys_set_display_switch_mode(int mode);
-+int be_sys_desktop_color_depth(void);
-+int be_sys_get_desktop_resolution(int *width, int *height);
-+void be_sys_get_gfx_safe_mode(int *driver, struct GFX_MODE *mode);
-+void be_sys_yield_timeslice(void);
-+void *be_sys_create_mutex(void);
-+void be_sys_destroy_mutex(void *handle);
-+void be_sys_lock_mutex(void *handle);
-+void be_sys_unlock_mutex(void *handle);
-+void be_sys_suspend(void);
-+void be_sys_resume(void);
-+void be_main_suspend(void);
-+void be_main_resume(void);
-+
-+struct BITMAP *be_gfx_bwindowscreen_accel_init(int w, int h, int v_w, int v_h, int color_depth);
-+struct BITMAP *be_gfx_bwindowscreen_init(int w, int h, int v_w, int v_h, int color_depth);
-+void be_gfx_bwindowscreen_exit(struct BITMAP *b);
-+void be_gfx_bwindowscreen_acquire(struct BITMAP *b);
-+void be_gfx_bwindowscreen_release(struct BITMAP *b);
-+void be_gfx_bwindowscreen_set_palette(AL_CONST struct RGB *p, int from, int to, int vsync);
-+int be_gfx_bwindowscreen_scroll(int x, int y);
-+int be_gfx_bwindowscreen_request_scroll(int x, int y);
-+int be_gfx_bwindowscreen_poll_scroll(void);
-+int be_gfx_bwindowscreen_request_video_bitmap(struct BITMAP *bitmap);
-+void be_gfx_vsync(void);
-+struct GFX_MODE_LIST *be_gfx_bwindowscreen_fetch_mode_list(void);
-+void be_gfx_bwindowscreen_accelerate(int color_depth);
-+#ifdef ALLEGRO_NO_ASM
-+uintptr_t be_gfx_bwindowscreen_read_write_bank(BITMAP *bmp, int lyne);
-+void be_gfx_bwindowscreen_unwrite_bank(BITMAP *bmp);
-+#else
-+uintptr_t _be_gfx_bwindowscreen_read_write_bank_asm(BITMAP *bmp, int lyne);
-+void _be_gfx_bwindowscreen_unwrite_bank_asm(BITMAP *bmp);
-+#endif
-+
-+struct BITMAP *be_gfx_bdirectwindow_init(int w, int h, int v_w, int v_h, int color_depth);
-+void be_gfx_bdirectwindow_exit(struct BITMAP *b);
-+void be_gfx_bdirectwindow_acquire(struct BITMAP *bmp);
-+void be_gfx_bdirectwindow_release(struct BITMAP *bmp);
-+void be_gfx_bdirectwindow_set_palette(AL_CONST struct RGB *p, int from, int to, int vsync);
-+
-+struct BITMAP *be_gfx_bwindow_init(int w, int h, int v_w, int v_h, int color_depth);
-+void be_gfx_bwindow_exit(struct BITMAP *b);
-+void be_gfx_bwindow_acquire(struct BITMAP *bmp);
-+void be_gfx_bwindow_release(struct BITMAP *bmp);
-+void be_gfx_bwindow_set_palette(AL_CONST struct RGB *p, int from, int to, int vsync);
-+
-+#ifdef ALLEGRO_NO_ASM
-+void _be_gfx_bwindow_unwrite_bank(BITMAP *bmp);
-+uintptr_t _be_gfx_bwindow_read_write_bank(BITMAP *bmp, int lyne);
-+#else
-+void _be_gfx_bwindow_unwrite_bank_asm(BITMAP *bmp);
-+uintptr_t _be_gfx_bwindow_read_write_bank_asm(BITMAP *bmp, int lyne);
-+#endif
-+
-+struct BITMAP *be_gfx_overlay_init(int w, int h, int v_w, int v_h, int color_depth);
-+void be_gfx_overlay_exit(struct BITMAP *b);
-+
-+int  be_time_init(void);
-+void be_time_exit(void);
-+void be_time_rest(unsigned int tyme, AL_METHOD(void, callback, (void)));
-+void be_time_suspend(void);
-+void be_time_resume(void);
-+
-+int be_mouse_init(void);
-+void be_mouse_exit(void);
-+void be_mouse_position(int x, int y);
-+void be_mouse_set_range(int x1, int y_1, int x2, int y2);
-+void be_mouse_set_speed(int xspeed, int yspeed);
-+void be_mouse_get_mickeys(int *mickeyx, int *mickeyy);
-+
-+int be_joy_init(void);
-+void be_joy_exit(void);
-+int be_joy_poll(void);
-+
-+int be_sound_detect(int input);
-+int be_sound_init(int input, int voices);
-+void be_sound_exit(int input);
-+void *be_sound_lock_voice(int voice, int start, int end);
-+void be_sound_unlock_voice(int voice);
-+int be_sound_buffer_size(void);
-+int be_sound_set_mixer_volume(int volume);
-+int be_sound_get_mixer_volume(void);
-+void be_sound_suspend(void);
-+void be_sound_resume(void);
-+
-+int be_midi_detect(int input);
-+int be_midi_init(int input, int voices);
-+void be_midi_exit(int input);
-+int be_midi_set_mixer_volume(int volume);
-+int be_midi_get_mixer_volume(void);
-+void be_midi_key_on(int inst, int note, int bend, int vol, int pan);
-+void be_midi_key_off(int voice);
-+void be_midi_set_volume(int voice, int vol);
-+void be_midi_set_pitch(int voice, int note, int bend);
-+void be_midi_set_pan(int voice, int pan);
-+
-+#ifdef __cplusplus
-+}
-+#endif
-diff -urN allegro-4.3.10/include/allegro/platform/alhaiku.h allegro-4.3.10-haiku/include/allegro/platform/alhaiku.h
---- allegro-4.3.10/include/allegro/platform/alhaiku.h	1969-12-31 16:00:00.000000000 -0800
-+++ allegro-4.3.10-haiku/include/allegro/platform/alhaiku.h	2002-10-01 11:05:12.000000000 -0700
-@@ -0,0 +1,76 @@
-+/*         ______   ___    ___ 
-+ *        /\  _  \ /\_ \  /\_ \ 
-+ *        \ \ \L\ \\//\ \ \//\ \      __     __   _ __   ___ 
-+ *         \ \  __ \ \ \ \  \ \ \   /'__`\ /'_ `\/\`'__\/ __`\
-+ *          \ \ \/\ \ \_\ \_ \_\ \_/\  __//\ \L\ \ \ \//\ \L\ \
-+ *           \ \_\ \_\/\____\/\____\ \____\ \____ \ \_\\ \____/
-+ *            \/_/\/_/\/____/\/____/\/____/\/___L\ \/_/ \/___/
-+ *                                           /\____/
-+ *                                           \_/__/
-+ *
-+ *      BeOS specific definitions header file.
-+ *
-+ *      By Jason Wilkins.
-+ *
-+ *      See readme.txt for copyright information.
-+ */
-+
-+
-+/* system driver */
-+#define SYSTEM_BEOS           AL_ID('B','S','Y','S')
-+AL_VAR(SYSTEM_DRIVER, system_beos);
-+
-+/* timer driver */
-+#define TIMER_BEOS            AL_ID('B','T','I','M')
-+AL_VAR(TIMER_DRIVER, timer_beos);
-+
-+/* keyboard driver */
-+#define KEYBOARD_BEOS         AL_ID('B','K','E','Y')
-+AL_VAR(KEYBOARD_DRIVER, keyboard_beos);
-+
-+/* mouse driver */
-+#define MOUSE_BEOS            AL_ID('B','M','O','U')
-+AL_VAR(MOUSE_DRIVER, mouse_beos);
-+
-+/* joystick driver */
-+#define JOYSTICK_BEOS         AL_ID('B','J','O','Y')
-+AL_VAR(JOYSTICK_DRIVER, joystick_beos);
-+
-+/* graphics drivers */
-+#define GFX_BWINDOWSCREEN_ACCEL  AL_ID('B','W','S','A')
-+#define GFX_BWINDOWSCREEN        AL_ID('B','W','S',' ')
-+AL_VAR(GFX_DRIVER, gfx_beos_bwindowscreen_accel);
-+AL_VAR(GFX_DRIVER, gfx_beos_bwindowscreen);
-+
-+#define GFX_BDIRECTWINDOW        AL_ID('B','D','W','N')
-+#define GFX_BWINDOW              AL_ID('B','W','N',' ')
-+AL_VAR(GFX_DRIVER, gfx_beos_bdirectwindow);
-+AL_VAR(GFX_DRIVER, gfx_beos_bwindow);
-+
-+#define GFX_BWINDOW_OVERLAY      AL_ID('B','O','V','L')
-+AL_VAR(GFX_DRIVER, gfx_beos_overlay);
-+
-+/* digi drivers */
-+#define DIGI_BEOS             AL_ID('B','D','I','G')
-+AL_VAR(DIGI_DRIVER, digi_beos);
-+
-+/* midi drivers */
-+#define MIDI_BEOS             AL_ID('B','M','I','D')
-+AL_VAR(MIDI_DRIVER, midi_beos);
-+
-+#define GFX_DRIVER_BEOS                                                 \
-+   { GFX_BWINDOWSCREEN_ACCEL,  &gfx_beos_bwindowscreen_accel, TRUE },	\
-+   { GFX_BWINDOWSCREEN,        &gfx_beos_bwindowscreen,       TRUE },	\
-+   { GFX_BDIRECTWINDOW,        &gfx_beos_bdirectwindow,       TRUE },	\
-+   { GFX_BWINDOW,              &gfx_beos_bwindow,             TRUE },   \
-+   { GFX_BWINDOW_OVERLAY,      &gfx_beos_overlay,             TRUE },
-+
-+#define DIGI_DRIVER_BEOS                                                \
-+   {  DIGI_BEOS,       &digi_beos,      TRUE  },
-+   
-+#define MIDI_DRIVER_BEOS                                                \
-+   {  MIDI_BEOS,       &midi_beos,      TRUE  },
-+
-+#define JOYSTICK_DRIVER_BEOS                                            \
-+   {  JOYSTICK_BEOS,   &joystick_beos,  TRUE  },
-+
-diff -urN allegro-4.3.10/include/allegro/platform/alhakcfg.h allegro-4.3.10-haiku/include/allegro/platform/alhakcfg.h
---- allegro-4.3.10/include/allegro/platform/alhakcfg.h	1969-12-31 16:00:00.000000000 -0800
-+++ allegro-4.3.10-haiku/include/allegro/platform/alhakcfg.h	2008-08-25 22:07:11.000000000 -0700
-@@ -0,0 +1,43 @@
-+/*         ______   ___    ___ 
-+ *        /\  _  \ /\_ \  /\_ \ 
-+ *        \ \ \L\ \\//\ \ \//\ \      __     __   _ __   ___ 
-+ *         \ \  __ \ \ \ \  \ \ \   /'__`\ /'_ `\/\`'__\/ __`\
-+ *          \ \ \/\ \ \_\ \_ \_\ \_/\  __//\ \L\ \ \ \//\ \L\ \
-+ *           \ \_\ \_\/\____\/\____\ \____\ \____ \ \_\\ \____/
-+ *            \/_/\/_/\/____/\/____/\/____/\/___L\ \/_/ \/___/
-+ *                                           /\____/
-+ *                                           \_/__/
-+ *
-+ *      Configuration defines for use with BeOS.
-+ *
-+ *      By Jason Wilkins.
-+ *
-+ *      See readme.txt for copyright information.
-+ */
-+
-+
-+#include <fcntl.h>
-+#include <unistd.h>
-+
-+/* provide implementations of missing functions */
-+#define ALLEGRO_NO_STRICMP
-+#define ALLEGRO_NO_STRLWR
-+#define ALLEGRO_NO_STRUPR
-+
-+/* a static auto config */
-+#define ALLEGRO_HAVE_DIRENT_H   1
-+#define ALLEGRO_HAVE_INTTYPES_H 1       /* TODO: check this */
-+#define ALLEGRO_HAVE_STDINT_H   1       /* TODO: check this */
-+#define ALLEGRO_HAVE_SYS_TIME_H 1
-+
-+/* describe this platform */
-+#define ALLEGRO_PLATFORM_STR  "Haiku"
-+#define ALLEGRO_LITTLE_ENDIAN
-+#define ALLEGRO_CONSOLE_OK
-+#define ALLEGRO_USE_CONSTRUCTOR
-+#define ALLEGRO_MULTITHREADED
-+
-+/* arrange for other headers to be included later on */
-+#define ALLEGRO_EXTRA_HEADER     "allegro/platform/alhaiku.h"
-+#define ALLEGRO_INTERNAL_HEADER  "allegro/platform/ainthaiku.h"
-+#define ALLEGRO_ASMCAPA_HEADER   "obj/beos/asmcapa.h"
-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-08-23 17:44:44.000000000 -0700
-@@ -8,7 +8,7 @@
- #        DEBUGMODE=2        selects a build intended to debug Allegro itself.
- #        PROFILEMODE=1      selects a profiling build.
- #        WARNMODE=1         selects strict compiler warnings.
--#        STATICLINK=1       use static linking (MinGW32, MSVC, BeOS).
-+#        STATICLINK=1       use static linking (MinGW32, MSVC, BeOS, Haiku).
- #        STATICRUNTIME=1    link to a static C runtime library (/MT) (MSVC)
- #        TARGET_ARCH_COMPAT optimize for the given processor while preserving backwards
- #                           compatibility with older processors (GCC-based platforms).
-@@ -132,7 +132,7 @@
- # XXX this is duplicated in makefile.in
- DOCBASEFILES = ahack changes faq mistakes help thanks allegro const abi api packfile \
-                readme makedoc datafile grabber dat dat2c dat2s license addons targets
--DOCBUILDFILES = bcc32 beos darwin djgpp dmc linux macosx mingw32 msvc qnx unix watcom
-+DOCBUILDFILES = bcc32 beos darwin djgpp dmc haiku linux macosx mingw32 msvc qnx unix watcom
- DOCTXTBUILDFILES = $(addprefix docs/build/,$(addsuffix .txt,$(DOCBUILDFILES)))
- 
- DOCS  = $(addprefix docs/txt/,$(addsuffix .txt,$(filter-out changes thanks readme, $(DOCBASEFILES))))
-diff -urN allegro-4.3.10/makefile.haiku allegro-4.3.10-haiku/makefile.haiku
---- allegro-4.3.10/makefile.haiku	1969-12-31 16:00:00.000000000 -0800
-+++ allegro-4.3.10-haiku/makefile.haiku	2008-08-25 21:19:47.000000000 -0700
-@@ -0,0 +1,315 @@
-+#
-+#  Rules for building the Allegro library with Haiku. This file is included
-+#  by the primary makefile, and should not be used directly.
-+#
-+#  The "depend" target uses sed.
-+#
-+#  See makefile.all for a list of the available targets.
-+
-+
-+
-+# -------- define some variables that the primary makefile will use --------
-+
-+PLATFORM = Haiku
-+CC = gcc
-+EXE = 
-+OBJ = .o
-+HTML = html
-+
-+PLATFORM_DIR = obj/beos
-+
-+UNIX_TOOLS = 1
-+
-+ifdef STATICLINK
-+
-+# -------- link as a static library --------
-+OBJ_DIR = obj/beos/$(VERSION)
-+LIB_NAME = lib/beos/lib$(VERSION).a
-+
-+else
-+
-+# -------- link as a DLL --------
-+OBJ_DIR = obj/beos/$(VERSION)
-+LIB_NAME = lib/beos/lib$(VERSION)-$(shared_version).so
-+
-+endif # STATICLINK
-+
-+# -------- give a sensible default target for make without any args --------
-+
-+.PHONY: _default
-+
-+_default: default
-+
-+
-+# -------- decide what compiler options to use --------
-+
-+ifdef WARNMODE
-+WFLAGS = -Wall -W -Wstrict-prototypes -Wno-unused -Wno-multichar -Wno-ctor-dtor-privacy -Werror
-+else
-+WFLAGS = -Wall -Wno-unused -Wno-multichar -Wno-ctor-dtor-privacy
-+endif
-+
-+ifdef TARGET_ARCH_COMPAT
-+   TARGET_ARCH = $(GCC_MTUNE)=$(TARGET_ARCH_COMPAT)
-+else
-+   ifdef TARGET_ARCH_EXCL
-+      TARGET_ARCH = -march=$(TARGET_ARCH_EXCL)
-+   else
-+      TARGET_ARCH = $(GCC_MTUNE)=i586
-+   endif
-+endif
-+
-+ifndef TARGET_OPTS
-+   TARGET_OPTS = -O6 -funroll-loops -ffast-math
-+endif
-+
-+OFLAGS =  $(TARGET_ARCH) $(TARGET_OPTS)
-+
-+CFLAGS = -DALLEGRO_LIB_BUILD
-+
-+
-+
-+ifdef DEBUGMODE
-+
-+# -------- debugging build --------
-+CFLAGS += -DDEBUGMODE=$(DEBUGMODE) $(WFLAGS) -g -O0
-+SFLAGS = -DDEBUGMODE=$(DEBUGMODE) $(WFLAGS)
-+LFLAGS = -g
-+
-+else
-+ifdef PROFILEMODE
-+
-+# -------- profiling build --------
-+CFLAGS += $(WFLAGS) $(OFLAGS) -pg
-+SFLAGS = $(WFLAGS)
-+LFLAGS = -pg
-+
-+else
-+
-+# -------- optimised build --------
-+CFLAGS += $(WFLAGS) $(OFLAGS) -fomit-frame-pointer
-+SFLAGS = $(WFLAGS)
-+
-+ifndef SYMBOLMODE
-+LFLAGS = -s
-+else
-+LFLAGS = 
-+endif
-+
-+endif
-+endif
-+
-+
-+# -------- list which platform specific objects to include --------
-+
-+VPATH = src/haiku src/misc src/unix tools/haiku
-+
-+ifdef ALLEGRO_USE_C
-+
-+# ------ build a C-only version ------
-+
-+VPATH += src/c
-+MY_OBJECTS = $(C_OBJECTS) cmiscs
-+CFLAGS += 
-+
-+else
-+
-+# ------ build the normal asm version ------
-+
-+VPATH += src/i386
-+MY_OBJECTS = $(I386_OBJECTS)
-+
-+endif # ALLEGRO_USE_C
-+
-+OBJECT_LIST = $(COMMON_OBJECTS) $(MY_OBJECTS) $(basename $(notdir $(ALLEGRO_SRC_HAIKU_FILES)))
-+
-+LIBRARIES = -lbe -lgame -ldevice -lmidi -lmedia -lnetwork
-+
-+PROGRAMS = bfixicon
-+
-+bfixicon: tools/haiku/bfixicon
-+
-+DISTCLEAN_FILES += tools/haiku/bfixicon
-+
-+
-+
-+# -------- rules for installing and removing the library files --------
-+
-+INSTALLDIR = /boot/develop
-+LIBDIR = lib/x86
-+INCDIR = headers
-+
-+SHARED_LIBDIR = /boot/common/lib
-+
-+
-+ifdef STATICLINK
-+
-+$(INSTALLDIR)/$(LIBDIR)/lib$(VERSION).a: $(LIB_NAME)
-+	cp $< $@
-+	
-+else	
-+		
-+$(SHARED_LIBDIR)/lib$(VERSION)-$(shared_version).so: $(LIB_NAME)
-+	cp $< $@	
-+	
-+endif
-+
-+
-+/bin/allegro-config:
-+ifdef STATICLINK
-+	sed -e "s/@LINK_WITH_STATIC_LIBS@/yes/" misc/allegro-config.in >temp
-+else
-+	sed -e "s/@LINK_WITH_STATIC_LIBS@/no/" misc/allegro-config.in >temp
-+endif
-+	sed -e "s/@prefix@/\/boot\/develop/" temp > temp2
-+	sed -e "s/@LIB_TO_LINK@/$(VERSION)/" temp2 > temp
-+	sed -e "s/@LDFLAGS@//" temp > temp2
-+	sed -e "s/@LIBS@/$(LIBRARIES)/" temp2 > temp
-+	sed -e "s/include/headers/" temp >temp2
-+	sed -e "s/ -l\$${lib_type}_unsharable//" temp2 >temp
-+	sed -e "s/libdirs=-L\$${exec_prefix}\/lib/libdirs=\"-L\$${exec_prefix}\/lib\/x86 -L\/boot\/common\/lib\"/" temp >/bin/allegro-config
-+	rm -f temp temp2
-+	chmod a+x /bin/allegro-config
-+
-+
-+HEADERS = $(INSTALLDIR)/$(INCDIR)/bealleg.h                   \
-+          $(INSTALLDIR)/$(INCDIR)/allegro/platform/aintbeos.h \
-+          $(INSTALLDIR)/$(INCDIR)/allegro/platform/al386gcc.h \
-+          $(INSTALLDIR)/$(INCDIR)/allegro/platform/albecfg.h  \
-+          $(INSTALLDIR)/$(INCDIR)/allegro/platform/alplatf.h  \
-+          $(INSTALLDIR)/$(INCDIR)/allegro/platform/astdint.h  \
-+          $(INSTALLDIR)/$(INCDIR)/allegro/platform/albeos.h
-+
-+ifdef STATICLINK
-+   INSTALL_FILES = $(INSTALLDIR)/$(LIBDIR)/lib$(VERSION).a 
-+else
-+   INSTALL_FILES = $(SHARED_LIBDIR)/lib$(VERSION)-$(shared_version).so
-+endif
-+
-+INSTALL_FILES += $(HEADERS) /bin/allegro-config
-+
-+
-+install: generic-install
-+	@echo The $(DESCRIPTION) $(PLATFORM) library has been installed.
-+
-+UNINSTALL_FILES = $(INSTALLDIR)/$(LIBDIR)/liballeg.a             \
-+                  $(INSTALLDIR)/$(LIBDIR)/liballd.a              \
-+                  $(INSTALLDIR)/$(LIBDIR)/liballp.a              \
-+                  $(SHARED_LIBDIR)/liballeg-$(shared_version).so \
-+                  $(SHARED_LIBDIR)/liballd-$(shared_version).so  \
-+                  $(SHARED_LIBDIR)/liballp-$(shared_version).so  \
-+                  $(HEADERS)                                     \
-+                  /bin/allegro-config
-+
-+uninstall: generic-uninstall
-+	@echo All gone!
-+
-+
-+
-+# -------- test capabilities --------
-+
-+TEST_CPP = @echo ...system compiler
-+
-+include makefile.tst
-+
-+
-+
-+# -------- finally, we get to the fun part... --------
-+
-+ifdef PROFILEMODE
-+OTHER_OBJECTS = /boot/develop/lib/x86/i386-mcount.o
-+endif
-+
-+ifdef STATICLINK
-+
-+# -------- link as a static library --------
-+define MAKE_LIB
-+ar rs $(LIB_NAME) $(OBJECTS) $(OTHER_OBJECTS)
-+endef
-+
-+else
-+
-+# -------- link as a shared library --------
-+
-+define MAKE_LIB
-+$(CC) -nostart $(PFLAGS) -o $(LIB_NAME) $(OBJECTS) $(OTHER_OBJECTS) $(LIBRARIES)
-+endef
-+
-+endif # STATICLINK
-+
-+COMPILE_FLAGS = $(subst src/,-DALLEGRO_SRC ,$(findstring src/, $<))$(CFLAGS)
-+
-+$(OBJ_DIR)/%.o: %.c
-+	$(CC) $(COMPILE_FLAGS) -I. -I./include -o $@ -c $<
-+
-+$(OBJ_DIR)/%.o: %.cpp
-+	$(CC) $(COMPILE_FLAGS) -I. -I./include -o $@ -c $<
-+
-+$(OBJ_DIR)/%.o: %.s
-+	$(CC) $(SFLAGS) -I. -I./include -x assembler-with-cpp -o $@ -c $<
-+
-+demos/shooter/shooter: $(OBJECTS_SHOOTER) $(LIB_NAME)
-+	$(CC) $(LFLAGS) -o $@ $(OBJECTS_SHOOTER) $(LIB_NAME) $(LIBRARIES)
-+
-+demos/skater/skater: $(OBJECTS_SKATER) $(LIB_NAME)
-+	$(CC) $(LFLAGS) -o $@ $(OBJECTS_SKATER) $(LIB_NAME) $(LIBRARIES)
-+
-+*/%: $(OBJ_DIR)/%.o $(LIB_NAME)
-+	$(CC) $(LFLAGS) -o $@ $< $(LIB_NAME) $(LIBRARIES)
-+
-+obj/haiku/asmdef.inc: obj/haiku/asmdef
-+	obj/haiku/asmdef obj/haiku/asmdef.inc
-+
-+obj/haiku/asmdef: src/i386/asmdef.c include/*.h include/allegro/*.h obj/haiku/asmcapa.h
-+	$(CC) -O $(WFLAGS) -I. -I./include -o obj/haiku/asmdef src/i386/asmdef.c
-+
-+define LINK_WITHOUT_LIB
-+   $(CC) $(LFLAGS) -o $@ $^ $(OTHER_OBJECTS)
-+endef
-+
-+PLUGIN_LIB = lib/haiku/lib$(VERY_SHORT_VERSION)dat.a
-+PLUGINS_H = obj/haiku/plugins.h
-+PLUGIN_DEPS = $(LIB_NAME) $(PLUGIN_LIB)
-+PLUGIN_SCR = scr
-+
-+define GENERATE_PLUGINS_H
-+cat tools/plugins/*.inc > obj/haiku/plugins.h
-+endef
-+
-+define MAKE_PLUGIN_LIB
-+ar rs $(PLUGIN_LIB) $(PLUGIN_OBJS)
-+endef
-+
-+define LINK_WITH_PLUGINS
-+$(CC) $(LFLAGS) -o $@ $< $(strip $(PLUGIN_LIB) $(addprefix @,$(PLUGIN_SCRIPTS)) $(LIB_NAME))
-+endef
-+
-+tools/haiku/%: $(OBJ_DIR)/%.o $(LIB_NAME)
-+	$(CC) $(LFLAGS) -o $@ $< $(LIB_NAME) $(LIBRARIES)
-+
-+
-+
-+# -------- demo program iconification --------
-+
-+.PHONY: fixdemo
-+
-+fixdemo: demos/shooter/shooter demo/demo.dat tools/haiku/bfixicon
-+	tools/haiku/bfixicon demos/shooter/shooter -d demos/shooter/demo.dat SHIP3 GAME_PAL
-+
-+
-+
-+# -------- generate automatic dependencies --------
-+
-+DEPEND_PARAMS = -MM -MG -I. -I./include -DSCAN_DEPEND -DALLEGRO_HAIKU
-+
-+depend:
-+	$(CC) $(DEPEND_PARAMS) src/*.c src/haiku/*.c src/i386/*.c src/misc/*.c src/unix/*.c demos/shooter/*.c > _depend.tmp
-+	$(CC) $(DEPEND_PARAMS) docs/src/makedoc/*.c examples/*.c setup/*.c tests/*.c tools/*.c tools/plugins/*.c >> _depend.tmp
-+	$(CC) $(DEPEND_PARAMS) demos/skater/source/*.c >> _depend.tmp
-+	$(CC) $(DEPEND_PARAMS) -x c src/haiku/*.cpp tests/*.cpp tools/haiku/*.cpp >> _depend.tmp
-+	$(CC) $(DEPEND_PARAMS) -x assembler-with-cpp src/i386/*.s src/misc/*.s >> _depend.tmp
-+	sed -e "s/^[a-zA-Z0-9_\/]*\///" _depend.tmp > _depend2.tmp
-+	sed -e "s/^\([a-zA-Z0-9_]*\.o *:\)/obj\/haiku\/alleg\/\1/" _depend2.tmp > obj/haiku/alleg/makefile.dep
-+	sed -e "s/^\([a-zA-Z0-9_]*\.o *:\)/obj\/haiku\/alld\/\1/" _depend2.tmp > obj/haiku/alld/makefile.dep
-+	sed -e "s/^\([a-zA-Z0-9_]*\.o *:\)/obj\/haiku\/allp\/\1/" _depend2.tmp > obj/haiku/allp/makefile.dep
-+	rm _depend.tmp _depend2.tmp
-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-08-23 20:56:44.000000000 -0700
-@@ -73,9 +73,9 @@
- # Hack'n'slash
- echo "Stripping to form end-user distribution"
- (cd $dir/$basename && {
--	(cd src && rm -rf beos qnx dos mac ppc win)
--	(cd obj && rm -rf bcc32 beos qnx djgpp mingw32 msvc watcom)
--	(cd lib && rm -rf bcc32 beos qnx djgpp mingw32 msvc watcom)
-+	(cd src && rm -rf beos haiku qnx dos mac ppc win)
-+	(cd obj && rm -rf bcc32 beos haiku qnx djgpp mingw32 msvc watcom)
-+	(cd lib && rm -rf bcc32 beos haiku qnx djgpp mingw32 msvc watcom)
- 	(cd include && rm -f bealleg.h qnxalleg.h macalleg.h winalleg.h)
- 	(cd misc && rm -f cmplog.pl dllsyms.lst findtext.sh fixpatch.sh fixver.sh)
- 	(cd misc && rm -f allegro-config-qnx.sh zipup.sh zipwin.sh *.bat *.c)
-@@ -91,11 +91,11 @@
- 
- 	# jpgalleg addon
- 	(cd addons/jpgalleg && rm -rf examples)
--	(cd addons/jpgalleg && rm -f makefile.be makefile.mgw makefile.dj)
-+	(cd addons/jpgalleg && rm -f makefile.be makefile.haiku makefile.mgw makefile.dj)
- 	(cd addons/jpgalleg && rm -f makefile.osx makefile.vc fix.bat readme.txt)
- 	(cd addons/jpgalleg/misc && rm -f fixver.sh runner.c)
--	(cd addons/jpgalleg/lib && rm -rf beos djgpp macosx mingw32 msvc)
--	(cd addons/jpgalleg/obj && rm -rf beos djgpp macosx mingw32 msvc)
-+	(cd addons/jpgalleg/lib && rm -rf beos djgpp haiku macosx mingw32 msvc)
-+	(cd addons/jpgalleg/obj && rm -rf beos djgpp haiku macosx mingw32 msvc)
- 
- 	# logg addon
- 	(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-08-23 20:53:10.000000000 -0700
-@@ -126,6 +126,14 @@
- make depend UNIX_TOOLS=1 CC=gcc
- 
- 
-+# generate dependencies for Haiku
-+echo "Generating Haiku dependencies..."
-+
-+./fix.sh haiku --quick
-+
-+make depend UNIX_TOOLS=1 CC=gcc
-+
-+
- # generate dependencies for QNX
- echo "Generating QNX dependencies..."
- 
-@@ -164,7 +172,7 @@
- for base in abi ahack allegro const faq help mistakes; do
-    ./_makedoc.exe -ascii docs/txt/$base.txt docs/src/$base._tx
- done
--for base in bcc32 beos darwin djgpp linux macosx mingw32 msvc qnx unix watcom; do
-+for base in bcc32 beos darwin djgpp haiku linux macosx mingw32 msvc qnx unix watcom; do
-    ./_makedoc.exe -ascii docs/build/$base.txt docs/src/build/$base._tx
- done
- 
-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-08-23 20:44:06.000000000 -0700
-@@ -342,7 +342,7 @@
-    }
- 
-    if (dat2c->lformat == lineformat_default)
--#if (defined ALLEGRO_UNIX || defined ALLEGRO_QNX || defined ALLEGRO_BEOS || defined ALLEGRO_MACOSX)
-+#if (defined ALLEGRO_UNIX || defined ALLEGRO_QNX || defined ALLEGRO_BEOS || defined ALLEGRO_HAIKU || defined ALLEGRO_MACOSX)
-       dat2c->lformat = lineformat_unix;
- #elif (defined ALLEGRO_WINDOWS || defined ALLEGRO_DOS)
-       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-08-23 20:42:07.000000000 -0700
-@@ -121,6 +121,8 @@
-       #include "obj/dmc/plugins.h"
-    #elif defined ALLEGRO_BEOS
-       #include "obj/beos/plugins.h"
-+   #elif defined ALLEGRO_HAIKU
-+      #include "obj/beos/plugins.h"
-    #elif defined ALLEGRO_BCC32
-       #include "obj/bcc32/plugins.h"
-    #elif defined ALLEGRO_MPW
diff --git a/media-libs/allegro/patches/allegro-4.3.10-haiku-2.diff b/media-libs/allegro/patches/allegro-4.3.10-haiku-2.diff
deleted file mode 100644
index 362496b24..000000000
--- a/media-libs/allegro/patches/allegro-4.3.10-haiku-2.diff
+++ /dev/null
@@ -1,657 +0,0 @@
-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-08-26 23:51:47.000000000 -0700
-@@ -9,7 +9,7 @@
-    echo
-    echo "Usage: $0 <platform> [--quick|--dtou|--utod|--utom|--mtou]"
-    echo
--   echo "Where platform is one of: bcc32, beos, djgpp, mingw, qnx, unix"
-+   echo "Where platform is one of: bcc32, beos, djgpp, haiku, mingw, qnx, unix"
-    echo "mac, macosx, macosx-universal and watcom."
-    echo "The --quick parameter turns off text file conversion, --dtou converts from"
-    echo "DOS/Win32 format to Unix, --utod converts from Unix to DOS/Win32 format,"
-@@ -140,6 +140,7 @@
-    "bcc32"   ) proc_fix "Windows (BCC32)"   "makefile.bcc" "ALLEGRO_BCC32";;
-    "beos"    ) proc_fix "BeOS"              "makefile.be"  "ALLEGRO_BEOS";;
-    "djgpp"   ) proc_fix "DOS (djgpp)"       "makefile.dj"  "ALLEGRO_DJGPP";;
-+   "haiku"   ) proc_fix "Haiku"             "makefile.be"  "ALLEGRO_HAIKU";;
-    "mingw"   ) proc_fix "Windows (MinGW)"   "makefile.mgw" "ALLEGRO_MINGW32";;
-    "mingw32" ) proc_fix "Windows (MinGW)"   "makefile.mgw" "ALLEGRO_MINGW32";;
-    # 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-08-26 22:35:46.000000000 -0700
-@@ -189,7 +189,7 @@
- 
- 
- #if (defined ALLEGRO_DOS) || (defined ALLEGRO_DJGPP) || (defined ALLEGRO_WATCOM) || \
--    (defined ALLEGRO_QNX) || (defined ALLEGRO_BEOS)
-+    (defined ALLEGRO_QNX) || (defined ALLEGRO_BEOS)  || (defined ALLEGRO_HAIKU)
- 
- AL_ARRAY(char *, _pckeys_names);
- 
-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-08-26 22:20:39.000000000 -0700
-@@ -48,6 +48,8 @@
-       #include "allegro/platform/albcc32.h"
-    #elif defined ALLEGRO_MSVC
-       #include "allegro/platform/almsvc.h"
-+   #elif defined ALLEGRO_HAIKU
-+      #include "allegro/platform/albecfg.h"
-    #elif defined ALLEGRO_BEOS
-       #include "allegro/platform/albecfg.h"
-    #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-08-26 22:24:41.000000000 -0700
-@@ -31,7 +31,12 @@
- #define ALLEGRO_HAVE_SYS_TIME_H 1
- 
- /* describe this platform */
--#define ALLEGRO_PLATFORM_STR  "BeOS"
-+#if defined __BEOS__ && !defined __HAIKU__
-+  #define ALLEGRO_PLATFORM_STR  "BeOS"
-+#endif
-+#if defined __HAIKU__
-+  #define ALLEGRO_PLATFORM_STR  "Haiku"
-+#endif
- #define ALLEGRO_LITTLE_ENDIAN
- #define ALLEGRO_CONSOLE_OK
- #define ALLEGRO_USE_CONSTRUCTOR
-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-08-23 17:44:44.000000000 -0700
-@@ -8,7 +8,7 @@
- #        DEBUGMODE=2        selects a build intended to debug Allegro itself.
- #        PROFILEMODE=1      selects a profiling build.
- #        WARNMODE=1         selects strict compiler warnings.
--#        STATICLINK=1       use static linking (MinGW32, MSVC, BeOS).
-+#        STATICLINK=1       use static linking (MinGW32, MSVC, BeOS, Haiku).
- #        STATICRUNTIME=1    link to a static C runtime library (/MT) (MSVC)
- #        TARGET_ARCH_COMPAT optimize for the given processor while preserving backwards
- #                           compatibility with older processors (GCC-based platforms).
-@@ -132,7 +132,7 @@
- # XXX this is duplicated in makefile.in
- DOCBASEFILES = ahack changes faq mistakes help thanks allegro const abi api packfile \
-                readme makedoc datafile grabber dat dat2c dat2s license addons targets
--DOCBUILDFILES = bcc32 beos darwin djgpp dmc linux macosx mingw32 msvc qnx unix watcom
-+DOCBUILDFILES = bcc32 beos darwin djgpp dmc haiku linux macosx mingw32 msvc qnx unix watcom
- DOCTXTBUILDFILES = $(addprefix docs/build/,$(addsuffix .txt,$(DOCBUILDFILES)))
- 
- 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-08-26 22:11:32.000000000 -0700
-@@ -10,7 +10,15 @@
- 
- # -------- define some variables that the primary makefile will use --------
- 
-+
-+ifeq ($(OS),BeOS)
- PLATFORM = BeOS
-+endif
-+
-+ifeq ($(OS),Haiku)
-+PLATFORM = Haiku
-+endif
-+
- CC = gcc
- EXE = 
- OBJ = .o
-@@ -123,7 +131,13 @@
- 
- OBJECT_LIST = $(COMMON_OBJECTS) $(MY_OBJECTS) $(basename $(notdir $(ALLEGRO_SRC_BEOS_FILES)))
- 
-+ifeq ($(OS),BeOS)
- LIBRARIES = -lbe -lgame -ldevice -lmidi -lmedia -lnet
-+endif
-+
-+ifeq ($(OS),Haiku)
-+LIBRARIES = -lbe -lgame -ldevice -lmidi -lmedia -lnetwork
-+endif
- 
- PROGRAMS = bfixicon
- 
-@@ -167,7 +181,14 @@
- 	sed -e "s/@LIBS@/$(LIBRARIES)/" temp2 > temp
- 	sed -e "s/include/headers/" temp >temp2
- 	sed -e "s/ -l\$${lib_type}_unsharable//" temp2 >temp
-+
-+ifeq ($(OS),BeOS)
- 	sed -e "s/libdirs=-L\$${exec_prefix}\/lib/libdirs=\"-L\$${exec_prefix}\/lib\/x86 -L\/boot\/home\/config\/lib\"/" temp >/bin/allegro-config
-+endif
-+ifeq ($(OS),Haiku)
-+	sed -e "s/libdirs=-L\$${exec_prefix}\/lib/libdirs=\"-L\$${exec_prefix}\/lib\/x86 -L\/boot\/common\/lib\"/" temp >/bin/allegro-config
-+endif
-+
- 	rm -f temp temp2
- 	chmod a+x /bin/allegro-config
- 
-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-08-23 20:56:44.000000000 -0700
-@@ -73,9 +73,9 @@
- # Hack'n'slash
- echo "Stripping to form end-user distribution"
- (cd $dir/$basename && {
--	(cd src && rm -rf beos qnx dos mac ppc win)
--	(cd obj && rm -rf bcc32 beos qnx djgpp mingw32 msvc watcom)
--	(cd lib && rm -rf bcc32 beos qnx djgpp mingw32 msvc watcom)
-+	(cd src && rm -rf beos haiku qnx dos mac ppc win)
-+	(cd obj && rm -rf bcc32 beos haiku qnx djgpp mingw32 msvc watcom)
-+	(cd lib && rm -rf bcc32 beos haiku qnx djgpp mingw32 msvc watcom)
- 	(cd include && rm -f bealleg.h qnxalleg.h macalleg.h winalleg.h)
- 	(cd misc && rm -f cmplog.pl dllsyms.lst findtext.sh fixpatch.sh fixver.sh)
- 	(cd misc && rm -f allegro-config-qnx.sh zipup.sh zipwin.sh *.bat *.c)
-@@ -91,11 +91,11 @@
- 
- 	# jpgalleg addon
- 	(cd addons/jpgalleg && rm -rf examples)
--	(cd addons/jpgalleg && rm -f makefile.be makefile.mgw makefile.dj)
-+	(cd addons/jpgalleg && rm -f makefile.be makefile.haiku makefile.mgw makefile.dj)
- 	(cd addons/jpgalleg && rm -f makefile.osx makefile.vc fix.bat readme.txt)
- 	(cd addons/jpgalleg/misc && rm -f fixver.sh runner.c)
--	(cd addons/jpgalleg/lib && rm -rf beos djgpp macosx mingw32 msvc)
--	(cd addons/jpgalleg/obj && rm -rf beos djgpp macosx mingw32 msvc)
-+	(cd addons/jpgalleg/lib && rm -rf beos djgpp haiku macosx mingw32 msvc)
-+	(cd addons/jpgalleg/obj && rm -rf beos djgpp haiku macosx mingw32 msvc)
- 
- 	# logg addon
- 	(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-08-23 20:53:10.000000000 -0700
-@@ -126,6 +126,14 @@
- make depend UNIX_TOOLS=1 CC=gcc
- 
- 
-+# generate dependencies for Haiku
-+echo "Generating Haiku dependencies..."
-+
-+./fix.sh haiku --quick
-+
-+make depend UNIX_TOOLS=1 CC=gcc
-+
-+
- # generate dependencies for QNX
- echo "Generating QNX dependencies..."
- 
-@@ -164,7 +172,7 @@
- for base in abi ahack allegro const faq help mistakes; do
-    ./_makedoc.exe -ascii docs/txt/$base.txt docs/src/$base._tx
- done
--for base in bcc32 beos darwin djgpp linux macosx mingw32 msvc qnx unix watcom; do
-+for base in bcc32 beos darwin djgpp haiku linux macosx mingw32 msvc qnx unix watcom; do
-    ./_makedoc.exe -ascii docs/build/$base.txt docs/src/build/$base._tx
- done
- 
-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-08-26 22:40:30.000000000 -0700
-@@ -25,8 +25,8 @@
- 
- 
- /* The code can't link on platforms that don't use src/misc/pckeys.c (everything
-- * but DOS, QNX, BEOS). */
--#if (defined ALLEGRO_DOS) || (defined ALLEGRO_QNX) || (defined ALLEGRO_BEOS)
-+ * but DOS, QNX, BEOS, HAIKU). */
-+#if (defined ALLEGRO_DOS) || (defined ALLEGRO_QNX) || (defined ALLEGRO_BEOS) || (defined ALLEGRO_HAIKU)
- 
- 
- 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-08-26 22:44:08.000000000 -0700
-@@ -20,7 +20,7 @@
- #include "allegro/internal/aintern.h"
- #include "allegro/platform/aintbeos.h"
- 
--#ifndef ALLEGRO_BEOS
-+#if !defined ALLEGRO_BEOS && !defined ALLEGRO_HAIKU
- #error something is wrong with the makefile
- #endif
- 
-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-08-26 22:44:30.000000000 -0700
-@@ -19,7 +19,7 @@
- #include "allegro/internal/aintern.h"
- #include "allegro/platform/aintbeos.h"
- 
--#ifndef ALLEGRO_BEOS
-+#if !defined ALLEGRO_BEOS && !defined ALLEGRO_HAIKU
- #error something is wrong with the makefile
- #endif
- 
-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-08-26 22:44:57.000000000 -0700
-@@ -21,7 +21,7 @@
- #include "allegro/internal/aintern.h"
- #include "allegro/platform/aintbeos.h"
- 
--#ifndef ALLEGRO_BEOS
-+#if !defined ALLEGRO_BEOS && !defined ALLEGRO_HAIKU
- #error something is wrong with the makefile
- #endif
- 
-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-08-26 22:45:13.000000000 -0700
-@@ -19,9 +19,9 @@
- #include "allegro/internal/aintern.h"
- #include "allegro/platform/aintbeos.h"
- 
--#ifndef ALLEGRO_BEOS
-+#if !defined ALLEGRO_BEOS && !defined ALLEGRO_HAIKU
- #error something is wrong with the makefile
--#endif 
-+#endif
- 
- 
- 
-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-08-26 22:45:26.000000000 -0700
-@@ -19,7 +19,7 @@
- #include "allegro/internal/aintern.h"
- #include "allegro/platform/aintbeos.h"
- 
--#ifndef ALLEGRO_BEOS
-+#if !defined ALLEGRO_BEOS && !defined ALLEGRO_HAIKU
- #error something is wrong with the makefile
- #endif
- 
-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-08-26 22:45:49.000000000 -0700
-@@ -18,9 +18,9 @@
- #include "allegro.h"
- #include "allegro/internal/aintern.h"
- 
--#ifndef ALLEGRO_BEOS
-+#if !defined ALLEGRO_BEOS && !defined ALLEGRO_HAIKU
- #error something is wrong with the makefile
--#endif                
-+#endif           
- 
- BEGIN_GFX_DRIVER_LIST
- 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-08-26 22:46:06.000000000 -0700
-@@ -19,7 +19,7 @@
- #include "allegro/internal/aintern.h"
- #include "allegro/platform/aintbeos.h"
- 
--#ifndef ALLEGRO_BEOS
-+#if !defined ALLEGRO_BEOS && !defined ALLEGRO_HAIKU
- #error something is wrong with the makefile
- #endif
- 
-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-08-26 22:46:32.000000000 -0700
-@@ -19,9 +19,9 @@
- #include "allegro/internal/aintern.h"
- #include "allegro/platform/aintbeos.h"
- 
--#ifndef ALLEGRO_BEOS
-+#if !defined ALLEGRO_BEOS && !defined ALLEGRO_HAIKU
- #error something is wrong with the makefile
--#endif                
-+#endif            
- 
- static BJoystick *be_joy = NULL;
- 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-08-26 22:46:46.000000000 -0700
-@@ -18,9 +18,9 @@
- #include "allegro.h"
- #include "allegro/internal/aintern.h"
- 
--#ifndef ALLEGRO_BEOS
-+#if !defined ALLEGRO_BEOS && !defined ALLEGRO_HAIKU
- #error something is wrong with the makefile
--#endif                
-+#endif              
- 
- BEGIN_JOYSTICK_DRIVER_LIST
- 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-08-26 22:47:00.000000000 -0700
-@@ -19,9 +19,9 @@
- #include "allegro/internal/aintern.h"
- #include "allegro/platform/aintbeos.h"
- 
--#ifndef ALLEGRO_BEOS
-+#if !defined ALLEGRO_BEOS && !defined ALLEGRO_HAIKU
- #error something is wrong with the makefile
--#endif 
-+#endif
- 
- 
- 
-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-08-26 22:47:20.000000000 -0700
-@@ -22,9 +22,9 @@
- #include "allegro/internal/aintern.h"
- #include "allegro/platform/aintbeos.h"
- 
--#ifndef ALLEGRO_BEOS
-+#if !defined ALLEGRO_BEOS && !defined ALLEGRO_HAIKU
- #error something is wrong with the makefile
--#endif                
-+#endif           
- 
- #define KEY_ID_PC101 0 // the docs say it should be 0x83ab, but they lie
- 
-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-08-26 22:47:53.000000000 -0700
-@@ -18,9 +18,9 @@
- #include "allegro.h"
- #include "allegro/internal/aintern.h"
- 
--#ifndef ALLEGRO_BEOS
-+#if !defined ALLEGRO_BEOS && !defined ALLEGRO_HAIKU
- #error something is wrong with the makefile
--#endif                
-+#endif             
- 
- _DRIVER_INFO _keyboard_driver_list[] =
- {
-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-08-26 22:48:11.000000000 -0700
-@@ -19,9 +19,9 @@
- #include "allegro/internal/aintern.h"
- #include "allegro/platform/aintbeos.h"
- 
--#ifndef ALLEGRO_BEOS
-+#if !defined ALLEGRO_BEOS && !defined ALLEGRO_HAIKU
- #error something is wrong with the makefile
--#endif                
-+#endif     
- 
- MIDI_DRIVER midi_beos =
- {
-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-08-26 22:48:29.000000000 -0700
-@@ -19,9 +19,9 @@
- #include "allegro/internal/aintern.h"
- #include "allegro/platform/aintbeos.h"
- 
--#ifndef ALLEGRO_BEOS
-+#if !defined ALLEGRO_BEOS && !defined ALLEGRO_HAIKU
- #error something is wrong with the makefile
--#endif                
-+#endif           
- 
- 
- 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-08-26 22:48:50.000000000 -0700
-@@ -18,9 +18,9 @@
- #include "allegro.h"
- #include "allegro/internal/aintern.h"
- 
--#ifndef ALLEGRO_BEOS
-+#if !defined ALLEGRO_BEOS && !defined ALLEGRO_HAIKU
- #error something is wrong with the makefile
--#endif                
-+#endif             
- 
- BEGIN_MIDI_DRIVER_LIST
- 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-08-26 22:49:09.000000000 -0700
-@@ -23,9 +23,9 @@
- #include "allegro/internal/aintern.h"
- #include "allegro/platform/aintbeos.h"
- 
--#ifndef ALLEGRO_BEOS
-+#if !defined ALLEGRO_BEOS && !defined ALLEGRO_HAIKU
- #error something is wrong with the makefile
--#endif                
-+#endif              
- 
- #define MOUSE_THREAD_NAME     "mouse driver"
- #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-08-26 22:49:25.000000000 -0700
-@@ -18,9 +18,9 @@
- #include "allegro.h"
- #include "allegro/internal/aintern.h"
- 
--#ifndef ALLEGRO_BEOS
-+#if !defined ALLEGRO_BEOS && !defined ALLEGRO_HAIKU
- #error something is wrong with the makefile
--#endif                
-+#endif              
- 
- 
- 
-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-08-26 22:49:38.000000000 -0700
-@@ -19,9 +19,9 @@
- #include "allegro/internal/aintern.h"
- #include "allegro/platform/aintbeos.h"
- 
--#ifndef ALLEGRO_BEOS
-+#if !defined ALLEGRO_BEOS && !defined ALLEGRO_HAIKU
- #error something is wrong with the makefile
--#endif                
-+#endif           
- 
- 
- 
-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-08-26 22:49:53.000000000 -0700
-@@ -19,7 +19,7 @@
- #include "allegro/internal/aintern.h"
- #include "allegro/platform/aintbeos.h"
- 
--#ifndef ALLEGRO_BEOS
-+#if !defined ALLEGRO_BEOS && !defined ALLEGRO_HAIKU
- #error something is wrong with the makefile
- #endif
- 
-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-08-26 22:50:07.000000000 -0700
-@@ -19,9 +19,9 @@
- #include "allegro/internal/aintern.h"
- #include "allegro/platform/aintbeos.h"
- 
--#ifndef ALLEGRO_BEOS
-+#if !defined ALLEGRO_BEOS && !defined ALLEGRO_HAIKU
- #error something is wrong with the makefile
--#endif                
-+#endif             
- 
- DIGI_DRIVER digi_beos =
- {
-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-08-26 22:50:22.000000000 -0700
-@@ -20,7 +20,7 @@
- #include "allegro/internal/aintern.h"
- #include "allegro/platform/aintbeos.h"
- 
--#ifndef ALLEGRO_BEOS
-+#if !defined ALLEGRO_BEOS && !defined ALLEGRO_HAIKU
- #error something is wrong with the makefile
- #endif
- 
-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-08-26 22:50:52.000000000 -0700
-@@ -19,9 +19,9 @@
- #include "allegro/internal/aintern.h"
- 
- 
--#ifndef ALLEGRO_BEOS
-+#if !defined ALLEGRO_BEOS && !defined ALLEGRO_HAIKU
- #error something is wrong with the makefile
--#endif                
-+#endif           
- 
- BEGIN_DIGI_DRIVER_LIST
- 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-08-26 22:51:53.000000000 -0700
-@@ -27,9 +27,9 @@
- #include <sys/utsname.h>
- #endif
- 
--#ifndef ALLEGRO_BEOS
-+#if !defined ALLEGRO_BEOS && !defined ALLEGRO_HAIKU
- #error something is wrong with the makefile
--#endif              
-+#endif            
- 
- #define SYS_THREAD_PRIORITY B_NORMAL_PRIORITY
- #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-08-26 22:52:11.000000000 -0700
-@@ -18,9 +18,9 @@
- #include "allegro.h"
- #include "allegro/internal/aintern.h"
- 
--#ifndef ALLEGRO_BEOS
-+#if !defined ALLEGRO_BEOS && !defined ALLEGRO_HAIKU
- #error something is wrong with the makefile
--#endif 
-+#endif
- 
- _DRIVER_INFO _system_driver_list[] =
- {
-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-08-26 23:39:03.000000000 -0700
-@@ -19,11 +19,9 @@
- #include "allegro/internal/aintern.h"
- #include "allegro/platform/aintbeos.h"
- 
--#ifndef ALLEGRO_BEOS
-+#if !defined ALLEGRO_BEOS && !defined ALLEGRO_HAIKU
- #error something is wrong with the makefile
--#endif 
--
--
-+#endif
- 
- SYSTEM_DRIVER system_beos = {
-    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-08-26 22:52:45.000000000 -0700
-@@ -19,7 +19,7 @@
- #include "allegro/internal/aintern.h"
- #include "allegro/platform/aintbeos.h"
- 
--#ifndef ALLEGRO_BEOS
-+#if !defined ALLEGRO_BEOS && !defined ALLEGRO_HAIKU
- #error something is wrong with the makefile
- #endif
- 
-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-08-26 22:53:00.000000000 -0700
-@@ -18,9 +18,9 @@
- #include "allegro.h"
- #include "allegro/internal/aintern.h"
- 
--#ifndef ALLEGRO_BEOS
-+#if !defined ALLEGRO_BEOS && !defined ALLEGRO_HAIKU
- #error something is wrong with the makefile
--#endif                
-+#endif         
- 
- _DRIVER_INFO _timer_driver_list[] = {
-    {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-08-26 22:53:13.000000000 -0700
-@@ -19,7 +19,7 @@
- #include "allegro/internal/aintern.h"
- #include "allegro/platform/aintbeos.h"
- 
--#ifndef ALLEGRO_BEOS
-+#if !defined ALLEGRO_BEOS && !defined ALLEGRO_HAIKU
- #error something is wrong with the makefile
- #endif
- 
-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-08-26 22:53:28.000000000 -0700
-@@ -19,7 +19,7 @@
- #include "allegro/internal/aintern.h"
- #include "allegro/platform/aintbeos.h"
- 
--#ifndef ALLEGRO_BEOS
-+#if !defined ALLEGRO_BEOS && !defined ALLEGRO_HAIKU
- #error something is wrong with the makefile
- #endif
- 
-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-08-26 22:53:51.000000000 -0700
-@@ -19,7 +19,7 @@
- #include "allegro/internal/aintern.h"
- #include "allegro/platform/aintbeos.h"
- 
--#ifndef ALLEGRO_BEOS
-+#if !defined ALLEGRO_BEOS && !defined ALLEGRO_HAIKU
- #error something is wrong with the makefile
- #endif
- 
-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-08-26 22:56:43.000000000 -0700
-@@ -1122,7 +1122,7 @@
-       running_status = 0;
- 
-       while (p < end) {                         /* work through data stream */
--#ifdef ALLEGRO_BEOS
-+#if defined ALLEGRO_BEOS || defined ALLEGRO_HAIKU
-          /* 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/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-08-23 20:44:06.000000000 -0700
-@@ -342,7 +342,7 @@
-    }
- 
-    if (dat2c->lformat == lineformat_default)
--#if (defined ALLEGRO_UNIX || defined ALLEGRO_QNX || defined ALLEGRO_BEOS || defined ALLEGRO_MACOSX)
-+#if (defined ALLEGRO_UNIX || defined ALLEGRO_QNX || defined ALLEGRO_BEOS || defined ALLEGRO_HAIKU || defined ALLEGRO_MACOSX)
-       dat2c->lformat = lineformat_unix;
- #elif (defined ALLEGRO_WINDOWS || defined ALLEGRO_DOS)
-       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-08-23 20:42:07.000000000 -0700
-@@ -121,6 +121,8 @@
-       #include "obj/dmc/plugins.h"
-    #elif defined ALLEGRO_BEOS
-       #include "obj/beos/plugins.h"
-+   #elif defined ALLEGRO_HAIKU
-+      #include "obj/beos/plugins.h"
-    #elif defined ALLEGRO_BCC32
-       #include "obj/bcc32/plugins.h"
-    #elif defined ALLEGRO_MPW
diff --git a/media-libs/allegro/patches/allegro-4.3.10-haiku-3.diff b/media-libs/allegro/patches/allegro-4.3.10-haiku-3.diff
deleted file mode 100644
index abd3aad5f..000000000
--- a/media-libs/allegro/patches/allegro-4.3.10-haiku-3.diff
+++ /dev/null
@@ -1,325 +0,0 @@
-diff -urN allegro-4.3.10/addons/allegrogl/fix.sh allegro-4.3.10-haiku-fixes/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-fixes/addons/allegrogl/fix.sh	2008-08-31 09:12:54.000000000 -0700
-@@ -18,7 +18,7 @@
- echo "Compilation target adjustment."
- echo "  Usage: fix <platform> [--dtou|--utod|--quick]"
- echo ""
--echo "  <platform> is one of: djgpp, mingw32, unix, macosx"
-+echo "  <platform> is one of: djgpp, haiku, mingw32, unix, macosx"
- echo ""
- echo "  --dtou converts from DOS/Win32 format to Unix"
- echo "  --utod converts from Unix format to DOS/Win32"
-@@ -79,6 +79,7 @@
- 
- case "$1" in
- 	djgpp	) proc_fix "DJGPP" "makefile.dj";;
-+	haiku	) proc_fix "Haiku" "makefile.gen";;
- 	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/loadpng/Makefile.be allegro-4.3.10-haiku-fixes/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-fixes/addons/loadpng/Makefile.be	2008-08-31 09:01:30.000000000 -0700
-@@ -0,0 +1,57 @@
-+## Aux -*- Makefile -*- for BeOS/Haiku
-+
-+prefix := `/boot/common/bin/allegro-config --prefix`
-+libdir := $(prefix)/lib
-+includedir := $(prefix)/include
-+DESTDIR :=
-+
-+EXAMPLECFLAGS := -Wno-deprecated-declarations -I/boot/common/include
-+EXAMPLELIBS := -lpng -lz `/boot/common/bin/allegro-config --libs --addon` -L/boot/common/lib
-+
-+
-+#--------------------------------------------------
-+# Note: this is for gcc
-+# And I don't really think you should use it, but it's up to you
-+.PHONY: shared
-+
-+SHAREDLIB := libloadpng-$(VERSION).so
-+
-+shared: $(SHAREDLIB)
-+
-+$(SHAREDLIB): loadpng.c savepng.c regpng.c
-+	$(CC) -o $(SHAREDLIB) $(CFLAGS) -fPIC -shared loadpng.c savepng.c regpng.c
-+
-+#--------------------------------------------------
-+.PHONY: install install-headers install-shared
-+
-+install: $(LIB) install-headers
-+	install -d -m 755 $(DESTDIR)$(libdir)
-+	install -m 644 $(LIB) $(DESTDIR)$(libdir)
-+	@echo -
-+	@echo loadpng is now installed.
-+
-+install-shared: $(SHAREDLIB) install-headers
-+	install -d -m 755 $(DESTDIR)$(libdir)
-+	install -m 755 $(SHAREDLIB) $(DESTDIR)$(libdir)
-+
-+install-headers:
-+	install -d -m 755 $(DESTDIR)$(includedir)
-+	install -m 644 loadpng.h $(DESTDIR)$(includedir)
-+
-+#--------------------------------------------------
-+.PHONY: uninstall
-+
-+uninstall:
-+	-rm -f $(DESTDIR)$(includedir)/loadpng.h
-+	-rm -f $(DESTDIR)$(libdir)/$(LIB)
-+	@echo -
-+	@echo loadpng is now uninstalled.
-+
-+#--------------------------------------------------
-+.PHONY: clean veryclean
-+
-+clean:
-+	- rm -f loadpng.o savepng.o regpng.o $(LIB) $(SHAREDLIB)
-+
-+veryclean: clean
-+	- rm -f $(EXAMPLES) examples/saved.png
-diff -urN allegro-4.3.10/addons/loadpng/fix.sh allegro-4.3.10-haiku-fixes/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-fixes/addons/loadpng/fix.sh	2008-08-31 09:04:07.000000000 -0700
-@@ -8,7 +8,7 @@
-    echo
-    echo "Usage: $0 <platform> [--quick|--dtou|--utod]"
-    echo
--   echo "Where platform is one of: djgpp, mingw32, unix"
-+   echo "Where platform is one of: beos, djgpp, haiku, mingw32, unix"
-    echo "The --quick parameter turns off text file conversion, --dtou converts from"
-    echo "DOS/Win32 format to Unix, --utod converts from Unix to DOS/Win32 format."
-    echo "If no parameter is specified --quick is assumed."
-@@ -95,7 +95,9 @@
- fi
- 
- case "$1" in
-+   "beos"   ) proc_fix "BeOS"   "Makefile.be";;
-    "djgpp"   ) proc_fix "DOS (djgpp)"       "Makefile.dj";;
-+   "haiku"   ) proc_fix "Haiku"   "Makefile.be";;
-    "mingw"   ) proc_fix "Windows (MinGW)"   "Makefile.mgw";;
-    "mingw32" ) proc_fix "Windows (MinGW)"   "Makefile.mgw";;
-    "unix"    ) proc_fix "Unix"              "Makefile.unx";;
-diff -urN allegro-4.3.10/addons/logg/Makefile.be allegro-4.3.10-haiku-fixes/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-fixes/addons/logg/Makefile.be	2008-08-31 08:57:22.000000000 -0700
-@@ -0,0 +1,43 @@
-+PREFIX=`/boot/common/bin/allegro-config --prefix`
-+CC=gcc
-+FLAGS=-O2 -g0 `/boot/common/bin/allegro-config --cflags --addon` -I/boot/common/include
-+LFLAGS=-L. -L/boot/common/lib -llogg -logg -lvorbis -lvorbisfile `/boot/common/bin/allegro-config --libs --addon`
-+
-+all: lib play_ogg stream_ogg
-+
-+lib: liblogg.a
-+
-+liblogg.a: logg.o
-+	ar rc $@ $^
-+	ranlib $@
-+
-+logg.o: logg.c logg.h
-+	$(CC) $(FLAGS) -c logg.c
-+
-+play_ogg: play_ogg.c liblogg.a
-+	gcc $(FLAGS) play_ogg.c -o play_ogg $(LFLAGS)
-+
-+stream_ogg: stream_ogg.c liblogg.a
-+	gcc $(FLAGS) stream_ogg.c -o stream_ogg $(LFLAGS)
-+
-+clean:
-+	rm -f logg.o
-+
-+veryclean: clean
-+	rm -f liblogg.a
-+	rm -f play_ogg
-+	rm -f stream_ogg
-+
-+install:
-+	cp -f logg.h $(DESTDIR)$(PREFIX)/include
-+	cp -f liblogg.a $(DESTDIR)$(PREFIX)/lib
-+	@echo -
-+	@echo logg is now installed.
-+
-+uninstall:
-+	rm -f $(DESTDIR)$(PREFIX)/include/logg.h
-+	rm -f $(DESTDIR)$(PREFIX)/lib/liblogg.a
-+	@echo -
-+	@echo logg is now uninstalled.
-+
-+examples: play_ogg stream_ogg
-diff -urN allegro-4.3.10/addons/logg/fix.sh allegro-4.3.10-haiku-fixes/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-fixes/addons/logg/fix.sh	2008-08-31 09:06:13.000000000 -0700
-@@ -8,7 +8,7 @@
-    echo
-    echo "Usage: $0 <platform> [--quick|--dtou|--utod]"
-    echo
--   echo "Where platform is one of: mingw32, unix"
-+   echo "Where platform is one of: beos, haiku, mingw32, unix"
-    echo "The --quick parameter turns off text file conversion, --dtou converts from"
-    echo "DOS/Win32 format to Unix, --utod converts from Unix to DOS/Win32 format."
-    echo "If no parameter is specified --quick is assumed."
-@@ -94,6 +94,8 @@
- fi
- 
- case "$1" in
-+   "beos"   ) proc_fix "BeOS"   "Makefile.be";;
-+   "haiku"   ) proc_fix "Haiku"   "Makefile.be";;
-    "mingw"   ) proc_fix "Windows (MinGW)"   "Makefile.migw";;
-    "mingw32" ) proc_fix "Windows (MinGW)"   "Makefile.migw";;
-    "unix"    ) proc_fix "Unix"              "Makefile.unix";;
-diff -urN allegro-4.3.10/fix.sh allegro-4.3.10-haiku-fixes/fix.sh
---- allegro-4.3.10/fix.sh	2008-01-01 13:59:18.000000000 -0800
-+++ allegro-4.3.10-haiku-fixes/fix.sh	2008-08-26 22:13:03.000000000 -0700
-@@ -9,7 +9,7 @@
-    echo
-    echo "Usage: $0 <platform> [--quick|--dtou|--utod|--utom|--mtou]"
-    echo
--   echo "Where platform is one of: bcc32, beos, djgpp, mingw, qnx, unix"
-+   echo "Where platform is one of: bcc32, beos, djgpp, haiku, mingw, qnx, unix"
-    echo "mac, macosx, macosx-universal and watcom."
-    echo "The --quick parameter turns off text file conversion, --dtou converts from"
-    echo "DOS/Win32 format to Unix, --utod converts from Unix to DOS/Win32 format,"
-@@ -140,6 +140,7 @@
-    "bcc32"   ) proc_fix "Windows (BCC32)"   "makefile.bcc" "ALLEGRO_BCC32";;
-    "beos"    ) proc_fix "BeOS"              "makefile.be"  "ALLEGRO_BEOS";;
-    "djgpp"   ) proc_fix "DOS (djgpp)"       "makefile.dj"  "ALLEGRO_DJGPP";;
-+   "haiku"   ) proc_fix "Haiku"              "makefile.be"  "ALLEGRO_HAIKU";;
-    "mingw"   ) proc_fix "Windows (MinGW)"   "makefile.mgw" "ALLEGRO_MINGW32";;
-    "mingw32" ) proc_fix "Windows (MinGW)"   "makefile.mgw" "ALLEGRO_MINGW32";;
-    # The 'msvc' target is undocumented in the help message, but is used
-diff -urN allegro-4.3.10/include/allegro/platform/alplatf.h allegro-4.3.10-haiku-fixes/include/allegro/platform/alplatf.h
---- allegro-4.3.10/include/allegro/platform/alplatf.h	2008-01-19 16:00:54.000000000 -0800
-+++ allegro-4.3.10-haiku-fixes/include/allegro/platform/alplatf.h	2008-08-23 17:23:59.000000000 -0700
-@@ -1,2 +1,2 @@
- /* generated by fix.sh */
--#define ALLEGRO_UNIX
-+#define ALLEGRO_BEOS
-diff -urN allegro-4.3.10/makefile.all allegro-4.3.10-haiku-fixes/makefile.all
---- allegro-4.3.10/makefile.all	2008-01-14 03:55:28.000000000 -0800
-+++ allegro-4.3.10-haiku-fixes/makefile.all	2008-08-23 17:45:06.000000000 -0700
-@@ -8,7 +8,7 @@
- #        DEBUGMODE=2        selects a build intended to debug Allegro itself.
- #        PROFILEMODE=1      selects a profiling build.
- #        WARNMODE=1         selects strict compiler warnings.
--#        STATICLINK=1       use static linking (MinGW32, MSVC, BeOS).
-+#        STATICLINK=1       use static linking (MinGW32, MSVC, BeOS, Haiku).
- #        STATICRUNTIME=1    link to a static C runtime library (/MT) (MSVC)
- #        TARGET_ARCH_COMPAT optimize for the given processor while preserving backwards
- #                           compatibility with older processors (GCC-based platforms).
-@@ -132,7 +132,7 @@
- # XXX this is duplicated in makefile.in
- DOCBASEFILES = ahack changes faq mistakes help thanks allegro const abi api packfile \
-                readme makedoc datafile grabber dat dat2c dat2s license addons targets
--DOCBUILDFILES = bcc32 beos darwin djgpp dmc linux macosx mingw32 msvc qnx unix watcom
-+DOCBUILDFILES = bcc32 beos darwin djgpp dmc haiku linux macosx mingw32 msvc qnx unix watcom
- DOCTXTBUILDFILES = $(addprefix docs/build/,$(addsuffix .txt,$(DOCBUILDFILES)))
- 
- DOCS  = $(addprefix docs/txt/,$(addsuffix .txt,$(filter-out changes thanks readme, $(DOCBASEFILES))))
-
-diff -urN allegro-4.3.10/misc/mkunixdists.sh allegro-4.3.10-haiku-fixes/misc/mkunixdists.sh
---- allegro-4.3.10/misc/mkunixdists.sh	2008-01-10 13:45:48.000000000 -0800
-+++ allegro-4.3.10-haiku-fixes/misc/mkunixdists.sh	2008-08-23 20:56:44.000000000 -0700
-@@ -73,9 +73,9 @@
- # Hack'n'slash
- echo "Stripping to form end-user distribution"
- (cd $dir/$basename && {
--	(cd src && rm -rf beos qnx dos mac ppc win)
--	(cd obj && rm -rf bcc32 beos qnx djgpp mingw32 msvc watcom)
--	(cd lib && rm -rf bcc32 beos qnx djgpp mingw32 msvc watcom)
-+	(cd src && rm -rf beos haiku qnx dos mac ppc win)
-+	(cd obj && rm -rf bcc32 beos haiku qnx djgpp mingw32 msvc watcom)
-+	(cd lib && rm -rf bcc32 beos haiku qnx djgpp mingw32 msvc watcom)
- 	(cd include && rm -f bealleg.h qnxalleg.h macalleg.h winalleg.h)
- 	(cd misc && rm -f cmplog.pl dllsyms.lst findtext.sh fixpatch.sh fixver.sh)
- 	(cd misc && rm -f allegro-config-qnx.sh zipup.sh zipwin.sh *.bat *.c)
-@@ -91,11 +91,11 @@
- 
- 	# jpgalleg addon
- 	(cd addons/jpgalleg && rm -rf examples)
--	(cd addons/jpgalleg && rm -f makefile.be makefile.mgw makefile.dj)
-+	(cd addons/jpgalleg && rm -f makefile.be makefile.haiku makefile.mgw makefile.dj)
- 	(cd addons/jpgalleg && rm -f makefile.osx makefile.vc fix.bat readme.txt)
- 	(cd addons/jpgalleg/misc && rm -f fixver.sh runner.c)
--	(cd addons/jpgalleg/lib && rm -rf beos djgpp macosx mingw32 msvc)
--	(cd addons/jpgalleg/obj && rm -rf beos djgpp macosx mingw32 msvc)
-+	(cd addons/jpgalleg/lib && rm -rf beos djgpp haiku macosx mingw32 msvc)
-+	(cd addons/jpgalleg/obj && rm -rf beos djgpp haiku macosx mingw32 msvc)
- 
- 	# logg addon
- 	(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-fixes/misc/zipup.sh
---- allegro-4.3.10/misc/zipup.sh	2008-01-19 04:16:56.000000000 -0800
-+++ allegro-4.3.10-haiku-fixes/misc/zipup.sh	2008-08-23 20:53:10.000000000 -0700
-@@ -126,6 +126,14 @@
- make depend UNIX_TOOLS=1 CC=gcc
- 
- 
-+# generate dependencies for Haiku
-+echo "Generating Haiku dependencies..."
-+
-+./fix.sh haiku --quick
-+
-+make depend UNIX_TOOLS=1 CC=gcc
-+
-+
- # generate dependencies for QNX
- echo "Generating QNX dependencies..."
- 
-@@ -164,7 +172,7 @@
- for base in abi ahack allegro const faq help mistakes; do
-    ./_makedoc.exe -ascii docs/txt/$base.txt docs/src/$base._tx
- done
--for base in bcc32 beos darwin djgpp linux macosx mingw32 msvc qnx unix watcom; do
-+for base in bcc32 beos darwin djgpp haiku linux macosx mingw32 msvc qnx unix watcom; do
-    ./_makedoc.exe -ascii docs/build/$base.txt docs/src/build/$base._tx
- done
- 
-diff -urN allegro-4.3.10/src/i386/asmdefs.inc allegro-4.3.10-haiku-fixes/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-fixes/src/i386/asmdefs.inc	2008-08-31 09:35:34.000000000 -0700
-@@ -31,6 +31,8 @@
-    #include "obj/msvc/asmdef.inc"
- #elif defined ALLEGRO_WATCOM
-    #include "obj/watcom/asmdef.inc"
-+#elif defined ALLEGRO_HAIKU
-+   #include "obj/beos/asmdef.inc"
- #elif defined ALLEGRO_BEOS
-    #include "obj/beos/asmdef.inc"
- #elif defined ALLEGRO_QNX
-diff -urN allegro-4.3.10/tools/dat2c.c allegro-4.3.10-haiku-fixes/tools/dat2c.c
---- allegro-4.3.10/tools/dat2c.c	2005-04-28 02:53:38.000000000 -0700
-+++ allegro-4.3.10-haiku-fixes/tools/dat2c.c	2008-08-23 20:44:06.000000000 -0700
-@@ -342,7 +342,7 @@
-    }
- 
-    if (dat2c->lformat == lineformat_default)
--#if (defined ALLEGRO_UNIX || defined ALLEGRO_QNX || defined ALLEGRO_BEOS || defined ALLEGRO_MACOSX)
-+#if (defined ALLEGRO_UNIX || defined ALLEGRO_QNX || defined ALLEGRO_BEOS || defined ALLEGRO_HAIKU || defined ALLEGRO_MACOSX)
-       dat2c->lformat = lineformat_unix;
- #elif (defined ALLEGRO_WINDOWS || defined ALLEGRO_DOS)
-       dat2c->lformat = lineformat_dos;
-diff -urN allegro-4.3.10/tools/datedit.c allegro-4.3.10-haiku-fixes/tools/datedit.c
---- allegro-4.3.10/tools/datedit.c	2007-10-08 09:23:36.000000000 -0700
-+++ allegro-4.3.10-haiku-fixes/tools/datedit.c	2008-08-23 20:42:07.000000000 -0700
-@@ -121,6 +121,8 @@
-       #include "obj/dmc/plugins.h"
-    #elif defined ALLEGRO_BEOS
-       #include "obj/beos/plugins.h"
-+   #elif defined ALLEGRO_HAIKU
-+      #include "obj/beos/plugins.h"
-    #elif defined ALLEGRO_BCC32
-       #include "obj/bcc32/plugins.h"
-    #elif defined ALLEGRO_MPW
-diff -urN allegro-4.3.10/tools/grabber.c allegro-4.3.10-haiku-fixes/tools/grabber.c
---- allegro-4.3.10/tools/grabber.c	2006-07-24 06:09:26.000000000 -0700
-+++ allegro-4.3.10-haiku-fixes/tools/grabber.c	2008-08-23 20:38:47.000000000 -0700
-@@ -3132,6 +3132,7 @@
-       case OSTYPE_QNX:        s = "QNX";                        break;
-       case OSTYPE_UNIX:       s = "Unix";                       break;
-       case OSTYPE_BEOS:       s = "BeOS";                       break;
-+      case OSTYPE_HAIKU:       s = "Haiku";                       break;
-       case OSTYPE_MACOS:      s = "MacOS";                      break;
-       case OSTYPE_MACOSX:     s = "MacOS X";                    break;
-       default:                s = "Unknown";                    break;
diff --git a/media-libs/allegro/patches/allegro-4.3.10-haiku-4.diff b/media-libs/allegro/patches/allegro-4.3.10-haiku-4.diff
deleted file mode 100644
index eb58d7d82..000000000
--- a/media-libs/allegro/patches/allegro-4.3.10-haiku-4.diff
+++ /dev/null
@@ -1,792 +0,0 @@
-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 11:20:16.000000000 +0000
-+++ allegro-4.3.10-haiku/addons/allegrogl/fix.sh	2008-09-13 20:09:02.000000000 +0000
-@@ -18,7 +18,7 @@
- echo "Compilation target adjustment."
- echo "  Usage: fix <platform> [--dtou|--utod|--quick]"
- echo ""
--echo "  <platform> is one of: djgpp, mingw32, unix, macosx"
-+echo "  <platform> is one of: djgpp, haiku, mingw32, unix, macosx"
- echo ""
- echo "  --dtou converts from DOS/Win32 format to Unix"
- echo "  --utod converts from Unix format to DOS/Win32"
-@@ -79,6 +79,7 @@
- 
- case "$1" in
- 	djgpp	) proc_fix "DJGPP" "makefile.dj";;
-+	haiku	) proc_fix "Haiku" "makefile.gen";;
- 	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/fix.sh allegro-4.3.10-haiku/addons/jpgalleg/fix.sh
---- allegro-4.3.10/addons/jpgalleg/fix.sh	2008-01-04 19:55:22.000000000 +0000
-+++ allegro-4.3.10-haiku/addons/jpgalleg/fix.sh	2008-09-13 18:13:30.000000000 +0000
-@@ -94,6 +94,7 @@
-    "mingw"   ) proc_fix "MinGW32" "makefile.mgw";;
-    "msvc"    ) proc_fix "MSVC" "makefile.vc";;
-    "beos"    ) proc_fix "BeOS" "makefile.be";;
-+   "haiku"   ) proc_fix "Haiku" "makefile.be";;
-    "unix"    ) proc_fix "Unix" "makefile.uni";;
-    "macosx"  ) proc_fix "MacOS X" "makefile.osx";;
-    "help"    ) proc_help;;
-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-28 01:05:30.000000000 +0000
-+++ allegro-4.3.10-haiku/addons/loadpng/fix.sh	2008-09-13 20:09:10.000000000 +0000
-@@ -8,7 +8,7 @@
-    echo
-    echo "Usage: $0 <platform> [--quick|--dtou|--utod]"
-    echo
--   echo "Where platform is one of: djgpp, mingw32, unix"
-+   echo "Where platform is one of: beos, djgpp, haiku, mingw32, unix"
-    echo "The --quick parameter turns off text file conversion, --dtou converts from"
-    echo "DOS/Win32 format to Unix, --utod converts from Unix to DOS/Win32 format."
-    echo "If no parameter is specified --quick is assumed."
-@@ -95,7 +95,9 @@
- fi
- 
- case "$1" in
-+   "beos"    ) proc_fix "BeOS"              "Makefile.be";;
-    "djgpp"   ) proc_fix "DOS (djgpp)"       "Makefile.dj";;
-+   "haiku"   ) proc_fix "Haiku"             "Makefile.be";;
-    "mingw"   ) proc_fix "Windows (MinGW)"   "Makefile.mgw";;
-    "mingw32" ) proc_fix "Windows (MinGW)"   "Makefile.mgw";;
-    "unix"    ) proc_fix "Unix"              "Makefile.unx";;
-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 19:24:16.000000000 +0000
-+++ allegro-4.3.10-haiku/addons/logg/fix.sh	2008-09-13 20:11:46.000000000 +0000
-@@ -8,7 +8,7 @@
-    echo
-    echo "Usage: $0 <platform> [--quick|--dtou|--utod]"
-    echo
--   echo "Where platform is one of: mingw32, unix"
-+   echo "Where platform is one of: beos, haiku, mingw32, unix"
-    echo "The --quick parameter turns off text file conversion, --dtou converts from"
-    echo "DOS/Win32 format to Unix, --utod converts from Unix to DOS/Win32 format."
-    echo "If no parameter is specified --quick is assumed."
-@@ -94,6 +94,8 @@
- fi
- 
- case "$1" in
-+   "beos"    ) proc_fix "BeOS"              "Makefile.be";;
-+   "haiku"   ) proc_fix "Haiku"             "Makefile.be";;
-    "mingw"   ) proc_fix "Windows (MinGW)"   "Makefile.migw";;
-    "mingw32" ) proc_fix "Windows (MinGW)"   "Makefile.migw";;
-    "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 21:59:18.000000000 +0000
-+++ allegro-4.3.10-haiku/fix.sh	2008-09-13 20:11:46.000000000 +0000
-@@ -9,7 +9,7 @@
-    echo
-    echo "Usage: $0 <platform> [--quick|--dtou|--utod|--utom|--mtou]"
-    echo
--   echo "Where platform is one of: bcc32, beos, djgpp, mingw, qnx, unix"
-+   echo "Where platform is one of: bcc32, beos, djgpp, haiku, mingw, qnx, unix"
-    echo "mac, macosx, macosx-universal and watcom."
-    echo "The --quick parameter turns off text file conversion, --dtou converts from"
-    echo "DOS/Win32 format to Unix, --utod converts from Unix to DOS/Win32 format,"
-@@ -140,6 +140,7 @@
-    "bcc32"   ) proc_fix "Windows (BCC32)"   "makefile.bcc" "ALLEGRO_BCC32";;
-    "beos"    ) proc_fix "BeOS"              "makefile.be"  "ALLEGRO_BEOS";;
-    "djgpp"   ) proc_fix "DOS (djgpp)"       "makefile.dj"  "ALLEGRO_DJGPP";;
-+   "haiku"   ) proc_fix "Haiku"             "makefile.be"  "ALLEGRO_HAIKU";;
-    "mingw"   ) proc_fix "Windows (MinGW)"   "makefile.mgw" "ALLEGRO_MINGW32";;
-    "mingw32" ) proc_fix "Windows (MinGW)"   "makefile.mgw" "ALLEGRO_MINGW32";;
-    # 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 22:37:14.000000000 +0000
-+++ allegro-4.3.10-haiku/include/allegro/internal/aintern.h	2008-09-13 20:11:46.000000000 +0000
-@@ -189,7 +189,7 @@
- 
- 
- #if (defined ALLEGRO_DOS) || (defined ALLEGRO_DJGPP) || (defined ALLEGRO_WATCOM) || \
--    (defined ALLEGRO_QNX) || (defined ALLEGRO_BEOS)
-+    (defined ALLEGRO_QNX) || (defined ALLEGRO_BEOS)  || (defined ALLEGRO_HAIKU)
- 
- AL_ARRAY(char *, _pckeys_names);
- 
-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 08:13:22.000000000 +0000
-+++ allegro-4.3.10-haiku/include/allegro/internal/alconfig.h	2008-09-13 20:11:46.000000000 +0000
-@@ -48,6 +48,8 @@
-       #include "allegro/platform/albcc32.h"
-    #elif defined ALLEGRO_MSVC
-       #include "allegro/platform/almsvc.h"
-+   #elif defined ALLEGRO_HAIKU
-+      #include "allegro/platform/albecfg.h"
-    #elif defined ALLEGRO_BEOS
-       #include "allegro/platform/albecfg.h"
-    #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-16 02:52:28.000000000 +0000
-+++ allegro-4.3.10-haiku/include/allegro/platform/albecfg.h	2008-09-13 20:11:46.000000000 +0000
-@@ -31,7 +31,13 @@
- #define ALLEGRO_HAVE_SYS_TIME_H 1
- 
- /* describe this platform */
--#define ALLEGRO_PLATFORM_STR  "BeOS"
-+#if defined __BEOS__ && !defined __HAIKU__
-+  #define ALLEGRO_PLATFORM_STR  "BeOS"
-+#endif
-+#if defined __HAIKU__
-+  #define ALLEGRO_PLATFORM_STR  "Haiku"
-+  #define ALLEGRO_HAVE_LIBPTHREAD 1
-+#endif
- #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 18:05:12.000000000 +0000
-+++ allegro-4.3.10-haiku/include/allegro/platform/albeos.h	2008-09-13 20:11:46.000000000 +0000
-@@ -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-15 05:28:14.000000000 +0000
-+++ allegro-4.3.10-haiku/include/allegro/platform/alunixac.hin	2008-09-13 20:11:46.000000000 +0000
-@@ -68,7 +68,7 @@
- #undef ALLEGRO_DARWIN
- 
- /* Define if you have the pthread library. */
--#undef ALLEGRO_HAVE_LIBPTHREAD
-+/* #undef ALLEGRO_HAVE_LIBPTHREAD */
- 
- /* Define if constructor attribute is supported. */
- #undef ALLEGRO_USE_CONSTRUCTOR
-@@ -159,7 +159,7 @@
- 
- /* Define as the return type of signal handlers (`int' or `void'). */
- /* TODO: rename this */
--#undef RETSIGTYPE
-+/* #undef RETSIGTYPE */
- 
- /* Define to empty if `const' does not conform to ANSI C. */
- #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 10:39:24.000000000 +0000
-+++ allegro-4.3.10-haiku/include/allegro/system.h	2008-09-13 20:11:46.000000000 +0000
-@@ -61,6 +61,7 @@
- #define OSTYPE_QNX         AL_ID('Q','N','X',' ')
- #define OSTYPE_UNIX        AL_ID('U','N','I','X')
- #define OSTYPE_BEOS        AL_ID('B','E','O','S')
-+#define OSTYPE_HAIKU       AL_ID('H','A','I','K')
- #define OSTYPE_MACOS       AL_ID('M','A','C',' ')
- #define OSTYPE_MACOSX      AL_ID('M','A','C','X')
- 
-diff -urN allegro-4.3.10/makefile.all allegro-4.3.10-haiku/makefile.all
---- allegro-4.3.10/makefile.all	2008-01-14 11:55:28.000000000 +0000
-+++ allegro-4.3.10-haiku/makefile.all	2008-09-13 20:11:46.000000000 +0000
-@@ -8,7 +8,7 @@
- #        DEBUGMODE=2        selects a build intended to debug Allegro itself.
- #        PROFILEMODE=1      selects a profiling build.
- #        WARNMODE=1         selects strict compiler warnings.
--#        STATICLINK=1       use static linking (MinGW32, MSVC, BeOS).
-+#        STATICLINK=1       use static linking (MinGW32, MSVC, BeOS, Haiku).
- #        STATICRUNTIME=1    link to a static C runtime library (/MT) (MSVC)
- #        TARGET_ARCH_COMPAT optimize for the given processor while preserving backwards
- #                           compatibility with older processors (GCC-based platforms).
-@@ -132,7 +132,7 @@
- # XXX this is duplicated in makefile.in
- DOCBASEFILES = ahack changes faq mistakes help thanks allegro const abi api packfile \
-                readme makedoc datafile grabber dat dat2c dat2s license addons targets
--DOCBUILDFILES = bcc32 beos darwin djgpp dmc linux macosx mingw32 msvc qnx unix watcom
-+DOCBUILDFILES = bcc32 beos darwin djgpp dmc haiku linux macosx mingw32 msvc qnx unix watcom
- DOCTXTBUILDFILES = $(addprefix docs/build/,$(addsuffix .txt,$(DOCBUILDFILES)))
- 
- 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 11:30:16.000000000 +0000
-+++ allegro-4.3.10-haiku/makefile.be	2008-09-13 20:11:46.000000000 +0000
-@@ -10,7 +10,15 @@
- 
- # -------- define some variables that the primary makefile will use --------
- 
-+
-+ifeq ($(OS),BeOS)
- PLATFORM = BeOS
-+endif
-+
-+ifeq ($(OS),Haiku)
-+PLATFORM = Haiku
-+endif
-+
- CC = gcc
- EXE = 
- OBJ = .o
-@@ -123,7 +131,13 @@
- 
- OBJECT_LIST = $(COMMON_OBJECTS) $(MY_OBJECTS) $(basename $(notdir $(ALLEGRO_SRC_BEOS_FILES)))
- 
-+ifeq ($(OS),BeOS)
- LIBRARIES = -lbe -lgame -ldevice -lmidi -lmedia -lnet
-+endif
-+
-+ifeq ($(OS),Haiku)
-+LIBRARIES = -lbe -lgame -ldevice -lmidi -lmedia -lnetwork
-+endif
- 
- PROGRAMS = bfixicon
- 
-@@ -167,7 +181,14 @@
- 	sed -e "s/@LIBS@/$(LIBRARIES)/" temp2 > temp
- 	sed -e "s/include/headers/" temp >temp2
- 	sed -e "s/ -l\$${lib_type}_unsharable//" temp2 >temp
-+
-+ifeq ($(OS),BeOS)
- 	sed -e "s/libdirs=-L\$${exec_prefix}\/lib/libdirs=\"-L\$${exec_prefix}\/lib\/x86 -L\/boot\/home\/config\/lib\"/" temp >/bin/allegro-config
-+endif
-+ifeq ($(OS),Haiku)
-+	sed -e "s/libdirs=-L\$${exec_prefix}\/lib/libdirs=\"-L\$${exec_prefix}\/lib\/x86 -L\/boot\/common\/lib\"/" temp >/bin/allegro-config
-+endif
-+
- 	rm -f temp temp2
- 	chmod a+x /bin/allegro-config
- 
-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 21:45:48.000000000 +0000
-+++ allegro-4.3.10-haiku/misc/mkunixdists.sh	2008-09-13 20:11:46.000000000 +0000
-@@ -73,9 +73,9 @@
- # Hack'n'slash
- echo "Stripping to form end-user distribution"
- (cd $dir/$basename && {
--	(cd src && rm -rf beos qnx dos mac ppc win)
--	(cd obj && rm -rf bcc32 beos qnx djgpp mingw32 msvc watcom)
--	(cd lib && rm -rf bcc32 beos qnx djgpp mingw32 msvc watcom)
-+	(cd src && rm -rf beos haiku qnx dos mac ppc win)
-+	(cd obj && rm -rf bcc32 beos haiku qnx djgpp mingw32 msvc watcom)
-+	(cd lib && rm -rf bcc32 beos haiku qnx djgpp mingw32 msvc watcom)
- 	(cd include && rm -f bealleg.h qnxalleg.h macalleg.h winalleg.h)
- 	(cd misc && rm -f cmplog.pl dllsyms.lst findtext.sh fixpatch.sh fixver.sh)
- 	(cd misc && rm -f allegro-config-qnx.sh zipup.sh zipwin.sh *.bat *.c)
-@@ -94,8 +94,8 @@
- 	(cd addons/jpgalleg && rm -f makefile.be makefile.mgw makefile.dj)
- 	(cd addons/jpgalleg && rm -f makefile.osx makefile.vc fix.bat readme.txt)
- 	(cd addons/jpgalleg/misc && rm -f fixver.sh runner.c)
--	(cd addons/jpgalleg/lib && rm -rf beos djgpp macosx mingw32 msvc)
--	(cd addons/jpgalleg/obj && rm -rf beos djgpp macosx mingw32 msvc)
-+	(cd addons/jpgalleg/lib && rm -rf beos djgpp haiku macosx mingw32 msvc)
-+	(cd addons/jpgalleg/obj && rm -rf beos djgpp haiku macosx mingw32 msvc)
- 
- 	# logg addon
- 	(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 12:16:56.000000000 +0000
-+++ allegro-4.3.10-haiku/misc/zipup.sh	2008-09-13 20:11:46.000000000 +0000
-@@ -125,6 +125,12 @@
- 
- make depend UNIX_TOOLS=1 CC=gcc
- 
-+# generate dependencies for Haiku
-+echo "Generating Haiku dependencies..."
-+
-+./fix.sh haiku --quick
-+
-+make depend UNIX_TOOLS=1 CC=gcc
- 
- # generate dependencies for QNX
- echo "Generating QNX dependencies..."
-@@ -164,7 +170,7 @@
- for base in abi ahack allegro const faq help mistakes; do
-    ./_makedoc.exe -ascii docs/txt/$base.txt docs/src/$base._tx
- done
--for base in bcc32 beos darwin djgpp linux macosx mingw32 msvc qnx unix watcom; do
-+for base in bcc32 beos darwin djgpp haiku linux macosx mingw32 msvc qnx unix watcom; do
-    ./_makedoc.exe -ascii docs/build/$base.txt docs/src/build/$base._tx
- done
- 
-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 23:37:20.000000000 +0000
-+++ allegro-4.3.10-haiku/setup/keyconf.c	2008-09-13 20:11:46.000000000 +0000
-@@ -25,8 +25,8 @@
- 
- 
- /* The code can't link on platforms that don't use src/misc/pckeys.c (everything
-- * but DOS, QNX, BEOS). */
--#if (defined ALLEGRO_DOS) || (defined ALLEGRO_QNX) || (defined ALLEGRO_BEOS)
-+ * but DOS, QNX, BEOS, HAIKU). */
-+#if (defined ALLEGRO_DOS) || (defined ALLEGRO_QNX) || (defined ALLEGRO_BEOS) || (defined ALLEGRO_HAIKU)
- 
- 
- 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 23:18:56.000000000 +0000
-+++ allegro-4.3.10-haiku/src/beos/baccel.cpp	2008-09-13 20:11:46.000000000 +0000
-@@ -20,7 +20,7 @@
- #include "allegro/internal/aintern.h"
- #include "allegro/platform/aintbeos.h"
- 
--#ifndef ALLEGRO_BEOS
-+#if !defined ALLEGRO_BEOS && !defined ALLEGRO_HAIKU
- #error something is wrong with the makefile
- #endif
- 
-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 15:18:16.000000000 +0000
-+++ allegro-4.3.10-haiku/src/beos/bdispsw.cpp	2008-09-13 20:11:46.000000000 +0000
-@@ -19,7 +19,7 @@
- #include "allegro/internal/aintern.h"
- #include "allegro/platform/aintbeos.h"
- 
--#ifndef ALLEGRO_BEOS
-+#if !defined ALLEGRO_BEOS && !defined ALLEGRO_HAIKU
- #error something is wrong with the makefile
- #endif
- 
-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 20:57:00.000000000 +0000
-+++ allegro-4.3.10-haiku/src/beos/bdwindow.cpp	2008-09-13 20:11:46.000000000 +0000
-@@ -21,7 +21,7 @@
- #include "allegro/internal/aintern.h"
- #include "allegro/platform/aintbeos.h"
- 
--#ifndef ALLEGRO_BEOS
-+#if !defined ALLEGRO_BEOS && !defined ALLEGRO_HAIKU
- #error something is wrong with the makefile
- #endif
- 
-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 16:05:12.000000000 +0000
-+++ allegro-4.3.10-haiku/src/beos/bgfx.c	2008-09-13 20:11:46.000000000 +0000
-@@ -19,9 +19,9 @@
- #include "allegro/internal/aintern.h"
- #include "allegro/platform/aintbeos.h"
- 
--#ifndef ALLEGRO_BEOS
-+#if !defined ALLEGRO_BEOS && !defined ALLEGRO_HAIKU
- #error something is wrong with the makefile
--#endif 
-+#endif
- 
- 
- 
-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 21:12:30.000000000 +0000
-+++ allegro-4.3.10-haiku/src/beos/bgfxapi.cpp	2008-09-13 20:11:46.000000000 +0000
-@@ -19,7 +19,7 @@
- #include "allegro/internal/aintern.h"
- #include "allegro/platform/aintbeos.h"
- 
--#ifndef ALLEGRO_BEOS
-+#if !defined ALLEGRO_BEOS && !defined ALLEGRO_HAIKU
- #error something is wrong with the makefile
- #endif
- 
-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 15:30:48.000000000 +0000
-+++ allegro-4.3.10-haiku/src/beos/bgfxdrv.c	2008-09-13 20:11:46.000000000 +0000
-@@ -18,9 +18,9 @@
- #include "allegro.h"
- #include "allegro/internal/aintern.h"
- 
--#ifndef ALLEGRO_BEOS
-+#if !defined ALLEGRO_BEOS && !defined ALLEGRO_HAIKU
- #error something is wrong with the makefile
--#endif                
-+#endif           
- 
- BEGIN_GFX_DRIVER_LIST
- 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 17:16:42.000000000 +0000
-+++ allegro-4.3.10-haiku/src/beos/bjoy.c	2008-09-13 20:11:46.000000000 +0000
-@@ -19,7 +19,7 @@
- #include "allegro/internal/aintern.h"
- #include "allegro/platform/aintbeos.h"
- 
--#ifndef ALLEGRO_BEOS
-+#if !defined ALLEGRO_BEOS && !defined ALLEGRO_HAIKU
- #error something is wrong with the makefile
- #endif
- 
-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 14:44:50.000000000 +0000
-+++ allegro-4.3.10-haiku/src/beos/bjoyapi.cpp	2008-09-13 20:11:46.000000000 +0000
-@@ -19,9 +19,9 @@
- #include "allegro/internal/aintern.h"
- #include "allegro/platform/aintbeos.h"
- 
--#ifndef ALLEGRO_BEOS
-+#if !defined ALLEGRO_BEOS && !defined ALLEGRO_HAIKU
- #error something is wrong with the makefile
--#endif                
-+#endif            
- 
- static BJoystick *be_joy = NULL;
- 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 15:30:48.000000000 +0000
-+++ allegro-4.3.10-haiku/src/beos/bjoydrv.c	2008-09-13 20:11:46.000000000 +0000
-@@ -18,9 +18,9 @@
- #include "allegro.h"
- #include "allegro/internal/aintern.h"
- 
--#ifndef ALLEGRO_BEOS
-+#if !defined ALLEGRO_BEOS && !defined ALLEGRO_HAIKU
- #error something is wrong with the makefile
--#endif                
-+#endif              
- 
- BEGIN_JOYSTICK_DRIVER_LIST
- 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 20:56:28.000000000 +0000
-+++ allegro-4.3.10-haiku/src/beos/bkey.c	2008-09-13 20:11:46.000000000 +0000
-@@ -19,9 +19,9 @@
- #include "allegro/internal/aintern.h"
- #include "allegro/platform/aintbeos.h"
- 
--#ifndef ALLEGRO_BEOS
-+#if !defined ALLEGRO_BEOS && !defined ALLEGRO_HAIKU
- #error something is wrong with the makefile
--#endif 
-+#endif
- 
- 
- 
-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 20:57:00.000000000 +0000
-+++ allegro-4.3.10-haiku/src/beos/bkeyapi.cpp	2008-09-13 20:11:46.000000000 +0000
-@@ -22,9 +22,9 @@
- #include "allegro/internal/aintern.h"
- #include "allegro/platform/aintbeos.h"
- 
--#ifndef ALLEGRO_BEOS
-+#if !defined ALLEGRO_BEOS && !defined ALLEGRO_HAIKU
- #error something is wrong with the makefile
--#endif                
-+#endif           
- 
- #define KEY_ID_PC101 0 // the docs say it should be 0x83ab, but they lie
- 
-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 15:30:48.000000000 +0000
-+++ allegro-4.3.10-haiku/src/beos/bkeydrv.c	2008-09-13 20:11:46.000000000 +0000
-@@ -18,9 +18,9 @@
- #include "allegro.h"
- #include "allegro/internal/aintern.h"
- 
--#ifndef ALLEGRO_BEOS
-+#if !defined ALLEGRO_BEOS && !defined ALLEGRO_HAIKU
- #error something is wrong with the makefile
--#endif                
-+#endif             
- 
- _DRIVER_INFO _keyboard_driver_list[] =
- {
-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 15:05:34.000000000 +0000
-+++ allegro-4.3.10-haiku/src/beos/bmidi.c	2008-09-13 20:11:46.000000000 +0000
-@@ -19,9 +19,9 @@
- #include "allegro/internal/aintern.h"
- #include "allegro/platform/aintbeos.h"
- 
--#ifndef ALLEGRO_BEOS
-+#if !defined ALLEGRO_BEOS && !defined ALLEGRO_HAIKU
- #error something is wrong with the makefile
--#endif                
-+#endif     
- 
- MIDI_DRIVER midi_beos =
- {
-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 21:48:38.000000000 +0000
-+++ allegro-4.3.10-haiku/src/beos/bmidiapi.cpp	2008-09-13 20:11:46.000000000 +0000
-@@ -19,9 +19,9 @@
- #include "allegro/internal/aintern.h"
- #include "allegro/platform/aintbeos.h"
- 
--#ifndef ALLEGRO_BEOS
-+#if !defined ALLEGRO_BEOS && !defined ALLEGRO_HAIKU
- #error something is wrong with the makefile
--#endif                
-+#endif           
- 
- 
- 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 15:30:48.000000000 +0000
-+++ allegro-4.3.10-haiku/src/beos/bmididrv.c	2008-09-13 20:11:46.000000000 +0000
-@@ -18,9 +18,9 @@
- #include "allegro.h"
- #include "allegro/internal/aintern.h"
- 
--#ifndef ALLEGRO_BEOS
-+#if !defined ALLEGRO_BEOS && !defined ALLEGRO_HAIKU
- #error something is wrong with the makefile
--#endif                
-+#endif             
- 
- BEGIN_MIDI_DRIVER_LIST
- 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 20:57:00.000000000 +0000
-+++ allegro-4.3.10-haiku/src/beos/bmousapi.cpp	2008-09-13 20:11:46.000000000 +0000
-@@ -23,9 +23,9 @@
- #include "allegro/internal/aintern.h"
- #include "allegro/platform/aintbeos.h"
- 
--#ifndef ALLEGRO_BEOS
-+#if !defined ALLEGRO_BEOS && !defined ALLEGRO_HAIKU
- #error something is wrong with the makefile
--#endif                
-+#endif              
- 
- #define MOUSE_THREAD_NAME     "mouse driver"
- #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 15:30:48.000000000 +0000
-+++ allegro-4.3.10-haiku/src/beos/bmousdrv.c	2008-09-13 20:11:46.000000000 +0000
-@@ -18,9 +18,9 @@
- #include "allegro.h"
- #include "allegro/internal/aintern.h"
- 
--#ifndef ALLEGRO_BEOS
-+#if !defined ALLEGRO_BEOS && !defined ALLEGRO_HAIKU
- #error something is wrong with the makefile
--#endif                
-+#endif              
- 
- 
- 
-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 13:24:16.000000000 +0000
-+++ allegro-4.3.10-haiku/src/beos/bmouse.c	2008-09-13 20:11:46.000000000 +0000
-@@ -19,9 +19,9 @@
- #include "allegro/internal/aintern.h"
- #include "allegro/platform/aintbeos.h"
- 
--#ifndef ALLEGRO_BEOS
-+#if !defined ALLEGRO_BEOS && !defined ALLEGRO_HAIKU
- #error something is wrong with the makefile
--#endif                
-+#endif           
- 
- 
- 
-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 11:53:40.000000000 +0000
-+++ allegro-4.3.10-haiku/src/beos/boverlay.cpp	2008-09-13 20:11:46.000000000 +0000
-@@ -19,7 +19,7 @@
- #include "allegro/internal/aintern.h"
- #include "allegro/platform/aintbeos.h"
- 
--#ifndef ALLEGRO_BEOS
-+#if !defined ALLEGRO_BEOS && !defined ALLEGRO_HAIKU
- #error something is wrong with the makefile
- #endif
- 
-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 15:05:34.000000000 +0000
-+++ allegro-4.3.10-haiku/src/beos/bsnd.c	2008-09-13 20:11:47.000000000 +0000
-@@ -19,9 +19,9 @@
- #include "allegro/internal/aintern.h"
- #include "allegro/platform/aintbeos.h"
- 
--#ifndef ALLEGRO_BEOS
-+#if !defined ALLEGRO_BEOS && !defined ALLEGRO_HAIKU
- #error something is wrong with the makefile
--#endif                
-+#endif             
- 
- DIGI_DRIVER digi_beos =
- {
-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 15:05:34.000000000 +0000
-+++ allegro-4.3.10-haiku/src/beos/bsndapi.cpp	2008-09-13 20:11:47.000000000 +0000
-@@ -20,7 +20,7 @@
- #include "allegro/internal/aintern.h"
- #include "allegro/platform/aintbeos.h"
- 
--#ifndef ALLEGRO_BEOS
-+#if !defined ALLEGRO_BEOS && !defined ALLEGRO_HAIKU
- #error something is wrong with the makefile
- #endif
- 
-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 15:30:48.000000000 +0000
-+++ allegro-4.3.10-haiku/src/beos/bsnddrv.c	2008-09-13 20:11:47.000000000 +0000
-@@ -19,9 +19,9 @@
- #include "allegro/internal/aintern.h"
- 
- 
--#ifndef ALLEGRO_BEOS
-+#if !defined ALLEGRO_BEOS && !defined ALLEGRO_HAIKU
- #error something is wrong with the makefile
--#endif                
-+#endif           
- 
- BEGIN_DIGI_DRIVER_LIST
- 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 20:57:00.000000000 +0000
-+++ allegro-4.3.10-haiku/src/beos/bsysapi.cpp	2008-09-13 20:11:47.000000000 +0000
-@@ -27,9 +27,9 @@
- #include <sys/utsname.h>
- #endif
- 
--#ifndef ALLEGRO_BEOS
-+#if !defined ALLEGRO_BEOS && !defined ALLEGRO_HAIKU
- #error something is wrong with the makefile
--#endif              
-+#endif            
- 
- #define SYS_THREAD_PRIORITY B_NORMAL_PRIORITY
- #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 15:30:48.000000000 +0000
-+++ allegro-4.3.10-haiku/src/beos/bsysdrv.c	2008-09-13 20:11:47.000000000 +0000
-@@ -18,9 +18,9 @@
- #include "allegro.h"
- #include "allegro/internal/aintern.h"
- 
--#ifndef ALLEGRO_BEOS
-+#if !defined ALLEGRO_BEOS && !defined ALLEGRO_HAIKU
- #error something is wrong with the makefile
--#endif 
-+#endif
- 
- _DRIVER_INFO _system_driver_list[] =
- {
-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 21:10:58.000000000 +0000
-+++ allegro-4.3.10-haiku/src/beos/bsystem.c	2008-09-13 20:11:47.000000000 +0000
-@@ -19,11 +19,9 @@
- #include "allegro/internal/aintern.h"
- #include "allegro/platform/aintbeos.h"
- 
--#ifndef ALLEGRO_BEOS
-+#if !defined ALLEGRO_BEOS && !defined ALLEGRO_HAIKU
- #error something is wrong with the makefile
--#endif 
--
--
-+#endif
- 
- SYSTEM_DRIVER system_beos = {
-    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 11:33:22.000000000 +0000
-+++ allegro-4.3.10-haiku/src/beos/btimeapi.cpp	2008-09-13 20:11:47.000000000 +0000
-@@ -19,7 +19,7 @@
- #include "allegro/internal/aintern.h"
- #include "allegro/platform/aintbeos.h"
- 
--#ifndef ALLEGRO_BEOS
-+#if !defined ALLEGRO_BEOS && !defined ALLEGRO_HAIKU
- #error something is wrong with the makefile
- #endif
- 
-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 15:30:48.000000000 +0000
-+++ allegro-4.3.10-haiku/src/beos/btimedrv.c	2008-09-13 20:11:47.000000000 +0000
-@@ -18,9 +18,9 @@
- #include "allegro.h"
- #include "allegro/internal/aintern.h"
- 
--#ifndef ALLEGRO_BEOS
-+#if !defined ALLEGRO_BEOS && !defined ALLEGRO_HAIKU
- #error something is wrong with the makefile
--#endif                
-+#endif         
- 
- _DRIVER_INFO _timer_driver_list[] = {
-    {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-22 02:57:14.000000000 +0000
-+++ allegro-4.3.10-haiku/src/beos/btimer.c	2008-09-13 20:11:47.000000000 +0000
-@@ -19,7 +19,7 @@
- #include "allegro/internal/aintern.h"
- #include "allegro/platform/aintbeos.h"
- 
--#ifndef ALLEGRO_BEOS
-+#if !defined ALLEGRO_BEOS && !defined ALLEGRO_HAIKU
- #error something is wrong with the makefile
- #endif
- 
-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 11:53:40.000000000 +0000
-+++ allegro-4.3.10-haiku/src/beos/bwindow.cpp	2008-09-13 20:11:47.000000000 +0000
-@@ -19,7 +19,7 @@
- #include "allegro/internal/aintern.h"
- #include "allegro/platform/aintbeos.h"
- 
--#ifndef ALLEGRO_BEOS
-+#if !defined ALLEGRO_BEOS && !defined ALLEGRO_HAIKU
- #error something is wrong with the makefile
- #endif
- 
-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 17:27:02.000000000 +0000
-+++ allegro-4.3.10-haiku/src/beos/bwscreen.cpp	2008-09-13 20:11:47.000000000 +0000
-@@ -19,7 +19,7 @@
- #include "allegro/internal/aintern.h"
- #include "allegro/platform/aintbeos.h"
- 
--#ifndef ALLEGRO_BEOS
-+#if !defined ALLEGRO_BEOS && !defined ALLEGRO_HAIKU
- #error something is wrong with the makefile
- #endif
- 
-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-16 02:52:28.000000000 +0000
-+++ allegro-4.3.10-haiku/src/i386/asmdefs.inc	2008-09-13 20:11:47.000000000 +0000
-@@ -31,6 +31,8 @@
-    #include "obj/msvc/asmdef.inc"
- #elif defined ALLEGRO_WATCOM
-    #include "obj/watcom/asmdef.inc"
-+#elif defined ALLEGRO_HAIKU
-+   #include "obj/beos/asmdef.inc"
- #elif defined ALLEGRO_BEOS
-    #include "obj/beos/asmdef.inc"
- #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 16:19:54.000000000 +0000
-+++ allegro-4.3.10-haiku/src/midi.c	2008-09-13 20:11:47.000000000 +0000
-@@ -1122,7 +1122,7 @@
-       running_status = 0;
- 
-       while (p < end) {                         /* work through data stream */
--#ifdef ALLEGRO_BEOS
-+#if defined ALLEGRO_BEOS || defined ALLEGRO_HAIKU
-          /* 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/tools/dat2c.c allegro-4.3.10-haiku/tools/dat2c.c
---- allegro-4.3.10/tools/dat2c.c	2005-04-28 09:53:38.000000000 +0000
-+++ allegro-4.3.10-haiku/tools/dat2c.c	2008-09-13 20:11:47.000000000 +0000
-@@ -342,7 +342,7 @@
-    }
- 
-    if (dat2c->lformat == lineformat_default)
--#if (defined ALLEGRO_UNIX || defined ALLEGRO_QNX || defined ALLEGRO_BEOS || defined ALLEGRO_MACOSX)
-+#if (defined ALLEGRO_UNIX || defined ALLEGRO_QNX || defined ALLEGRO_BEOS || defined ALLEGRO_HAIKU || defined ALLEGRO_MACOSX)
-       dat2c->lformat = lineformat_unix;
- #elif (defined ALLEGRO_WINDOWS || defined ALLEGRO_DOS)
-       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 16:23:36.000000000 +0000
-+++ allegro-4.3.10-haiku/tools/datedit.c	2008-09-13 20:11:47.000000000 +0000
-@@ -121,6 +121,8 @@
-       #include "obj/dmc/plugins.h"
-    #elif defined ALLEGRO_BEOS
-       #include "obj/beos/plugins.h"
-+   #elif defined ALLEGRO_HAIKU
-+      #include "obj/beos/plugins.h"
-    #elif defined ALLEGRO_BCC32
-       #include "obj/bcc32/plugins.h"
-    #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 13:09:26.000000000 +0000
-+++ allegro-4.3.10-haiku/tools/grabber.c	2008-09-13 20:11:48.000000000 +0000
-@@ -3132,6 +3132,7 @@
-       case OSTYPE_QNX:        s = "QNX";                        break;
-       case OSTYPE_UNIX:       s = "Unix";                       break;
-       case OSTYPE_BEOS:       s = "BeOS";                       break;
-+      case OSTYPE_HAIKU:      s = "Haiku";                      break;
-       case OSTYPE_MACOS:      s = "MacOS";                      break;
-       case OSTYPE_MACOSX:     s = "MacOS X";                    break;
-       default:                s = "Unknown";                    break;
diff --git a/media-libs/allegro/patches/allegro-4.3.10-haiku-5.diff b/media-libs/allegro/patches/allegro-4.3.10-haiku-5.diff
deleted file mode 100644
index 5b3a25a4f..000000000
--- a/media-libs/allegro/patches/allegro-4.3.10-haiku-5.diff
+++ /dev/null
@@ -1,792 +0,0 @@
-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-10-04 20:41:29.000000000 +0000
-+++ allegro-4.3.10-haiku/addons/allegrogl/fix.sh	2008-10-04 21:07:34.000000000 +0000
-@@ -26,7 +26,7 @@
-       echo "Compilation target adjustment."
-       echo "  Usage: fix <platform> [--dtou|--utod|--quick]"
-       echo ""
--      echo "  <platform> is one of: djgpp, mingw32, unix, macosx,"
-+      echo "  <platform> is one of: djgpp, haiku, mingw32, unix, macosx,"
- 	  echo "  macosx-universal"
-       echo ""
-       echo "  --dtou converts from DOS/Win32 format to Unix"
-@@ -81,6 +81,7 @@
- 
- case "$1" in
- 	djgpp	) proc_fix "DJGPP" "makefile.dj";;
-+	haiku	) proc_fix "Haiku" "makefile.gen";;
- 	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/fix.sh allegro-4.3.10-haiku/addons/jpgalleg/fix.sh
---- allegro-4.3.10/addons/jpgalleg/fix.sh	2008-10-04 20:41:12.000000000 +0000
-+++ allegro-4.3.10-haiku/addons/jpgalleg/fix.sh	2008-10-04 21:01:19.000000000 +0000
-@@ -85,6 +85,7 @@
-    "mingw"   ) proc_fix "MinGW32" "makefile.mgw";;
-    "msvc"    ) proc_fix "MSVC" "makefile.vc";;
-    "beos"    ) proc_fix "BeOS" "makefile.be";;
-+   "haiku"   ) proc_fix "Haiku" "makefile.be";;
-    "unix"    ) proc_fix "Unix" "makefile.uni";;
-    "macosx"  ) proc_fix "MacOS X" "makefile.osx";;
-    "macosx-universal" ) proc_fix_osx_ub ;;
-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	2008-10-04 20:41:10.000000000 +0000
-+++ allegro-4.3.10-haiku/addons/loadpng/fix.sh	2008-10-04 21:08:47.000000000 +0000
-@@ -8,7 +8,7 @@
-    echo
-    echo "Usage: $0 <platform> [--quick|--dtou|--utod]"
-    echo
--   echo "Where platform is one of: djgpp, mingw32, unix, macosx, macosx-universal"
-+   echo "Where platform is one of: djgpp, haiku, mingw32, unix, macosx, macosx-universal"
-    echo "The --quick parameter turns off text file conversion, --dtou converts from"
-    echo "DOS/Win32 format to Unix, --utod converts from Unix to DOS/Win32 format."
-    echo "If no parameter is specified --quick is assumed."
-@@ -88,7 +88,9 @@
- fi
- 
- case "$1" in
-+   "beos"    ) proc_fix "BeOS"              "Makefile.be";;
-    "djgpp"   ) proc_fix "DOS (djgpp)"       "Makefile.dj";;
-+   "haiku"   ) proc_fix "Haiku"             "Makefile.be";;
-    "mingw"   ) proc_fix "Windows (MinGW)"   "Makefile.mgw";;
-    "mingw32" ) proc_fix "Windows (MinGW)"   "Makefile.mgw";;
-    "unix"    ) proc_fix "Unix"              "Makefile.unx";;
-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	2008-10-04 20:41:29.000000000 +0000
-+++ allegro-4.3.10-haiku/addons/logg/fix.sh	2008-10-04 21:12:47.000000000 +0000
-@@ -8,7 +8,7 @@
-    echo
-    echo "Usage: $0 <platform> [--quick|--dtou|--utod]"
-    echo
--   echo "Where platform is one of: mingw32, unix, macosx, macosx-universal"
-+   echo "Where platform is one of: beos, haiku, mingw32, unix, macosx, macosx-universal"
-    echo "The --quick parameter turns off text file conversion, --dtou converts from"
-    echo "DOS/Win32 format to Unix, --utod converts from Unix to DOS/Win32 format."
-    echo "If no parameter is specified --quick is assumed."
-@@ -80,6 +80,8 @@
- fi
- 
- case "$1" in
-+   "beos"    ) proc_fix "BeOS"              "Makefile.be";;
-+   "haiku"   ) proc_fix "Haiku"             "Makefile.be";;
-    "mingw"   ) proc_fix "Windows (MinGW)"   "Makefile.migw";;
-    "mingw32" ) proc_fix "Windows (MinGW)"   "Makefile.migw";;
-    "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-10-04 20:41:32.000000000 +0000
-+++ allegro-4.3.10-haiku/fix.sh	2008-10-04 21:01:20.000000000 +0000
-@@ -9,7 +9,7 @@
-    echo
-    echo "Usage: $0 <platform> [--quick|--dtou|--utod]"
-    echo
--   echo "Where platform is one of: bcc32, beos, djgpp, mingw, qnx, unix"
-+   echo "Where platform is one of: bcc32, beos, djgpp, haiku, mingw, qnx, unix"
-    echo "mac, macosx, macosx-universal and watcom."
-    echo "The --quick parameter turns off text file conversion, --dtou converts from"
-    echo "DOS/Win32 format to Unix, --utod converts from Unix to DOS/Win32 format."
-@@ -90,6 +90,7 @@
-    "bcc32"   ) proc_fix "Windows (BCC32)"   "makefile.bcc" "ALLEGRO_BCC32";;
-    "beos"    ) proc_fix "BeOS"              "makefile.be"  "ALLEGRO_BEOS";;
-    "djgpp"   ) proc_fix "DOS (djgpp)"       "makefile.dj"  "ALLEGRO_DJGPP";;
-+   "haiku"   ) proc_fix "Haiku"             "makefile.be"  "ALLEGRO_HAIKU";;
-    "mingw"   ) proc_fix "Windows (MinGW)"   "makefile.mgw" "ALLEGRO_MINGW32";;
-    "mingw32" ) proc_fix "Windows (MinGW)"   "makefile.mgw" "ALLEGRO_MINGW32";;
-    # 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-10-04 20:41:30.000000000 +0000
-+++ allegro-4.3.10-haiku/include/allegro/internal/aintern.h	2008-10-04 21:01:20.000000000 +0000
-@@ -190,7 +190,7 @@
- 
- 
- #if (defined ALLEGRO_DOS) || (defined ALLEGRO_DJGPP) || (defined ALLEGRO_WATCOM) || \
--    (defined ALLEGRO_QNX) || (defined ALLEGRO_BEOS)
-+    (defined ALLEGRO_QNX) || (defined ALLEGRO_BEOS)  || (defined ALLEGRO_HAIKU)
- 
- AL_ARRAY(char *, _pckeys_names);
- 
-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	2008-10-04 20:41:30.000000000 +0000
-+++ allegro-4.3.10-haiku/include/allegro/internal/alconfig.h	2008-10-04 21:01:20.000000000 +0000
-@@ -48,6 +48,8 @@
-       #include "allegro/platform/albcc32.h"
-    #elif defined ALLEGRO_MSVC
-       #include "allegro/platform/almsvc.h"
-+   #elif defined ALLEGRO_HAIKU
-+      #include "allegro/platform/albecfg.h"
-    #elif defined ALLEGRO_BEOS
-       #include "allegro/platform/albecfg.h"
-    #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	2008-10-04 20:41:30.000000000 +0000
-+++ allegro-4.3.10-haiku/include/allegro/platform/albecfg.h	2008-10-04 21:01:20.000000000 +0000
-@@ -31,7 +31,13 @@
- #define ALLEGRO_HAVE_SYS_TIME_H 1
- 
- /* describe this platform */
--#define ALLEGRO_PLATFORM_STR  "BeOS"
-+#if defined __BEOS__ && !defined __HAIKU__
-+  #define ALLEGRO_PLATFORM_STR  "BeOS"
-+#endif
-+#if defined __HAIKU__
-+  #define ALLEGRO_PLATFORM_STR  "Haiku"
-+  #define ALLEGRO_HAVE_LIBPTHREAD 1
-+#endif
- #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	2008-10-04 20:41:30.000000000 +0000
-+++ allegro-4.3.10-haiku/include/allegro/platform/albeos.h	2008-10-04 21:01:20.000000000 +0000
-@@ -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	2008-10-04 20:41:30.000000000 +0000
-+++ allegro-4.3.10-haiku/include/allegro/platform/alunixac.hin	2008-10-04 21:01:20.000000000 +0000
-@@ -68,7 +68,7 @@
- #undef ALLEGRO_DARWIN
- 
- /* Define if you have the pthread library. */
--#undef ALLEGRO_HAVE_LIBPTHREAD
-+/* #undef ALLEGRO_HAVE_LIBPTHREAD */
- 
- /* Define if constructor attribute is supported. */
- #undef ALLEGRO_USE_CONSTRUCTOR
-@@ -159,7 +159,7 @@
- 
- /* Define as the return type of signal handlers (`int' or `void'). */
- /* TODO: rename this */
--#undef RETSIGTYPE
-+/* #undef RETSIGTYPE */
- 
- /* Define to empty if `const' does not conform to ANSI C. */
- #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-10-04 20:41:30.000000000 +0000
-+++ allegro-4.3.10-haiku/include/allegro/system.h	2008-10-04 21:01:20.000000000 +0000
-@@ -61,6 +61,7 @@
- #define OSTYPE_QNX         AL_ID('Q','N','X',' ')
- #define OSTYPE_UNIX        AL_ID('U','N','I','X')
- #define OSTYPE_BEOS        AL_ID('B','E','O','S')
-+#define OSTYPE_HAIKU       AL_ID('H','A','I','K')
- #define OSTYPE_MACOS       AL_ID('M','A','C',' ')
- #define OSTYPE_MACOSX      AL_ID('M','A','C','X')
- 
-diff -urN allegro-4.3.10/makefile.all allegro-4.3.10-haiku/makefile.all
---- allegro-4.3.10/makefile.all	2008-10-04 20:41:32.000000000 +0000
-+++ allegro-4.3.10-haiku/makefile.all	2008-10-04 21:01:20.000000000 +0000
-@@ -8,7 +8,7 @@
- #        DEBUGMODE=2        selects a build intended to debug Allegro itself.
- #        PROFILEMODE=1      selects a profiling build.
- #        WARNMODE=1         selects strict compiler warnings.
--#        STATICLINK=1       use static linking (MinGW32, MSVC, BeOS).
-+#        STATICLINK=1       use static linking (MinGW32, MSVC, BeOS, Haiku).
- #        STATICRUNTIME=1    link to a static C runtime library (/MT) (MSVC)
- #        TARGET_ARCH_COMPAT optimize for the given processor while preserving backwards
- #                           compatibility with older processors (GCC-based platforms).
-@@ -132,7 +132,7 @@
- # XXX this is duplicated in makefile.in
- DOCBASEFILES = ahack changes faq mistakes help thanks allegro const abi api packfile \
-                readme makedoc datafile grabber dat dat2c dat2s license addons targets
--DOCBUILDFILES = bcc32 beos darwin djgpp dmc linux macosx mingw32 msvc qnx unix watcom
-+DOCBUILDFILES = bcc32 beos darwin djgpp dmc haiku linux macosx mingw32 msvc qnx unix watcom
- DOCTXTBUILDFILES = $(addprefix docs/build/,$(addsuffix .txt,$(DOCBUILDFILES)))
- 
- 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-10-04 20:41:32.000000000 +0000
-+++ allegro-4.3.10-haiku/makefile.be	2008-10-04 21:01:20.000000000 +0000
-@@ -10,7 +10,15 @@
- 
- # -------- define some variables that the primary makefile will use --------
- 
-+
-+ifeq ($(OS),BeOS)
- PLATFORM = BeOS
-+endif
-+
-+ifeq ($(OS),Haiku)
-+PLATFORM = Haiku
-+endif
-+
- CC = gcc
- EXE = 
- OBJ = .o
-@@ -123,7 +131,13 @@
- 
- OBJECT_LIST = $(COMMON_OBJECTS) $(MY_OBJECTS) $(basename $(notdir $(ALLEGRO_SRC_BEOS_FILES)))
- 
-+ifeq ($(OS),BeOS)
- LIBRARIES = -lbe -lgame -ldevice -lmidi -lmedia -lnet
-+endif
-+
-+ifeq ($(OS),Haiku)
-+LIBRARIES = -lbe -lgame -ldevice -lmidi -lmedia -lnetwork
-+endif
- 
- PROGRAMS = bfixicon
- 
-@@ -167,7 +181,14 @@
- 	sed -e "s/@LIBS@/$(LIBRARIES)/" temp2 > temp
- 	sed -e "s/include/headers/" temp >temp2
- 	sed -e "s/ -l\$${lib_type}_unsharable//" temp2 >temp
-+
-+ifeq ($(OS),BeOS)
- 	sed -e "s/libdirs=-L\$${exec_prefix}\/lib/libdirs=\"-L\$${exec_prefix}\/lib\/x86 -L\/boot\/home\/config\/lib\"/" temp >/bin/allegro-config
-+endif
-+ifeq ($(OS),Haiku)
-+	sed -e "s/libdirs=-L\$${exec_prefix}\/lib/libdirs=\"-L\$${exec_prefix}\/lib\/x86 -L\/boot\/common\/lib\"/" temp >/bin/allegro-config
-+endif
-+
- 	rm -f temp temp2
- 	chmod a+x /bin/allegro-config
- 
-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-10-04 20:41:30.000000000 +0000
-+++ allegro-4.3.10-haiku/misc/mkunixdists.sh	2008-10-04 21:01:20.000000000 +0000
-@@ -73,9 +73,9 @@
- # Hack'n'slash
- echo "Stripping to form end-user distribution"
- (cd $dir/$basename && {
--	(cd src && rm -rf beos qnx dos mac ppc win)
--	(cd obj && rm -rf bcc32 beos qnx djgpp mingw32 msvc watcom)
--	(cd lib && rm -rf bcc32 beos qnx djgpp mingw32 msvc watcom)
-+	(cd src && rm -rf beos haiku qnx dos mac ppc win)
-+	(cd obj && rm -rf bcc32 beos haiku qnx djgpp mingw32 msvc watcom)
-+	(cd lib && rm -rf bcc32 beos haiku qnx djgpp mingw32 msvc watcom)
- 	(cd include && rm -f bealleg.h qnxalleg.h macalleg.h winalleg.h)
- 	(cd misc && rm -f cmplog.pl dllsyms.lst findtext.sh fixpatch.sh fixver.sh)
- 	(cd misc && rm -f allegro-config-qnx.sh zipup.sh zipwin.sh *.bat *.c)
-@@ -94,8 +94,8 @@
- 	(cd addons/jpgalleg && rm -f makefile.be makefile.mgw makefile.dj)
- 	(cd addons/jpgalleg && rm -f makefile.osx makefile.vc fix.bat readme.txt)
- 	(cd addons/jpgalleg/misc && rm -f fixver.sh runner.c)
--	(cd addons/jpgalleg/lib && rm -rf beos djgpp macosx mingw32 msvc)
--	(cd addons/jpgalleg/obj && rm -rf beos djgpp macosx mingw32 msvc)
-+	(cd addons/jpgalleg/lib && rm -rf beos djgpp haiku macosx mingw32 msvc)
-+	(cd addons/jpgalleg/obj && rm -rf beos djgpp haiku macosx mingw32 msvc)
- 
- 	# logg addon
- 	(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-10-04 20:41:30.000000000 +0000
-+++ allegro-4.3.10-haiku/misc/zipup.sh	2008-10-04 21:01:20.000000000 +0000
-@@ -125,6 +125,12 @@
- 
- make depend UNIX_TOOLS=1 CC=gcc
- 
-+# generate dependencies for Haiku
-+echo "Generating Haiku dependencies..."
-+
-+./fix.sh haiku --quick
-+
-+make depend UNIX_TOOLS=1 CC=gcc
- 
- # generate dependencies for QNX
- echo "Generating QNX dependencies..."
-@@ -164,7 +170,7 @@
- for base in abi ahack allegro const faq help mistakes; do
-    ./_makedoc.exe -ascii docs/txt/$base.txt docs/src/$base._tx
- done
--for base in bcc32 beos darwin djgpp linux macosx mingw32 msvc qnx unix watcom; do
-+for base in bcc32 beos darwin djgpp haiku linux macosx mingw32 msvc qnx unix watcom; do
-    ./_makedoc.exe -ascii docs/build/$base.txt docs/src/build/$base._tx
- done
- 
-diff -urN allegro-4.3.10/setup/keyconf.c allegro-4.3.10-haiku/setup/keyconf.c
---- allegro-4.3.10/setup/keyconf.c	2008-10-04 20:41:31.000000000 +0000
-+++ allegro-4.3.10-haiku/setup/keyconf.c	2008-10-04 21:01:20.000000000 +0000
-@@ -25,8 +25,8 @@
- 
- 
- /* The code can't link on platforms that don't use src/misc/pckeys.c (everything
-- * but DOS, QNX, BEOS). */
--#if (defined ALLEGRO_DOS) || (defined ALLEGRO_QNX) || (defined ALLEGRO_BEOS)
-+ * but DOS, QNX, BEOS, HAIKU). */
-+#if (defined ALLEGRO_DOS) || (defined ALLEGRO_QNX) || (defined ALLEGRO_BEOS) || (defined ALLEGRO_HAIKU)
- 
- 
- 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	2008-10-04 20:40:55.000000000 +0000
-+++ allegro-4.3.10-haiku/src/beos/baccel.cpp	2008-10-04 21:01:20.000000000 +0000
-@@ -20,7 +20,7 @@
- #include "allegro/internal/aintern.h"
- #include "allegro/platform/aintbeos.h"
- 
--#ifndef ALLEGRO_BEOS
-+#if !defined ALLEGRO_BEOS && !defined ALLEGRO_HAIKU
- #error something is wrong with the makefile
- #endif
- 
-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	2008-10-04 20:40:55.000000000 +0000
-+++ allegro-4.3.10-haiku/src/beos/bdispsw.cpp	2008-10-04 21:01:20.000000000 +0000
-@@ -19,7 +19,7 @@
- #include "allegro/internal/aintern.h"
- #include "allegro/platform/aintbeos.h"
- 
--#ifndef ALLEGRO_BEOS
-+#if !defined ALLEGRO_BEOS && !defined ALLEGRO_HAIKU
- #error something is wrong with the makefile
- #endif
- 
-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	2008-10-04 20:40:55.000000000 +0000
-+++ allegro-4.3.10-haiku/src/beos/bdwindow.cpp	2008-10-04 21:01:20.000000000 +0000
-@@ -21,7 +21,7 @@
- #include "allegro/internal/aintern.h"
- #include "allegro/platform/aintbeos.h"
- 
--#ifndef ALLEGRO_BEOS
-+#if !defined ALLEGRO_BEOS && !defined ALLEGRO_HAIKU
- #error something is wrong with the makefile
- #endif
- 
-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	2008-10-04 20:40:55.000000000 +0000
-+++ allegro-4.3.10-haiku/src/beos/bgfx.c	2008-10-04 21:01:20.000000000 +0000
-@@ -19,9 +19,9 @@
- #include "allegro/internal/aintern.h"
- #include "allegro/platform/aintbeos.h"
- 
--#ifndef ALLEGRO_BEOS
-+#if !defined ALLEGRO_BEOS && !defined ALLEGRO_HAIKU
- #error something is wrong with the makefile
--#endif 
-+#endif
- 
- 
- 
-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	2008-10-04 20:40:55.000000000 +0000
-+++ allegro-4.3.10-haiku/src/beos/bgfxapi.cpp	2008-10-04 21:01:20.000000000 +0000
-@@ -19,7 +19,7 @@
- #include "allegro/internal/aintern.h"
- #include "allegro/platform/aintbeos.h"
- 
--#ifndef ALLEGRO_BEOS
-+#if !defined ALLEGRO_BEOS && !defined ALLEGRO_HAIKU
- #error something is wrong with the makefile
- #endif
- 
-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	2008-10-04 20:40:55.000000000 +0000
-+++ allegro-4.3.10-haiku/src/beos/bgfxdrv.c	2008-10-04 21:01:20.000000000 +0000
-@@ -18,9 +18,9 @@
- #include "allegro.h"
- #include "allegro/internal/aintern.h"
- 
--#ifndef ALLEGRO_BEOS
-+#if !defined ALLEGRO_BEOS && !defined ALLEGRO_HAIKU
- #error something is wrong with the makefile
--#endif                
-+#endif           
- 
- BEGIN_GFX_DRIVER_LIST
- 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	2008-10-04 20:40:55.000000000 +0000
-+++ allegro-4.3.10-haiku/src/beos/bjoy.c	2008-10-04 21:01:20.000000000 +0000
-@@ -19,7 +19,7 @@
- #include "allegro/internal/aintern.h"
- #include "allegro/platform/aintbeos.h"
- 
--#ifndef ALLEGRO_BEOS
-+#if !defined ALLEGRO_BEOS && !defined ALLEGRO_HAIKU
- #error something is wrong with the makefile
- #endif
- 
-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	2008-10-04 20:40:55.000000000 +0000
-+++ allegro-4.3.10-haiku/src/beos/bjoyapi.cpp	2008-10-04 21:01:20.000000000 +0000
-@@ -19,9 +19,9 @@
- #include "allegro/internal/aintern.h"
- #include "allegro/platform/aintbeos.h"
- 
--#ifndef ALLEGRO_BEOS
-+#if !defined ALLEGRO_BEOS && !defined ALLEGRO_HAIKU
- #error something is wrong with the makefile
--#endif                
-+#endif            
- 
- static BJoystick *be_joy = NULL;
- 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	2008-10-04 20:40:55.000000000 +0000
-+++ allegro-4.3.10-haiku/src/beos/bjoydrv.c	2008-10-04 21:01:20.000000000 +0000
-@@ -18,9 +18,9 @@
- #include "allegro.h"
- #include "allegro/internal/aintern.h"
- 
--#ifndef ALLEGRO_BEOS
-+#if !defined ALLEGRO_BEOS && !defined ALLEGRO_HAIKU
- #error something is wrong with the makefile
--#endif                
-+#endif              
- 
- BEGIN_JOYSTICK_DRIVER_LIST
- 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	2008-10-04 20:40:55.000000000 +0000
-+++ allegro-4.3.10-haiku/src/beos/bkey.c	2008-10-04 21:01:20.000000000 +0000
-@@ -19,9 +19,9 @@
- #include "allegro/internal/aintern.h"
- #include "allegro/platform/aintbeos.h"
- 
--#ifndef ALLEGRO_BEOS
-+#if !defined ALLEGRO_BEOS && !defined ALLEGRO_HAIKU
- #error something is wrong with the makefile
--#endif 
-+#endif
- 
- 
- 
-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	2008-10-04 20:40:55.000000000 +0000
-+++ allegro-4.3.10-haiku/src/beos/bkeyapi.cpp	2008-10-04 21:01:20.000000000 +0000
-@@ -22,9 +22,9 @@
- #include "allegro/internal/aintern.h"
- #include "allegro/platform/aintbeos.h"
- 
--#ifndef ALLEGRO_BEOS
-+#if !defined ALLEGRO_BEOS && !defined ALLEGRO_HAIKU
- #error something is wrong with the makefile
--#endif                
-+#endif           
- 
- #define KEY_ID_PC101 0 // the docs say it should be 0x83ab, but they lie
- 
-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	2008-10-04 20:40:55.000000000 +0000
-+++ allegro-4.3.10-haiku/src/beos/bkeydrv.c	2008-10-04 21:01:20.000000000 +0000
-@@ -18,9 +18,9 @@
- #include "allegro.h"
- #include "allegro/internal/aintern.h"
- 
--#ifndef ALLEGRO_BEOS
-+#if !defined ALLEGRO_BEOS && !defined ALLEGRO_HAIKU
- #error something is wrong with the makefile
--#endif                
-+#endif             
- 
- _DRIVER_INFO _keyboard_driver_list[] =
- {
-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	2008-10-04 20:40:55.000000000 +0000
-+++ allegro-4.3.10-haiku/src/beos/bmidi.c	2008-10-04 21:01:20.000000000 +0000
-@@ -19,9 +19,9 @@
- #include "allegro/internal/aintern.h"
- #include "allegro/platform/aintbeos.h"
- 
--#ifndef ALLEGRO_BEOS
-+#if !defined ALLEGRO_BEOS && !defined ALLEGRO_HAIKU
- #error something is wrong with the makefile
--#endif                
-+#endif     
- 
- MIDI_DRIVER midi_beos =
- {
-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	2008-10-04 20:40:55.000000000 +0000
-+++ allegro-4.3.10-haiku/src/beos/bmidiapi.cpp	2008-10-04 21:01:20.000000000 +0000
-@@ -19,9 +19,9 @@
- #include "allegro/internal/aintern.h"
- #include "allegro/platform/aintbeos.h"
- 
--#ifndef ALLEGRO_BEOS
-+#if !defined ALLEGRO_BEOS && !defined ALLEGRO_HAIKU
- #error something is wrong with the makefile
--#endif                
-+#endif           
- 
- 
- 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	2008-10-04 20:40:55.000000000 +0000
-+++ allegro-4.3.10-haiku/src/beos/bmididrv.c	2008-10-04 21:01:20.000000000 +0000
-@@ -18,9 +18,9 @@
- #include "allegro.h"
- #include "allegro/internal/aintern.h"
- 
--#ifndef ALLEGRO_BEOS
-+#if !defined ALLEGRO_BEOS && !defined ALLEGRO_HAIKU
- #error something is wrong with the makefile
--#endif                
-+#endif             
- 
- BEGIN_MIDI_DRIVER_LIST
- 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	2008-10-04 20:40:55.000000000 +0000
-+++ allegro-4.3.10-haiku/src/beos/bmousapi.cpp	2008-10-04 21:01:20.000000000 +0000
-@@ -23,9 +23,9 @@
- #include "allegro/internal/aintern.h"
- #include "allegro/platform/aintbeos.h"
- 
--#ifndef ALLEGRO_BEOS
-+#if !defined ALLEGRO_BEOS && !defined ALLEGRO_HAIKU
- #error something is wrong with the makefile
--#endif                
-+#endif              
- 
- #define MOUSE_THREAD_NAME     "mouse driver"
- #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	2008-10-04 20:40:55.000000000 +0000
-+++ allegro-4.3.10-haiku/src/beos/bmousdrv.c	2008-10-04 21:01:20.000000000 +0000
-@@ -18,9 +18,9 @@
- #include "allegro.h"
- #include "allegro/internal/aintern.h"
- 
--#ifndef ALLEGRO_BEOS
-+#if !defined ALLEGRO_BEOS && !defined ALLEGRO_HAIKU
- #error something is wrong with the makefile
--#endif                
-+#endif              
- 
- 
- 
-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	2008-10-04 20:40:55.000000000 +0000
-+++ allegro-4.3.10-haiku/src/beos/bmouse.c	2008-10-04 21:01:20.000000000 +0000
-@@ -19,9 +19,9 @@
- #include "allegro/internal/aintern.h"
- #include "allegro/platform/aintbeos.h"
- 
--#ifndef ALLEGRO_BEOS
-+#if !defined ALLEGRO_BEOS && !defined ALLEGRO_HAIKU
- #error something is wrong with the makefile
--#endif                
-+#endif           
- 
- 
- 
-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	2008-10-04 20:40:55.000000000 +0000
-+++ allegro-4.3.10-haiku/src/beos/boverlay.cpp	2008-10-04 21:01:20.000000000 +0000
-@@ -19,7 +19,7 @@
- #include "allegro/internal/aintern.h"
- #include "allegro/platform/aintbeos.h"
- 
--#ifndef ALLEGRO_BEOS
-+#if !defined ALLEGRO_BEOS && !defined ALLEGRO_HAIKU
- #error something is wrong with the makefile
- #endif
- 
-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	2008-10-04 20:40:55.000000000 +0000
-+++ allegro-4.3.10-haiku/src/beos/bsnd.c	2008-10-04 21:01:21.000000000 +0000
-@@ -19,9 +19,9 @@
- #include "allegro/internal/aintern.h"
- #include "allegro/platform/aintbeos.h"
- 
--#ifndef ALLEGRO_BEOS
-+#if !defined ALLEGRO_BEOS && !defined ALLEGRO_HAIKU
- #error something is wrong with the makefile
--#endif                
-+#endif             
- 
- DIGI_DRIVER digi_beos =
- {
-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	2008-10-04 20:40:55.000000000 +0000
-+++ allegro-4.3.10-haiku/src/beos/bsndapi.cpp	2008-10-04 21:01:21.000000000 +0000
-@@ -20,7 +20,7 @@
- #include "allegro/internal/aintern.h"
- #include "allegro/platform/aintbeos.h"
- 
--#ifndef ALLEGRO_BEOS
-+#if !defined ALLEGRO_BEOS && !defined ALLEGRO_HAIKU
- #error something is wrong with the makefile
- #endif
- 
-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	2008-10-04 20:40:55.000000000 +0000
-+++ allegro-4.3.10-haiku/src/beos/bsnddrv.c	2008-10-04 21:01:21.000000000 +0000
-@@ -19,9 +19,9 @@
- #include "allegro/internal/aintern.h"
- 
- 
--#ifndef ALLEGRO_BEOS
-+#if !defined ALLEGRO_BEOS && !defined ALLEGRO_HAIKU
- #error something is wrong with the makefile
--#endif                
-+#endif           
- 
- BEGIN_DIGI_DRIVER_LIST
- 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	2008-10-04 20:40:55.000000000 +0000
-+++ allegro-4.3.10-haiku/src/beos/bsysapi.cpp	2008-10-04 21:01:21.000000000 +0000
-@@ -27,9 +27,9 @@
- #include <sys/utsname.h>
- #endif
- 
--#ifndef ALLEGRO_BEOS
-+#if !defined ALLEGRO_BEOS && !defined ALLEGRO_HAIKU
- #error something is wrong with the makefile
--#endif              
-+#endif            
- 
- #define SYS_THREAD_PRIORITY B_NORMAL_PRIORITY
- #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	2008-10-04 20:40:55.000000000 +0000
-+++ allegro-4.3.10-haiku/src/beos/bsysdrv.c	2008-10-04 21:01:21.000000000 +0000
-@@ -18,9 +18,9 @@
- #include "allegro.h"
- #include "allegro/internal/aintern.h"
- 
--#ifndef ALLEGRO_BEOS
-+#if !defined ALLEGRO_BEOS && !defined ALLEGRO_HAIKU
- #error something is wrong with the makefile
--#endif 
-+#endif
- 
- _DRIVER_INFO _system_driver_list[] =
- {
-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	2008-10-04 20:40:55.000000000 +0000
-+++ allegro-4.3.10-haiku/src/beos/bsystem.c	2008-10-04 21:01:21.000000000 +0000
-@@ -19,11 +19,9 @@
- #include "allegro/internal/aintern.h"
- #include "allegro/platform/aintbeos.h"
- 
--#ifndef ALLEGRO_BEOS
-+#if !defined ALLEGRO_BEOS && !defined ALLEGRO_HAIKU
- #error something is wrong with the makefile
--#endif 
--
--
-+#endif
- 
- SYSTEM_DRIVER system_beos = {
-    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	2008-10-04 20:40:55.000000000 +0000
-+++ allegro-4.3.10-haiku/src/beos/btimeapi.cpp	2008-10-04 21:01:21.000000000 +0000
-@@ -19,7 +19,7 @@
- #include "allegro/internal/aintern.h"
- #include "allegro/platform/aintbeos.h"
- 
--#ifndef ALLEGRO_BEOS
-+#if !defined ALLEGRO_BEOS && !defined ALLEGRO_HAIKU
- #error something is wrong with the makefile
- #endif
- 
-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	2008-10-04 20:40:55.000000000 +0000
-+++ allegro-4.3.10-haiku/src/beos/btimedrv.c	2008-10-04 21:01:21.000000000 +0000
-@@ -18,9 +18,9 @@
- #include "allegro.h"
- #include "allegro/internal/aintern.h"
- 
--#ifndef ALLEGRO_BEOS
-+#if !defined ALLEGRO_BEOS && !defined ALLEGRO_HAIKU
- #error something is wrong with the makefile
--#endif                
-+#endif         
- 
- _DRIVER_INFO _timer_driver_list[] = {
-    {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	2008-10-04 20:40:55.000000000 +0000
-+++ allegro-4.3.10-haiku/src/beos/btimer.c	2008-10-04 21:01:21.000000000 +0000
-@@ -19,7 +19,7 @@
- #include "allegro/internal/aintern.h"
- #include "allegro/platform/aintbeos.h"
- 
--#ifndef ALLEGRO_BEOS
-+#if !defined ALLEGRO_BEOS && !defined ALLEGRO_HAIKU
- #error something is wrong with the makefile
- #endif
- 
-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	2008-10-04 20:40:55.000000000 +0000
-+++ allegro-4.3.10-haiku/src/beos/bwindow.cpp	2008-10-04 21:01:21.000000000 +0000
-@@ -19,7 +19,7 @@
- #include "allegro/internal/aintern.h"
- #include "allegro/platform/aintbeos.h"
- 
--#ifndef ALLEGRO_BEOS
-+#if !defined ALLEGRO_BEOS && !defined ALLEGRO_HAIKU
- #error something is wrong with the makefile
- #endif
- 
-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	2008-10-04 20:40:55.000000000 +0000
-+++ allegro-4.3.10-haiku/src/beos/bwscreen.cpp	2008-10-04 21:01:21.000000000 +0000
-@@ -19,7 +19,7 @@
- #include "allegro/internal/aintern.h"
- #include "allegro/platform/aintbeos.h"
- 
--#ifndef ALLEGRO_BEOS
-+#if !defined ALLEGRO_BEOS && !defined ALLEGRO_HAIKU
- #error something is wrong with the makefile
- #endif
- 
-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	2008-10-04 20:40:57.000000000 +0000
-+++ allegro-4.3.10-haiku/src/i386/asmdefs.inc	2008-10-04 21:01:21.000000000 +0000
-@@ -31,6 +31,8 @@
-    #include "obj/msvc/asmdef.inc"
- #elif defined ALLEGRO_WATCOM
-    #include "obj/watcom/asmdef.inc"
-+#elif defined ALLEGRO_HAIKU
-+   #include "obj/beos/asmdef.inc"
- #elif defined ALLEGRO_BEOS
-    #include "obj/beos/asmdef.inc"
- #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	2008-10-04 20:41:01.000000000 +0000
-+++ allegro-4.3.10-haiku/src/midi.c	2008-10-04 21:01:21.000000000 +0000
-@@ -1122,7 +1122,7 @@
-       running_status = 0;
- 
-       while (p < end) {                         /* work through data stream */
--#ifdef ALLEGRO_BEOS
-+#if defined ALLEGRO_BEOS || defined ALLEGRO_HAIKU
-          /* 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/tools/dat2c.c allegro-4.3.10-haiku/tools/dat2c.c
---- allegro-4.3.10/tools/dat2c.c	2008-10-04 20:41:07.000000000 +0000
-+++ allegro-4.3.10-haiku/tools/dat2c.c	2008-10-04 21:01:21.000000000 +0000
-@@ -342,7 +342,7 @@
-    }
- 
-    if (dat2c->lformat == lineformat_default)
--#if (defined ALLEGRO_UNIX || defined ALLEGRO_QNX || defined ALLEGRO_BEOS || defined ALLEGRO_MACOSX)
-+#if (defined ALLEGRO_UNIX || defined ALLEGRO_QNX || defined ALLEGRO_BEOS || defined ALLEGRO_HAIKU || defined ALLEGRO_MACOSX)
-       dat2c->lformat = lineformat_unix;
- #elif (defined ALLEGRO_WINDOWS || defined ALLEGRO_DOS)
-       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	2008-10-04 20:41:07.000000000 +0000
-+++ allegro-4.3.10-haiku/tools/datedit.c	2008-10-04 21:01:21.000000000 +0000
-@@ -121,6 +121,8 @@
-       #include "obj/dmc/plugins.h"
-    #elif defined ALLEGRO_BEOS
-       #include "obj/beos/plugins.h"
-+   #elif defined ALLEGRO_HAIKU
-+      #include "obj/beos/plugins.h"
-    #elif defined ALLEGRO_BCC32
-       #include "obj/bcc32/plugins.h"
-    #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	2008-10-04 20:41:07.000000000 +0000
-+++ allegro-4.3.10-haiku/tools/grabber.c	2008-10-04 21:01:21.000000000 +0000
-@@ -3132,6 +3132,7 @@
-       case OSTYPE_QNX:        s = "QNX";                        break;
-       case OSTYPE_UNIX:       s = "Unix";                       break;
-       case OSTYPE_BEOS:       s = "BeOS";                       break;
-+      case OSTYPE_HAIKU:      s = "Haiku";                      break;
-       case OSTYPE_MACOS:      s = "MacOS";                      break;
-       case OSTYPE_MACOSX:     s = "MacOS X";                    break;
-       default:                s = "Unknown";                    break;
diff --git a/media-libs/allegro/patches/allegro-4.3.10-lm.diff b/media-libs/allegro/patches/allegro-4.3.10-lm.diff
deleted file mode 100644
index a2b22d939..000000000
--- a/media-libs/allegro/patches/allegro-4.3.10-lm.diff
+++ /dev/null
@@ -1,190 +0,0 @@
-diff -urN allegro-4.3.10/addons/allegrogl/configure allegro-4.3.10-haiku/addons/allegrogl/configure
---- allegro-4.3.10/addons/allegrogl/configure	2008-01-19 23:57:16.000000000 +0000
-+++ allegro-4.3.10-haiku/addons/allegrogl/configure	2008-09-13 19:57:44.000000000 +0000
-@@ -3624,6 +3624,70 @@
-   LIBS="-lpthread $LIBS"
- fi
- 
-+{ echo "$as_me:$LINENO: checking for cos in -lm" >&5
-+echo $ECHO_N "checking for cos in -lm... $ECHO_C" >&6; }
-+if test "${ac_cv_lib_m_cos+set}" = set; then
-+  echo $ECHO_N "(cached) $ECHO_C" >&6
-+else
-+  ac_check_lib_save_LIBS=$LIBS
-+LIBS="-lm  $LIBS"
-+cat >conftest.$ac_ext <<_ACEOF
-+/* confdefs.h.  */
-+_ACEOF
-+cat confdefs.h >>conftest.$ac_ext
-+cat >>conftest.$ac_ext <<_ACEOF
-+/* end confdefs.h.  */
-+
-+/* Override any GCC internal prototype to avoid an error.
-+   Use char because int might match the return type of a GCC
-+   builtin and then its argument prototype would still apply.  */
-+#ifdef __cplusplus
-+extern "C"
-+#endif
-+char cos ();
-+int
-+main ()
-+{
-+return cos ();
-+  ;
-+  return 0;
-+}
-+_ACEOF
-+rm -f conftest.$ac_objext conftest$ac_exeext
-+if { (ac_try="$ac_link"
-+case "(($ac_try" in
-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+  *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+  (eval "$ac_link") 2>conftest.er1
-+  ac_status=$?
-+  grep -v '^ *+' conftest.er1 >conftest.err
-+  rm -f conftest.er1
-+  cat conftest.err >&5
-+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+  (exit $ac_status); } && {
-+	 test -z "$ac_c_werror_flag" ||
-+	 test ! -s conftest.err
-+       } && test -s conftest$ac_exeext &&
-+       $as_test_x conftest$ac_exeext; then
-+  ac_cv_lib_m_cos=yes
-+else
-+  echo "$as_me: failed program was:" >&5
-+sed 's/^/| /' conftest.$ac_ext >&5
-+
-+	ac_cv_lib_m_cos=no
-+fi
-+
-+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
-+      conftest$ac_exeext conftest.$ac_ext
-+LIBS=$ac_check_lib_save_LIBS
-+fi
-+{ echo "$as_me:$LINENO: result: $ac_cv_lib_m_cos" >&5
-+echo "${ECHO_T}$ac_cv_lib_m_cos" >&6; }
-+if test $ac_cv_lib_m_cos = yes; then
-+  LIBS="-lm $LIBS"
-+fi
- 
- 
- if test -n "$agl_build_generic"; then
-@@ -4247,7 +4311,7 @@
- 	if test -n "$x_libraries"; then
- 		LDFLAGS="-L$x_libraries $LDFLAGS"
- 	fi
--	LIBS="-lXext -lX11 -lm $LIBS"
-+	LIBS="-lXext -lX11 $LIBS"
- 
- 
- 	if test -n "$agl_enable_xf86vidmode"; then
-diff -urN allegro-4.3.10/addons/allegrogl/configure.in allegro-4.3.10-haiku/addons/allegrogl/configure.in
---- allegro-4.3.10/addons/allegrogl/configure.in	2008-01-01 11:20:16.000000000 +0000
-+++ allegro-4.3.10-haiku/addons/allegrogl/configure.in	2008-09-13 19:56:10.000000000 +0000
-@@ -54,7 +54,7 @@
- dnl Check for pthread support, which GL libs may require (e.g. FreeBSD)
- AC_CHECK_HEADER(pthread.h, , dontcare=y)
- AC_CHECK_LIB(pthread, pthread_create, LIBS="-lpthread $LIBS")
--
-+AC_CHECK_LIB(m, cos, LIBS="-lm $LIBS")
- 
- dnl Build Mesa generic driver
- if test -n "$agl_build_generic"; then
-@@ -76,7 +76,7 @@
- 	if test -n "$x_libraries"; then
- 		LDFLAGS="-L$x_libraries $LDFLAGS"
- 	fi
--	LIBS="-lXext -lX11 -lm $LIBS"
-+	LIBS="-lXext -lX11 $LIBS"
- 
- 
- dnl Test for VidMode extension
-
-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 21:59:18.000000000 +0000
-+++ allegro-4.3.10-haiku/addons/jpgalleg/makefile.be	2008-09-13 20:09:02.000000000 +0000
-@@ -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/configure allegro-4.3.10-haiku/configure
---- allegro-4.3.10/configure	2008-01-19 23:57:12.000000000 +0000
-+++ allegro-4.3.10-haiku/configure	2008-09-13 19:53:14.000000000 +0000
-@@ -5436,6 +5436,14 @@
-   allegro_build_normal_library=yes
-   _programs="release"
- fi
-+
-+M_LIBS="-lm"
-+case "$host_os" in
-+  beos* | haiku*)
-+      M_LIBS=""
-+      ;;
-+esac
-+
- if test "X$allegro_build_static_programs" = "Xyes"; then
-   LIBALLEG=lib/unix/lib$LIB_TO_LINK.a
-   LINK_LIBALLEG="$LIBALLEG \$(LIBS)"
-@@ -5444,7 +5452,7 @@
-   _programs="statically linked $_programs"
- else
-   LIBALLEG="lib/unix/lib${LIB_TO_LINK}-\$(shared_version).so lib/unix/lib${LIB_TO_LINK}_unsharable.a"
--  LINK_LIBALLEG="-Llib/unix -l${LIB_TO_LINK}-\$(shared_version) -l${LIB_TO_LINK}_unsharable -lm"
-+  LINK_LIBALLEG="-Llib/unix -l${LIB_TO_LINK}-\$(shared_version) -l${LIB_TO_LINK}_unsharable $(M_LIBS)"
-   LINK_WITH_STATIC_LIBS=no
-   allegro_shared_libraries=yes
-   _programs="dynamically linked $_programs"
-@@ -11167,7 +11175,7 @@
- 
- #-----------------------------------------------------------------------------#
- 
--LIBS="-lm $LIBS"
-+LIBS="$(M_LIBS) $LIBS"
- 
- case "$allegro_system" in
- 
-diff -urN allegro-4.3.10/configure.in allegro-4.3.10-haiku/configure.in
---- allegro-4.3.10/configure.in	2008-01-03 20:47:10.000000000 +0000
-+++ allegro-4.3.10-haiku/configure.in	2008-09-13 19:52:03.000000000 +0000
-@@ -298,6 +298,15 @@
-   allegro_build_normal_library=yes
-   _programs="release"
- fi
-+
-+M_LIBS="-lm"
-+case "$host_os" in
-+  beos* | haiku*)
-+      M_LIBS=""
-+      ;;
-+esac
-+
-+
- if test "X$allegro_build_static_programs" = "Xyes"; then
-   LIBALLEG=lib/unix/lib$LIB_TO_LINK.a
-   LINK_LIBALLEG="$LIBALLEG \$(LIBS)"
-@@ -306,7 +315,7 @@
-   _programs="statically linked $_programs"
- else
-   LIBALLEG="lib/unix/lib${LIB_TO_LINK}-\$(shared_version).so lib/unix/lib${LIB_TO_LINK}_unsharable.a"
--  LINK_LIBALLEG="-Llib/unix -l${LIB_TO_LINK}-\$(shared_version) -l${LIB_TO_LINK}_unsharable -lm"
-+  LINK_LIBALLEG="-Llib/unix -l${LIB_TO_LINK}-\$(shared_version) -l${LIB_TO_LINK}_unsharable $(M_LIBS)"
-   LINK_WITH_STATIC_LIBS=no
-   allegro_shared_libraries=yes
-   _programs="dynamically linked $_programs"
-@@ -873,7 +882,7 @@
- #-----------------------------------------------------------------------------#
- 
- dnl Additional libraries.
--LIBS="-lm $LIBS"
-+LIBS="$(M_LIBS) $LIBS"
- 
- case "$allegro_system" in
- 
diff --git a/media-libs/allegro/patches/allegro-4.3.10plus-haiku.diff b/media-libs/allegro/patches/allegro-4.3.10plus-haiku.diff
deleted file mode 100644
index d70c44369..000000000
--- a/media-libs/allegro/patches/allegro-4.3.10plus-haiku.diff
+++ /dev/null
@@ -1,922 +0,0 @@
-diff -urN allegro-4.3.10plus/addons/allegrogl/fix.sh allegro-4.3.10plus-haiku/addons/allegrogl/fix.sh
---- allegro-4.3.10plus/addons/allegrogl/fix.sh	2008-10-15 14:42:13.000000000 +0000
-+++ allegro-4.3.10plus-haiku/addons/allegrogl/fix.sh	2008-10-15 15:04:09.000000000 +0000
-@@ -27,7 +27,7 @@
-       echo "  Usage: fix <platform> [--dtou|--utod|--quick]"
-       echo ""
-       echo "  <platform> is one of: djgpp, mingw32, unix, macosx,"
--	  echo "  macosx-universal"
-+	  echo "  macosx-universal, beos, haiku"
-       echo ""
-       echo "  --dtou converts from DOS/Win32 format to Unix"
-       echo "  --utod converts from Unix format to DOS/Win32"
-@@ -81,6 +81,7 @@
- 
- case "$1" in
- 	djgpp	) proc_fix "DJGPP" "makefile.dj";;
-+	haiku	) proc_fix "Haiku" "makefile.gen";;
- 	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.10plus/addons/jpgalleg/fix.sh allegro-4.3.10plus-haiku/addons/jpgalleg/fix.sh
---- allegro-4.3.10plus/addons/jpgalleg/fix.sh	2008-10-15 14:40:17.000000000 +0000
-+++ allegro-4.3.10plus-haiku/addons/jpgalleg/fix.sh	2008-10-15 15:01:00.000000000 +0000
-@@ -85,6 +85,7 @@
-    "mingw"   ) proc_fix "MinGW32" "makefile.mgw";;
-    "msvc"    ) proc_fix "MSVC" "makefile.vc";;
-    "beos"    ) proc_fix "BeOS" "makefile.be";;
-+   "haiku"   ) proc_fix "Haiku" "makefile.be";;
-    "unix"    ) proc_fix "Unix" "makefile.uni";;
-    "macosx"  ) proc_fix "MacOS X" "makefile.osx";;
-    "macosx-universal" ) proc_fix_osx_ub ;;
-diff -urN allegro-4.3.10plus/addons/loadpng/fix.sh allegro-4.3.10plus-haiku/addons/loadpng/fix.sh
---- allegro-4.3.10plus/addons/loadpng/fix.sh	2008-10-15 14:39:18.000000000 +0000
-+++ allegro-4.3.10plus-haiku/addons/loadpng/fix.sh	2008-10-15 15:04:58.000000000 +0000
-@@ -8,7 +8,7 @@
-    echo
-    echo "Usage: $0 <platform> [--quick|--dtou|--utod]"
-    echo
--   echo "Where platform is one of: djgpp, mingw32, unix, macosx, macosx-universal"
-+   echo "Where platform is one of: djgpp, mingw32, unix, macosx, macosx-universal, beos, haiku"
-    echo "The --quick parameter turns off text file conversion, --dtou converts from"
-    echo "DOS/Win32 format to Unix, --utod converts from Unix to DOS/Win32 format."
-    echo "If no parameter is specified --quick is assumed."
-@@ -88,7 +88,9 @@
- fi
- 
- case "$1" in
-+   "beos"    ) proc_fix "BeOS"              "Makefile.be";;
-    "djgpp"   ) proc_fix "DOS (djgpp)"       "Makefile.dj";;
-+   "haiku"   ) proc_fix "Haiku"             "Makefile.be";;
-    "mingw"   ) proc_fix "Windows (MinGW)"   "Makefile.mgw";;
-    "mingw32" ) proc_fix "Windows (MinGW)"   "Makefile.mgw";;
-    "unix"    ) proc_fix "Unix"              "Makefile.unx";;
-diff -urN allegro-4.3.10plus/addons/logg/fix.sh allegro-4.3.10plus-haiku/addons/logg/fix.sh
---- allegro-4.3.10plus/addons/logg/fix.sh	2008-10-15 14:42:14.000000000 +0000
-+++ allegro-4.3.10plus-haiku/addons/logg/fix.sh	2008-10-15 15:07:15.000000000 +0000
-@@ -8,7 +8,8 @@
-    echo
-    echo "Usage: $0 <platform> [--quick|--dtou|--utod]"
-    echo
--   echo "Where platform is one of: mingw32, unix, macosx, macosx-universal"
-+   echo "Where platform is one of: mingw32, unix, macosx, macosx-universal,"
-+	  echo "  beos, haiku"
-    echo "The --quick parameter turns off text file conversion, --dtou converts from"
-    echo "DOS/Win32 format to Unix, --utod converts from Unix to DOS/Win32 format."
-    echo "If no parameter is specified --quick is assumed."
-@@ -80,6 +81,8 @@
- fi
- 
- case "$1" in
-+   "beos"    ) proc_fix "BeOS"              "Makefile.be";;
-+   "haiku"   ) proc_fix "Haiku"             "Makefile.be";;
-    "mingw"   ) proc_fix "Windows (MinGW)"   "Makefile.migw";;
-    "mingw32" ) proc_fix "Windows (MinGW)"   "Makefile.migw";;
-    "unix"    ) proc_fix "Unix"              "Makefile.unix";;
-diff -urN allegro-4.3.10plus/fix.sh allegro-4.3.10plus-haiku/fix.sh
---- allegro-4.3.10plus/fix.sh	2008-10-15 14:44:47.000000000 +0000
-+++ allegro-4.3.10plus-haiku/fix.sh	2008-10-15 15:01:00.000000000 +0000
-@@ -9,7 +9,7 @@
-    echo
-    echo "Usage: $0 <platform> [--quick|--dtou|--utod]"
-    echo
--   echo "Where platform is one of: bcc32, beos, djgpp, mingw, qnx, unix"
-+   echo "Where platform is one of: bcc32, beos, djgpp, haiku, mingw, qnx, unix"
-    echo "mac, macosx, macosx-universal and watcom."
-    echo "The --quick parameter turns off text file conversion, --dtou converts from"
-    echo "DOS/Win32 format to Unix, --utod converts from Unix to DOS/Win32 format."
-@@ -90,6 +90,7 @@
-    "bcc32"   ) proc_fix "Windows (BCC32)"   "makefile.bcc" "ALLEGRO_BCC32";;
-    "beos"    ) proc_fix "BeOS"              "makefile.be"  "ALLEGRO_BEOS";;
-    "djgpp"   ) proc_fix "DOS (djgpp)"       "makefile.dj"  "ALLEGRO_DJGPP";;
-+   "haiku"   ) proc_fix "Haiku"             "makefile.be"  "ALLEGRO_HAIKU";;
-    "mingw"   ) proc_fix "Windows (MinGW)"   "makefile.mgw" "ALLEGRO_MINGW32";;
-    "mingw32" ) proc_fix "Windows (MinGW)"   "makefile.mgw" "ALLEGRO_MINGW32";;
-    # The 'msvc' target is undocumented in the help message, but is used
-diff -urN allegro-4.3.10plus/include/allegro/internal/aintern.h allegro-4.3.10plus-haiku/include/allegro/internal/aintern.h
---- allegro-4.3.10plus/include/allegro/internal/aintern.h	2008-10-15 14:42:48.000000000 +0000
-+++ allegro-4.3.10plus-haiku/include/allegro/internal/aintern.h	2008-10-15 15:01:00.000000000 +0000
-@@ -190,7 +190,7 @@
- 
- 
- #if (defined ALLEGRO_DOS) || (defined ALLEGRO_DJGPP) || (defined ALLEGRO_WATCOM) || \
--    (defined ALLEGRO_QNX) || (defined ALLEGRO_BEOS)
-+    (defined ALLEGRO_QNX) || (defined ALLEGRO_BEOS)  || (defined ALLEGRO_HAIKU)
- 
- AL_ARRAY(char *, _pckeys_names);
- 
-diff -urN allegro-4.3.10plus/include/allegro/internal/alconfig.h allegro-4.3.10plus-haiku/include/allegro/internal/alconfig.h
---- allegro-4.3.10plus/include/allegro/internal/alconfig.h	2008-10-15 14:42:48.000000000 +0000
-+++ allegro-4.3.10plus-haiku/include/allegro/internal/alconfig.h	2008-10-15 15:01:00.000000000 +0000
-@@ -48,6 +48,8 @@
-       #include "allegro/platform/albcc32.h"
-    #elif defined ALLEGRO_MSVC
-       #include "allegro/platform/almsvc.h"
-+   #elif defined ALLEGRO_HAIKU
-+      #include "allegro/platform/albecfg.h"
-    #elif defined ALLEGRO_BEOS
-       #include "allegro/platform/albecfg.h"
-    #elif defined ALLEGRO_MPW
-diff -urN allegro-4.3.10plus/include/allegro/platform/albecfg.h allegro-4.3.10plus-haiku/include/allegro/platform/albecfg.h
---- allegro-4.3.10plus/include/allegro/platform/albecfg.h	2008-10-15 14:42:46.000000000 +0000
-+++ allegro-4.3.10plus-haiku/include/allegro/platform/albecfg.h	2008-10-15 15:01:00.000000000 +0000
-@@ -31,7 +31,13 @@
- #define ALLEGRO_HAVE_SYS_TIME_H 1
- 
- /* describe this platform */
--#define ALLEGRO_PLATFORM_STR  "BeOS"
-+#if defined __BEOS__ && !defined __HAIKU__
-+  #define ALLEGRO_PLATFORM_STR  "BeOS"
-+#endif
-+#if defined __HAIKU__
-+  #define ALLEGRO_PLATFORM_STR  "Haiku"
-+  #define ALLEGRO_HAVE_LIBPTHREAD 1
-+#endif
- #define ALLEGRO_LITTLE_ENDIAN
- #define ALLEGRO_CONSOLE_OK
- #define ALLEGRO_USE_CONSTRUCTOR
-diff -urN allegro-4.3.10plus/include/allegro/platform/albeos.h allegro-4.3.10plus-haiku/include/allegro/platform/albeos.h
---- allegro-4.3.10plus/include/allegro/platform/albeos.h	2008-10-15 14:42:46.000000000 +0000
-+++ allegro-4.3.10plus-haiku/include/allegro/platform/albeos.h	2008-10-15 15:01:00.000000000 +0000
-@@ -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.10plus/include/allegro/platform/alunixac.hin allegro-4.3.10plus-haiku/include/allegro/platform/alunixac.hin
---- allegro-4.3.10plus/include/allegro/platform/alunixac.hin	2008-10-15 14:42:46.000000000 +0000
-+++ allegro-4.3.10plus-haiku/include/allegro/platform/alunixac.hin	2008-10-15 15:01:00.000000000 +0000
-@@ -68,7 +68,7 @@
- #undef ALLEGRO_DARWIN
- 
- /* Define if you have the pthread library. */
--#undef ALLEGRO_HAVE_LIBPTHREAD
-+/* #undef ALLEGRO_HAVE_LIBPTHREAD */
- 
- /* Define if constructor attribute is supported. */
- #undef ALLEGRO_USE_CONSTRUCTOR
-@@ -159,7 +159,7 @@
- 
- /* Define as the return type of signal handlers (`int' or `void'). */
- /* TODO: rename this */
--#undef RETSIGTYPE
-+/* #undef RETSIGTYPE */
- 
- /* Define to empty if `const' does not conform to ANSI C. */
- #undef const
-diff -urN allegro-4.3.10plus/include/allegro/system.h allegro-4.3.10plus-haiku/include/allegro/system.h
---- allegro-4.3.10plus/include/allegro/system.h	2008-10-15 14:42:57.000000000 +0000
-+++ allegro-4.3.10plus-haiku/include/allegro/system.h	2008-10-15 15:01:00.000000000 +0000
-@@ -61,6 +61,7 @@
- #define OSTYPE_QNX         AL_ID('Q','N','X',' ')
- #define OSTYPE_UNIX        AL_ID('U','N','I','X')
- #define OSTYPE_BEOS        AL_ID('B','E','O','S')
-+#define OSTYPE_HAIKU       AL_ID('H','A','I','K')
- #define OSTYPE_MACOS       AL_ID('M','A','C',' ')
- #define OSTYPE_MACOSX      AL_ID('M','A','C','X')
- 
-diff -urN allegro-4.3.10plus/makefile.all allegro-4.3.10plus-haiku/makefile.all
---- allegro-4.3.10plus/makefile.all	2008-10-15 14:44:47.000000000 +0000
-+++ allegro-4.3.10plus-haiku/makefile.all	2008-10-15 15:01:00.000000000 +0000
-@@ -8,7 +8,7 @@
- #        DEBUGMODE=2        selects a build intended to debug Allegro itself.
- #        PROFILEMODE=1      selects a profiling build.
- #        WARNMODE=1         selects strict compiler warnings.
--#        STATICLINK=1       use static linking (MinGW32, MSVC, BeOS).
-+#        STATICLINK=1       use static linking (MinGW32, MSVC, BeOS, Haiku).
- #        STATICRUNTIME=1    link to a static C runtime library (/MT) (MSVC)
- #        TARGET_ARCH_COMPAT optimize for the given processor while preserving backwards
- #                           compatibility with older processors (GCC-based platforms).
-@@ -132,7 +132,7 @@
- # XXX this is duplicated in makefile.in
- DOCBASEFILES = ahack changes faq mistakes help thanks allegro const abi api packfile \
-                readme makedoc datafile grabber dat dat2c dat2s license addons targets
--DOCBUILDFILES = bcc32 beos darwin djgpp dmc linux macosx mingw32 msvc qnx unix watcom
-+DOCBUILDFILES = bcc32 beos darwin djgpp dmc haiku linux macosx mingw32 msvc qnx unix watcom
- DOCTXTBUILDFILES = $(addprefix docs/build/,$(addsuffix .txt,$(DOCBUILDFILES)))
- 
- DOCS  = $(addprefix docs/txt/,$(addsuffix .txt,$(filter-out changes thanks readme, $(DOCBASEFILES))))
-diff -urN allegro-4.3.10plus/makefile.be allegro-4.3.10plus-haiku/makefile.be
---- allegro-4.3.10plus/makefile.be	2008-10-15 14:44:47.000000000 +0000
-+++ allegro-4.3.10plus-haiku/makefile.be	2008-10-15 15:01:00.000000000 +0000
-@@ -10,11 +10,20 @@
- 
- # -------- define some variables that the primary makefile will use --------
- 
-+OS=$(shell uname -s)
-+
-+ifeq ($(OS),BeOS)
- PLATFORM = BeOS
-+endif
-+
-+ifeq ($(OS),Haiku)
-+PLATFORM = Haiku
-+endif
-+
- CC = gcc
- EXE = 
- OBJ = .o
--HTML = html
-+#HTML = html
- 
- PLATFORM_DIR = obj/beos
- 
-@@ -109,7 +118,7 @@
- # ------ build a C-only version ------
- 
- VPATH += src/c
--MY_OBJECTS = $(C_OBJECTS) cmiscs
-+MY_OBJECTS = $(C_OBJECTS) 
- CFLAGS += -DALLEGRO_NO_ASM
- 
- else
-@@ -123,7 +132,13 @@
- 
- OBJECT_LIST = $(COMMON_OBJECTS) $(MY_OBJECTS) $(basename $(notdir $(ALLEGRO_SRC_BEOS_FILES)))
- 
-+ifeq ($(OS),BeOS)
- LIBRARIES = -lbe -lgame -ldevice -lmidi -lmedia -lnet
-+endif
-+
-+ifeq ($(OS),Haiku)
-+LIBRARIES = -lbe -lgame -ldevice -lmidi -lmedia -lnetwork
-+endif
- 
- PROGRAMS = bfixicon
- 
-@@ -135,11 +150,21 @@
- 
- # -------- rules for installing and removing the library files --------
- 
-+ifeq ($(OS),BeOS)
- INSTALLDIR = /boot/develop
- LIBDIR = lib/x86
- INCDIR = headers
- 
- SHARED_LIBDIR = /boot/home/config/lib
-+endif
-+
-+ifeq ($(OS),Haiku)
-+INSTALLDIR = /boot/common
-+LIBDIR = lib
-+INCDIR = include
-+
-+SHARED_LIBDIR = /boot/common/lib
-+endif
- 
- 
- ifdef STATICLINK
-@@ -167,7 +192,14 @@
- 	sed -e "s/@LIBS@/$(LIBRARIES)/" temp2 > temp
- 	sed -e "s/include/headers/" temp >temp2
- 	sed -e "s/ -l\$${lib_type}_unsharable//" temp2 >temp
-+
-+ifeq ($(OS),BeOS)
- 	sed -e "s/libdirs=-L\$${exec_prefix}\/lib/libdirs=\"-L\$${exec_prefix}\/lib\/x86 -L\/boot\/home\/config\/lib\"/" temp >/bin/allegro-config
-+endif
-+ifeq ($(OS),Haiku)
-+	sed -e "s/libdirs=-L\$${exec_prefix}\/lib/libdirs=\"-L\$${exec_prefix}\/lib\/x86 -L\/boot\/common\/lib\"/" temp >/bin/allegro-config
-+endif
-+
- 	rm -f temp temp2
- 	chmod a+x /bin/allegro-config
- 
-diff -urN allegro-4.3.10plus/misc/mkunixdists.sh allegro-4.3.10plus-haiku/misc/mkunixdists.sh
---- allegro-4.3.10plus/misc/mkunixdists.sh	2008-10-15 14:43:09.000000000 +0000
-+++ allegro-4.3.10plus-haiku/misc/mkunixdists.sh	2008-10-15 15:01:00.000000000 +0000
-@@ -73,9 +73,9 @@
- # Hack'n'slash
- echo "Stripping to form end-user distribution"
- (cd $dir/$basename && {
--	(cd src && rm -rf beos qnx dos mac ppc win)
--	(cd obj && rm -rf bcc32 beos qnx djgpp mingw32 msvc watcom)
--	(cd lib && rm -rf bcc32 beos qnx djgpp mingw32 msvc watcom)
-+	(cd src && rm -rf beos haiku qnx dos mac ppc win)
-+	(cd obj && rm -rf bcc32 beos haiku qnx djgpp mingw32 msvc watcom)
-+	(cd lib && rm -rf bcc32 beos haiku qnx djgpp mingw32 msvc watcom)
- 	(cd include && rm -f bealleg.h qnxalleg.h macalleg.h winalleg.h)
- 	(cd misc && rm -f cmplog.pl dllsyms.lst findtext.sh fixpatch.sh fixver.sh)
- 	(cd misc && rm -f allegro-config-qnx.sh zipup.sh zipwin.sh *.bat *.c)
-@@ -94,8 +94,8 @@
- 	(cd addons/jpgalleg && rm -f makefile.be makefile.mgw makefile.dj)
- 	(cd addons/jpgalleg && rm -f makefile.osx makefile.vc fix.bat readme.txt)
- 	(cd addons/jpgalleg/misc && rm -f fixver.sh runner.c)
--	(cd addons/jpgalleg/lib && rm -rf beos djgpp macosx mingw32 msvc)
--	(cd addons/jpgalleg/obj && rm -rf beos djgpp macosx mingw32 msvc)
-+	(cd addons/jpgalleg/lib && rm -rf beos djgpp haiku macosx mingw32 msvc)
-+	(cd addons/jpgalleg/obj && rm -rf beos djgpp haiku macosx mingw32 msvc)
- 
- 	# logg addon
- 	(cd addons/logg && rm -f Makefile.mingw play_ogg.c stream_ogg.c fix.bat)
-diff -urN allegro-4.3.10plus/misc/zipup.sh allegro-4.3.10plus-haiku/misc/zipup.sh
---- allegro-4.3.10plus/misc/zipup.sh	2008-10-15 14:43:09.000000000 +0000
-+++ allegro-4.3.10plus-haiku/misc/zipup.sh	2008-10-15 15:01:00.000000000 +0000
-@@ -125,6 +125,12 @@
- 
- make depend UNIX_TOOLS=1 CC=gcc
- 
-+# generate dependencies for Haiku
-+echo "Generating Haiku dependencies..."
-+
-+./fix.sh haiku --quick
-+
-+make depend UNIX_TOOLS=1 CC=gcc
- 
- # generate dependencies for QNX
- echo "Generating QNX dependencies..."
-@@ -164,7 +170,7 @@
- for base in abi ahack allegro const faq help mistakes; do
-    ./_makedoc.exe -ascii docs/txt/$base.txt docs/src/$base._tx
- done
--for base in bcc32 beos darwin djgpp linux macosx mingw32 msvc qnx unix watcom; do
-+for base in bcc32 beos darwin djgpp haiku linux macosx mingw32 msvc qnx unix watcom; do
-    ./_makedoc.exe -ascii docs/build/$base.txt docs/src/build/$base._tx
- done
- 
-diff -urN allegro-4.3.10plus/setup/keyconf.c allegro-4.3.10plus-haiku/setup/keyconf.c
---- allegro-4.3.10plus/setup/keyconf.c	2008-10-15 14:43:30.000000000 +0000
-+++ allegro-4.3.10plus-haiku/setup/keyconf.c	2008-10-15 15:01:00.000000000 +0000
-@@ -25,8 +25,8 @@
- 
- 
- /* The code can't link on platforms that don't use src/misc/pckeys.c (everything
-- * but DOS, QNX, BEOS). */
--#if (defined ALLEGRO_DOS) || (defined ALLEGRO_QNX) || (defined ALLEGRO_BEOS)
-+ * but DOS, QNX, BEOS, HAIKU). */
-+#if (defined ALLEGRO_DOS) || (defined ALLEGRO_QNX) || (defined ALLEGRO_BEOS) || (defined ALLEGRO_HAIKU)
- 
- 
- char *ascii_name[32] = 
-diff -urN allegro-4.3.10plus/src/beos/baccel.cpp allegro-4.3.10plus-haiku/src/beos/baccel.cpp
---- allegro-4.3.10plus/src/beos/baccel.cpp	2008-10-15 14:29:35.000000000 +0000
-+++ allegro-4.3.10plus-haiku/src/beos/baccel.cpp	2008-10-15 15:01:00.000000000 +0000
-@@ -20,7 +20,7 @@
- #include "allegro/internal/aintern.h"
- #include "allegro/platform/aintbeos.h"
- 
--#ifndef ALLEGRO_BEOS
-+#if !defined ALLEGRO_BEOS && !defined ALLEGRO_HAIKU
- #error something is wrong with the makefile
- #endif
- 
-diff -urN allegro-4.3.10plus/src/beos/bdispsw.cpp allegro-4.3.10plus-haiku/src/beos/bdispsw.cpp
---- allegro-4.3.10plus/src/beos/bdispsw.cpp	2008-10-15 14:29:35.000000000 +0000
-+++ allegro-4.3.10plus-haiku/src/beos/bdispsw.cpp	2008-10-15 15:01:00.000000000 +0000
-@@ -19,7 +19,7 @@
- #include "allegro/internal/aintern.h"
- #include "allegro/platform/aintbeos.h"
- 
--#ifndef ALLEGRO_BEOS
-+#if !defined ALLEGRO_BEOS && !defined ALLEGRO_HAIKU
- #error something is wrong with the makefile
- #endif
- 
-diff -urN allegro-4.3.10plus/src/beos/bdwindow.cpp allegro-4.3.10plus-haiku/src/beos/bdwindow.cpp
---- allegro-4.3.10plus/src/beos/bdwindow.cpp	2008-10-15 14:29:35.000000000 +0000
-+++ allegro-4.3.10plus-haiku/src/beos/bdwindow.cpp	2008-10-15 15:01:00.000000000 +0000
-@@ -21,7 +21,7 @@
- #include "allegro/internal/aintern.h"
- #include "allegro/platform/aintbeos.h"
- 
--#ifndef ALLEGRO_BEOS
-+#if !defined ALLEGRO_BEOS && !defined ALLEGRO_HAIKU
- #error something is wrong with the makefile
- #endif
- 
-@@ -260,8 +260,10 @@
- 	             cmap[i] = BScreen().IndexForColor(((i >> 4) & 0xF0) | (i >> 8),  (i & 0xF0) | ((i >> 4) & 0xF),  (i & 0xF) | ((i & 0xF) << 4));
- 	       }
- 	    }
-+#if 0
- 	    TRACE(PREFIX_I "Color conversion mode set: %d->%d\n",
- 		  (int)screen_depth, (int)display_depth);
-+#endif
- 	 }
- 	 			       
- 	 if (rects) {
-diff -urN allegro-4.3.10plus/src/beos/bgfx.c allegro-4.3.10plus-haiku/src/beos/bgfx.c
---- allegro-4.3.10plus/src/beos/bgfx.c	2008-10-15 14:29:36.000000000 +0000
-+++ allegro-4.3.10plus-haiku/src/beos/bgfx.c	2008-10-15 15:01:00.000000000 +0000
-@@ -19,9 +19,9 @@
- #include "allegro/internal/aintern.h"
- #include "allegro/platform/aintbeos.h"
- 
--#ifndef ALLEGRO_BEOS
-+#if !defined ALLEGRO_BEOS && !defined ALLEGRO_HAIKU
- #error something is wrong with the makefile
--#endif 
-+#endif
- 
- 
- 
-diff -urN allegro-4.3.10plus/src/beos/bgfxapi.cpp allegro-4.3.10plus-haiku/src/beos/bgfxapi.cpp
---- allegro-4.3.10plus/src/beos/bgfxapi.cpp	2008-10-15 14:29:35.000000000 +0000
-+++ allegro-4.3.10plus-haiku/src/beos/bgfxapi.cpp	2008-10-15 15:01:00.000000000 +0000
-@@ -19,7 +19,7 @@
- #include "allegro/internal/aintern.h"
- #include "allegro/platform/aintbeos.h"
- 
--#ifndef ALLEGRO_BEOS
-+#if !defined ALLEGRO_BEOS && !defined ALLEGRO_HAIKU
- #error something is wrong with the makefile
- #endif
- 
-diff -urN allegro-4.3.10plus/src/beos/bgfxdrv.c allegro-4.3.10plus-haiku/src/beos/bgfxdrv.c
---- allegro-4.3.10plus/src/beos/bgfxdrv.c	2008-10-15 14:29:35.000000000 +0000
-+++ allegro-4.3.10plus-haiku/src/beos/bgfxdrv.c	2008-10-15 15:01:00.000000000 +0000
-@@ -18,9 +18,9 @@
- #include "allegro.h"
- #include "allegro/internal/aintern.h"
- 
--#ifndef ALLEGRO_BEOS
-+#if !defined ALLEGRO_BEOS && !defined ALLEGRO_HAIKU
- #error something is wrong with the makefile
--#endif                
-+#endif           
- 
- BEGIN_GFX_DRIVER_LIST
- GFX_DRIVER_BEOS 
-diff -urN allegro-4.3.10plus/src/beos/bjoy.c allegro-4.3.10plus-haiku/src/beos/bjoy.c
---- allegro-4.3.10plus/src/beos/bjoy.c	2008-10-15 14:29:35.000000000 +0000
-+++ allegro-4.3.10plus-haiku/src/beos/bjoy.c	2008-10-15 15:01:00.000000000 +0000
-@@ -19,7 +19,7 @@
- #include "allegro/internal/aintern.h"
- #include "allegro/platform/aintbeos.h"
- 
--#ifndef ALLEGRO_BEOS
-+#if !defined ALLEGRO_BEOS && !defined ALLEGRO_HAIKU
- #error something is wrong with the makefile
- #endif
- 
-diff -urN allegro-4.3.10plus/src/beos/bjoyapi.cpp allegro-4.3.10plus-haiku/src/beos/bjoyapi.cpp
---- allegro-4.3.10plus/src/beos/bjoyapi.cpp	2008-10-15 14:29:36.000000000 +0000
-+++ allegro-4.3.10plus-haiku/src/beos/bjoyapi.cpp	2008-10-15 15:01:00.000000000 +0000
-@@ -19,9 +19,9 @@
- #include "allegro/internal/aintern.h"
- #include "allegro/platform/aintbeos.h"
- 
--#ifndef ALLEGRO_BEOS
-+#if !defined ALLEGRO_BEOS && !defined ALLEGRO_HAIKU
- #error something is wrong with the makefile
--#endif                
-+#endif            
- 
- static BJoystick *be_joy = NULL;
- static int32 num_devices, num_axes, num_hats, num_buttons;
-@@ -64,12 +64,12 @@
-    device_config = get_config_string("joystick", "joystick_device", "");
-    
-    /* Let's try to open selected device */
--   if ((device_config[0] == '\0') || (be_joy->Open(device_config) < 0)) {
-+   if ((device_config[0] == '\0') || (be_joy->Open(device_config, true) < 0)) {
-       /* ok, let's try to open first available device */
-       if (be_joy->GetDeviceName(0, device_name) != B_OK) {
-          goto cleanup;
-       }
--      if (be_joy->Open(device_name) == B_ERROR) {
-+      if (be_joy->Open(device_name, true) == B_ERROR) {
-          goto cleanup;
-       }
-    }
-diff -urN allegro-4.3.10plus/src/beos/bjoydrv.c allegro-4.3.10plus-haiku/src/beos/bjoydrv.c
---- allegro-4.3.10plus/src/beos/bjoydrv.c	2008-10-15 14:29:35.000000000 +0000
-+++ allegro-4.3.10plus-haiku/src/beos/bjoydrv.c	2008-10-15 15:01:00.000000000 +0000
-@@ -18,9 +18,9 @@
- #include "allegro.h"
- #include "allegro/internal/aintern.h"
- 
--#ifndef ALLEGRO_BEOS
-+#if !defined ALLEGRO_BEOS && !defined ALLEGRO_HAIKU
- #error something is wrong with the makefile
--#endif                
-+#endif              
- 
- BEGIN_JOYSTICK_DRIVER_LIST
- JOYSTICK_DRIVER_BEOS
-diff -urN allegro-4.3.10plus/src/beos/bkey.c allegro-4.3.10plus-haiku/src/beos/bkey.c
---- allegro-4.3.10plus/src/beos/bkey.c	2008-10-15 14:29:36.000000000 +0000
-+++ allegro-4.3.10plus-haiku/src/beos/bkey.c	2008-10-15 15:01:00.000000000 +0000
-@@ -19,9 +19,9 @@
- #include "allegro/internal/aintern.h"
- #include "allegro/platform/aintbeos.h"
- 
--#ifndef ALLEGRO_BEOS
-+#if !defined ALLEGRO_BEOS && !defined ALLEGRO_HAIKU
- #error something is wrong with the makefile
--#endif 
-+#endif
- 
- 
- 
-diff -urN allegro-4.3.10plus/src/beos/bkeyapi.cpp allegro-4.3.10plus-haiku/src/beos/bkeyapi.cpp
---- allegro-4.3.10plus/src/beos/bkeyapi.cpp	2008-10-15 14:29:35.000000000 +0000
-+++ allegro-4.3.10plus-haiku/src/beos/bkeyapi.cpp	2008-10-15 15:01:00.000000000 +0000
-@@ -22,9 +22,9 @@
- #include "allegro/internal/aintern.h"
- #include "allegro/platform/aintbeos.h"
- 
--#ifndef ALLEGRO_BEOS
-+#if !defined ALLEGRO_BEOS && !defined ALLEGRO_HAIKU
- #error something is wrong with the makefile
--#endif                
-+#endif           
- 
- #define KEY_ID_PC101 0 // the docs say it should be 0x83ab, but they lie
- 
-@@ -260,7 +260,9 @@
-       key_info_old = key_info_new;
-    }
- 
-+#if 0
-  TRACE(PREFIX_I "keyboard thread exited\n");
-+#endif
- 
-  return 0;
- }
-diff -urN allegro-4.3.10plus/src/beos/bkeydrv.c allegro-4.3.10plus-haiku/src/beos/bkeydrv.c
---- allegro-4.3.10plus/src/beos/bkeydrv.c	2008-10-15 14:29:35.000000000 +0000
-+++ allegro-4.3.10plus-haiku/src/beos/bkeydrv.c	2008-10-15 15:01:01.000000000 +0000
-@@ -18,9 +18,9 @@
- #include "allegro.h"
- #include "allegro/internal/aintern.h"
- 
--#ifndef ALLEGRO_BEOS
-+#if !defined ALLEGRO_BEOS && !defined ALLEGRO_HAIKU
- #error something is wrong with the makefile
--#endif                
-+#endif             
- 
- _DRIVER_INFO _keyboard_driver_list[] =
- {
-diff -urN allegro-4.3.10plus/src/beos/bmidi.c allegro-4.3.10plus-haiku/src/beos/bmidi.c
---- allegro-4.3.10plus/src/beos/bmidi.c	2008-10-15 14:29:35.000000000 +0000
-+++ allegro-4.3.10plus-haiku/src/beos/bmidi.c	2008-10-15 15:01:01.000000000 +0000
-@@ -19,9 +19,9 @@
- #include "allegro/internal/aintern.h"
- #include "allegro/platform/aintbeos.h"
- 
--#ifndef ALLEGRO_BEOS
-+#if !defined ALLEGRO_BEOS && !defined ALLEGRO_HAIKU
- #error something is wrong with the makefile
--#endif                
-+#endif     
- 
- MIDI_DRIVER midi_beos =
- {
-diff -urN allegro-4.3.10plus/src/beos/bmidiapi.cpp allegro-4.3.10plus-haiku/src/beos/bmidiapi.cpp
---- allegro-4.3.10plus/src/beos/bmidiapi.cpp	2008-10-15 14:29:35.000000000 +0000
-+++ allegro-4.3.10plus-haiku/src/beos/bmidiapi.cpp	2008-10-15 15:01:01.000000000 +0000
-@@ -19,9 +19,9 @@
- #include "allegro/internal/aintern.h"
- #include "allegro/platform/aintbeos.h"
- 
--#ifndef ALLEGRO_BEOS
-+#if !defined ALLEGRO_BEOS && !defined ALLEGRO_HAIKU
- #error something is wrong with the makefile
--#endif                
-+#endif           
- 
- 
- BMidiSynth *_be_midisynth = NULL;
-diff -urN allegro-4.3.10plus/src/beos/bmididrv.c allegro-4.3.10plus-haiku/src/beos/bmididrv.c
---- allegro-4.3.10plus/src/beos/bmididrv.c	2008-10-15 14:29:35.000000000 +0000
-+++ allegro-4.3.10plus-haiku/src/beos/bmididrv.c	2008-10-15 15:01:01.000000000 +0000
-@@ -18,9 +18,9 @@
- #include "allegro.h"
- #include "allegro/internal/aintern.h"
- 
--#ifndef ALLEGRO_BEOS
-+#if !defined ALLEGRO_BEOS && !defined ALLEGRO_HAIKU
- #error something is wrong with the makefile
--#endif                
-+#endif             
- 
- BEGIN_MIDI_DRIVER_LIST
- MIDI_DRIVER_BEOS
-diff -urN allegro-4.3.10plus/src/beos/bmousapi.cpp allegro-4.3.10plus-haiku/src/beos/bmousapi.cpp
---- allegro-4.3.10plus/src/beos/bmousapi.cpp	2008-10-15 14:29:35.000000000 +0000
-+++ allegro-4.3.10plus-haiku/src/beos/bmousapi.cpp	2008-10-15 15:01:01.000000000 +0000
-@@ -23,9 +23,9 @@
- #include "allegro/internal/aintern.h"
- #include "allegro/platform/aintbeos.h"
- 
--#ifndef ALLEGRO_BEOS
-+#if !defined ALLEGRO_BEOS && !defined ALLEGRO_HAIKU
- #error something is wrong with the makefile
--#endif                
-+#endif              
- 
- #define MOUSE_THREAD_NAME     "mouse driver"
- #define MOUSE_THREAD_PRIORITY 60
-@@ -78,7 +78,9 @@
- 
-       if (mouse_thread_running == false) {
-          release_sem(_be_mouse_view_attached);
-+#if 0
-          TRACE(PREFIX_I "mouse thread exited\n");
-+#endif
- 
-          return 0;
-       }
-diff -urN allegro-4.3.10plus/src/beos/bmousdrv.c allegro-4.3.10plus-haiku/src/beos/bmousdrv.c
---- allegro-4.3.10plus/src/beos/bmousdrv.c	2008-10-15 14:29:35.000000000 +0000
-+++ allegro-4.3.10plus-haiku/src/beos/bmousdrv.c	2008-10-15 15:01:01.000000000 +0000
-@@ -18,9 +18,9 @@
- #include "allegro.h"
- #include "allegro/internal/aintern.h"
- 
--#ifndef ALLEGRO_BEOS
-+#if !defined ALLEGRO_BEOS && !defined ALLEGRO_HAIKU
- #error something is wrong with the makefile
--#endif                
-+#endif              
- 
- 
- 
-diff -urN allegro-4.3.10plus/src/beos/bmouse.c allegro-4.3.10plus-haiku/src/beos/bmouse.c
---- allegro-4.3.10plus/src/beos/bmouse.c	2008-10-15 14:29:36.000000000 +0000
-+++ allegro-4.3.10plus-haiku/src/beos/bmouse.c	2008-10-15 15:01:01.000000000 +0000
-@@ -19,9 +19,9 @@
- #include "allegro/internal/aintern.h"
- #include "allegro/platform/aintbeos.h"
- 
--#ifndef ALLEGRO_BEOS
-+#if !defined ALLEGRO_BEOS && !defined ALLEGRO_HAIKU
- #error something is wrong with the makefile
--#endif                
-+#endif           
- 
- 
- 
-diff -urN allegro-4.3.10plus/src/beos/boverlay.cpp allegro-4.3.10plus-haiku/src/beos/boverlay.cpp
---- allegro-4.3.10plus/src/beos/boverlay.cpp	2008-10-15 14:29:35.000000000 +0000
-+++ allegro-4.3.10plus-haiku/src/beos/boverlay.cpp	2008-10-15 15:01:01.000000000 +0000
-@@ -19,7 +19,7 @@
- #include "allegro/internal/aintern.h"
- #include "allegro/platform/aintbeos.h"
- 
--#ifndef ALLEGRO_BEOS
-+#if !defined ALLEGRO_BEOS && !defined ALLEGRO_HAIKU
- #error something is wrong with the makefile
- #endif
- 
-diff -urN allegro-4.3.10plus/src/beos/bsnd.c allegro-4.3.10plus-haiku/src/beos/bsnd.c
---- allegro-4.3.10plus/src/beos/bsnd.c	2008-10-15 14:29:36.000000000 +0000
-+++ allegro-4.3.10plus-haiku/src/beos/bsnd.c	2008-10-15 15:01:01.000000000 +0000
-@@ -19,9 +19,9 @@
- #include "allegro/internal/aintern.h"
- #include "allegro/platform/aintbeos.h"
- 
--#ifndef ALLEGRO_BEOS
-+#if !defined ALLEGRO_BEOS && !defined ALLEGRO_HAIKU
- #error something is wrong with the makefile
--#endif                
-+#endif             
- 
- DIGI_DRIVER digi_beos =
- {
-diff -urN allegro-4.3.10plus/src/beos/bsndapi.cpp allegro-4.3.10plus-haiku/src/beos/bsndapi.cpp
---- allegro-4.3.10plus/src/beos/bsndapi.cpp	2008-10-15 14:29:35.000000000 +0000
-+++ allegro-4.3.10plus-haiku/src/beos/bsndapi.cpp	2008-10-15 15:01:01.000000000 +0000
-@@ -20,7 +20,7 @@
- #include "allegro/internal/aintern.h"
- #include "allegro/platform/aintbeos.h"
- 
--#ifndef ALLEGRO_BEOS
-+#if !defined ALLEGRO_BEOS && !defined ALLEGRO_HAIKU
- #error something is wrong with the makefile
- #endif
- 
-diff -urN allegro-4.3.10plus/src/beos/bsnddrv.c allegro-4.3.10plus-haiku/src/beos/bsnddrv.c
---- allegro-4.3.10plus/src/beos/bsnddrv.c	2008-10-15 14:29:35.000000000 +0000
-+++ allegro-4.3.10plus-haiku/src/beos/bsnddrv.c	2008-10-15 15:01:01.000000000 +0000
-@@ -19,9 +19,9 @@
- #include "allegro/internal/aintern.h"
- 
- 
--#ifndef ALLEGRO_BEOS
-+#if !defined ALLEGRO_BEOS && !defined ALLEGRO_HAIKU
- #error something is wrong with the makefile
--#endif                
-+#endif           
- 
- BEGIN_DIGI_DRIVER_LIST
- DIGI_DRIVER_BEOS
-diff -urN allegro-4.3.10plus/src/beos/bsysapi.cpp allegro-4.3.10plus-haiku/src/beos/bsysapi.cpp
---- allegro-4.3.10plus/src/beos/bsysapi.cpp	2008-10-15 14:29:35.000000000 +0000
-+++ allegro-4.3.10plus-haiku/src/beos/bsysapi.cpp	2008-10-15 15:01:01.000000000 +0000
-@@ -27,9 +27,9 @@
- #include <sys/utsname.h>
- #endif
- 
--#ifndef ALLEGRO_BEOS
-+#if !defined ALLEGRO_BEOS && !defined ALLEGRO_HAIKU
- #error something is wrong with the makefile
--#endif              
-+#endif            
- 
- #define SYS_THREAD_PRIORITY B_NORMAL_PRIORITY
- #define SYS_THREAD_NAME     "system driver"
-@@ -144,7 +144,9 @@
- 
-    _be_allegro_app->Run();
- 
-+#if 0
-    TRACE(PREFIX_I "system thread exited\n");
-+#endif
- 
-    return 0;
- }
-@@ -201,8 +203,6 @@
-    uname(&os_name);
-    os_type = OSTYPE_BEOS;
-    os_multitasking = TRUE;
--   os_version = atoi(strtok(os_name.release, "."));
--   os_revision = atoi(strtok(NULL, "."));
- 
-    chdir(app_path);
- 
-diff -urN allegro-4.3.10plus/src/beos/bsysdrv.c allegro-4.3.10plus-haiku/src/beos/bsysdrv.c
---- allegro-4.3.10plus/src/beos/bsysdrv.c	2008-10-15 14:29:36.000000000 +0000
-+++ allegro-4.3.10plus-haiku/src/beos/bsysdrv.c	2008-10-15 15:01:01.000000000 +0000
-@@ -18,9 +18,9 @@
- #include "allegro.h"
- #include "allegro/internal/aintern.h"
- 
--#ifndef ALLEGRO_BEOS
-+#if !defined ALLEGRO_BEOS && !defined ALLEGRO_HAIKU
- #error something is wrong with the makefile
--#endif 
-+#endif
- 
- _DRIVER_INFO _system_driver_list[] =
- {
-diff -urN allegro-4.3.10plus/src/beos/bsystem.c allegro-4.3.10plus-haiku/src/beos/bsystem.c
---- allegro-4.3.10plus/src/beos/bsystem.c	2008-10-15 14:29:36.000000000 +0000
-+++ allegro-4.3.10plus-haiku/src/beos/bsystem.c	2008-10-15 15:01:01.000000000 +0000
-@@ -19,11 +19,9 @@
- #include "allegro/internal/aintern.h"
- #include "allegro/platform/aintbeos.h"
- 
--#ifndef ALLEGRO_BEOS
-+#if !defined ALLEGRO_BEOS && !defined ALLEGRO_HAIKU
- #error something is wrong with the makefile
--#endif 
--
--
-+#endif
- 
- SYSTEM_DRIVER system_beos = {
-    SYSTEM_BEOS,
-diff -urN allegro-4.3.10plus/src/beos/btimeapi.cpp allegro-4.3.10plus-haiku/src/beos/btimeapi.cpp
---- allegro-4.3.10plus/src/beos/btimeapi.cpp	2008-10-15 14:29:36.000000000 +0000
-+++ allegro-4.3.10plus-haiku/src/beos/btimeapi.cpp	2008-10-15 15:01:01.000000000 +0000
-@@ -19,7 +19,7 @@
- #include "allegro/internal/aintern.h"
- #include "allegro/platform/aintbeos.h"
- 
--#ifndef ALLEGRO_BEOS
-+#if !defined ALLEGRO_BEOS && !defined ALLEGRO_HAIKU
- #error something is wrong with the makefile
- #endif
- 
-diff -urN allegro-4.3.10plus/src/beos/btimedrv.c allegro-4.3.10plus-haiku/src/beos/btimedrv.c
---- allegro-4.3.10plus/src/beos/btimedrv.c	2008-10-15 14:29:35.000000000 +0000
-+++ allegro-4.3.10plus-haiku/src/beos/btimedrv.c	2008-10-15 15:01:01.000000000 +0000
-@@ -18,9 +18,9 @@
- #include "allegro.h"
- #include "allegro/internal/aintern.h"
- 
--#ifndef ALLEGRO_BEOS
-+#if !defined ALLEGRO_BEOS && !defined ALLEGRO_HAIKU
- #error something is wrong with the makefile
--#endif                
-+#endif         
- 
- _DRIVER_INFO _timer_driver_list[] = {
-    {TIMER_BEOS, &timer_beos, TRUE},
-diff -urN allegro-4.3.10plus/src/beos/btimer.c allegro-4.3.10plus-haiku/src/beos/btimer.c
---- allegro-4.3.10plus/src/beos/btimer.c	2008-10-15 14:29:35.000000000 +0000
-+++ allegro-4.3.10plus-haiku/src/beos/btimer.c	2008-10-15 15:01:01.000000000 +0000
-@@ -19,7 +19,7 @@
- #include "allegro/internal/aintern.h"
- #include "allegro/platform/aintbeos.h"
- 
--#ifndef ALLEGRO_BEOS
-+#if !defined ALLEGRO_BEOS && !defined ALLEGRO_HAIKU
- #error something is wrong with the makefile
- #endif
- 
-diff -urN allegro-4.3.10plus/src/beos/bwindow.cpp allegro-4.3.10plus-haiku/src/beos/bwindow.cpp
---- allegro-4.3.10plus/src/beos/bwindow.cpp	2008-10-15 14:29:35.000000000 +0000
-+++ allegro-4.3.10plus-haiku/src/beos/bwindow.cpp	2008-10-15 15:01:01.000000000 +0000
-@@ -19,7 +19,7 @@
- #include "allegro/internal/aintern.h"
- #include "allegro/platform/aintbeos.h"
- 
--#ifndef ALLEGRO_BEOS
-+#if !defined ALLEGRO_BEOS && !defined ALLEGRO_HAIKU
- #error something is wrong with the makefile
- #endif
- 
-@@ -117,7 +117,7 @@
- /* _be_gfx_bwindow_read_write_bank:
-  *  Returns new line and marks it as dirty.
-  */
--extern "C" unsigned long _be_gfx_bwindow_read_write_bank(BITMAP *bmp, int line)
-+extern "C" uintptr_t _be_gfx_bwindow_read_write_bank(BITMAP *bmp, int line)
- {
-    if (!bmp->id & BMP_ID_LOCKED) {
-       bmp->id |= (BMP_ID_LOCKED | BMP_ID_AUTOLOCK);
-diff -urN allegro-4.3.10plus/src/beos/bwscreen.cpp allegro-4.3.10plus-haiku/src/beos/bwscreen.cpp
---- allegro-4.3.10plus/src/beos/bwscreen.cpp	2008-10-15 14:29:35.000000000 +0000
-+++ allegro-4.3.10plus-haiku/src/beos/bwscreen.cpp	2008-10-15 15:01:01.000000000 +0000
-@@ -19,7 +19,7 @@
- #include "allegro/internal/aintern.h"
- #include "allegro/platform/aintbeos.h"
- 
--#ifndef ALLEGRO_BEOS
-+#if !defined ALLEGRO_BEOS && !defined ALLEGRO_HAIKU
- #error something is wrong with the makefile
- #endif
- 
-@@ -474,7 +474,7 @@
- /* be_gfx_bwindowscreen_read_write_bank:
-  *  Returns new line and synchronizes framebuffer if needed.
-  */
--extern "C" unsigned long be_gfx_bwindowscreen_read_write_bank(BITMAP *bmp, int line)
-+extern "C" uintptr_t be_gfx_bwindowscreen_read_write_bank(BITMAP *bmp, int line)
- {
-    if (!(bmp->id & BMP_ID_LOCKED)) {
-       _be_sync_func();
-@@ -490,7 +490,7 @@
-  */
- extern "C" void be_gfx_bwindowscreen_unwrite_bank(BITMAP *bmp)
- {
--   if (bmp->id & BMP_AUTOLOCK) {
-+   if (bmp->id & BMP_ID_AUTOLOCK) {
-       bmp->id &= ~(BMP_ID_LOCKED | BMP_ID_AUTOLOCK);
-    }
- }
-diff -urN allegro-4.3.10plus/src/i386/asmdefs.inc allegro-4.3.10plus-haiku/src/i386/asmdefs.inc
---- allegro-4.3.10plus/src/i386/asmdefs.inc	2008-10-15 14:31:06.000000000 +0000
-+++ allegro-4.3.10plus-haiku/src/i386/asmdefs.inc	2008-10-15 15:01:01.000000000 +0000
-@@ -31,6 +31,8 @@
-    #include "obj/msvc/asmdef.inc"
- #elif defined ALLEGRO_WATCOM
-    #include "obj/watcom/asmdef.inc"
-+#elif defined ALLEGRO_HAIKU
-+   #include "obj/beos/asmdef.inc"
- #elif defined ALLEGRO_BEOS
-    #include "obj/beos/asmdef.inc"
- #elif defined ALLEGRO_QNX
-diff -urN allegro-4.3.10plus/src/midi.c allegro-4.3.10plus-haiku/src/midi.c
---- allegro-4.3.10plus/src/midi.c	2008-10-15 14:33:58.000000000 +0000
-+++ allegro-4.3.10plus-haiku/src/midi.c	2008-10-15 15:01:01.000000000 +0000
-@@ -1122,7 +1122,7 @@
-       running_status = 0;
- 
-       while (p < end) {                         /* work through data stream */
--#ifdef ALLEGRO_BEOS
-+#if defined ALLEGRO_BEOS || defined ALLEGRO_HAIKU
-          /* 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.10plus/tools/dat2c.c allegro-4.3.10plus-haiku/tools/dat2c.c
---- allegro-4.3.10plus/tools/dat2c.c	2008-10-15 14:36:09.000000000 +0000
-+++ allegro-4.3.10plus-haiku/tools/dat2c.c	2008-10-15 15:01:01.000000000 +0000
-@@ -342,7 +342,7 @@
-    }
- 
-    if (dat2c->lformat == lineformat_default)
--#if (defined ALLEGRO_UNIX || defined ALLEGRO_QNX || defined ALLEGRO_BEOS || defined ALLEGRO_MACOSX)
-+#if (defined ALLEGRO_UNIX || defined ALLEGRO_QNX || defined ALLEGRO_BEOS || defined ALLEGRO_HAIKU || defined ALLEGRO_MACOSX)
-       dat2c->lformat = lineformat_unix;
- #elif (defined ALLEGRO_WINDOWS || defined ALLEGRO_DOS)
-       dat2c->lformat = lineformat_dos;
-diff -urN allegro-4.3.10plus/tools/datedit.c allegro-4.3.10plus-haiku/tools/datedit.c
---- allegro-4.3.10plus/tools/datedit.c	2008-10-15 14:36:09.000000000 +0000
-+++ allegro-4.3.10plus-haiku/tools/datedit.c	2008-10-15 15:01:01.000000000 +0000
-@@ -121,6 +121,8 @@
-       #include "obj/dmc/plugins.h"
-    #elif defined ALLEGRO_BEOS
-       #include "obj/beos/plugins.h"
-+   #elif defined ALLEGRO_HAIKU
-+      #include "obj/beos/plugins.h"
-    #elif defined ALLEGRO_BCC32
-       #include "obj/bcc32/plugins.h"
-    #elif defined ALLEGRO_MPW
-diff -urN allegro-4.3.10plus/tools/grabber.c allegro-4.3.10plus-haiku/tools/grabber.c
---- allegro-4.3.10plus/tools/grabber.c	2008-10-15 14:36:09.000000000 +0000
-+++ allegro-4.3.10plus-haiku/tools/grabber.c	2008-10-15 15:01:01.000000000 +0000
-@@ -3132,6 +3132,7 @@
-       case OSTYPE_QNX:        s = "QNX";                        break;
-       case OSTYPE_UNIX:       s = "Unix";                       break;
-       case OSTYPE_BEOS:       s = "BeOS";                       break;
-+      case OSTYPE_HAIKU:      s = "Haiku";                      break;
-       case OSTYPE_MACOS:      s = "MacOS";                      break;
-       case OSTYPE_MACOSX:     s = "MacOS X";                    break;
-       default:                s = "Unknown";                    break;
diff --git a/media-libs/allegro/patches/allegro-4.4.x-svn.patch b/media-libs/allegro/patches/allegro-4.4.x_svn.patch
similarity index 100%
rename from media-libs/allegro/patches/allegro-4.4.x-svn.patch
rename to media-libs/allegro/patches/allegro-4.4.x_svn.patch
diff --git a/media-libs/freetype/freetype_with_subpixel_rendering-2.4.9 b/media-libs/freetype/freetype_with_subpixel_rendering-2.4.9.recipe
similarity index 100%
rename from media-libs/freetype/freetype_with_subpixel_rendering-2.4.9
rename to media-libs/freetype/freetype_with_subpixel_rendering-2.4.9.recipe
diff --git a/media-libs/freetype/patches/freetype-2.4.9-with-subpixel-rendering-enabled.patch b/media-libs/freetype/patches/freetype-2.4.9_with_subpixel_rendering_enabled.patch
similarity index 100%
rename from media-libs/freetype/patches/freetype-2.4.9-with-subpixel-rendering-enabled.patch
rename to media-libs/freetype/patches/freetype-2.4.9_with_subpixel_rendering_enabled.patch
diff --git a/media-libs/ftgl/ftgl-2.1-svn b/media-libs/ftgl/ftgl-2.1-svn
deleted file mode 100644
index a2cbd0a4f..000000000
--- a/media-libs/ftgl/ftgl-2.1-svn
+++ /dev/null
@@ -1,27 +0,0 @@
-DESCRIPTION="FTGL is a free cross-platform Open Source C++ library that uses Freetype2 to simplify rendering fonts in OpenGL applications" 
-HOMEPAGE="http://sourceforge.net/projects/ftgl" 
-SRC_URI="svn+https://ftgl.svn.sourceforge.net/svnroot/ftgl/trunk"
-#CHECKSUM_MD5=""
-REVISION="1"
-STATUS_HAIKU="stable"
-DEPEND="pkgconfig >= 0.23"
-
-BUILD()
-{
-	cd ftgl-2.1-svn
-	libtoolize --copy --force --install
-	aclocal --install -I m4
-	./autogen.sh
-	./configure --prefix=`finddir B_COMMON_DIRECTORY`
-	make
-}
-
-INSTALL()
-{
-	cd ftgl-2.1-svn
-	make install DESTDIR=${DESTDIR}
-}
-
-LICENSE="MIT"
-COPYRIGHT="2001-2004 Unicode, Inc.
-		   2001-2010 Henry Maddocks"
diff --git a/media-libs/ladspa_sdk/ladspa_sdk-1.13 b/media-libs/ladspa_sdk/ladspa_sdk-1.13.recipe
similarity index 100%
rename from media-libs/ladspa_sdk/ladspa_sdk-1.13
rename to media-libs/ladspa_sdk/ladspa_sdk-1.13.recipe
diff --git a/media-libs/libnsbmp/libnsbmp_0.0.3-HEAD b/media-libs/libnsbmp/libnsbmp_0.0.3-HEAD
deleted file mode 100644
index 23564b564..000000000
--- a/media-libs/libnsbmp/libnsbmp_0.0.3-HEAD
+++ /dev/null
@@ -1,21 +0,0 @@
-DESCRIPTION="Libnsbmp is a decoding library for BMP and ICO image file formats" 
-HOMEPAGE="http://www.netsurf-browser.org/projects/libnsbmp/" 
-SRC_URI="git://git.netsurf-browser.org/libnsbmp.git"
-REVISION="1"
-STATUS_HAIKU="stable"
-DEPEND="dev-util/buildsystem >= 0"
-
-BUILD()
-{
-	cd libnsbmp-0.0.3-HEAD
-	make PREFIX=/boot/common
-}
-
-INSTALL()
-{
-	cd libnsbmp-0.0.3-HEAD
-	make install PREFIX=/boot/common
-}
-
-LICENSE="MIT"
-COPYRIGHT="2003 - 2012 The NetSurf Developers"
diff --git a/media-libs/libsdl/sdl-config b/media-libs/libsdl/additional-files/sdl-config
similarity index 100%
rename from media-libs/libsdl/sdl-config
rename to media-libs/libsdl/additional-files/sdl-config
diff --git a/media-libs/libsdl/libsdl-1.2_hg b/media-libs/libsdl/libsdl-1.2_hg.recipe
similarity index 100%
rename from media-libs/libsdl/libsdl-1.2_hg
rename to media-libs/libsdl/libsdl-1.2_hg.recipe
diff --git a/media-libs/libsdl/libsdl-1.3_gsoc b/media-libs/libsdl/libsdl-1.3_gsoc.recipe
similarity index 100%
rename from media-libs/libsdl/libsdl-1.3_gsoc
rename to media-libs/libsdl/libsdl-1.3_gsoc.recipe
diff --git a/media-libs/libsdl/libsdl-2.0_hg b/media-libs/libsdl/libsdl-2.0_hg.recipe
similarity index 100%
rename from media-libs/libsdl/libsdl-2.0_hg
rename to media-libs/libsdl/libsdl-2.0_hg.recipe
diff --git a/media-libs/libsdl/libsdl-2.0_hg_cmake b/media-libs/libsdl/libsdl-2.0_hg_cmake.recipe
similarity index 100%
rename from media-libs/libsdl/libsdl-2.0_hg_cmake
rename to media-libs/libsdl/libsdl-2.0_hg_cmake.recipe
diff --git a/media-libs/libsdl/patches/libsdl-1.2-hg.patch b/media-libs/libsdl/patches/libsdl-1.2_hg.patch
similarity index 100%
rename from media-libs/libsdl/patches/libsdl-1.2-hg.patch
rename to media-libs/libsdl/patches/libsdl-1.2_hg.patch
diff --git a/media-libs/libsvgtiny/libsvgtiny-0_HEAD b/media-libs/libsvgtiny/libsvgtiny-0_HEAD.recipe
similarity index 100%
rename from media-libs/libsvgtiny/libsvgtiny-0_HEAD
rename to media-libs/libsvgtiny/libsvgtiny-0_HEAD.recipe
diff --git a/media-libs/libwebm/libwebm-0.9.2_git b/media-libs/libwebm/libwebm-0.9.2_git.recipe
similarity index 100%
rename from media-libs/libwebm/libwebm-0.9.2_git
rename to media-libs/libwebm/libwebm-0.9.2_git.recipe
diff --git a/media-libs/libwebp/libwebp-0.1.2_git b/media-libs/libwebp/libwebp-0.1.2_git.recipe
similarity index 100%
rename from media-libs/libwebp/libwebp-0.1.2_git
rename to media-libs/libwebp/libwebp-0.1.2_git.recipe
diff --git a/media-libs/openal/openal-1.12_git b/media-libs/openal/openal-1.12_git
deleted file mode 100644
index fc6f589e0..000000000
--- a/media-libs/openal/openal-1.12_git
+++ /dev/null
@@ -1,25 +0,0 @@
-DESCRIPTION="OpenAL - A software implementation of the OpenAL 3D audio API" 
-HOMEPAGE="http://kcat.strangesoft.net/openal.html" 
-SRC_URI="git+git://repo.or.cz/openal-soft.git"
-#CHECKSUM_MD5=""
-REVISION="1"
-STATUS_HAIKU="stable"
-DEPEND="dev-util/cmake >= 2.8.0"
-        
-BUILD()
-{
-	cd openal-1.12-git
-	cmake .
-	make
-}
-
-INSTALL()
-{
-	cd openal-1.12-git
-	make install
-}
-
-LICENSE="GNU LGPL v2.1"
-COPYRIGHT="1999-2000 Loki Software
-	2005-2010 OpenAL Soft team"
-
diff --git a/media-libs/sdl_gfx/patches/sdl-gfx-2.0.20.patch b/media-libs/sdl_gfx/patches/sdl_gfx-2.0.20.patch
similarity index 100%
rename from media-libs/sdl_gfx/patches/sdl-gfx-2.0.20.patch
rename to media-libs/sdl_gfx/patches/sdl_gfx-2.0.20.patch
diff --git a/media-libs/sdl_gfx/sdl_gfx-2.0.20 b/media-libs/sdl_gfx/sdl_gfx-2.0.20.recipe
similarity index 100%
rename from media-libs/sdl_gfx/sdl_gfx-2.0.20
rename to media-libs/sdl_gfx/sdl_gfx-2.0.20.recipe
diff --git a/media-libs/sdl_gfx/sdl_gfx-2.0.22 b/media-libs/sdl_gfx/sdl_gfx-2.0.22.recipe
similarity index 100%
rename from media-libs/sdl_gfx/sdl_gfx-2.0.22
rename to media-libs/sdl_gfx/sdl_gfx-2.0.22.recipe
diff --git a/media-libs/sdl_gfx/sdl_gfx-2.0.23 b/media-libs/sdl_gfx/sdl_gfx-2.0.23.recipe
similarity index 100%
rename from media-libs/sdl_gfx/sdl_gfx-2.0.23
rename to media-libs/sdl_gfx/sdl_gfx-2.0.23.recipe
diff --git a/media-libs/sdl_image/sdl-image.OptionalPackageDescription b/media-libs/sdl_image/sdl-image.OptionalPackageDescription
deleted file mode 100644
index c0af9ed47..000000000
--- a/media-libs/sdl_image/sdl-image.OptionalPackageDescription
+++ /dev/null
@@ -1,5 +0,0 @@
-Package:	sdl-image
-Version:	1.2.10
-Copyright:	1997-2009 Sam Lantinga and Mattias Engdegård
-License:	GNU LGPL v2.1
-URL:		http://www.libsdl.org/projects/SDL_image/
diff --git a/media-libs/sdl_image/sdl_image-1.2.10 b/media-libs/sdl_image/sdl_image-1.2.10.recipe
similarity index 100%
rename from media-libs/sdl_image/sdl_image-1.2.10
rename to media-libs/sdl_image/sdl_image-1.2.10.recipe
diff --git a/media-libs/sdl_image/sdl_image-1.2.12 b/media-libs/sdl_image/sdl_image-1.2.12.recipe
similarity index 100%
rename from media-libs/sdl_image/sdl_image-1.2.12
rename to media-libs/sdl_image/sdl_image-1.2.12.recipe
diff --git a/media-libs/sdl_image/sdl_image-1.2.6 b/media-libs/sdl_image/sdl_image-1.2.6.recipe
similarity index 100%
rename from media-libs/sdl_image/sdl_image-1.2.6
rename to media-libs/sdl_image/sdl_image-1.2.6.recipe
diff --git a/media-libs/sdl_image/sdl_image-1.2.8 b/media-libs/sdl_image/sdl_image-1.2.8.recipe
similarity index 100%
rename from media-libs/sdl_image/sdl_image-1.2.8
rename to media-libs/sdl_image/sdl_image-1.2.8.recipe
diff --git a/media-libs/sdl_image/sdl_image-1.2.9 b/media-libs/sdl_image/sdl_image-1.2.9.recipe
similarity index 100%
rename from media-libs/sdl_image/sdl_image-1.2.9
rename to media-libs/sdl_image/sdl_image-1.2.9.recipe
diff --git a/media-libs/sdl_image/sdl_image-1.2_hg b/media-libs/sdl_image/sdl_image-1.2_hg.recipe
similarity index 100%
rename from media-libs/sdl_image/sdl_image-1.2_hg
rename to media-libs/sdl_image/sdl_image-1.2_hg.recipe
diff --git a/media-libs/sdl_mixer/patches/sdl-mixer-1.2.11.patch b/media-libs/sdl_mixer/patches/sdl_mixer-1.2.11.patch
similarity index 100%
rename from media-libs/sdl_mixer/patches/sdl-mixer-1.2.11.patch
rename to media-libs/sdl_mixer/patches/sdl_mixer-1.2.11.patch
diff --git a/media-libs/sdl_mixer/sdl_mixer-1.2.10 b/media-libs/sdl_mixer/sdl_mixer-1.2.10.recipe
similarity index 100%
rename from media-libs/sdl_mixer/sdl_mixer-1.2.10
rename to media-libs/sdl_mixer/sdl_mixer-1.2.10.recipe
diff --git a/media-libs/sdl_mixer/sdl_mixer-1.2.11 b/media-libs/sdl_mixer/sdl_mixer-1.2.11.recipe
similarity index 100%
rename from media-libs/sdl_mixer/sdl_mixer-1.2.11
rename to media-libs/sdl_mixer/sdl_mixer-1.2.11.recipe
diff --git a/media-libs/sdl_mixer/sdl_mixer-1.2.12 b/media-libs/sdl_mixer/sdl_mixer-1.2.12.recipe
similarity index 100%
rename from media-libs/sdl_mixer/sdl_mixer-1.2.12
rename to media-libs/sdl_mixer/sdl_mixer-1.2.12.recipe
diff --git a/media-libs/sdl_mixer/sdl_mixer-1.2.9 b/media-libs/sdl_mixer/sdl_mixer-1.2.9.recipe
similarity index 100%
rename from media-libs/sdl_mixer/sdl_mixer-1.2.9
rename to media-libs/sdl_mixer/sdl_mixer-1.2.9.recipe
diff --git a/media-libs/sdl_mixer/sdl_mixer-1.2_hg b/media-libs/sdl_mixer/sdl_mixer-1.2_hg.recipe
similarity index 100%
rename from media-libs/sdl_mixer/sdl_mixer-1.2_hg
rename to media-libs/sdl_mixer/sdl_mixer-1.2_hg.recipe
diff --git a/media-libs/sdl_net/patches/sdl-net-1.2.7.patch b/media-libs/sdl_net/patches/sdl_net-1.2.7.patch
similarity index 100%
rename from media-libs/sdl_net/patches/sdl-net-1.2.7.patch
rename to media-libs/sdl_net/patches/sdl_net-1.2.7.patch
diff --git a/media-libs/sdl_net/patches/sdl-net-1.2.8.patch b/media-libs/sdl_net/patches/sdl_net-1.2.8.patch
similarity index 100%
rename from media-libs/sdl_net/patches/sdl-net-1.2.8.patch
rename to media-libs/sdl_net/patches/sdl_net-1.2.8.patch
diff --git a/media-libs/sdl_net/sdl_net-1.2.7 b/media-libs/sdl_net/sdl_net-1.2.7.recipe
similarity index 100%
rename from media-libs/sdl_net/sdl_net-1.2.7
rename to media-libs/sdl_net/sdl_net-1.2.7.recipe
diff --git a/media-libs/sdl_net/sdl_net-1.2.8 b/media-libs/sdl_net/sdl_net-1.2.8.recipe
similarity index 100%
rename from media-libs/sdl_net/sdl_net-1.2.8
rename to media-libs/sdl_net/sdl_net-1.2.8.recipe
diff --git a/media-libs/sdl_net/sdl_net-1.2_hg b/media-libs/sdl_net/sdl_net-1.2_hg.recipe
similarity index 100%
rename from media-libs/sdl_net/sdl_net-1.2_hg
rename to media-libs/sdl_net/sdl_net-1.2_hg.recipe
diff --git a/media-libs/sdl_rtf/sdl_rtf-0.1.0 b/media-libs/sdl_rtf/sdl_rtf-0.1.0.recipe
similarity index 100%
rename from media-libs/sdl_rtf/sdl_rtf-0.1.0
rename to media-libs/sdl_rtf/sdl_rtf-0.1.0.recipe
diff --git a/media-libs/sdl_sound/sdl_sound-1.0.3 b/media-libs/sdl_sound/sdl_sound-1.0.3.recipe
similarity index 100%
rename from media-libs/sdl_sound/sdl_sound-1.0.3
rename to media-libs/sdl_sound/sdl_sound-1.0.3.recipe
diff --git a/media-libs/sdl_sound/sdl_sound-1.0_hg b/media-libs/sdl_sound/sdl_sound-1.0_hg.recipe
similarity index 100%
rename from media-libs/sdl_sound/sdl_sound-1.0_hg
rename to media-libs/sdl_sound/sdl_sound-1.0_hg.recipe
diff --git a/media-libs/sdl_ttf/sdl_ttf-2.0.10 b/media-libs/sdl_ttf/sdl_ttf-2.0.10.recipe
similarity index 100%
rename from media-libs/sdl_ttf/sdl_ttf-2.0.10
rename to media-libs/sdl_ttf/sdl_ttf-2.0.10.recipe
diff --git a/media-libs/sdl_ttf/sdl_ttf-2.0.11 b/media-libs/sdl_ttf/sdl_ttf-2.0.11.recipe
similarity index 100%
rename from media-libs/sdl_ttf/sdl_ttf-2.0.11
rename to media-libs/sdl_ttf/sdl_ttf-2.0.11.recipe
diff --git a/media-libs/sdl_ttf/sdl_ttf-2.0.9 b/media-libs/sdl_ttf/sdl_ttf-2.0.9.recipe
similarity index 100%
rename from media-libs/sdl_ttf/sdl_ttf-2.0.9
rename to media-libs/sdl_ttf/sdl_ttf-2.0.9.recipe
diff --git a/media-libs/sdl_ttf/sdl_ttf-2.0_ b/media-libs/sdl_ttf/sdl_ttf-2.0_.recipe
similarity index 100%
rename from media-libs/sdl_ttf/sdl_ttf-2.0_
rename to media-libs/sdl_ttf/sdl_ttf-2.0_.recipe
diff --git a/media-libs/speex/speex-1.2_git b/media-libs/speex/speex-1.2_git
deleted file mode 100644
index 1cc925689..000000000
--- a/media-libs/speex/speex-1.2_git
+++ /dev/null
@@ -1,35 +0,0 @@
-DESCRIPTION="Speex" 
-HOMEPAGE="http://www.speex.org" 
-SRC_URI="git+http://git.xiph.org/speex.git"
-#CHECKSUM_MD5="c4438b22c08e5811ff10e2b06ee9b9ae"
-REVISION="1"
-STATUS_HAIKU="stable"
-DEPEND="libogg >= 1.2.0"
-BUILD()
-{
-	cd speex-1.2-git
-	libtoolize --copy --force --install
-	echo 'AC_CONFIG_MACRO_DIR([m4])' >> configure.ac
-	autogen.sh --prefix=`finddir B_COMMON_DIRECTORY`
-	sed -i 's/$(datadir)\/aclocal/`finddir B_COMMON_DATA_DIRECTORY`\/aclocal/g' M*
-	COMMON_DOCS=`finddir B_COMMON_DOCUMENTATION_DIRECTORY`
-	./configure --prefix=`finddir B_COMMON_DIRECTORY` \
-		--datarootdir=$COMMON_DOCS \
-		--libdir=`finddir B_COMMON_LIB_DIRECTORY` \
-		--mandir=$COMMON_DIR/man
-	make
-}
-
-INSTALL()
-{
-	cd speex-1.2-git
-	make install
-}
-LICENSE="Speex"
-COPYRIGHT="2002-2009 Xiph.org Foundation
-	2002-2008 Jean-Marc Valin
-	2005-2007 Analog Devices Inc.
-	2005-2008 Commonwealth Scientific and Industrial Research Organisation (CSIRO)
-	1993, 2002, 2006 David Rowe
-	2003 EpicGames
-	1992-1994 Jutta Degener, Carsten Bormann"
diff --git a/media-sound/fluidsynth/fluidsynth_1.1_midi_buffer b/media-sound/fluidsynth/fluidsynth-1.1_midi_buffer.recipe
similarity index 100%
rename from media-sound/fluidsynth/fluidsynth_1.1_midi_buffer
rename to media-sound/fluidsynth/fluidsynth-1.1_midi_buffer.recipe
diff --git a/media-sound/fluidsynth/patches/fluidsynth-1.1-midi-buffer.patch b/media-sound/fluidsynth/patches/fluidsynth-1.1_midi_buffer.patch
similarity index 100%
rename from media-sound/fluidsynth/patches/fluidsynth-1.1-midi-buffer.patch
rename to media-sound/fluidsynth/patches/fluidsynth-1.1_midi_buffer.patch
diff --git a/media-sound/gogo_no_coda/gogo_no_coda-3.13 b/media-sound/gogo_no_coda/gogo_no_coda-3.13.recipe
similarity index 100%
rename from media-sound/gogo_no_coda/gogo_no_coda-3.13
rename to media-sound/gogo_no_coda/gogo_no_coda-3.13.recipe
diff --git a/media-sound/gogo_no_coda/patches/gogo-no-coda-3.13.patch b/media-sound/gogo_no_coda/patches/gogo_no_coda-3.13.patch
similarity index 100%
rename from media-sound/gogo_no_coda/patches/gogo-no-coda-3.13.patch
rename to media-sound/gogo_no_coda/patches/gogo_no_coda-3.13.patch
diff --git a/media-sound/lame/lame-398_2 b/media-sound/lame/lame-398_2
deleted file mode 100644
index e53af5d43..000000000
--- a/media-sound/lame/lame-398_2
+++ /dev/null
@@ -1,25 +0,0 @@
-DESCRIPTION="LAME Ain't an MP3 Encoder" 
-HOMEPAGE="http://lame.sourceforge.net/" 
-SRC_URI="http://downloads.sourceforge.net/project/lame/lame/3.98.2/lame-398-2.tar.gz"
-CHECKSUM_MD5="719dae0ee675d0c16e0e89952930ed35"
-REVISION="1"
-STATUS_HAIKU="untested"
-DEPEND="dev-lang/nasm >= 2.03.01"
-BUILD()
-{
-	cd lame-398-2
-	libtoolize --force --copy --install
-	aclocal
-	autoconf
-	automake
-	./configure --prefix=`finddir B_COMMON_DIRECTORY`
-	make
-}
-
-INSTALL()
-{
-	cd lame-398-2
-	make install
-}
-LICENSE="GNU LGPL v2"
-COPYRIGHT="1998-2008 Mike Cheng et al."
diff --git a/media-sound/lame/patches/lame-398-2.patch b/media-sound/lame/patches/lame-398-2.patch
deleted file mode 100644
index dc58cb068..000000000
--- a/media-sound/lame/patches/lame-398-2.patch
+++ /dev/null
@@ -1,41 +0,0 @@
-diff -urN lame-398-2/configure.in lame-398-2-haiku/configure.in
---- lame-398-2/configure.in	2008-08-05 14:16:05.000000000 +0000
-+++ lame-398-2-haiku/configure.in	2009-07-18 07:33:31.000000000 +0000
-@@ -343,6 +343,9 @@
- 		*solaris*)
- 			LIBS="$LIBS -lnsl"
- 			;;
-+		*haiku*)
-+			LIBS="$LIBS -lnetwork"
-+			;;
- 		esac
- 	fi
- fi
-@@ -385,14 +388,13 @@
- 
- dnl configure use of features
- 
--AM_PATH_GTK(1.2.0, HAVE_GTK="yes", HAVE_GTK="no")
-+dnl	AM_PATH_GTK(1.2.0, HAVE_GTK="yes", HAVE_GTK="no")
- 
- dnl ElectricFence malloc debugging
- AC_MSG_CHECKING(use of ElectricFence malloc debugging)
- AC_ARG_ENABLE(efence,
-   [  --enable-efence            Use ElectricFence for malloc debugging],
-   CONFIG_EFENCE="${enableval}", CONFIG_EFENCE="no")
--
- case "${CONFIG_EFENCE}" in
- yes)
- 	AC_CHECK_LIB(efence, EF_Print, HAVE_EFENCE="-lefence")
-diff -urN lame-398-2/frontend/Makefile.am lame-398-2-haiku/frontend/Makefile.am
---- lame-398-2/frontend/Makefile.am	2006-09-30 09:17:05.000000000 +0000
-+++ lame-398-2-haiku/frontend/Makefile.am	2009-07-18 07:42:04.000000000 +0000
-@@ -60,7 +60,7 @@
- 	$(top_builddir)/libmp3lame/libmp3lame.la \
- 	@FRONTEND_LDADD@
- 
--mp3x_LDADD = $(LDADD) @GTK_LIBS@
-+mp3x_LDADD = $(LDADD)
- 
- CLEANFILES = lclint.txt $(EXTRA_PROGRAMS)
- 
diff --git a/media-sound/naspro/naspro-0.2.9_hg b/media-sound/naspro/naspro-0.2.9_hg.recipe
similarity index 100%
rename from media-sound/naspro/naspro-0.2.9_hg
rename to media-sound/naspro/naspro-0.2.9_hg.recipe
diff --git a/media-sound/ocp/ocp_0.1.21_git b/media-sound/ocp/ocp-0.1.21_git.recipe
similarity index 100%
rename from media-sound/ocp/ocp_0.1.21_git
rename to media-sound/ocp/ocp-0.1.21_git.recipe
diff --git a/media-sound/vorbis_tools/patches/vorbis-tools-1.2.0.patch b/media-sound/vorbis_tools/patches/vorbis_tools-1.2.0.patch
similarity index 100%
rename from media-sound/vorbis_tools/patches/vorbis-tools-1.2.0.patch
rename to media-sound/vorbis_tools/patches/vorbis_tools-1.2.0.patch
diff --git a/media-sound/vorbis_tools/patches/vorbis-tools-1.4.0.patch b/media-sound/vorbis_tools/patches/vorbis_tools-1.4.0.patch
similarity index 100%
rename from media-sound/vorbis_tools/patches/vorbis-tools-1.4.0.patch
rename to media-sound/vorbis_tools/patches/vorbis_tools-1.4.0.patch
diff --git a/media-sound/vorbis_tools/vorbis_tools-1.2.0 b/media-sound/vorbis_tools/vorbis_tools-1.2.0.recipe
similarity index 100%
rename from media-sound/vorbis_tools/vorbis_tools-1.2.0
rename to media-sound/vorbis_tools/vorbis_tools-1.2.0.recipe
diff --git a/media-sound/vorbis_tools/vorbis_tools-1.4.0 b/media-sound/vorbis_tools/vorbis_tools-1.4.0.recipe
similarity index 100%
rename from media-sound/vorbis_tools/vorbis_tools-1.4.0
rename to media-sound/vorbis_tools/vorbis_tools-1.4.0.recipe
diff --git a/media-video/ffmpeg/ffmpeg-0.10.2_vlc b/media-video/ffmpeg/ffmpeg-0.10.2_vlc
deleted file mode 100644
index 75c5d9949..000000000
--- a/media-video/ffmpeg/ffmpeg-0.10.2_vlc
+++ /dev/null
@@ -1,29 +0,0 @@
-DESCRIPTION="FFmpeg is a complete, cross-platform solution to record, convert and stream audio and video. It includes libavcodec - the leading audio/video codec library." 
-HOMEPAGE="http://www.ffmpeg.org" 
-SRC_URI="http://www.ffmpeg.org/releases/ffmpeg-0.10.2.tar.bz2"
-CHECKSUM_MD5="de1bd5fc4bbf3ef730a5361ee596fedd"
-REVISION="1"
-STATUS_HAIKU="stable"
-DEPEND="media-libs/libogg >= 1.3.0
-	media-libs/speex >= 1.2rc1
-	media-libs/libtheora >= 1.1.0
-	media-libs/libvorbis >= 1.3.2
-	media-libs/libvpx >= 1.0.0"
-BUILD()
-{
-	cd ffmpeg-0.10.2
-	./configure --prefix=`finddir B_COMMON_DIRECTORY` --disable-debug --enable-shared \
-		--enable-libvorbis --enable-libspeex --enable-libtheora --enable-libvpx \
-		--enable-gpl --datadir=`finddir B_COMMON_DATA_DIRECTORY`
-	make
-}
-
-INSTALL()
-{
-	cd ffmpeg-0.10.2
-	make install
-}
-
-LICENSE="GNU GPL v2"
-COPYRIGHT="2000-2003 Fabrice Bellard
-	2003-2012 the FFmpeg developers"
diff --git a/media-video/ffmpeg/ffmpeg-0.10.recipe b/media-video/ffmpeg/ffmpeg-0.10.recipe
deleted file mode 100644
index 95f5fe931..000000000
--- a/media-video/ffmpeg/ffmpeg-0.10.recipe
+++ /dev/null
@@ -1,29 +0,0 @@
-DESCRIPTION="FFmpeg is a complete, cross-platform solution to record, convert and stream audio and video. It includes libavcodec - the leading audio/video codec library." 
-HOMEPAGE="http://www.ffmpeg.org" 
-SRC_URI="http://www.ffmpeg.org/releases/ffmpeg-0.10.tar.bz2"
-CHECKSUM_MD5="dc665cc599a739e3c5262ccdac13d129"
-REVISION="1"
-STATUS_HAIKU="stable"
-DEPEND="media-libs/libogg >= 1.3.0
-	media-libs/speex >= 1.2rc1
-	media-libs/libtheora >= 1.1.0
-	media-libs/libvorbis >= 1.3.2
-	media-libs/libvpx >= 1.0.0"
-BUILD()
-{
-	cd ffmpeg-0.10
-	./configure --prefix=`finddir B_COMMON_DIRECTORY` --disable-debug --enable-shared \
-		--enable-libvorbis --enable-libspeex --enable-libtheora --enable-libvpx
-	make
-}
-
-INSTALL()
-{
-	cd ffmpeg-0.10
-	make install
-}
-
-LICENSE="GNU LGPL v2.1
-	GNU GPL v2"
-COPYRIGHT="2000-2003 Fabrice Bellard
-	2003-2012 the FFmpeg developers"
diff --git a/media-video/ffmpeg/patches/ffmpeg-0.10-gcc2.patch b/media-video/ffmpeg/patches/ffmpeg-0.10-gcc2.patch
deleted file mode 100644
index 935cd7276..000000000
--- a/media-video/ffmpeg/patches/ffmpeg-0.10-gcc2.patch
+++ /dev/null
@@ -1,268 +0,0 @@
-diff --git a/cmdutils.c b/cmdutils.c
-index 386db3d..f918600 100644
---- ffmpeg-0.10/cmdutils.c
-+++ ffmpeg-0.10/cmdutils.c
-@@ -89,7 +89,7 @@ static void log_callback_report(void *ptr, int level, const char *fmt, va_list v
-     char line[1024];
-     static int print_prefix = 1;
- 
--    va_copy(vl2, vl);
-+    __va_copy(vl2, vl);
-     av_log_default_callback(ptr, level, fmt, vl);
-     av_log_format_line(ptr, level, fmt, vl2, line, sizeof(line), &print_prefix);
-     va_end(vl2);
-diff --git a/ffmpeg.c b/ffmpeg.c
-index 463e1f4..245e8b5 100644
---- ffmpeg-0.10/ffmpeg.c
-+++ ffmpeg-0.10/ffmpeg.c
-@@ -1247,9 +1247,11 @@ need_realloc:
-                                 av_fifo_size(ost->fifo) / (enc->channels * osize); // FIXME wrong
- 
-     if (ost->audio_resample) {
-+	uint8_t *buftmp2[] = { buftmp };
-+	const uint8_t *buf2[] = { buf };
-         buftmp = audio_buf;
--        size_out = swr_convert(ost->swr, (      uint8_t*[]){buftmp}, audio_buf_size / (enc->channels * osize),
--                                         (const uint8_t*[]){buf   }, size / (dec->channels * isize));
-+        size_out = swr_convert(ost->swr, buftmp2, audio_buf_size / (enc->channels * osize),
-+                                         buf2, size / (dec->channels * isize));
-         size_out = size_out * enc->channels * osize;
-     } else {
-         buftmp = buf;
-diff --git a/ffprobe.c b/ffprobe.c
-index ca6133e..43f9d39 100644
---- ffmpeg-0.10/ffprobe.c
-+++ ffmpeg-0.10/ffprobe.c
-@@ -293,7 +293,9 @@ static void writer_print_time(WriterContext *wctx, const char *key,
-         writer_print_string(wctx, key, "N/A", 1);
-     } else {
-         double d = ts * av_q2d(*time_base);
--        value_string(buf, sizeof(buf), (struct unit_value){.val.d=d, .unit=unit_second_str});
-+	struct unit_value value2 = {.unit=unit_second_str};
-+	value2.val.d = d;
-+        value_string(buf, sizeof(buf), value2);
-         writer_print_string(wctx, key, buf, 0);
-     }
- }
-@@ -1249,8 +1251,8 @@ static void writer_register_all(void)
- #define print_str_opt(k, v)     writer_print_string(w, k, v, 1)
- #define print_time(k, v, tb)    writer_print_time(w, k, v, tb)
- #define print_ts(k, v)          writer_print_ts(w, k, v)
--#define print_val(k, v, u)      writer_print_string(w, k, \
--    value_string(val_str, sizeof(val_str), (struct unit_value){.val.i = v, .unit=u}), 0)
-+#define print_val(k, v, u)      value2.val.i = v; value2.unit=u; writer_print_string(w, k, \
-+    value_string(val_str, sizeof(val_str), value2), 0); 
- #define print_section_header(s) writer_print_section_header(w, s)
- #define print_section_footer(s) writer_print_section_footer(w, s)
- #define show_tags(metadata)     writer_show_tags(w, metadata)
-@@ -1261,6 +1263,7 @@ static void show_packet(WriterContext *w, AVFormatContext *fmt_ctx, AVPacket *pk
-     AVStream *st = fmt_ctx->streams[pkt->stream_index];
-     struct print_buf pbuf = {.s = NULL};
-     const char *s;
-+    struct unit_value value2;
- 
-     print_section_header("packet");
-     s = av_get_media_type_string(st->codec->codec_type);
-@@ -1404,6 +1407,7 @@ static void show_stream(WriterContext *w, AVFormatContext *fmt_ctx, int stream_i
-     const char *s;
-     AVRational display_aspect_ratio;
-     struct print_buf pbuf = {.s = NULL};
-+    struct unit_value value2;
- 
-     print_section_header("stream");
- 
-@@ -1516,6 +1520,7 @@ static void show_format(WriterContext *w, AVFormatContext *fmt_ctx)
- {
-     char val_str[128];
-     int64_t size = fmt_ctx->pb ? avio_size(fmt_ctx->pb) : -1;
-+    struct unit_value value2;
- 
-     print_section_header("format");
-     print_str("filename",         fmt_ctx->filename);
-@@ -1524,9 +1529,9 @@ static void show_format(WriterContext *w, AVFormatContext *fmt_ctx)
-     print_str("format_long_name", fmt_ctx->iformat->long_name);
-     print_time("start_time",      fmt_ctx->start_time, &AV_TIME_BASE_Q);
-     print_time("duration",        fmt_ctx->duration,   &AV_TIME_BASE_Q);
--    if (size >= 0) print_val    ("size", size, unit_byte_str);
-+    if (size >= 0) { print_val    ("size", size, unit_byte_str); }
-     else           print_str_opt("size", "N/A");
--    if (fmt_ctx->bit_rate > 0) print_val    ("bit_rate", fmt_ctx->bit_rate, unit_bit_per_second_str);
-+    if (fmt_ctx->bit_rate > 0) { print_val    ("bit_rate", fmt_ctx->bit_rate, unit_bit_per_second_str); }
-     else                       print_str_opt("bit_rate", "N/A");
-     show_tags(fmt_ctx->metadata);
-     print_section_footer("format");
-diff --git a/libavcodec/aacenc.c b/libavcodec/aacenc.c
-index 55f0286..35d5f1a 100644
---- ffmpeg-0.10/libavcodec/aacenc.c
-+++ ffmpeg-0.10/libavcodec/aacenc.c
-@@ -223,8 +223,9 @@ WINDOW_FUNC(eight_short)
-     const float *pwindow = sce->ics.use_kb_window[1] ? ff_aac_kbd_short_128 : ff_sine_128;
-     const float *in = audio + 448;
-     float *out = sce->ret;
-+	int w;
- 
--    for (int w = 0; w < 8; w++) {
-+    for (w = 0; w < 8; w++) {
-         dsp->vector_fmul        (out, in, w ? pwindow : swindow, 128);
-         out += 128;
-         in  += 128;
-@@ -686,11 +687,12 @@ static av_cold int dsp_init(AVCodecContext *avctx, AACEncContext *s)
- 
- static av_cold int alloc_buffers(AVCodecContext *avctx, AACEncContext *s)
- {
-+	int ch;
-     FF_ALLOCZ_OR_GOTO(avctx, s->buffer.samples, 3 * 1024 * s->channels * sizeof(s->buffer.samples[0]), alloc_fail);
-     FF_ALLOCZ_OR_GOTO(avctx, s->cpe, sizeof(ChannelElement) * s->chan_map[0], alloc_fail);
-     FF_ALLOCZ_OR_GOTO(avctx, avctx->extradata, 5 + FF_INPUT_BUFFER_PADDING_SIZE, alloc_fail);
- 
--    for(int ch = 0; ch < s->channels; ch++)
-+    for(ch = 0; ch < s->channels; ch++)
-         s->planar_samples[ch] = s->buffer.samples + 3 * 1024 * ch;
- 
-     return 0;
-diff --git a/libavutil/pixdesc.c b/libavutil/pixdesc.c
-index e73fbfe..3cde56c 100644
---- ffmpeg-0.10/libavutil/pixdesc.c
-+++ ffmpeg-0.10/libavutil/pixdesc.c
-@@ -1096,12 +1096,6 @@ const AVPixFmtDescriptor av_pix_fmt_descriptors[PIX_FMT_NB] = {
-         .log2_chroma_h = 1,
-         .flags = PIX_FMT_HWACCEL,
-     },
--    [PIX_FMT_VDA_VLD] = {
--        .name = "vda_vld",
--        .log2_chroma_w = 1,
--        .log2_chroma_h = 1,
--        .flags = PIX_FMT_HWACCEL,
--    },
-     [PIX_FMT_GRAY8A] = {
-         .name = "gray8a",
-         .nb_components = 2,
-@@ -1110,16 +1104,6 @@ const AVPixFmtDescriptor av_pix_fmt_descriptors[PIX_FMT_NB] = {
-             { 0, 1, 2, 0, 7 },        /* A */
-         },
-     },
--    [PIX_FMT_GBR24P] = {
--        .name = "gbr24p",
--        .nb_components= 3,
--        .comp = {
--            { 1, 0, 1, 0, 7 },        /* B */
--            { 0, 0, 1, 0, 7 },        /* G */
--            { 2, 0, 1, 0, 7 },        /* R */
--        },
--        .flags = PIX_FMT_PLANAR | PIX_FMT_RGB,
--    },
-     [PIX_FMT_GBRP] = {
-         .name = "gbrp",
-         .nb_components = 3,
-diff --git a/libswscale/swscale_unscaled.c b/libswscale/swscale_unscaled.c
-index e1ba799..3820056 100644
---- ffmpeg-0.10/libswscale/swscale_unscaled.c
-+++ ffmpeg-0.10/libswscale/swscale_unscaled.c
-@@ -370,30 +370,38 @@ static int planarRgbToRgbWrapper(SwsContext *c, const uint8_t* src[], int srcStr
-     }
- 
-     switch (c->dstFormat) {
--        case PIX_FMT_BGR24:
--            gbr24ptopacked24((const uint8_t* []) {src[1], src[0], src[2]}, (int []) {srcStride[1], srcStride[0], srcStride[2]},
-+        case PIX_FMT_BGR24: {
-+            const uint8_t* src2[] =  {src[1], src[0], src[2]};
-+            int srcStride2[] = {srcStride[1], srcStride[0], srcStride[2]};
-+            gbr24ptopacked24(src2, srcStride2,
-                   dst[0] + srcSliceY * dstStride[0], dstStride[0], srcSliceH, c->srcW);
-             break;
--
--        case PIX_FMT_RGB24:
--            gbr24ptopacked24((const uint8_t* []) {src[2], src[0], src[1]}, (int []) {srcStride[2], srcStride[0], srcStride[1]},
-+	}
-+        case PIX_FMT_RGB24: {
-+            const uint8_t* src2[] =  {src[2], src[0], src[1]};
-+            int srcStride2[] = {srcStride[2], srcStride[0], srcStride[1]};
-+            gbr24ptopacked24(src2, srcStride2,
-                   dst[0] + srcSliceY * dstStride[0], dstStride[0], srcSliceH, c->srcW);
-             break;
--
-+	}
-         case PIX_FMT_ARGB:
-             alpha_first = 1;
--        case PIX_FMT_RGBA:
--            gbr24ptopacked32((const uint8_t* []) {src[2], src[0], src[1]}, (int []) {srcStride[2], srcStride[0], srcStride[1]},
-+        case PIX_FMT_RGBA: {
-+            const uint8_t* src2[] =  {src[2], src[0], src[1]};
-+            int srcStride2[] = {srcStride[2], srcStride[0], srcStride[1]};
-+            gbr24ptopacked32(src2, srcStride2,
-                   dst[0] + srcSliceY * dstStride[0], dstStride[0], srcSliceH, alpha_first, c->srcW);
-             break;
--
-+        }
-         case PIX_FMT_ABGR:
-             alpha_first = 1;
--        case PIX_FMT_BGRA:
--            gbr24ptopacked32((const uint8_t* []) {src[1], src[0], src[2]}, (int []) {srcStride[1], srcStride[0], srcStride[2]},
-+        case PIX_FMT_BGRA: {
-+            const uint8_t* src2[] =  {src[1], src[0], src[2]};
-+            int srcStride2[] = {srcStride[1], srcStride[0], srcStride[2]};
-+            gbr24ptopacked32(src2, srcStride2,
-                   dst[0] + srcSliceY * dstStride[0], dstStride[0], srcSliceH, alpha_first, c->srcW);
-             break;
--
-+        }
-         default:
-             av_log(c, AV_LOG_ERROR, "unsupported planar RGB conversion %s -> %s\n",
-                     av_get_pix_fmt_name(c->srcFormat), av_get_pix_fmt_name(c->dstFormat));
-diff --git a/configure b/configure 
---- ffmpeg-0.10/configure       2012-01-26 22:15:59.047710208 +0000
-+++ ffmpeg-0.10-haiku/configure 2012-03-28 22:30:34.330563584 +0000
-@@ -1359,7 +1359,6 @@
- 
- aligned_stack_if_any="ppc x86"
- fast_64bit_if_any="alpha ia64 mips64 parisc64 ppc64 sparc64 x86_64"
--fast_clz_if_any="alpha armv5te avr32 mips ppc x86"
- fast_unaligned_if_any="armv6 ppc x86"
- 
- inline_asm_deps="!tms470"
-@@ -1866,7 +1865,7 @@
- CC_O='-o $@'
- CXX_O='-o $@'
- 
--host_cflags='-D_ISOC99_SOURCE -O3 -g'
-+host_cflags='-D_ISOC99_SOURCE -O2 -g'
- host_libs='-lm'
- 
- target_path='$(CURDIR)'
-@@ -1948,6 +1947,7 @@
- done
- 
- enable $ARCH_EXT_LIST $ALL_TESTS
-+disable sse
- 
- die_unknown(){
-     echo "Unknown option \"$1\"."
-@@ -2144,7 +2144,7 @@
-         CC_DEPFLAGS='-MMD -MF $(@:.o=.d) -MT $@'
-         AS_DEPFLAGS='-MMD -MF $(@:.o=.d) -MT $@'
-     fi
--    speed_cflags='-O3'
-+    speed_cflags='-O2'
-     size_cflags='-Os'
- elif $cc --version 2>/dev/null | grep -q Intel; then
-     cc_type=icc
-@@ -2831,10 +2831,6 @@
- struct { int x; } __attribute__((packed)) x;
- EOF
- 
--check_cc <<EOF && enable attribute_may_alias
--union { int x; } __attribute__((may_alias)) x;
--EOF
--
- check_cc <<EOF || die "endian test failed"
- unsigned int endian = 'B' << 24 | 'I' << 16 | 'G' << 8 | 'E';
- EOF
-@@ -3108,8 +3104,6 @@
- enabled vaapi && require vaapi va/va.h vaInitialize -lva
- 
- check_mathfunc cbrtf
--check_mathfunc exp2
--check_mathfunc exp2f
- check_mathfunc llrint
- check_mathfunc llrintf
- check_mathfunc log2
diff --git a/media-video/gnash/gnash.hvif b/media-video/gnash/additional-files/gnash.hvif
similarity index 100%
rename from media-video/gnash/gnash.hvif
rename to media-video/gnash/additional-files/gnash.hvif
diff --git a/media-video/gnash/mime.zip b/media-video/gnash/additional-files/mime.zip
similarity index 100%
rename from media-video/gnash/mime.zip
rename to media-video/gnash/additional-files/mime.zip
diff --git a/media-video/gnash/gnash-0.recipe b/media-video/gnash/gnash-0.recipe
index f523e4159..88b02a692 100644
--- a/media-video/gnash/gnash-0.recipe
+++ b/media-video/gnash/gnash-0.recipe
@@ -105,7 +105,7 @@ INSTALL()
     done
     strip --strip-debug boot/apps/Gnash/haiku-gnash || true
 
-    xres -o boot/apps/Gnash/haiku-gnash -a VICN:101:BEOS:ICON $ROOTDIR/gnash.hvif
+    xres -o boot/apps/Gnash/haiku-gnash -a VICN:101:BEOS:ICON $ROOTDIR/additional-files/gnash.hvif
 
     popd
 
diff --git a/media-video/vlc/patches/vlc-0.8.6i.patch.old b/media-video/vlc/patches/vlc-0.8.6i.patch.old
deleted file mode 100644
index 852fc33bf..000000000
--- a/media-video/vlc/patches/vlc-0.8.6i.patch.old
+++ /dev/null
@@ -1,529 +0,0 @@
-diff -ur vlc-0.8.6i-original/configure.ac vlc-0.8.6i/configure.ac
---- vlc-0.8.6i-original/configure.ac	2008-07-08 21:59:22.000000000 +0100
-+++ vlc-0.8.6i/configure.ac	2009-11-07 23:47:24.000000000 +0000
-@@ -270,6 +270,12 @@
-         VLC_ADD_LDFLAGS([beos],[-lzeta])
-     fi
-     ;;
-+  haiku)
-+  	SYS=beos
-+    VLC_ADD_CXXFLAGS([beos],[])
-+    VLC_ADD_LDFLAGS([vlc logger],[-lbe])
-+    VLC_ADD_LDFLAGS([beos],[-lbe -lmedia -ltranslation -ltracker -lgame])
-+    ;;
-   *)
-     SYS="${target_os}"
-     ;;
-diff -ur vlc-0.8.6i-original/include/vlc_common.h vlc-0.8.6i/include/vlc_common.h
---- vlc-0.8.6i-original/include/vlc_common.h	2008-07-08 21:59:23.000000000 +0100
-+++ vlc-0.8.6i/include/vlc_common.h	2009-11-08 00:28:56.000000000 +0000
-@@ -898,7 +898,7 @@
- #   define vlc_strtoll NULL
- #endif
- 
--#if defined(SYS_BEOS) \
-+#if defined(SYS_BEOS) && !(defined(__HAIKU__))\
-  || (defined (__FreeBSD__) && (__FreeBSD__ < 5))
-     typedef struct {
-         long long quot; /* Quotient. */
-diff -ur vlc-0.8.6i-original/include/vlc_threads.h vlc-0.8.6i/include/vlc_threads.h
---- vlc-0.8.6i-original/include/vlc_threads.h	2008-07-08 21:59:23.000000000 +0100
-+++ vlc-0.8.6i/include/vlc_threads.h	2009-11-07 23:53:51.000000000 +0000
-@@ -45,7 +45,7 @@
- #elif defined( HAVE_KERNEL_SCHEDULER_H )                             /* BeOS */
- #   include <kernel/OS.h>
- #   include <kernel/scheduler.h>
--#   include <byteorder.h>
-+#   include <ByteOrder.h>
- 
- #elif defined( PTHREAD_COND_T_IN_PTHREAD_H )  /* pthreads (like Linux & BSD) */
- #   include <pthread.h>
-diff -ur vlc-0.8.6i-original/modules/codec/cinepak.c vlc-0.8.6i/modules/codec/cinepak.c
---- vlc-0.8.6i-original/modules/codec/cinepak.c	2008-07-08 21:59:23.000000000 +0100
-+++ vlc-0.8.6i/modules/codec/cinepak.c	2009-11-08 00:57:55.000000000 +0000
-@@ -279,7 +279,7 @@
-                            int i_strip, int i_x, int i_y,
-                            int i_x2, int i_y2, uint8_t *p_data )
- {
--    uint8_t i_index[4];
-+    uint8_t i_index[4], *p_dst_y, *p_dst_u, *p_dst_v;
-     int i,j;
- 
-     size_t y_max = p_context->i_stride[0] * ( i_y + 5 ) + i_x + 5;
-@@ -292,7 +292,7 @@
-     if( y_max >= y_siz || u_max >= u_siz || v_max >= v_siz )
-         return;
- 
--    uint8_t *p_dst_y, *p_dst_u, *p_dst_v;
-+    
- #define PIX_SET_Y( x, y, v ) \
-     p_dst_y[(x) + (y)* p_context->i_stride[0]] = (v);
- 
-@@ -336,7 +336,7 @@
-                            int i_strip, int i_x,  int i_y,
-                            int i_x2, int i_y2, uint8_t *p_data )
- {
--    uint8_t i_index;
-+    uint8_t i_index, *p_dst_y, *p_dst_u, *p_dst_v;
-     int i,j;
- 
-     size_t y_max = p_context->i_stride[0] * ( i_y + 5 ) + i_x + 5;
-@@ -349,7 +349,6 @@
-     if( y_max >= y_siz || u_max >= u_siz || v_max >= v_siz )
-         return;
- 
--    uint8_t *p_dst_y, *p_dst_u, *p_dst_v;
- #define PIX_SET_Y( x, y, v ) \
-     p_dst_y[(x) + (y)* p_context->i_stride[0]] = (v);
-
-diff -ur vlc-0.8.6i-original/modules/codec/telx.c vlc-0.8.6i/modules/codec/telx.c
---- vlc-0.8.6i-original/modules/codec/telx.c	2008-07-08 21:59:23.000000000 +0100
-+++ vlc-0.8.6i/modules/codec/telx.c	2009-11-08 00:59:26.000000000 +0000
-@@ -450,7 +450,7 @@
-     vlc_bool_t b_update = VLC_FALSE;
-     char psz_text[512], *pt = psz_text;
-     char psz_line[256];
--    int i, total;
-+    int i, total, mpag, row, magazine;
- 
-     if( pp_block == NULL || *pp_block == NULL ) return NULL;
-     p_block = *pp_block;
-@@ -473,8 +473,7 @@
- /*         continue; */
- /*       } */
- 
--        int mpag = (hamming_8_4( packet[4] ) << 4) | hamming_8_4( packet[5] );
--        int row, magazine;
-+        mpag = (hamming_8_4( packet[4] ) << 4) | hamming_8_4( packet[5] );
-         if ( mpag < 0 )
-         {
-             /* decode error */
-diff -ur vlc-0.8.6i-original/modules/demux/a52.c vlc-0.8.6i/modules/demux/a52.c
---- vlc-0.8.6i-original/modules/demux/a52.c	2008-07-08 21:59:23.000000000 +0100
-+++ vlc-0.8.6i/modules/demux/a52.c	2009-11-08 01:00:41.000000000 +0000
-@@ -80,7 +80,7 @@
-     demux_t     *p_demux = (demux_t*)p_this;
-     demux_sys_t *p_sys;
-     byte_t      *p_peek;
--    int         i_peek = 0;
-+    int         i_peek = 0, i_size;
-     vlc_bool_t  b_big_endian = 0; /* Arbitrary initialisation */
- 
-     /* Check if we are dealing with a WAV file */
-@@ -104,7 +104,7 @@
- 
-         /* Some A52 wav files don't begin with a sync code so we do a more
-          * extensive search */
--        int i_size = stream_Peek( p_demux->s, &p_peek, i_peek + A52_PACKET_SIZE * 2);
-+        i_size = stream_Peek( p_demux->s, &p_peek, i_peek + A52_PACKET_SIZE * 2);
-         i_size -= (PCM_FRAME_SIZE + A52_MAX_HEADER_SIZE);
- 
-         while( i_peek < i_size )
-diff -ur vlc-0.8.6i-original/modules/demux/dts.c vlc-0.8.6i/modules/demux/dts.c
---- vlc-0.8.6i-original/modules/demux/dts.c	2008-07-08 21:59:23.000000000 +0100
-+++ vlc-0.8.6i/modules/demux/dts.c	2009-11-08 01:01:49.000000000 +0000
-@@ -74,7 +74,8 @@
-     demux_t     *p_demux = (demux_t*)p_this;
-     demux_sys_t *p_sys;
-     byte_t *     p_peek;
--    int          i_peek = 0;
-+    int          i_peek = 0, i_size;
-+    uint32_t	 i_len;
- 
-     /* Check if we are dealing with a WAV file */
-     if( stream_Peek( p_demux->s, &p_peek, 20 ) == 20 &&
-@@ -94,7 +95,7 @@
-         }
- 
-         /* Sanity check the wave format header */
--        uint32_t i_len = GetDWLE( p_peek + i_peek - 4 );
-+        i_len = GetDWLE( p_peek + i_peek - 4 );
-         if( i_len > DTS_PROBE_SIZE )
-             return VLC_EGENERIC;
- 
-@@ -124,7 +125,7 @@
- 
-         /* Some DTS wav files don't begin with a sync code so we do a more
-          * extensive search */
--        int i_size = stream_Peek( p_demux->s, &p_peek, DTS_PROBE_SIZE );
-+        i_size = stream_Peek( p_demux->s, &p_peek, DTS_PROBE_SIZE );
-         i_size -= DTS_MAX_HEADER_SIZE;
- 
-         while( i_peek < i_size )
-diff -ur vlc-0.8.6i-original/modules/gui/beos/InterfaceWindow.cpp vlc-0.8.6i/modules/gui/beos/InterfaceWindow.cpp
---- vlc-0.8.6i-original/modules/gui/beos/InterfaceWindow.cpp	2008-07-08 21:59:23.000000000 +0100
-+++ vlc-0.8.6i/modules/gui/beos/InterfaceWindow.cpp	2009-11-08 01:03:41.000000000 +0000
-@@ -33,7 +33,7 @@
- #include <SupportKit.h>
- #include <malloc.h>
- #include <scsi.h>
--#include <scsiprobe_driver.h>
-+//#include <scsiprobe_driver.h>
- #include <fs_info.h>
- #include <string.h>
- 
-diff -ur vlc-0.8.6i-original/modules/misc/network/ipv6.c vlc-0.8.6i/modules/misc/network/ipv6.c
---- vlc-0.8.6i-original/modules/misc/network/ipv6.c	2008-07-08 21:59:24.000000000 +0100
-+++ vlc-0.8.6i/modules/misc/network/ipv6.c	2009-11-08 01:12:23.000000000 +0000
-@@ -239,6 +239,7 @@
-         return 0;
-     }
- 
-+#ifndef __HAIKU__
-     /* Join the multicast group if the socket is a multicast address */
-     if( IN6_IS_ADDR_MULTICAST(&loc.sin6_addr) )
-     {
-@@ -384,4 +385,5 @@
-     p_socket->i_mtu = val.i_int;
- 
-     return 0;
-+    #endif
- }
-diff -ur vlc-0.8.6i-original/modules/mux/mpeg/ts.c vlc-0.8.6i/modules/mux/mpeg/ts.c
---- vlc-0.8.6i-original/modules/mux/mpeg/ts.c	2008-07-08 21:59:24.000000000 +0100
-+++ vlc-0.8.6i/modules/mux/mpeg/ts.c	2009-11-08 01:15:10.000000000 +0000
-@@ -1719,27 +1719,30 @@
- static block_t *Add_ADTS( block_t *p_data, es_format_t *p_fmt )
- {
-     uint8_t *p_extra = p_fmt->p_extra;
-+	int i_index, i_profile, i_channels, i_fullness;
-+	uint8_t *p_buffer;
-+	block_t *p_bak_block, *p_new_block;
- 
-     if( !p_data || p_fmt->i_extra < 2 || !p_extra )
-         return p_data; /* no data to construct the headers */
- 
--    int i_index = ( (p_extra[0] << 1) | (p_extra[1] >> 7) ) & 0x0f;
--    int i_profile = (p_extra[0] >> 3) - 1; /* i_profile < 4 */
-+    i_index = ( (p_extra[0] << 1) | (p_extra[1] >> 7) ) & 0x0f;
-+    i_profile = (p_extra[0] >> 3) - 1; /* i_profile < 4 */
- 
-     if( i_index == 0x0f && p_fmt->i_extra < 5 )
-         return p_data; /* not enough data */
- 
--    int i_channels = (p_extra[i_index == 0x0f ? 4 : 1] >> 3) & 0x0f;
-+    i_channels = (p_extra[i_index == 0x0f ? 4 : 1] >> 3) & 0x0f;
- 
- #define ADTS_HEADER_SIZE 7 /* CRC needs 2 more bytes */
- 
- 
-     /* keep a copy in case block_Realloc() fails */
--    block_t *p_bak_block = block_Duplicate( p_data );
-+    p_bak_block = block_Duplicate( p_data );
-     if( !p_bak_block ) /* OOM, block_Realloc() is likely to lose our block */
-         return p_data; /* the frame isn't correct but that's the best we have */
- 
--    block_t *p_new_block = block_Realloc( p_data, ADTS_HEADER_SIZE,
-+    p_new_block = block_Realloc( p_data, ADTS_HEADER_SIZE,
-                                             p_data->i_buffer );
-     if( !p_new_block )
-         return p_bak_block; /* OOM, send the (incorrect) original frame */
-@@ -1747,7 +1750,7 @@
-     block_Release( p_bak_block ); /* we don't need the copy anymore */
- 
- 
--    uint8_t *p_buffer = p_new_block->p_buffer;
-+    p_buffer = p_new_block->p_buffer;
- 
-     /* fixed header */
-     p_buffer[0] = 0xff;
-@@ -1757,7 +1760,7 @@
- 
-     /* variable header (starts at last 2 bits of 4th byte) */
- 
--    int i_fullness = 0x7ff; /* 0x7ff means VBR */
-+    i_fullness = 0x7ff; /* 0x7ff means VBR */
-     /* XXX: We should check if it's CBR or VBR, but no known implementation
-      * do that, and it's a pain to calculate this field */
- 
-diff -ur vlc-0.8.6i-original/modules/packetizer/h264.c vlc-0.8.6i/modules/packetizer/h264.c
---- vlc-0.8.6i-original/modules/packetizer/h264.c	2008-07-08 21:59:24.000000000 +0100
-+++ vlc-0.8.6i/modules/packetizer/h264.c	2009-11-08 01:21:24.000000000 +0000
-@@ -219,13 +219,14 @@
-         i_sps = (*p++)&0x1f;
-         for( i = 0; i < i_sps; i++ )
-         {
-+        	block_t *p_sps;
-             uint16_t i_length = GetWBE( p ); p += 2;
-             if( i_length >
-                 (uint8_t*)p_dec->fmt_in.p_extra + p_dec->fmt_in.i_extra - p )
-             {
-                 return VLC_EGENERIC;
-             }
--            block_t *p_sps = nal_get_annexeb( p_dec, p, i_length );
-+            p_sps = nal_get_annexeb( p_dec, p, i_length );
-             if( !p_sps )
-                 return VLC_EGENERIC;
-             p_sys->p_sps = block_Duplicate( p_sps );
-@@ -237,13 +238,14 @@
-         i_pps = *p++;
-         for( i = 0; i < i_pps; i++ )
-         {
-+        	block_t *p_pps;
-             uint16_t i_length = GetWBE( p ); p += 2;
-             if( i_length >
-                 (uint8_t*)p_dec->fmt_in.p_extra + p_dec->fmt_in.i_extra - p )
-             {
-                 return VLC_EGENERIC;
-             }
--            block_t *p_pps = nal_get_annexeb( p_dec, p, i_length );
-+            p_pps = nal_get_annexeb( p_dec, p, i_length );
-             if( !p_pps )
-                 return VLC_EGENERIC;
-             p_sys->p_pps = block_Duplicate( p_pps );
-@@ -446,7 +448,7 @@
- 
-     for( p = p_block->p_buffer; p < &p_block->p_buffer[p_block->i_buffer]; )
-     {
--        block_t *p_pic;
-+        block_t *p_pic, *p_part;
-         int i_size = 0;
-         int i;
- 
-@@ -462,7 +464,7 @@
-             break;
-         }
- 
--        block_t *p_part = nal_get_annexeb( p_dec, p, i_size );
-+        p_part = nal_get_annexeb( p_dec, p, i_size );
-         if( !p_part )
-             break;
-         p_part->i_dts = p_block->i_dts;
-diff -ur vlc-0.8.6i-original/modules/packetizer/mpeg4audio.c vlc-0.8.6i/modules/packetizer/mpeg4audio.c
---- vlc-0.8.6i-original/modules/packetizer/mpeg4audio.c	2008-07-08 21:59:24.000000000 +0100
-+++ vlc-0.8.6i/modules/packetizer/mpeg4audio.c	2009-11-08 01:18:22.000000000 +0000
-@@ -332,6 +332,7 @@
- {
-     int i_profile, i_sample_rate_idx, i_frame_size;
-     vlc_bool_t b_crc;
-+	unsigned short i_raw_blocks_in_frame;
- 
-     /* Fixed header between frames */
-     //int i_id = ( (p_buf[1] >> 3) & 0x01) ? 2 : 4; /* MPEG-2 or 4 */
-@@ -350,7 +351,7 @@
-     i_frame_size = ((p_buf[3] & 0x03) << 11) | (p_buf[4] << 3) |
-                    ((p_buf[5] >> 5) /*& 0x7*/);
-     //uint16_t buffer_fullness = ((p_buf[5] & 0x1f) << 6) | (p_buf[6] >> 2);
--    unsigned short i_raw_blocks_in_frame = p_buf[6] & 0x03;
-+    i_raw_blocks_in_frame = p_buf[6] & 0x03;
- 
-     if( !*pi_sample_rate || !*pi_channels || !i_frame_size )
-     {
-@@ -436,15 +437,16 @@
- {
-     /* TODO compute channels count ? */
-     int i_tag = bs_read( s, 4 );
--    if( i_tag != 0x05 )
--        return -1;
--    bs_skip( s, 2 + 4 ); // object type + sampling index
-     int i_num_front = bs_read( s, 4 );
-     int i_num_side = bs_read( s, 4 );
-     int i_num_back = bs_read( s, 4 );
-     int i_num_lfe = bs_read( s, 2 );
-     int i_num_assoc_data = bs_read( s, 3 );
-     int i_num_valid_cc = bs_read( s, 4 );
-+    int i_comment;
-+    if( i_tag != 0x05 )
-+        return -1;
-+    bs_skip( s, 2 + 4 ); // object type + sampling index
- 
-     if( bs_read1(s) )
-         bs_skip( s, 4 ); // mono downmix
-@@ -460,19 +462,20 @@
-     bs_skip( s, i_num_assoc_data * (4) );
-     bs_skip( s, i_num_valid_cc * (5) );
-     bs_align( s );
--    int i_comment = bs_read( s, 8 );
-+    i_comment = bs_read( s, 8 );
-     bs_skip( s, i_comment * 8 );
-     return 0;
- }
- 
- static int Mpeg4GASpecificConfig( mpeg4_cfg_t *p_cfg, bs_t *s )
- {
-+	int i_extension_flag;
-     p_cfg->i_frame_length = bs_read1(s) ? 960 : 1024;
- 
-     if( bs_read1( s ) )     // depend on core coder
-         bs_skip( s, 14 );   // core coder delay
- 
--    int i_extension_flag = bs_read1( s );
-+    i_extension_flag = bs_read1( s );
-     if( p_cfg->i_channel == 0 )
-     {
-         Mpeg4GAProgramConfigElement( s );
-diff -ur vlc-0.8.6i-original/modules/stream_out/mosaic_bridge.c vlc-0.8.6i/modules/stream_out/mosaic_bridge.c
---- vlc-0.8.6i-original/modules/stream_out/mosaic_bridge.c	2008-07-08 21:59:24.000000000 +0100
-+++ vlc-0.8.6i/modules/stream_out/mosaic_bridge.c	2009-11-08 01:22:30.000000000 +0000
-@@ -339,11 +339,12 @@
- 
-     if ( p_sys->p_decoder != NULL )
-     {
-+    	void *p_owner;
-         picture_t **pp_ring = p_sys->p_decoder->p_owner->pp_pics;
- 
-         if( p_sys->p_decoder->p_module )
-             module_Unneed( p_sys->p_decoder, p_sys->p_decoder->p_module );
--        void *p_owner = p_sys->p_decoder->p_owner;
-+        p_owner = p_sys->p_decoder->p_owner;
-         vlc_object_detach( p_sys->p_decoder );
-         vlc_object_destroy( p_sys->p_decoder );
- 
-diff -ur vlc-0.8.6i-original/modules/stream_out/switcher.c vlc-0.8.6i/modules/stream_out/switcher.c
---- vlc-0.8.6i-original/modules/stream_out/switcher.c	2008-07-08 21:59:24.000000000 +0100
-+++ vlc-0.8.6i/modules/stream_out/switcher.c	2009-11-08 01:23:24.000000000 +0000
-@@ -657,8 +657,9 @@
- 
-     if ( i_len > 0 )
-     {
-+		int i_cmd;
-         psz_buffer[i_len] = '\0';
--        int i_cmd = strtol( psz_buffer, NULL, 0 );
-+        i_cmd = strtol( psz_buffer, NULL, 0 );
-         if ( i_cmd < -1 || i_cmd > p_sys->i_nb_pictures )
-         {
-             msg_Err( p_stream, "got a wrong command (%d)", i_cmd );
-diff -ur vlc-0.8.6i-original/src/extras/libc.c vlc-0.8.6i/src/extras/libc.c
---- vlc-0.8.6i-original/src/extras/libc.c	2008-07-08 22:08:36.000000000 +0100
-+++ vlc-0.8.6i/src/extras/libc.c	2009-11-08 00:44:49.000000000 +0000
-@@ -348,7 +348,7 @@
- /*****************************************************************************
-  * lldiv: returns quotient and remainder
-  *****************************************************************************/
--#if defined(SYS_BEOS) \
-+#if defined(SYS_BEOS) & !(defined(__HAIKU__))\
-  || (defined (__FreeBSD__) && (__FreeBSD__ < 5))
- lldiv_t vlc_lldiv( long long numer, long long denom )
- {
-diff -ur vlc-0.8.6i-original/src/input/input.c vlc-0.8.6i/src/input/input.c
---- vlc-0.8.6i-original/src/input/input.c	2008-07-08 22:08:36.000000000 +0100
-+++ vlc-0.8.6i/src/input/input.c	2009-11-08 00:30:10.000000000 +0000
-@@ -1913,11 +1913,11 @@
-     {
-         vlc_meta_t *tk = p_meta->track[i];
-         int j;
-+        char *psz_cat;
- 
-         if( tk->i_meta > 0 )
-         {
-             msg_Dbg( p_input, "  - track[%d]:", i );
--            char *psz_cat;
-             if( asprintf( &psz_cat, "%s %d", _("Stream"), i ) != -1 )
-             {
-                 for( j = 0; j < tk->i_meta; j++ )
-diff -ur vlc-0.8.6i-original/src/misc/beos_specific.cpp vlc-0.8.6i/src/misc/beos_specific.cpp
---- vlc-0.8.6i-original/src/misc/beos_specific.cpp	2008-07-08 22:08:36.000000000 +0100
-+++ vlc-0.8.6i/src/misc/beos_specific.cpp	2009-11-09 18:46:51.000000000 +0000
-@@ -154,7 +154,7 @@
- {
-     BAlert *alert;
-     alert = new BAlert( "VLC " PACKAGE_VERSION,
--                        "VLC " PACKAGE_VERSION " for BeOS\n\n"
-+                        "VLC " PACKAGE_VERSION " for Haiku\n\n"
-                                         "<www.videolan.org>", "OK");
-     alert->Go( NULL );
- }
-diff -ur vlc-0.8.6i-original/src/misc/threads.c vlc-0.8.6i/src/misc/threads.c
---- vlc-0.8.6i-original/src/misc/threads.c	2008-07-08 22:08:36.000000000 +0100
-+++ vlc-0.8.6i/src/misc/threads.c	2009-11-08 17:02:02.000000000 +0000
-@@ -647,6 +647,7 @@
- int __vlc_thread_set_priority( vlc_object_t *p_this, char * psz_file,
-                                int i_line, int i_priority )
- {
-+/*
- #if defined( PTH_INIT_IN_PTH_H ) || defined( ST_INIT_IN_ST_H )
- #elif defined( WIN32 ) || defined( UNDER_CE )
-     if( !SetThreadPriority(GetCurrentThread(), i_priority) )
-@@ -689,7 +690,7 @@
-         }
-     }
- #endif
--
-+*/
-     return 0;
- }
- 
-@@ -790,3 +791,7 @@
-     p_this->b_thread = 0;
- }
- 
-+
-+
-+
-+
-Only in vlc-0.8.6i-original/src/misc: version.c
-diff -ur vlc-0.8.6i-original/src/misc/vlm.c vlc-0.8.6i/src/misc/vlm.c
---- vlc-0.8.6i-original/src/misc/vlm.c	2008-07-08 22:08:36.000000000 +0100
-+++ vlc-0.8.6i/src/misc/vlm.c	2009-11-08 00:42:59.000000000 +0000
-@@ -1368,10 +1368,11 @@
- 
- vlm_schedule_t *vlm_ScheduleNew( vlm_t *vlm, const char *psz_name )
- {
-+	vlm_schedule_t *p_sched;
-     if( !psz_name )
-         return NULL;
- 
--    vlm_schedule_t *p_sched = malloc( sizeof( vlm_schedule_t ) );
-+    p_sched = malloc( sizeof( vlm_schedule_t ) );
-     if( !p_sched )
-         return NULL;
- 
-diff -ur vlc-0.8.6i-original/src/network/httpd.c vlc-0.8.6i/src/network/httpd.c
---- vlc-0.8.6i-original/src/network/httpd.c	2008-07-08 22:08:36.000000000 +0100
-+++ vlc-0.8.6i/src/network/httpd.c	2009-11-08 00:33:09.000000000 +0000
-@@ -365,7 +365,7 @@
- static int httpd_FileCallBack( httpd_callback_sys_t *p_sys, httpd_client_t *cl, httpd_message_t *answer, httpd_message_t *query )
- {
-     httpd_file_t *file = (httpd_file_t*)p_sys;
--    uint8_t **pp_body, *p_body;
-+    uint8_t **pp_body, *p_body, *psz_args;
-     char *psz_connection = NULL;
-     int *pi_body, i_body;
- 
-@@ -402,7 +402,7 @@
-         /* msg_Warn not supported */
-     }
- 
--    uint8_t *psz_args = query->psz_args;
-+    psz_args = query->psz_args;
-     file->pf_fill( file->p_sys, file, psz_args, pp_body, pi_body );
- 
-     if( query->i_type == HTTPD_MSG_HEAD && p_body != NULL )
-@@ -487,6 +487,7 @@
- {
-     httpd_handler_t *handler = (httpd_handler_t*)p_sys;
-     char psz_remote_addr[NI_MAXNUMERICHOST];
-+    uint8_t *psz_args;
- 
-     if( answer == NULL || query == NULL )
-     {
-@@ -502,7 +503,7 @@
-     if( httpd_ClientIP( cl, psz_remote_addr ) == NULL )
-         *psz_remote_addr = '\0';
- 
--    uint8_t *psz_args = query->psz_args;
-+    psz_args = query->psz_args;
-     handler->pf_fill( handler->p_sys, handler, query->psz_url, psz_args,
-                       query->i_type, query->p_body, query->i_body,
-                       psz_remote_addr, NULL,
-diff -ur vlc-0.8.6i-original/src/stream_output/sap.c vlc-0.8.6i/src/stream_output/sap.c
---- vlc-0.8.6i-original/src/stream_output/sap.c	2008-07-08 22:08:36.000000000 +0100
-+++ vlc-0.8.6i/src/stream_output/sap.c	2009-11-08 01:26:17.000000000 +0000
-@@ -287,7 +287,8 @@
- 
-             memcpy( a6->s6_addr + 2, "\x00\x00\x00\x00\x00\x00"
-                    "\x00\x00\x00\x00\x00\x02\x7f\xfe", 14 );
--            if( IN6_IS_ADDR_MULTICAST( a6 ) )
-+        #ifndef __HAIKU__ 
-+           if( IN6_IS_ADDR_MULTICAST( a6 ) )
-             {
-                 /* SSM <=> ff3x::/32 */
-                 b_ssm = (U32_AT (a6->s6_addr) & 0xfff0ffff) == 0xff300000;
-@@ -301,6 +302,7 @@
- 
-             b_ipv6 = VLC_TRUE;
-             break;
-+        #endif
-         }
- #endif
- 
diff --git a/media-video/vlc/vlc-1.1.5_20101107 b/media-video/vlc/vlc-1.1.5_20101107.recipe
similarity index 100%
rename from media-video/vlc/vlc-1.1.5_20101107
rename to media-video/vlc/vlc-1.1.5_20101107.recipe
diff --git a/net-irc/rhapsody_irc/patches/rhapsody-irc-0.28b.patch b/net-irc/rhapsody_irc/patches/rhapsody_irc-0.28b.patch
similarity index 100%
rename from net-irc/rhapsody_irc/patches/rhapsody-irc-0.28b.patch
rename to net-irc/rhapsody_irc/patches/rhapsody_irc-0.28b.patch
diff --git a/net-irc/rhapsody_irc/rhapsody_irc-0.28b b/net-irc/rhapsody_irc/rhapsody_irc-0.28b.recipe
similarity index 100%
rename from net-irc/rhapsody_irc/rhapsody_irc-0.28b
rename to net-irc/rhapsody_irc/rhapsody_irc-0.28b.recipe
diff --git a/net-libs/hubbub/hubbub-0.1.2_HEAD b/net-libs/hubbub/hubbub-0.1.2_HEAD.recipe
similarity index 100%
rename from net-libs/hubbub/hubbub-0.1.2_HEAD
rename to net-libs/hubbub/hubbub-0.1.2_HEAD.recipe
diff --git a/net-p2p/seeks/seeks-0.x_git b/net-p2p/seeks/seeks-0.x_git.recipe
similarity index 100%
rename from net-p2p/seeks/seeks-0.x_git
rename to net-p2p/seeks/seeks-0.x_git.recipe
diff --git a/net-wireless/b43_fwcutter/b43_fwcutter-012 b/net-wireless/b43_fwcutter/b43_fwcutter-012.recipe
similarity index 100%
rename from net-wireless/b43_fwcutter/b43_fwcutter-012
rename to net-wireless/b43_fwcutter/b43_fwcutter-012.recipe
diff --git a/net-wireless/b43_fwcutter/patches/b43-fwcutter-012.patch b/net-wireless/b43_fwcutter/patches/b43_fwcutter-012.patch
similarity index 100%
rename from net-wireless/b43_fwcutter/patches/b43-fwcutter-012.patch
rename to net-wireless/b43_fwcutter/patches/b43_fwcutter-012.patch
diff --git a/sys-apps/dtc/dtc-1.3.0_git b/sys-apps/dtc/dtc-1.3.0_git.recipe
similarity index 100%
rename from sys-apps/dtc/dtc-1.3.0_git
rename to sys-apps/dtc/dtc-1.3.0_git.recipe
diff --git a/sys-apps/dtc/patches/dtc-1.3.0-git.patch b/sys-apps/dtc/patches/dtc-1.3.0_git.patch
similarity index 100%
rename from sys-apps/dtc/patches/dtc-1.3.0-git.patch
rename to sys-apps/dtc/patches/dtc-1.3.0_git.patch
diff --git a/sys-apps/hgrep/hgrep b/sys-apps/hgrep/hgrep
deleted file mode 100755
index 356dec164..000000000
--- a/sys-apps/hgrep/hgrep
+++ /dev/null
@@ -1,10 +0,0 @@
-#!/bin/sh
-
-#
-# Copyright 2011, Haiku, Inc. All Rights Reserved.
-# Distributed under the terms of the MIT License.
-#
-
-find $(finddir B_COMMON_DEVELOP_DIRECTORY)/headers -type f -print0 | xargs -0 egrep "$@"
-
-# TODO add other header directories to search?
diff --git a/sys-apps/lgrep/lgrep b/sys-apps/lgrep/lgrep
deleted file mode 100755
index aa9a00c41..000000000
--- a/sys-apps/lgrep/lgrep
+++ /dev/null
@@ -1,50 +0,0 @@
-#!/bin/sh
-
-#
-# Copyright 2011, Haiku, Inc. All Rights Reserved.
-# Distributed under the terms of the MIT License.
-#
-
-usage() {
-	echo `basename $0` \[-V\] \<symbol\>
-	echo \- list files containing \<symbol\>
-	echo "  -V lists also directories searched"
-	echo ""
-	echo `basename $0` -h
-	echo \- Show this help
-	exit 0
-}
-
-if [ "$1" == "-V" ]; then
-	VERBOSE=1
-	shift
-else
-	VERBOSE=0
-fi
-
-if [ "$1" == "-h" ]; then
-	usage
-fi
-
-if [ "x$1" == "x" ]; then
-	usage
-fi
-
-LPATH=`echo $LIBRARY_PATH|sed "s|%A/lib:||"`
-[ -d ./lib ] && LPATH="./lib:$LPATH" || true
-LPATH=`echo $LPATH|sed "s/:/ /g"`
-TEMPFILE=/boot/var/tmp/`basename $0`.$PPID
-for libdir in `echo $LPATH`; do
-	if [ "$VERBOSE" == "1" ]; then
-		echo Searching in \"$libdir\"...
-	fi
-	for lib in $libdir/*.so ; do
-		echo "[ $lib ]" > $TEMPFILE
-		(nm -D $lib 2>/dev/null)|grep $1 >> $TEMPFILE
-		LINES=`wc -l $TEMPFILE | awk '{ print $1; }'`
-		if [ "$LINES" != "1" ]; then 
-		 	cat $TEMPFILE
-		fi
-	done
-done
-rm -f $TEMPFILE
diff --git a/sys-fs/e2fsprogs/e2fsprogs-1.43_git b/sys-fs/e2fsprogs/e2fsprogs-1.43_git.recipe
similarity index 100%
rename from sys-fs/e2fsprogs/e2fsprogs-1.43_git
rename to sys-fs/e2fsprogs/e2fsprogs-1.43_git.recipe
diff --git a/sys-fs/e2fsprogs/patches/e2fsprogs-1.43-git.patch b/sys-fs/e2fsprogs/patches/e2fsprogs-1.43_git.patch
similarity index 100%
rename from sys-fs/e2fsprogs/patches/e2fsprogs-1.43-git.patch
rename to sys-fs/e2fsprogs/patches/e2fsprogs-1.43_git.patch
diff --git a/www-client/netsurf/netsurf-2.7_svn b/www-client/netsurf/netsurf-2.7_svn.recipe
similarity index 100%
rename from www-client/netsurf/netsurf-2.7_svn
rename to www-client/netsurf/netsurf-2.7_svn.recipe
diff --git a/x11-libs/libX11/libX11.OptionalPackageDescription b/x11-libs/libX11/libX11.OptionalPackageDescription
deleted file mode 100644
index 0c9217176..000000000
--- a/x11-libs/libX11/libX11.OptionalPackageDescription
+++ /dev/null
@@ -1,65 +0,0 @@
-Package:	libx11
-Version:	1.3.3
-Copyright:	2009 X.Org Foundation
-License:	MIT
-URL:		http://www.x.org/releases/individual/lib/
-
-Package:	util-macros
-Version:	1.7.0
-Copyright:	2005-2006 Sun Microsystems, Inc. 2009 X.Org Foundation.
-License:	MIT
-URL:		http://www.x.org/releases/individual/util/
-
-Package:	xproto
-Version:	7.0.16
-Copyright:	2009 X.Org Foundation
-License:	MIT
-URL:		http://xorg.freedesktop.org/releases/individual/proto/
-
-Package:	inputproto
-Version:	2.0
-Copyright:	2009 X.Org Foundation
-License:	MIT
-URL:		http://xorg.freedesktop.org/releases/individual/proto/
-
-Package:	kbproto
-Version:	1.0.4
-Copyright:	2009 X.Org Foundation
-License:	MIT
-URL:		http://xorg.freedesktop.org/releases/individual/proto/
-
-Package:	xtrans
-Version:	1.2.5
-Copyright:	2009 X.Org Foundation
-License:	MIT
-URL:		http://xorg.freedesktop.org/releases/individual/lib/
-
-Package:	libxcb
-Version:	1.6
-Copyright:	2001-2006 Bart Massey, Jamey Sharp, and Josh Triplett.
-License:	MIT
-URL:		http://xcb.freedesktop.org
-
-Package:	xcb-proto
-Version:	1.6
-Copyright:	2001-2006 Bart Massey, Jamey Sharp, and Josh Triplett.
-License:	MIT
-URL:		http://xcb.freedesktop.org
-
-Package:	libxslt
-Version:	1.1.24
-Copyright:	2001-2002 Daniel Veillard.
-License:	MIT
-URL:		http://xmlsoft.org/XSLT/
-
-Package:	libptread-stubs
-Version:	0.3
-Copyright:	2001-2006 Bart Massey, Jamey Sharp, and Josh Triplett.
-License:	MIT
-URL:		http://xcb.freedesktop.org
-
-Package:	libxau
-Version:	1.0.5
-Copyright:	2009 X.Org Foundation
-License:	MIT
-URL:		http://xorg.freedesktop.org/releases/individual/lib/
diff --git a/x11-libs/pixman/patches/pixman-0.19-master.patch b/x11-libs/pixman/patches/pixman-0.19_master.patch
similarity index 100%
rename from x11-libs/pixman/patches/pixman-0.19-master.patch
rename to x11-libs/pixman/patches/pixman-0.19_master.patch
diff --git a/x11-libs/pixman/patches/pixman-patch-2009-03-06.diff b/x11-libs/pixman/patches/pixman-patch-2009-03-06.diff
deleted file mode 100644
index a40ebecad..000000000
--- a/x11-libs/pixman/patches/pixman-patch-2009-03-06.diff
+++ /dev/null
@@ -1,10 +0,0 @@
-diff --git a/autogen.sh b/autogen.sh
-index 904cd67..354f254 100755
---- a/autogen.sh
-+++ b/autogen.sh
-@@ -9,4 +9,4 @@ cd $srcdir
- autoreconf -v --install || exit 1
- cd $ORIGDIR || exit $?
- 
--$srcdir/configure --enable-maintainer-mode "$@"
-+$srcdir/configure "$@"
diff --git a/x11-libs/pixman/pixman-0.19_master b/x11-libs/pixman/pixman-0.19_master.recipe
similarity index 100%
rename from x11-libs/pixman/pixman-0.19_master
rename to x11-libs/pixman/pixman-0.19_master.recipe
diff --git a/x11-misc/shared_mime_info/shared_mime_info-1.0 b/x11-misc/shared_mime_info/shared_mime_info-1.0.recipe
similarity index 100%
rename from x11-misc/shared_mime_info/shared_mime_info-1.0
rename to x11-misc/shared_mime_info/shared_mime_info-1.0.recipe
diff --git a/x11-misc/util_macros/util_macros-1.17.0_git b/x11-misc/util_macros/util_macros-1.17.0_git.recipe
similarity index 100%
rename from x11-misc/util_macros/util_macros-1.17.0_git
rename to x11-misc/util_macros/util_macros-1.17.0_git.recipe
diff --git a/x11-misc/util_macros/util_macros-1.7.0 b/x11-misc/util_macros/util_macros-1.7.0.recipe
similarity index 100%
rename from x11-misc/util_macros/util_macros-1.7.0
rename to x11-misc/util_macros/util_macros-1.7.0.recipe
diff --git a/x11-proto/xcb_proto/xcb_proto-1.6 b/x11-proto/xcb_proto/xcb_proto-1.6.recipe
similarity index 100%
rename from x11-proto/xcb_proto/xcb_proto-1.6
rename to x11-proto/xcb_proto/xcb_proto-1.6.recipe
diff --git a/x11-proto/xproto/patches/xproto-7.0.23-git.patch b/x11-proto/xproto/patches/xproto-7.0.23_git.patch
similarity index 100%
rename from x11-proto/xproto/patches/xproto-7.0.23-git.patch
rename to x11-proto/xproto/patches/xproto-7.0.23_git.patch
diff --git a/x11-proto/xproto/xproto-7.0.23_git b/x11-proto/xproto/xproto-7.0.23_git.recipe
similarity index 100%
rename from x11-proto/xproto/xproto-7.0.23_git
rename to x11-proto/xproto/xproto-7.0.23_git.recipe