diff --git a/FormatVersions b/FormatVersions
new file mode 100644
index 000000000..313ad77a1
--- /dev/null
+++ b/FormatVersions
@@ -0,0 +1,2 @@
+# contains the format versions used by this ports tree
+RecipeFormatVersion=1
diff --git a/app-admin/pwgen/pwgen-2.06.recipe b/app-admin/pwgen/pwgen-2.06.recipe
index 0867248af..f17975be6 100644
--- a/app-admin/pwgen/pwgen-2.06.recipe
+++ b/app-admin/pwgen/pwgen-2.06.recipe
@@ -17,7 +17,7 @@ able to 'shoulder surf' the user's chosen password.
 "
 HOMEPAGE="http://sourceforge.net/projects/pwgen" 
 SRC_URI="http://sourceforge.net/projects/pwgen/files/pwgen/2.06/pwgen-2.06.tar.gz"
-CHECKSUM_MD5="935aebcbe610fbc9de8125e7b7d71297"
+CHECKSUM_SHA256="61598c9e3a0f7eb2e7367d4ecc71522c4f16a7d41ed31db29e3afee8d9843454"
 REVISION="1"
 ARCHITECTURES="x86 x86_gcc2 x86_64"
 COPYRIGHT="2001-2006 by Theodore Ts'o
diff --git a/app-arch/arc/arc-5.21p.recipe b/app-arch/arc/arc-5.21p.recipe
index 3907001cd..ec7f29b62 100644
--- a/app-arch/arc/arc-5.21p.recipe
+++ b/app-arch/arc/arc-5.21p.recipe
@@ -6,7 +6,7 @@ HOMEPAGE="http://arc.sourceforge.net/"
 LICENSE="GNU GPL v2"
 COPYRIGHT="1985-2009 Thom Henderson"
 SRC_URI="http://sourceforge.net/projects/arc/files/arc/arc-5.21p/arc-5.21p.tar.gz"
-CHECKSUM_MD5="902ce24b23422880d474df6f1d9eba5e"
+CHECKSUM_SHA256="eacf870a245f155a4ba8c6f8e0fbb2e8a267aafa157f56ba7a8cb1d74fd8b5a1"
 REVISION="1"
 ARCHITECTURES="x86 ?x86_gcc2 ?x86_64"
 
diff --git a/app-arch/bzip2/bzip2-1.0.6.recipe b/app-arch/bzip2/bzip2-1.0.6.recipe
index 3954ef3b3..b6b8b6462 100644
--- a/app-arch/bzip2/bzip2-1.0.6.recipe
+++ b/app-arch/bzip2/bzip2-1.0.6.recipe
@@ -10,9 +10,9 @@ HOMEPAGE="http://www.bzip.org/"
 LICENSE="bzip2"
 COPYRIGHT="1996-2010 Julian R Seward"
 SRC_URI="http://www.bzip.org/1.0.6/bzip2-1.0.6.tar.gz"
-CHECKSUM_MD5="00b516f4704d4a7cb50a1d97e6e8e15b"
+CHECKSUM_SHA256="a2848f34fcd5d6cf47def00461fcb528a0484d8edef8208d6d2e2909dc61d9cd"
 REVISION="5"
-ARCHITECTURES="x86_gcc2 x86 x86_64"
+ARCHITECTURES="x86_gcc2 x86 x86_64 arm"
 SECONDARY_ARCHITECTURES="x86 x86_gcc2"
 
 PROVIDES="
diff --git a/app-arch/cabextract/cabextract-1.4.recipe b/app-arch/cabextract/cabextract-1.4.recipe
index 9379fb165..0c6466083 100644
--- a/app-arch/cabextract/cabextract-1.4.recipe
+++ b/app-arch/cabextract/cabextract-1.4.recipe
@@ -9,7 +9,7 @@ HOMEPAGE="http://www.cabextract.org.uk"
 LICENSE="GNU GPL v2"
 COPYRIGHT="2000-2011 Stuart Caie"
 SRC_URI="http://www.cabextract.org.uk/cabextract-1.4.tar.gz"
-CHECKSUM_MD5="79f41f568cf1a3ac105e0687e8bfb7c0"
+CHECKSUM_SHA256="f7ba8ba2c2d71912846eaaa2bed9200a7722ef0addeec32db7471c350a48e41e"
 REVISION="1"
 ARCHITECTURES="x86 ?x86_gcc2 ?x86_64"
 
diff --git a/app-arch/cpio/cpio-2.10.recipe b/app-arch/cpio/cpio-2.10.recipe
index a5c32ef12..a1d3caf2b 100644
--- a/app-arch/cpio/cpio-2.10.recipe
+++ b/app-arch/cpio/cpio-2.10.recipe
@@ -15,7 +15,7 @@ HOMEPAGE="http://www.gnu.org/software/cpio/cpio.html"
 COPYRIGHT="1988-2009 Free Software Foundation, Inc."
 LICENSE="GNU GPL v3"
 SRC_URI="http://ftp.gnu.org/gnu/cpio/cpio-2.10.tar.gz"
-CHECKSUM_MD5="351ab3d38d8949913e478cc23b9d6ad4"
+CHECKSUM_SHA256="2a2da2dbb741a75b9a374ceca46036ac3f3c3698e3756b9e3cd44edac8536ba5"
 REVISION="1"
 ARCHITECTURES="x86 ?x86_gcc2"
 
@@ -35,10 +35,7 @@ BUILD_REQUIRES="
 	"
 
 BUILD_PREREQUIRES="
-#	cmd:aclocal
-#	cmd:autoconf
-#	cmd:gettext
-#	cmd:libtoolize
+	cmd:awk
 	cmd:make
 	cmd:gcc
 	cmd:ld
diff --git a/app-arch/fastjar/fastjar-0.98.recipe b/app-arch/fastjar/fastjar-0.98.recipe
index 3b1efc106..3ed7d949d 100644
--- a/app-arch/fastjar/fastjar-0.98.recipe
+++ b/app-arch/fastjar/fastjar-0.98.recipe
@@ -10,7 +10,7 @@ LICENSE="GNU GPL v2"
 COPYRIGHT="1999-2001 Bryan Burns, Cory Jon Hollingsworth, Matthias Klose (documentation)
 	2007-2009  Dalibor Topic"
 SRC_URI="http://download.savannah.gnu.org/releases/fastjar/fastjar-0.98.tar.gz"
-CHECKSUM_MD5="d2d264d343d4d0e1575832cc1023c3bf"
+CHECKSUM_SHA256="f156abc5de8658f22ee8f08d7a72c88f9409ebd8c7933e9466b0842afeb2f145"
 REVISION="1"
 ARCHITECTURES="x86 ?x86_gcc2 ?x86_64"
 
diff --git a/app-arch/ha/ha-0999.recipe b/app-arch/ha/ha-0999.recipe
index f6de020b6..0b7d0d31e 100644
--- a/app-arch/ha/ha-0999.recipe
+++ b/app-arch/ha/ha-0999.recipe
@@ -6,8 +6,8 @@ LICENSE="GNU GPL v2"
 COPYRIGHT="1993-1995 Harri Hirvola"
 HOMEPAGE="https://code.google.com/p/ak-various-projects/"
 SRC_URI="https://ak-various-projects.googlecode.com/files/ha0999.tgz"
+CHECKSUM_SHA256="641417d256f645c92fe1ee042b9c133b5173d33d540af99ed4932f7d79a30228"
 REVISION="1"
-CHECKSUM_MD5="77f3266a451712bec55d60df67f61486"
 ARCHITECTURES="x86 ?x86_gcc2 ?x86_64"
 
 PROVIDES="
diff --git a/app-arch/lha/lha-1.14i.recipe b/app-arch/lha/lha-1.14i.recipe
index 43949775d..340107828 100644
--- a/app-arch/lha/lha-1.14i.recipe
+++ b/app-arch/lha/lha-1.14i.recipe
@@ -8,7 +8,7 @@ COPYRIGHT="1991, Masaru Oki
 	2000, Tsugio Okamoto et al."
 HOMEPAGE="http://sourceforge.jp/projects/lha/" 
 SRC_URI="http://jaist.dl.sourceforge.jp/lha/22231/lha-1.14i-ac20050924p1.tar.gz"
-CHECKSUM_MD5="9f52430410928ba4390a73a41a36d56f"
+CHECKSUM_SHA256="b5261e9f98538816aa9e64791f23cb83f1632ecda61f02e54b6749e9ca5e9ee4"
 REVISION="1"
 ARCHITECTURES="x86 ?x86_gcc2 ?x86_64"
 
diff --git a/app-arch/libarchive/libarchive-3.1.2.recipe b/app-arch/libarchive/libarchive-3.1.2.recipe
index 87a6faefa..1e2e9d781 100644
--- a/app-arch/libarchive/libarchive-3.1.2.recipe
+++ b/app-arch/libarchive/libarchive-3.1.2.recipe
@@ -24,7 +24,7 @@ LICENSE="BSD (2-clause)"
 COPYRIGHT="2003-2013 Tim Kientzle"
 HOMEPAGE="http://www.libarchive.org/"
 SRC_URI="http://www.libarchive.org/downloads/libarchive-3.1.2.tar.gz"
-CHECKSUM_MD5="efad5a503f66329bb9d2f4308b5de98a"
+CHECKSUM_SHA256="eb87eacd8fe49e8d90c8fdc189813023ccc319c5e752b01fb6ad0cc7b2c53d5e"
 REVISION="1"
 ARCHITECTURES="x86"
 if [ $effectiveTargetArchitecture != x86_gcc2 ]; then
diff --git a/app-arch/lz4/lz4-r117.recipe b/app-arch/lz4/lz4-r117.recipe
new file mode 100644
index 000000000..d515d5dac
--- /dev/null
+++ b/app-arch/lz4/lz4-r117.recipe
@@ -0,0 +1,69 @@
+SUMMARY="lz4 data compression utilities and libraries"
+DESCRIPTION="
+LZ4 is a very fast lossless compression algorithm, providing compression speed \
+at 400 MB/s per core, scalable with multi-cores CPU. It also features an \
+extremely fast decoder, with speed in multiple GB/s per core, typically \
+reaching RAM speed limits on multi-core systems.
+"
+HOMEPAGE="https://code.google.com/p/lz4/"
+LICENSE="BSD (2-clause)"
+COPYRIGHT="2011-2014, Yann Collet"
+SRC_URI="https://github.com/Cyan4973/lz4/archive/r117.tar.gz"
+SRC_FILENAME="$portVersionedName.tar.gz"
+CHECKSUM_SHA256="c4ca70bf6711021d5ae64e79469a619a4e5899a4c7e07e665f3eb3a517cd029d"
+REVISION="1"
+ARCHITECTURES="x86_gcc2 x86 x86_64"
+SECONDARY_ARCHITECTURES="x86 x86_gcc2"
+
+PATCHES="lz4-$portVersion.patchset"
+
+PROVIDES="
+	lz4${secondaryArchSuffix} = $portVersion
+	lib:liblz4${secondaryArchSuffix} = 1.0.0 compat >= 1
+	"
+
+if [ -z "$secondaryArchSuffix" ]; then
+PROVIDES="$PROVIDES
+	cmd:lz4 = $portVersion
+	cmd:lz4c = $portVersion
+	cmd:lz4cat = $portVersion
+	"
+fi
+
+REQUIRES="
+	haiku$secondaryArchSuffix >= $haikuVersion
+	"
+BUILD_REQUIRES="
+	haiku${secondaryArchSuffix}_devel >= $haikuVersion
+	"
+BUILD_PREREQUIRES="
+	cmd:ar
+	cmd:gcc$secondaryArchSuffix
+	cmd:ld$secondaryArchSuffix
+	cmd:make
+	"
+
+BUILD()
+{
+	make $jobArgs all
+}
+
+INSTALL()
+{
+	make install LIBDIR=$libDir INCLUDEDIR=$includeDir \
+		BINDIR=$binDir MANDIR=$manDir 
+	prepareInstalledDevelLibs liblz4
+	
+	packageEntries devel \
+    	$developDir
+}
+
+# ----- devel package -------------------------------------------------------
+
+PROVIDES_devel="
+	lz4${secondaryArchSuffix}_devel = $portVersion
+	devel:liblz4$secondaryArchSuffix = 1.0.0 compat >= 1
+	"
+REQUIRES_devel="
+	lz4${secondaryArchSuffix} == $portVersion base
+	"
diff --git a/app-arch/lz4/patches/lz4-r117.patchset b/app-arch/lz4/patches/lz4-r117.patchset
new file mode 100644
index 000000000..4ec483daf
--- /dev/null
+++ b/app-arch/lz4/patches/lz4-r117.patchset
@@ -0,0 +1,173 @@
+From 9c137ea48247801d309d867244820833685e2477 Mon Sep 17 00:00:00 2001
+From: Jerome Duval <jerome.duval@gmail.com>
+Date: Thu, 15 May 2014 16:14:06 +0000
+Subject: undef _PACKED (defined in Bebuild.h)
+
+
+diff --git a/lz4.c b/lz4.c
+index fd229ef..9284bbf 100644
+--- a/lz4.c
++++ b/lz4.c
+@@ -188,6 +188,7 @@
+   typedef unsigned long long  U64;
+ #endif
+ 
++#undef _PACKED
+ #if defined(__GNUC__)  && !defined(LZ4_FORCE_UNALIGNED_ACCESS)
+ #  define _PACKED __attribute__ ((packed))
+ #else
+diff --git a/lz4hc.c b/lz4hc.c
+index e84de2b..cb72ef8 100644
+--- a/lz4hc.c
++++ b/lz4hc.c
+@@ -158,6 +158,7 @@
+   typedef unsigned long long  U64;
+ #endif
+ 
++#undef _PACKED
+ #if defined(__GNUC__)  && !defined(LZ4_FORCE_UNALIGNED_ACCESS)
+ #  define _PACKED __attribute__ ((packed))
+ #else
+diff --git a/programs/xxhash.c b/programs/xxhash.c
+index 8304ec2..d4aa50e 100644
+--- a/programs/xxhash.c
++++ b/programs/xxhash.c
+@@ -110,6 +110,7 @@ FORCE_INLINE void* XXH_memcpy(void* dest, const void* src, size_t size) { return
+   typedef unsigned long long U64;
+ #endif
+ 
++#undef _PACKED
+ #if defined(__GNUC__)  && !defined(XXH_USE_UNALIGNED_ACCESS)
+ #  define _PACKED __attribute__ ((packed))
+ #else
+-- 
+1.8.3.4
+
+
+From 83f35b4005aa62773f52a843d3f515854baaf787 Mon Sep 17 00:00:00 2001
+From: Jerome Duval <jerome.duval@gmail.com>
+Date: Thu, 15 May 2014 16:18:40 +0000
+Subject: PAGE_SIZE is already defined on Haiku
+
+
+diff --git a/programs/fuzzer.c b/programs/fuzzer.c
+index ba4f960..fa84aec 100644
+--- a/programs/fuzzer.c
++++ b/programs/fuzzer.c
+@@ -53,6 +53,7 @@
+ #define SEQ_MSK ((NUM_SEQ) - 1)
+ #define MOD_SEQ(x) ((((x) >> 8) & 255) == 0)
+ #define NEW_SEQ(x) ((((x) >> 10) %10) == 0)
++#undef PAGE_SIZE
+ #define PAGE_SIZE 4096
+ #define ROUND_PAGE(x) (((x) + PAGE_SIZE - 1) & ~(PAGE_SIZE - 1))
+ #define PRIME1   2654435761U
+-- 
+1.8.3.4
+
+
+From fbc8cf911a39fa5d64db09f5a3cf3d54f8614a24 Mon Sep 17 00:00:00 2001
+From: Jerome Duval <jerome.duval@gmail.com>
+Date: Thu, 15 May 2014 16:20:36 +0000
+Subject: Haiku install support
+
+
+diff --git a/Makefile b/Makefile
+index e5797c7..c976c95 100644
+--- a/Makefile
++++ b/Makefile
+@@ -106,7 +106,7 @@ clean:
+ 
+ 
+ #make install option is reserved to Linux & OSX targets
+-ifneq (,$(filter $(shell uname),Linux Darwin))
++ifneq (,$(filter $(shell uname),Linux Darwin Haiku))
+ 
+ install: liblz4
+ 	@install -d -m 755 $(DESTDIR)$(LIBDIR)/ $(DESTDIR)$(INCLUDEDIR)/
+diff --git a/programs/Makefile b/programs/Makefile
+index 8ec0b85..aa5926b 100644
+--- a/programs/Makefile
++++ b/programs/Makefile
+@@ -37,8 +37,8 @@ CC:=$(CC)
+ CFLAGS+= -std=c99 -O3 -Wall -W -Wundef -DLZ4_VERSION=\"$(RELEASE)\"
+ FLAGS= -I.. $(CFLAGS)
+ 
+-BINDIR=$(PREFIX)/bin
+-MANDIR=$(PREFIX)/share/man/man1
++#BINDIR=$(PREFIX)/bin
++#MANDIR=$(PREFIX)/share/man/man1
+ LZ4DIR=..
+ 
+ TEST_FILES = COPYING
+@@ -83,7 +83,7 @@ clean:
+ 	@echo Cleaning completed
+ 
+ 
+-ifneq (,$(filter $(shell uname),Linux Darwin))
++ifneq (,$(filter $(shell uname),Linux Darwin, Haiku))
+ 
+ install: lz4 lz4c
+ 	@echo Installing binaries
+-- 
+1.8.3.4
+
+
+From 52f22e57e55cc5f4dbaab5dc9acae3491916b306 Mon Sep 17 00:00:00 2001
+From: Jerome Duval <jerome.duval@gmail.com>
+Date: Fri, 16 May 2014 14:16:07 +0000
+Subject: gcc2 doesn't know std=c99
+
+
+diff --git a/Makefile b/Makefile
+index c976c95..4964a59 100644
+--- a/Makefile
++++ b/Makefile
+@@ -39,7 +39,7 @@ LIBVER=$(LIBVER_MAJOR).$(LIBVER_MINOR).$(LIBVER_PATCH)
+ DESTDIR=
+ PREFIX=/usr
+ CC:=$(CC)
+-CFLAGS+= -I. -std=c99 -O3 -Wall -W -Wundef -DLZ4_VERSION=\"$(RELEASE)\"
++CFLAGS+= -I. -O3 -Wall -W -Wundef -DLZ4_VERSION=\"$(RELEASE)\"
+ 
+ LIBDIR=$(PREFIX)/lib
+ INCLUDEDIR=$(PREFIX)/include
+diff --git a/programs/Makefile b/programs/Makefile
+index aa5926b..e380c35 100644
+--- a/programs/Makefile
++++ b/programs/Makefile
+@@ -34,7 +34,7 @@ RELEASE=r116
+ DESTDIR=
+ PREFIX=/usr
+ CC:=$(CC)
+-CFLAGS+= -std=c99 -O3 -Wall -W -Wundef -DLZ4_VERSION=\"$(RELEASE)\"
++CFLAGS+= -O3 -Wall -W -Wundef -DLZ4_VERSION=\"$(RELEASE)\"
+ FLAGS= -I.. $(CFLAGS)
+ 
+ #BINDIR=$(PREFIX)/bin
+-- 
+1.8.3.4
+
+
+From bf73e35f83ed099523193493e77dd3b342937d89 Mon Sep 17 00:00:00 2001
+From: Jerome Duval <jerome.duval@gmail.com>
+Date: Fri, 16 May 2014 14:20:25 +0000
+Subject: we don't want 32-bit versions
+
+
+diff --git a/programs/Makefile b/programs/Makefile
+index e380c35..b89410f 100644
+--- a/programs/Makefile
++++ b/programs/Makefile
+@@ -53,7 +53,7 @@ endif
+ 
+ default: lz4 lz4c
+ 
+-all: lz4 lz4c lz4c32 fuzzer fuzzer32 fullbench fullbench32
++all: lz4 lz4c fuzzer fullbench
+ 
+ lz4: $(LZ4DIR)/lz4.c $(LZ4DIR)/lz4hc.c bench.c xxhash.c lz4io.c lz4cli.c
+ 	$(CC)      $(FLAGS) -DDISABLE_LZ4C_LEGACY_OPTIONS $^ -o $@$(EXT)
+-- 
+1.8.3.4
+
diff --git a/app-arch/p7zip/p7zip-9.13.recipe b/app-arch/p7zip/p7zip-9.13.recipe
index 558b2eb35..de8bdead4 100644
--- a/app-arch/p7zip/p7zip-9.13.recipe
+++ b/app-arch/p7zip/p7zip-9.13.recipe
@@ -6,7 +6,7 @@ Supported Formats:
 - Unpacking Only: ARJ, CAB, CHM, CPIO, CramFS, DEB, DMG, FAT, HFS, ISO, LZH, LZMA, MBR, MSI, NSIS, NTFS, RAR, RPM, SquashFS, UDF, VHD, WIM, XAR, and Z."
 HOMEPAGE="http://p7zip.sourceforge.net"
 SRC_URI="http://downloads.sourceforge.net/project/p7zip/p7zip/9.13/p7zip_9.13_src_all.tar.bz2"
-CHECKSUM_MD5="8ddb5053db3b1f2696407d01be145779"
+CHECKSUM_SHA256="fc9c0fa2eabd367d6adbc3ea07bb305dbdc1f68717eea362c8c074b91c03d923"
 LICENSE="GNU LGPL v2.1"
 COPYRIGHT="1999-2010 7-Zip Igor Pavlov."
 REVISION="2"
diff --git a/app-arch/p7zip/p7zip-9.20.1.recipe b/app-arch/p7zip/p7zip-9.20.1.recipe
index 2be642d7a..b612f3456 100644
--- a/app-arch/p7zip/p7zip-9.20.1.recipe
+++ b/app-arch/p7zip/p7zip-9.20.1.recipe
@@ -5,7 +5,7 @@ OpenBSD, FreeBSD, Cygwin, AIX, ...), MacOS X and also for BeOS and Amiga.
 "
 HOMEPAGE="http://p7zip.sourceforge.net"
 SRC_URI="http://downloads.sourceforge.net/project/p7zip/p7zip/9.20.1/p7zip_9.20.1_src_all.tar.bz2"
-CHECKSUM_MD5="bd6caaea567dc0d995c990c5cc883c89"
+CHECKSUM_SHA256="49557e7ffca08100f9fc687f4dfc5aea703ca207640c76d9dee7b66f03cb4782"
 LICENSE="GNU LGPL v2.1"
 COPYRIGHT="1999-2011 7-Zip Igor Pavlov."
 REVISION="5"
diff --git a/app-arch/pigz/pigz-2.3.1.recipe b/app-arch/pigz/pigz-2.3.1.recipe
index 0e29b7284..a4bbb2611 100644
--- a/app-arch/pigz/pigz-2.3.1.recipe
+++ b/app-arch/pigz/pigz-2.3.1.recipe
@@ -13,7 +13,7 @@ LICENSE="Zlib"
 COPYRIGHT="2008-2013 Mark Adler"
 HOMEPAGE="http://www.zlib.net/pigz" 
 SRC_URI="http://www.zlib.net/pigz/pigz-2.3.1.tar.gz"
-CHECKSUM_MD5="e803f8bc0770c7a5e96dccb1d2dd2aab"
+CHECKSUM_SHA256="629b0ce5422a3978f31742bf8275d0be2f84987140d18f390f1e3b4e46e0af54"
 REVISION="1"
 ARCHITECTURES="x86 ?x86_gcc2 ?x86_64"
 
diff --git a/app-arch/sharutils/patches/sharutils-4.14.patchset b/app-arch/sharutils/patches/sharutils-4.14.patchset
index 46e9f7500..7a2ab8b03 100644
--- a/app-arch/sharutils/patches/sharutils-4.14.patchset
+++ b/app-arch/sharutils/patches/sharutils-4.14.patchset
@@ -1,4 +1,4 @@
-From 72e4b6e9859ea8e7c3f4a55947a20141bdd4a254 Mon Sep 17 00:00:00 2001
+From ddc3088b56acff9a92dd611bc35989cbea8ba580 Mon Sep 17 00:00:00 2001
 From: Chris Roberts <cpr420@gmail.com>
 Date: Sun, 24 Nov 2013 19:58:36 -0700
 Subject: Include config.h before other headers
@@ -17,3 +17,39 @@ index 57fa9d0..26e820b 100644
 -- 
 1.8.3.4
 
+
+From a9cb54731100e3d642a38721d655340d7ba47778 Mon Sep 17 00:00:00 2001
+From: Jerome Duval <jerome.duval@gmail.com>
+Date: Mon, 14 Apr 2014 18:36:36 +0000
+Subject: gcc2 fix
+
+
+diff --git a/configure b/configure
+index 98d81a5..b7af1ec 100755
+--- a/configure
++++ b/configure
+@@ -17612,6 +17612,8 @@ if ac_fn_c_try_compile "$LINENO"; then :
+ else
+   ac_cv_header_stdbool_h=no
+ fi
++ac_cv_header_stdbool_h=yes
++
+ rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+ fi
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_header_stdbool_h" >&5
+diff --git a/src/uuencode.c b/src/uuencode.c
+index 370726e..bbf259d 100644
+--- a/src/uuencode.c
++++ b/src/uuencode.c
+@@ -249,7 +249,7 @@ process_opts (int argc, char ** argv, int * mode)
+   if (HAVE_OPT(ENCODE_FILE_NAME))
+     {
+       size_t nmlen = strlen (output_name);
+-      size_t bfsz  = nmlen + (nmlen / 3) + 4;;
++      size_t bfsz  = nmlen + (nmlen / 3) + 4;
+       char * p = malloc (bfsz);
+       if (p == NULL)
+         fserr (UUENCODE_EXIT_FAILURE, "malloc", _("file name"));
+-- 
+1.8.3.4
+
diff --git a/app-arch/sharutils/sharutils-4.14.recipe b/app-arch/sharutils/sharutils-4.14.recipe
index 5dd3acc58..62e5a4d99 100644
--- a/app-arch/sharutils/sharutils-4.14.recipe
+++ b/app-arch/sharutils/sharutils-4.14.recipe
@@ -15,20 +15,12 @@ shell. unshar may also process files containing concatenated shell archives.
 HOMEPAGE="http://www.gnu.org/software/sharutils/"
 LICENSE="GNU GPL v3"
 COPYRIGHT="1990-2013 Free Software Foundation, Inc."
-SRC_URI="http://ftp.gnu.org/gnu/sharutils/sharutils-4.14.tar.xz"
-CHECKSUM_MD5="77ede22951bdb67279c6e78e79a04784"
+SRC_URI="http://ftp.gnu.org/gnu/sharutils/sharutils-4.14.tar.gz"
+CHECKSUM_SHA256="90f5107c167cfd1b299bb211828d2586471087863dbed698f53109cd5f717208"
 REVISION="1"
 
-ARCHITECTURES="x86 ?x86_64"
-
-if [ $effectiveTargetArchitecture != x86_gcc2 ]; then
-	# x86_gcc2 is fine as primary target architecture as long as we're building
-	# for a different secondary architecture.
-	ARCHITECTURES="$ARCHITECTURES x86_gcc2"
-else
-	ARCHITECTURES="$ARCHITECTURES !x86_gcc2"
-fi
-SECONDARY_ARCHITECTURES="x86"
+ARCHITECTURES="x86_gcc2 x86 x86_64"
+SECONDARY_ARCHITECTURES="x86_gcc2 x86"
 
 PROVIDES="
 	sharutils$secondaryArchSuffix = $portVersion
@@ -47,6 +39,7 @@ BUILD_REQUIRES="
 	"
 
 BUILD_PREREQUIRES="
+	cmd:awk
 	cmd:make
 	cmd:which
 	cmd:bison
diff --git a/app-arch/tar/patches/tar-1.27.1.patchset b/app-arch/tar/patches/tar-1.27.1.patchset
new file mode 100644
index 000000000..0af126885
--- /dev/null
+++ b/app-arch/tar/patches/tar-1.27.1.patchset
@@ -0,0 +1,147 @@
+From 25395e3fa0b01a898b6e6ae456c8eef3c66849f1 Mon Sep 17 00:00:00 2001
+From: Jonathan Schleifer <js@webkeks.org>
+Date: Thu, 20 Mar 2014 14:52:58 +0100
+Subject: Patches from tar-1.26
+
+
+diff --git a/src/common.h b/src/common.h
+index 42fd539..633ca19 100644
+--- a/src/common.h
++++ b/src/common.h
+@@ -192,6 +192,8 @@ GLOBAL enum old_files old_files_option;
+ 
+ GLOBAL bool keep_directory_symlink_option;
+ 
++GLOBAL bool simulate_hardlinks_option;
++
+ /* Specified file name for incremental list.  */
+ GLOBAL const char *listed_incremental_option;
+ /* Incremental dump level */
+diff --git a/src/extract.c b/src/extract.c
+index 9b6b7f9..26b027f 100644
+--- a/src/extract.c
++++ b/src/extract.c
+@@ -33,6 +33,8 @@ static bool we_are_root;	/* true if our effective uid == 0 */
+ static mode_t newdir_umask;	/* umask when creating new directories */
+ static mode_t current_umask;	/* current umask (which is set to 0 if -p) */
+ 
++static int extract_symlink (char *, int);
++
+ #define ALL_MODE_BITS ((mode_t) ~ (mode_t) 0)
+ 
+ #if ! HAVE_FCHMOD && ! defined fchmod
+@@ -1268,6 +1270,38 @@ extract_link (char *file_name, int typeflag)
+   char const *link_name;
+   int rc;
+ 
++  if (simulate_hardlinks_option)
++  {
++	/* symlinks have to be normalized */
++	const char* f = file_name;
++	const char* l = current_stat_info.link_name;
++	int sep_pos = 0;
++	int p_count = 0;
++	char *link_name = (char*) xmalloc(strlen(current_stat_info.link_name) * 2);
++
++   for (; *f && *l; f++, l++)
++	{
++	  if (*f != *l)
++		  break;
++	  if (*f == DIRECTORY_SEPARATOR)
++		  sep_pos = f - file_name;
++	}
++
++	for (p_count = 0; *f; f++)
++	  if (*f == DIRECTORY_SEPARATOR)
++	    p_count++;
++
++	link_name[0] = '\0';
++	while (p_count--)
++	  strcat(link_name, "../");
++
++	strcat(link_name, &current_stat_info.link_name[sep_pos + 1]);
++	free(current_stat_info.link_name);
++	current_stat_info.link_name = link_name;
++
++	return extract_symlink(file_name, typeflag);
++  }
++
+   link_name = current_stat_info.link_name;
+ 
+   if (! absolute_names_option && contains_dot_dot (link_name))
+@@ -1357,6 +1391,13 @@ extract_symlink (char *file_name, int typeflag)
+ #else
+   static int warned_once;
+ 
++  /* recursion is not welcomed here */
++  if (simulate_hardlinks_option && typeflag == LINKTYPE)
++  {
++	link_error (current_stat_info.link_name, file_name);
++	return -1;
++  }
++
+   if (!warned_once)
+     {
+       warned_once = 1;
+diff --git a/src/tar.c b/src/tar.c
+index 4f5017d..2dd5200 100644
+--- a/src/tar.c
++++ b/src/tar.c
+@@ -457,6 +457,8 @@ static struct argp_option options[] = {
+   {"check-device", CHECK_DEVICE_OPTION, NULL, 0,
+    N_("check device numbers when creating incremental archives (default)"),
+    GRID+1 },
++  {"replace-hardlinks", 'Q', 0, 0,
++   N_("replace hardlinks with corresponding symlink when extracting"), GRID+1 },
+ #undef GRID
+ 
+ #define GRID 30
+@@ -1756,6 +1758,10 @@ parse_opt (int key, char *arg, struct argp_state *state)
+       set_archive_format (arg);
+       break;
+ 
++    case 'Q':
++      simulate_hardlinks_option = true;
++      break;
++
+     case INDEX_FILE_OPTION:
+       index_file_name = arg;
+       break;
+@@ -2253,6 +2259,7 @@ decode_options (int argc, char **argv)
+   unquote_option = true;
+   tar_sparse_major = 1;
+   tar_sparse_minor = 0;
++  simulate_hardlinks_option = false;
+ 
+   owner_option = -1; owner_name_option = NULL;
+   group_option = -1; group_name_option = NULL;
+-- 
+1.8.3.4
+
+
+From 6f729d50ba6ca87c6cd33d87462884d90d4504c0 Mon Sep 17 00:00:00 2001
+From: Adrien Destugues <pulkomandy@pulkomandy.tk>
+Date: Fri, 28 Mar 2014 21:44:58 +0100
+Subject: gcc2 build fix.
+
+
+diff --git a/lib/wordsplit.h b/lib/wordsplit.h
+index b48e3cd..d286ffb 100644
+--- a/lib/wordsplit.h
++++ b/lib/wordsplit.h
+@@ -33,10 +33,8 @@ struct wordsplit
+   const char *ws_comment;
+   const char *ws_escape;
+   void (*ws_alloc_die) (struct wordsplit * wsp);
+-  void (*ws_error) (const char *, ...)
+-                   __attribute__ ((__format__ (__printf__, 1, 2)));
+-  void (*ws_debug) (const char *, ...)
+-                   __attribute__ ((__format__ (__printf__, 1, 2)));
++  void (*ws_error) (const char *, ...);
++  void (*ws_debug) (const char *, ...);
+ 
+   const char **ws_env;
+   const char *(*ws_getvar) (const char *, size_t, void *);
+-- 
+1.8.3.4
+
diff --git a/app-arch/tar/tar-1.26.recipe b/app-arch/tar/tar-1.26.recipe
index 5e88b1770..d5b53a11f 100644
--- a/app-arch/tar/tar-1.26.recipe
+++ b/app-arch/tar/tar-1.26.recipe
@@ -14,7 +14,7 @@ HOMEPAGE="http://www.gnu.org/software/tar/"
 COPYRIGHT="1990-2011 Free Software Foundation, Inc."
 LICENSE="GNU GPL v3"
 SRC_URI="http://ftp.gnu.org/gnu/tar/tar-1.26.tar.bz2"
-CHECKSUM_MD5="2cee42a2ff4f1cd4f9298eeeb2264519"
+CHECKSUM_SHA256="5a5369f464502a598e938029c310d4b3abd51e6bb8dfd045663e61c8ea9f6d41"
 REVISION="6"
 ARCHITECTURES="x86_gcc2 x86 x86_64"
 
diff --git a/app-arch/tar/tar-1.27.1.recipe b/app-arch/tar/tar-1.27.1.recipe
new file mode 100644
index 000000000..49f1036d3
--- /dev/null
+++ b/app-arch/tar/tar-1.27.1.recipe
@@ -0,0 +1,61 @@
+SUMMARY="Saves and restores files to/from a tape or disk archive."
+DESCRIPTION="
+The Tar program provides the ability to create tar archives, as well as \
+various other kinds of manipulation. For example, you can use Tar on \
+previously created archives to extract files, to store additional files, or to \
+update or list files which were already stored.
+Initially, tar archives were used to store files conveniently on magnetic \
+tape. The name \"Tar\" comes from this use; it stands for tape archiver. Despite \
+the utility's name, Tar can direct its output to available devices, files, or \
+other programs (using pipes), it can even access remote devices or files (as \
+archives).
+"
+HOMEPAGE="http://www.gnu.org/software/tar/"
+COPYRIGHT="1990-2011 Free Software Foundation, Inc."
+LICENSE="GNU GPL v3"
+SRC_URI="http://ftp.gnu.org/gnu/tar/tar-1.27.1.tar.bz2"
+CHECKSUM_SHA256="9b0fb3ce8512059337add0da5f8f0f7d7647f2201f5ece24581d620ea60337c6"
+REVISION="2"
+ARCHITECTURES="x86_gcc2 ?x86 x86_64 arm"
+
+PATCHES="tar-1.27.1.patchset"
+
+PROVIDES="
+	tar = $portVersion compat >= 1
+	cmd:tar = $portVersion compat >= 1
+	"
+REQUIRES="
+	haiku >= $haikuVersion
+	"
+BUILD_REQUIRES="
+	"
+BUILD_PREREQUIRES="
+	haiku_devel >= $haikuVersion
+	cmd:automake
+	cmd:autoreconf
+	cmd:gcc
+	cmd:ld
+	cmd:make
+	cmd:sed
+	"
+
+defineDebugInfoPackage tar \
+	$binDir/tar
+
+
+BUILD()
+{
+	runConfigure ./configure \
+		--disable-nls \
+		--disable-gcc-warnings \
+		LDFLAGS="-lnetwork" \
+		FORCE_UNSAFE_CONFIGURE=1
+	make $jobArgs
+}
+
+INSTALL()
+{
+	make install
+
+	rm $libDir/charset.alias
+}
diff --git a/app-arch/unrar/patches/unrar-5.0.14.patchset b/app-arch/unrar/patches/unrar-5.0.14.patchset
new file mode 100644
index 000000000..ba93fa0e2
--- /dev/null
+++ b/app-arch/unrar/patches/unrar-5.0.14.patchset
@@ -0,0 +1,95 @@
+From a24228db5eb4450d185904b3a3795bffa28ce5f7 Mon Sep 17 00:00:00 2001
+From: Jerome Duval <jerome.duval@gmail.com>
+Date: Mon, 14 Apr 2014 16:24:18 +0000
+Subject: initial haiku patch
+
+
+diff --git a/archive.hpp b/archive.hpp
+index 95645ed..377b779 100644
+--- a/archive.hpp
++++ b/archive.hpp
+@@ -67,7 +67,6 @@ class Archive:public File
+     size_t SearchSubBlock(const wchar *Type);
+     size_t SearchRR();
+     void WriteBlock(HEADER_TYPE HeaderType,BaseBlock *wb=NULL,bool OnlySetSize=false,bool NonFinalWrite=false);
+-    void SetBlockSize(HEADER_TYPE HeaderType,BaseBlock *wb=NULL) {WriteBlock(HeaderType,wb,true);}
+     size_t ReadHeader();
+     void CheckArc(bool EnableBroken);
+     void CheckOpen(const wchar *Name);
+diff --git a/makefile b/makefile
+index dfb3efb..bc6419a 100644
+--- a/makefile
++++ b/makefile
+@@ -7,8 +7,12 @@ CXXFLAGS=-O2
+ LIBFLAGS=-fPIC
+ DEFINES=-D_FILE_OFFSET_BITS=64 -D_LARGEFILE_SOURCE -DRAR_SMP
+ STRIP=strip
+-LDFLAGS=-pthread
++LDFLAGS=-lbsd
+ DESTDIR=/usr
++RC=rc
++XRES=xres
++MIMESET=mimeset
++DESTDIR=(shell finddir B_SYSTEM_DIRECTORY)
+ 
+ # Linux using LCC
+ #CXX=lcc
+@@ -116,12 +120,14 @@ install:	install-unrar
+ uninstall:	uninstall-unrar
+ 
+ clean:
+-	@rm -f *.o *.bak *~
++	@rm -f *.o *.bak *~ *.rsrc
+ 
+ unrar:	clean $(OBJECTS) $(UNRAR_OBJ)
+ 	@rm -f unrar
+ 	$(LINK) -o unrar $(LDFLAGS) $(OBJECTS) $(UNRAR_OBJ) $(LIBS)	
+-	$(STRIP) unrar
++	$(RC) -o unrar.rsrc unrar.rdef
++	$(XRES) -o unrar unrar.rsrc
++	$(MIMESET) unrar
+ 
+ sfx:	WHAT=SFX_MODULE
+ sfx:	clean $(OBJECTS)
+diff --git a/os.hpp b/os.hpp
+index ed76a19..41594be 100644
+--- a/os.hpp
++++ b/os.hpp
+@@ -187,6 +187,15 @@
+   #endif
+ #endif
+ 
++#ifdef __HAIKU__
++  #include <endian.h>
++  #if LITTLE_ENDIAN
++    #undef BIG_ENDIAN
++  #elif BIG_ENDIAN
++    #undef LITTLE_ENDIAN
++  #endif
++#endif
++
+ #if defined(__sparc) || defined(sparc) || defined(__hpux)
+   #ifndef BIG_ENDIAN
+      #define BIG_ENDIAN
+diff --git a/unrar.rdef b/unrar.rdef
+new file mode 100644
+index 0000000..79411da
+--- /dev/null
++++ b/unrar.rdef
+@@ -0,0 +1,13 @@
++
++resource app_signature "application/x-vnd.Roshal-UnRAR";
++resource app_flags B_MULTIPLE_LAUNCH | B_BACKGROUND_APP;
++
++resource app_version {
++	major = 5,
++	middle = 0,
++	minor = 4,
++	variety = 0,
++	internal = 0,
++	short_info = "5.0.4", 
++	long_info = "5.0.4 Alexander Roshal"
++};
+-- 
+1.8.3.4
+
diff --git a/app-arch/unrar/patches/unrar-5.1.5.patchset b/app-arch/unrar/patches/unrar-5.1.5.patchset
new file mode 100644
index 000000000..16e4d7e4e
--- /dev/null
+++ b/app-arch/unrar/patches/unrar-5.1.5.patchset
@@ -0,0 +1,95 @@
+From ebe959af19ad3f72d3119444f9afc0ab15caaa7a Mon Sep 17 00:00:00 2001
+From: Jerome Duval <jerome.duval@gmail.com>
+Date: Mon, 12 May 2014 18:07:44 +0000
+Subject: initial Haiku patch
+
+
+diff --git a/archive.hpp b/archive.hpp
+index 1d8444b..252b850 100644
+--- a/archive.hpp
++++ b/archive.hpp
+@@ -67,7 +67,6 @@ class Archive:public File
+     size_t SearchSubBlock(const wchar *Type);
+     size_t SearchRR();
+     void WriteBlock(HEADER_TYPE HeaderType,BaseBlock *wb=NULL,bool OnlySetSize=false,bool NonFinalWrite=false);
+-    void SetBlockSize(HEADER_TYPE HeaderType,BaseBlock *wb=NULL) {WriteBlock(HeaderType,wb,true);}
+     size_t ReadHeader();
+     void CheckArc(bool EnableBroken);
+     void CheckOpen(const wchar *Name);
+diff --git a/makefile b/makefile
+index 3c38027..5d69089 100644
+--- a/makefile
++++ b/makefile
+@@ -7,8 +7,12 @@ CXXFLAGS=-O2
+ LIBFLAGS=-fPIC
+ DEFINES=-D_FILE_OFFSET_BITS=64 -D_LARGEFILE_SOURCE -DRAR_SMP
+ STRIP=strip
+-LDFLAGS=-pthread
++LDFLAGS=-lbsd
+ DESTDIR=/usr
++RC=rc
++XRES=xres
++MIMESET=mimeset
++DESTDIR=(shell finddir B_SYSTEM_DIRECTORY)
+ 
+ # Linux using LCC
+ #CXX=lcc
+@@ -116,12 +120,14 @@ install:	install-unrar
+ uninstall:	uninstall-unrar
+ 
+ clean:
+-	@rm -f *.o *.bak *~
++	@rm -f *.o *.bak *~ *.rsrc
+ 
+ unrar:	clean $(OBJECTS) $(UNRAR_OBJ)
+ 	@rm -f unrar
+ 	$(LINK) -o unrar $(LDFLAGS) $(OBJECTS) $(UNRAR_OBJ) $(LIBS)	
+-	$(STRIP) unrar
++	$(RC) -o unrar.rsrc unrar.rdef
++	$(XRES) -o unrar unrar.rsrc
++	$(MIMESET) unrar
+ 
+ sfx:	WHAT=SFX_MODULE
+ sfx:	clean $(OBJECTS)
+diff --git a/os.hpp b/os.hpp
+index 95fa5d6..2ae36ba 100644
+--- a/os.hpp
++++ b/os.hpp
+@@ -189,6 +189,15 @@
+   #endif
+ #endif
+ 
++#ifdef __HAIKU__
++  #include <endian.h>
++  #if LITTLE_ENDIAN
++    #undef BIG_ENDIAN
++  #elif BIG_ENDIAN
++    #undef LITTLE_ENDIAN
++  #endif
++#endif
++
+ #if defined(__sparc) || defined(sparc) || defined(__hpux)
+   #ifndef BIG_ENDIAN
+      #define BIG_ENDIAN
+diff --git a/unrar.rdef b/unrar.rdef
+new file mode 100644
+index 0000000..28bb5e2
+--- /dev/null
++++ b/unrar.rdef
+@@ -0,0 +1,13 @@
++
++resource app_signature "application/x-vnd.Roshal-UnRAR";
++resource app_flags B_MULTIPLE_LAUNCH | B_BACKGROUND_APP;
++
++resource app_version {
++	major = 5,
++	middle = 1,
++	minor = 5,
++	variety = 0,
++	internal = 0,
++	short_info = "5.1.5", 
++	long_info = "5.1.5 Alexander Roshal"
++};
+-- 
+1.8.3.4
+
diff --git a/app-arch/unrar/unrar-4.2.4.recipe b/app-arch/unrar/unrar-4.2.4.recipe
index 00b0bf287..804eabbab 100644
--- a/app-arch/unrar/unrar-4.2.4.recipe
+++ b/app-arch/unrar/unrar-4.2.4.recipe
@@ -21,9 +21,9 @@ following file formats:
 "
 HOMEPAGE="http://www.rarlab.com/"
 SRC_URI="http://www.rarlab.com/rar/unrarsrc-4.2.4.tar.gz"
+CHECKSUM_SHA256="9432bf798e5f7123f3060f37b75b7c07f36f0091305f46473dcae9154f8cd686"
 REVISION="1"
 ARCHITECTURES="x86_gcc2 x86"
-CHECKSUM_MD5="8ea9d1b4139474b282d76e627a2de3e4"
 
 PROVIDES="
 	unrar = $portVersion
diff --git a/app-arch/unrar/unrar-5.0.14.recipe b/app-arch/unrar/unrar-5.0.14.recipe
new file mode 100644
index 000000000..0b5d2ea72
--- /dev/null
+++ b/app-arch/unrar/unrar-5.0.14.recipe
@@ -0,0 +1,56 @@
+SUMMARY="Uncompress rar files"
+DESCRIPTION="
+Unrar decompresses rar files. It is a powerful archive manager that can backup \
+your data and reduce the size of email attachments. Unrar can decompress the \
+following file formats:
+- RAR
+- ZIP
+- CAB
+- ARJ
+- JZH
+- TAR
+- GZ and TAR.GZ
+- BZ2 and TAR.BZ2
+- ACE
+- UUE
+- JAR (Java Archive)
+- ISO
+- 7Z
+- XZ
+- Z (Unix Compress)
+"
+HOMEPAGE="http://www.rarlab.com/"
+SRC_URI="http://www.rarlab.com/rar/unrarsrc-$portVersion.tar.gz"
+CHECKSUM_SHA256="e276ea30a2dc9b8961a4268772e5b6caccaa984664e2d5255a43fcb0f5d59806"
+REVISION="1"
+ARCHITECTURES="x86_gcc2 x86 x86_64"
+
+PATCHES="unrar-5.0.14.patchset"
+
+PROVIDES="
+	unrar = $portVersion
+	cmd:unrar = $portVersion
+	"
+
+REQUIRES="
+	haiku >= $haikuVersion
+	"
+BUILD_REQUIRES="
+	haiku_devel >= $haikuVersion
+	cmd:make
+	cmd:g++
+	"
+
+SOURCE_DIR="unrar"
+BUILD()
+{
+	make DESTDIR=$prefix
+}
+
+INSTALL()
+{
+	make DESTDIR=$prefix install
+}
+
+LICENSE="UnRAR"
+COPYRIGHT="Alexander Roshal"
diff --git a/app-arch/unrar/unrar-5.1.5.recipe b/app-arch/unrar/unrar-5.1.5.recipe
new file mode 100644
index 000000000..09777cfb2
--- /dev/null
+++ b/app-arch/unrar/unrar-5.1.5.recipe
@@ -0,0 +1,56 @@
+SUMMARY="Uncompress rar files"
+DESCRIPTION="
+Unrar decompresses rar files. It is a powerful archive manager that can backup \
+your data and reduce the size of email attachments. Unrar can decompress the \
+following file formats:
+- RAR
+- ZIP
+- CAB
+- ARJ
+- JZH
+- TAR
+- GZ and TAR.GZ
+- BZ2 and TAR.BZ2
+- ACE
+- UUE
+- JAR (Java Archive)
+- ISO
+- 7Z
+- XZ
+- Z (Unix Compress)
+"
+HOMEPAGE="http://www.rarlab.com/"
+SRC_URI="http://www.rarlab.com/rar/unrarsrc-$portVersion.tar.gz"
+CHECKSUM_SHA256="2224ced8288553392abe94e410e29d2570bfdfea22af51125d3984548a5034cb"
+REVISION="1"
+ARCHITECTURES="x86_gcc2 x86 x86_64"
+
+PATCHES="unrar-$portVersion.patchset"
+
+PROVIDES="
+	unrar = $portVersion
+	cmd:unrar = $portVersion
+	"
+
+REQUIRES="
+	haiku >= $haikuVersion
+	"
+BUILD_REQUIRES="
+	haiku_devel >= $haikuVersion
+	cmd:make
+	cmd:g++
+	"
+
+SOURCE_DIR="unrar"
+BUILD()
+{
+	make DESTDIR=$prefix
+}
+
+INSTALL()
+{
+	make DESTDIR=$prefix install
+}
+
+LICENSE="UnRAR"
+COPYRIGHT="Alexander Roshal"
diff --git a/app-arch/xar/xar-1.5.2.recipe b/app-arch/xar/xar-1.5.2.recipe
index a0d7a1dde..453ca3eaf 100644
--- a/app-arch/xar/xar-1.5.2.recipe
+++ b/app-arch/xar/xar-1.5.2.recipe
@@ -13,7 +13,7 @@ LICENSE="BSD (3-clause)"
 COPYRIGHT="2005 Rob Braun"
 HOMEPAGE="http://code.google.com/p/xar/"
 SRC_URI="http://xar.googlecode.com/files/xar-1.5.2.tar.gz"
-CHECKSUM_MD5="8eabb055d3387b8edc30ecfb08d2e80d"
+CHECKSUM_SHA256="4c5d5682803cdfab16d72365cf51fc4075d597c5eeaa8c7d1990fea98cdae3e6"
 REVISION="1"
 ARCHITECTURES="x86"
 if [ $effectiveTargetArchitecture != x86_gcc2 ]; then
diff --git a/app-arch/xz_utils/xz_utils-5.0.1.recipe b/app-arch/xz_utils/xz_utils-5.0.1.recipe
index 2985e36de..63464e50b 100644
--- a/app-arch/xz_utils/xz_utils-5.0.1.recipe
+++ b/app-arch/xz_utils/xz_utils-5.0.1.recipe
@@ -1,7 +1,7 @@
 SUMMARY="Free general-purpose data compression software"
 HOMEPAGE="http://tukaani.org/xz/"
 SRC_URI="http://tukaani.org/xz/xz-5.0.1.tar.bz2"
-CHECKSUM_MD5="cb6c7a58cec4d663a395c54d186ca0c6"
+CHECKSUM_SHA256="9b380f502d37085a60821484a3a13747454638927cc36033be64970512451ed8"
 LICENSE="
 	GNU LGPL v2.1
 	GNU GPL v2
diff --git a/app-arch/xz_utils/xz_utils-5.0.4.recipe b/app-arch/xz_utils/xz_utils-5.0.4.recipe
index 36adc8046..2f79b39fd 100644
--- a/app-arch/xz_utils/xz_utils-5.0.4.recipe
+++ b/app-arch/xz_utils/xz_utils-5.0.4.recipe
@@ -1,7 +1,7 @@
 SUMMARY="Free general-purpose data compression software"
 HOMEPAGE="http://tukaani.org/xz/"
 SRC_URI="http://tukaani.org/xz/xz-5.0.4.tar.bz2"
-CHECKSUM_MD5="741cd3a5f64b23b7bac56ec5b2258715"
+CHECKSUM_SHA256="5cd9b060d3a1ad396b3be52c9b9311046a1c369e6062aea752658c435629ce92"
 LICENSE="
 	GNU LGPL v2.1
 	GNU GPL v2
diff --git a/app-arch/xz_utils/xz_utils-5.0.5.recipe b/app-arch/xz_utils/xz_utils-5.0.5.recipe
new file mode 100644
index 000000000..1ca81ce47
--- /dev/null
+++ b/app-arch/xz_utils/xz_utils-5.0.5.recipe
@@ -0,0 +1,120 @@
+SUMMARY="Free general-purpose data compression software"
+HOMEPAGE="http://tukaani.org/xz/"
+SRC_URI="http://tukaani.org/xz/xz-5.0.5.tar.bz2"
+CHECKSUM_SHA256="166c48d2842519bc4f96333bff9e265f8cdda44d38e40594ef3f9bbb52890490"
+LICENSE="
+	GNU LGPL v2.1
+	GNU GPL v2
+	GNU GPL v3
+	"
+COPYRIGHT="2005-2013 Lasse Collin"
+REVISION="1"
+ARCHITECTURES="x86 x86_64"
+if [ $effectiveTargetArchitecture != x86_gcc2 ]; then
+	# x86_gcc2 is fine as primary target architecture as long as we're building
+	# for a different secondary architecture.
+	ARCHITECTURES="$ARCHITECTURES ?x86_gcc2"
+else
+	ARCHITECTURES="$ARCHITECTURES !x86_gcc2"
+fi
+SECONDARY_ARCHITECTURES="x86"
+
+ADDITIONAL_FILES="xz_utils-expander-rules"
+
+# On x86_gcc2 we don't want to install the commands in bin/<arch>/, but in bin/.
+commandSuffix=$secondaryArchSuffix
+commandBinDir=$binDir
+if [ "$targetArchitecture" = x86_gcc2 ]; then
+	commandSuffix=
+	commandBinDir=$prefix/bin
+fi
+
+PROVIDES="
+	xz_utils$secondaryArchSuffix = $portVersion compat >= 5
+	cmd:lzcat$commandSuffix = $portVersion compat >= 5
+	cmd:lzcmp$commandSuffix = $portVersion compat >= 5
+	cmd:lzdiff$commandSuffix = $portVersion compat >= 5
+	cmd:lzegrep$commandSuffix = $portVersion compat >= 5
+	cmd:lzfgrep$commandSuffix = $portVersion compat >= 5
+	cmd:lzgrep$commandSuffix = $portVersion compat >= 5
+	cmd:lzless$commandSuffix = $portVersion compat >= 5
+	cmd:lzma$commandSuffix = $portVersion compat >= 5
+	cmd:lzmadec$commandSuffix = $portVersion compat >= 5
+	cmd:lzmainfo$commandSuffix = $portVersion compat >= 5
+	cmd:lzmore$commandSuffix = $portVersion compat >= 5
+	cmd:unlzma$commandSuffix = $portVersion compat >= 5
+	cmd:unxz$commandSuffix = $portVersion compat >= 5
+	cmd:xz$commandSuffix = $portVersion compat >= 5
+	cmd:xzcat$commandSuffix = $portVersion compat >= 5
+	cmd:xzcmp$commandSuffix = $portVersion compat >= 5
+	cmd:xzdec$commandSuffix = $portVersion compat >= 5
+	cmd:xzdiff$commandSuffix = $portVersion compat >= 5
+	cmd:xzegrep$commandSuffix = $portVersion compat >= 5
+	cmd:xzfgrep$commandSuffix = $portVersion compat >= 5
+	cmd:xzgrep$commandSuffix = $portVersion compat >= 5
+	cmd:xzless$commandSuffix = $portVersion compat >= 5
+	cmd:xzmore$commandSuffix = $portVersion compat >= 5
+	lib:liblzma$secondaryArchSuffix = $portVersion compat >= 5
+	devel:liblzma$secondaryArchSuffix = $portVersion compat >= 5
+	"
+REQUIRES="
+	haiku$secondaryArchSuffix >= $haikuVersion
+	"
+BUILD_REQUIRES="
+	"
+BUILD_PREREQUIRES="
+	haiku${secondaryArchSuffix}_devel >= $haikuVersion
+	cmd:gcc$secondaryArchSuffix
+	cmd:ld$secondaryArchSuffix
+	cmd:libtoolize
+	cmd:make
+	"
+
+SOURCE_DIR="xz-$portVersion"
+
+BUILD()
+{
+	touch po/t-cs.gmo
+	runConfigure --omit-dirs binDir ./configure --bindir=$commandBinDir
+	make $jobArgs
+}
+
+INSTALL()
+{
+	make install
+
+	expanderRulesDir=$dataDir/expander/rules
+	mkdir -p $expanderRulesDir
+	cp "$portDir/additional-files/xz_utils-expander-rules" \
+		"$expanderRulesDir/xz_utils"
+
+	fixPkgconfig liblzma
+	prepareInstalledDevelLibs liblzma
+}
+
+TEST()
+{
+	make check
+}
+
+DESCRIPTION="
+XZ Utils is free general-purpose data compression software with high \
+compression ratio. XZ Utils were written for POSIX-like systems, but also work \
+on some not-so-POSIX systems. XZ Utils are the successor to LZMA Utils.
+The core of the XZ Utils compression code is based on LZMA SDK, but it has \
+been modified quite a lot to be suitable for XZ Utils. The primary compression \
+algorithm is currently LZMA2, which is used inside the .xz container format. \
+With typical files, XZ Utils create 30 % smaller output than gzip and 15 % \
+smaller output than bzip2.
+XZ Utils consist of several components:
+* liblzma is a compression library with API similar to that of zlib.
+* xz is a command line tool with syntax similar to that of gzip.
+* xzdec is a decompression-only tool smaller than the full-featured xz tool.
+* A set of shell scripts (xzgrep, xzdiff, etc.) have been adapted from gzip to \
+ease viewing, grepping, and comparing compressed files.
+* Emulation of command line tools of LZMA Utils eases transition from LZMA \
+Utils to XZ Utils.
+While liblzma has a zlib-like API, liblzma doesn't include any file I/O \
+functions. A separate I/O library is planned, which would abstract handling of \
+.gz, .bz2, and .xz files with an easy to use API.
+"
diff --git a/app-arch/zip/patches/zip-3.0.patch b/app-arch/zip/patches/zip-3.0.patch
deleted file mode 100644
index b3c73159c..000000000
--- a/app-arch/zip/patches/zip-3.0.patch
+++ /dev/null
@@ -1,122 +0,0 @@
-diff -Naur zip30-original/beos/beos.c zip30/beos/beos.c
---- zip30-original/beos/beos.c	2009-04-12 17:23:24.000000000 +0000
-+++ zip30/beos/beos.c	2009-04-12 15:11:50.000000000 +0000
-@@ -31,8 +31,12 @@
- 
- #include <kernel/fs_attr.h>
- #include <storage/Mime.h>
-+#ifdef __BEOS__
- #include <support/byteorder.h>
--
-+#endif
-+#ifdef __HAIKU__
-+#include <support/ByteOrder.h>
-+#endif
- 
- #define PAD 0
- #define PATH_END '/'
-diff -Naur zip30-original/tailor.h zip30/tailor.h
---- zip30-original/tailor.h	2009-04-12 17:23:24.000000000 +0000
-+++ zip30/tailor.h	2009-04-12 15:15:56.000000000 +0000
-@@ -52,7 +52,7 @@
- #include "atheos/osdep.h"
- #endif
- 
--#ifdef __BEOS__
-+#if (defined(__BEOS__) || defined(__HAIKU__))
- #include "beos/osdep.h"
- #endif
- 
-@@ -835,7 +835,7 @@
- #ifdef MVS
- #  define OS_CODE  0xf00
- #endif
--#ifdef __BEOS__
-+#if (defined(__BEOS__) || defined(__HAIKU__))
- #  define OS_CODE  0x1000
- #endif
- #ifdef TANDEM
-diff -Naur zip30-original/ttyio.c zip30/ttyio.c
---- zip30-original/ttyio.c	2009-04-12 17:23:25.000000000 +0000
-+++ zip30/ttyio.c	2009-04-12 14:05:26.000000000 +0000
-@@ -52,7 +52,7 @@
- #  define GLOBAL(g) G.g
- #endif
- 
--#if (defined(__ATHEOS__) || defined(__BEOS__))  /* why yes, we do */
-+#if (defined(__ATHEOS__) || defined(__BEOS__) || defined(__HAIKU__))  /* why yes, we do */
- #  define HAVE_TERMIOS_H
- #endif
- 
-diff -Naur zip30-original/ttyio.h zip30/ttyio.h
---- zip30-original/ttyio.h	2009-04-12 17:23:25.000000000 +0000
-+++ zip30/ttyio.h	2009-04-12 14:06:12.000000000 +0000
-@@ -60,7 +60,7 @@
- #  endif
- #endif
- 
--#if (defined(__ATHEOS__) || defined(__BEOS__) || defined(UNIX))
-+#if (defined(__ATHEOS__) || defined(__BEOS__) || defined(__HAIKU__) || defined(UNIX))
- #  ifndef ATH_BEO_UNX
- #    define ATH_BEO_UNX
- #  endif
-diff -Naur zip30-original/zip.c zip30/zip.c
---- zip30-original/zip.c	2009-04-12 17:23:25.000000000 +0000
-+++ zip30/zip.c	2009-04-12 14:06:31.000000000 +0000
-@@ -1845,7 +1845,7 @@
- int set_filetype(out_path)
-   char *out_path;
- {
--#ifdef __BEOS__
-+#if (defined(__BEOS__) || defined(__HAIKU__))
-   /* Set the filetype of the zipfile to "application/zip" */
-   setfiletype( out_path, "application/zip" );
- #endif
-diff -Naur zip30-original/zipcloak.c zip30/zipcloak.c
---- zip30-original/zipcloak.c	2009-04-12 17:23:25.000000000 +0000
-+++ zip30/zipcloak.c	2009-04-12 14:06:59.000000000 +0000
-@@ -54,7 +54,7 @@
- int set_filetype(out_path)
-   char *out_path;
- {
--#ifdef __BEOS__
-+#if (defined(__BEOS__) || defined(__HAIKU__))
-   /* Set the filetype of the zipfile to "application/zip" */
-   setfiletype( out_path, "application/zip" );
- #endif
-diff -Naur zip30-original/zipnote.c zip30/zipnote.c
---- zip30-original/zipnote.c	2009-04-12 17:23:25.000000000 +0000
-+++ zip30/zipnote.c	2009-04-12 14:07:19.000000000 +0000
-@@ -72,7 +72,7 @@
- int set_filetype(out_path)
-   char *out_path;
- {
--#ifdef __BEOS__
-+#if (defined(__BEOS__) || defined(__HAIKU__))
-   /* Set the filetype of the zipfile to "application/zip" */
-   setfiletype( out_path, "application/zip" );
- #endif
-diff -Naur zip30-original/zipsplit.c zip30/zipsplit.c
---- zip30-original/zipsplit.c	2009-04-12 17:23:25.000000000 +0000
-+++ zip30/zipsplit.c	2009-04-12 14:07:37.000000000 +0000
-@@ -96,7 +96,7 @@
- int set_filetype(out_path)
-   char *out_path;
- {
--#ifdef __BEOS__
-+#if (defined(__BEOS__) || defined(__HAIKU__))
-   /* Set the filetype of the zipfile to "application/zip" */
-   setfiletype( out_path, "application/zip" );
- #endif
-diff -Naur zip30-original/zipup.c zip30/zipup.c
---- zip30-original/zipup.c	2009-04-12 17:23:25.000000000 +0000
-+++ zip30/zipup.c	2009-04-12 14:07:58.000000000 +0000
-@@ -68,7 +68,7 @@
- #  include "atari/zipup.h"
- #endif
- 
--#ifdef __BEOS__
-+#if (defined(__BEOS__) || defined(__HAIKU__))
- #  include "beos/zipup.h"
- #endif
- 
diff --git a/app-arch/zip/patches/zip-3.0.patchset b/app-arch/zip/patches/zip-3.0.patchset
new file mode 100644
index 000000000..f860bb961
--- /dev/null
+++ b/app-arch/zip/patches/zip-3.0.patchset
@@ -0,0 +1,436 @@
+From 6041b90bd0edc53e7596d2e18119cde24987b314 Mon Sep 17 00:00:00 2001
+From: Kacper Kasper <kacperkasper@gmail.com>
+Date: Thu, 3 Apr 2014 20:58:47 +0000
+Subject: Haiku support
+
+
+diff --git a/beos/Makefile b/beos/Makefile
+index 1b9e613..d66e6e3 100644
+--- a/beos/Makefile
++++ b/beos/Makefile
+@@ -22,16 +22,30 @@ BIND = $(CC)
+ AS   = $(CC) -c
+ CPP  = $(CC) -E
+ 
+-INSTALL = install
++# probably can change this to 'install' if you have it
++INSTALL_PROGRAM = cp
++# probably can change this to 'install -d' if you have it
++# XXX NextStep 3.3 and Openstep 4.x don't know about -p !
++INSTALL_D = mkdir -p
++CHMOD = chmod
++BINFLAGS = 755
++MANFLAGS = 644
+ 
+ # Target directories
+-prefix = /boot/home/config
+-BINDIR = $(prefix)/bin
+-manext = 1
+-MANDIR = $(prefix)/man/man$(manext)
++PREFIX = `finddir B_COMMON_DIRECTORY`
++BINDIR = $(PREFIX)/bin
++MANEXT = 1
++MANDIR = $(PREFIX)/documentation/man
++MANDIRF = $(MANDIR)/man$(MANEXT)
++INCLUDEDIR = `finddir B_SYSTEM_DEVELOP_DIRECTORY`/headers
++LIBDIR = `finddir B_SYSTEM_LIB_DIRECTORY`
+ ZIPMANUAL = MANUAL
+-
+-VERSION = Version 2.3 of __DATE__
++ZIPMANUALcloak = zipcloak.txt
++ZIPMANUALnote = zipnote.txt
++ZIPMANUALsplit = zipsplit.txt
++ZIPMANUALs = zip.txt zipcloak.txt zipnote.txt zipsplit.txt
++PKGDIR = IZzip
++VERSION = Version 3.0
+ 
+ ######################################################################
+ # Things that change:
+@@ -65,14 +79,14 @@ CC:=gcc
+ 
+ # Removed -Wconversion and -Wshadow because of the unnecessary warnings 
+ # they generate. - Sept. 28, 1999
+-CFLAGS:=-O3 -mpentiumpro \
++CFLAGS:=-O3  \
+ 		-Wall -Wno-multichar -Wno-ctor-dtor-privacy \
+ 		-Wbad-function-cast -Woverloaded-virtual \
+-		-I. -I/boot/develop/headers/be/support \
+-	    -I/boot/develop/headers/be/storage \
++		-I. -I$(INCLUDEDIR)/be/support \
++	    -I$(INCLUDEDIR)/be/storage \
+ 	    -DHAVE_DIRENT_H -DPASSWD_FROM_STDIN # -DASMV
+ LFLAGS1:=
+-LFLAGS2:=-L/boot/develop/lib/x86 -lbe -lroot
++LFLAGS2:=-L$(LIBDIR) -lbe -lroot
+ OBJA = #match.o
+ TARGET=$(ZIPS)
+ 
+@@ -88,44 +102,40 @@ all:
+ ######################################################################
+ # Object file lists and other build goodies
+ 
+-# Object file lists
++# object file lists
+ OBJZ = zip.o zipfile.o zipup.o fileio.o util.o globals.o crypt.o ttyio.o \
+-       beos.o crc32.o
++       beos.o crc32.o zbz2err.o setfiletype.o
+ OBJI = deflate.o trees.o
+-# OBJA moved into ifeq block above; we'll use assembly for x86
+-OBJU = zipfile_.o fileio_.o util_.o globals.o beos_.o
++OBJA =
++OCRCU8 =
++OCRCTB = crc32_.o
++OBJU = zipfile_.o fileio_.o util_.o globals.o beos_.o setfiletype.o $(OCRCU8)
+ OBJN = zipnote.o  $(OBJU)
+-OBJC = zipcloak.o $(OBJU) crc32_.o crypt_.o ttyio.o
++OBJC = zipcloak.o $(OBJU) $(OCRCTB) crypt_.o ttyio.o
+ OBJS = zipsplit.o $(OBJU)
+ 
+-# Headers
+ ZIP_H = zip.h ziperr.h tailor.h beos/osdep.h
+ 
+-# What to build?
+-ZIPS = zip zipnote zipsplit zipcloak
+-
+ # suffix rules
+ .SUFFIXES:
+ .SUFFIXES: _.o .o .c .doc .1
+ .c_.o:
+-	rm -f $*_.c; $(LN) $< $*_.c
+-	$(CC) -c $(CFLAGS) -DUTIL $*_.c
+-	rm -f $*_.c
++	$(CC) -c $(CFLAGS) -DUTIL -o $@ $<
+ 
+ .c.o:
+ 	$(CC) -c $(CFLAGS) $<
+ 
+ .1.doc:
+-	groff -man -Tascii $< > $@
++	nroff -man $< | col -bx | uniq > $@
+ 
+-# rules for zip, zipnote, zipcloak, zipsplit, and the Zip MANUAL.
++# rules for zip, zipnote, zipcloak, zipsplit, and the Zip MANUALs.
+ $(OBJZ): $(ZIP_H)
+ $(OBJI): $(ZIP_H)
+ $(OBJN): $(ZIP_H)
+ $(OBJS): $(ZIP_H)
+ $(OBJC): $(ZIP_H)
+-zip.o crc32.o crypt.o fileio.o zipfile.o zipup.o: crc32.h
+-zipcloak.o crc32_.o crypt_.o fileio_.o zipfile_.o: crc32.h
++zip.o zipup.o zipfile.o fileio.o crc32.o crypt.o: crc32.h
++zipcloak.o zipfile_.o fileio_.o crc32_.o crypt_.o: crc32.h
+ zip.o zipup.o crypt.o ttyio.o zipcloak.o crypt_.o: crypt.h
+ zip.o zipup.o zipnote.o zipcloak.o zipsplit.o: revision.h
+ zip.o crypt.o ttyio.o zipcloak.o crypt_.o: ttyio.h
+@@ -134,42 +144,69 @@ zipup.o: beos/zipup.h
+ match.o: match.S
+ 	$(CPP) match.S > _match.s
+ 	$(AS) _match.s
+-	mv -f _match.o match.o
++	mv _match.o match.o
+ 	rm -f _match.s
+ 
++crc_i386.o: crc_i386.S
++	$(CPP) crc_i386.S > _crc_i386.s
++	$(AS) _crc_i386.s
++	mv _crc_i386.o crc_i386.o
++	rm -f _crc_i386.s
++
+ beos.o: beos/beos.c
+ 	$(CC) -c $(CFLAGS) beos/beos.c
+ 
+ beos_.o: beos/beos.c
+-	rm -f $*_.c; $(LN) beos/beos.c $*_.c
+-	$(CC) -c $(CFLAGS) -DUTIL $*_.c
+-	rm -f $*_.c
++	$(CC) -c $(CFLAGS) -DUTIL -o $@ beos/beos.c
++	
++setfiletype.o: beos/setfiletype.c
++	$(CC) -c $(CFLAGS) -o $@ beos/setfiletype.c
++
++ZIPS = zip$E zipcloak$E zipnote$E zipsplit$E
+ 
+ zips: $(ZIPS)
+-zipsman: $(ZIPS) $(ZIPMANUAL)
++zipsman: $(ZIPS) $(ZIPMANUALs)
+ 
+-zip: $(OBJZ) $(OBJI) $(OBJA)
+-	$(BIND) -o zip $(LFLAGS1) $(OBJZ) $(OBJI) $(OBJA) $(LFLAGS2)
+-zipnote: $(OBJN)
+-	$(BIND) -o zipnote $(LFLAGS1) $(OBJN) $(LFLAGS2)
+-zipcloak: $(OBJC)
+-	$(BIND) -o zipcloak $(LFLAGS1) $(OBJC) $(LFLAGS2)
+-zipsplit: $(OBJS)
+-	$(BIND) -o zipsplit $(LFLAGS1) $(OBJS) $(LFLAGS2)
++zip$E: $(OBJZ) $(OBJI) $(OBJA) $(LIB_BZ)
++	$(BIND) -o zip$E $(LFLAGS1) $(OBJZ) $(OBJI) $(OBJA) $(LFLAGS2)
++zipnote$E: $(OBJN)
++	$(BIND) -o zipnote$E $(LFLAGS1) $(OBJN) $(LFLAGS2)
++zipcloak$E: $(OBJC) $(OCRCTB)
++	$(BIND) -o zipcloak$E $(LFLAGS1) $(OBJC) $(LFLAGS2)
++zipsplit$E: $(OBJS)
++	$(BIND) -o zipsplit$E $(LFLAGS1) $(OBJS) $(LFLAGS2)
+ 
+ $(ZIPMANUAL): man/zip.1
+-	groff -man -Tascii man/zip.1 > $(ZIPMANUAL)
++	nroff -man man/zip.1 | col -bx | uniq > $(ZIPMANUAL)
++
++$(ZIPMANUALcloak): man/zipcloak.1
++	nroff -man man/zipcloak.1 | col -bx | uniq > $(ZIPMANUALcloak)
+ 
++$(ZIPMANUALnote): man/zipnote.1
++	nroff -man man/zipnote.1 | col -bx | uniq > $(ZIPMANUALnote)
++
++$(ZIPMANUALsplit): man/zipsplit.1
++	nroff -man man/zipsplit.1 | col -bx | uniq > $(ZIPMANUALsplit)
++	
+ # install
+ install:        $(ZIPS)
+-	$(INSTALL) -m755 $(ZIPS) $(BINDIR)
+-	mkdir -p $(MANDIR)
+-	$(INSTALL) -m644 man/zip.1 $(MANDIR)/zip.$(manext)
++	-$(INSTALL_D) $(BINDIR)
++	$(INSTALL_PROGRAM) $(ZIPS) $(BINDIR)
++	-cd $(BINDIR); $(CHMOD) $(BINFLAGS) $(ZIPS)
++	-$(INSTALL_D) $(MANDIRF)
++	$(INSTALL_PROGRAM) man/zip.1 $(MANDIRF)/zip.$(MANEXT)
++	$(CHMOD) $(MANFLAGS) $(MANDIRF)/zip.$(MANEXT)
++	$(INSTALL_PROGRAM) man/zipcloak.1 $(MANDIRF)/zipcloak.$(MANEXT)
++	$(CHMOD) $(MANFLAGS) $(MANDIRF)/zipcloak.$(MANEXT)
++	$(INSTALL_PROGRAM) man/zipnote.1 $(MANDIRF)/zipnote.$(MANEXT)
++	$(CHMOD) $(MANFLAGS) $(MANDIRF)/zipnote.$(MANEXT)
++	$(INSTALL_PROGRAM) man/zipsplit.1 $(MANDIRF)/zipsplit.$(MANEXT)
++	$(CHMOD) $(MANFLAGS) $(MANDIRF)/zipsplit.$(MANEXT)
+ 
+ uninstall:
+ 	-cd $(BINDIR); rm -f $(ZIPS)
+-	-cd $(MANDIR); rm -f zip.$(manext)
+-
++	-cd $(MANDIRF); rm -f \
++	 zip.$(MANEXT) zipcloak.$(MANEXT) zipnote.$(MANEXT) zipsplit.$(MANEXT)
+ dist: $(ZIPMANUAL)
+ 	zip -u9T zip`sed -e '/VERSION/!d' -e 's/.*"\(.*\)".*/\1/' \
+ 			  -e s/[.]//g -e q revision.h` \
+diff --git a/beos/beos.c b/beos/beos.c
+index d8d16df..d8df5d5 100644
+--- a/beos/beos.c
++++ b/beos/beos.c
+@@ -31,7 +31,7 @@
+ 
+ #include <kernel/fs_attr.h>
+ #include <storage/Mime.h>
+-#include <support/byteorder.h>
++#include <support/ByteOrder.h>
+ 
+ 
+ #define PAD 0
+@@ -851,32 +851,6 @@ int set_extra_field(z, z_utim)
+     return ZE_OK;
+ }
+ 
+-/* ---------------------------------------------------------------------- */
+-/* Set a file's MIME type.                                                */
+-void setfiletype( const char *file, const char *type )
+-{
+-    int fd;
+-    attr_info fa;
+-    ssize_t wrote_bytes;
+-
+-    fd = open( file, O_RDWR );
+-    if( fd < 0 ) {
+-        zipwarn( "can't open zipfile to write file type", "" );
+-        return;
+-    }
+-
+-    fa.type = B_MIME_STRING_TYPE;
+-    fa.size = (off_t)(strlen( type ) + 1);
+-
+-    wrote_bytes = fs_write_attr( fd, BE_FILE_TYPE_NAME, fa.type, 0,
+-                                 type, fa.size );
+-    if( wrote_bytes != (ssize_t)fa.size ) {
+-        zipwarn( "couldn't write complete file type", "" );
+-    }
+-
+-    close( fd );
+-}
+-
+ int deletedir(d)
+ char *d;                /* directory to delete */
+ /* Delete the directory *d if it is empty, do nothing otherwise.
+diff --git a/beos/setfiletype.c b/beos/setfiletype.c
+new file mode 100644
+index 0000000..cd8dd2e
+--- /dev/null
++++ b/beos/setfiletype.c
+@@ -0,0 +1,33 @@
++#include <fcntl.h>
++#include <string.h>
++
++#include <kernel/fs_attr.h>
++#include <storage/Mime.h>
++
++#include "beos/osdep.h"
++
++/* ---------------------------------------------------------------------- */
++/* Set a file's MIME type.                                                */
++void setfiletype( const char *file, const char *type )
++{
++    int fd;
++    attr_info fa;
++    ssize_t wrote_bytes;
++
++    fd = open( file, O_RDWR );
++    if( fd < 0 ) {
++        zipwarn( "can't open zipfile to write file type", "" );
++        return;
++    }
++
++    fa.type = B_MIME_STRING_TYPE;
++    fa.size = (off_t)(strlen( type ) + 1);
++
++    wrote_bytes = fs_write_attr( fd, BE_FILE_TYPE_NAME, fa.type, 0,
++                                 type, fa.size );
++    if( wrote_bytes != (ssize_t)fa.size ) {
++        zipwarn( "couldn't write complete file type", "" );
++    }
++
++    close( fd );
++}
+diff --git a/tailor.h b/tailor.h
+index 272f979..579609a 100644
+--- a/tailor.h
++++ b/tailor.h
+@@ -52,7 +52,7 @@
+ #include "atheos/osdep.h"
+ #endif
+ 
+-#ifdef __BEOS__
++#if (defined(__BEOS__) || defined(__HAIKU__))
+ #include "beos/osdep.h"
+ #endif
+ 
+diff --git a/ttyio.c b/ttyio.c
+index 5899fdc..15cc835 100644
+--- a/ttyio.c
++++ b/ttyio.c
+@@ -52,7 +52,7 @@
+ #  define GLOBAL(g) G.g
+ #endif
+ 
+-#if (defined(__ATHEOS__) || defined(__BEOS__))  /* why yes, we do */
++#if (defined(__ATHEOS__) || defined(__BEOS__) || defined(__HAIKU__))  /* why yes, we do */
+ #  define HAVE_TERMIOS_H
+ #endif
+ 
+diff --git a/ttyio.h b/ttyio.h
+index df6a4ed..5180af1 100644
+--- a/ttyio.h
++++ b/ttyio.h
+@@ -60,7 +60,7 @@
+ #  endif
+ #endif
+ 
+-#if (defined(__ATHEOS__) || defined(__BEOS__) || defined(UNIX))
++#if (defined(__ATHEOS__) || defined(__BEOS__) || defined(__HAIKU__) || defined(UNIX))
+ #  ifndef ATH_BEO_UNX
+ #    define ATH_BEO_UNX
+ #  endif
+diff --git a/zip.c b/zip.c
+index 439821f..173d922 100644
+--- a/zip.c
++++ b/zip.c
+@@ -1845,7 +1845,7 @@ int rename_split(temp_name, out_path)
+ int set_filetype(out_path)
+   char *out_path;
+ {
+-#ifdef __BEOS__
++#if (defined(__BEOS__) || defined(__HAIKU__))
+   /* Set the filetype of the zipfile to "application/zip" */
+   setfiletype( out_path, "application/zip" );
+ #endif
+diff --git a/zip.h b/zip.h
+index ba03160..208a0c7 100644
+--- a/zip.h
++++ b/zip.h
+@@ -78,12 +78,6 @@ freely, subject to the above disclaimer and the following restrictions:
+ 
+ #define ZIP   /* for crypt.c:  include zip password functions, not unzip */
+ 
+-/* Types centralized here for easy modification */
+-#define local static            /* More meaningful outside functions */
+-typedef unsigned char uch;      /* unsigned 8-bit value */
+-typedef unsigned short ush;     /* unsigned 16-bit value */
+-typedef unsigned long ulg;      /* unsigned 32-bit value */
+-
+ /* Set up portability */
+ #include "tailor.h"
+ 
+@@ -129,6 +123,13 @@ typedef unsigned long ulg;      /* unsigned 32-bit value */
+ #  define MATCH shmatch         /* Default for pattern matching: UNIX style */
+ #endif
+ 
++/* Types centralized here for easy modification */
++#define local static            /* More meaningful outside functions */
++typedef unsigned char uch;      /* unsigned 8-bit value */
++typedef unsigned short ush;     /* unsigned 16-bit value */
++typedef unsigned long ulg;      /* unsigned 32-bit value */
++
++
+ /* Structure carrying extended timestamp information */
+ typedef struct iztimes {
+    time_t atime;                /* new access time */
+diff --git a/zipcloak.c b/zipcloak.c
+index 37bd414..f3afc36 100644
+--- a/zipcloak.c
++++ b/zipcloak.c
+@@ -54,7 +54,7 @@ ZCONST uLongf *crc_32_tab;
+ int set_filetype(out_path)
+   char *out_path;
+ {
+-#ifdef __BEOS__
++#if (defined(__BEOS__) || defined(__HAIKU__))
+   /* Set the filetype of the zipfile to "application/zip" */
+   setfiletype( out_path, "application/zip" );
+ #endif
+diff --git a/zipnote.c b/zipnote.c
+index 5e02cb6..315a3de 100644
+--- a/zipnote.c
++++ b/zipnote.c
+@@ -72,7 +72,7 @@ void zipnotewarn(ZCONST char *a, ZCONST char *b);
+ int set_filetype(out_path)
+   char *out_path;
+ {
+-#ifdef __BEOS__
++#if (defined(__BEOS__) || defined(__HAIKU__))
+   /* Set the filetype of the zipfile to "application/zip" */
+   setfiletype( out_path, "application/zip" );
+ #endif
+diff --git a/zipsplit.c b/zipsplit.c
+index 8db76a1..ecced0c 100644
+--- a/zipsplit.c
++++ b/zipsplit.c
+@@ -96,7 +96,7 @@ int talln = 0;          /* number of entries in talls[] */
+ int set_filetype(out_path)
+   char *out_path;
+ {
+-#ifdef __BEOS__
++#if (defined(__BEOS__) || defined(__HAIKU__))
+   /* Set the filetype of the zipfile to "application/zip" */
+   setfiletype( out_path, "application/zip" );
+ #endif
+diff --git a/zipup.c b/zipup.c
+index 39f7d9c..80c3101 100644
+--- a/zipup.c
++++ b/zipup.c
+@@ -68,7 +68,7 @@
+ #  include "atari/zipup.h"
+ #endif
+ 
+-#ifdef __BEOS__
++#if (defined(__BEOS__) || defined(__HAIKU__))
+ #  include "beos/zipup.h"
+ #endif
+ 
+-- 
+1.8.3.4
+
diff --git a/app-arch/zip/zip-3.0.recipe b/app-arch/zip/zip-3.0.recipe
index d5e953e1e..ab36b1ce5 100644
--- a/app-arch/zip/zip-3.0.recipe
+++ b/app-arch/zip/zip-3.0.recipe
@@ -6,30 +6,46 @@ incremental backups and multi-part archives.
 "
 HOMEPAGE="http://www.info-zip.org/Zip.html"
 SRC_URI="http://downloads.sourceforge.net/project/infozip/Zip%203.x%20%28latest%29/3.0/zip30.tar.gz"
+CHECKSUM_SHA256="f0e8bb1f9b7eb0b01285495a2699df3a4b766784c1765a8f1aeedf63c0806369"
 REVISION="1"
-STATUS_HAIKU="broken"
-DEPEND=""
-CHECKSUM_MD5="7b74551e63f8ee6aab6fbc86676c0d37"
+LICENSE="Info-ZIP"
+COPYRIGHT="1990-2008 Info-ZIP"
+
+ARCHITECTURES="x86 x86_gcc2"
+
+PATCHES="$portName-$portVersion.patchset"
+
+PROVIDES="
+	$portName = $portVersion
+	cmd:zip = $portVersion
+	cmd:zipcloak = $portVersion
+	cmd:zipnote = $portVersion
+	cmd:zipsplit = $portVersion
+	"
+REQUIRES="
+	haiku >= $haikuVersion
+	"
+BUILD_REQUIRES="
+	"
+BUILD_PREREQUIRES="
+	haiku_devel >= $haikuVersion
+	cmd:gcc
+	cmd:ld
+	cmd:make
+	"
+	
+SOURCE_DIR="zip30"
+
 BUILD()
 {
-	cd zip30
-	make -f beos/Makefile \
-		PREFIX=`finddir B_COMMON_DIRECTORY` \
-		MANDIR=`finddir B_COMMON_DOCUMENTATION_DIRECTORY`/man
+	make $jobArgs -f beos/Makefile
 }
 
 INSTALL()
 {
-	cd zip30
-	make -f beos/Makefile install
+	make -f beos/Makefile install \
+		BINDIR=$binDir \
+		INCLUDEDIR=$includeDir \
+		LIBDIR=$libDir \
+		MANDIR=$manDir
 }
-
-TEST()
-{
-	cd zip30
-#	make test
-#	make check
-}
-
-#LICENSE="Info-Zip"
-#COPYRIGHT=""
diff --git a/app-benchmarks/bonnie++/bonnie++-1.03e.recipe b/app-benchmarks/bonnie++/bonnie++-1.03e.recipe
index a44ce176c..44068d926 100644
--- a/app-benchmarks/bonnie++/bonnie++-1.03e.recipe
+++ b/app-benchmarks/bonnie++/bonnie++-1.03e.recipe
@@ -20,8 +20,8 @@ COPYRIGHT="1990, Tim Bray
 	1999, Russell Coker"
 HOMEPAGE="http://www.coker.com.au/bonnie++/"
 SRC_URI="http://www.coker.com.au/bonnie++/bonnie++-1.03e.tgz"
+CHECKSUM_SHA256="cb3866116634bf65760b6806be4afa7e24a1cad6f145c876df8721f01ba2e2cb"
 REVISION="1"
-CHECKSUM_MD5="750aa5b5051263a99c6c195888c74968"
 ARCHITECTURES="x86 ?x86_gcc2 ?x86_64"
 
 PROVIDES="
diff --git a/app-benchmarks/ffsb/ffsb-6.0_rc2.recipe b/app-benchmarks/ffsb/ffsb-6.0_rc2.recipe
index c8aecba5b..a6b9b6312 100644
--- a/app-benchmarks/ffsb/ffsb-6.0_rc2.recipe
+++ b/app-benchmarks/ffsb/ffsb-6.0_rc2.recipe
@@ -9,8 +9,8 @@ LICENSE="GNU GPL v2"
 COPYRIGHT="2001-2004 International Business Machines Corp."
 HOMEPAGE="http://sourceforge.net/projects/ffsb" 
 SRC_URI="http://downloads.sourceforge.net/project/ffsb/ffsb/ffsb-6.0-rc2/ffsb-6.0-rc2.tar.bz2"
+CHECKSUM_SHA256="e5867692aae8c9bfbcdc774599022289c4d89c1d90f4dd7101fb9865ac773c71"
 REVISION="1"
-CHECKSUM_MD5="cabfc1021c2ec6c6b168fefc84210891"
 ARCHITECTURES="x86 ?x86_gcc2 ?x86_64"
 
 PROVIDES="
diff --git a/app-benchmarks/piozone/piozone-1.0.recipe b/app-benchmarks/piozone/piozone-1.0.recipe
index 9c685b1be..8db2ca30e 100644
--- a/app-benchmarks/piozone/piozone-1.0.recipe
+++ b/app-benchmarks/piozone/piozone-1.0.recipe
@@ -6,7 +6,7 @@ LICENSE="GNU GPL v2"
 COPYRIGHT="2002 Peter Eriksson"
 HOMEPAGE="http://www.lysator.se/~pen/piozone/" 
 SRC_URI="ftp://ftp.lysator.liu.se/pub/unix/piozone/piozone-1.0.tar.gz"
-CHECKSUM_MD5="e48370a9aa80aed212b18e16c08b9056"
+CHECKSUM_SHA256="0b7f880b72b10664a24b712c22c90b4caab4f0cb1a8c99cba0d1a106fd63d15d"
 REVISION="1"
 ARCHITECTURES="?x86 ?x86_gcc2 ?x86_64"
 
diff --git a/app-cdr/bchunk/bchunk-1.2.0.recipe b/app-cdr/bchunk/bchunk-1.2.0.recipe
index 6893030e7..36515db57 100644
--- a/app-cdr/bchunk/bchunk-1.2.0.recipe
+++ b/app-cdr/bchunk/bchunk-1.2.0.recipe
@@ -10,8 +10,8 @@ LICENSE="GNU GPL v2"
 COPYRIGHT="1998-2004 Heikki Hannikainen"
 HOMEPAGE="http://he.fi/bchunk/"
 SRC_URI="http://he.fi/bchunk/bchunk-1.2.0.tar.gz"
+CHECKSUM_SHA256="afdc9d5e38bdd16f0b8b9d9d382b0faee0b1e0494446d686a08b256446f78b5d"
 REVISION="2"
-CHECKSUM_MD5="6a613da3f34f9a303f202d2e9731d231"
 ARCHITECTURES="x86 x86_gcc2 x86_64"
 
 PROVIDES="
diff --git a/app-cdr/cdrtools/cdrtools-3.01~a07.recipe b/app-cdr/cdrtools/cdrtools-3.01~a07.recipe
index 34eaf72a4..e9736228d 100644
--- a/app-cdr/cdrtools/cdrtools-3.01~a07.recipe
+++ b/app-cdr/cdrtools/cdrtools-3.01~a07.recipe
@@ -23,7 +23,7 @@ LICENSE="
 	CDDL v1
 	"
 SRC_URI="ftp://ftp.berlios.de/pub/cdrecord/alpha/cdrtools-3.01a07.tar.bz2"
-CHECKSUM_MD5="266bae8db7d1e5473555b48c306aa216"
+CHECKSUM_SHA256="cc54fefaf4ed5b6b49b996da1d1ebb1c44e88bbfada5c60e8f76c3a082591428"
 REVISION="3"
 ARCHITECTURES="x86_gcc2 x86 x86_64"
 
diff --git a/app-cdr/cdrtools/cdrtools-3.01~a17.recipe b/app-cdr/cdrtools/cdrtools-3.01~a17.recipe
index 5d78afffe..2bf1cc15a 100644
--- a/app-cdr/cdrtools/cdrtools-3.01~a17.recipe
+++ b/app-cdr/cdrtools/cdrtools-3.01~a17.recipe
@@ -23,7 +23,7 @@ LICENSE="
 	CDDL v1
 	"
 SRC_URI="ftp://ftp.berlios.de/pub/cdrecord/alpha/cdrtools-3.01a17.tar.bz2"
-CHECKSUM_MD5="4cef9db0cf15a770c52d65b00bbee2db"
+CHECKSUM_SHA256="3d613965b213ad83e4be0ba2535e784901839ea4d11a20a2beb6765f0eb76dfa"
 REVISION="1"
 ARCHITECTURES="x86_gcc2 x86"
 
diff --git a/app-cdr/cdrtools/cdrtools-3.01~a18.recipe b/app-cdr/cdrtools/cdrtools-3.01~a18.recipe
index 25cb10e63..dd38107d9 100644
--- a/app-cdr/cdrtools/cdrtools-3.01~a18.recipe
+++ b/app-cdr/cdrtools/cdrtools-3.01~a18.recipe
@@ -24,7 +24,7 @@ LICENSE="
 	CDDL v1
 	"
 SRC_URI="ftp://ftp.berlios.de/pub/cdrecord/alpha/cdrtools-3.01a18.tar.bz2"
-CHECKSUM_MD5="cf3e5dc49c654a87c20b9fa55eb84ed4"
+CHECKSUM_SHA256="7e9ad9e00679bb0c0456455243eb41614a5a3395eebded9371a0c843dd3494d6"
 REVISION="1"
 ARCHITECTURES="x86_gcc2 x86"
 
diff --git a/app-cdr/daa2iso/daa2iso-0.1.7e.recipe b/app-cdr/daa2iso/daa2iso-0.1.7e.recipe
index b343809d5..80c5e6764 100644
--- a/app-cdr/daa2iso/daa2iso-0.1.7e.recipe
+++ b/app-cdr/daa2iso/daa2iso-0.1.7e.recipe
@@ -8,8 +8,9 @@ LICENSE="GNU GPL v2"
 COPYRIGHT="Luigi Auriemma"
 HOMEPAGE="http://aluigi.org/mytoolz.htm#daa2iso"
 SRC_URI="http://aluigi.altervista.org/mytoolz/daa2iso.zip"
+CHECKSUM_SHA256="f5990542bbfb632a18e664bb956d1dfa35b20945881c617af641a9ee8cfbc47b"
+SRC_FILENAME="daa2iso-$portVersion.zip"
 REVISION="1"
-CHECKSUM_MD5="6930ebcd8568e8ade0a175352d4a3481"
 ARCHITECTURES="x86 ?x86_gcc2 ?x86_64"
 
 PROVIDES="
diff --git a/app-crypt/gnupg/gnupg-1.4.11.recipe b/app-crypt/gnupg/gnupg-1.4.11.recipe
index 7aa9d0378..816b44b3d 100644
--- a/app-crypt/gnupg/gnupg-1.4.11.recipe
+++ b/app-crypt/gnupg/gnupg-1.4.11.recipe
@@ -9,7 +9,7 @@ applications.
 "
 HOMEPAGE="http://www.gnupg.org/"
 SRC_URI="ftp://ftp.gnupg.org/gcrypt/gnupg/gnupg-1.4.11.tar.bz2"
-CHECKSUM_MD5="411744e1ef8ce90b87938c4203f001f1"
+CHECKSUM_SHA256="d18ceeac16e554a501170b9bfde611625252d0fe9448685a69c93bf149ee6ef6"
 REVISION="1"
 LICENSE="GNU GPL v3"
 COPYRIGHT="1998-2010 Free Software Foundation, Inc."
diff --git a/app-crypt/gnupg/gnupg-1.4.16.recipe b/app-crypt/gnupg/gnupg-1.4.16.recipe
new file mode 100644
index 000000000..0373d0660
--- /dev/null
+++ b/app-crypt/gnupg/gnupg-1.4.16.recipe
@@ -0,0 +1,56 @@
+SUMMARY="GnuPG is the GNU project's free implementation of the OpenPGP standard."
+DESCRIPTION="
+GnuPG is the GNU project's complete and free implementation of the OpenPGP \
+standard as defined by RFC4880 . GnuPG allows to encrypt and sign your data \
+and communication, features a versatile key management system as well as \
+access modules for all kinds of public key directories. GnuPG, also known as \
+GPG, is a command line tool with features for easy integration with other \
+applications.
+"
+HOMEPAGE="http://www.gnupg.org/"
+SRC_URI="ftp://ftp.gnupg.org/gcrypt/gnupg/gnupg-1.4.16.tar.bz2"
+CHECKSUM_SHA256="7b3b748e6aaa338092a0b26b1730cd9355765b55e3684f58dd70f9a1b00f4a2f"
+REVISION="1"
+LICENSE="GNU GPL v3"
+COPYRIGHT="1998-2010 Free Software Foundation, Inc."
+
+ARCHITECTURES="x86_gcc2 ?x86 ?x86_64"
+
+PROVIDES="gnupg = $portVersion
+	cmd:gpg = $portVersion compat >= 1.4
+	cmd:gpg_zip = $portVersion compat >= 1.4
+	cmd:gpgsplit = $portVersion compat >= 1.4
+	cmd:gpgv = $portVersion compat >= 1.4
+	"
+REQUIRES="
+	haiku >= $haikuVersion
+	lib:libz
+	"
+BUILD_REQUIRES="
+	"
+BUILD_PREREQUIRES="
+	haiku_devel >= $haikuVersion
+	cmd:autoconf
+	cmd:gcc
+	cmd:ld
+	cmd:libtoolize
+	cmd:make
+	"
+
+BUILD()
+{
+	#libtoolize --force --copy --install
+	#autoconf
+	runConfigure ./configure 
+	make $jobArgs
+}
+
+INSTALL()
+{
+	make install
+}
+
+TEST()
+{
+	make check
+}
diff --git a/app-dicts/aspell_en/aspell_en-7.1_0.recipe b/app-dicts/aspell_en/aspell_en-7.1_0.recipe
index 49eedebe9..0a2adb8a6 100644
--- a/app-dicts/aspell_en/aspell_en-7.1_0.recipe
+++ b/app-dicts/aspell_en/aspell_en-7.1_0.recipe
@@ -10,9 +10,9 @@ LICENSE="GNU GPL v2"
 COPYRIGHT="2000-2011 Kevin Atkinson"
 HOMEPAGE="http://aspell.net" 
 SRC_URI="ftp://ftp.gnu.org/gnu/aspell/dict/en/aspell6-en-7.1-0.tar.bz2"
+CHECKSUM_SHA256="ff9df3c2e8c5bb19c6a66078b36a0ef4c4dfb0fcb969e29f7b5345e26d748d0a"
 REVISION="1"
 ARCHITECTURES="x86 x86_gcc2"
-CHECKSUM_MD5="beba5e8f3afd3ed1644653bb685b2dfb"
 
 PROVIDES="
 	aspell_en = $portVersion
diff --git a/app-doc/doxygen/doxygen-1.6.3.recipe b/app-doc/doxygen/doxygen-1.6.3.recipe
index 346c41bce..eefdf0252 100644
--- a/app-doc/doxygen/doxygen-1.6.3.recipe
+++ b/app-doc/doxygen/doxygen-1.6.3.recipe
@@ -23,7 +23,7 @@ HOMEPAGE="http://www.doxygen.org"
 COPYRIGHT="1997-2010 Dimitri van Heesch"
 LICENSE="GNU GPL v2"
 SRC_URI="http://ftp.stack.nl/pub/users/dimitri/doxygen-1.6.3.src.tar.gz"
-CHECKSUM_MD5="2d6ea20a9d850d94321cee78bab7bb87"
+CHECKSUM_SHA256="a3a6524b5fc1da084fd0e081507c99240abaffff85f76ef7b15c9fb3ae248492"
 REVISION="4"
 ARCHITECTURES="x86_gcc2 x86 x86_64"
 
diff --git a/app-editors/nano/nano-2.2.6.recipe b/app-editors/nano/nano-2.2.6.recipe
index 1e9837d8b..6b6fb9740 100644
--- a/app-editors/nano/nano-2.2.6.recipe
+++ b/app-editors/nano/nano-2.2.6.recipe
@@ -13,7 +13,7 @@ functionality. Features include:
 "
 HOMEPAGE="http://www.nano-editor.org/"
 SRC_URI="http://www.nano-editor.org/dist/v2.2/nano-2.2.6.tar.gz"
-CHECKSUM_MD5="03233ae480689a008eb98feb1b599807"
+CHECKSUM_SHA256="be68e133b5e81df41873d32c517b3e5950770c00fc5f4dd23810cd635abce67a"
 LICENSE="GNU GPL v3"
 COPYRIGHT="1999-2010 Free Software Foundation, Inc. "
 REVISION="3"
diff --git a/app-editors/qemacs/qemacs-0.3.3.recipe b/app-editors/qemacs/qemacs-0.3.3.recipe
index 42ff96953..3589eb2db 100644
--- a/app-editors/qemacs/qemacs-0.3.3.recipe
+++ b/app-editors/qemacs/qemacs-0.3.3.recipe
@@ -14,7 +14,7 @@ syntax.
 "
 HOMEPAGE="http://bellard.org/qemacs/"
 SRC_URI="http://bellard.org/qemacs/qemacs-0.3.3.tar.gz"
-CHECKSUM_MD5="42fe8cc431bb9cbbeb898a2c18335990"
+CHECKSUM_SHA256="2ffba66a44783849282199acfcc08707debc7169394a8fd0902626222f27df94"
 REVISION="1"
 LICENSE="GNU LGPL v2.1"
 COPYRIGHT="2000-2003 Fabrice Bellard"
diff --git a/app-editors/vim/vim-7.3.recipe b/app-editors/vim/vim-7.3.recipe
index c96e7fb7c..21e92af03 100644
--- a/app-editors/vim/vim-7.3.recipe
+++ b/app-editors/vim/vim-7.3.recipe
@@ -12,10 +12,10 @@ simple (Notepad-like) way, called evim or Easy Vim.
 "
 HOMEPAGE="http://www.vim.org"
 SRC_URI="ftp://ftp.vim.org/pub/vim/unix/vim-7.3.tar.bz2"
+CHECKSUM_SHA256="5c5d5d6e07f1bbc49b6fe3906ff8a7e39b049928b68195b38e3e3d347100221d"
 COPYRIGHT="Bram Moleenar et al."
 LICENSE="Vim"
 REVISION="1"
-CHECKSUM_MD5="5b9510a17074e2b37d8bb38ae09edbf2"
 ARCHITECTURES="x86_gcc2 x86"
 
 PROVIDES="
diff --git a/app-editors/vim/vim-7.4.recipe b/app-editors/vim/vim-7.4.recipe
index f7a940028..229c72a6d 100644
--- a/app-editors/vim/vim-7.4.recipe
+++ b/app-editors/vim/vim-7.4.recipe
@@ -12,10 +12,10 @@ simple (Notepad-like) way, called evim or Easy Vim.
 "
 HOMEPAGE="http://www.vim.org"
 SRC_URI="ftp://ftp.vim.org/pub/vim/unix/vim-7.4.tar.bz2"
+CHECKSUM_SHA256="d0f5a6d2c439f02d97fa21bd9121f4c5abb1f6cd8b5a79d3ca82867495734ade"
 COPYRIGHT="Bram Moleenar et al."
 LICENSE="Vim"
-REVISION="1"
-CHECKSUM_MD5="607e135c559be642f210094ad023dc65"
+REVISION="2"
 ARCHITECTURES="x86_gcc2 x86 x86_64"
 
 PROVIDES="
@@ -28,6 +28,7 @@ PROVIDES="
 	cmd:rgvim = $portVersion
 	cmd:rview = $portVersion
 	cmd:rvim = $portVersion
+	cmd:vi = $portVersion
 	cmd:vim = $portVersion
 	cmd:vimdiff = $portVersion
 	cmd:vimtutor = $portVersion
@@ -37,6 +38,7 @@ PROVIDES="
 REQUIRES="
 	haiku$secondaryArchSuffix >= $haikuVersion
 	lib:libncurses
+	lib:libintl
 "
 BUILD_REQUIRES="
 	ncurses_devel
@@ -47,6 +49,7 @@ BUILD_PREREQUIRES="
 	cmd:make
 	cmd:autoconf
 	cmd:gcc
+	cmd:find
 "
 
 SOURCE_DIR="vim74"
@@ -69,4 +72,9 @@ BUILD()
 INSTALL()
 {
 	make install
+
+	# Make arrow keys, backspace, delete, etc behave as expected.
+	echo "set nocompatible" > $dataDir/vim/vimrc
+
+	ln -s vim $binDir/vi
 }
diff --git a/app-emulation/joyce/joyce-2.2.6.recipe b/app-emulation/joyce/joyce-2.2.6.recipe
new file mode 100644
index 000000000..3f733088a
--- /dev/null
+++ b/app-emulation/joyce/joyce-2.2.6.recipe
@@ -0,0 +1,58 @@
+SUMMARY="JOYCE emulates the Amstrad PCW."
+DESCRIPTION="
+The latest version of JOYCE (2.2.5) includes ANNE, which emulates the PcW16.
+"
+HOMEPAGE="http://www.seasip.demon.co.uk/Unix/Joyce/"
+SRC_URI="http://www.seasip.info/Unix/Joyce/joyce-2.2.6.tar.gz"
+CHECKSUM_SHA256="d92089dc3e583e88973ef6708dc35e649500949086da0a03f973efe3f62c3d8f"
+REVISION="1"
+COPYRIGHT="2002-2012 John Elliott"
+LICENSE="GNU GPL v2"
+
+ARCHITECTURES="x86_gcc2 ?x86 ?x86_64"
+
+PROVIDES="
+	joyce = $portVersion
+	cmd:xjoyce = $portVersion
+	cmd:xanne = $portVersion
+	devel:lib765
+	devel:libcpmredir
+	devel:liblink
+	"
+REQUIRES="
+	haiku
+	lib:libsdl
+	lib:libpng
+	lib:libxml2
+	lib:libz
+	lib:libgl
+	"
+BUILD_REQUIRES="
+	haiku_devel >= $haikuVersion
+	devel:libsdl
+	devel:libpng
+	devel:libxml2
+	devel:libz
+	"
+BUILD_PREREQUIRES="
+	cmd:make
+	cmd:gcc
+	cmd:awk
+	"
+
+PATCHES="joyce-2.2.6.patchset"
+BUILD()
+{
+	runConfigure ./configure
+	make
+}
+
+INSTALL()
+{
+	make install
+
+	# These are already provided in the libdsk package.
+	rm $binDir/apriboot $binDir/dsk* $binDir/md3serial $libDir/libdsk*
+	prepareInstalledDevelLibs lib765 libcpmredir liblink
+}
+
diff --git a/app-emulation/joyce/patches/joyce-2.2.6.patchset b/app-emulation/joyce/patches/joyce-2.2.6.patchset
new file mode 100644
index 000000000..fc5b2be82
--- /dev/null
+++ b/app-emulation/joyce/patches/joyce-2.2.6.patchset
@@ -0,0 +1,64 @@
+From acd7536857589b44814463078787ebe32cc2e519 Mon Sep 17 00:00:00 2001
+From: Adrien Destugues <pulkomandy@pulkomandy.tk>
+Date: Tue, 6 May 2014 13:48:58 +0200
+Subject: Small build fixes for Haiku.
+
+
+diff --git a/LibLink/lib/llparsocket.c b/LibLink/lib/llparsocket.c
+index 6d09d1f..7f723c2 100644
+--- a/LibLink/lib/llparsocket.c
++++ b/LibLink/lib/llparsocket.c
+@@ -21,6 +21,8 @@
+ #include "llparsocket.h"
+ #include "llspacket.h"
+ 
++#include <errno.h>
++
+ #ifdef HAVE_WINSOCK_H
+ #define AGAIN (WSAGetLastError() == WSAEWOULDBLOCK)
+ #else
+diff --git a/cpmredir/lib/cpmdrv.c b/cpmredir/lib/cpmdrv.c
+index 79a872d..fd0511a 100644
+--- a/cpmredir/lib/cpmdrv.c
++++ b/cpmredir/lib/cpmdrv.c
+@@ -22,6 +22,8 @@
+ 
+ #include "cpmint.h"
+ 
++#include <sys/statvfs.h>
++
+ cpm_byte fcb_reset(void)
+ {
+ #ifdef __MSDOS__
+@@ -131,11 +133,11 @@ cpm_word fcb_getdpb(cpm_byte *dpb)
+ #ifndef WIN32
+ /* XXX In WIN32, use some function or other to do this */
+ 
+-        struct statfs buf;
++        struct statvfs buf;
+ 	cpm_word nfiles;
+ 
+ 	/* Get DPB for redir_cpmdrive. Currently just returns a dummy. */
+-        if (!statfs(redir_drive_prefix[redir_cpmdrive], &buf))
++        if (!statvfs(redir_drive_prefix[redir_cpmdrive], &buf))
+ 	{
+ 		/* Store correct directory entry count */
+ 
+@@ -184,12 +186,12 @@ cpm_word fcb_dfree (cpm_byte drive, cpm_byte *dma)
+ 		dfree = 4194303L;
+ 	}
+ #else
+-	struct statfs buf;
++	struct statvfs buf;
+ 	long dfree;
+ 
+ 	if (!redir_drive_prefix[drive]) return 0x01FF;	/* Can't select */
+ 	
+-	if (statfs(redir_drive_prefix[drive], &buf)) return 0x01FF;
++	if (statvfs(redir_drive_prefix[drive], &buf)) return 0x01FF;
+ 
+ 	dfree = (buf.f_bavail * (buf.f_bsize / 128));
+ 
+-- 
+1.8.3.4
+
diff --git a/app-emulation/libdsk/libdsk-1.3.3.recipe b/app-emulation/libdsk/libdsk-1.3.3.recipe
index 8d2b1cf7f..5ff6ac982 100644
--- a/app-emulation/libdsk/libdsk-1.3.3.recipe
+++ b/app-emulation/libdsk/libdsk-1.3.3.recipe
@@ -1,15 +1,14 @@
 SUMMARY="LibDSK is a library for manipulating disk image files"
 HOMEPAGE="http://www.seasip.demon.co.uk/Unix/LibDsk/"
 SRC_URI="http://www.seasip.info/Unix/LibDsk/libdsk-1.3.3.tar.gz"
-REVISION="1"
+CHECKSUM_SHA256="a9186b167934ce5b847f74d2389b6c37084761ea255501dab481051336353606"
+REVISION="2"
 ARCHITECTURES="x86 x86_gcc2"
 SECONDARY_ARCHITECTURES="x86 x86_gcc2"
-CHECKSUM_MD5="2cce41b4b1325d697183e34afcae2a9c"
 
 PROVIDES="
 	libdsk$secondaryArchSuffix = $portVersion
 	lib:libdsk$secondaryArchSuffix = $portVersion
-	devel:libdsk$secondaryArchSuffix = $portVersion
 	"
 
 
@@ -26,6 +25,14 @@ PROVIDES="$PROVIDES
 	"
 fi
 
+PROVIDES_devel="
+	devel:libdsk$secondaryArchSuffix = $portVersion
+"
+
+REQUIRES_devel="
+	libdsk$secondaryArchSuffix == $portVersion base
+"
+
 REQUIRES="
 	haiku$secondaryArchSuffix >= $haikuVersion
 	lib:libz$secondaryArchSuffix
@@ -59,6 +66,8 @@ INSTALL()
 	fi
 
 	prepareInstalledDevelLib libdsk
+
+	packageEntries devel $developDir
 }
 
 COPYRIGHT="2010 John Elliott"
diff --git a/app-emulation/linaro_qemu/linaro_qemu-2014.01.recipe b/app-emulation/linaro_qemu/linaro_qemu-2014.01.recipe
new file mode 100644
index 000000000..2c01e0b63
--- /dev/null
+++ b/app-emulation/linaro_qemu/linaro_qemu-2014.01.recipe
@@ -0,0 +1,106 @@
+SUMMARY="QEMU is a generic and open source machine emulator and virtualizer."
+DESCRIPTION="
+QEMU is a generic and open source machine emulator and virtualizer.
+
+QEMU can run OSes and programs made for one machine (e.g. an ARM board) on a \
+different machine (e.g. your own PC). By using dynamic translation, it \
+achieves very good performance.
+"
+HOMEPAGE="http://wiki.qemu.org/"
+SRC_URI="https://launchpad.net/qemu-linaro/trunk/2014.01/+download/qemu-linaro-1.7.0-2014.01.tar.gz"
+CHECKSUM_SHA256="bd9a2266dd6abc5da8bac1ec9eadd728693911bbfbfe26d2a464e068ad6afd70"
+COPYRIGHT="2003-2014 Fabrice Bellard"
+LICENSE="GNU GPL v2"
+REVISION="1"
+ARCHITECTURES="x86 x86_64"
+if [ $effectiveTargetArchitecture != x86_gcc2 ]; then
+	# x86_gcc2 is fine as primary target architecture as long as we're building
+	# for a different secondary architecture.
+	ARCHITECTURES="$ARCHITECTURES x86_gcc2"
+fi
+SECONDARY_ARCHITECTURES="x86"
+
+PROVIDES="
+	qemu$secondaryArchSuffix = $portVersion
+	cmd:qemu$secondaryArchSuffix = $portVersion
+	cmd:qemu_img$secondaryArchSuffix = $portVersion
+	cmd:qemu_io$secondaryArchSuffix = $portVersion
+	cmd:qemu_system_aarch64$secondaryArchSuffix = $portVersion
+	cmd:qemu_system_alpha$secondaryArchSuffix = $portVersion
+	cmd:qemu_system_arm$secondaryArchSuffix = $portVersion
+	cmd:qemu_system_cris$secondaryArchSuffix = $portVersion
+	cmd:qemu_system_i386$secondaryArchSuffix = $portVersion
+	cmd:qemu_system_lm32$secondaryArchSuffix = $portVersion
+	cmd:qemu_system_m68k$secondaryArchSuffix = $portVersion
+	cmd:qemu_system_microblaze$secondaryArchSuffix = $portVersion
+	cmd:qemu_system_microblazeel$secondaryArchSuffix = $portVersion
+	cmd:qemu_system_mips$secondaryArchSuffix = $portVersion
+	cmd:qemu_system_mips64$secondaryArchSuffix = $portVersion
+	cmd:qemu_system_mips64el$secondaryArchSuffix = $portVersion
+	cmd:qemu_system_mipsel$secondaryArchSuffix = $portVersion
+	cmd:qemu_system_moxie$secondaryArchSuffix = $portVersion
+	cmd:qemu_system_or32$secondaryArchSuffix = $portVersion
+	cmd:qemu_system_ppc$secondaryArchSuffix = $portVersion
+	cmd:qemu_system_ppc64$secondaryArchSuffix = $portVersion
+	cmd:qemu_system_ppcemb$secondaryArchSuffix = $portVersion
+	cmd:qemu_system_s390x$secondaryArchSuffix = $portVersion
+	cmd:qemu_system_sh4$secondaryArchSuffix = $portVersion
+	cmd:qemu_system_sh4eb$secondaryArchSuffix = $portVersion
+	cmd:qemu_system_sparc$secondaryArchSuffix = $portVersion
+	cmd:qemu_system_sparc64$secondaryArchSuffix = $portVersion
+	cmd:qemu_system_unicore32$secondaryArchSuffix = $portVersion
+	cmd:qemu_system_x86_64$secondaryArchSuffix = $portVersion
+	cmd:qemu_system_xtensa$secondaryArchSuffix = $portVersion
+	cmd:qemu_system_xtensaeb$secondaryArchSuffix = $portVersion
+	"
+
+PATCHES="qemu-2.0.0.patchset"
+
+REQUIRES="
+	haiku$secondaryArchSuffix >= $haikuVersion
+	lib:libz$secondaryArchSuffix
+	lib:libintl$secondaryArchSuffix
+	lib:libstdc++$secondaryArchSuffix
+	lib:libsdl$secondaryArchSuffix
+	glib2$secondaryArchSuffix >= 2.12
+	pixman$secondaryArchSuffix
+	"
+
+BUILD_REQUIRES="
+	devel:libz$secondaryArchSuffix
+	devel:libfdt$secondaryArchSuffix
+	devel:libsdl$secondaryArchSuffix
+	glib2${secondaryArchSuffix}_devel >= 2.12
+	pixman${secondaryArchSuffix}_devel
+	"
+
+BUILD_PREREQUIRES="
+	haiku${secondaryArchSuffix}_devel >= $haikuVersion
+	cmd:awk
+	cmd:gcc$secondaryArchSuffix
+	cmd:ld$secondaryArchSuffix
+	cmd:make
+	cmd:find
+	cmd:pkg_config$secondaryArchSuffix
+	cmd:pod2man
+	cmd:python
+	"
+
+SOURCE_DIR="qemu-linaro-1.7.0-2014.01"
+
+BUILD()
+{
+	runConfigure --omit-buildspec ./configure
+	make $jobArgs LDFLAGS=-lbsd
+}
+
+INSTALL()
+{
+	make install
+
+	# provide convenience symlink to just "qemu"
+	ln -s qemu-system-i386 $binDir/qemu
+
+	# Remove empty config file.
+	rm $settingsDir/qemu/target-x86_64.conf
+}
diff --git a/app-emulation/linaro_qemu/patches/qemu-2.0.0.patchset b/app-emulation/linaro_qemu/patches/qemu-2.0.0.patchset
new file mode 100644
index 000000000..052dffe1b
--- /dev/null
+++ b/app-emulation/linaro_qemu/patches/qemu-2.0.0.patchset
@@ -0,0 +1,175 @@
+From 28f3a4ce22d729f7de4bd7f50447dc908e49cc23 Mon Sep 17 00:00:00 2001
+From: Adrien Destugues <pulkomandy@pulkomandy.tk>
+Date: Sun, 20 Apr 2014 19:50:07 +0200
+Subject: Get it to compile on Haiku.
+
+
+diff --git a/main-loop.c b/main-loop.c
+index 8a85493..48a4a74 100644
+--- a/main-loop.c
++++ b/main-loop.c
+@@ -81,7 +81,9 @@ static int qemu_signal_init(void)
+      */
+     sigemptyset(&set);
+     sigaddset(&set, SIG_IPI);
++#ifndef __HAIKU__
+     sigaddset(&set, SIGIO);
++#endif
+     sigaddset(&set, SIGALRM);
+     sigaddset(&set, SIGBUS);
+     pthread_sigmask(SIG_BLOCK, &set, NULL);
+diff --git a/os-posix.c b/os-posix.c
+index cb2a7f7..ae5b02c 100644
+--- a/os-posix.c
++++ b/os-posix.c
+@@ -334,6 +334,9 @@ bool is_daemonized(void)
+ 
+ int os_mlock(void)
+ {
++#ifdef __HAIKU__
++	return ENOSYS;
++#else
+     int ret = 0;
+ 
+     ret = mlockall(MCL_CURRENT | MCL_FUTURE);
+@@ -342,4 +345,5 @@ int os_mlock(void)
+     }
+ 
+     return ret;
++#endif
+ }
+diff --git a/target-xtensa/xtensa-semi.c b/target-xtensa/xtensa-semi.c
+index 424253d..20a6a86 100644
+--- a/target-xtensa/xtensa-semi.c
++++ b/target-xtensa/xtensa-semi.c
+@@ -95,59 +95,53 @@ enum {
+ 
+ static uint32_t errno_h2g(int host_errno)
+ {
+-    static const uint32_t guest_errno[] = {
+-        [EPERM]         = TARGET_EPERM,
+-        [ENOENT]        = TARGET_ENOENT,
+-        [ESRCH]         = TARGET_ESRCH,
+-        [EINTR]         = TARGET_EINTR,
+-        [EIO]           = TARGET_EIO,
+-        [ENXIO]         = TARGET_ENXIO,
+-        [E2BIG]         = TARGET_E2BIG,
+-        [ENOEXEC]       = TARGET_ENOEXEC,
+-        [EBADF]         = TARGET_EBADF,
+-        [ECHILD]        = TARGET_ECHILD,
+-        [EAGAIN]        = TARGET_EAGAIN,
+-        [ENOMEM]        = TARGET_ENOMEM,
+-        [EACCES]        = TARGET_EACCES,
+-        [EFAULT]        = TARGET_EFAULT,
++	switch (host_errno) {
++		case 0: return 0;
++		case EPERM: return TARGET_EPERM;
++		case ENOENT: return TARGET_ENOENT;
++		case ESRCH: return TARGET_ESRCH;
++		case EINTR: return TARGET_EINTR;
++		case EIO: return TARGET_EIO;
++		case ENXIO: return TARGET_ENXIO;
++		case E2BIG: return TARGET_E2BIG;
++		case ENOEXEC: return TARGET_ENOEXEC;
++		case EBADF: return TARGET_EBADF;
++		case ECHILD: return TARGET_ECHILD;
++		case EAGAIN: return TARGET_EAGAIN;
++		case ENOMEM: return TARGET_ENOMEM;
++		case EACCES: return TARGET_EACCES;
++		case EFAULT: return TARGET_EFAULT;
+ #ifdef ENOTBLK
+-        [ENOTBLK]       = TARGET_ENOTBLK,
++		case ENOTBLK: return TARGET_ENOTBLK;
+ #endif
+-        [EBUSY]         = TARGET_EBUSY,
+-        [EEXIST]        = TARGET_EEXIST,
+-        [EXDEV]         = TARGET_EXDEV,
+-        [ENODEV]        = TARGET_ENODEV,
+-        [ENOTDIR]       = TARGET_ENOTDIR,
+-        [EISDIR]        = TARGET_EISDIR,
+-        [EINVAL]        = TARGET_EINVAL,
+-        [ENFILE]        = TARGET_ENFILE,
+-        [EMFILE]        = TARGET_EMFILE,
+-        [ENOTTY]        = TARGET_ENOTTY,
++		case EBUSY: return TARGET_EBUSY;
++		case EEXIST: return TARGET_EEXIST;
++		case EXDEV: return TARGET_EXDEV;
++		case ENODEV: return TARGET_ENODEV;
++		case ENOTDIR: return TARGET_ENOTDIR;
++		case EISDIR: return TARGET_EISDIR;
++		case EINVAL: return TARGET_EINVAL;
++		case ENFILE: return TARGET_ENFILE;
++		case EMFILE: return TARGET_EMFILE;
++		case ENOTTY: return TARGET_ENOTTY;
+ #ifdef ETXTBSY
+-        [ETXTBSY]       = TARGET_ETXTBSY,
++		case ETXTBSY: return TARGET_ETXTBSY;
+ #endif
+-        [EFBIG]         = TARGET_EFBIG,
+-        [ENOSPC]        = TARGET_ENOSPC,
+-        [ESPIPE]        = TARGET_ESPIPE,
+-        [EROFS]         = TARGET_EROFS,
+-        [EMLINK]        = TARGET_EMLINK,
+-        [EPIPE]         = TARGET_EPIPE,
+-        [EDOM]          = TARGET_EDOM,
+-        [ERANGE]        = TARGET_ERANGE,
+-        [ENOSYS]        = TARGET_ENOSYS,
++		case EFBIG: return TARGET_EFBIG;
++		case ENOSPC: return TARGET_ENOSPC;
++		case ESPIPE: return TARGET_ESPIPE;
++		case EROFS: return TARGET_EROFS;
++		case EMLINK: return TARGET_EMLINK;
++		case EPIPE: return TARGET_EPIPE;
++		case EDOM: return TARGET_EDOM;
++		case ERANGE: return TARGET_ERANGE;
++		case ENOSYS: return TARGET_ENOSYS;
+ #ifdef ELOOP
+-        [ELOOP]         = TARGET_ELOOP,
++		case ELOOP: return TARGET_ELOOP;
+ #endif
+     };
+ 
+-    if (host_errno == 0) {
+-        return 0;
+-    } else if (host_errno > 0 && host_errno < ARRAY_SIZE(guest_errno) &&
+-            guest_errno[host_errno]) {
+-        return guest_errno[host_errno];
+-    } else {
+-        return TARGET_EINVAL;
+-    }
++    return TARGET_EINVAL;
+ }
+ 
+ void HELPER(simcall)(CPUXtensaState *env)
+diff --git a/util/compatfd.c b/util/compatfd.c
+index 341ada6..e50416d 100644
+--- a/util/compatfd.c
++++ b/util/compatfd.c
+@@ -17,7 +17,9 @@
+ #include "qemu/compatfd.h"
+ #include "qemu/thread.h"
+ 
++#ifndef __HAIKU__
+ #include <sys/syscall.h>
++#endif
+ 
+ struct sigfd_compat_info
+ {
+diff --git a/util/qemu-openpty.c b/util/qemu-openpty.c
+index 4febfe9..5579646 100644
+--- a/util/qemu-openpty.c
++++ b/util/qemu-openpty.c
+@@ -35,7 +35,9 @@
+ #include "config-host.h"
+ #include "qemu-common.h"
+ 
+-#if defined(__GLIBC__)
++#if defined(__HAIKU__)
++# include <termios.h>
++#elif defined(__GLIBC__)
+ # include <pty.h>
+ #elif defined CONFIG_BSD
+ # include <termios.h>
+-- 
+1.8.3.4
+
diff --git a/app-emulation/qemu/patches/qemu-1.7.0.patchset b/app-emulation/qemu/patches/qemu-1.7.0.patchset
new file mode 100644
index 000000000..24826f60e
--- /dev/null
+++ b/app-emulation/qemu/patches/qemu-1.7.0.patchset
@@ -0,0 +1,108 @@
+From 7eb459b9e4b6ba5ecf3065a603285681f822cc53 Mon Sep 17 00:00:00 2001
+From: Jerome Duval <jerome.duval@gmail.com>
+Date: Wed, 26 Feb 2014 17:02:49 +0000
+Subject: Haiku: adapt configure for x86_64
+
+* don't hardcode arch/cpu.
+* define _POSIX_C_SOURCE for memalign.
+
+diff --git a/configure b/configure
+index 2f11a10..59ed591 100755
+--- a/configure
++++ b/configure
+@@ -583,7 +583,7 @@ Haiku)
+   sysconfdir="${prefix}/etc"
+   bindir="${prefix}"
+   confsuffix=""
+-  CFLAGS="-fno-pic -march=prescott -mtune=core2 $CFLAGS"
++  CFLAGS="$CFLAGS -D_POSIX_C_SOURCE"
+   QEMU_CFLAGS="-DB_USE_POSITIVE_POSIX_ERRORS $QEMU_CFLAGS"
+   LIBS="-lposix_error_mapper -lnetwork -lbe -lbsd -lgame -lmedia -lstdc++ $LIBS"
+ ;;
+-- 
+1.8.3.4
+
+
+From d5e0e5b00c84005d8685b5a76d611d1b39f61c06 Mon Sep 17 00:00:00 2001
+From: Jerome Duval <jerome.duval@gmail.com>
+Date: Wed, 26 Feb 2014 17:19:05 +0000
+Subject: Haiku: don't hardcode types.
+
+
+diff --git a/include/fpu/softfloat.h b/include/fpu/softfloat.h
+index a445506..f3927e2 100644
+--- a/include/fpu/softfloat.h
++++ b/include/fpu/softfloat.h
+@@ -55,24 +55,12 @@ these four paragraphs for those parts of this code that are retained.
+ | to the same as `int'.
+ *----------------------------------------------------------------------------*/
+ typedef uint8_t flag;
+-#ifndef __HAIKU__
+ typedef uint8_t uint8;
+ typedef int8_t int8;
+ typedef unsigned int uint32;
+ typedef signed int int32;
+ typedef uint64_t uint64;
+ typedef int64_t int64;
+-#else
+-// Haiku types
+-typedef signed char int8;
+-typedef unsigned char uint8;
+-typedef short int16;
+-typedef unsigned short uint16;
+-typedef long int32;
+-typedef unsigned long uint32;
+-typedef long long int64;
+-typedef unsigned long long uint64;
+-#endif
+ 
+ #define LIT64( a ) a##LL
+ #define INLINE static inline
+-- 
+1.8.3.4
+
+
+From 22229911497a93086ea5dff35683cf2f5ac63754 Mon Sep 17 00:00:00 2001
+From: Adrien Destugues <pulkomandy@pulkomandy.tk>
+Date: Sun, 20 Apr 2014 12:59:07 +0200
+Subject: Avoid redefinition of int32and uint32
+
+
+diff --git a/include/haiku-include-before.h b/include/haiku-include-before.h
+index 87cde55..4cdb25e 100644
+--- a/include/haiku-include-before.h
++++ b/include/haiku-include-before.h
+@@ -16,4 +16,7 @@
+ #undef atomic_and
+ #undef atomic_or
+ 
++#define int32 haiku_int32
++#define uint32 haiku_uint32
++
+ #endif /* HAIKU_INCLUDE_BEFORE_H */
+diff --git a/ui/haiku.cpp b/ui/haiku.cpp
+index 7b6ce41..2106b82 100644
+--- a/ui/haiku.cpp
++++ b/ui/haiku.cpp
+@@ -57,6 +57,8 @@ static const uint32 kConsoleSelectEvent = 'cons';
+ static const uint32 kShutdownRequest = 'shut';
+ static const uint32 kInvalidationRequest = 'ival';
+ 
++#undef int32
++#undef uint32
+ 
+ // QEMU C interface
+ extern "C" {
+@@ -84,6 +86,9 @@ static	void	haiku_refresh(DisplayChangeListener *dcl);
+ 		void	qemu_system_shutdown_request(void);
+ };
+ 
++#define int32 haiku_int32
++#define uint32 haiku_uint32
++
+ 
+ // Haiku keycode to scancode table
+ static const uint8
+-- 
+1.8.3.4
+
diff --git a/app-emulation/qemu/patches/qemu-2.0.0.patchset b/app-emulation/qemu/patches/qemu-2.0.0.patchset
new file mode 100644
index 000000000..052dffe1b
--- /dev/null
+++ b/app-emulation/qemu/patches/qemu-2.0.0.patchset
@@ -0,0 +1,175 @@
+From 28f3a4ce22d729f7de4bd7f50447dc908e49cc23 Mon Sep 17 00:00:00 2001
+From: Adrien Destugues <pulkomandy@pulkomandy.tk>
+Date: Sun, 20 Apr 2014 19:50:07 +0200
+Subject: Get it to compile on Haiku.
+
+
+diff --git a/main-loop.c b/main-loop.c
+index 8a85493..48a4a74 100644
+--- a/main-loop.c
++++ b/main-loop.c
+@@ -81,7 +81,9 @@ static int qemu_signal_init(void)
+      */
+     sigemptyset(&set);
+     sigaddset(&set, SIG_IPI);
++#ifndef __HAIKU__
+     sigaddset(&set, SIGIO);
++#endif
+     sigaddset(&set, SIGALRM);
+     sigaddset(&set, SIGBUS);
+     pthread_sigmask(SIG_BLOCK, &set, NULL);
+diff --git a/os-posix.c b/os-posix.c
+index cb2a7f7..ae5b02c 100644
+--- a/os-posix.c
++++ b/os-posix.c
+@@ -334,6 +334,9 @@ bool is_daemonized(void)
+ 
+ int os_mlock(void)
+ {
++#ifdef __HAIKU__
++	return ENOSYS;
++#else
+     int ret = 0;
+ 
+     ret = mlockall(MCL_CURRENT | MCL_FUTURE);
+@@ -342,4 +345,5 @@ int os_mlock(void)
+     }
+ 
+     return ret;
++#endif
+ }
+diff --git a/target-xtensa/xtensa-semi.c b/target-xtensa/xtensa-semi.c
+index 424253d..20a6a86 100644
+--- a/target-xtensa/xtensa-semi.c
++++ b/target-xtensa/xtensa-semi.c
+@@ -95,59 +95,53 @@ enum {
+ 
+ static uint32_t errno_h2g(int host_errno)
+ {
+-    static const uint32_t guest_errno[] = {
+-        [EPERM]         = TARGET_EPERM,
+-        [ENOENT]        = TARGET_ENOENT,
+-        [ESRCH]         = TARGET_ESRCH,
+-        [EINTR]         = TARGET_EINTR,
+-        [EIO]           = TARGET_EIO,
+-        [ENXIO]         = TARGET_ENXIO,
+-        [E2BIG]         = TARGET_E2BIG,
+-        [ENOEXEC]       = TARGET_ENOEXEC,
+-        [EBADF]         = TARGET_EBADF,
+-        [ECHILD]        = TARGET_ECHILD,
+-        [EAGAIN]        = TARGET_EAGAIN,
+-        [ENOMEM]        = TARGET_ENOMEM,
+-        [EACCES]        = TARGET_EACCES,
+-        [EFAULT]        = TARGET_EFAULT,
++	switch (host_errno) {
++		case 0: return 0;
++		case EPERM: return TARGET_EPERM;
++		case ENOENT: return TARGET_ENOENT;
++		case ESRCH: return TARGET_ESRCH;
++		case EINTR: return TARGET_EINTR;
++		case EIO: return TARGET_EIO;
++		case ENXIO: return TARGET_ENXIO;
++		case E2BIG: return TARGET_E2BIG;
++		case ENOEXEC: return TARGET_ENOEXEC;
++		case EBADF: return TARGET_EBADF;
++		case ECHILD: return TARGET_ECHILD;
++		case EAGAIN: return TARGET_EAGAIN;
++		case ENOMEM: return TARGET_ENOMEM;
++		case EACCES: return TARGET_EACCES;
++		case EFAULT: return TARGET_EFAULT;
+ #ifdef ENOTBLK
+-        [ENOTBLK]       = TARGET_ENOTBLK,
++		case ENOTBLK: return TARGET_ENOTBLK;
+ #endif
+-        [EBUSY]         = TARGET_EBUSY,
+-        [EEXIST]        = TARGET_EEXIST,
+-        [EXDEV]         = TARGET_EXDEV,
+-        [ENODEV]        = TARGET_ENODEV,
+-        [ENOTDIR]       = TARGET_ENOTDIR,
+-        [EISDIR]        = TARGET_EISDIR,
+-        [EINVAL]        = TARGET_EINVAL,
+-        [ENFILE]        = TARGET_ENFILE,
+-        [EMFILE]        = TARGET_EMFILE,
+-        [ENOTTY]        = TARGET_ENOTTY,
++		case EBUSY: return TARGET_EBUSY;
++		case EEXIST: return TARGET_EEXIST;
++		case EXDEV: return TARGET_EXDEV;
++		case ENODEV: return TARGET_ENODEV;
++		case ENOTDIR: return TARGET_ENOTDIR;
++		case EISDIR: return TARGET_EISDIR;
++		case EINVAL: return TARGET_EINVAL;
++		case ENFILE: return TARGET_ENFILE;
++		case EMFILE: return TARGET_EMFILE;
++		case ENOTTY: return TARGET_ENOTTY;
+ #ifdef ETXTBSY
+-        [ETXTBSY]       = TARGET_ETXTBSY,
++		case ETXTBSY: return TARGET_ETXTBSY;
+ #endif
+-        [EFBIG]         = TARGET_EFBIG,
+-        [ENOSPC]        = TARGET_ENOSPC,
+-        [ESPIPE]        = TARGET_ESPIPE,
+-        [EROFS]         = TARGET_EROFS,
+-        [EMLINK]        = TARGET_EMLINK,
+-        [EPIPE]         = TARGET_EPIPE,
+-        [EDOM]          = TARGET_EDOM,
+-        [ERANGE]        = TARGET_ERANGE,
+-        [ENOSYS]        = TARGET_ENOSYS,
++		case EFBIG: return TARGET_EFBIG;
++		case ENOSPC: return TARGET_ENOSPC;
++		case ESPIPE: return TARGET_ESPIPE;
++		case EROFS: return TARGET_EROFS;
++		case EMLINK: return TARGET_EMLINK;
++		case EPIPE: return TARGET_EPIPE;
++		case EDOM: return TARGET_EDOM;
++		case ERANGE: return TARGET_ERANGE;
++		case ENOSYS: return TARGET_ENOSYS;
+ #ifdef ELOOP
+-        [ELOOP]         = TARGET_ELOOP,
++		case ELOOP: return TARGET_ELOOP;
+ #endif
+     };
+ 
+-    if (host_errno == 0) {
+-        return 0;
+-    } else if (host_errno > 0 && host_errno < ARRAY_SIZE(guest_errno) &&
+-            guest_errno[host_errno]) {
+-        return guest_errno[host_errno];
+-    } else {
+-        return TARGET_EINVAL;
+-    }
++    return TARGET_EINVAL;
+ }
+ 
+ void HELPER(simcall)(CPUXtensaState *env)
+diff --git a/util/compatfd.c b/util/compatfd.c
+index 341ada6..e50416d 100644
+--- a/util/compatfd.c
++++ b/util/compatfd.c
+@@ -17,7 +17,9 @@
+ #include "qemu/compatfd.h"
+ #include "qemu/thread.h"
+ 
++#ifndef __HAIKU__
+ #include <sys/syscall.h>
++#endif
+ 
+ struct sigfd_compat_info
+ {
+diff --git a/util/qemu-openpty.c b/util/qemu-openpty.c
+index 4febfe9..5579646 100644
+--- a/util/qemu-openpty.c
++++ b/util/qemu-openpty.c
+@@ -35,7 +35,9 @@
+ #include "config-host.h"
+ #include "qemu-common.h"
+ 
+-#if defined(__GLIBC__)
++#if defined(__HAIKU__)
++# include <termios.h>
++#elif defined(__GLIBC__)
+ # include <pty.h>
+ #elif defined CONFIG_BSD
+ # include <termios.h>
+-- 
+1.8.3.4
+
diff --git a/app-emulation/qemu/qemu-1.7.0.recipe b/app-emulation/qemu/qemu-1.7.0.recipe
index 74725b0af..bb7338657 100644
--- a/app-emulation/qemu/qemu-1.7.0.recipe
+++ b/app-emulation/qemu/qemu-1.7.0.recipe
@@ -7,62 +7,72 @@ SRC_URI="git+https://github.com/mmlr/qemu-haiku.git#e57972be33c91222a580d47c68b1
 COPYRIGHT="2003-2008 Fabrice Bellard"
 LICENSE="GNU GPL v2"
 REVISION="1"
-ARCHITECTURES="x86"
+ARCHITECTURES="x86 x86_64"
+if [ $effectiveTargetArchitecture != x86_gcc2 ]; then
+	# x86_gcc2 is fine as primary target architecture as long as we're building
+	# for a different secondary architecture.
+	ARCHITECTURES="$ARCHITECTURES x86_gcc2"
+fi
+SECONDARY_ARCHITECTURES="x86"
+
+PATCHES="qemu-1.7.0.patchset"
 
 PROVIDES="
-	qemu = $portVersion
-	cmd:qemu = $portVersion
-	cmd:qemu_img = $portVersion
-	cmd:qemu_io = $portVersion
-	cmd:qemu_system_alpha = $portVersion
-	cmd:qemu_system_arm = $portVersion
-	cmd:qemu_system_cris = $portVersion
-	cmd:qemu_system_i386 = $portVersion
-	cmd:qemu_system_lm32 = $portVersion
-	cmd:qemu_system_m68k = $portVersion
-	cmd:qemu_system_microblaze = $portVersion
-	cmd:qemu_system_microblazeel = $portVersion
-	cmd:qemu_system_mips = $portVersion
-	cmd:qemu_system_mips64 = $portVersion
-	cmd:qemu_system_mips64el = $portVersion
-	cmd:qemu_system_mipsel = $portVersion
-	cmd:qemu_system_moxie = $portVersion
-	cmd:qemu_system_or32 = $portVersion
-	cmd:qemu_system_ppc = $portVersion
-	cmd:qemu_system_ppc64 = $portVersion
-	cmd:qemu_system_ppcemb = $portVersion
-	cmd:qemu_system_s390x = $portVersion
-	cmd:qemu_system_sh4 = $portVersion
-	cmd:qemu_system_sh4eb = $portVersion
-	cmd:qemu_system_sparc = $portVersion
-	cmd:qemu_system_sparc64 = $portVersion
-	cmd:qemu_system_unicore32 = $portVersion
-	cmd:qemu_system_x86_64 = $portVersion
-	cmd:qemu_system_xtensa = $portVersion
-	cmd:qemu_system_xtensaeb = $portVersion
+	qemu$secondaryArchSuffix = $portVersion
+	cmd:qemu$secondaryArchSuffix = $portVersion
+	cmd:qemu_img$secondaryArchSuffix = $portVersion
+	cmd:qemu_io$secondaryArchSuffix = $portVersion
+	cmd:qemu_system_alpha$secondaryArchSuffix = $portVersion
+	cmd:qemu_system_arm$secondaryArchSuffix = $portVersion
+	cmd:qemu_system_cris$secondaryArchSuffix = $portVersion
+	cmd:qemu_system_i386$secondaryArchSuffix = $portVersion
+	cmd:qemu_system_lm32$secondaryArchSuffix = $portVersion
+	cmd:qemu_system_m68k$secondaryArchSuffix = $portVersion
+	cmd:qemu_system_microblaze$secondaryArchSuffix = $portVersion
+	cmd:qemu_system_microblazeel$secondaryArchSuffix = $portVersion
+	cmd:qemu_system_mips$secondaryArchSuffix = $portVersion
+	cmd:qemu_system_mips64$secondaryArchSuffix = $portVersion
+	cmd:qemu_system_mips64el$secondaryArchSuffix = $portVersion
+	cmd:qemu_system_mipsel$secondaryArchSuffix = $portVersion
+	cmd:qemu_system_moxie$secondaryArchSuffix = $portVersion
+	cmd:qemu_system_or32$secondaryArchSuffix = $portVersion
+	cmd:qemu_system_ppc$secondaryArchSuffix = $portVersion
+	cmd:qemu_system_ppc64$secondaryArchSuffix = $portVersion
+	cmd:qemu_system_ppcemb$secondaryArchSuffix = $portVersion
+	cmd:qemu_system_s390x$secondaryArchSuffix = $portVersion
+	cmd:qemu_system_sh4$secondaryArchSuffix = $portVersion
+	cmd:qemu_system_sh4eb$secondaryArchSuffix = $portVersion
+	cmd:qemu_system_sparc$secondaryArchSuffix = $portVersion
+	cmd:qemu_system_sparc64$secondaryArchSuffix = $portVersion
+	cmd:qemu_system_unicore32$secondaryArchSuffix = $portVersion
+	cmd:qemu_system_x86_64$secondaryArchSuffix = $portVersion
+	cmd:qemu_system_xtensa$secondaryArchSuffix = $portVersion
+	cmd:qemu_system_xtensaeb$secondaryArchSuffix = $portVersion
 	"
 
 REQUIRES="
-	haiku >= $haikuVersion
-	lib:libz
-	lib:libintl
-	glib2 >= 2.12
-	pixman
+	haiku$secondaryArchSuffix >= $haikuVersion
+	lib:libz$secondaryArchSuffix
+	lib:libintl$secondaryArchSuffix
+	lib:libstdc++$secondaryArchSuffix
+	glib2$secondaryArchSuffix >= 2.12
+	pixman$secondaryArchSuffix
 	"
 
 BUILD_REQUIRES="
-	devel:libz
-	devel:libfdt
-	glib2_devel >= 2.12
-	pixman_devel
+	devel:libz$secondaryArchSuffix
+	devel:libfdt$secondaryArchSuffix
+	glib2${secondaryArchSuffix}_devel >= 2.12
+	pixman${secondaryArchSuffix}_devel
 	"
 
 BUILD_PREREQUIRES="
-	haiku_devel >= $haikuVersion
-	cmd:gcc
-	cmd:ld
+	haiku${secondaryArchSuffix}_devel >= $haikuVersion
+	cmd:awk
+	cmd:gcc$secondaryArchSuffix
+	cmd:ld$secondaryArchSuffix
 	cmd:make
-	cmd:pkg_config
+	cmd:pkg_config$secondaryArchSuffix
 	cmd:pod2man
 	cmd:python
 	"
diff --git a/app-emulation/qemu/qemu-2.0.0.recipe b/app-emulation/qemu/qemu-2.0.0.recipe
new file mode 100644
index 000000000..1d14d34bd
--- /dev/null
+++ b/app-emulation/qemu/qemu-2.0.0.recipe
@@ -0,0 +1,104 @@
+SUMMARY="QEMU is a generic and open source machine emulator and virtualizer."
+DESCRIPTION="
+QEMU is a generic and open source machine emulator and virtualizer.
+
+QEMU can run OSes and programs made for one machine (e.g. an ARM board) on a \
+different machine (e.g. your own PC). By using dynamic translation, it \
+achieves very good performance.
+"
+HOMEPAGE="http://wiki.qemu.org/"
+SRC_URI="http://wiki.qemu-project.org/download/qemu-2.0.0.tar.bz2"
+CHECKSUM_SHA256="60cc1aa0cad39cec891f970bed60ca8a484f071adad4943123599ac223543a3b"
+COPYRIGHT="2003-2014 Fabrice Bellard"
+LICENSE="GNU GPL v2"
+REVISION="1"
+ARCHITECTURES="x86 x86_64"
+if [ $effectiveTargetArchitecture != x86_gcc2 ]; then
+	# x86_gcc2 is fine as primary target architecture as long as we're building
+	# for a different secondary architecture.
+	ARCHITECTURES="$ARCHITECTURES x86_gcc2"
+fi
+SECONDARY_ARCHITECTURES="x86"
+
+PROVIDES="
+	qemu$secondaryArchSuffix = $portVersion
+	cmd:qemu$secondaryArchSuffix = $portVersion
+	cmd:qemu_img$secondaryArchSuffix = $portVersion
+	cmd:qemu_io$secondaryArchSuffix = $portVersion
+	cmd:qemu_system_aarch64$secondaryArchSuffix = $portVersion
+	cmd:qemu_system_alpha$secondaryArchSuffix = $portVersion
+	cmd:qemu_system_arm$secondaryArchSuffix = $portVersion
+	cmd:qemu_system_cris$secondaryArchSuffix = $portVersion
+	cmd:qemu_system_i386$secondaryArchSuffix = $portVersion
+	cmd:qemu_system_lm32$secondaryArchSuffix = $portVersion
+	cmd:qemu_system_m68k$secondaryArchSuffix = $portVersion
+	cmd:qemu_system_microblaze$secondaryArchSuffix = $portVersion
+	cmd:qemu_system_microblazeel$secondaryArchSuffix = $portVersion
+	cmd:qemu_system_mips$secondaryArchSuffix = $portVersion
+	cmd:qemu_system_mips64$secondaryArchSuffix = $portVersion
+	cmd:qemu_system_mips64el$secondaryArchSuffix = $portVersion
+	cmd:qemu_system_mipsel$secondaryArchSuffix = $portVersion
+	cmd:qemu_system_moxie$secondaryArchSuffix = $portVersion
+	cmd:qemu_system_or32$secondaryArchSuffix = $portVersion
+	cmd:qemu_system_ppc$secondaryArchSuffix = $portVersion
+	cmd:qemu_system_ppc64$secondaryArchSuffix = $portVersion
+	cmd:qemu_system_ppcemb$secondaryArchSuffix = $portVersion
+	cmd:qemu_system_s390x$secondaryArchSuffix = $portVersion
+	cmd:qemu_system_sh4$secondaryArchSuffix = $portVersion
+	cmd:qemu_system_sh4eb$secondaryArchSuffix = $portVersion
+	cmd:qemu_system_sparc$secondaryArchSuffix = $portVersion
+	cmd:qemu_system_sparc64$secondaryArchSuffix = $portVersion
+	cmd:qemu_system_unicore32$secondaryArchSuffix = $portVersion
+	cmd:qemu_system_x86_64$secondaryArchSuffix = $portVersion
+	cmd:qemu_system_xtensa$secondaryArchSuffix = $portVersion
+	cmd:qemu_system_xtensaeb$secondaryArchSuffix = $portVersion
+	"
+
+PATCHES="qemu-$portVersion.patchset"
+
+REQUIRES="
+	haiku$secondaryArchSuffix >= $haikuVersion
+	lib:libz$secondaryArchSuffix
+	lib:libintl$secondaryArchSuffix
+	lib:libstdc++$secondaryArchSuffix
+	lib:libsdl$secondaryArchSuffix
+	glib2$secondaryArchSuffix >= 2.12
+	pixman$secondaryArchSuffix
+	"
+
+BUILD_REQUIRES="
+	devel:libz$secondaryArchSuffix
+	devel:libfdt$secondaryArchSuffix
+	devel:libsdl$secondaryArchSuffix
+	glib2${secondaryArchSuffix}_devel >= 2.12
+	pixman${secondaryArchSuffix}_devel
+	"
+
+BUILD_PREREQUIRES="
+	haiku${secondaryArchSuffix}_devel >= $haikuVersion
+	cmd:awk
+	cmd:gcc$secondaryArchSuffix
+	cmd:ld$secondaryArchSuffix
+	cmd:make
+	cmd:find
+	cmd:pkg_config$secondaryArchSuffix
+	cmd:pod2man
+	cmd:python
+	"
+
+BUILD()
+{
+	runConfigure --omit-buildspec ./configure
+	make $jobArgs LDFLAGS=-lbsd
+}
+
+INSTALL()
+{
+	make install
+
+	# provide convenience symlink to just "qemu"
+	ln -s qemu-system-i386 $binDir/qemu
+
+	# Remove empty config file.
+	rm $settingsDir/qemu/target-x86_64.conf
+}
diff --git a/app-misc/colordiff/colordiff-1.0.13.recipe b/app-misc/colordiff/colordiff-1.0.13.recipe
index 222d97c9b..a37d90217 100644
--- a/app-misc/colordiff/colordiff-1.0.13.recipe
+++ b/app-misc/colordiff/colordiff-1.0.13.recipe
@@ -6,7 +6,7 @@ but with pretty 'syntax' highlighting. Colour schemes can be customized.
 
 HOMEPAGE="http://colordiff.sourceforge.net/"
 SRC_URI="http://www.colordiff.org/colordiff-1.0.13.tar.gz"
-CHECKSUM_MD5="77093f7b31b84622bb59e75a12259ca5"
+CHECKSUM_SHA256="ce2805a130c81545711df94bc00a93545da3f323d835cc38b452d3396ef86c2a"
 REVISION="1"
 ARCHITECTURES="any"
 LICENSE="GNU GPL v2"
diff --git a/app-misc/fdupes/fdupes-1.51.recipe b/app-misc/fdupes/fdupes-1.51.recipe
index ced732e77..25f04a845 100644
--- a/app-misc/fdupes/fdupes-1.51.recipe
+++ b/app-misc/fdupes/fdupes-1.51.recipe
@@ -7,7 +7,7 @@ and then performs a byte-by-byte check for verification.
 "
 HOMEPAGE="http://code.google.com/p/fdupes/"
 SRC_URI="http://fdupes.googlecode.com/files/fdupes-1.51.tar.gz"
-CHECKSUM_MD5="47d0410c90c9e51e450933ba35a32b62"
+CHECKSUM_SHA256="87dbc85b7b9cdb9626e713dd8078bd7487bceb58d47ceaff5404a9e6fd062881"
 COPYRIGHT="1999-2013 Adrian Lopez"
 LICENSE="MIT"
 REVISION="1"
diff --git a/app-misc/getopt/getopt-1.1.5.recipe b/app-misc/getopt/getopt-1.1.5.recipe
index 609921ba4..6607c66a3 100644
--- a/app-misc/getopt/getopt-1.1.5.recipe
+++ b/app-misc/getopt/getopt-1.1.5.recipe
@@ -12,7 +12,7 @@ command-line.
 "
 HOMEPAGE="http://software.frodo.looijaard.name/getopt/" 
 SRC_URI="http://software.frodo.looijaard.name/getopt/files/getopt-1.1.5.tar.gz"
-CHECKSUM_MD5="546acfdb67ba16b8658a45ade9a64d5d"
+CHECKSUM_SHA256="11893276b94b1629606ab75772143918a5713259950fbf4216288e246f19fbb6"
 REVISION="1"
 LICENSE="GNU GPL v2"
 COPYRIGHT="1997-2012 Frodo Looijaard"
diff --git a/app-misc/srm/srm-1.2.12.recipe b/app-misc/srm/srm-1.2.12.recipe
index 3b734d06f..075aa698d 100644
--- a/app-misc/srm/srm-1.2.12.recipe
+++ b/app-misc/srm/srm-1.2.12.recipe
@@ -3,8 +3,8 @@ DESCRIPTION="
 A command-line compatible rm which destroys file contents before unlinking.
 " 
 HOMEPAGE="http://srm.sourceforge.net/" 
-SRC_URI="http://sourceforge.net/projects/srm/files/1.2.12/srm-1.2.12.tar.bz2"
-CHECKSUM_MD5="5c89c96f53ea1a3d671678bec52959a1"
+SRC_URI="http://downloads.sourceforge.net/project/srm/old_releases/1.2.12/srm-1.2.12.tar.bz2"
+CHECKSUM_SHA256="865ce03933dcf61c9dc4e673cd458a902b7f47de8430176aeb2ca0ae78ee8b67"
 REVISION="1"
 LICENSE="MIT (no promotion)"
 COPYRIGHT="2000 Matthew D. Gauthier"
diff --git a/app-shells/bash/bash-4.3.recipe b/app-shells/bash/bash-4.3.recipe
new file mode 100644
index 000000000..3be0ab981
--- /dev/null
+++ b/app-shells/bash/bash-4.3.recipe
@@ -0,0 +1,51 @@
+SUMMARY="The GNU Bourne Again Shell"
+DESCRIPTION="
+Bash is an sh-compatible command language interpreter that \
+executes commands read from the standard input or from a file. Bash also \
+incorporates useful features from the Korn and C shells (ksh and csh).
+"
+HOMEPAGE="http://tiswww.case.edu/php/chet/bash/bashtop.html"
+SRC_URI="ftp://ftp.gnu.org/gnu/bash/bash-4.3.tar.gz"
+CHECKSUM_SHA256="afc687a28e0e24dc21b988fa159ff9dbcf6b7caa92ade8645cc6d5605cd024d4"
+REVISION="1"
+LICENSE="GNU GPL v3"
+COPYRIGHT="1989, Brian Fox; 2010, Chet Ramey"
+
+ARCHITECTURES="?x86_gcc2 ?x86 ?x86_64"
+
+PROVIDES="
+	bash = $portVersion
+	cmd:bash = $portVersion
+	cmd:bashbug = $portVersion
+	"
+
+REQUIRES="
+	haiku >= $haikuVersion
+	lib:libreadline
+	lib:libncursesw
+	"
+
+BUILD_REQUIRES="
+	haiku_devel
+	devel:libreadline
+	devel:libncursesw
+	cmd:gcc
+	cmd:bison
+	cmd:make
+	cmd:awk
+	"
+
+
+#PATCHES="
+#	"
+
+BUILD()
+{
+	runConfigure ./configure --without-bash-malloc --with-installed-readline
+	make $jobArgs
+}
+
+INSTALL()
+{
+	make install
+}
diff --git a/app-shells/dash/dash-0.5.7.recipe b/app-shells/dash/dash-0.5.7.recipe
new file mode 100644
index 000000000..94fc8675f
--- /dev/null
+++ b/app-shells/dash/dash-0.5.7.recipe
@@ -0,0 +1,45 @@
+SUMMARY="POSIX-compliant implementation of /bin/sh."
+DESCRIPTION="
+Dash is a POSIX-compliant implementation of /bin/sh that aims to be as small \
+as possible. It does this without sacrificing speed where possible. In fact, \
+it is significantly faster than bash (the GNU Bourne-Again Shell) for most tasks.
+"
+HOMEPAGE="http://gondor.apana.org/~herbert/dash/"
+SRC_URI="http://gondor.apana.org/~herbert/dash/files/dash-0.5.7.tar.gz"
+CHECKSUM_SHA256="ae89fa9f1145b7748cf0740e1df04cd52fdf8a285da4911dd0f04983efba4e39"
+REVISION="1"
+LICENSE="GNU GPL v3"
+COPYRIGHT="Copyright (c) 1989-1994 The Regents of the University of California. 1997 Christos Zoulas. 1997-2005 Herbert Xu."
+
+ARCHITECTURES="?x86_gcc2 ?x86 !x86_64"
+
+PATCHES="dash-0.5.7.patchset"
+
+PROVIDES="
+	dash = $portVersion
+	cmd:dash = $portVersion
+	"
+
+REQUIRES="
+	haiku >= $haikuVersion
+	lib:libreadline
+	lib:libncursesw
+	"
+
+BUILD_REQUIRES="
+	haiku_devel >= $haikuVersion
+	cmd:gcc
+	cmd:awk
+	cmd:make
+	"
+
+BUILD()
+{
+	runConfigure ./configure
+	make $jobArgs LIBS=-lbsd
+}
+
+INSTALL()
+{
+	make install
+}
diff --git a/app-shells/dash/patches/dash-0.5.7.patchset b/app-shells/dash/patches/dash-0.5.7.patchset
new file mode 100644
index 000000000..fc88d2dc2
--- /dev/null
+++ b/app-shells/dash/patches/dash-0.5.7.patchset
@@ -0,0 +1,21 @@
+From bf0f50131da4ab31343b239a7e4360ffeb82779a Mon Sep 17 00:00:00 2001
+From: Jerome Duval <jerome.duval@gmail.com>
+Date: Sat, 19 Apr 2014 20:07:51 +0000
+Subject: string.h needs __USE_GNU
+
+
+diff --git a/src/mystring.h b/src/mystring.h
+index 083ea98..0381f6c 100644
+--- a/src/mystring.h
++++ b/src/mystring.h
+@@ -35,6 +35,7 @@
+  */
+ 
+ #include <inttypes.h>
++#define __USE_GNU
+ #include <string.h>
+ 
+ extern const char snlfmt[];
+-- 
+1.8.3.4
+
diff --git a/app-shells/zsh/zsh-5.0.2.recipe b/app-shells/zsh/zsh-5.0.2.recipe
index 75dcabf22..bbf1e8775 100644
--- a/app-shells/zsh/zsh-5.0.2.recipe
+++ b/app-shells/zsh/zsh-5.0.2.recipe
@@ -8,7 +8,7 @@ HOMEPAGE="http://www.zsh.org"
 LICENSE="ZSH"
 COPYRIGHT="1992-2013, Paul Falstad, Richard Coleman, Zoltán Hidvégi, Andrew Main, Peter Stephenson, Sven Wishnowsky, and others."
 SRC_URI="http://sourceforge.net/projects/zsh/files/zsh/5.0.2/zsh-5.0.2.tar.bz2"
-CHECKSUM_MD5="b8f2ad691acf58b3252225746480dcad"
+CHECKSUM_SHA256="eb220ae5a8076191ec6b4c6a5a2f18122d074a19f25b45f0320b44b8166c5a03"
 REVISION="1"
 ARCHITECTURES="x86_gcc2 x86 x86_64"
 PATCHES="zsh-5.0.2.patchset"
diff --git a/app-text/aiksaurus/aiksaurus-1.2.1.recipe b/app-text/aiksaurus/aiksaurus-1.2.1.recipe
index ecbedbe5f..8c1fe2112 100644
--- a/app-text/aiksaurus/aiksaurus-1.2.1.recipe
+++ b/app-text/aiksaurus/aiksaurus-1.2.1.recipe
@@ -11,7 +11,7 @@ C++, with some use of Cocoa/ObjC++; wrappers are provided for C and Cocoa/ObjC.
 
 HOMEPAGE="http://aiksaurus.sourceforge.net"
 SRC_URI="http://switch.dl.sourceforge.net/project/aiksaurus/aiksaurus/1.2.1/aiksaurus-1.2.1.tar.gz"
-CHECKSUM_MD5="3eae03b7c49843ccc9262e52846ea6b4"
+CHECKSUM_SHA256="1b62cb6351835217f3c229faba3182ba2aa0ab395849bb894dab422976dc8cf4"
 
 REVISION="1"
 
diff --git a/app-text/antiword/antiword-0.37.recipe b/app-text/antiword/antiword-0.37.recipe
index c9c5e1c65..f823f5fec 100644
--- a/app-text/antiword/antiword-0.37.recipe
+++ b/app-text/antiword/antiword-0.37.recipe
@@ -7,7 +7,7 @@ plain text, PostScript, PDF, and XML/DocBook (experimental).
 "
 HOMEPAGE="http://www.winfield.demon.nl/#Programmer"
 SRC_URI="http://www.winfield.demon.nl/linux/antiword-0.37.tar.gz"
-CHECKSUM_MD5="f868e2a269edcbc06bf77e89a55898d1"
+CHECKSUM_SHA256="8e2c000fcbc6d641b0e6ff95e13c846da3ff31097801e86702124a206888f5ac"
 REVISION="1"
 LICENSE="GNU GPL v2"
 COPYRIGHT="1998-2005 A.J. van Os"
diff --git a/app-text/asciidoc/asciidoc-8.6.8.recipe b/app-text/asciidoc/asciidoc-8.6.8.recipe
index 6689e24f0..9ab93e570 100644
--- a/app-text/asciidoc/asciidoc-8.6.8.recipe
+++ b/app-text/asciidoc/asciidoc-8.6.8.recipe
@@ -11,7 +11,7 @@ HOMEPAGE="http://asciidoc.org"
 LICENSE="GNU GPL v2"
 COPYRIGHT="2002-2011 Stuart Rackham"
 SRC_URI="http://sourceforge.net/projects/asciidoc/files/asciidoc/8.6.8/asciidoc-8.6.8.tar.gz"
-CHECKSUM_MD5="6ffff1ab211f30481741ce4d1e4b12bf"
+CHECKSUM_SHA256="ffb67f59dccaf6f15db72fcd04fdf21a2f9b703d31f94fcd0c49a424a9fcfbc4"
 REVISION="1"
 ARCHITECTURES="x86_gcc2 ?x86"
 
diff --git a/app-text/aspell/aspell-0.60.6.1.recipe b/app-text/aspell/aspell-0.60.6.1.recipe
index 69508c645..d89de9292 100644
--- a/app-text/aspell/aspell-0.60.6.1.recipe
+++ b/app-text/aspell/aspell-0.60.6.1.recipe
@@ -15,9 +15,9 @@ LICENSE="GNU LGPL v2"
 COPYRIGHT="2000-2006 Kevin Atkinson"
 HOMEPAGE="http://aspell.net" 
 SRC_URI="ftp://ftp.gnu.org/gnu/aspell/aspell-0.60.6.1.tar.gz"
+CHECKSUM_SHA256="f52583a83a63633701c5f71db3dc40aab87b7f76b29723aeb27941eff42df6e1"
 REVISION="1"
 ARCHITECTURES="x86 x86_gcc2"
-CHECKSUM_MD5="e66a9c9af6a60dc46134fdacf6ce97d7"
 
 PROVIDES="
 	aspell = $portVersion compat >= 0.60
diff --git a/app-text/discount/discount-2.1.3.recipe b/app-text/discount/discount-2.1.3.recipe
index cb36e9f49..a8fc46179 100644
--- a/app-text/discount/discount-2.1.3.recipe
+++ b/app-text/discount/discount-2.1.3.recipe
@@ -9,11 +9,11 @@ the markdown library.
 
 HOMEPAGE="http://www.pell.portland.or.us/~orc/Code/discount/" 
 SRC_URI="http://www.pell.portland.or.us/~orc/Code/discount/discount-2.1.3.tar.bz2"
+CHECKSUM_SHA256="7280da7a27be42244311912eeee19695623f196817ec08f43b652fcc2ded975d"
 REVISION="1"
 LICENSE="BSD (4-clause)"
 COPYRIGHT="2007-2012 David Loren Parsons"
 ARCHITECTURES="x86 x86_gcc2"
-CHECKSUM_MD5="a1a4eade44f8141e38f2be7f2ed56c98"
 
 PROVIDES="
 	discount = $portVersion compat >= 2
diff --git a/app-text/dos2unix/dos2unix-1.0.recipe b/app-text/dos2unix/dos2unix-1.0.recipe
index b4cc9e89a..b3043e6d5 100644
--- a/app-text/dos2unix/dos2unix-1.0.recipe
+++ b/app-text/dos2unix/dos2unix-1.0.recipe
@@ -2,7 +2,7 @@ SUMMARY="dos2unix and unix2dos end of line file convertors."
 DESCRIPTION="DOS/Windows like to put CR/LF at the end of lines whereas UNIX like to have just LF.  Dos2unix and unix2dos are simple parser/converter command line programs to convert between the two formats." 
 HOMEPAGE="http://www.programmersheaven.com/download/3118/download.aspx" 
 SRC_URI="http://ports-space.haiku-files.org/source/dos2unix-1.0.zip"
-CHECKSUM_MD5="76c4991341219d71072474255714b010"
+CHECKSUM_SHA256="a88941a2ab824deb79e7d012b0df72b5c84d1157af0b2d59b46184fb35b5519d"
 REVISION="1"
 COPYRIGHT="Public Domain"
 LICENSE="Public Domain"
diff --git a/app-text/help2man/help2man-1.43.3.recipe b/app-text/help2man/help2man-1.43.3.recipe
index 73b1755b3..99131ff3a 100644
--- a/app-text/help2man/help2man-1.43.3.recipe
+++ b/app-text/help2man/help2man-1.43.3.recipe
@@ -12,7 +12,7 @@ manual page.
 
 HOMEPAGE="http://www.gnu.org/software/help2man/"
 SRC_URI="http://ftpmirror.gnu.org/help2man/help2man-1.43.3.tar.gz"
-CHECKSUM_MD5="a84868db7c139238df8add5d86a0b54f"
+CHECKSUM_SHA256="67978d118980ebd9f0c60be5db129527900a7b997b9568fc795ba9bdb341d303"
 
 REVISION="1"
 
diff --git a/app-text/help2man/help2man-1.44.1.recipe b/app-text/help2man/help2man-1.44.1.recipe
new file mode 100644
index 000000000..f5b00a3cf
--- /dev/null
+++ b/app-text/help2man/help2man-1.44.1.recipe
@@ -0,0 +1,53 @@
+SUMMARY="Produces simple manual pages from the ‘--help’ and ‘--version’ output of other commands."
+DESCRIPTION="
+help2man is a tool for automatically generating simple manual pages from \
+program output.
+This program is intended to provide an easy way for software authors to \
+include a manual page in their distribution without having to maintain that \
+document.
+Given a program which produces reasonably standard ‘--help’ and ‘--version’ \
+outputs, help2man can re-arrange that output into something which resembles a \
+manual page.
+"
+
+HOMEPAGE="http://www.gnu.org/software/help2man/"
+SRC_URI="http://ftpmirror.gnu.org/help2man/help2man-1.44.1.tar.xz"
+CHECKSUM_SHA256="22de6846771921f455e389cdca07119d7f55b1877685b42dd5bbb9fc1377defb"
+
+REVISION="1"
+
+LICENSE="GNU GPL v3"
+COPYRIGHT="1997-2013 Free Software Foundation"
+
+ARCHITECTURES="?x86_gcc2 x86 x86_64"
+SECONDARY_ARCHITECTURES="?x86_gcc2 x86"
+
+PROVIDES="
+	help2man = $portVersion
+	cmd:help2man$secondaryArchSuffix = $portVersion
+	"
+REQUIRES="
+	haiku$secondaryArchSuffix >= $haikuVersion
+	cmd:perl
+	"
+BUILD_REQUIRES="
+	haiku${secondaryArchSuffix}_devel >= $haikuVersion
+	"
+BUILD_PREREQUIRES="
+	cmd:gcc$secondaryArchSuffix
+	cmd:ld$secondaryArchSuffix
+	cmd:make
+	cmd:perl
+	cmd:awk
+	"
+	
+BUILD()
+{
+	runConfigure ./configure
+	make
+}
+
+INSTALL()
+{
+	make install
+}
diff --git a/app-text/htmldoc/htmldoc-1.8.27.recipe b/app-text/htmldoc/htmldoc-1.8.27.recipe
index 5281111de..2421eb887 100644
--- a/app-text/htmldoc/htmldoc-1.8.27.recipe
+++ b/app-text/htmldoc/htmldoc-1.8.27.recipe
@@ -7,7 +7,7 @@ HOMEPAGE="http://www.msweet.org/projects.php?Z1"
 LICENSE="GNU GPL v2"
 COPYRIGHT="1997-2006 Easy Software Products"
 SRC_URI="http://www.msweet.org/files/project1/htmldoc-1.8.27-source.tar.bz2"
-CHECKSUM_MD5="35589e7b8fe9c54e11be87cd5aec4dcc"
+CHECKSUM_SHA256="89ffd223734268375dc959c200622dc5f167576c5cad9d7ce4bd7567faeb9613"
 REVISION="3"
 ARCHITECTURES="x86_gcc2 x86 x86_64"
 
diff --git a/app-text/htmltidy/htmltidy-20092812.recipe b/app-text/htmltidy/htmltidy-20092812.recipe
index 8a584fc01..4f46dd7eb 100644
--- a/app-text/htmltidy/htmltidy-20092812.recipe
+++ b/app-text/htmltidy/htmltidy-20092812.recipe
@@ -1,18 +1,59 @@
+SUMMARY="Tidy the layout and correct errors in HTML and XML documents." 
 DESCRIPTION="htmltidy - Tidy the layout and correct errors in HTML and XML documents." 
 HOMEPAGE="http://tidy.sourceforge.net/" 
 SRC_URI="cvs://:pserver:anonymous@tidy.cvs.sourceforge.net:/cvsroot/tidy/tidy#12/28/2009"
 REVISION="1"
-STATUS_HAIKU="stable"
-DEPEND=""
 LICENSE="MIT"
 COPYRIGHT="1998-2008 World Wide Web Consortium"
+ARCHITECTURES="x86_gcc2"
+
+PROVIDES="
+	htmltydy = $portVersion
+	cmd:tab2space
+	cmd:tidy
+	lib:libtidy_0.99
+	lib:libtidy
+	"
+
+REQUIRES="
+	haiku$secondaryArchSuffix >= $haikuVersion
+	"
+
+BUILD_REQUIRES="
+	haiku${secondaryArchSuffix}_devel >= $haikuVersion
+	"
+
+BUILD_PREREQUIRES="
+	cmd:gcc$secondaryArchsuffix
+	cmd:as$secondaryArchSuffix
+	cmd:make
+	cmd:libtoolize
+	cmd:autoconf
+	"
+
+PATCHES="$portName-$portVersion.patchset"
 BUILD()
 {
-	cd htmltidy-20092812/build/gmake
+	/bin/sh build/gnuauto/setup.sh
+	runConfigure ./configure
 	make
 }
 INSTALL()
 {
-	cd htmltidy-20092812/build/gmake
-	make installexes installhdrs installib
+	make install
+	prepareInstalledDevelLibs libtidy
+	packageEntries devel $developDir
 }
+TEST()
+{
+	cd test
+	sh testall.sh
+}
+
+PROVIDES_devel="
+	devel:libtidy
+	"
+
+REQUIRES_devel="
+	htmltidy == $portVersion base
+	"
diff --git a/app-text/htmltidy/patches/htmltidy-20092812.patch b/app-text/htmltidy/patches/htmltidy-20092812.patch
deleted file mode 100644
index 66e4c78a6..000000000
--- a/app-text/htmltidy/patches/htmltidy-20092812.patch
+++ /dev/null
@@ -1,69 +0,0 @@
-diff -up htmltidy-20092812/build/gmake/Makefile.orig htmltidy-20092812/build/gmake/Makefile
---- htmltidy-20092812/build/gmake/Makefile.orig	2008-03-22 15:13:38.035389440 -0600
-+++ htmltidy-20092812/build/gmake/Makefile	2010-05-18 13:58:13.713293824 -0600
-@@ -58,8 +58,13 @@ SHELL=/bin/sh
- PROJECT=tidy
- 
- # Installation variables.  Spaces OK, only dir create and file copy operations.
-+ifeq ($(shell uname), Haiku)
-+runinst_prefix=${DESTDIR}/boot/common
-+devinst_prefix=${DESTDIR}/boot/common
-+else
- runinst_prefix=/usr/local
- devinst_prefix=/usr/local
-+endif
- 
- bininst = ${runinst_prefix}/bin
- libinst = ${devinst_prefix}/lib
-@@ -93,7 +98,10 @@ DOCDIR = ${TOPDIR}/htmldoc
- CC= gcc
- CFLAGS= -g -pedantic -Wall -I $(INCDIR)
- # flags only supported with gcc 3.x
-+GCC_MAJOR= $(shell $(CC) -v 2>&1 | grep " version " | cut -d' ' -f3  | cut -d'.' -f1)
-+ifneq ($(GCC_MAJOR), 2)
- CFLAGS += -Wunused-parameter
-+endif
- 
- OTHERCFLAGS=
- OTHERCFLAGS+= -D_DEBUG=1
-diff -up htmltidy-20092812/include/platform.h.orig htmltidy-20092812/include/platform.h
---- htmltidy-20092812/include/platform.h.orig	2008-03-17 06:57:01.048758784 -0600
-+++ htmltidy-20092812/include/platform.h	2010-05-18 13:54:14.034865152 -0600
-@@ -296,6 +296,15 @@ extern "C" {
- #endif
- #endif
- 
-+/* Convenience defines for Haiku platforms */
-+
-+#if defined(__HAIKU__)
-+#define HAIKU_OS
-+#ifndef PLATFORM_NAME
-+#define PLATFORM_NAME "Haiku"
-+#endif
-+#endif
-+
- /* Convenience defines for Cygwin platforms */
- 
- #if defined(__CYGWIN__)
-@@ -417,7 +426,7 @@ extern "C" {
- #if PRESERVE_FILE_TIMES
- 
- #ifndef HAS_FUTIME
--#if defined(CYGWIN_OS) || defined(BE_OS) || defined(OS2_OS) || defined(HPUX_OS) || defined(SOLARIS_OS) || defined(LINUX_OS) || defined(BSD_BASED_OS) || defined(MAC_OS) || defined(__MSL__) || defined(IRIX_OS) || defined(AIX_OS) || defined(__BORLANDC__)
-+#if defined(CYGWIN_OS) || defined(BE_OS) || defined(HAIKU_OS) || defined(OS2_OS) || defined(HPUX_OS) || defined(SOLARIS_OS) || defined(LINUX_OS) || defined(BSD_BASED_OS) || defined(MAC_OS) || defined(__MSL__) || defined(IRIX_OS) || defined(AIX_OS) || defined(__BORLANDC__)
- #define HAS_FUTIME 0
- #else
- #define HAS_FUTIME 1
-@@ -513,10 +522,10 @@ extern "C" {
- 
- /* hack for gnu sys/types.h file which defines uint and ulong */
- 
--#if defined(BE_OS) || defined(SOLARIS_OS) || defined(BSD_BASED_OS) || defined(OSF_OS) || defined(IRIX_OS) || defined(AIX_OS)
-+#if defined(BE_OS) || defined(HAIKU_OS) || defined(SOLARIS_OS) || defined(BSD_BASED_OS) || defined(OSF_OS) || defined(IRIX_OS) || defined(AIX_OS)
- #include <sys/types.h>
- #endif
--#if !defined(HPUX_OS) && !defined(CYGWIN_OS) && !defined(MAC_OS_X) && !defined(BE_OS) && !defined(SOLARIS_OS) && !defined(BSD_BASED_OS) && !defined(OSF_OS) && !defined(IRIX_OS) && !defined(AIX_OS) && !defined(LINUX_OS)
-+#if !defined(HPUX_OS) && !defined(CYGWIN_OS) && !defined(MAC_OS_X) && !defined(BE_OS) && !defined(HAIKU_OS) && !defined(SOLARIS_OS) && !defined(BSD_BASED_OS) && !defined(OSF_OS) && !defined(IRIX_OS) && !defined(AIX_OS) && !defined(LINUX_OS)
- # undef uint
- typedef unsigned int uint;
- #endif
diff --git a/app-text/htmltidy/patches/htmltidy-20092812.patchset b/app-text/htmltidy/patches/htmltidy-20092812.patchset
new file mode 100644
index 000000000..ea11a2def
--- /dev/null
+++ b/app-text/htmltidy/patches/htmltidy-20092812.patchset
@@ -0,0 +1,45 @@
+From 1f39ac359161c8bb06a4f1d8e85465a70298bd5b Mon Sep 17 00:00:00 2001
+From: Adrien Destugues <pulkomandy@pulkomandy.tk>
+Date: Sun, 30 Mar 2014 12:30:32 +0200
+Subject: Fix path of generated binaries for tests.
+
+
+diff --git a/test/testone.sh b/test/testone.sh
+index 8abb3b9..b3dbd0f 100755
+--- a/test/testone.sh
++++ b/test/testone.sh
+@@ -24,7 +24,7 @@ set +f
+ 
+ TESTNO=$1
+ EXPECTED=$2
+-TIDY=../bin/tidy
++TIDY=../console/tidy
+ INFILES=./input/in_${TESTNO}.*ml
+ CFGFILE=./input/cfg_${TESTNO}.txt
+ 
+-- 
+1.8.3.4
+
+
+From 2b3f8f044417309878612b135edff9726553fcad Mon Sep 17 00:00:00 2001
+From: Adrien Destugues <pulkomandy@pulkomandy.tk>
+Date: Sun, 30 Mar 2014 12:30:49 +0200
+Subject: Make file aware of Haiku.
+
+
+diff --git a/include/platform.h b/include/platform.h
+index c30946b..ae7843c 100644
+--- a/include/platform.h
++++ b/include/platform.h
+@@ -417,7 +417,7 @@ extern "C" {
+ #if PRESERVE_FILE_TIMES
+ 
+ #ifndef HAS_FUTIME
+-#if defined(CYGWIN_OS) || defined(BE_OS) || defined(OS2_OS) || defined(HPUX_OS) || defined(SOLARIS_OS) || defined(LINUX_OS) || defined(BSD_BASED_OS) || defined(MAC_OS) || defined(__MSL__) || defined(IRIX_OS) || defined(AIX_OS) || defined(__BORLANDC__)
++#if defined(CYGWIN_OS) || defined(BE_OS) || defined(OS2_OS) || defined(HPUX_OS) || defined(SOLARIS_OS) || defined(LINUX_OS) || defined(BSD_BASED_OS) || defined(MAC_OS) || defined(__MSL__) || defined(IRIX_OS) || defined(AIX_OS) || defined(__BORLANDC__) || defined(__HAIKU__)
+ #define HAS_FUTIME 0
+ #else
+ #define HAS_FUTIME 1
+-- 
+1.8.3.4
+
diff --git a/app-text/hunspell/hunspell-1.3.2.recipe b/app-text/hunspell/hunspell-1.3.2.recipe
index a4e26881a..2b3957155 100644
--- a/app-text/hunspell/hunspell-1.3.2.recipe
+++ b/app-text/hunspell/hunspell-1.3.2.recipe
@@ -1,35 +1,90 @@
-DESCRIPTION="hunspell - spellchecker, forked from myspell" 
-HOMEPAGE="http://hunspell.sourceforge.net/" 
+SUMMARY="Spellchecker, forked from myspell"
+DESCRIPTION="
+	Hunspell is a spell checker and morphological analyzer library and program
+	designed for languages with rich morphology and complex word compounding or
+	character encoding.
+	"
+HOMEPAGE="http://hunspell.sourceforge.net/"
 SRC_URI="http://downloads.sourceforge.net/hunspell/hunspell-1.3.2.tar.gz"
+CHECKSUM_SHA256="b4edd4a4ee944cb9f485b35473e46b729ed768e9d24da8e78e4c4c6ca56addbd"
+LICENSE="
+	GNU GPL v2
+	GNU LGPL v2.1
+	MPL v1.1
+	"
+COPYRIGHT="
+	2007-2011 Hunspell developers et al.
+	2002-2008 László Németh (Hunspell)
+	2001-2002 Kevin Hendricks (MySpell)
+	"
 REVISION="1"
-STATUS_HAIKU="stable"
-DEPEND=""
-CHECKSUM_MD5="3121aaf3e13e5d88dfff13fb4a5f1ab8"
+
+ARCHITECTURES="x86 x86_gcc2"
+
+PROVIDES="
+	$portName = $portVersion
+	cmd:affixcompress = $portVersion
+	cmd:analyze = $portVersion
+	cmd:chmorph = $portVersion
+	cmd:hunspell = $portVersion
+	cmd:hunzip = $portVersion
+	cmd:hzip = $portVersion
+	cmd:ispellaff2myspell = $portVersion
+	cmd:makealias = $portVersion
+	cmd:munch = $portVersion
+	cmd:unmunch = $portVersion
+	cmd:wordforms = $portVersion
+	cmd:wordlist2hunspell = $portVersion
+	lib:libhunspell_1.3 = $portVersion compat >= 1.3
+	"
+REQUIRES="
+	haiku >= $haikuVersion
+	"
+BUILD_REQUIRES="
+	"
+BUILD_PREREQUIRES="
+	haiku_devel >= $haikuVersion
+	cmd:gcc
+	cmd:ld
+	cmd:make
+	cmd:libtoolize
+	cmd:aclocal
+	cmd:autoconf
+	cmd:automake
+	"
+
 BUILD()
 {
-	cd hunspell-1.3.2
 	libtoolize --force --copy --install
 	aclocal -I m4
 	autoconf
-	automake
+	automake --add-missing
 	touch po/t-hu.gmo
 	touch po/t-it.gmo
-	./configure --prefix=`finddir B_COMMON_DIRECTORY` \
-		--mandir=`finddir B_COMMON_DOCUMENTATION_DIRECTORY`/man \
-		--localedir=`finddir B_COMMON_DATA_DIRECTORY`/locale
-	make
+	runConfigure ./configure
+	make $jobArgs
 }
 
 INSTALL()
 {
-	cd hunspell-1.3.2
 	make install
+
+	prepareInstalledDevelLibs libhunspell-1.3 libparsers
+	fixPkgconfig
+
+	packageEntries devel $developDir
 }
 
-LICENSE="GNU GPL v2
-	GNU LGPL v2.1
-	MPL v1.1"
+TEST()
+{
+	make check
+}
 
-COPYRIGHT="2007-2011 Hunspell developers et al.
-	2002-2008 László Németh (Hunspell)
-	2001-2002 Kevin Hendricks (MySpell)"
+PROVIDES_devel="
+	hunspell_devel = $portVersion
+	devel:libhunspell_1.3 = $portVersion compat >= 1.3
+	devel:libparsers = $portVersion compat >= 1.3
+	"
+REQUIRES_devel="
+	hunspell == $portVersion base
+	"
diff --git a/app-text/libpaper/libpaper-1.1.24.recipe b/app-text/libpaper/libpaper-1.1.24.recipe
index ce654f7b0..faad58af5 100644
--- a/app-text/libpaper/libpaper-1.1.24.recipe
+++ b/app-text/libpaper/libpaper-1.1.24.recipe
@@ -5,7 +5,7 @@ paper types and sizes for programs that need to deal with printed output.
 "
 HOMEPAGE="http://packages.debian.org/unstable/source/libpaper"
 SRC_URI="http://ftp.de.debian.org/debian/pool/main/libp/libpaper/libpaper_1.1.24.tar.gz"
-CHECKSUM_MD5="5bc87d494ba470aba54f6d2d51471834"
+CHECKSUM_SHA256="38ac28114673d4b175a939d981e0477a0ed9bcaab27033522ecb2ca78ee90c7e"
 LICENSE="GNU GPL v2"
 COPYRIGHT="1996 Yves Arrouye
 	2000 Adrian Bunk"
diff --git a/app-text/libwpd/libwpd-0.9.6.recipe b/app-text/libwpd/libwpd-0.9.6.recipe
deleted file mode 100644
index 9f95286e3..000000000
--- a/app-text/libwpd/libwpd-0.9.6.recipe
+++ /dev/null
@@ -1,27 +0,0 @@
-DESCRIPTION="libwpd - a library for importing WordPerfect (tm) documents"
-HOMEPAGE="libwpd.sourceforge.net"
-SRC_URI="http://prdownloads.sourceforge.net/libwpd/libwpd-0.9.6.tar.gz?download"
-MESSAGE="This port only builds with gcc4. Use 'setgcc gcc4' before building"
-CHECKSUM_MD5="979fc276bcecb1f3220b529ffa68d52c"
-REVISION="1"
-DEPEND="glib >= 2.0.0
-	libgsf >= 1.6.0"
-BUILD()
-{
-	cd libwpd-0.9.6
-	libtoolize --force --copy --install
-	aclocal
-	autoconf
-	automake
-	./configure --prefix=`finddir B_COMMON_DIRECTORY`
-	make
-}
-
-INSTALL()
-{
-	cd libwpd-0.9.6
-	make install
-}
-LICENSE="GNU GPL v2"
-COPYRIGHT="2002 William Lachance 
-	2002 Marc Maurer"
diff --git a/app-text/libwpd/libwpd-0.9.9.recipe b/app-text/libwpd/libwpd-0.9.9.recipe
new file mode 100644
index 000000000..5e2bf3fc6
--- /dev/null
+++ b/app-text/libwpd/libwpd-0.9.9.recipe
@@ -0,0 +1,84 @@
+SUMMARY="A library for importing WordPerfect (tm) documents"
+DESCRIPTION="
+	libwpd is a C++ library designed to help process WordPerfect documents. It \
+	is most commonly used to import WordPerfect documents into other word \
+	processors (see below), but may be useful in other cases as well.
+	"
+HOMEPAGE="http://libwpd.sourceforge.net"
+SRC_URI="http://prdownloads.sourceforge.net/libwpd/libwpd-0.9.9.tar.gz"
+LICENSE="
+	MPL v2.0
+	GNU LGPL v2.1
+	"
+COPYRIGHT="
+	William Lachance
+	Marc Maurer
+	Fridrich Strba
+	"
+REVISION="2"
+CHECKSUM_SHA256="6d894db0de312dbbef3359c14b967ee4d2bab4e70052c151f2a44dc39b0744b9"
+
+ARCHITECTURES="x86 ?x86_64"
+if [ $effectiveTargetArchitecture != x86_gcc2 ]; then
+	# x86_gcc2 is fine as primary target architecture as long as we're building
+	# for a different secondary architecture.
+	ARCHITECTURES="$ARCHITECTURES x86_gcc2"
+fi
+SECONDARY_ARCHITECTURES="x86"
+
+PROVIDES="
+	$portName$secondaryArchSuffix = $portVersion
+	cmd:wpd2html$secondaryArchSuffix
+	cmd:wpd2raw$secondaryArchSuffix
+	cmd:wpd2text$secondaryArchSuffix
+	lib:libwpd_0.9$secondaryArchSuffix = 9.0.9 compat >= 9
+	lib:libwpd_stream_0.9$secondaryArchSuffix = 9.0.9 compat >= 9
+	"
+REQUIRES="
+	haiku$secondaryArchSuffix >= $haikuVersion
+	lib:libz$secondaryArchSuffix
+	"
+BUILD_REQUIRES="
+	devel:libz$secondaryArchSuffix
+	"
+BUILD_PREREQUIRES="
+	haiku${secondaryArchSuffix}_devel >= $haikuVersion
+	pkgconfig$secondaryArchSuffix >= 0.27
+	cmd:aclocal
+	cmd:libtoolize
+	cmd:autoconf
+	cmd:automake
+	cmd:gcc$secondaryArchSuffix
+	cmd:ld$secondaryArchSuffix
+	cmd:make
+	cmd:awk
+	"
+
+BUILD()
+{
+	libtoolize --force --copy --install
+	aclocal
+	autoconf
+	automake
+	runConfigure ./configure
+	make $jobArgs
+}
+
+INSTALL()
+{
+	make install
+
+	prepareInstalledDevelLibs libwpd-0.9 libwpd-stream-0.9
+	fixPkgconfig
+
+	packageEntries devel $developDir
+}
+
+PROVIDES_devel="
+	libwpd${secondaryArchSuffix}_devel = $portVersion
+	devel:libwpd_0.9$secondaryArchSuffix = 9.0.9 compat >= 9
+	devel:libwpd_stream_0.9$secondaryArchSuffix = 9.0.9 compat >= 9
+	"
+REQUIRES_devel="
+	$portName$secondaryArchSuffix == $portVersion base
+	"
diff --git a/app-text/libwpg/libwpg-0.2.1.recipe b/app-text/libwpg/libwpg-0.2.1.recipe
deleted file mode 100644
index 372c8b985..000000000
--- a/app-text/libwpg/libwpg-0.2.1.recipe
+++ /dev/null
@@ -1,28 +0,0 @@
-DESCRIPTION="
-Libwpg project is a collection of library and tools to work with graphics in \
-WPG (WordPerfect Graphics) format.
-"
-HOMEPAGE="libwpg.sourceforge.net"
-SRC_URI="http://sourceforge.net/projects/libwpg/files/libwpg/libwpg-0.2.1/libwpg-0.2.1.tar.gz/download"
-MESSAGE="This port only builds with gcc4. Use 'setgcc gcc4' before building."
-CHECKSUM_MD5="7f292980b5c458a58bf89ebba1ed07b6"
-REVISION="1"
-DEPEND="pkg-config >= 0.2
-	libwpd >= 0.8"
-BUILD()
-{
-	cd libwpg-0.2.1
-	libtoolize --force --copy --install
-	aclocal
-	autoconf
-	automake
-	./configure --prefix=`finddir B_COMMON_DIRECTORY`
-	make
-}
-INSTALL()
-{
-	cd libwpg-0.2.1
-	make install
-}
-LICENSE="GNU GPL v2"
-COPYRIGHT="2007 Ariya Hidayat"
diff --git a/app-text/libwpg/libwpg-0.2.2.recipe b/app-text/libwpg/libwpg-0.2.2.recipe
new file mode 100644
index 000000000..68fd39386
--- /dev/null
+++ b/app-text/libwpg/libwpg-0.2.2.recipe
@@ -0,0 +1,83 @@
+SUMMARY="The free WPG library, converter and viewer"
+DESCRIPTION="
+	libwpg project is a collection of library and tools to work with graphics \
+	in WPG (WordPerfect Graphics) format.
+	"
+HOMEPAGE="http://libwpg.sourceforge.net"
+SRC_URI="http://downloads.sourceforge.net/project/libwpg/libwpg/libwpg-0.2.2/libwpg-0.2.2.tar.gz"
+LICENSE="
+	MPL v2.0
+	GNU LGPL v2.1
+	"
+COPYRIGHT="
+	Marc Oude Kotte
+	Marc Maurer
+	Ariya Hidayat
+	Fridrich Strba
+	"
+REVISION="2"
+CHECKSUM_SHA256="d5260dd46a9f2bb8ace90379b8afc47fe78f26048bb32abb982b900ef2fb2aa3"
+
+ARCHITECTURES="x86 ?x86_64"
+if [ $effectiveTargetArchitecture != x86_gcc2 ]; then
+	# x86_gcc2 is fine as primary target architecture as long as we're building
+	# for a different secondary architecture.
+	ARCHITECTURES="$ARCHITECTURES x86_gcc2"
+fi
+SECONDARY_ARCHITECTURES="x86"
+
+PROVIDES="
+	$portName$secondaryArchSuffix = $portVersion
+	cmd:wpg2raw$secondaryArchSuffix
+	cmd:wpg2svg$secondaryArchSuffix
+	cmd:wpg2svgbatch.pl$secondaryArchSuffix
+	lib:libwpg_0.2$secondaryArchSuffix = 2.0.2 compat >= 2
+	"
+REQUIRES="
+	haiku$secondaryArchSuffix >= $haikuVersion
+	lib:libwpd_0.9$secondaryArchSuffix
+	lib:libz$secondaryArchSuffix
+	"
+BUILD_REQUIRES="
+	devel:libwpd_0.9$secondaryArchSuffix
+	devel:libz$secondaryArchSuffix
+	"
+BUILD_PREREQUIRES="
+	haiku${secondaryArchSuffix}_devel >= $haikuVersion
+	pkgconfig$secondaryArchSuffix >= 0.27
+	cmd:aclocal
+	cmd:libtoolize
+	cmd:autoconf
+	cmd:automake
+	cmd:gcc$secondaryArchSuffix
+	cmd:ld$secondaryArchSuffix
+	cmd:make
+	"
+
+BUILD()
+{
+	libtoolize --force --copy --install
+	aclocal
+	autoconf
+	automake
+	runConfigure ./configure
+	make $jobArgs
+}
+
+INSTALL()
+{
+	make install
+
+	prepareInstalledDevelLibs libwpg-0.2
+	fixPkgconfig
+
+	packageEntries devel $developDir
+}
+
+PROVIDES_devel="
+	libwpg${secondaryArchSuffix}_devel = $portVersion
+	devel:libwpg_0.2$secondaryArchSuffix = 2.0.2 compat >= 2
+	"
+REQUIRES_devel="
+	$portName$secondaryArchSuffix == $portVersion base
+	"
diff --git a/app-text/mdocml/mdocml-1.12.2.recipe b/app-text/mdocml/mdocml-1.12.2.recipe
index 22bfae2c4..230f85987 100644
--- a/app-text/mdocml/mdocml-1.12.2.recipe
+++ b/app-text/mdocml/mdocml-1.12.2.recipe
@@ -9,7 +9,7 @@ man.
 
 HOMEPAGE="http://mdocml.bsd.lv/"
 SRC_URI="http://mdocml.bsd.lv/snapshots/mdocml-1.12.2.tar.gz"
-CHECKSUM_MD5="aacd171e99d856d003f244f4a9d6c31b"
+CHECKSUM_SHA256="c4f37afbf823636f63e3cd0673ae6c2ffc6017558e86bdcc02dc825c62daa9d7"
 COPYRIGHT="2008-2013 Ingo Schwarze, Kristaps Dzonsons"
 LICENSE="ISC"
 REVISION="1"
diff --git a/app-text/rman/rman-3.2.recipe b/app-text/rman/rman-3.2.recipe
index 0a67ec7cd..a9cf42844 100644
--- a/app-text/rman/rman-3.2.recipe
+++ b/app-text/rman/rman-3.2.recipe
@@ -7,7 +7,7 @@ HOMEPAGE="http://www.sourceforge.net/project/polyglotman"
 LICENSE="Artistic"
 COPYRIGHT="2003 Thomas A. Phelps"
 SRC_URI="http://downloads.sourceforge.net/project/polyglotman/polyglotman/3.2/rman-3.2.tar.gz"
-CHECKSUM_MD5="6d1d67641c6d042595a96a62340d3cc6"
+CHECKSUM_SHA256="68a130696b251966db10a4774e2bc8083a0147b83f64c11e9bb4cd654da32d5f"
 PATCHES="rman-3.2.patch"
 REVISION="1"
 ARCHITECTURES="x86_gcc2 ?x86"
diff --git a/app-text/texi2html/texi2html-1.82.recipe b/app-text/texi2html/texi2html-1.82.recipe
index 4315894cd..e18c38f61 100644
--- a/app-text/texi2html/texi2html-1.82.recipe
+++ b/app-text/texi2html/texi2html-1.82.recipe
@@ -27,7 +27,7 @@ HOMEPAGE="http://www.nongnu.org/texi2html/"
 COPYRIGHT="1999-2005 Patrice Dumas, Derek Price, Adrian Aichner & others."
 LICENSE="GNU GPL v2"
 SRC_URI="http://download.savannah.gnu.org/releases/texi2html/texi2html-1.82.tar.bz2"
-CHECKSUM_MD5="a8a9193c0ac1bec2f3ca7be40a5a82eb"
+CHECKSUM_SHA256="d69c1effc416896409003ea64fdb21152cc0a9a7c665d437a0a3bef9b588b4f1"
 REVISION="2"
 ARCHITECTURES="any"
 
diff --git a/app-text/tree/patches/tree-1.6.0.patch b/app-text/tree/patches/tree-1.6.0.patch
deleted file mode 100644
index 56aaefc17..000000000
--- a/app-text/tree/patches/tree-1.6.0.patch
+++ /dev/null
@@ -1,28 +0,0 @@
-diff -Naur tree-1.6.0/Makefile tree-1.6.0-haiku/Makefile
---- tree-1.6.0/Makefile	2011-06-24 16:25:27.060030976 +0200
-+++ tree-1.6.0-haiku/Makefile	2011-12-18 01:40:48.786169856 +0100
-@@ -31,8 +31,8 @@
- 
- # Linux defaults:
- #CFLAGS=-ggdb -Wall -DLINUX -D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64
--CFLAGS=-O4 -Wall  -DLINUX -D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64
--LDFLAGS=-s
-+#CFLAGS=-O4 -Wall  -DLINUX -D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64
-+#LDFLAGS=-s
- 
- # Uncomment for FreeBSD:
- #CFLAGS=-O2 -Wall -fomit-frame-pointer
-@@ -58,6 +58,13 @@
- #LDFLAGS=
- #OBJS+=strverscmp.o
- 
-+# Uncomment for Haiku:
-+prefix=$(shell finddir B_COMMON_DIRECTORY)
-+MANDIR=$(shell finddir B_COMMON_DOCUMENTATION_DIRECTORY)/man/man1
-+CFLAGS=-O2 -Wall -fomit-frame-pointer
-+LDFLAGS=
-+OBJS+=strverscmp.o
-+
- # Uncomment for HP/UX:
- #CC=cc
- #CFLAGS=-O2 -DAportable -Wall
diff --git a/app-text/tree/patches/tree-1.7.0.patchset b/app-text/tree/patches/tree-1.7.0.patchset
new file mode 100644
index 000000000..3be28bd97
--- /dev/null
+++ b/app-text/tree/patches/tree-1.7.0.patchset
@@ -0,0 +1,34 @@
+From 30e49b8a31a6e43a22c1fa093d9a57fbacb4e710 Mon Sep 17 00:00:00 2001
+From: Jerome Duval <jerome.duval@gmail.com>
+Date: Thu, 24 Apr 2014 16:37:07 +0000
+Subject: Haiku patch
+
+
+diff --git a/Makefile b/Makefile
+index e91f1f6..9ae1149 100644
+--- a/Makefile
++++ b/Makefile
+@@ -30,7 +30,7 @@ OBJS=tree.o unix.o html.o xml.o json.o hash.o color.o
+ # Uncomment options below for your particular OS:
+ 
+ # Linux defaults:
+-CFLAGS=-ggdb -Wall -DLINUX -D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64
++#CFLAGS=-ggdb -Wall -DLINUX -D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64
+ #CFLAGS=-O4 -Wall  -DLINUX -D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64
+ #LDFLAGS=-s
+ 
+@@ -59,6 +59,11 @@ CFLAGS=-ggdb -Wall -DLINUX -D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64
+ #MANDIR=/usr/share/man/man1
+ #OBJS+=strverscmp.o
+ 
++# Uncomment for Haiku:
++CFLAGS=-O2 -Wall -fomit-frame-pointer
++LDFLAGS=
++OBJS+=strverscmp.o
++
+ # Uncomment for HP/UX:
+ #CC=cc
+ #CFLAGS=-O2 -DAportable -Wall
+-- 
+1.8.3.4
+
diff --git a/app-text/tree/tree-1.6.0.recipe b/app-text/tree/tree-1.6.0.recipe
deleted file mode 100644
index 4f1f9ab9e..000000000
--- a/app-text/tree/tree-1.6.0.recipe
+++ /dev/null
@@ -1,23 +0,0 @@
-DESCRIPTION="Lists directories recursively, and produces an indented listing of files."
-HOMEPAGE="http://mama.indstate.edu/users/ice/tree/"
-SRC_URI="http://mama.indstate.edu/users/ice/tree/src/tree-1.6.0.tgz"
-REVISION="1"
-STATUS_HAIKU="stable"
-DEPEND=""
-CHECKSUM_MD5="04e967a3f4108d50cde3b4b0e89e970a"
-BUILD()
-{
-	cd tree-1.6.0
-	make
-}
-
-INSTALL()
-{
-	cd tree-1.6.0
-	make install \
-		BINDIR=${DESTDIR}`finddir B_COMMON_BIN_DIRECTORY` \
-		MANDIR=${DESTDIR}`finddir B_COMMON_DOCUMENTATION_DIRECTORY`/man
-}
-
-LICENSE="GNU GPL v2"
-COPYRIGHT="1996-2011 Steve Baker"
diff --git a/app-text/tree/tree-1.7.0.recipe b/app-text/tree/tree-1.7.0.recipe
new file mode 100644
index 000000000..031ad4075
--- /dev/null
+++ b/app-text/tree/tree-1.7.0.recipe
@@ -0,0 +1,44 @@
+SUMMARY="Lists directories and files recursively."
+DESCRIPTION="
+Lists directories recursively, and produces an indented listing of files.
+"
+
+HOMEPAGE="http://mama.indstate.edu/users/ice/tree/"
+SRC_URI="http://mama.indstate.edu/users/ice/tree/src/tree-$portVersion.tgz"
+CHECKSUM_SHA256="6957c20e82561ac4231638996e74f4cfa4e6faabc5a2f511f0b4e3940e8f7b12"
+
+REVISION="1"
+
+LICENSE="GNU GPL v2"
+COPYRIGHT="1996-2011 Steve Baker"
+
+ARCHITECTURES="x86_gcc2 x86 x86_64"
+SECONDARY_ARCHITECTURES="?x86_gcc2 ?x86"
+
+PATCHES="tree-1.7.0.patchset"
+
+PROVIDES="
+	tree = $portVersion
+	cmd:tree$secondaryArchSuffix = $portVersion
+	"
+REQUIRES="
+	haiku$secondaryArchSuffix >= $haikuVersion
+	"
+BUILD_REQUIRES="
+	haiku${secondaryArchSuffix}_devel >= $haikuVersion
+	"
+BUILD_PREREQUIRES="
+	cmd:gcc$secondaryArchSuffix
+	cmd:ld$secondaryArchSuffix
+	cmd:make
+	"
+	
+BUILD()
+{
+	make
+}
+
+INSTALL()
+{
+	make install MANDIR=$manDir/man1 prefix=$prefix
+}
diff --git a/app-vim/cream/cream-0.43.recipe b/app-vim/cream/cream-0.43.recipe
new file mode 100644
index 000000000..c593a9652
--- /dev/null
+++ b/app-vim/cream/cream-0.43.recipe
@@ -0,0 +1,58 @@
+SUMMARY="a modern configuration of the Vim text editor"
+DESCRIPTION="
+Vim is a powerful and full-featured text editor, the popular descendant of the \
+1976 Vi text editor.
+
+But Vim has a steep learning curve. It was not primarily designed to be easy to \
+use, favoring performance and technical flexibility instead. Because it is so \
+different, learning to use Vim takes time.
+
+Cream shapes Vim into an interface you probably already know (sometimes called \
+Common User Access). Whether you are writing emails or developing large \
+software applications, Cream saves you time and gets you up and running quickly.
+"
+HOMEPAGE="http://cream.sf.net"
+SRC_URI="http://freefr.dl.sourceforge.net/project/$portName/Cream/$portVersion/$portName-$portVersion.tar.gz"
+CHECKSUM_SHA256="b7adee33d5464f985a71722fdbe133e726bffebf34eae14c33674c4c5327d777"
+
+REVISION="1"
+ARCHITECTURES="!any"
+
+PROVIDES="
+	cream = $portVersion
+	cmd:cream
+	"
+
+REQUIRES="
+	cmd:vim == 7.4
+	"
+
+BUILD_REQUIRES="
+	cmd:vim
+	"
+
+BUILD_PREREQUIRES="
+	cmd:which
+	cmd:perl
+	"
+
+BUILD()
+{
+	true
+}
+
+INSTALL()
+{
+	export VIMRUNTIME=$dataDir/vim/vim74/
+	mkdir -p $VIMRUNTIME
+
+	sh INSTALL.sh $prefix
+
+	rm -r $prefix/share # Useless .desktop file
+	addAppDeskbarSymlink $binDir/cream "Cream"
+}
+
+# no TEST script available
+
+COPYRIGHT="2001-2014 Cream contributors"
+LICENSE="GNU GPL v3"
diff --git a/dev-db/db/db-4.8.30.recipe b/dev-db/db/db-4.8.30.recipe
index c66848af8..c6bf1dfa5 100644
--- a/dev-db/db/db-4.8.30.recipe
+++ b/dev-db/db/db-4.8.30.recipe
@@ -2,7 +2,7 @@ SUMMARY="The Oracle Berkeley Database"
 DESCRIPTION="The Oracle Berkeley DB family of open source, embeddable databases provides developers with fast, reliable, local persistence with zero administration." 
 HOMEPAGE="http://www.oracle.com/technetwork/database/berkeleydb/index.html"
 SRC_URI="http://download.oracle.com/berkeley-db/db-${portVersion}.tar.gz"
-CHECKSUM_MD5="f80022099c5742cd179343556179aa8c"
+CHECKSUM_SHA256="e0491a07cdb21fb9aa82773bbbedaeb7639cbd0e7f96147ab46141e0045db72a"
 REVISION="2"
 ARCHITECTURES="x86_gcc2 x86 x86_64"
 SECONDARY_ARCHITECTURES="x86_gcc2 x86"
diff --git a/dev-db/db/db-5.3.28.recipe b/dev-db/db/db-5.3.28.recipe
index a503e433f..6f59d234b 100644
--- a/dev-db/db/db-5.3.28.recipe
+++ b/dev-db/db/db-5.3.28.recipe
@@ -5,7 +5,7 @@ developers with fast, reliable, local persistence with zero administration.
 " 
 HOMEPAGE="http://www.oracle.com/technetwork/database/berkeleydb/index.html"
 SRC_URI="http://download.oracle.com/berkeley-db/db-5.3.28.tar.gz"
-CHECKSUM_MD5="b99454564d5b4479750567031d66fe24"
+CHECKSUM_SHA256="e0a992d740709892e81f9d93f06daf305cf73fb81b545afe72478043172c3628"
 REVISION="3"
 ARCHITECTURES="x86_gcc2 x86 x86_64"
 SECONDARY_ARCHITECTURES="x86_gcc2 x86"
diff --git a/dev-db/db/db-6.0.30.recipe b/dev-db/db/db-6.0.30.recipe
new file mode 100644
index 000000000..88069b905
--- /dev/null
+++ b/dev-db/db/db-6.0.30.recipe
@@ -0,0 +1,96 @@
+SUMMARY="The Oracle Berkeley Database"
+DESCRIPTION="
+The Oracle Berkeley DB family of open source, embeddable databases provides \
+developers with fast, reliable, local persistence with zero administration.
+" 
+HOMEPAGE="http://www.oracle.com/technetwork/database/berkeleydb/index.html"
+SRC_URI="http://download.oracle.com/berkeley-db/db-6.0.30.tar.gz"
+CHECKSUM_SHA256="608e4b1cf390e9bf54c0ef00c5bd9ca76d36e2261b9f4d33d54516f3f6a20fd2"
+REVISION="1"
+ARCHITECTURES="x86_gcc2 x86 x86_64"
+SECONDARY_ARCHITECTURES="x86_gcc2 x86"
+LICENSE="SleepyCat"
+COPYRIGHT="1990-2013, Oracle
+	1990-1995, The Regents of the University of California
+	1996-1996, The President and Fellows of Harvard University
+	2000-2005, INRIA - France Telecom"
+
+PROVIDES="
+	db${secondaryArchSuffix} = $portVersion compat >= 6.0
+	cmd:db_archive${secondaryArchSuffix}
+	cmd:db_checkpoint${secondaryArchSuffix}
+	cmd:db_deadlock${secondaryArchSuffix}
+	cmd:db_dump${secondaryArchSuffix}
+	cmd:db_hotbackup${secondaryArchSuffix}
+	cmd:db_load${secondaryArchSuffix}
+	cmd:db_log_verify${secondaryArchSuffix}
+	cmd:db_printlog${secondaryArchSuffix}
+	cmd:db_recover${secondaryArchSuffix}
+	cmd:db_replicate${secondaryArchSuffix}
+	cmd:db_stat${secondaryArchSuffix}
+	cmd:db_tuner${secondaryArchSuffix}
+	cmd:db_upgrade${secondaryArchSuffix}
+	cmd:db_verify${secondaryArchSuffix}
+	lib:libdb_6.0${secondaryArchSuffix}
+	lib:libdb_6${secondaryArchSuffix}
+	lib:libdb${secondaryArchSuffix}
+	lib:libdb_cxx${secondaryArchSuffix}
+	lib:libdb_cxx_6.0${secondaryArchSuffix}
+	lib:libdb_cxx_6${secondaryArchSuffix}
+	"
+REQUIRES="
+    haiku${secondaryArchSuffix} >= $haikuVersion
+    "
+BUILD_REQUIRES="
+    "
+BUILD_PREREQUIRES="
+    haiku${secondaryArchSuffix}_devel >= $haikuVersion
+	cmd:gcc$secondaryArchSuffix
+    cmd:ld$secondaryArchSuffix
+	cmd:libtool
+	cmd:make
+	"
+
+PATCHES="db-${portVersion}.patch"
+SOURCE_DIR="db-${portVersion}"
+
+BUILD()
+{
+	cd build_unix
+	runConfigure ../dist/configure --enable-cxx
+	make $jobArgs
+}
+
+INSTALL()
+{
+	cd build_unix
+	make install
+
+    # prepare develop/lib
+    prepareInstalledDevelLibs libdb libdb-6.0 libdb_cxx libdb_cxx-6.0
+    fixPkgconfig
+
+	# devel package
+	packageEntries devel \
+		$developDir
+}
+
+TEST()
+{
+	cd build_unix
+	#make dbtest
+}
+
+# ----- devel package -------------------------------------------------------
+
+PROVIDES_devel="
+	db${secondaryArchSuffix}_devel = $portVersion compat >= 6.0
+	devel:libdb${secondaryArchSuffix} = $portVersion
+	devel:libdb_6.0${secondaryArchSuffix} = $portVersion
+	devel:libdb_cxx${secondaryArchSuffix} = $portVersion
+	devel:libdb_cxx_6.0${secondaryArchSuffix} = $portVersion
+	"
+
+REQUIRES_devel="
+	db$secondaryArchSuffix == $portVersion base
+    "
diff --git a/dev-db/db/patches/db-6.0.30.patch b/dev-db/db/patches/db-6.0.30.patch
new file mode 100644
index 000000000..70cc54b4d
--- /dev/null
+++ b/dev-db/db/patches/db-6.0.30.patch
@@ -0,0 +1,79 @@
+diff --git a/dist/Makefile.in b/dist/Makefile.in
+index e90c0c2..60f8aef 100644
+--- a/dist/Makefile.in
++++ b/dist/Makefile.in
+@@ -17,7 +17,7 @@ exec_prefix=@exec_prefix@
+ bindir=	@bindir@
+ includedir=@includedir@
+ libdir=	@libdir@
+-docdir=	$(prefix)/docs
++docdir=	@docdir@
+ 
+ dmode=	755
+ emode=	555
+diff --git a/dist/configure b/dist/configure
+index 32b2c66..5d1ed9a 100755
+--- a/dist/configure
++++ b/dist/configure
+@@ -5122,6 +5122,8 @@ irix*)	optimize_flag="-O2"
+ 	CPPFLAGS="$CPPFLAGS -D_SGI_MP_SOURCE";;
+ mpeix*)	CPPFLAGS="$CPPFLAGS -D_POSIX_SOURCE -D_SOCKET_SOURCE"
+ 	LIBSO_LIBS="$LIBSO_LIBS -lsocket -lsvipc";;
++haiku*)
++	LIBSO_LIBS="$LIBSO_LIBS -lnetwork";;
+ osf*)	CPPFLAGS="$CPPFLAGS -pthread";;
+ *qnx*)	qnx_build="yes"
+ 	$as_echo "#define HAVE_QNX 1" >>confdefs.h
+diff --git a/dist/configure.ac b/dist/configure.ac
+index 689f3b8..d5d5125 100644
+--- a/dist/configure.ac
++++ b/dist/configure.ac
+@@ -206,6 +206,8 @@ irix*)	optimize_flag="-O2"
+ 	CPPFLAGS="$CPPFLAGS -D_SGI_MP_SOURCE";;
+ mpeix*)	CPPFLAGS="$CPPFLAGS -D_POSIX_SOURCE -D_SOCKET_SOURCE"
+ 	LIBSO_LIBS="$LIBSO_LIBS -lsocket -lsvipc";;
++haiku*)
++	LIBSO_LIBS="$LIBSO_LIBS -lnetwork";;
+ osf*)	CPPFLAGS="$CPPFLAGS -pthread";;
+ *qnx*)	qnx_build="yes"
+ 	AC_DEFINE(HAVE_QNX)
+@@ -671,6 +673,9 @@ AC_SEARCH_LIBS(sched_yield, rt)
+ # The Berkeley DB library calls fdatasync, only available in -lrt on Solaris.
+ AC_SEARCH_LIBS(fdatasync, rt)
+ 
++# Socket only available in -lnetwork on Haiku
++AC_SEARCH_LIBS(socket, network)
++
+ AC_SEARCH_LIBS(getaddrinfo, nsl socket)
+ AC_SEARCH_LIBS(hstrerror, resolv)
+ 
+diff --git a/src/repmgr/repmgr_posix.c b/src/repmgr/repmgr_posix.c
+index f803863..e2b93f6 100644
+--- a/src/repmgr/repmgr_posix.c
++++ b/src/repmgr/repmgr_posix.c
+@@ -571,11 +571,7 @@ __repmgr_wake_main_thread(env)
+  * PUBLIC: int __repmgr_writev __P((socket_t, db_iovec_t *, int, size_t *));
+  */
+ int
+-__repmgr_writev(fd, iovec, buf_count, byte_count_p)
+-	socket_t fd;
+-	db_iovec_t *iovec;
+-	int buf_count;
+-	size_t *byte_count_p;
++__repmgr_writev(socket_t fd, db_iovec_t *iovec, int buf_count, size_t *byte_count_p)
+ {
+ 	int nw, result;
+ 
+@@ -593,11 +589,7 @@ __repmgr_writev(fd, iovec, buf_count, byte_count_p)
+  * PUBLIC: int __repmgr_readv __P((socket_t, db_iovec_t *, int, size_t *));
+  */
+ int
+-__repmgr_readv(fd, iovec, buf_count, byte_count_p)
+-	socket_t fd;
+-	db_iovec_t *iovec;
+-	int buf_count;
+-	size_t *byte_count_p;
++__repmgr_readv(socket_t fd, db_iovec_t *iovec, int buf_count, size_t *byte_count_p)
+ {
+ 	int result;
+ 	ssize_t nw;
diff --git a/dev-db/postgresql_server/licenses/PostgreSQL b/dev-db/postgresql_server/licenses/PostgreSQL
new file mode 100644
index 000000000..b773b4d9c
--- /dev/null
+++ b/dev-db/postgresql_server/licenses/PostgreSQL
@@ -0,0 +1,23 @@
+PostgreSQL Database Management System
+(formerly known as Postgres, then as Postgres95)
+
+Portions Copyright (c) 1996-2010, PostgreSQL Global Development Group
+
+Portions Copyright (c) 1994, The Regents of the University of California
+
+Permission to use, copy, modify, and distribute this software and its
+documentation for any purpose, without fee, and without a written agreement
+is hereby granted, provided that the above copyright notice and this
+paragraph and the following two paragraphs appear in all copies.
+
+IN NO EVENT SHALL THE UNIVERSITY OF CALIFORNIA BE LIABLE TO ANY PARTY FOR
+DIRECT, INDIRECT, SPECIAL, INCIDENTAL, OR CONSEQUENTIAL DAMAGES, INCLUDING
+LOST PROFITS, ARISING OUT OF THE USE OF THIS SOFTWARE AND ITS
+DOCUMENTATION, EVEN IF THE UNIVERSITY OF CALIFORNIA HAS BEEN ADVISED OF THE
+POSSIBILITY OF SUCH DAMAGE.
+
+THE UNIVERSITY OF CALIFORNIA SPECIFICALLY DISCLAIMS ANY WARRANTIES,
+INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY
+AND FITNESS FOR A PARTICULAR PURPOSE.  THE SOFTWARE PROVIDED HEREUNDER IS
+ON AN "AS IS" BASIS, AND THE UNIVERSITY OF CALIFORNIA HAS NO OBLIGATIONS TO
+PROVIDE MAINTENANCE, SUPPORT, UPDATES, ENHANCEMENTS, OR MODIFICATIONS.
diff --git a/dev-db/postgresql_server/patches/postgresql_server-9.3.4.patchset b/dev-db/postgresql_server/patches/postgresql_server-9.3.4.patchset
new file mode 100644
index 000000000..940e4d2b2
--- /dev/null
+++ b/dev-db/postgresql_server/patches/postgresql_server-9.3.4.patchset
@@ -0,0 +1,290 @@
+From 69b627758b0c5e78cfa982861fab45b871b73b37 Mon Sep 17 00:00:00 2001
+From: Jerome Duval <jerome.duval@gmail.com>
+Date: Wed, 7 May 2014 15:52:41 +0000
+Subject: autoconf version
+
+
+diff --git a/configure.in b/configure.in
+index 61484df..66e501c 100644
+--- a/configure.in
++++ b/configure.in
+@@ -19,10 +19,10 @@ m4_pattern_forbid(^PGAC_)dnl to catch undefined macros
+ 
+ AC_INIT([PostgreSQL], [9.3.4], [pgsql-bugs@postgresql.org])
+ 
+-m4_if(m4_defn([m4_PACKAGE_VERSION]), [2.63], [], [m4_fatal([Autoconf version 2.63 is required.
+-Untested combinations of 'autoconf' and PostgreSQL versions are not
+-recommended.  You can remove the check from 'configure.in' but it is then
+-your responsibility whether the result works or not.])])
++dnl m4_if(m4_defn([m4_PACKAGE_VERSION]), [2.63], [], [m4_fatal([Autoconf version 2.63 is required.
++dnl Untested combinations of 'autoconf' and PostgreSQL versions are not
++dnl recommended.  You can remove the check from 'configure.in' but it is then
++dnl your responsibility whether the result works or not.])])
+ AC_COPYRIGHT([Copyright (c) 1996-2013, PostgreSQL Global Development Group])
+ AC_CONFIG_SRCDIR([src/backend/access/common/heaptuple.c])
+ AC_CONFIG_AUX_DIR(config)
+-- 
+1.8.3.4
+
+
+From a2440b0d15d9da3359c0bfba6bdf9160a35a2ab7 Mon Sep 17 00:00:00 2001
+From: Jerome Duval <jerome.duval@gmail.com>
+Date: Wed, 7 May 2014 16:03:31 +0000
+Subject: haiku support
+
+
+diff --git a/configure.in b/configure.in
+index 66e501c..3072dbc 100644
+--- a/configure.in
++++ b/configure.in
+@@ -59,6 +59,7 @@ case $host_os in
+   darwin*) template=darwin ;;
+ dragonfly*) template=netbsd ;;
+  freebsd*) template=freebsd ;;
++   haiku*) template=haiku ;;
+     hpux*) template=hpux ;;
+     irix*) template=irix ;;
+  linux*|gnu*|k*bsd*-gnu)
+@@ -873,7 +874,7 @@ fi
+ AC_CHECK_LIB(m, main)
+ AC_SEARCH_LIBS(setproctitle, util)
+ AC_SEARCH_LIBS(dlopen, dl)
+-AC_SEARCH_LIBS(socket, [socket wsock32])
++AC_SEARCH_LIBS(socket, [socket wsock32 network])
+ AC_SEARCH_LIBS(shl_load, dld)
+ # We only use libld in port/dynloader/aix.c
+ case $host_os in
+@@ -887,7 +888,7 @@ AC_SEARCH_LIBS(crypt, crypt)
+ AC_SEARCH_LIBS(fdatasync, [rt posix4])
+ # Required for thread_test.c on Solaris 2.5:
+ # Other ports use it too (HP-UX) so test unconditionally
+-AC_SEARCH_LIBS(gethostbyname_r, nsl)
++AC_SEARCH_LIBS(gethostbyname_r, [nsl network])
+ # Cygwin:
+ AC_SEARCH_LIBS(shmget, cygipc)
+ 
+diff --git a/src/backend/port/dynloader/haiku.c b/src/backend/port/dynloader/haiku.c
+new file mode 100644
+index 0000000..c99b717
+--- /dev/null
++++ b/src/backend/port/dynloader/haiku.c
+@@ -0,0 +1,133 @@
++/*-------------------------------------------------------------------------
++ *
++ * linux.c
++ *	  Dynamic Loader for Postgres for Linux, generated from those for
++ *	  Ultrix.
++ *
++ *	  You need to install the dld library on your Linux system!
++ *
++ * Portions Copyright (c) 1996-2013, PostgreSQL Global Development Group
++ * Portions Copyright (c) 1994, Regents of the University of California
++ *
++ *
++ * IDENTIFICATION
++ *	  src/backend/port/dynloader/haiku.c
++ *
++ *-------------------------------------------------------------------------
++ */
++
++#include "postgres.h"
++
++#ifdef HAVE_DLD_H
++#include <dld.h>
++#endif
++
++#include "dynloader.h"
++#include "miscadmin.h"
++
++
++#ifndef HAVE_DLOPEN
++
++void *
++pg_dlopen(char *filename)
++{
++#ifndef HAVE_DLD_H
++	elog(ERROR, "dynamic load not supported");
++	return NULL;
++#else
++	static int	dl_initialized = 0;
++
++	/*
++	 * initializes the dynamic loader with the executable's pathname. (only
++	 * needs to do this the first time pg_dlopen is called.)
++	 */
++	if (!dl_initialized)
++	{
++		if (dld_init(dld_find_executable(my_exec_path)))
++			return NULL;
++
++		/*
++		 * if there are undefined symbols, we want dl to search from the
++		 * following libraries also.
++		 */
++		dl_initialized = 1;
++	}
++
++	/*
++	 * link the file, then check for undefined symbols!
++	 */
++	if (dld_link(filename))
++		return NULL;
++
++	/*
++	 * If undefined symbols: try to link with the C and math libraries! This
++	 * could be smarter, if the dynamic linker was able to handle shared libs!
++	 */
++	if (dld_undefined_sym_count > 0)
++	{
++		if (dld_link("/usr/lib/libc.a"))
++		{
++			elog(WARNING, "could not link C library");
++			return NULL;
++		}
++		if (dld_undefined_sym_count > 0)
++		{
++			if (dld_link("/usr/lib/libm.a"))
++			{
++				elog(WARNING, "could not link math library");
++				return NULL;
++			}
++			if (dld_undefined_sym_count > 0)
++			{
++				int			count = dld_undefined_sym_count;
++				char	  **list = dld_list_undefined_sym();
++
++				/* list the undefined symbols, if any */
++				do
++				{
++					elog(WARNING, "\"%s\" is undefined", *list);
++					list++;
++					count--;
++				} while (count > 0);
++
++				dld_unlink_by_file(filename, 1);
++				return NULL;
++			}
++		}
++	}
++
++	return (void *) strdup(filename);
++#endif
++}
++
++PGFunction
++pg_dlsym(void *handle, char *funcname)
++{
++#ifndef HAVE_DLD_H
++	return NULL;
++#else
++	return (PGFunction) dld_get_func((funcname));
++#endif
++}
++
++void
++pg_dlclose(void *handle)
++{
++#ifndef HAVE_DLD_H
++#else
++	dld_unlink_by_file(handle, 1);
++	free(handle);
++#endif
++}
++
++char *
++pg_dlerror(void)
++{
++#ifndef HAVE_DLD_H
++	return "dynaloader unspported";
++#else
++	return dld_strerror(dld_errno);
++#endif
++}
++
++#endif   /* !HAVE_DLOPEN */
+diff --git a/src/backend/port/dynloader/haiku.h b/src/backend/port/dynloader/haiku.h
+new file mode 100644
+index 0000000..974cf4a
+--- /dev/null
++++ b/src/backend/port/dynloader/haiku.h
+@@ -0,0 +1,44 @@
++/*-------------------------------------------------------------------------
++ *
++ * linux.h
++ *		Port-specific prototypes for Linux
++ *
++ *
++ * Portions Copyright (c) 1996-2013, PostgreSQL Global Development Group
++ * Portions Copyright (c) 1994, Regents of the University of California
++ *
++ * src/backend/port/dynloader/haiku.h
++ *
++ *-------------------------------------------------------------------------
++ */
++#ifndef PORT_PROTOS_H
++#define PORT_PROTOS_H
++
++#include "utils/dynamic_loader.h"		/* pgrminclude ignore */
++#ifdef HAVE_DLOPEN
++#include <dlfcn.h>
++#endif
++
++
++#ifdef HAVE_DLOPEN
++
++/*
++ * In some older systems, the RTLD_NOW flag isn't defined and the mode
++ * argument to dlopen must always be 1.  The RTLD_GLOBAL flag is wanted
++ * if available, but it doesn't exist everywhere.
++ * If it doesn't exist, set it to 0 so it has no effect.
++ */
++#ifndef RTLD_NOW
++#define RTLD_NOW 1
++#endif
++#ifndef RTLD_GLOBAL
++#define RTLD_GLOBAL 0
++#endif
++
++#define pg_dlopen(f)	dlopen((f), RTLD_NOW | RTLD_GLOBAL)
++#define pg_dlsym		dlsym
++#define pg_dlclose		dlclose
++#define pg_dlerror		dlerror
++#endif   /* HAVE_DLOPEN */
++
++#endif   /* PORT_PROTOS_H */
+diff --git a/src/include/port/haiku.h b/src/include/port/haiku.h
+new file mode 100644
+index 0000000..beabea1
+--- /dev/null
++++ b/src/include/port/haiku.h
+@@ -0,0 +1 @@
++/* src/include/port/haiku.h */
+diff --git a/src/makefiles/Makefile.haiku b/src/makefiles/Makefile.haiku
+new file mode 100644
+index 0000000..53780c1
+--- /dev/null
++++ b/src/makefiles/Makefile.haiku
+@@ -0,0 +1,12 @@
++AROPT = cr
++export_dynamic = -Wl,-E
++# Use --enable-new-dtags to generate DT_RUNPATH instead of DT_RPATH.
++# This allows LD_LIBRARY_PATH to still work when needed.
++rpath = -Wl,-rpath,'$(rpathdir)',--enable-new-dtags
++DLSUFFIX = .so
++
++CFLAGS_SL = -fpic
++
++# Rule for building a shared library from a single .o file
++%.so: %.o
++	$(CC) $(CFLAGS) $(LDFLAGS) $(LDFLAGS_SL) -shared -o $@ $<
+diff --git a/src/template/haiku b/src/template/haiku
+new file mode 100644
+index 0000000..fd1e3dc
+--- /dev/null
++++ b/src/template/haiku
+@@ -0,0 +1,2 @@
++# src/template/haiku
++
+-- 
+1.8.3.4
+
diff --git a/dev-db/postgresql_server/postgresql_server-9.3.4.recipe b/dev-db/postgresql_server/postgresql_server-9.3.4.recipe
new file mode 100644
index 000000000..7510f56bb
--- /dev/null
+++ b/dev-db/postgresql_server/postgresql_server-9.3.4.recipe
@@ -0,0 +1,79 @@
+SUMMARY="A powerful, open source object-relational database system." 
+DESCRIPTION="
+PostgreSQL is a powerful, open source object-relational database system. It has\
+ more than 15 years of active development and a proven architecture that has \
+earned it a strong reputation for reliability, data integrity, and correctness.\
+ It runs on all major operating systems, including Linux, UNIX (AIX, BSD, HP-UX,\
+ SGI IRIX, Mac OS X, Solaris, Tru64), and Windows. It is fully ACID compliant,\
+ has full support for foreign keys, joins, views, triggers, and stored\
+ procedures (in multiple languages). It includes most SQL:2008 data types,\
+ including INTEGER, NUMERIC, BOOLEAN, CHAR, VARCHAR, DATE, INTERVAL, and\
+ TIMESTAMP. It also supports storage of binary large objects, including\
+ pictures, sounds, or video. It has native programming interfaces for C/C++,\
+ Java, .Net, Perl, Python, Ruby, Tcl, ODBC, among others, and exceptional\
+ documentation.
+"
+HOMEPAGE="http://www.postgresql.org/" 
+SRC_URI="http://ftp.postgresql.org/pub/source/v9.3.4/postgresql-9.3.4.tar.bz2"
+CHECKSUM_SHA256="9ee819574dfc8798a448dc23a99510d2d8924c2f8b49f8228cd77e4efc8a6621"
+REVISION="1"
+ARCHITECTURES="!x86_gcc2 !x86 !x86_64"
+LICENSE="PostgreSQL"
+COPYRIGHT="1996-2014, PostgreSQL Global Development Group"
+
+PROVIDES="
+		postgresql_server = $portVersion compat >= 9
+		cmd:clusterdb = $portVersion compat >= 9
+		cmd:createdb = $portVersion compat >= 9
+		cmd:createlang = $portVersion compat >= 9
+		cmd:createuser = $portVersion compat >= 9
+		cmd:dropdb = $portVersion compat >= 9
+		cmd:droplang = $portVersion compat >= 9
+		cmd:dropuser = $portVersion compat >= 9
+		cmd:pg_config = $portVersion compat >= 9
+		cmd:pg_dump = $portVersion compat >= 9
+		cmd:pg_dumpall = $portVersion compat >= 9
+		cmd:pg_isready = $portVersion compat >= 9
+		cmd:pg_restore = $portVersion compat >= 9
+		cmd:psql = $portVersion compat >= 9
+		cmd:reindexdb = $portVersion compat >= 9
+		cmd:vacuumdb = $portVersion compat >= 9
+		cmd:pgsql = $portVersion compat >= 9
+"
+
+REQUIRES="
+	haiku >= $haikuVersion
+	lib:libreadline
+	lib:libz
+	"
+BUILD_REQUIRES="
+	haiku_devel >= $haikuVersion
+	devel:libreadline
+	devel:libz
+	"
+BUILD_PREREQUIRES="
+	cmd:aclocal
+	cmd:autoconf
+	cmd:automake
+	cmd:gcc
+	cmd:ld
+	cmd:libtoolize
+	cmd:make
+	"
+
+PATCHES="postgresql_server-9.3.4.patchset"
+
+SOURCE_DIR="postgresql-$portVersion"
+
+BUILD()
+{
+	runConfigure ./configure
+	make $jobArgs
+}
+
+INSTALL()
+{
+	make install
+
+	fixPkgconfig
+}
diff --git a/dev-db/sqlite/sqlite-3.7.13.recipe b/dev-db/sqlite/sqlite-3.7.13.recipe
index 91ec55170..4d7ae6bfd 100644
--- a/dev-db/sqlite/sqlite-3.7.13.recipe
+++ b/dev-db/sqlite/sqlite-3.7.13.recipe
@@ -8,7 +8,7 @@ DESCRIPTION="
 	"
 HOMEPAGE="http://www.sqlite.org/"
 SRC_URI="http://www.sqlite.org/sqlite-autoconf-3071300.tar.gz"
-CHECKSUM_MD5="c97df403e8a3d5b67bb408fcd6aabd8e"
+CHECKSUM_SHA256="ac566819f82ec4cc2ff6c5cc90987ca38e589efbd79ff263838bbc62356ab119"
 LICENSE="SQLite"
 COPYRIGHT="Public Domain"
 REVISION="4"
diff --git a/dev-db/sqlite/sqlite-3.7.16.1.recipe b/dev-db/sqlite/sqlite-3.7.16.1.recipe
index 700c17163..509cafbac 100644
--- a/dev-db/sqlite/sqlite-3.7.16.1.recipe
+++ b/dev-db/sqlite/sqlite-3.7.16.1.recipe
@@ -1,8 +1,8 @@
 SUMMARY="A SQL Database Engine in a C Library" 
 DESCRIPTION="SQLite is a software library that implements a self-contained, serverless, zero-configuration, transactional SQL database engine." 
 HOMEPAGE="http://www.sqlite.org/" 
-SRC_URI="http://www.sqlite.org/sqlite-autoconf-3071601.tar.gz"
-CHECKSUM_MD5="8860d1a1ed26d40f07e3c7ae035b644a"
+SRC_URI="http://www.sqlite.org/2013/sqlite-autoconf-3071601.tar.gz"
+CHECKSUM_SHA256="4af5ea8cbb1b0b0b53c67cef0b32d86f76e84c912228954e8577224150184a68"
 REVISION="2"
 ARCHITECTURES="?x86_gcc2 ?x86"
 
diff --git a/dev-db/sqlite/sqlite-3.7.5.recipe b/dev-db/sqlite/sqlite-3.7.5.recipe
index 498618e68..caaace5af 100644
--- a/dev-db/sqlite/sqlite-3.7.5.recipe
+++ b/dev-db/sqlite/sqlite-3.7.5.recipe
@@ -8,7 +8,7 @@ DESCRIPTION="
 	"
 HOMEPAGE="http://www.sqlite.org/" 
 SRC_URI="http://www.sqlite.org/sqlite-autoconf-3070500.tar.gz"
-CHECKSUM_MD5="a9604a82613ade2e7f4c303f233e477f"
+CHECKSUM_SHA256="cb5b86926ec9f65882b2dddd244f2d620337d911ec73411863f77e48cf6a2f94"
 LICENSE="SQLite"
 COPYRIGHT="Public Domain"
 REVISION="7"
diff --git a/dev-db/sqlite/sqlite-3.8.0.2.recipe b/dev-db/sqlite/sqlite-3.8.0.2.recipe
index ea34006c8..272ce13be 100644
--- a/dev-db/sqlite/sqlite-3.8.0.2.recipe
+++ b/dev-db/sqlite/sqlite-3.8.0.2.recipe
@@ -7,7 +7,7 @@ source code for SQLite is in the public domain.
 "
 HOMEPAGE="http://www.sqlite.org/" 
 SRC_URI="http://www.sqlite.org/2013/sqlite-autoconf-3080002.tar.gz"
-CHECKSUM_MD5="6d6cc639a4da04fbbdda7b1a1a01b386"
+CHECKSUM_SHA256="fca3a0a12f94dc92a6d9e700c3f6cab6cd4e79214bd7b6f13717a10f4bcfddb2"
 REVISION="1"
 ARCHITECTURES="x86_gcc2 x86"
 SECONDARY_ARCHITECTURES="x86_gcc2 x86"
diff --git a/dev-db/sqlite/sqlite-3.8.4.1.recipe b/dev-db/sqlite/sqlite-3.8.4.1.recipe
new file mode 100644
index 000000000..042cfa4bf
--- /dev/null
+++ b/dev-db/sqlite/sqlite-3.8.4.1.recipe
@@ -0,0 +1,82 @@
+SUMMARY="An SQL Database Engine in a C Library" 
+DESCRIPTION="
+SQLite is a software library that implements a self-contained, serverless, \
+zero-configuration, transactional SQL database engine.
+SQLite is the most widely deployed SQL database engine in the world. The \
+source code for SQLite is in the public domain.
+"
+HOMEPAGE="http://www.sqlite.org/" 
+SRC_URI="http://www.sqlite.org/2014/sqlite-autoconf-3080401.tar.gz"
+CHECKSUM_SHA256="17227492466bb29fbef30d94a7cc27ec799e36c5d4d879dedd331079a6d1bc38"
+REVISION="1"
+ARCHITECTURES="x86_gcc2 x86 x86_64"
+SECONDARY_ARCHITECTURES="x86_gcc2 x86"
+LICENSE="SQLite"
+COPYRIGHT="Public Domain"
+
+PROVIDES="
+	sqlite$secondaryArchSuffix = $portVersion compat >= 3
+	lib:libsqlite3$secondaryArchSuffix = 0.8.6 compat >= 0
+	"
+if [ -z "$secondaryArchSuffix" ]; then
+	PROVIDES="$PROVIDES
+		cmd:sqlite3 = $portVersion compat >= 3
+		"
+fi
+
+REQUIRES="
+	haiku$secondaryArchSuffix >= $haikuVersion
+	"
+BUILD_REQUIRES="
+	"
+BUILD_PREREQUIRES="
+	haiku${secondaryArchSuffix}_devel >= $haikuVersion
+	haiku_devel >= $haikuVersion
+	cmd:aclocal
+	cmd:autoconf
+	cmd:automake
+	cmd:gcc$secondaryArchSuffix
+	cmd:ld$secondaryArchSuffix
+	cmd:libtoolize
+	cmd:make
+	"
+
+SOURCE_DIR="sqlite-autoconf-3080401"
+
+BUILD()
+{
+	libtoolize --force --copy --install
+	aclocal
+	autoconf
+	automake
+	runConfigure ./configure
+	make $jobArgs
+}
+
+INSTALL()
+{
+	make install
+
+	prepareInstalledDevelLib libsqlite3
+	fixPkgconfig
+
+	# devel package
+	packageEntries devel \
+		$developDir
+
+	# Remove stuff we don't need in the secondary architecture base package.
+	if [ -n "$secondaryArchSuffix" ]; then
+		rm -rf $binDir
+		rm -rf $documentationDir
+	fi
+}
+
+# ----- devel package -------------------------------------------------------
+
+PROVIDES_devel="
+	sqlite${secondaryArchSuffix}_devel = $portVersion
+	devel:libsqlite3$secondaryArchSuffix = 0.8.6 compat >= 0
+	"
+REQUIRES_devel="
+	sqlite$secondaryArchSuffix == $portVersion base
+	"
diff --git a/dev-embedded/avr_libc/avr_libc-1.8.0.recipe b/dev-embedded/avr_libc/avr_libc-1.8.0.recipe
new file mode 100644
index 000000000..f6d7bbf10
--- /dev/null
+++ b/dev-embedded/avr_libc/avr_libc-1.8.0.recipe
@@ -0,0 +1,81 @@
+SUMMARY="C library for Atmel AVR microcontrollers"
+DESCRIPTION="
+AVR Libc is a Free Software project whose goal is to provide a high quality C
+library for use with GCC on Atmel AVR microcontrollers.
+
+Together, avr-binutils, avr-gcc, and avr-libc form the heart of the Free
+Software toolchain for the Atmel AVR microcontrollers.
+"
+HOMEPAGE="http://www.nongnu.org/avr-libc/"
+LICENSE="
+	BSD (3-clause)
+	"
+COPYRIGHT="
+Portions of avr-libc are Copyright (c) 1999-2005
+      Keith Gudger,
+	  Bjoern Haase,
+	  Steinar Haugen,
+	  Peter Jansen,
+	  Reinhard Jessich,
+	  Magnus Johansson,
+	  Artur Lipowski,
+	  Marek Michalkiewicz,
+	  Colin O'Flynn,
+	  Bob Paddock,
+	  Reiner Patommel,
+	  Michael Rickman,
+	  Theodore A. Roth,
+	  Juergen Schilling,
+	  Philip Soeberg,
+	  Anatoly Sokolov,
+	  Nils Kristian Strom,
+	  Michael Stumpf,
+	  Stefan Swanepoel,
+	  Eric B. Weddington,
+	  Joerg Wunsch,
+	  Dmitry Xmelkov,
+	  The Regents of the University of California.
+"
+SRC_URI="http://download.savannah.gnu.org/releases/avr-libc/avr-libc-1.8.0.tar.bz2"
+CHECKSUM_SHA256="67a36bdb43a16f9b0512ba09584d4785f9bce6c057393f1020a5552e096e34ce"
+REVISION="1"
+ARCHITECTURES="any"
+SECONDARY_ARCHITECTURES="x86"
+
+PROVIDES="
+	avr_libc = $portVersion
+	"
+
+REQUIRES="
+	haiku$secondaryArchSuffix >= $haikuVersion
+	"
+BUILD_REQUIRES="
+	"
+BUILD_PREREQUIRES="
+	haiku${secondaryArchSuffix}_devel >= $haikuVersion
+	cmd:autoconf
+	cmd:automake
+	cmd:avr_as$secondaryArchSuffix
+	cmd:avr_gcc$secondaryArchSuffix
+	cmd:libtool
+	cmd:make
+	"
+
+SOURCE_DIR="avr-libc-$portVersion"
+
+relativeInstallDir="develop/tools/avr"
+installDir="$prefix/$relativeInstallDir"
+
+BUILD()
+{
+	libtoolize --force --copy --install
+	runConfigure ./configure --host=avr --build=$effectiveTargetMachineTriple \
+		--prefix=$installDir --libexecdir=$installDir/lib --mandir=$manDir \
+		--docdir=$docDir --target=avr
+	make $jobArgs
+}
+
+INSTALL()
+{
+	make install
+}
diff --git a/dev-embedded/avrdude/avrdude-6.0.1.recipe b/dev-embedded/avrdude/avrdude-6.0.1.recipe
index acc6890ca..ed869792e 100644
--- a/dev-embedded/avrdude/avrdude-6.0.1.recipe
+++ b/dev-embedded/avrdude/avrdude-6.0.1.recipe
@@ -11,7 +11,7 @@ COPYRIGHT="
 	2003-2013 Brian S. Dean <bsd@bdmicro.com>
 "
 SRC_URI="http://download.savannah.gnu.org/releases/avrdude/avrdude-6.0.1.tar.gz"
-CHECKSUM_MD5="346ec2e46393a54ac152b95abf1d9850"
+CHECKSUM_SHA256="c6804668dfa96b23185dfe2e8239089af4e4ae0b11aa7435bebb28c3260ede41"
 REVISION="1"
 ARCHITECTURES="x86 x86_64"
 if [ $effectiveTargetArchitecture != x86_gcc2 ]; then
diff --git a/dev-embedded/libftdi/libftdi-1.0.recipe b/dev-embedded/libftdi/libftdi-1.0.recipe
index 4b751dc26..957e1f92c 100644
--- a/dev-embedded/libftdi/libftdi-1.0.recipe
+++ b/dev-embedded/libftdi/libftdi-1.0.recipe
@@ -8,7 +8,7 @@ libusb.
 "
 HOMEPAGE="http://www.intra2net.com/en/developer/libftdi/index.php"
 SRC_URI="http://www.intra2net.com/en/developer/libftdi/download/libftdi1-1.0.tar.bz2"
-CHECKSUM_MD5="e02dd77ee10b82b5edfbb8c199185bbf"
+CHECKSUM_SHA256="7290fd38208d8c00d25ed13ce172aaa0403b37148080e4a33a99837022d2b321"
 LICENSE="
 	GNU LGPL v2.1
 	GNU GPL v2
diff --git a/dev-games/ode/ode-0.12.recipe b/dev-games/ode/ode-0.12.recipe
index 33c473aff..f9129d0d0 100644
--- a/dev-games/ode/ode-0.12.recipe
+++ b/dev-games/ode/ode-0.12.recipe
@@ -7,8 +7,8 @@ detection with friction. ODE is useful for simulating vehicles, objects in \
 virtual reality environments and virtual creatures.
 "
 HOMEPAGE="http://www.ode.org/"
-SRC_URI="http://downloads.sourceforge.net/project/opende/ODE/0.12/ode-0.12.tar.bz2?r=http%3A%2F%2Fsourceforge.net%2Fprojects%2Fopende%2Ffiles%2F&ts=1356377654&use_mirror=freefr"
-CHECKSUM_MD5="48fdd41fae1a7e7831feeded09826599"
+SRC_URI="http://downloads.sourceforge.net/project/opende/ODE/0.12/ode-0.12.tar.bz2"
+CHECKSUM_SHA256="65c5315a42c725d2da01ea2c1b045583d54e0d1a95e3f7c062e5ba3769f5c350"
 REVISION="1"
 COPYRIGHT="2001-2004 Russell L. Smith"
 LICENSE="
diff --git a/dev-games/physfs/physfs-2.0.3.recipe b/dev-games/physfs/physfs-2.0.3.recipe
index b733f35f2..628931cb3 100644
--- a/dev-games/physfs/physfs-2.0.3.recipe
+++ b/dev-games/physfs/physfs-2.0.3.recipe
@@ -4,7 +4,7 @@ PhysicsFS is a library to provide abstract access to various archives.
 "
 HOMEPAGE="http://icculus.org/physfs"
 SRC_URI="http://icculus.org/physfs/downloads/physfs-2.0.3.tar.bz2"
-CHECKSUM_MD5="c2c727a8a8deb623b521b52d0080f613"
+CHECKSUM_SHA256="ca862097c0fb451f2cacd286194d071289342c107b6fe69079c079883ff66b69"
 LICENSE="PHYSFS"
 COPYRIGHT="2001-2012 Ryan C. Gordon"
 
diff --git a/dev-java/ant_core/ant_core-1.9.2.recipe b/dev-java/ant_core/ant_core-1.9.2.recipe
index 8d72981fe..79e278601 100644
--- a/dev-java/ant_core/ant_core-1.9.2.recipe
+++ b/dev-java/ant_core/ant_core-1.9.2.recipe
@@ -25,7 +25,7 @@ REVISION="1"
 ARCHITECTURES="any"
 
 SRC_URI="http://archive.apache.org/dist/ant/source/apache-ant-1.9.2-src.tar.bz2"
-CHECKSUM_MD5="8f610c1a0183507c2beebbf230f456af"
+CHECKSUM_SHA256="cf95317f683f28ae3d263327447abbebd30a6c910cfa069a05c5ee39aa5ad0e3"
 SOURCE_DIR="apache-ant-$portVersion"
 
 PROVIDES="
diff --git a/dev-java/gnu_classpath/gnu_classpath-0.98.recipe b/dev-java/gnu_classpath/gnu_classpath-0.98.recipe
index ed51897d4..e182f0ca6 100644
--- a/dev-java/gnu_classpath/gnu_classpath-0.98.recipe
+++ b/dev-java/gnu_classpath/gnu_classpath-0.98.recipe
@@ -5,8 +5,8 @@ Java language
 "
 HOMEPAGE="http://www.gnu.org/software/classpath"
 SRC_URI="ftp://ftp.gnu.org/gnu/classpath/classpath-0.98.tar.gz"
+CHECKSUM_SHA256="501b5acd4dff79b6100da22cef15080f31071821ce3cea6f1b739bc1b56fac3f"
 REVISION="1"
-CHECKSUM_MD5="90c6571b8b0309e372faa0f9f6255ea9"
 LICENSE="GNU GPL v2
 	GNU GPL v2 with classpath exceptions"
 COPYRIGHT="1998-1999, 2001-2008 Free Software Foundation
diff --git a/dev-java/jamvm/jamvm-1.5.4.recipe b/dev-java/jamvm/jamvm-1.5.4.recipe
index f229a9749..f9a6b7a52 100644
--- a/dev-java/jamvm/jamvm-1.5.4.recipe
+++ b/dev-java/jamvm/jamvm-1.5.4.recipe
@@ -6,9 +6,9 @@ it is extremely small.
 "
 HOMEPAGE="http://jamvm.sourceforge.net/" 
 SRC_URI="http://sourceforge.net/projects/jamvm/files/jamvm/JamVM%201.5.4/jamvm-1.5.4.tar.gz/download"
+CHECKSUM_SHA256="7865693698bc4322cabe1014a4b7ebdec1bc1daf45f1a4457b6e908a4446b124"
 REVISION="1"
 DEPEND=""
-CHECKSUM_MD5="7654e9657691f5f09c4f481ed4686176"
 LICENSE="GNU GPL v2"
 COPYRIGHT="2003-2010 Robert Lougher"
 
diff --git a/dev-lang/erlang/erlang-16.03.recipe b/dev-lang/erlang/erlang-16.03.recipe
index 9678bc53e..a3d28d934 100644
--- a/dev-lang/erlang/erlang-16.03.recipe
+++ b/dev-lang/erlang/erlang-16.03.recipe
@@ -8,7 +8,7 @@ telephony and instant messaging. Erlang's runtime
 system has built-in support for concurrency, distribution and fault tolerance." 
 HOMEPAGE="http://www.erlang.org" 
 SRC_URI="http://www.erlang.org/download/otp_src_R16B03.tar.gz"
-CHECKSUM_MD5="c330150913556a0fe73e57a441cb6375"
+CHECKSUM_SHA256="6133b3410681a5c934e54c76eee1825f96dead8d6a12c31a64f6e160daf0bb06"
 ARCHITECTURES="x86_gcc2 x86"
 LICENSE="EPL"
 REVISION="1"
diff --git a/dev-lang/fpc/fpc-2.6.2.recipe b/dev-lang/fpc/fpc-2.6.2.recipe
index 23055db6e..7db347dca 100644
--- a/dev-lang/fpc/fpc-2.6.2.recipe
+++ b/dev-lang/fpc/fpc-2.6.2.recipe
@@ -9,7 +9,7 @@ little endian variants) and Motorola 68k architecture targets are available in\
 the development versions."
 HOMEPAGE="http://www.freespascal.org"
 SRC_URI="http://sourceforge.net/projects/freepascal/files/Source/2.6.2/fpc-2.6.2.source.tar.gz/download"
-CHECKSUM_MD5="d501bb766b728a50d3a38adbe195528e"
+CHECKSUM_SHA256="71dd1be93593daf184556377dfde61c7882bc749ad8c0bc342210e542555f9d0"
 LICENSE="
 	GNU LGPL v3
 	GNU GPL v3
diff --git a/dev-lang/fpc/fpc-2.6.2_bin.recipe b/dev-lang/fpc/fpc-2.6.2_bin.recipe
index 003e84789..27db1154b 100644
--- a/dev-lang/fpc/fpc-2.6.2_bin.recipe
+++ b/dev-lang/fpc/fpc-2.6.2_bin.recipe
@@ -2,7 +2,7 @@ SUMMARY="FreePascalCompiler binary"
 DESCRIPTION="FreePascalCompiler binary"
 HOMEPAGE="http://www.freepascal.org"
 SRC_URI="ftp://freepascal.stack.nl/pub/fpc/dist/2.6.0/i386-haiku/fpc-2.6.0.i386-haiku.tar"
-CHECKSUM_MD5="e45911a932ff8fdb4578dae2f96c19a1"
+CHECKSUM_SHA256="abec33111d1d88dcce96cf26498b3687d53aa29494c6a8aada16b9b0625eef95"
 LICENSE="
 	GNU LGPL v3
 	GNU GPL v3
diff --git a/dev-lang/lua/lua-5.1.4.recipe b/dev-lang/lua/lua-5.1.4.recipe
index f41a11c35..cdfe57f62 100644
--- a/dev-lang/lua/lua-5.1.4.recipe
+++ b/dev-lang/lua/lua-5.1.4.recipe
@@ -1,14 +1,15 @@
 SUMMARY="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="5"
+CHECKSUM_SHA256="b038e225eaf2a5b57c9bcc35cd13aa8c6c8288ef493d52970c9545074098af3a"
+REVISION="6"
 ARCHITECTURES="x86 x86_gcc2"
 SECONDARY_ARCHITECTURES="x86 x86_gcc2"
 
 PROVIDES="
 	lua${secondaryArchSuffix} = $portVersion compat >= 5.1
 	cmd:lua${secondaryArchSuffix} = $portVersion compat >= 5.1
+	cmd:lua5.1${secondaryArchSuffix} = $portVersion compat >= 5.1
 	cmd:luac${secondaryArchSuffix} = $portVersion compat >= 5.1
 	lib:liblua${secondaryArchSuffix} = $portVersion compat >= 5.1
 	"
@@ -31,23 +32,34 @@ BUILD()
 INSTALL()
 {
     make install INSTALL_TOP="$prefix" INSTALL_MAN="$manDir/man1" \
-        INSTALL_INC="$includeDir" INSTALL_LMOD="$dataDir/lua/5.1" \
+        INSTALL_INC="$includeDir/lua5.1" INSTALL_LMOD="$dataDir/lua/5.1" \
         INSTALL_LIB="$libDir" INSTALL_BIN="$binDir"
 
 	mkdir -p $libDir/pkgconfig
 	cp etc/lua.pc $libDir/pkgconfig/lua.pc
 
-	ln -s $libDir/liblua.so $libDir/liblua.so.5.1
+	ln -s liblua.so $libDir/liblua.so.5.1
+	ln -s liblua.a $libDir/liblua5.1.a
+
+	mv $binDir/lua $binDir/lua5.1
+	ln -s $binDir/lua5.1 $binDir/lua
 
 	prepareInstalledDevelLib liblua
+	prepareInstalledDevelLib liblua5.1
 	fixPkgconfig
 
+	# The includes are in a subdirectory of includeDir, and fixPkgconfig breaks
+	# that.
+	sed -i -e "s,^includedir=.*,includedir=$prefix/$relativeIncludeDir/lua5.1," \
+   		$developLibDir/pkgconfig/lua.pc
+	
 	packageEntries devel $developDir
 }
 
 PROVIDES_devel="
 	lua${secondaryArchSuffix}_devel = $portVersion compat >= 5.1
 	devel:liblua$secondaryArchSuffix = $portVersion compat >= 5.1
+	devel:liblua5.1$secondaryArchSuffix = $portVersion compat >= 5.1
 	"
 
 REQUIRES_devel="
diff --git a/dev-lang/lua/lua-5.2.1.recipe b/dev-lang/lua/lua-5.2.1.recipe
index 39b5bba43..f4b4aaa27 100644
--- a/dev-lang/lua/lua-5.2.1.recipe
+++ b/dev-lang/lua/lua-5.2.1.recipe
@@ -1,13 +1,14 @@
 SUMMARY="Lua is a powerful, fast, light-weight, embeddable scripting language."
 HOMEPAGE="http://www.lua.org"
 SRC_URI="http://www.lua.org/ftp/lua-$portVersion.tar.gz"
-CHECKSUM_MD5="ae08f641b45d737d12d30291a5e5f6e3"
-REVISION="6"
+CHECKSUM_SHA256="64304da87976133196f9e4c15250b70f444467b6ed80d7cfd7b3b982b5177be5"
+REVISION="7"
 ARCHITECTURES="x86 x86_gcc2"
 SECONDARY_ARCHITECTURES="x86"
 PROVIDES="
 	lua$secondaryArchSuffix = $portVersion compat >= 5.2
 	cmd:lua$secondaryArchSuffix = $portVersion compat >= 5.2
+	cmd:lua5.2$secondaryArchSuffix = $portVersion compat >= 5.2
 	cmd:luac$secondaryArchSuffix = $portVersion compat >= 5.2
 	lib:liblua$secondaryArchSuffix = $portVersion compat >= 5.2
 	"
@@ -24,6 +25,7 @@ BUILD_PREREQUIRES="
 PROVIDES_devel="
 	lua${secondaryArchSuffix}_devel = $portVersion compat >= 5.2
 	devel:liblua$secondaryArchSuffix = $portVersion compat >= 5.2
+	devel:liblua52$secondaryArchSuffix = $portVersion compat >= 5.2
 	"
 
 REQUIRES_devel="
@@ -40,12 +42,17 @@ BUILD()
 INSTALL()
 {
 	make install INSTALL_TOP="$prefix" INSTALL_MAN="$manDir/man1" \
-		INSTALL_INC="$includeDir" INSTALL_LMOD="$dataDir/lua/5.2" \
+		INSTALL_INC="$includeDir/lua52" INSTALL_LMOD="$dataDir/lua/5.2" \
 		INSTALL_LIB="$libDir" INSTALL_BIN="$binDir"
 
 	ln -s liblua.so $libDir/liblua.so.5.2
+	ln -s liblua.a $libDir/liblua52.a
+
+	mv $binDir/lua $binDir/lua5.2
+	ln -s $binDir/lua5.2 $binDir/lua
 
 	prepareInstalledDevelLib liblua
+	prepareInstalledDevelLib liblua52
 	packageEntries devel $developDir
 }
 LICENSE="MIT"
diff --git a/dev-lang/lua/lua-5.2.3.recipe b/dev-lang/lua/lua-5.2.3.recipe
new file mode 100644
index 000000000..6818abddf
--- /dev/null
+++ b/dev-lang/lua/lua-5.2.3.recipe
@@ -0,0 +1,66 @@
+SUMMARY="Lua is a powerful, fast, light-weight, embeddable scripting language."
+HOMEPAGE="http://www.lua.org"
+SRC_URI="http://www.lua.org/ftp/lua-$portVersion.tar.gz"
+CHECKSUM_SHA256="13c2fb97961381f7d06d5b5cea55b743c163800896fd5c5e2356201d3619002d"
+REVISION="1"
+ARCHITECTURES="x86 x86_gcc2 x86_64"
+SECONDARY_ARCHITECTURES="x86"
+PROVIDES="
+	lua$secondaryArchSuffix = $portVersion compat >= 5.2
+	cmd:lua$secondaryArchSuffix = $portVersion compat >= 5.2
+	cmd:lua5.2$secondaryArchSuffix = $portVersion compat >= 5.2
+	cmd:luac$secondaryArchSuffix = $portVersion compat >= 5.2
+	lib:liblua$secondaryArchSuffix = $portVersion compat >= 5.2
+	"
+
+REQUIRES="
+	haiku$secondaryArchSuffix >= $haikuVersion
+	"
+BUILD_PREREQUIRES="
+	haiku${secondaryArchSuffix}_devel >= $haikuVersion
+	cmd:make
+	cmd:gcc$secondaryArchSuffix
+	"
+
+PROVIDES_devel="
+	lua${secondaryArchSuffix}_devel = $portVersion compat >= 5.2
+	devel:liblua$secondaryArchSuffix = $portVersion compat >= 5.2
+	devel:liblua52$secondaryArchSuffix = $portVersion compat >= 5.2
+	"
+
+REQUIRES_devel="
+	lua$secondaryArchSuffix == $portVersion
+	"
+
+PATCHES="lua-$portVersion.patchset"
+
+BUILD()
+{
+	make haiku MYCFLAGS="-DLUA_ROOT='\"$prefix/\"' -DLUA_LDIR='\"$dataDir/lua/5.2/\"'"
+}
+
+INSTALL()
+{
+	make install INSTALL_TOP="$prefix" INSTALL_MAN="$manDir/man1" \
+		INSTALL_INC="$includeDir/lua52" INSTALL_LMOD="$dataDir/lua/5.2" \
+		INSTALL_LIB="$libDir" INSTALL_BIN="$binDir"
+
+	ln -s liblua.so $libDir/liblua.so.5.2
+	ln -s liblua.a $libDir/liblua52.a
+
+	mv $binDir/lua $binDir/lua5.2
+	ln -s $binDir/lua5.2 $binDir/lua
+
+	prepareInstalledDevelLib liblua
+	prepareInstalledDevelLib liblua52
+	packageEntries devel $developDir
+}
+LICENSE="MIT"
+COPYRIGHT="1994-2012, Lua.org, PUC-Rio"
+DESCRIPTION="
+Lua combines simple procedural syntax with powerful data description \
+constructs based on associative arrays and extensible semantics. Lua is \
+dynamically typed, runs by interpreting bytecode for a register-based virtual \
+machine, and has automatic memory management with incremental garbage \
+collection, making it ideal for configuration, scripting, and rapid prototyping.
+"
diff --git a/dev-lang/lua/patches/lua-5.2.3.patchset b/dev-lang/lua/patches/lua-5.2.3.patchset
new file mode 100644
index 000000000..44c86858b
--- /dev/null
+++ b/dev-lang/lua/patches/lua-5.2.3.patchset
@@ -0,0 +1,113 @@
+From 95be65d7676d75b778defff51dd110e31644d499 Mon Sep 17 00:00:00 2001
+From: Jerome Duval <jerome.duval@gmail.com>
+Date: Mon, 5 May 2014 15:59:15 +0000
+Subject: import patch from 5.2.1
+
+
+diff --git a/Makefile b/Makefile
+index d2c7db4..baa4521 100644
+--- a/Makefile
++++ b/Makefile
+@@ -36,12 +36,12 @@ RM= rm -f
+ # == 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 lua.hpp
+-TO_LIB= liblua.a
++TO_LIB= liblua.a liblua.so
+ TO_MAN= lua.1 luac.1
+ 
+ # Lua version and release.
+@@ -52,7 +52,7 @@ R= $V.3
+ all:	$(PLAT)
+ 
+ $(PLATS) clean:
+-	cd src && $(MAKE) $@
++	cd src && $(MAKE) V=$(V) $@
+ 
+ test:	dummy
+ 	src/lua -v
+diff --git a/src/Makefile b/src/Makefile
+index 7b4b2b7..8edc5d6 100644
+--- a/src/Makefile
++++ b/src/Makefile
+@@ -26,9 +26,10 @@ MYOBJS=
+ 
+ # == 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 lctype.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
+@@ -43,7 +44,7 @@ LUAC_T=	luac
+ LUAC_O=	luac.o
+ 
+ ALL_O= $(BASE_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)
+ 
+ # Targets start here.
+@@ -65,6 +66,9 @@ $(LUA_T): $(LUA_O) $(LUA_A)
+ $(LUAC_T): $(LUAC_O) $(LUA_A)
+ 	$(CC) -o $@ $(LDFLAGS) $(LUAC_O) $(LUA_A) $(LIBS)
+ 
++$(LUA_SO): $(CORE_O) $(LIB_O)
++	$(CC) -o $@ -shared -fPIC -Wl,-soname=liblua.so.$(V) $(LDFLAGS) $? $(LIBS)
++
+ clean:
+ 	$(RM) $(ALL_T) $(ALL_O)
+ 
+@@ -102,6 +106,9 @@ freebsd:
+ 
+ generic: $(ALL)
+ 
++haiku:
++	$(MAKE) all SYSCFLAGS="-DLUA_USE_HAIKU" LIBS=
++
+ linux:
+ 	$(MAKE) $(ALL) SYSCFLAGS="-DLUA_USE_LINUX" SYSLIBS="-Wl,-E -ldl -lreadline"
+ 
+diff --git a/src/luaconf.h b/src/luaconf.h
+index 18be9a9..1cce188 100644
+--- a/src/luaconf.h
++++ b/src/luaconf.h
+@@ -38,7 +38,12 @@
+ #define LUA_USE_AFORMAT		/* assume 'printf' handles 'aA' specifiers */
+ #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
+@@ -100,8 +105,12 @@
+ #else			/* }{ */
+ 
+ #define LUA_VDIR	LUA_VERSION_MAJOR "." LUA_VERSION_MINOR "/"
++#ifndef LUA_ROOT
+ #define LUA_ROOT	"/usr/local/"
++#endif
++#ifndef LUA_LDIR
+ #define LUA_LDIR	LUA_ROOT "share/lua/" LUA_VDIR
++#endif
+ #define LUA_CDIR	LUA_ROOT "lib/lua/" LUA_VDIR
+ #define LUA_PATH_DEFAULT  \
+ 		LUA_LDIR"?.lua;"  LUA_LDIR"?/init.lua;" \
+-- 
+1.8.3.4
+
diff --git a/dev-lang/luajit/luajit-2.0.2.recipe b/dev-lang/luajit/luajit-2.0.2.recipe
index a5c5a1028..febaaa841 100644
--- a/dev-lang/luajit/luajit-2.0.2.recipe
+++ b/dev-lang/luajit/luajit-2.0.2.recipe
@@ -1,7 +1,7 @@
 SUMMARY="LuaJIT is a Just-In-Time Compiler (JIT) for the Lua programming language."
 HOMEPAGE="http://luajit.org/luajit.html"
 SRC_URI="http://luajit.org/download/LuaJIT-$portVersion.tar.gz"
-CHECKSUM_MD5="112dfb82548b03377fbefbba2e0e3a5b"
+CHECKSUM_SHA256="c05202974a5890e777b181908ac237625b499aece026654d7cc33607e3f46c38"
 REVISION="2"
 ARCHITECTURES="x86 x86_gcc2"
 SECONDARY_ARCHITECTURES="x86"
diff --git a/dev-lang/nasm/nasm-2.08.01.recipe b/dev-lang/nasm/nasm-2.08.01.recipe
index 4e2a133e1..c39073082 100644
--- a/dev-lang/nasm/nasm-2.08.01.recipe
+++ b/dev-lang/nasm/nasm-2.08.01.recipe
@@ -4,7 +4,7 @@ The Nasm assembler
 " 
 HOMEPAGE="http://www.nasm.us/" 
 SRC_URI="http://www.nasm.us/pub/nasm/releasebuilds/2.08.01/nasm-2.08.01.tar.bz2"
-CHECKSUM_MD5="1e3ebc1289c2be5963571c0937b7a211"
+CHECKSUM_SHA256="049b9a1381c0c775a07490f272a57c1802627cbfd6b2d675770b72078bdd8bc6"
 LICENSE="BSD (2-clause)"
 COPYRIGHT="1996 Simon Tatham and Julian Hall."
 REVISION="1"
diff --git a/dev-lang/nasm/nasm-2.11.02.recipe b/dev-lang/nasm/nasm-2.11.02.recipe
new file mode 100644
index 000000000..bd51cb63c
--- /dev/null
+++ b/dev-lang/nasm/nasm-2.11.02.recipe
@@ -0,0 +1,44 @@
+SUMMARY="The Nasm assembler"
+DESCRIPTION="
+The Nasm assembler
+" 
+HOMEPAGE="http://www.nasm.us/" 
+SRC_URI="http://www.nasm.us/pub/nasm/releasebuilds/2.11.02/nasm-2.11.02.tar.bz2"
+CHECKSUM_SHA256="ece26b5ef565f94d19a72756d05965e424d2e5ca55f88b949852da70dd62f0e0"
+LICENSE="BSD (2-clause)"
+COPYRIGHT="1996 Simon Tatham and Julian Hall."
+REVISION="1"
+ARCHITECTURES="x86_gcc2 x86 x86_64"
+
+PROVIDES="
+	nasm = $portVersion compat >= 1
+	cmd:nasm = $portVersion compat >= 1
+	cmd:ndisasm = $portVersion compat >= 1
+	"
+	
+REQUIRES="
+	haiku >= $haikuVersion
+	"
+BUILD_REQUIRES=""
+
+BUILD_PREREQUIRES="
+	haiku_devel >= $haikuVersion
+	cmd:gcc
+	cmd:ld
+	cmd:awk
+	cmd:make
+	cmd:perl
+	cmd:sed
+	"
+
+
+BUILD()
+{
+	runConfigure ./configure
+	make $jobArgs
+}
+
+INSTALL()
+{
+	make install
+}
diff --git a/dev-lang/ocaml/ocaml-4.00.0.recipe b/dev-lang/ocaml/ocaml-4.00.0.recipe
index 88e5854f7..97fad1ac3 100644
--- a/dev-lang/ocaml/ocaml-4.00.0.recipe
+++ b/dev-lang/ocaml/ocaml-4.00.0.recipe
@@ -15,7 +15,7 @@ LICENSE="GNU LGPL v2"
 COPYRIGHT="1996-2012 Institut National de Recherche en Informatique et en Automatique (INRIA)."
 HOMEPAGE="http://caml.inria.fr/index.en.html" 
 SRC_URI="http://caml.inria.fr/pub/distrib/ocaml-4.00/ocaml-4.00.0.tar.gz"
-CHECKSUM_MD5="fa11560a45793bd9fa45c1295a6f4a91"
+CHECKSUM_SHA256="9ea5544538144811b5fd9c7172d63abc0d1c6ba6b64d2c60474807fc57ad4c6e"
 REVISION="1"
 ARCHITECTURES="?x86 ?x86_gcc2"
 
diff --git a/dev-lang/ocaml/ocaml-4.01.0.recipe b/dev-lang/ocaml/ocaml-4.01.0.recipe
new file mode 100644
index 000000000..ea84a679e
--- /dev/null
+++ b/dev-lang/ocaml/ocaml-4.01.0.recipe
@@ -0,0 +1,93 @@
+SUMMARY="Implementation of the Caml language"
+DESCRIPTION="
+Caml is a general-purpose programming language, designed with program safety \
+and reliability in mind. It is very expressive, yet easy to learn and use. \
+Caml supports functional, imperative, and object-oriented programming styles. \
+It has been developed and distributed by INRIA, a French research institute in \
+computer science and applied mathematics, since 1985.
+The OCaml system is the main implementation of the Caml language. It features \
+a powerful module system and a full-fledged object-oriented layer. It comes \
+with a native-code compiler that supports numerous architectures, for high \
+performance; a bytecode compiler, for increased portability; and an \
+interactive loop, for experimentation and rapid development.
+"
+LICENSE="GNU LGPL v2"
+COPYRIGHT="1996-2013 Institut National de Recherche en Informatique et en Automatique (INRIA)."
+HOMEPAGE="http://caml.inria.fr/index.en.html" 
+SRC_URI="http://caml.inria.fr/pub/distrib/ocaml-4.01/ocaml-4.01.0.tar.gz"
+CHECKSUM_SHA256="ea1751deff454f5c738d10d8a0ad135afee0852d391cf95766b726c0faf7cfdb"
+REVISION="1"
+ARCHITECTURES="x86 ?x86_gcc2 x86_64"
+
+SOURCE_DIR="ocaml-4.01.0"
+
+PROVIDES="
+	ocaml = $portVersion compat >= 4
+	cmd:camlp4 = $portVersion compat >= 4
+	cmd:camlp4boot = $portVersion compat >= 4
+	cmd:camlp4o = $portVersion compat >= 4
+	cmd:camlp4o.opt = $portVersion compat >= 4
+	cmd:camlp4of = $portVersion compat >= 4
+	cmd:camlp4of.opt = $portVersion compat >= 4
+	cmd:camlp4oof = $portVersion compat >= 4
+	cmd:camlp4oof.opt = $portVersion compat >= 4
+	cmd:camlp4orf = $portVersion compat >= 4
+	cmd:camlp4orf.opt = $portVersion compat >= 4
+	cmd:camlp4prof = $portVersion compat >= 4
+	cmd:camlp4r = $portVersion compat >= 4
+	cmd:camlp4r.opt = $portVersion compat >= 4
+	cmd:camlp4rf = $portVersion compat >= 4
+	cmd:camlp4rf.opt = $portVersion compat >= 4
+	cmd:mkcamlp4 = $portVersion compat >= 4
+	cmd:ocaml = $portVersion compat >= 4
+	cmd:ocamlbuild = $portVersion compat >= 4
+	cmd:ocamlbuild.byte = $portVersion compat >= 4
+	cmd:ocamlbuild.native = $portVersion compat >= 4
+	cmd:ocamlc = $portVersion compat >= 4
+	cmd:ocamlc.opt = $portVersion compat >= 4
+	cmd:ocamlcp = $portVersion compat >= 4
+	cmd:ocamldebug = $portVersion compat >= 4
+	cmd:ocamldep = $portVersion compat >= 4
+	cmd:ocamldep.opt = $portVersion compat >= 4
+	cmd:ocamldoc = $portVersion compat >= 4
+	cmd:ocamldoc.opt = $portVersion compat >= 4
+	cmd:ocamllex = $portVersion compat >= 4
+	cmd:ocamllex.opt = $portVersion compat >= 4
+	cmd:ocamlmklib = $portVersion compat >= 4
+	cmd:ocamlmktop = $portVersion compat >= 4
+	cmd:ocamlobjinfo = $portVersion compat >= 4
+	cmd:ocamlopt = $portVersion compat >= 4
+	cmd:ocamlopt.opt = $portVersion compat >= 4
+	cmd:ocamloptp = $portVersion compat >= 4
+	cmd:ocamlprof = $portVersion compat >= 4
+	cmd:ocamlrun = $portVersion compat >= 4
+	cmd:ocamlyacc = $portVersion compat >= 4
+	"
+
+REQUIRES="
+	haiku >= $haikuVersion
+	"
+
+BUILD_PREREQUIRES="
+	haiku_devel >= $haikuVersion
+	cmd:make
+	cmd:gcc
+	cmd:awk
+	cmd:sed
+	cmd:grep
+	cmd:xargs
+	"
+
+PATCHES="ocaml-4.01.0.patchset"
+
+BUILD()
+{
+	./configure --prefix $prefix \
+		--mandir $manDir
+	make world.opt 
+}
+
+INSTALL()
+{
+	make install
+}
diff --git a/dev-lang/ocaml/patches/ocaml-4.01.0.patchset b/dev-lang/ocaml/patches/ocaml-4.01.0.patchset
new file mode 100644
index 000000000..4d85d0195
--- /dev/null
+++ b/dev-lang/ocaml/patches/ocaml-4.01.0.patchset
@@ -0,0 +1,285 @@
+From d536d33f14b403bf1eaa6214844a55a4fcb632f8 Mon Sep 17 00:00:00 2001
+From: Chris Roberts <cpr420@gmail.com>
+Date: Wed, 30 Oct 2013 21:35:40 -0600
+Subject: import old patch
+
+
+diff --git a/configure b/configure
+index 07b1c35..0b386f1 100755
+--- a/configure
++++ b/configure
+@@ -290,6 +290,10 @@ case "$bytecc,$host" in
+     bytecccompopts="-fno-defer-pop $gcc_warnings"
+     # No -lm library
+     mathlib="";;
++  *,*-*-haiku*)
++    bytecccompopts="-fno-defer-pop $gcc_warnings"
++    # No -lm library
++    mathlib="";;
+   gcc,alpha*-*-osf*)
+     bytecccompopts="-fno-defer-pop $gcc_warnings"
+     if cc="$bytecc" sh ./hasgot -mieee; then
+@@ -622,6 +626,9 @@ if test $withsharedlibs = "yes"; then
+       byteccrpath="-Wl,-rpath,"
+       mksharedlibrpath="-Wl,-rpath,"
+       shared_libraries_supported=true;;
++    *-*haiku*)
++      mksharedlib="$bytecc -shared"
++      shared_libraries_supported=true;;  
+   esac
+ fi
+ 
+@@ -687,6 +694,7 @@ case "$host" in
+                                   arch=i386; system=solaris
+                                 fi;;
+   i[3456]86-*-beos*)            arch=i386; system=beos;;
++  i[3456]86-*-haiku*)            arch=i386; system=beos;;
+   i[3456]86-*-cygwin*)          arch=i386; system=cygwin;;
+   i[3456]86-*-darwin*)          if $arch64; then
+                                   arch=amd64; system=macosx
+@@ -918,6 +926,11 @@ elif sh ./hasgot -lnsl -lsocket socket socketpair bind listen accept connect; th
+   cclibs="$cclibs -lnsl -lsocket"
+   echo "#define HAS_SOCKETS" >> s.h
+   has_sockets=yes
++elif sh ./hasgot -lnetwork socket socketpair bind listen accept connect; then
++  echo "You have BSD sockets (with libraries '-lnetwork')"
++  cclibs="$cclibs -lnetwork"
++  echo "#define HAS_SOCKETS" >> s.h
++  has_sockets=yes
+ fi
+ 
+ if sh ./hasgot -i sys/socket.h -t socklen_t; then
+diff --git a/otherlibs/unix/nice.c b/otherlibs/unix/nice.c
+index 019e2d1..e765a60 100644
+--- a/otherlibs/unix/nice.c
++++ b/otherlibs/unix/nice.c
+@@ -22,7 +22,11 @@ CAMLprim value unix_nice(value incr)
+ {
+   int ret;
+   errno = 0;
++#ifdef __HAIKU__
++  ret = 0;
++#else
+   ret = nice(Int_val(incr));
++#endif
+   if (ret == -1 && errno != 0) uerror("nice", Nothing);
+   return Val_int(ret);
+ }
+-- 
+1.8.3.4
+
+
+From b35a7ca313da620259d7d304251d608620ac6b22 Mon Sep 17 00:00:00 2001
+From: Jerome Duval <jerome.duval@gmail.com>
+Date: Sat, 22 Mar 2014 19:48:57 +0000
+Subject: Haiku x86_64 support
+
+
+diff --git a/config/gnu/config.guess b/config/gnu/config.guess
+index 8152efd..1804e9f 100755
+--- a/config/gnu/config.guess
++++ b/config/gnu/config.guess
+@@ -2,13 +2,13 @@
+ # Attempt to guess a canonical system name.
+ #   Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999,
+ #   2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010,
+-#   2011 Free Software Foundation, Inc.
++#   2011, 2012, 2013 Free Software Foundation, Inc.
+ 
+-timestamp='2011-11-11'
++timestamp='2012-12-29'
+ 
+ # This file is free software; you can redistribute it and/or modify it
+ # under the terms of the GNU General Public License as published by
+-# the Free Software Foundation; either version 2 of the License, or
++# the Free Software Foundation; either version 3 of the License, or
+ # (at your option) any later version.
+ #
+ # This program is distributed in the hope that it will be useful, but
+@@ -17,26 +17,22 @@ timestamp='2011-11-11'
+ # General Public License for more details.
+ #
+ # You should have received a copy of the GNU General Public License
+-# along with this program; if not, write to the Free Software
+-# Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston, MA
+-# 02110-1301, USA.
++# along with this program; if not, see <http://www.gnu.org/licenses/>.
+ #
+ # As a special exception to the GNU General Public License, if you
+ # distribute this file as part of a program that contains a
+ # configuration script generated by Autoconf, you may include it under
+-# the same distribution terms that you use for the rest of that program.
+-
+-
+-# Originally written by Per Bothner.  Please send patches (context
+-# diff format) to <config-patches@gnu.org> and include a ChangeLog
+-# entry.
++# the same distribution terms that you use for the rest of that
++# program.  This Exception is an additional permission under section 7
++# of the GNU General Public License, version 3 ("GPLv3").
+ #
+-# This script attempts to guess a canonical system name similar to
+-# config.sub.  If it succeeds, it prints the system name on stdout, and
+-# exits with 0.  Otherwise, it exits with 1.
++# Originally written by Per Bothner. 
+ #
+ # You can get the latest version of this script from:
+ # http://git.savannah.gnu.org/gitweb/?p=config.git;a=blob_plain;f=config.guess;hb=HEAD
++#
++# Please send patches with a ChangeLog entry to config-patches@gnu.org.
++
+ 
+ me=`echo "$0" | sed -e 's,.*/,,'`
+ 
+@@ -57,8 +53,8 @@ GNU config.guess ($timestamp)
+ 
+ Originally written by Per Bothner.
+ Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000,
+-2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free
+-Software Foundation, Inc.
++2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011,
++2012, 2013 Free Software Foundation, Inc.
+ 
+ This is free software; see the source for copying conditions.  There is NO
+ warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE."
+@@ -145,7 +141,7 @@ UNAME_VERSION=`(uname -v) 2>/dev/null` || UNAME_VERSION=unknown
+ case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in
+     *:NetBSD:*:*)
+ 	# NetBSD (nbsd) targets should (where applicable) match one or
+-	# more of the tupples: *-*-netbsdelf*, *-*-netbsdaout*,
++	# more of the tuples: *-*-netbsdelf*, *-*-netbsdaout*,
+ 	# *-*-netbsdecoff* and *-*-netbsd*.  For targets that recently
+ 	# switched to ELF, *-*-netbsd* would select the old
+ 	# object file format.  This provides both forward
+@@ -202,6 +198,10 @@ case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in
+ 	# CPU_TYPE-MANUFACTURER-OPERATING_SYSTEM is used.
+ 	echo "${machine}-${os}${release}"
+ 	exit ;;
++    *:Bitrig:*:*)
++	UNAME_MACHINE_ARCH=`arch | sed 's/Bitrig.//'`
++	echo ${UNAME_MACHINE_ARCH}-unknown-bitrig${UNAME_RELEASE}
++	exit ;;
+     *:OpenBSD:*:*)
+ 	UNAME_MACHINE_ARCH=`arch | sed 's/OpenBSD.//'`
+ 	echo ${UNAME_MACHINE_ARCH}-unknown-openbsd${UNAME_RELEASE}
+@@ -304,7 +304,7 @@ case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in
+     arm:RISC*:1.[012]*:*|arm:riscix:1.[012]*:*)
+ 	echo arm-acorn-riscix${UNAME_RELEASE}
+ 	exit ;;
+-    arm:riscos:*:*|arm:RISCOS:*:*)
++    arm*:riscos:*:*|arm*:RISCOS:*:*)
+ 	echo arm-unknown-riscos
+ 	exit ;;
+     SR2?01:HI-UX/MPP:*:* | SR8000:HI-UX/MPP:*:*)
+@@ -803,6 +803,9 @@ EOF
+     i*:CYGWIN*:*)
+ 	echo ${UNAME_MACHINE}-pc-cygwin
+ 	exit ;;
++    *:MINGW64*:*)
++	echo ${UNAME_MACHINE}-pc-mingw64
++	exit ;;
+     *:MINGW*:*)
+ 	echo ${UNAME_MACHINE}-pc-mingw32
+ 	exit ;;
+@@ -863,6 +866,13 @@ EOF
+     i*86:Minix:*:*)
+ 	echo ${UNAME_MACHINE}-pc-minix
+ 	exit ;;
++    aarch64:Linux:*:*)
++	echo ${UNAME_MACHINE}-unknown-linux-gnu
++	exit ;;
++    aarch64_be:Linux:*:*)
++	UNAME_MACHINE=aarch64_be
++	echo ${UNAME_MACHINE}-unknown-linux-gnu
++	exit ;;
+     alpha:Linux:*:*)
+ 	case `sed -n '/^cpu model/s/^.*: \(.*\)/\1/p' < /proc/cpuinfo` in
+ 	  EV5)   UNAME_MACHINE=alphaev5 ;;
+@@ -897,16 +907,16 @@ EOF
+ 	echo ${UNAME_MACHINE}-unknown-linux-gnu
+ 	exit ;;
+     cris:Linux:*:*)
+-	echo cris-axis-linux-gnu
++	echo ${UNAME_MACHINE}-axis-linux-gnu
+ 	exit ;;
+     crisv32:Linux:*:*)
+-	echo crisv32-axis-linux-gnu
++	echo ${UNAME_MACHINE}-axis-linux-gnu
+ 	exit ;;
+     frv:Linux:*:*)
+-	echo frv-unknown-linux-gnu
++	echo ${UNAME_MACHINE}-unknown-linux-gnu
+ 	exit ;;
+     hexagon:Linux:*:*)
+-	echo hexagon-unknown-linux-gnu
++	echo ${UNAME_MACHINE}-unknown-linux-gnu
+ 	exit ;;
+     i*86:Linux:*:*)
+ 	LIBC=gnu
+@@ -948,7 +958,7 @@ EOF
+ 	test x"${CPU}" != x && { echo "${CPU}-unknown-linux-gnu"; exit; }
+ 	;;
+     or32:Linux:*:*)
+-	echo or32-unknown-linux-gnu
++	echo ${UNAME_MACHINE}-unknown-linux-gnu
+ 	exit ;;
+     padre:Linux:*:*)
+ 	echo sparc-unknown-linux-gnu
+@@ -989,7 +999,7 @@ EOF
+ 	echo ${UNAME_MACHINE}-dec-linux-gnu
+ 	exit ;;
+     x86_64:Linux:*:*)
+-	echo x86_64-unknown-linux-gnu
++	echo ${UNAME_MACHINE}-unknown-linux-gnu
+ 	exit ;;
+     xtensa*:Linux:*:*)
+ 	echo ${UNAME_MACHINE}-unknown-linux-gnu
+@@ -1196,6 +1206,9 @@ EOF
+     BePC:Haiku:*:*)	# Haiku running on Intel PC compatible.
+ 	echo i586-pc-haiku
+ 	exit ;;
++    x86_64:Haiku:*:*)
++	echo x86_64-unknown-haiku
++	exit ;;
+     SX-4:SUPER-UX:*:*)
+ 	echo sx4-nec-superux${UNAME_RELEASE}
+ 	exit ;;
+@@ -1251,7 +1264,7 @@ EOF
+     NEO-?:NONSTOP_KERNEL:*:*)
+ 	echo neo-tandem-nsk${UNAME_RELEASE}
+ 	exit ;;
+-    NSE-?:NONSTOP_KERNEL:*:*)
++    NSE-*:NONSTOP_KERNEL:*:*)
+ 	echo nse-tandem-nsk${UNAME_RELEASE}
+ 	exit ;;
+     NSR-?:NONSTOP_KERNEL:*:*)
+@@ -1320,11 +1333,11 @@ EOF
+     i*86:AROS:*:*)
+ 	echo ${UNAME_MACHINE}-pc-aros
+ 	exit ;;
++    x86_64:VMkernel:*:*)
++	echo ${UNAME_MACHINE}-unknown-esx
++	exit ;;
+ esac
+ 
+-#echo '(No uname command or uname output not recognized.)' 1>&2
+-#echo "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" 1>&2
+-
+ eval $set_cc_for_build
+ cat >$dummy.c <<EOF
+ #ifdef _SEQUENT_
+diff --git a/configure b/configure
+index 0b386f1..268da09 100755
+--- a/configure
++++ b/configure
+@@ -721,6 +721,7 @@ case "$host" in
+   x86_64-*-freebsd*)            arch=amd64; system=freebsd;;
+   x86_64-*-netbsd*)             arch=amd64; system=netbsd;;
+   x86_64-*-openbsd*)            arch=amd64; system=openbsd;;
++  x86_64-*-haiku*)              arch=amd64; system=haiku;;
+   x86_64-*-darwin*)             arch=amd64; system=macosx;;
+ esac
+ 
+-- 
+1.8.3.4
+
diff --git a/dev-lang/openjdk/openjdk-1.7.recipe b/dev-lang/openjdk/openjdk-1.7.recipe
deleted file mode 100644
index 151eeb701..000000000
--- a/dev-lang/openjdk/openjdk-1.7.recipe
+++ /dev/null
@@ -1,186 +0,0 @@
-DESCRIPTION="openjdk"
-HOMEPAGE="http://openjdk.java.net/"
-SRC_URI="http://ports-space.haiku-files.org/source/openjdk/j2sdk-april-2013.tar"
-REVISION="3"
-STATUS_HAIKU="stable"
-DEPEND="app-arch/cpio 	= 2.10
-	media-libs/freetype 	>= 2.4.9"
-
-CHECKSUM_MD5="e38b939c34b04427336245397fa43c9c"
-
-BUILD()
-{
-	OPENJDK_DIR=`haikuporter -t`/dev-lang/openjdk/work
-
-	# Get and build Apache Ant.
-	# Making a separate .bep file for it wasn't such a good idea.
-
-	wget -nc http://archive.apache.org/dist/ant/source/apache-ant-1.8.4-src.tar.gz
-	tar xvfz apache-ant-1.8.4-src.tar.gz
-	export LIBRARY_PATH=${OPENJDK_DIR}/j2sdk-image/jre/lib/i386/:$LIBRARY_PATH
-	export JAVA_HOME=${OPENJDK_DIR}/j2sdk-image
-	export ANT_HOME=${OPENJDK_DIR}/ant
-	cd apache-ant-1.8.4
-	sed -i 's/depends=\"jars,test-jar\"/depends=\"jars\"/' build.xml
-	sh build.sh install-lite
-	unset JAVA_HOME
-	cd ..
-
-	# Clone latest JDK repositories.
-	if [ "$(ls -A jdk)" ]; then
-		echo "jdk directory is not empty"
-	else
-		hg clone http://hg.openjdk.java.net/haiku/haiku jdk --debug
-	fi
-
-	if [ "$(ls -A jdk/corba)" ]; then
-		echo "jdk/corba directory is not empty"
-	else
-		hg clone http://hg.openjdk.java.net/haiku/haiku/corba jdk/corba --debug
-	fi
-
-	if [ "$(ls -A jdk/hotspot)" ]; then
-		echo "jdk/hotspot directory is not empty"
-	else
-		hg clone http://hg.openjdk.java.net/haiku/haiku/hotspot jdk/hotspot --debug
-	fi
-
-	if [ "$(ls -A jdk/jaxp)" ]; then
-		echo "jdk/jaxp directory is not empty"
-	else
-		hg clone http://hg.openjdk.java.net/haiku/haiku/jaxp jdk/jaxp --debug
-	fi
-
-	if [ "$(ls -A jdk/jaxws)" ]; then
-		echo "jdk/jaxws directory is not empty"
-	else
-		hg clone http://hg.openjdk.java.net/haiku/haiku/jaxws jdk/jaxws --debug
-	fi
-
-	if [ "$(ls -A jdk/jdk)" ]; then
-		echo "jdk/jdk directory is not empty"
-	else
-		hg clone http://hg.openjdk.java.net/haiku/haiku/jdk jdk/jdk --debug
-	fi
-
-	if [ "$(ls -A jdk/langtools)" ]; then
-		echo "jdk/langtools directory is not empty"
-	else
-		hg clone http://hg.openjdk.java.net/haiku/haiku/langtools jdk/langtools --debug
-	fi
-
-	export ALT_BOOTDIR=${OPENJDK_DIR}/j2sdk-image
-
-	# don't set ALT_JDK_IMPORT for a full build
-	# set jdk/README-build.html
-	# export ALT_JDK_IMPORT_PATH=${OPENJDK_DIR}/j2sdk-image
-
-	export ANT=${OPENJDK_DIR}/ant
-	export ALT_OUTPUTDIR=${OPENJDK_DIR}/output
-
-	# set jdk/README-build.html
-	export LANG=C
-
-	# add $ANT_HOME/bin to PATH
-	export PATH=$PATH:$ANT_HOME/bin
-
-	# use PATH to search commands rather than explicitly set path for each commands
-	# so that grep, egrep & readelf are automaticly found
-	# see Defs-haiku.gmk
-	export ALT_UNIXCOMMAND_PATH=
-
-	# mandatory GCC4 [requires at least 4.5.3]
-	setgcc gcc4
-
-	mkdir -p ${ALT_OUTPUTDIR}
-
-	# some sources downloaded while building have moved
-	# so we have to provide a directory where they have to reside to
-	export ALT_DROPS_DIR=${OPENJDK_DIR}/drop
-	mkdir -p ${ALT_DROPS_DIR}
-	export ALLOW_DOWNLOADS=false
-
-	# grab relocated sources
-	cd ${ALT_DROPS_DIR}
-	wget -nc http://ports-space.haiku-files.org/source/openjdk/jaxp145_01.zip
-	wget -nc http://ports-space.haiku-files.org/source/openjdk/jdk7-jaf-2010_08_19.zip
-	wget -nc http://ports-space.haiku-files.org/source/openjdk/jdk7-jaxws2_2_4-b03-2011_05_27.zip
-	cd ..
-
-	# Deploy certain headers, if they are missing.
-
-	HEADERS_DIR=`finddir B_SYSTEM_HEADERS_DIRECTORY`
-	MEDIA_DIR=${HEADERS_DIR}/os/media
-
-	if [ -e ${MEDIA_DIR}/SoundConsumer.h ] ;
-	then
-		echo SoundConsumer.h exists.
-	else
-		cp SoundConsumer.h ${MEDIA_DIR}/SoundConsumer.h
-		SOUND_CONSUMER_H=1
-		echo SoundConsumer.h was not found. Deployed private file instead.
-	fi
-
-	if [ -e ${MEDIA_DIR}/SoundUtils.h ] ;
-	then
-		echo SoundUtils.h exists.
-	else
-		cp SoundUtils.h ${MEDIA_DIR}/SoundUtils.h
-		declare SOUND_UTILS_H=1
-		echo SoundUtils.h was not found. Deployed private file instead.
-	fi
-
-	# small patch allowing to finish build without errors
-	# this modification already exists in another dev branch
-	# if someone fix it in current branch, using sed rathan than patch should not brake
-	# the whole build
-	if [ -e jdk/make/Defs-internal.gmk.org ];
-	then
-		echo Defs-internal exists.
-	else
-		mv jdk/make/Defs-internal.gmk jdk/make/Defs-internal.gmk.org
-	fi
-	cat jdk/make/Defs-internal.gmk.org | sed s/'$(PRINTF) "--'/'$(PRINTF) -- "--'/ >jdk/make/Defs-internal.gmk
-
-	# Build.
-	cd jdk
-	make
-
-	# Cleanup private files, if any were deployed.
-	# I don't really think it would harm anyone if we don't clean them up after compiling.
-
-#	if [ ${SOUND_CONSUMER_H} == 1 ] ;
-#	then
-#		rm -f ${MEDIA_DIR}/SoundConsumer.h
-#		echo Removed private SoundConsumer.h
-#	fi
-#
-#	if [ ${SOUND_UTILS_H} == 1 ] ;
-#	then
-#		rm -f ${MEDIA_DIR}/SoundUtils.h
-#		echo Removed private SoundUtils.h
-#	fi
-}
-
-INSTALL()
-{
-	# install
-	mkdir -p `finddir B_COMMON_DIRECTORY`/jdk
-	cp -r -f -v output/j2sdk-image/* `finddir B_COMMON_DIRECTORY`/jdk
-	# setup env
-	$(haikuporter -t)/dev-lang/openjdk/openjdk_setup_env.sh
-
-	# build distro
-	mkdir -p ${DESTDIR}`finddir B_COMMON_DIRECTORY`/jdk
-	cp -r -f -v output/j2sdk-image/* ${DESTDIR}`finddir B_COMMON_DIRECTORY`/jdk
-	mkdir -p ${DESTDIR}/boot/common/boot/post_install
-	cp -f $(haikuporter -t)/dev-lang/openjdk/openjdk_setup_env.sh ${DESTDIR}/boot/common/boot/post_install
-}
-
-TEST()
-{
-	echo "OpenJDK tests are not yet ported to Haiku."
-}
-
-LICENSE="GNU GPL v2"
-COPYRIGHT="2005, 2006, Oracle and/or its affiliates"
diff --git a/dev-lang/openjdk/openjdk-1.7_2013_11_08.recipe b/dev-lang/openjdk/openjdk-1.7_2013_11_08.recipe
index 20d49c3ff..bcbbc290e 100644
--- a/dev-lang/openjdk/openjdk-1.7_2013_11_08.recipe
+++ b/dev-lang/openjdk/openjdk-1.7_2013_11_08.recipe
@@ -10,11 +10,11 @@ LICENSE="GNU GPL v2"
 #CHECKSUM_MD5="65b348918f92eb357ed7b455dadcded8"
 # The August j2sdk image is apparently incomplete.
 SRC_URI="http://ports-space.haiku-files.org/source/openjdk/j2sdk-april-2013.tar"
-CHECKSUM_MD5="e38b939c34b04427336245397fa43c9c"
+CHECKSUM_SHA256="fca2603875d5c0b77b95a6f01f3d0fd368d32754801d5180d262404f8e2a31c6"
 SOURCE_DIR="j2sdk-image"
 
 SRC_URI_2="http://archive.apache.org/dist/ant/source/apache-ant-1.8.4-src.tar.gz"
-CHECKSUM_MD5_2="4e05e1cc4ea4b56d85bbbc4fe29d1c29"
+CHECKSUM_SHA256_2="df6f0aaede2549dc4347b972efc8036c01a737caac545b8ba43a21687bc521e7"
 SOURCE_DIR_2="apache-ant-1.8.4"
 
 SRC_URI_3="hg+http://hg.openjdk.java.net/haiku/haiku#ee67ee3bd597"
@@ -34,16 +34,22 @@ PATCHES_8="openjdk-1.7_2013_11_08-source8.patchset"
 SRC_URI_9="hg+http://hg.openjdk.java.net/haiku/haiku/langtools#0dabb2f5fad0"
 
 SRC_URI_10="http://ports-space.haiku-files.org/source/openjdk/jaxp145_01.zip#noarchive"
-CHECKSUM_MD5_10="32394c780c8fb5e29775f623525993c0"
+CHECKSUM_SHA256_10="c5924c6188988e2e8397ee5143bd8eaa062569d052567afd2ac9326a54a848cb"
 
 SRC_URI_11="http://ports-space.haiku-files.org/source/openjdk/jdk7-jaf-2010_08_19.zip#noarchive"
-CHECKSUM_MD5_11="18d15dfd71117daadb332af003d08212"
+CHECKSUM_SHA256_11="e6aefedfdbb4673e8019583d1344fb162b94e1b10382c362364dbbfd5889c09e"
 
 SRC_URI_12="http://ports-space.haiku-files.org/source/openjdk/jdk7-jaxws2_2_4-b03-2011_05_27.zip#noarchive"
-CHECKSUM_MD5_12="2f5b829ade70f67fe272d0b322e3e702"
+CHECKSUM_SHA256_12="05ae7259b75d0f2307276d61ece1887fcd437cb4ecda42fab8c22d4b537effd6"
 
 REVISION="2"
-ARCHITECTURES="x86 !x86_gcc2"
+ARCHITECTURES="x86"
+if [ $effectiveTargetArchitecture != x86_gcc2 ]; then
+	# x86_gcc2 is fine as primary target architecture as long as we're building
+	# for a different secondary architecture.
+	ARCHITECTURES="$ARCHITECTURES !x86_gcc2"
+fi
+SECONDARY_ARCHITECTURES="x86"
 
 DISABLE_SOURCE_PACKAGE=yes
 	# at least as long as Ant and a complete SDK image are part of the sources
@@ -90,24 +96,24 @@ PROVIDES="
 	"
 
 REQUIRES="
-	haiku >= $haikuVersion
-	lib:libfreetype
-	lib:libiconv
-	lib:libz
+	haiku$secondaryArchSuffx >= $haikuVersion
+	lib:libfreetype$secondaryArchSuffix
+	lib:libiconv$secondaryArchSuffix
+	lib:libz$secondaryArchSuffix
 	"
 
 BUILD_REQUIRES="
-	haiku_devel >= $haikuVersion
-	devel:libfreetype
-	devel:libiconv
-	devel:libz
+	haiku${secondaryArchSuffix}_devel >= $haikuVersion
+	devel:libfreetype$secondaryArchSuffix
+	devel:libiconv$secondaryArchSuffix
+	devel:libz$secondaryArchSuffix
 	"
 
 BUILD_PREREQUIRES="
 	cmd:cpio >= 2.10
 	cmd:make
-	cmd:gcc
-	cmd:ld
+	cmd:gcc$secondaryArchSuffix
+	cmd:ld$secondaryArchSuffix
 	cmd:sed
 	cmd:tar
 	cmd:zip
diff --git a/dev-lang/openjdk/openjdk_setup_env.sh b/dev-lang/openjdk/openjdk_setup_env.sh
deleted file mode 100644
index ef1cd2f39..000000000
--- a/dev-lang/openjdk/openjdk_setup_env.sh
+++ /dev/null
@@ -1,41 +0,0 @@
-#!/bin/sh
-_progress () {
-	notify --type progress --group openJDK \
-		--icon /boot/system/kernel_x86 \
-		--messageID $0_$$ \
-		--title "Set OpenJDK env..." \
-		--progress "$1" "$2" >/dev/null
-}
-
-_progress 0.2 ".profile"
-cd
-if [ -e .profile ];
-then
-	echo
-else
-	touch .profile
-fi
-
-_progress 0.4 "JAVA_HOME"
-grep "export JAVA_HOME=" .profile >/dev/null
-if [ $? == 1 ];
-then
-	echo "export JAVA_HOME=\`finddir B_COMMON_DIRECTORY\`/jdk" >>.profile
-fi
-
-_progress 0.6 "PATH"
-grep "export PATH=\$JAVA_HOME/bin:\$PATH" .profile >/dev/null
-if [ $? == 1 ];
-then
-	echo "export PATH=\$JAVA_HOME/bin:\$PATH" >>.profile
-fi
-
-_progress 0.8 "LIBRARY_PATH"
-export _SEARCH=$JAVA_HOME/jre/lib/i386
-echo $_SEARCH | grep $LIBRARY_PATH >/dev/null
-grep "export LIBRARY_PATH=\$JAVA_HOME/jre/lib/i386:\$LIBRARY_PATH" .profile >/dev/null
-if [ $? == 1 ];
-then
-	echo "export LIBRARY_PATH=\$JAVA_HOME/jre/lib/i386:\$LIBRARY_PATH" >>.profile
-fi
-_progress 1.0 "done"
diff --git a/dev-lang/perl/perl-5.10.1.recipe b/dev-lang/perl/perl-5.10.1.recipe
index 28cafe29d..8b2d4a341 100644
--- a/dev-lang/perl/perl-5.10.1.recipe
+++ b/dev-lang/perl/perl-5.10.1.recipe
@@ -19,7 +19,7 @@ COPYRIGHT="1993-2009 Larry Wall and others"
 LICENSE="GNU GPL v1
 	Artistic (Perl)"
 SRC_URI="http://www.cpan.org/src/perl-5.10.1.tar.gz"
-CHECKSUM_MD5="b9b2fdb957f50ada62d73f43ee75d044"
+CHECKSUM_SHA256="cb7f26ea4b2b28d6644354d87a269d01cac1b635287dae64e88eeafa24b44f35"
 REVISION="6"
 ARCHITECTURES="x86_gcc2 x86 x86_64"
 
diff --git a/dev-lang/perl/perl-5.18.1.recipe b/dev-lang/perl/perl-5.18.1.recipe
index 81efeee0f..e29d49b9e 100644
--- a/dev-lang/perl/perl-5.18.1.recipe
+++ b/dev-lang/perl/perl-5.18.1.recipe
@@ -19,7 +19,7 @@ COPYRIGHT="1993-2009 Larry Wall and others"
 LICENSE="GNU GPL v1
 	Artistic (Perl)"
 SRC_URI="http://www.cpan.org/src/perl-5.18.1.tar.gz"
-CHECKSUM_MD5="304cb5bd18e48c44edd6053337d3386d"
+CHECKSUM_SHA256="655e11a8ffba8853efcdce568a142c232600ed120ac24aaebb4e6efe74e85b2b"
 REVISION="1"
 ARCHITECTURES="x86_gcc2 x86 x86_64"
 
diff --git a/dev-lang/perl/perl-5.18.2.recipe b/dev-lang/perl/perl-5.18.2.recipe
new file mode 100644
index 000000000..2b384eed6
--- /dev/null
+++ b/dev-lang/perl/perl-5.18.2.recipe
@@ -0,0 +1,143 @@
+SUMMARY="Larry Wall's Practical Extraction and Report Language"
+DESCRIPTION="
+Perl was originally developed by Larry Wall in 1987 as a general-purpose Unix \
+scripting language to make report processing easier.
+
+Perl borrows features from other programming languages including C, shell \
+scripting (sh), AWK, and sed. The language provides powerful text processing \
+facilities without the arbitrary data-length limits of many contemporary Unix \
+tools, facilitating easy manipulation of text files.
+
+In addition to CGI, Perl is used for graphics programming, system \
+administration, network programming, finance, bioinformatics, and other \
+applications. Perl is nicknamed 'the Swiss Army chainsaw of scripting \
+languages' because of its flexibility and power, and possibly also because of \
+its perceived 'ugliness'.
+"
+HOMEPAGE="http://www.perl.org/"
+COPYRIGHT="1993-2009 Larry Wall and others"
+LICENSE="GNU GPL v1
+	Artistic (Perl)"
+SRC_URI="http://www.cpan.org/src/perl-5.18.2.tar.gz"
+CHECKSUM_SHA256="7cbed5ef11900e8f68041215eea0de5e443d53393f84c41d5c9c69c150a4982f"
+REVISION="2"
+ARCHITECTURES="?x86_gcc2 ?x86 x86_64 arm"
+
+PATCHES="perl-5.18.1.patchset"
+
+PROVIDES="
+	# assume that any perl commands are backwards compatible to version 5.
+	perl = $portVersion compat >= 5
+	cmd:a2p = $portVersion compat >= 5
+	cmd:c2ph = $portVersion compat >= 5
+	cmd:config_data = $portVersion compat >= 5
+	cmd:corelist = $portVersion compat >= 5
+	cmd:cpan = $portVersion compat >= 5
+	cmd:cpan2dist = $portVersion compat >= 5
+	cmd:cpanp = $portVersion compat >= 5
+	cmd:cpanp_run_perl = $portVersion compat >= 5
+	cmd:dprofpp = $portVersion compat >= 5
+	cmd:enc2xs = $portVersion compat >= 5
+	cmd:find2perl = $portVersion compat >= 5
+	cmd:h2ph = $portVersion compat >= 5
+	cmd:h2xs = $portVersion compat >= 5
+	cmd:instmodsh = $portVersion compat >= 5
+	cmd:json_pp = $portVersion compat >= 5
+	cmd:libnetcfg = $portVersion compat >= 5
+	cmd:perl = $portVersion compat >= 5
+	cmd:perl$portVersion = $portVersion compat >= 5
+	cmd:perlbug = $portVersion compat >= 5
+	cmd:perldoc = $portVersion compat >= 5
+	cmd:perlivp = $portVersion compat >= 5
+	cmd:perlthanks = $portVersion compat >= 5
+	cmd:piconv = $portVersion compat >= 5
+	cmd:pl2pm = $portVersion compat >= 5
+	cmd:pod2html = $portVersion compat >= 5
+	cmd:pod2latex = $portVersion compat >= 5
+	cmd:pod2man = $portVersion compat >= 5
+	cmd:pod2text = $portVersion compat >= 5
+	cmd:pod2usage = $portVersion compat >= 5
+	cmd:podchecker = $portVersion compat >= 5
+	cmd:podselect = $portVersion compat >= 5
+	cmd:prove = $portVersion compat >= 5
+	cmd:psed = $portVersion compat >= 5
+	cmd:pstruct = $portVersion compat >= 5
+	cmd:ptar = $portVersion compat >= 5
+	cmd:ptardiff = $portVersion compat >= 5
+	cmd:ptargrep = $portVersion compat >= 5
+	cmd:s2p = $portVersion compat >= 5
+	cmd:shasum = $portVersion compat >= 5
+	cmd:splain = $portVersion compat >= 5
+	cmd:xsubpp = $portVersion compat >= 5
+	cmd:zipdetails = $portVersion compat >= 5
+	# vendor_perl refers to the path to packaged perl modules, which includes
+	# the full perl version, so it isn't backwards compatible to anything else.
+	vendor_perl = $portVersion
+	# It is unclear which kind of backwards compatibility libperl.so 
+	# implements, so we assume none.
+	lib:libperl = $portVersion
+	"
+REQUIRES="
+	haiku >= $haikuVersion
+	"
+BUILD_REQUIRES="
+	"
+BUILD_PREREQUIRES="
+	haiku_devel >= $haikuVersion
+	cmd:awk
+	cmd:gcc
+	cmd:ld
+	cmd:make
+	cmd:sed
+	"
+
+perlArchName="$(uname -m)-haiku"
+
+GLOBAL_WRITABLE_FILES="
+	non-packaged/lib/perl5/site_perl/$portVersion/sitecustomize.pl keep-old
+	non-packaged/lib/perl5/site_perl/$portVersion/$perlArchName directory keep-old
+	"
+
+BUILD_PACKAGE_ACTIVATION_PHASE=INSTALL
+
+BUILD()
+{
+	./Configure \
+		-Dprefix=$prefix \
+		-Dprivlib=$prefix/lib/perl5/$portVersion \
+		-Dsiteprefix=$prefix/non-packaged \
+		-Dsitelib=$prefix/non-packaged/lib/perl5/site_perl/$portVersion \
+		-Dvendorprefix=$prefix \
+		-Dvendorlib=$prefix/lib/perl5/vendor_perl/$portVersion \
+		-Dcf_email=zooey@hirschkaefer.de \
+		-Uusenm -Duseshrplib -Uusemymalloc \
+		-Dlibpth="$(finddir B_USER_DEVELOP_DIRECTORY)/lib $(finddir B_SYSTEM_DEVELOP_DIRECTORY)/lib" \
+		-Dusrinc="$(finddir B_SYSTEM_DEVELOP_DIRECTORY)/headers/posix" \
+		-Dlocinc="$(finddir B_USER_CONFIG_DIRECTORY)/develop/headers $(finddir B_SYSTEM_DEVELOP_DIRECTORY)/headers" \
+		-Dlibc="'$(finddir B_SYSTEM_LIB_DIRECTORY)/libroot.so'" \
+		-Dlibs=-lnetwork -Dcc=gcc -Dld=gcc \
+		-Ud_link -Ddont_use_nlink -Ud_syserrlst \
+		-Dldlibpthname=LIBRARY_PATH -Dstartperl="#! perl" \
+		-Dccdlflags="-Wl,-rpath=$libDir/perl5/$portVersion/$perlArchName/CORE" \
+		-Dusesitecustomize \
+		-de
+
+	# force-remove path from sed
+	sed -i -e 's/LOC_SED\s*"\/bin\/sed/LOC_SED "sed/' config.h
+
+	make $jobArgs
+}
+
+INSTALL()
+{
+	make install
+	chmod a+x $binDir/{perl,psed,pstruct,perlthanks}
+
+	# copy script into site_perl that takes care of massaging @INC into what we need.
+	cp sitecustomize.pl $prefix/non-packaged/lib/perl5/site_perl/$portVersion/
+}
+
+TEST()
+{
+	make test
+}
diff --git a/dev-lang/python/patches/python-2.7.6.patchset b/dev-lang/python/patches/python-2.7.6.patchset
new file mode 100644
index 000000000..22d516fe1
--- /dev/null
+++ b/dev-lang/python/patches/python-2.7.6.patchset
@@ -0,0 +1,783 @@
+From faaf6967e31a129b062c3a3a9b6752944aee865f Mon Sep 17 00:00:00 2001
+From: Jerome Duval <jerome.duval@gmail.com>
+Date: Wed, 12 Mar 2014 21:17:06 +0000
+Subject: initial Haiku patch
+
+
+diff --git a/Lib/distutils/command/install.py b/Lib/distutils/command/install.py
+index b9f1c6c..7be61d3 100644
+--- a/Lib/distutils/command/install.py
++++ b/Lib/distutils/command/install.py
+@@ -83,6 +83,35 @@ INSTALL_SCHEMES = {
+         'scripts': '$userbase/bin',
+         'data'   : '$userbase',
+         },
++    'haiku': {
++        'purelib': '$base/non-packaged/lib/python$py_version_short/site-packages',
++        'platlib': '$platbase/non-packaged/lib/python$py_version_short/site-packages',
++        'headers': '$base/non-packaged/develop/headers/python$py_version_short/$dist_name',
++        'scripts': '$base/non-packaged/bin',
++        'data'   : '$base/non-packaged',
++        },
++    'haiku_vendor': {
++        'purelib': '$base/lib/python$py_version_short/vendor-packages',
++        'platlib': '$platbase/lib/python$py_version_short/vendor-packages',
++        'headers': '$base/develop/headers/python$py_version_short/$dist_name',
++        'scripts': '$base/bin',
++        'data'   : '$base',
++        },
++    'haiku_home': {
++        'purelib': '$base/lib/python',
++        'platlib': '$base/lib/python',
++        'headers': '$base/develop/headers/python/$dist_name',
++        'scripts': '$base/bin',
++        'data'   : '$base',
++        },
++    'haiku_user': {
++        'purelib': '$usersite',
++        'platlib': '$usersite',
++        'headers': '$userbase/develop/headers/python$py_version_short/$dist_name',
++        'scripts': '$userbase/bin',
++        'data'   : '$userbase',
++        },
++
+     }
+ 
+ # The keys to an installation scheme; if any new types of files are to be
+@@ -416,10 +445,16 @@ class install (Command):
+                 raise DistutilsPlatformError(
+                     "User base directory is not specified")
+             self.install_base = self.install_platbase = self.install_userbase
+-            self.select_scheme("unix_user")
++            if sys.platform.startswith('haiku'):
++	            self.select_scheme("haiku_user")
++            else:
++	            self.select_scheme("unix_user")
+         elif self.home is not None:
+             self.install_base = self.install_platbase = self.home
+-            self.select_scheme("unix_home")
++            if sys.platform.startswith('haiku'):
++	            self.select_scheme("haiku_home")
++            else:
++	            self.select_scheme("unix_home")
+         else:
+             if self.prefix is None:
+                 if self.exec_prefix is not None:
+@@ -435,7 +470,13 @@ class install (Command):
+ 
+             self.install_base = self.prefix
+             self.install_platbase = self.exec_prefix
+-            self.select_scheme("unix_prefix")
++            if sys.platform.startswith('haiku'):
++                if os.environ.get('HAIKU_USE_VENDOR_DIRECTORIES') == '1':
++                    self.select_scheme("haiku_vendor")
++                else:
++                    self.select_scheme("haiku")
++            else:
++                self.select_scheme("unix_prefix")
+ 
+     # finalize_unix ()
+ 
+diff --git a/Lib/distutils/sysconfig.py b/Lib/distutils/sysconfig.py
+index 4aa9334..d06e5e8 100644
+--- a/Lib/distutils/sysconfig.py
++++ b/Lib/distutils/sysconfig.py
+@@ -90,7 +90,8 @@ def get_python_inc(plat_specific=0, prefix=None):
+                 # Include is located in the srcdir
+                 inc_dir = os.path.join(srcdir, "Include")
+             return inc_dir
+-        return os.path.join(prefix, "include", "python" + get_python_version())
++        inc_dir = "include" if sys.platform != "haiku1" else "develop/headers"
++        return os.path.join(prefix, inc_dir, "python" + get_python_version())
+     elif os.name == "nt":
+         return os.path.join(prefix, "include")
+     elif os.name == "os2":
+@@ -119,12 +120,20 @@ def get_python_lib(plat_specific=0, standard_lib=0, prefix=None):
+         prefix = plat_specific and EXEC_PREFIX or PREFIX
+ 
+     if os.name == "posix":
+-        libpython = os.path.join(prefix,
+-                                 "lib", "python" + get_python_version())
+-        if standard_lib:
+-            return libpython
++        if sys.platform.startswith('haiku'):
++            if standard_lib:
++                return os.path.join(prefix,
++                                    "lib", "python" + get_python_version())
++            return os.path.join(prefix, "non-packaged",
++                                "lib", "python" + get_python_version(),
++                                "site-packages")
+         else:
+-            return os.path.join(libpython, "site-packages")
++	        libpython = os.path.join(prefix,
++	                                 "lib", "python" + get_python_version())
++	        if standard_lib:
++	            return libpython
++	        else:
++	            return os.path.join(libpython, "site-packages")
+ 
+     elif os.name == "nt":
+         if standard_lib:
+diff --git a/Lib/plat-haiku1/IN.py b/Lib/plat-haiku1/IN.py
+new file mode 100644
+index 0000000..362cb41
+--- /dev/null
++++ b/Lib/plat-haiku1/IN.py
+@@ -0,0 +1,327 @@
++# Generated by h2py from /boot/develop/headers/be/net/netinet/in.h
++
++# Included from socket.h
++
++# Included from BeBuild.h
++B_BEOS_VERSION_4 = 0x0400
++B_BEOS_VERSION_4_5 = 0x0450
++B_BEOS_VERSION_5 = 0x0500
++B_BEOS_VERSION = B_BEOS_VERSION_5
++B_BEOS_VERSION_MAUI = B_BEOS_VERSION_5
++_PR2_COMPATIBLE_ = 1
++_PR3_COMPATIBLE_ = 1
++_R4_COMPATIBLE_ = 1
++_R4_5_COMPATIBLE_ = 1
++_PR2_COMPATIBLE_ = 0
++_PR3_COMPATIBLE_ = 0
++_R4_COMPATIBLE_ = 1
++_R4_5_COMPATIBLE_ = 1
++def _UNUSED(x): return x
++
++
++# Included from sys/types.h
++
++# Included from time.h
++
++# Included from be_setup.h
++def __std(ref): return ref
++
++__be_os = 2
++__dest_os = __be_os
++__MSL__ = 0x4011
++__GLIBC__ = -2
++__GLIBC_MINOR__ = 1
++
++# Included from null.h
++NULL = (0)
++NULL = 0L
++
++# Included from size_t.h
++
++# Included from stddef.h
++
++# Included from wchar_t.h
++CLOCKS_PER_SEC = 1000
++CLK_TCK = CLOCKS_PER_SEC
++MAX_TIMESTR = 70
++
++# Included from sys/time.h
++
++# Included from ByteOrder.h
++
++# Included from endian.h
++__LITTLE_ENDIAN = 1234
++LITTLE_ENDIAN = __LITTLE_ENDIAN
++__BYTE_ORDER = __LITTLE_ENDIAN
++BYTE_ORDER = __BYTE_ORDER
++__BIG_ENDIAN = 0
++BIG_ENDIAN = 0
++__BIG_ENDIAN = 4321
++BIG_ENDIAN = __BIG_ENDIAN
++__BYTE_ORDER = __BIG_ENDIAN
++BYTE_ORDER = __BYTE_ORDER
++__LITTLE_ENDIAN = 0
++LITTLE_ENDIAN = 0
++__PDP_ENDIAN = 3412
++PDP_ENDIAN = __PDP_ENDIAN
++
++# Included from SupportDefs.h
++
++# Included from Errors.h
++
++# Included from limits.h
++
++# Included from float.h
++FLT_ROUNDS = 1
++FLT_RADIX = 2
++FLT_MANT_DIG = 24
++FLT_DIG = 6
++FLT_MIN_EXP = (-125)
++FLT_MIN_10_EXP = (-37)
++FLT_MAX_EXP = 128
++FLT_MAX_10_EXP = 38
++DBL_MANT_DIG = 53
++DBL_DIG = 15
++DBL_MIN_EXP = (-1021)
++DBL_MIN_10_EXP = (-308)
++DBL_MAX_EXP = 1024
++DBL_MAX_10_EXP = 308
++LDBL_MANT_DIG = DBL_MANT_DIG
++LDBL_DIG = DBL_DIG
++LDBL_MIN_EXP = DBL_MIN_EXP
++LDBL_MIN_10_EXP = DBL_MIN_10_EXP
++LDBL_MAX_EXP = DBL_MAX_EXP
++LDBL_MAX_10_EXP = DBL_MAX_10_EXP
++CHAR_BIT = (8)
++SCHAR_MIN = (-127-1)
++SCHAR_MAX = (127)
++CHAR_MIN = SCHAR_MIN
++CHAR_MAX = SCHAR_MAX
++MB_LEN_MAX = (1)
++SHRT_MIN = (-32767-1)
++SHRT_MAX = (32767)
++LONG_MIN = (-2147483647L-1)
++LONG_MAX = (2147483647L)
++INT_MIN = LONG_MIN
++INT_MAX = LONG_MAX
++ARG_MAX = (32768)
++ATEXIT_MAX = (32)
++CHILD_MAX = (1024)
++IOV_MAX = (256)
++FILESIZEBITS = (64)
++LINK_MAX = (1)
++LOGIN_NAME_MAX = (32)
++MAX_CANON = (255)
++MAX_INPUT = (255)
++NAME_MAX = (256)
++NGROUPS_MAX = (32)
++OPEN_MAX = (128)
++PATH_MAX = (1024)
++PIPE_MAX = (512)
++SSIZE_MAX = (2147483647L)
++TTY_NAME_MAX = (256)
++TZNAME_MAX = (32)
++SYMLINKS_MAX = (16)
++_POSIX_ARG_MAX = (32768)
++_POSIX_CHILD_MAX = (1024)
++_POSIX_LINK_MAX = (1)
++_POSIX_LOGIN_NAME_MAX = (9)
++_POSIX_MAX_CANON = (255)
++_POSIX_MAX_INPUT = (255)
++_POSIX_NAME_MAX = (255)
++_POSIX_NGROUPS_MAX = (0)
++_POSIX_OPEN_MAX = (128)
++_POSIX_PATH_MAX = (1024)
++_POSIX_PIPE_BUF = (512)
++_POSIX_SSIZE_MAX = (2147483647L)
++_POSIX_STREAM_MAX = (8)
++_POSIX_TTY_NAME_MAX = (256)
++_POSIX_TZNAME_MAX = (3)
++B_GENERAL_ERROR_BASE = LONG_MIN
++B_OS_ERROR_BASE = B_GENERAL_ERROR_BASE + 0x1000
++B_APP_ERROR_BASE = B_GENERAL_ERROR_BASE + 0x2000
++B_INTERFACE_ERROR_BASE = B_GENERAL_ERROR_BASE + 0x3000
++B_MEDIA_ERROR_BASE = B_GENERAL_ERROR_BASE + 0x4000
++B_TRANSLATION_ERROR_BASE = B_GENERAL_ERROR_BASE + 0x4800
++B_MIDI_ERROR_BASE = B_GENERAL_ERROR_BASE + 0x5000
++B_STORAGE_ERROR_BASE = B_GENERAL_ERROR_BASE + 0x6000
++B_POSIX_ERROR_BASE = B_GENERAL_ERROR_BASE + 0x7000
++B_MAIL_ERROR_BASE = B_GENERAL_ERROR_BASE + 0x8000
++B_PRINT_ERROR_BASE = B_GENERAL_ERROR_BASE + 0x9000
++B_DEVICE_ERROR_BASE = B_GENERAL_ERROR_BASE + 0xa000
++B_ERRORS_END = (B_GENERAL_ERROR_BASE + 0xffff)
++E2BIG = (B_POSIX_ERROR_BASE + 1)
++ECHILD = (B_POSIX_ERROR_BASE + 2)
++EDEADLK = (B_POSIX_ERROR_BASE + 3)
++EFBIG = (B_POSIX_ERROR_BASE + 4)
++EMLINK = (B_POSIX_ERROR_BASE + 5)
++ENFILE = (B_POSIX_ERROR_BASE + 6)
++ENODEV = (B_POSIX_ERROR_BASE + 7)
++ENOLCK = (B_POSIX_ERROR_BASE + 8)
++ENOSYS = (B_POSIX_ERROR_BASE + 9)
++ENOTTY = (B_POSIX_ERROR_BASE + 10)
++ENXIO = (B_POSIX_ERROR_BASE + 11)
++ESPIPE = (B_POSIX_ERROR_BASE + 12)
++ESRCH = (B_POSIX_ERROR_BASE + 13)
++EFPOS = (B_POSIX_ERROR_BASE + 14)
++ESIGPARM = (B_POSIX_ERROR_BASE + 15)
++EDOM = (B_POSIX_ERROR_BASE + 16)
++ERANGE = (B_POSIX_ERROR_BASE + 17)
++EPROTOTYPE = (B_POSIX_ERROR_BASE + 18)
++EPROTONOSUPPORT = (B_POSIX_ERROR_BASE + 19)
++EPFNOSUPPORT = (B_POSIX_ERROR_BASE + 20)
++EAFNOSUPPORT = (B_POSIX_ERROR_BASE + 21)
++EADDRINUSE = (B_POSIX_ERROR_BASE + 22)
++EADDRNOTAVAIL = (B_POSIX_ERROR_BASE + 23)
++ENETDOWN = (B_POSIX_ERROR_BASE + 24)
++ENETUNREACH = (B_POSIX_ERROR_BASE + 25)
++ENETRESET = (B_POSIX_ERROR_BASE + 26)
++ECONNABORTED = (B_POSIX_ERROR_BASE + 27)
++ECONNRESET = (B_POSIX_ERROR_BASE + 28)
++EISCONN = (B_POSIX_ERROR_BASE + 29)
++ENOTCONN = (B_POSIX_ERROR_BASE + 30)
++ESHUTDOWN = (B_POSIX_ERROR_BASE + 31)
++ECONNREFUSED = (B_POSIX_ERROR_BASE + 32)
++EHOSTUNREACH = (B_POSIX_ERROR_BASE + 33)
++ENOPROTOOPT = (B_POSIX_ERROR_BASE + 34)
++ENOBUFS = (B_POSIX_ERROR_BASE + 35)
++EINPROGRESS = (B_POSIX_ERROR_BASE + 36)
++EALREADY = (B_POSIX_ERROR_BASE + 37)
++EILSEQ = (B_POSIX_ERROR_BASE + 38)
++ENOMSG = (B_POSIX_ERROR_BASE + 39)
++ESTALE = (B_POSIX_ERROR_BASE + 40)
++EOVERFLOW = (B_POSIX_ERROR_BASE + 41)
++EMSGSIZE = (B_POSIX_ERROR_BASE + 42)
++EOPNOTSUPP = (B_POSIX_ERROR_BASE + 43)
++ENOTSOCK = (B_POSIX_ERROR_BASE + 44)
++false = 0
++true = 1
++NULL = (0)
++FALSE = 0
++TRUE = 1
++
++# Included from TypeConstants.h
++B_HOST_IS_LENDIAN = 1
++B_HOST_IS_BENDIAN = 0
++def B_HOST_TO_LENDIAN_DOUBLE(arg): return (double)(arg)
++
++def B_HOST_TO_LENDIAN_FLOAT(arg): return (float)(arg)
++
++def B_HOST_TO_LENDIAN_INT64(arg): return (uint64)(arg)
++
++def B_HOST_TO_LENDIAN_INT32(arg): return (uint32)(arg)
++
++def B_HOST_TO_LENDIAN_INT16(arg): return (uint16)(arg)
++
++def B_HOST_TO_BENDIAN_DOUBLE(arg): return __swap_double(arg)
++
++def B_HOST_TO_BENDIAN_FLOAT(arg): return __swap_float(arg)
++
++def B_HOST_TO_BENDIAN_INT64(arg): return __swap_int64(arg)
++
++def B_HOST_TO_BENDIAN_INT32(arg): return __swap_int32(arg)
++
++def B_HOST_TO_BENDIAN_INT16(arg): return __swap_int16(arg)
++
++def B_LENDIAN_TO_HOST_DOUBLE(arg): return (double)(arg)
++
++def B_LENDIAN_TO_HOST_FLOAT(arg): return (float)(arg)
++
++def B_LENDIAN_TO_HOST_INT64(arg): return (uint64)(arg)
++
++def B_LENDIAN_TO_HOST_INT32(arg): return (uint32)(arg)
++
++def B_LENDIAN_TO_HOST_INT16(arg): return (uint16)(arg)
++
++def B_BENDIAN_TO_HOST_DOUBLE(arg): return __swap_double(arg)
++
++def B_BENDIAN_TO_HOST_FLOAT(arg): return __swap_float(arg)
++
++def B_BENDIAN_TO_HOST_INT64(arg): return __swap_int64(arg)
++
++def B_BENDIAN_TO_HOST_INT32(arg): return __swap_int32(arg)
++
++def B_BENDIAN_TO_HOST_INT16(arg): return __swap_int16(arg)
++
++B_HOST_IS_LENDIAN = 0
++B_HOST_IS_BENDIAN = 1
++def B_HOST_TO_LENDIAN_DOUBLE(arg): return __swap_double(arg)
++
++def B_HOST_TO_LENDIAN_FLOAT(arg): return __swap_float(arg)
++
++def B_HOST_TO_LENDIAN_INT64(arg): return __swap_int64(arg)
++
++def B_HOST_TO_LENDIAN_INT32(arg): return __swap_int32(arg)
++
++def B_HOST_TO_LENDIAN_INT16(arg): return __swap_int16(arg)
++
++def B_HOST_TO_BENDIAN_DOUBLE(arg): return (double)(arg)
++
++def B_HOST_TO_BENDIAN_FLOAT(arg): return (float)(arg)
++
++def B_HOST_TO_BENDIAN_INT64(arg): return (uint64)(arg)
++
++def B_HOST_TO_BENDIAN_INT32(arg): return (uint32)(arg)
++
++def B_HOST_TO_BENDIAN_INT16(arg): return (uint16)(arg)
++
++def B_LENDIAN_TO_HOST_DOUBLE(arg): return __swap_double(arg)
++
++def B_LENDIAN_TO_HOST_FLOAT(arg): return __swap_float(arg)
++
++def B_LENDIAN_TO_HOST_INT64(arg): return __swap_int64(arg)
++
++def B_LENDIAN_TO_HOST_INT32(arg): return __swap_int32(arg)
++
++def B_LENDIAN_TO_HOST_INT16(arg): return __swap_int16(arg)
++
++def B_BENDIAN_TO_HOST_DOUBLE(arg): return (double)(arg)
++
++def B_BENDIAN_TO_HOST_FLOAT(arg): return (float)(arg)
++
++def B_BENDIAN_TO_HOST_INT64(arg): return (uint64)(arg)
++
++def B_BENDIAN_TO_HOST_INT32(arg): return (uint32)(arg)
++
++def B_BENDIAN_TO_HOST_INT16(arg): return (uint16)(arg)
++
++def B_SWAP_DOUBLE(arg): return __swap_double(arg)
++
++def B_SWAP_FLOAT(arg): return __swap_float(arg)
++
++def B_SWAP_INT64(arg): return __swap_int64(arg)
++
++def B_SWAP_INT32(arg): return __swap_int32(arg)
++
++def B_SWAP_INT16(arg): return __swap_int16(arg)
++
++def htonl(x): return B_HOST_TO_BENDIAN_INT32(x)
++
++def ntohl(x): return B_BENDIAN_TO_HOST_INT32(x)
++
++def htons(x): return B_HOST_TO_BENDIAN_INT16(x)
++
++def ntohs(x): return B_BENDIAN_TO_HOST_INT16(x)
++
++AF_INET = 1
++INADDR_ANY = 0x00000000
++INADDR_BROADCAST = 0xffffffff
++INADDR_LOOPBACK = 0x7f000001
++SOL_SOCKET = 1
++SO_DEBUG = 1
++SO_REUSEADDR = 2
++SO_NONBLOCK = 3
++SO_REUSEPORT = 4
++MSG_OOB = 0x1
++SOCK_DGRAM = 1
++SOCK_STREAM = 2
++IPPROTO_UDP = 1
++IPPROTO_TCP = 2
++IPPROTO_ICMP = 3
++B_UDP_MAX_SIZE = (65536 - 1024)
++FD_SETSIZE = 256
++FDSETSIZE = FD_SETSIZE
++NFDBITS = 32
++def _FDMSKNO(fd): return ((fd) / NFDBITS)
++
++def _FDBITNO(fd): return ((fd) % NFDBITS)
+diff --git a/Lib/plat-haiku1/regen b/Lib/plat-haiku1/regen
+new file mode 100644
+index 0000000..d9da80c
+--- /dev/null
++++ b/Lib/plat-haiku1/regen
+@@ -0,0 +1,7 @@
++#! /bin/sh
++
++H2PY=../../Tools/scripts/h2py.py
++HEADERS=/boot/develop/headers
++
++set -v
++python $H2PY -i '(u_long)' $HEADERS/posix/netinet/in.h
+diff --git a/Lib/test/test_fileio.py b/Lib/test/test_fileio.py
+index e7955cc..703ddf6 100644
+--- a/Lib/test/test_fileio.py
++++ b/Lib/test/test_fileio.py
+@@ -297,6 +297,7 @@ class OtherFileTests(unittest.TestCase):
+                     self.assertEqual(f.writable(), True)
+                     if sys.platform != "darwin" and \
+                        'bsd' not in sys.platform and \
++                       'haiku' not in sys.platform and \
+                        not sys.platform.startswith('sunos'):
+                         # Somehow /dev/tty appears seekable on some BSDs
+                         self.assertEqual(f.seekable(), False)
+diff --git a/Modules/resource.c b/Modules/resource.c
+index 53a6c3e..6c5f52f 100644
+--- a/Modules/resource.c
++++ b/Modules/resource.c
+@@ -86,6 +86,7 @@ resource_getrusage(PyObject *self, PyObject *args)
+                     PyFloat_FromDouble(doubletime(ru.ru_utime)));
+     PyStructSequence_SET_ITEM(result, 1,
+                     PyFloat_FromDouble(doubletime(ru.ru_stime)));
++#ifndef __HAIKU__
+     PyStructSequence_SET_ITEM(result, 2, PyInt_FromLong(ru.ru_maxrss));
+     PyStructSequence_SET_ITEM(result, 3, PyInt_FromLong(ru.ru_ixrss));
+     PyStructSequence_SET_ITEM(result, 4, PyInt_FromLong(ru.ru_idrss));
+@@ -100,6 +101,7 @@ resource_getrusage(PyObject *self, PyObject *args)
+     PyStructSequence_SET_ITEM(result, 13, PyInt_FromLong(ru.ru_nsignals));
+     PyStructSequence_SET_ITEM(result, 14, PyInt_FromLong(ru.ru_nvcsw));
+     PyStructSequence_SET_ITEM(result, 15, PyInt_FromLong(ru.ru_nivcsw));
++#endif
+ 
+     if (PyErr_Occurred()) {
+         Py_DECREF(result);
+diff --git a/Modules/socketmodule.c b/Modules/socketmodule.c
+index 2735ecc..fb01c63 100644
+--- a/Modules/socketmodule.c
++++ b/Modules/socketmodule.c
+@@ -4865,7 +4865,9 @@ init_socket(void)
+ #ifndef __BEOS__
+ /* We have incomplete socket support. */
+     PyModule_AddIntConstant(m, "SOCK_RAW", SOCK_RAW);
++#ifndef __HAIKU__
+     PyModule_AddIntConstant(m, "SOCK_SEQPACKET", SOCK_SEQPACKET);
++#endif
+ #if defined(SOCK_RDM)
+     PyModule_AddIntConstant(m, "SOCK_RDM", SOCK_RDM);
+ #endif
+diff --git a/Modules/socketmodule.h b/Modules/socketmodule.h
+index 8515499..4e33e4f 100644
+--- a/Modules/socketmodule.h
++++ b/Modules/socketmodule.h
+@@ -47,6 +47,10 @@ typedef int socklen_t;
+ #  undef AF_NETLINK
+ #endif
+ 
++#if defined(__HAIKU__)
++#undef HAVE_BLUETOOTH_BLUETOOTH_H
++#endif
++
+ #ifdef HAVE_BLUETOOTH_BLUETOOTH_H
+ #include <bluetooth/bluetooth.h>
+ #include <bluetooth/rfcomm.h>
+diff --git a/Modules/spwdmodule.c b/Modules/spwdmodule.c
+index 957de58..69be5bb 100644
+--- a/Modules/spwdmodule.c
++++ b/Modules/spwdmodule.c
+@@ -79,7 +79,9 @@ static PyObject *mkspent(struct spwd *p)
+ 
+     SETS(setIndex++, p->sp_namp);
+     SETS(setIndex++, p->sp_pwdp);
++#ifndef __HAIKU__
+     SETI(setIndex++, p->sp_lstchg);
++#endif
+     SETI(setIndex++, p->sp_min);
+     SETI(setIndex++, p->sp_max);
+     SETI(setIndex++, p->sp_warn);
+diff --git a/Modules/timemodule.c b/Modules/timemodule.c
+index 12c43b0..206b325 100644
+--- a/Modules/timemodule.c
++++ b/Modules/timemodule.c
+@@ -1006,11 +1006,11 @@ floatsleep(double secs)
+         return -1;
+     }
+     Py_END_ALLOW_THREADS
+-#elif defined(__BEOS__)
++#elif defined(__BEOS__) || defined(__HAIKU__)
+     /* This sleep *CAN BE* interrupted. */
+     {
+         if( secs <= 0.0 ) {
+-            return;
++            return 0;
+         }
+ 
+         Py_BEGIN_ALLOW_THREADS
+diff --git a/Python/bltinmodule.c b/Python/bltinmodule.c
+index d22dca2..9a5d561 100644
+--- a/Python/bltinmodule.c
++++ b/Python/bltinmodule.c
+@@ -19,7 +19,7 @@
+ */
+ #if defined(MS_WINDOWS) && defined(HAVE_USABLE_WCHAR_T)
+ const char *Py_FileSystemDefaultEncoding = "mbcs";
+-#elif defined(__APPLE__)
++#elif defined(__APPLE__) || defined(__HAIKU__)
+ const char *Py_FileSystemDefaultEncoding = "utf-8";
+ #else
+ const char *Py_FileSystemDefaultEncoding = NULL; /* use default */
+diff --git a/Tools/scripts/h2py.py b/Tools/scripts/h2py.py
+index c64501e..7df3ad7 100755
+--- a/Tools/scripts/h2py.py
++++ b/Tools/scripts/h2py.py
+@@ -50,7 +50,7 @@ except KeyError:
+         searchdirs=os.environ['INCLUDE'].split(';')
+     except KeyError:
+         try:
+-            if  sys.platform.find("beos") == 0:
++            if  sys.platform.find("beos") == 0 or sys.platform.find("haiku1") == 0:
+                 searchdirs=os.environ['BEINCLUDES'].split(';')
+             elif sys.platform.startswith("atheos"):
+                 searchdirs=os.environ['C_INCLUDE_PATH'].split(':')
+diff --git a/configure.ac b/configure.ac
+index 891d568..24959b3 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -883,7 +883,7 @@ if test $enable_shared = "yes"; then
+ 	  RUNSHARED=LD_LIBRARY_PATH=`pwd`:${LD_LIBRARY_PATH}
+ 	  INSTSONAME="$LDLIBRARY".$SOVERSION
+           ;;
+-    Linux*|GNU*|NetBSD*|FreeBSD*|DragonFly*|OpenBSD*)
++    Linux*|GNU*|NetBSD*|FreeBSD*|DragonFly*|OpenBSD*|Haiku*)
+ 	  LDLIBRARY='libpython$(VERSION).so'
+ 	  BLDLIBRARY='-L. -lpython$(VERSION)'
+ 	  RUNSHARED=LD_LIBRARY_PATH=`pwd`:${LD_LIBRARY_PATH}
+@@ -891,6 +891,9 @@ if test $enable_shared = "yes"; then
+ 	      FreeBSD*)
+ 		SOVERSION=`echo $SOVERSION|cut -d "." -f 1`
+ 		;;
++	      Haiku*)
++	    RUNSHARED=LIBRARY_PATH=`pwd`:${LIBRARY_PATH}
++		;;
+ 	  esac
+ 	  INSTSONAME="$LDLIBRARY".$SOVERSION
+ 	  ;;
+@@ -1006,7 +1009,7 @@ AC_PROG_MKDIR_P
+ AC_SUBST(LN)
+ if test -z "$LN" ; then
+ 	case $ac_sys_system in
+-		BeOS*) LN="ln -s";;
++		BeOS*|Haiku*) LN="ln -s";;
+ 		CYGWIN*) LN="ln -s";;
+ 		atheos*) LN="ln -s";;
+ 		*) LN=ln;;
+@@ -2024,7 +2027,7 @@ then
+ 			fi
+ 		fi
+ 		;;
+-	Linux*|GNU*|QNX*)
++	Linux*|GNU*|QNX*|Haiku*)
+ 		LDSHARED='$(CC) -shared'
+ 		LDCXXSHARED='$(CXX) -shared';;
+ 	BSD/OS*/4*)
+@@ -2096,7 +2099,7 @@ then
+ 		 then CCSHARED="-fPIC";
+ 		 else CCSHARED="+z";
+ 		 fi;;
+-	Linux*|GNU*) CCSHARED="-fPIC";;
++	Linux*|GNU*|Haiku*) CCSHARED="-fPIC";;
+ 	BSD/OS*/4*) CCSHARED="-fpic";;
+ 	FreeBSD*|NetBSD*|OpenBSD*|DragonFly*) CCSHARED="-fPIC";;
+ 	OpenUNIX*|UnixWare*)
+@@ -2128,7 +2131,7 @@ then
+ 	    LINKFORSHARED="-Wl,-E -Wl,+s";;
+ #	    LINKFORSHARED="-Wl,-E -Wl,+s -Wl,+b\$(BINLIBDEST)/lib-dynload";;
+ 	BSD/OS/4*) LINKFORSHARED="-Xlinker -export-dynamic";;
+-	Linux*|GNU*) LINKFORSHARED="-Xlinker -export-dynamic";;
++	Linux*|GNU*|Haiku*) LINKFORSHARED="-Xlinker -export-dynamic";;
+ 	# -u libsys_s pulls in all symbols in libsys
+ 	Darwin/*) 
+ 		# -u _PyMac_Error is needed to pull in the mac toolbox glue,
+@@ -2243,14 +2246,16 @@ case "$ac_sys_system" in
+ esac
+ 
+ # Most SVR4 platforms (e.g. Solaris) need -lsocket and -lnsl.
+-# BeOS' sockets are stashed in libnet.
+ AC_CHECK_LIB(nsl, t_open, [LIBS="-lnsl $LIBS"]) # SVR4
+ AC_CHECK_LIB(socket, socket, [LIBS="-lsocket $LIBS"], [], $LIBS) # SVR4 sockets
+ 
++# BeOS' sockets are stashed in libnet.
++# Haiku's sockets are stashed in libnetwork.
+ case "$ac_sys_system" in
+-BeOS*)
+-AC_CHECK_LIB(net, socket, [LIBS="-lnet $LIBS"], [], $LIBS) # BeOS
+-;;
++	BeOS*)
++		AC_CHECK_LIB(net, socket, [LIBS="-lnet $LIBS"], [], $LIBS);;
++	Haiku*)
++		AC_CHECK_LIB(network, socket, [LIBS="-lnetwork $LIBS"], [], $LIBS);;
+ esac
+ 
+ AC_MSG_CHECKING(for --with-libs)
+@@ -3586,7 +3591,7 @@ fi],
+ AC_SUBST(LIBM)
+ case $ac_sys_system in
+ Darwin) ;;
+-BeOS) ;;
++BeOS|Haiku) ;;
+ *) LIBM=-lm
+ esac
+ AC_MSG_CHECKING(for --with-libm=STRING)
+diff --git a/setup.py b/setup.py
+index 40ad843..24621ef 100644
+--- a/setup.py
++++ b/setup.py
+@@ -523,6 +523,12 @@ class PyBuildExt(build_ext):
+             lib_dirs += os.getenv('LIBRARY_PATH', '').split(os.pathsep)
+             inc_dirs += ['/system/include', '/atheos/autolnk/include']
+             inc_dirs += os.getenv('C_INCLUDE_PATH', '').split(os.pathsep)
++            
++        # Haiku-specific include and library locations
++        if host_platform == 'haiku1':
++            inc_dirs += ['/boot/develop/headers/posix',
++                         '/boot/system/develop/headers']
++            lib_dirs += ['/boot/system/develop/lib']
+ 
+         # OSF/1 and Unixware have some stuff in /usr/ccs/lib (like -ldb)
+         if host_platform in ['osf1', 'unixware7', 'openunix8']:
+@@ -551,7 +557,7 @@ class PyBuildExt(build_ext):
+ 
+         # Check for MacOS X, which doesn't need libm.a at all
+         math_libs = ['m']
+-        if host_platform in ['darwin', 'beos']:
++        if host_platform in ['darwin', 'beos', 'haiku1']:
+             math_libs = []
+ 
+         # XXX Omitted modules: gl, pure, dl, SGI-specific modules
+@@ -788,15 +794,22 @@ class PyBuildExt(build_ext):
+                               '/usr/local/ssl/include',
+                               '/usr/contrib/ssl/include/'
+                              ]
+-        ssl_incs = find_file('openssl/ssl.h', inc_dirs,
++        ssl_incs = find_file('openssl/ssl.h', [],
++                             inc_dirs + search_for_ssl_incs_in
++                             )
++        ssl_incs_to_add = find_file('openssl/ssl.h', inc_dirs,
+                              search_for_ssl_incs_in
+                              )
+         if ssl_incs is not None:
+             krb5_h = find_file('krb5.h', inc_dirs,
+                                ['/usr/kerberos/include'])
+             if krb5_h:
+-                ssl_incs += krb5_h
+-        ssl_libs = find_library_file(self.compiler, 'ssl',lib_dirs,
++                ssl_incs_to_add += krb5_h
++        ssl_libs = find_library_file(self.compiler, 'ssl', [],
++                                     lib_dirs + ['/usr/local/ssl/lib',
++                                      '/usr/contrib/ssl/lib/'
++                                     ] )
++        ssl_libs_to_add = find_library_file(self.compiler, 'ssl', lib_dirs,
+                                      ['/usr/local/ssl/lib',
+                                       '/usr/contrib/ssl/lib/'
+                                      ] )
+@@ -804,8 +817,8 @@ class PyBuildExt(build_ext):
+         if (ssl_incs is not None and
+             ssl_libs is not None):
+             exts.append( Extension('_ssl', ['_ssl.c'],
+-                                   include_dirs = ssl_incs,
+-                                   library_dirs = ssl_libs,
++                                   include_dirs = ssl_incs_to_add,
++                                   library_dirs = ssl_libs_to_add,
+                                    libraries = ['ssl', 'crypto'],
+                                    depends = ['socketmodule.h']), )
+         else:
+@@ -843,8 +856,8 @@ class PyBuildExt(build_ext):
+                 # The _hashlib module wraps optimized implementations
+                 # of hash functions from the OpenSSL library.
+                 exts.append( Extension('_hashlib', ['_hashopenssl.c'],
+-                                       include_dirs = ssl_incs,
+-                                       library_dirs = ssl_libs,
++                                       include_dirs = ssl_incs_to_add,
++                                       library_dirs = ssl_libs_to_add,
+                                        libraries = ['ssl', 'crypto']) )
+             else:
+                 print ("warning: openssl 0x%08x is too old for _hashlib" %
+@@ -1324,7 +1337,7 @@ class PyBuildExt(build_ext):
+                 missing.append('resource')
+ 
+             # Sun yellow pages. Some systems have the functions in libc.
+-            if (host_platform not in ['cygwin', 'atheos', 'qnx6'] and
++            if (host_platform not in ['cygwin', 'atheos', 'qnx6', 'haiku1'] and
+                 find_file('rpcsvc/yp_prot.h', inc_dirs, []) is not None):
+                 if (self.compiler.find_library_file(lib_dirs, 'nsl')):
+                     libs = ['nsl']
+-- 
+1.8.3.4
+
+
+From 6e1205e2b0b90002f678ed93a8a27ab567e8bd86 Mon Sep 17 00:00:00 2001
+From: Jerome Duval <jerome.duval@gmail.com>
+Date: Sat, 5 Apr 2014 21:16:40 +0000
+Subject: fix pyconfig.h path
+
+
+diff --git a/Makefile.pre.in b/Makefile.pre.in
+index cf75650..bb54b6f 100644
+--- a/Makefile.pre.in
++++ b/Makefile.pre.in
+@@ -105,7 +105,7 @@ BINDIR=		@bindir@
+ LIBDIR=		@libdir@
+ MANDIR=		@mandir@
+ INCLUDEDIR=	@includedir@
+-CONFINCLUDEDIR=	$(exec_prefix)/include
++CONFINCLUDEDIR=	$(INCLUDEDIR)
+ SCRIPTDIR=	$(prefix)/lib
+ 
+ # Detailed destination directories
+-- 
+1.8.3.4
+
diff --git a/dev-lang/python/python-2.6.8.recipe b/dev-lang/python/python-2.6.8.recipe
index ffa51aedd..a33e1ae05 100644
--- a/dev-lang/python/python-2.6.8.recipe
+++ b/dev-lang/python/python-2.6.8.recipe
@@ -12,7 +12,7 @@ HOMEPAGE="http://www.python.org"
 LICENSE="Python"
 COPYRIGHT="1990-2012, Python Software Foundation"
 SRC_URI="http://www.python.org/ftp/python/2.6.8/Python-2.6.8.tar.bz2"
-CHECKSUM_MD5="c6e0420a21d8b23dee8b0195c9b9a125"
+CHECKSUM_SHA256="c34036718ee1f091736677f543bc7960861cf9fcbea77d49572b59f7f1ab3c3f"
 REVISION="6"
 ARCHITECTURES="x86_gcc2 x86 x86_64"
 
diff --git a/dev-lang/python/python-2.6.9.recipe b/dev-lang/python/python-2.6.9.recipe
index a97f285e6..1501779ad 100644
--- a/dev-lang/python/python-2.6.9.recipe
+++ b/dev-lang/python/python-2.6.9.recipe
@@ -11,8 +11,8 @@ OSI-approved open source license.
 HOMEPAGE="http://www.python.org"
 LICENSE="Python"
 COPYRIGHT="1990-2012, Python Software Foundation"
-SRC_URI="http://www.python.org/ftp/python/2.6.9/Python-2.6.9.tar.xz"
-CHECKSUM_MD5="933a811f11e3db3d73ae492f6c3a7a76"
+SRC_URI="https://www.python.org/ftp/python/2.6.9/Python-2.6.9.tar.xz"
+CHECKSUM_SHA256="cae7bb995006ea5b703d9d28446f694894c441fe4bfb95d561c0ac908cd06e41"
 REVISION="1"
 ARCHITECTURES="x86_gcc2 x86 x86_64"
 
@@ -70,7 +70,6 @@ GLOBAL_WRITABLE_FILES="
 PATCH()
 {
 	echo "AC_CONFIG_MACRO_DIR([m4])" >> configure.in
-	find . -name '*.py' -exec sed -i -e 's|/usr/bin/env|/bin/env|g' {} \;
 }
 
 BUILD()
diff --git a/dev-lang/python/python-2.7.6.recipe b/dev-lang/python/python-2.7.6.recipe
new file mode 100644
index 000000000..ada901e8a
--- /dev/null
+++ b/dev-lang/python/python-2.7.6.recipe
@@ -0,0 +1,112 @@
+SUMMARY="An interpreted, interactive, object-oriented programming language"
+DESCRIPTION="
+Python is a programming language that lets you work more quickly and integrate \
+your systems more effectively. You can learn to use Python and see almost \
+immediate gains in productivity and lower maintenance costs.
+Python runs on Windows, Linux/Unix, Mac OS X, and has been ported to the Java \
+and .NET virtual machines.
+Python is free to use, even for commercial products, because of its \
+OSI-approved open source license.
+"
+HOMEPAGE="http://www.python.org"
+LICENSE="Python"
+COPYRIGHT="1990-2012, Python Software Foundation"
+SRC_URI="https://www.python.org/ftp/python/2.7.6/Python-2.7.6.tar.xz"
+CHECKSUM_SHA256="1fd68e81f8bf7386ff239b7faee9ba387129d2cf34eab13350bd8503a0bff6a1"
+REVISION="2"
+ARCHITECTURES="!x86_gcc2 !x86 x86_64"
+
+PATCHES="python-2.7.6.patchset"
+
+PROVIDES="
+	python = $portVersion compat >= 2.7
+	cmd:2to3 = $portVersion compat >= 2.7
+	cmd:idle = $portVersion compat >= 2.7
+	cmd:pydoc = $portVersion compat >= 2.7
+	cmd:python = $portVersion compat >= 2.7
+	cmd:python2 = $portVersion compat >= 2.7
+	cmd:python2_config = $portVersion compat >= 2.7
+	cmd:python2.7 = $portVersion compat >= 2.7
+	cmd:python2.7_config = $portVersion compat >= 2.7
+	cmd:python_config = $portVersion compat >= 2.7
+	cmd:smtpd.py = $portVersion compat >= 2.7
+	devel:libpython2.7 = 1.0
+	lib:libpython2.7 = 1.0
+	"
+REQUIRES="
+	haiku >= $haikuVersion
+	cmd:nano
+	lib:libbz2
+	lib:libncurses
+	lib:libssl
+	lib:libreadline
+	lib:libsqlite3
+	lib:libz
+	"
+BUILD_REQUIRES="
+	devel:libbz2
+	devel:libncurses
+	devel:libssl
+	devel:libreadline
+	devel:libsqlite3
+	devel:libz
+	"
+BUILD_PREREQUIRES="
+	haiku_devel >= $haikuVersion
+	cmd:aclocal
+	cmd:autoconf
+	cmd:find
+	cmd:gcc
+	cmd:ld
+	cmd:libtoolize
+	cmd:make
+	cmd:nano
+	"
+
+SOURCE_DIR="Python-2.7.6"
+
+GLOBAL_WRITABLE_FILES="
+	non-packaged/lib/python2.7/site-packages directory keep-old
+	"
+
+BUILD()
+{
+	cd Modules/_ctypes/libffi
+	libtoolize --force --copy --install
+	cd ../../..
+
+	libtoolize --force --copy --install
+	aclocal
+	autoconf
+	runConfigure ./configure \
+		--enable-shared \
+		--enable-unicode=ucs4
+
+	# prevent make from rebuilding stuff that requires python
+	touch Parser/asdl* Python/Python-ast.c Include/Python-ast.h
+
+	make $jobArgs
+}
+
+INSTALL()
+{
+	make install
+
+	prepareInstalledDevelLibs libpython2.7
+	
+	mkdir -p $prefix/lib/python2.7/vendor-packages
+	echo 'This directory contains packaged python modules.' \
+		>$prefix/lib/python2.7/vendor-packages/README
+
+	mkdir -p $prefix/non-packaged/lib/python2.7
+	mv $prefix/lib/python2.7/site-packages $prefix/non-packaged/lib/python2.7/
+}
+
+TEST()
+{
+	cd Lib/test
+	rm test_asynchat.py  # this one stalls, so skip it for now
+	rm test_multiprocessing.py  # this one stalls, so skip it for now
+
+	python regrtest.py
+}
diff --git a/dev-lang/rebol/rebol-2.101.0.5.75.recipe b/dev-lang/rebol/rebol-2.101.0.5.75.recipe
index 4aa1edf6d..af73c4423 100644
--- a/dev-lang/rebol/rebol-2.101.0.5.75.recipe
+++ b/dev-lang/rebol/rebol-2.101.0.5.75.recipe
@@ -6,11 +6,14 @@ providing effective solutions to modern network distributed applications.
 "
 HOMEPAGE="http://www.rebol.com/"
 SRC_URI="https://github.com/rebol/r3/archive/4d9840f8e661e7067472e828ee6ad8dd3008b247.zip"
-CHECKSUM_MD5="752fe4843dd1ce80678e9d66ec20a6dc"
+CHECKSUM_SHA256="9ad2601d5e18f070a442aed554b118ee4d2e06bdfe85413dc65613eb61c38d35"
+SRC_FILENAME="rebol-r3-$portVersion.zip"
 SRC_URI_2="http://ports-space.haiku-files.org/dev-lang/rebol/r3-make.zip"
-CHECKSUM_MD5_2="a922e0e82d020dedebcfa1a529028636"
+CHECKSUM_SHA256_2="2a6dda70211787fcca4249c922378e891ca287c8c110affb386b5cc939ba4798"
+SRC_FILENAME_2="rebol-r3-make-$portVersion.zip"
 SRC_URI_3="https://github.com/rebolsource/rebol-test/archive/502075cc3a4116c1785081e602eb8e28efd3247f.zip"
-CHECKSUM_MD5_3="dc1e322361df2f21cb26032612a8b101"
+CHECKSUM_SHA256_3="7d8415f467fbc87bfd77f21cf3fc2af5dfc6f129941a3a2daf1ed27ec2d194e1"
+SRC_FILENAME_3="rebol-test-$portVersion.zip"
 LICENSE="Apache v2"
 COPYRIGHT="2014 REBOL Technologies"
 REVISION="1"
diff --git a/dev-lang/ruby/ruby-1.9.1.recipe b/dev-lang/ruby/ruby-1.9.1.recipe
index f1b987d43..ce57c7e7b 100644
--- a/dev-lang/ruby/ruby-1.9.1.recipe
+++ b/dev-lang/ruby/ruby-1.9.1.recipe
@@ -12,7 +12,7 @@ management. Therefore, it is similar in varying degrees to, Smalltalk,
 Python, Perl, Lisp, Dylan, and CLU."
 HOMEPAGE="http://www.ruby-lang.org" 
 SRC_URI="ftp://ftp.ruby-lang.org/pub/ruby/1.9/ruby-1.9.1-p243.tar.gz"
-CHECKSUM_MD5="515bfd965814e718c0943abf3dde5494"
+CHECKSUM_SHA256="31598e37b3962643bec722921644957be6f8fb9a26f6c91fa627bd668ea68be4"
 LICENSE="Ruby
 	GNU GPL v2
 	GNU LGPL v2.1
diff --git a/dev-lang/ruby/ruby-1.9.3.recipe b/dev-lang/ruby/ruby-1.9.3.recipe
new file mode 100644
index 000000000..b676700a0
--- /dev/null
+++ b/dev-lang/ruby/ruby-1.9.3.recipe
@@ -0,0 +1,96 @@
+SUMMARY="A programming language focused on simplicity and productivity"
+DESCRIPTION="
+Ruby is a dynamic, reflective, object-oriented, general-purpose
+programming language. It was designed and developed in the mid-1990s
+by Yukihiro 'Matz' Matsumoto in Japan.
+
+Ruby embodies syntax inspired by Perl with Smalltalk-like features and
+was also influenced by Eiffel and Lisp.  It supports multiple
+programming paradigms, including functional, object oriented, and
+imperative. It also has a dynamic type system and automatic memory
+management. Therefore, it is similar in varying degrees to, Smalltalk,
+Python, Perl, Lisp, Dylan, and CLU."
+HOMEPAGE="http://www.ruby-lang.org" 
+SRC_URI="http://cache.ruby-lang.org/pub/ruby/ruby-1.9.3-p545.tar.bz2"
+CHECKSUM_SHA256="2533de9f56d62f11c06a02dd32b5ab6d22a8f268c94b8e1e1ade6536adfd1aab"
+LICENSE="Ruby
+	GNU GPL v2
+	GNU LGPL v2.1
+	Artistic (Perl)
+	BSD (3-clause)"
+COPYRIGHT="1993-2009 Yukihiro Matsumoto"
+
+REVISION="2"
+
+ARCHITECTURES="?x86_gcc2 ?x86 ?x86_64"
+
+PROVIDES="
+	ruby = $portVersion compat >= 1.9
+	cmd:ruby = $portVersion compat >= 1.9
+	cmd:erb = $portVersion compat >= 1.9
+	cmd:gem = $portVersion compat >= 1.9
+	cmd:irb = $portVersion compat >= 1.9
+	cmd:rake = $portVersion compat >= 1.9
+	cmd:rdoc = $portVersion compat >= 1.9
+	cmd:ri = $portVersion compat >= 1.9
+	cmd:testrb = $portVersion compat >= 1.9
+	lib:libruby = $portVersion compat >= 1.9
+	"
+
+REQUIRES="
+	haiku >= $haikuVersion
+	lib:libedit
+	lib:libz
+	lib:libcrypto
+	lib:libssl
+	lib:libiconv
+	lib:libncursesw
+	"
+	
+BUILD_REQUIRES="
+	devel:libedit
+	devel:libz
+	devel:libcrypto
+	devel:libssl
+	devel:libiconv
+	devel:libncursesw
+	"
+
+BUILD_PREREQUIRES="
+	haiku_devel >= $haikuVersion
+	cmd:gcc
+	cmd:g++
+	cmd:autoconf
+	cmd:make
+	cmd:bison
+	"
+
+PROVIDES_devel="
+	ruby_devel = $portVersion
+	devel:libruby_static = $portVersion compat >= 1.9
+	lib:libruby_static = $portVersion compat >= 1.9
+	devel:libruby = $portVersion compat >= 1.9
+	"
+
+REQUIRES_devel="
+	ruby == $portVersion
+	"
+
+SOURCE_DIR="ruby-1.9.3-p545"
+
+PATCHES="ruby-1.9.1.patchset"
+
+BUILD()
+{
+	autoconf
+	runConfigure ./configure \
+	--enable-shared
+	make $jobArgs
+}
+
+INSTALL()
+{
+	make install
+	prepareInstalledDevelLibs libruby-static libruby
+	packageEntries devel $developDir
+}
diff --git a/dev-lang/ruby/ruby-2.1.1.recipe b/dev-lang/ruby/ruby-2.1.1.recipe
new file mode 100644
index 000000000..589540b52
--- /dev/null
+++ b/dev-lang/ruby/ruby-2.1.1.recipe
@@ -0,0 +1,97 @@
+SUMMARY="A programming language focused on simplicity and productivity"
+DESCRIPTION="
+Ruby is a dynamic, reflective, object-oriented, general-purpose
+programming language. It was designed and developed in the mid-1990s
+by Yukihiro 'Matz' Matsumoto in Japan.
+
+Ruby embodies syntax inspired by Perl with Smalltalk-like features and
+was also influenced by Eiffel and Lisp.  It supports multiple
+programming paradigms, including functional, object oriented, and
+imperative. It also has a dynamic type system and automatic memory
+management. Therefore, it is similar in varying degrees to, Smalltalk,
+Python, Perl, Lisp, Dylan, and CLU."
+HOMEPAGE="http://www.ruby-lang.org" 
+SRC_URI="http://cache.ruby-lang.org/pub/ruby/2.1/ruby-2.1.1.tar.gz"
+CHECKSUM_SHA256="c843df31ae88ed49f5393142b02b9a9f5a6557453805fd489a76fbafeae88941"
+LICENSE="Ruby
+	BSD (3-clause)"
+COPYRIGHT="1993-2014 Yukihiro Matsumoto"
+
+REVISION="1"
+
+ARCHITECTURES="!x86_gcc2 ?x86 ?x86_64"
+SECONDARY_ARCHITECTURES="!x86"
+
+PROVIDES="
+	ruby$secondaryArchSuffix = $portVersion compat >= 1.9
+	cmd:ruby = $portVersion compat >= 1.9
+	cmd:erb = $portVersion compat >= 1.9
+	cmd:gem = $portVersion compat >= 1.9
+	cmd:irb = $portVersion compat >= 1.9
+	cmd:rake = $portVersion compat >= 1.9
+	cmd:rdoc = $portVersion compat >= 1.9
+	cmd:ri = $portVersion compat >= 1.9
+	cmd:testrb = $portVersion compat >= 1.9
+	lib:libruby$secondaryArchSuffix = $portVersion compat >= 1.9
+	"
+
+REQUIRES="
+	haiku$secondaryArchSuffix >= $haikuVersion
+	lib:libedit$secondaryArchSuffix
+	lib:libz$secondaryArchSuffix
+	lib:libcrypto$secondaryArchSuffix
+	lib:libssl$secondaryArchSuffix
+	lib:libiconv$secondaryArchSuffix
+	lib:libncursesw$secondaryArchSuffix
+	"
+	
+BUILD_REQUIRES="
+	devel:libedit$secondaryArchSuffix
+	devel:libz$secondaryArchSuffix
+	devel:libcrypto$secondaryArchSuffix
+	devel:libssl$secondaryArchSuffix
+	devel:libiconv$secondaryArchSuffix
+	devel:libncursesw$secondaryArchSuffix
+	"
+
+BUILD_PREREQUIRES="
+	haiku${secondaryArchSuffix}_devel >= $haikuVersion
+	cmd:gcc$secondaryArchSuffix
+	cmd:g++$secondaryArchSuffix
+	cmd:autoconf
+	cmd:make
+	cmd:bison
+	"
+
+PROVIDES_devel="
+	ruby_devel$secondaryArchSuffix = $portVersion
+	devel:libruby_static$secondaryArchSuffix = $portVersion compat >= 1.9
+	lib:libruby_static$secondaryArchSuffix = $portVersion compat >= 1.9
+	devel:libruby$secondaryArchSuffix = $portVersion compat >= 1.9
+	"
+
+REQUIRES_devel="
+	ruby$secondaryArchSuffix == $portVersion base
+	"
+
+BUILD()
+{
+	runConfigure ./configure --enable-shared
+	# The build process needs to run ruby, and without this it fails to find
+	# libruby.so.
+	export LIBRARY_PATH=$LIBRARY_PATH:%A
+	make $jobArgs
+}
+
+INSTALL()
+{
+	export LIBRARY_PATH=$LIBRARY_PATH:%A
+	make install
+	prepareInstalledDevelLibs libruby-static libruby
+	packageEntries devel $developDir
+}
+
+TEST()
+{
+	make check
+}
diff --git a/dev-lang/squirrel/squirrel-3.0.4.recipe b/dev-lang/squirrel/squirrel-3.0.4.recipe
index e7f133e8e..214289791 100644
--- a/dev-lang/squirrel/squirrel-3.0.4.recipe
+++ b/dev-lang/squirrel/squirrel-3.0.4.recipe
@@ -7,7 +7,7 @@ collection on demand.  C-like syntax.
 "
 HOMEPAGE="http://www.squirrel-lang.org"
 SRC_URI="https://squirrel.googlecode.com/files/squirrel_3_0_4_stable.tar.gz"
-CHECKSUM_MD5="e75feaed79c203d027708e2067ca1dcc"
+CHECKSUM_SHA256="6a3706accf9872aafea1eb3f3f3018b135e2671033824ccebf0735a98b2440a5"
 LICENSE="MIT"
 COPYRIGHT="2004-2013 Alberto Demichelis"
 REVISION="1"
diff --git a/dev-lang/swi_prolog/swi_prolog-6.2.0.recipe b/dev-lang/swi_prolog/swi_prolog-6.2.0.recipe
index 057f43d91..a6605227d 100644
--- a/dev-lang/swi_prolog/swi_prolog-6.2.0.recipe
+++ b/dev-lang/swi_prolog/swi_prolog-6.2.0.recipe
@@ -9,7 +9,7 @@ and GUI profiler), and extensive documentation.
 "
 HOMEPAGE="http://www.swi-prolog.org/"
 SRC_URI="http://www.swi-prolog.org/download/stable/src/pl-6.2.0.tar.gz"
-CHECKSUM_MD5="969ed2e00b7afc1537fbf19d667333c5"
+CHECKSUM_SHA256="be358eacd50bc7013cdcdd1aa763e67c5b1d40f7bbf1833a7a48c0123a6455a8"
 LICENSE="
 	GNU LGPL v2.1
 	SWI-Prolog
diff --git a/dev-lang/swig/swig-2.0.11.recipe b/dev-lang/swig/swig-2.0.11.recipe
index b782d7973..3d9ef9f79 100644
--- a/dev-lang/swig/swig-2.0.11.recipe
+++ b/dev-lang/swig/swig-2.0.11.recipe
@@ -23,7 +23,7 @@ COPYRIGHT="1995-1998 University of Utah and the Regents of the University of Cal
 		1995-2013 The SWIG Developers"
 HOMEPAGE="http://www.swig.org/"
 SRC_URI="http://sourceforge.net/projects/swig/files/swig/swig-2.0.11/swig-2.0.11.tar.gz"
-CHECKSUM_MD5="291ba57c0acd218da0b0916c280dcbae"
+CHECKSUM_SHA256="63780bf29f53937ad399a1f68bccb3730c90f65746868c4cdfc25cafcd0a424e"
 REVISION="1"
 ARCHITECTURES="?x86 ?x86_gcc2"
 
diff --git a/dev-lang/tcl/patches/tcl-8.5.15.patchset b/dev-lang/tcl/patches/tcl-8.5.15.patchset
new file mode 100644
index 000000000..50450455c
--- /dev/null
+++ b/dev-lang/tcl/patches/tcl-8.5.15.patchset
@@ -0,0 +1,66 @@
+From 02a513a41a3a8aaf7a28bbb86db4eafaf63045ff Mon Sep 17 00:00:00 2001
+From: Jerome Duval <jerome.duval@gmail.com>
+Date: Mon, 5 May 2014 16:07:04 +0000
+Subject: import patch from previous version
+
+
+diff --git a/tests/env.test b/tests/env.test
+index ee13b7f..db8f1ce 100644
+--- a/tests/env.test
++++ b/tests/env.test
+@@ -85,7 +85,7 @@ set printenvScript [makeFile {
+ 	TCL_LIBRARY PATH LD_LIBRARY_PATH LIBPATH PURE_PROG_NAME DISPLAY
+ 	SHLIB_PATH SYSTEMDRIVE SYSTEMROOT DYLD_LIBRARY_PATH DYLD_FRAMEWORK_PATH
+ 	DYLD_NEW_LOCAL_SHARED_REGIONS DYLD_NO_FIX_PREBINDING
+-	__CF_USER_TEXT_ENCODING SECURITYSESSIONID LANG WINDIR TERM
++	__CF_USER_TEXT_ENCODING SECURITYSESSIONID LANG WINDIR TERM LIBRARY_PATH
+ 	CommonProgramFiles ProgramFiles CommonProgramW6432 ProgramW6432
+     } {
+ 	lrem names $name
+@@ -117,7 +117,7 @@ foreach name [array names env] {
+ 	TCL_LIBRARY PATH LD_LIBRARY_PATH LIBPATH DISPLAY SHLIB_PATH
+ 	SYSTEMDRIVE SYSTEMROOT DYLD_LIBRARY_PATH DYLD_FRAMEWORK_PATH
+ 	DYLD_NEW_LOCAL_SHARED_REGIONS DYLD_NO_FIX_PREBINDING
+-	SECURITYSESSIONID LANG WINDIR TERM
++	SECURITYSESSIONID LANG WINDIR TERM LIBRARY_PATH
+ 	CONNOMPROGRAMFILES PROGRAMFILES COMMONPROGRAMW6432 PROGRAMW6432
+     }} {
+ 	unset env($name)
+diff --git a/unix/tcl.m4 b/unix/tcl.m4
+index f484989..def649b 100644
+--- a/unix/tcl.m4
++++ b/unix/tcl.m4
+@@ -652,7 +652,13 @@ AC_DEFUN([SC_ENABLE_THREADS], [
+ 	    # The space is needed
+ 	    THREADS_LIBS=" -lpthread"
+ 	else
+-	    AC_CHECK_LIB(pthreads, pthread_mutex_init,
++	    AC_CHECK_LIB(root, pthread_mutex_init,
++		tcl_ok=yes, tcl_ok=no)
++		if test "$tcl_ok" = "yes"; then
++		# The space is needed
++		THREAD_LIBS=" "
++		else
++		AC_CHECK_LIB(pthreads, pthread_mutex_init,
+ 		tcl_ok=yes, tcl_ok=no)
+ 	    if test "$tcl_ok" = "yes"; then
+ 		# The space is needed
+@@ -671,6 +677,7 @@ AC_DEFUN([SC_ENABLE_THREADS], [
+ 			AC_MSG_WARN([Don't know how to find pthread lib on your system - you must disable thread support or edit the LIBS in the Makefile...])
+ 		    fi
+ 		fi
++		fi
+ 	    fi
+ 	fi
+ 
+@@ -1284,6 +1291,7 @@ AC_DEFUN([SC_CONFIG_CFLAGS], [
+ 	    SHLIB_LD='${CC} -shared ${CFLAGS} ${LDFLAGS}'
+ 	    DL_OBJS="tclLoadDl.o"
+ 	    DL_LIBS="-lroot"
++	    LD_LIBRARY_PATH_VAR="LIBRARY_PATH"
+ 	    AC_CHECK_LIB(network, inet_ntoa, [LIBS="$LIBS -lnetwork"])
+ 	    ;;
+ 	HP-UX-*.11.*)
+-- 
+1.8.3.4
+
diff --git a/dev-lang/tcl/tcl-8.5.15.recipe b/dev-lang/tcl/tcl-8.5.15.recipe
new file mode 100644
index 000000000..b2c21199c
--- /dev/null
+++ b/dev-lang/tcl/tcl-8.5.15.recipe
@@ -0,0 +1,79 @@
+SUMMARY="A very powerful but easy to learn dynamic programming language"
+DESCRIPTION="
+Tcl (Tool Command Language) is a very powerful but easy to learn dynamic \
+programming language, suitable for a very wide range of uses, including web \
+and desktop applications, networking, administration, testing and many more. \
+Open source and business-friendly, Tcl is a mature yet evolving language that \
+is truly cross platform, easily deployed and highly extensible.
+"
+HOMEPAGE="http://www.tcl.tk" 
+SRC_URI="http://sourceforge.net/projects/tcl/files/Tcl/$portVersion/tcl$portVersion-src.tar.gz"
+CHECKSUM_SHA256="f24eaae461795e6b09bf54c7e9f38def025892da55f26008c16413cfdda2884e"
+REVISION="1"
+ARCHITECTURES="x86 x86_gcc2 x86_64"
+LICENSE="BSD (2-clause)"
+COPYRIGHT="Regents of the University of California, Sun Microsystems, Inc., Scriptics Corporation, ActiveState Corporation and other parties"
+SOURCE_DIR="tcl$portVersion"
+
+PATCHES="tcl-8.5.15.patchset"
+
+PROVIDES="
+	tcl = $portVersion compat >= 8.5
+	cmd:tclsh = $portVersion compat >= 8.5
+	cmd:tclsh8.5 = $portVersion compat >= 8.5
+	lib:libtcl8.5 = $portVersion compat >= 8.5
+	"
+
+REQUIRES="
+	haiku >= $haikuVersion
+	"
+
+BUILD_REQUIRES="
+"
+
+BUILD_PREREQUIRES="
+	haiku_devel >= $haikuVersion
+	cmd:autoconf
+	cmd:make
+	cmd:gcc
+	cmd:ld
+	cmd:find
+	cmd:sed
+	cmd:grep
+	"
+
+BUILD()
+{
+	cd unix
+	autoconf -f
+	runConfigure ./configure \
+	--enable-threads --enable-man-symlinks
+	make
+}
+
+INSTALL()
+{
+	cd unix
+	make install
+
+	ln -s tclsh8.5 "${binDir}/tclsh"
+
+	prepareInstalledDevelLibs libtclstub8.5
+	packageEntries devel $developDir
+	packageEntries devel ${libDir}/tclConfig.sh
+}
+
+TEST()
+{
+	cd unix
+	make test
+}
+
+PROVIDES_devel="
+	tcl_devel = $portVersion
+	devel:libtclstub8.5 = $portVersion
+	"
+
+REQUIRES_devel="
+	tcl == $portVersion
+	"
diff --git a/dev-lang/tcl/tcl-8.5.9.recipe b/dev-lang/tcl/tcl-8.5.9.recipe
index f9ea1b1ae..dee8be742 100644
--- a/dev-lang/tcl/tcl-8.5.9.recipe
+++ b/dev-lang/tcl/tcl-8.5.9.recipe
@@ -8,9 +8,9 @@ is truly cross platform, easily deployed and highly extensible.
 "
 HOMEPAGE="http://www.tcl.tk" 
 SRC_URI="http://sourceforge.net/projects/tcl/files/Tcl/8.5.9/tcl8.5.9-src.tar.gz"
+CHECKSUM_SHA256="3ab671b417e3eeb41b9cef626d742d8f7f57425101e83e5fcad1d552cd99237d"
 REVISION="1"
 ARCHITECTURES="x86 x86_gcc2"
-CHECKSUM_MD5="8512d8db3233041dd68a81476906012a"
 LICENSE="BSD (2-clause)"
 COPYRIGHT="Regents of the University of California, Sun Microsystems, Inc., Scriptics Corporation, ActiveState Corporation and other parties"
 SOURCE_DIR="tcl8.5.9"
diff --git a/dev-lang/xamos/patches/xamos-0.29.patchset b/dev-lang/xamos/patches/xamos-0.29.patchset
new file mode 100644
index 000000000..d02174797
--- /dev/null
+++ b/dev-lang/xamos/patches/xamos-0.29.patchset
@@ -0,0 +1,81 @@
+From f02982020ebc693e0f1c6f10523fa54282a42cce Mon Sep 17 00:00:00 2001
+From: Adrien Destugues <pulkomandy@pulkomandy.tk>
+Date: Thu, 1 May 2014 13:52:57 +0200
+Subject: Fix build on gcc2, add Haiku makefile.
+
+
+diff --git a/src/GameEngineWrapper.cpp b/src/GameEngineWrapper.cpp
+index d3099a8..854d8fb 100644
+--- a/src/GameEngineWrapper.cpp
++++ b/src/GameEngineWrapper.cpp
+@@ -2416,7 +2416,7 @@ bool GameEngineWrapper::sdlinit()
+ #endif
+ 
+ 	// Set the window caption (patch - do not use Unicode on Amiga-like systems which do not support it):
+-#if defined(USESDL) && !defined(AMIGOID)
++#if defined(USESDL) && !defined(AMIGOID) && __GNUC__ > 2
+ 	SDL_WM_SetCaption( "XAMOS alpha 0.29 \u00a9 2012 Mequa Innovations", NULL ); // \u00a9
+ #endif
+ #if defined(USESDL) && defined(AMIGOID)
+diff --git a/src/GameEngineWrapper.h b/src/GameEngineWrapper.h
+index 60f27c7..c9f2c67 100644
+--- a/src/GameEngineWrapper.h
++++ b/src/GameEngineWrapper.h
+@@ -46,6 +46,9 @@ using namespace boost;
+ 
+ #if defined(USESDL) && !defined(USEBOOST)
+ // Deprecated:
++#if __GNUC__ <= 2
++#include <hash_map>
++#else
+ #include <ext/hash_map>
+ 
+ // TODO - allow hash_map for other compilers besides G++
+@@ -54,6 +57,7 @@ using namespace __gnu_cxx;
+ // Added - fix for hash_map using std::string:
+ namespace __gnu_cxx //std
+ {
++#endif
+ 	template<> struct hash< std::string >
+ 	{
+ 		size_t operator()( const std::string& x ) const
+@@ -61,8 +65,10 @@ namespace __gnu_cxx //std
+ 			return hash< const char* >()( x.c_str() );
+ 		}
+ 	};
++#if __GNUC__ > 2
+ }
+ #endif
++#endif
+ 
+ // Added - detect all Amiga-like systems:
+ #if !defined(AMIGOID) && (defined(__AROS__) || defined(__MORPHOS__) || defined(__amigaos__) || defined (__amigaos4__))
+diff --git a/src/Makefile_haiku b/src/Makefile_haiku
+new file mode 100644
+index 0000000..25e31e6
+--- /dev/null
++++ b/src/Makefile_haiku
+@@ -0,0 +1,20 @@
++CC=g++
++
++CFLAGS=-c -Wall -pedantic -Wno-deprecated -O3 -D USESDL
++LDFLAGS=-lSDL_image -lSDL_gfx -lSDL_mixer -ljpeg -lpng -lvorbisfile -lvorbis -logg -lSDL_ttf -lfreetype -lz -lSDL -lGL -lGLU
++
++SOURCES=main.cpp XAMOS.cpp SDL_collide.cpp Console.cpp AMALDebugTest.cpp PrintStream.cpp AMALBank.cpp AMALEnvGen.cpp AMALParser.cpp AMALInterpreter.cpp AMALCompiler.cpp AmalPrograms.cpp Timer.cpp AMOS_Sprite.cpp MequaScript.cpp AMOS_System.cpp GameEngineWrapper.cpp Mytype.cpp Mytypearray.cpp TheTokens.cpp Parser.cpp Dumper.cpp Interpreter.cpp CommandWrapper.cpp ActiveObject.cpp
++OBJECTS=$(SOURCES:.cpp=.o)
++EXECUTABLE=../XAMOS
++
++all: $(SOURCES) $(EXECUTABLE)
++	
++$(EXECUTABLE): $(OBJECTS) 
++	$(CC) $(OBJECTS) -o $@ $(LDFLAGS)
++
++.cpp.o:
++	$(CC) $(CFLAGS) $< -o $@
++
++clean:
++	rm -rf $(EXECUTABLE) *.o
++
+-- 
+1.8.3.4
+
diff --git a/dev-lang/xamos/xamos-0.29.recipe b/dev-lang/xamos/xamos-0.29.recipe
new file mode 100644
index 000000000..0f9ae89dd
--- /dev/null
+++ b/dev-lang/xamos/xamos-0.29.recipe
@@ -0,0 +1,55 @@
+SUMMARY="Cross-platform AMOS BASIC reimplementation"
+DESCRIPTION="
+This project is a complete re-write of jAMOS in C++ using SDL libraries and
+(optional) Boost headers.
+
+This initial release is run-only and does not feature an editor at this stage.
+However, it is compatible with almost all programs created with the latest
+jAMOS editor. All jAMOS examples (without AMAL) are running in XAMOS, often
+with a serious speed boost over the Java original, particularly on low-end
+platforms.
+"
+HOMEPAGE="http://sourceforge.net/projects/xamos"
+SRC_URI="http://sourceforge.net/projects/xamos/files/XAMOS_src.zip"
+CHECKSUM_SHA256="f559794ed7a443f00a21b3c0050e8ee70a9d1340ad41e46a5f87f5238bc7479e"
+ARCHITECTURES="x86_gcc2"
+LICENSE="BSD (2-clause)"
+COPYRIGHT="2012 Mequa Innovations"
+REVISION="1"
+
+PROVIDES="
+	xamos = $portVersion
+"
+
+BUILD_REQUIRES="
+	haiku_devel >= $haikuVersion
+	devel:libsdl
+	devel:sdl_image
+	devel:sdl_mixer
+	devel:sdl_ttf
+	devel:sdl_gfx
+	devel:libglu
+	devel:libjpeg
+	devel:libpng
+	devel:libvorbisfile
+	devel:libogg
+	devel:libfreetype
+	devel:libz
+	"
+
+BUILD_PREREQUIRES="
+	cmd:make
+	cmd:gcc
+	"
+
+SOURCE_DIR="XAMOS"
+PATCHES="xamos-$portVersion.patchset"
+
+BUILD() {
+	cd src
+	make -f Makefile_aros
+}
+
+INSTALL() {
+	false
+}
diff --git a/dev-lang/yab/yab-1.7.02.recipe b/dev-lang/yab/yab-1.7.02.recipe
new file mode 100644
index 000000000..cd45c0cbc
--- /dev/null
+++ b/dev-lang/yab/yab-1.7.02.recipe
@@ -0,0 +1,67 @@
+SUMMARY="extended version of the yabsic programming language"
+DESCRIPTION="
+yab is an extended version of yabasic, a BASIC programming language, with \
+special commands designed for Haiku.
+"
+HOMEPAGE="http://sourceforge.net/projects/yab-interpreter"
+SRC_URI="git+https://github.com/HaikuArchives/Yab.git#a5681d8a3403c142eae0ad416a59abd2aa7a28e4"
+
+
+REVISION="2"
+
+LICENSE="Artistic"
+
+COPYRIGHT="1995-2006 Marc-Oliver Ihm (yabasic)
+	2006-2009 Jan Bungeroth (yab improvements)
+	2013 Jim Saxton (yab improvements)"
+
+ARCHITECTURES="x86_gcc2 x86 ?x86_64"
+
+PROVIDES="
+	yab = $portVersion compat >=1.7.02 
+	cmd:yab= $portVersion compat >=1.7.02 
+	"
+
+REQUIRES="
+	haiku$secondaryArchSuffix >= $haikuVersion
+	lib:libncurses$secondaryArchSuffix
+	"
+
+BUILD_REQUIRES="
+	haiku${secondaryArchSuffix}_devel >= $haikuVersion
+	devel:libncurses$secondaryArchSuffix
+	"
+
+BUILD_PREREQUIRES="
+	cmd:bison
+	cmd:flex
+	cmd:gcc$secondaryArchSuffix
+	cmd:make
+	cmd:mkdepend
+	cmd:perl
+	makefile_engine
+	"
+
+BUILD()
+{	
+	mkdir -p tmp
+	cp -r src/* tmp
+	cd tmp
+	make $jobArgs BUILDHOME=`finddir B_SYSTEM_DEVELOP_DIRECTORY`
+	unzip -o App_YAB.zip
+	copyattr App_YAB yab
+	
+}
+
+INSTALL()
+{	
+	mkdir -p $binDir
+	cp tmp/yab  $binDir/
+	
+	mkdir -p $appsDir/yab-IDE
+	cp -r src $appsDir/yab-IDE/src
+	cp -r Documentation $appsDir/yab-IDE/Documentation
+
+	mkdir -p $documentationDir
+	ln -s $appsDir/yab-IDE/Documentation $documentationDir/yab-1.7.02
+}
diff --git a/dev-lang/yasm/yasm-1.1.0.recipe b/dev-lang/yasm/yasm-1.1.0.recipe
index 8a635213c..30336a0d6 100644
--- a/dev-lang/yasm/yasm-1.1.0.recipe
+++ b/dev-lang/yasm/yasm-1.1.0.recipe
@@ -1,7 +1,7 @@
 SUMMARY="The Yasm modular assembler"
 HOMEPAGE="http://www.tortall.net/projects/yasm/"
 SRC_URI="http://www.tortall.net/projects/yasm/releases/yasm-1.1.0.tar.gz"
-CHECKSUM_MD5="8392e5f2235c2c2a981e1a633f2698cb"
+CHECKSUM_SHA256="e5d56b582f3d0c30ed5c4fc221063e4175602307ea645520889458133671c232"
 LICENSE="
 	Artistic
 	BSD (2-clause)
diff --git a/dev-lang/yasm/yasm-1.2.0.recipe b/dev-lang/yasm/yasm-1.2.0.recipe
index 089a1466c..95d7575bc 100644
--- a/dev-lang/yasm/yasm-1.2.0.recipe
+++ b/dev-lang/yasm/yasm-1.2.0.recipe
@@ -1,7 +1,7 @@
 SUMMARY="The Yasm modular assembler"
 HOMEPAGE="http://www.tortall.net/projects/yasm/"
 SRC_URI="http://www.tortall.net/projects/yasm/releases/yasm-1.2.0.tar.gz"
-CHECKSUM_MD5="4cfc0686cf5350dd1305c4d905eb55a6"
+CHECKSUM_SHA256="768ffab457b90a20a6d895c39749adb547c1b7cb5c108e84b151a838a23ccf31"
 LICENSE="
 	Artistic
 	BSD (2-clause)
diff --git a/dev-libs/apr/apr-1.4.6.recipe b/dev-libs/apr/apr-1.4.6.recipe
index 94b9e9d8c..6928dafe4 100644
--- a/dev-libs/apr/apr-1.4.6.recipe
+++ b/dev-libs/apr/apr-1.4.6.recipe
@@ -1,9 +1,9 @@
 SUMMARY="Apache Portable Runtime Library"
 HOMEPAGE="http://apr.apache.org/"
 SRC_URI="http://archive.apache.org/dist/apr/apr-1.4.6.tar.gz"
+CHECKSUM_SHA256="538d593d805c36985fc6d200d31bf6c1b5f90df2a50b917902743a13bbc10e05"
 COPYRIGHT="2012 The Apache Software Foundation."
 LICENSE="Apache v2"
-CHECKSUM_MD5="76cc4457fbb71eefdafa27dba8f511fb"
 REVISION="7"
 ARCHITECTURES="x86_gcc2 x86 x86_64"
 
diff --git a/dev-libs/apr/apr-1.5.0.recipe b/dev-libs/apr/apr-1.5.0.recipe
new file mode 100644
index 000000000..1ef901bf7
--- /dev/null
+++ b/dev-libs/apr/apr-1.5.0.recipe
@@ -0,0 +1,108 @@
+SUMMARY="Apache Portable Runtime Library"
+HOMEPAGE="http://apr.apache.org/"
+SRC_URI="http://archive.apache.org/dist/apr/apr-1.5.0.tar.gz"
+CHECKSUM_SHA256="9879f02054cb22e99f605f6fdbf47f4c028af4cd4f351cf64186a7ee447f35d7"
+COPYRIGHT="2012 The Apache Software Foundation."
+LICENSE="Apache v2"
+REVISION="1"
+ARCHITECTURES="x86_gcc2 x86 ?x86_64"
+
+PATCHES="apr-1.5.0.patch"
+
+PROVIDES="
+	apr = $portVersion compat >= 1
+	lib:libapr_1 = 0.5.0 compat >= 0
+	"
+REQUIRES="
+	haiku >= $haikuVersion
+	"
+BUILD_REQUIRES="
+	"
+BUILD_PREREQUIRES="
+	haiku_devel >= $haikuVersion
+	cmd:aclocal
+	cmd:autoconf
+	cmd:gcc
+	cmd:ld
+	cmd:libtoolize
+	cmd:make
+	"
+
+
+BUILD()
+{
+	libtoolize -fci
+	touch libtool.m4
+	aclocal -I build
+	autoconf
+	runConfigure ./configure \
+		--with-installbuilddir=$prefix/data/apr
+
+	# TODO: fix this hack (by finding out why top_builddir seems to be unset)!
+	ln -sfn $sourceDir/libtool /libtool
+
+	make $jobArgs
+}
+
+INSTALL()
+{
+	make install
+
+	# prepare develop/lib
+	prepareInstalledDevelLibs libapr-1
+	fixPkgconfig
+
+	# fix apr-1-config
+	fixDevelopLibDirReferences $binDir/apr-1-config
+
+	# remove superfluous .exp file
+	rm $libDir/apr.exp
+
+	# devel package
+	packageEntries devel \
+		$binDir \
+		$dataDir \
+		$developDir
+}
+
+TEST()
+{
+	make test
+}
+
+# ----- description ----------------------------------------------------------
+
+DESCRIPTION="
+The mission of the Apache Portable Runtime (APR) project is to create and \
+maintain software libraries that provide a predictable and consistent \
+interface to underlying platform-specific implementations. The primary goal is \
+to provide an API to which software developers may code and be assured of \
+predictable if not identical behaviour regardless of the platform on which \
+their software is built, relieving them of the need to code special-case \
+conditions to work around or take advantage of platform-specific deficiencies \
+or features.
+To give a brief overview, the primary core subsystems of APR 1.x include the \
+following:
+- atomic operations
+- dynamic Shared Object loading
+- file I/O
+- locks (mutexes, condition variables, etc)
+- memory management (high performance allocators)
+- memory-mapped files
+- multicast Sockets
+- network I/O
+- shared memory
+- thread and Process management
+- various data structures (tables, hashes, priority queues, etc)
+"
+
+# ----- devel package -------------------------------------------------------
+
+PROVIDES_devel="
+	apr_devel = portVersion compat >= 1
+	cmd:apr_1_config = portVersion compat >= 1
+	devel:libapr_1 = 0.5.0 compat >= 0
+	"
+REQUIRES_devel="
+	apr == $portVersion base
+	"
diff --git a/dev-libs/apr/patches/apr-1.5.0.patch b/dev-libs/apr/patches/apr-1.5.0.patch
new file mode 100644
index 000000000..088277597
--- /dev/null
+++ b/dev-libs/apr/patches/apr-1.5.0.patch
@@ -0,0 +1,50 @@
+diff -urN apr-1.4.6/config.layout apr-1.4.6-haiku/config.layout
+--- apr-1.4.6/config.layout	2004-11-24 22:51:51.056360960 +0000
++++ apr-1.4.6-haiku/config.layout	2011-07-12 10:34:27.155189248 +0000
+@@ -60,6 +60,23 @@
+     runtimedir:    ${localstatedir}/run
+ </Layout>
+ 
++#	Haiku Layout making use of finddir
++<Layout haiku>
++    prefix:        /boot/system
++    exec_prefix:   /boot/system
++    bindir:        /boot/system/bin
++    sbindir:       /boot/system/servers
++    libdir:        /boot/system/lib
++    libexecdir:    /boot/system/servers
++    mandir:        /boot/system/documentation/man
++    sysconfdir:    /boot/system/settings
++    datadir:       /boot/system/data
++    installbuilddir: /boot/develop/build
++    includedir:    /boot/system/include
++    localstatedir: /boot/system/var
++    runtimedir:    ${localstatedir}/log
++</Layout>
++
+ #   Mac OS X Server (Rhapsody)
+ <Layout Mac OS X Server>
+     prefix:        /Local/Library/WebServer
+diff -urN apr-1.4.6/configure.in apr-1.4.6-haiku/configure.in
+--- apr-1.4.6/configure.in	2011-04-11 12:58:38.043253760 -0700
++++ apr-1.4.6-haiku/configure.in	2011-08-02 12:49:33.801112064 -0700
+@@ -203,7 +203,7 @@
+ AC_PROG_CPP
+ AC_PROG_AWK
+ AC_PROG_LN_S
+-AC_PROG_RANLIB
++AC_PROG_LIBTOOL
+ AC_PROG_INSTALL
+ AC_CHECK_PROG(RM, rm, rm)
+ AC_CHECK_PROG(AS, as, as)
+@@ -672,9 +672,9 @@
+       ac_cv_func_CreateFileMapping=yes
+       ;;
+    *)
++      AC_SEARCH_LIBS(socket, socket network)
+       AC_SEARCH_LIBS(gethostbyname, nsl)
+       AC_SEARCH_LIBS(gethostname, nsl)
+-      AC_SEARCH_LIBS(socket, socket)
+       AC_SEARCH_LIBS(crypt, crypt ufc)
+       AC_CHECK_LIB(truerand, main)
+       AC_SEARCH_LIBS(modf, m)
diff --git a/dev-libs/apr_util/apr_util-1.3.10.recipe b/dev-libs/apr_util/apr_util-1.3.10.recipe
index eac650587..0cb40c651 100644
--- a/dev-libs/apr_util/apr_util-1.3.10.recipe
+++ b/dev-libs/apr_util/apr_util-1.3.10.recipe
@@ -1,9 +1,9 @@
 SUMMARY="Apache Portable Runtime Utility Library"
 HOMEPAGE="http://apr.apache.org/"
 SRC_URI="http://archive.apache.org/dist/apr/apr-util-1.3.10.tar.gz"
+CHECKSUM_SHA256="7c37ac40b2351bfc23000fb6b7b54a67e0872255df315c82eb60c821bcef4b23"
 LICENSE="Apache v2"
 COPYRIGHT="2010 The Apache Software Foundation."
-CHECKSUM_MD5="82acd25cf3df8c72eba44eaee8b80c19"
 REVISION="4"
 ARCHITECTURES="x86_gcc2 ?x86"
 
diff --git a/dev-libs/apr_util/apr_util-1.4.1.recipe b/dev-libs/apr_util/apr_util-1.4.1.recipe
index ed1b5b8dc..cd19d3aa6 100644
--- a/dev-libs/apr_util/apr_util-1.4.1.recipe
+++ b/dev-libs/apr_util/apr_util-1.4.1.recipe
@@ -1,9 +1,9 @@
 SUMMARY="Apache Portable Runtime Utility Library"
 HOMEPAGE="http://apr.apache.org/"
 SRC_URI="http://archive.apache.org/dist/apr/apr-util-1.4.1.tar.gz"
+CHECKSUM_SHA256="d636d9ef95c6e50e47fc338d532aa375edd11e5d7a3c30dee48beb38ddf4ab4c"
 LICENSE="Apache v2"
 COPYRIGHT="2011 The Apache Software Foundation."
-CHECKSUM_MD5="666a5d56098a9debf998510e304c8095"
 REVISION="4"
 ARCHITECTURES="x86_gcc2 x86 x86_64"
 
diff --git a/dev-libs/apr_util/apr_util-1.5.3.recipe b/dev-libs/apr_util/apr_util-1.5.3.recipe
new file mode 100644
index 000000000..82b307208
--- /dev/null
+++ b/dev-libs/apr_util/apr_util-1.5.3.recipe
@@ -0,0 +1,128 @@
+SUMMARY="Apache Portable Runtime Utility Library"
+HOMEPAGE="http://apr.apache.org/"
+SRC_URI="http://archive.apache.org/dist/apr/apr-util-1.5.3.tar.gz"
+CHECKSUM_SHA256="76db34cb508e346e3bf69347c29ed1500bf0b71bcc48d54271ad9d1c25703743"
+LICENSE="Apache v2"
+COPYRIGHT="2011 The Apache Software Foundation."
+REVISION="1"
+ARCHITECTURES="x86_gcc2 x86 x86_64"
+
+PATCHES="apr_util-1.5.3.patch"
+
+PROVIDES="
+	apr_util = $portVersion compat >= 1
+	lib:libaprutil_1 = 0.5.3 compat >= 0
+	"
+REQUIRES="
+	haiku >= $haikuVersion
+	lib:libapr_1
+	lib:libexpat
+	lib:libiconv
+	"
+BUILD_REQUIRES="
+	devel:libapr_1 >= 0.5.0
+	devel:libexpat
+	devel:libiconv
+	"
+BUILD_PREREQUIRES="
+	haiku_devel >= $haikuVersion
+	cmd:aclocal
+	cmd:autoconf
+	cmd:autoheader
+	cmd:gcc
+	cmd:ld
+	cmd:libtoolize
+	cmd:make
+	"
+
+SOURCE_DIR="apr-util-$portVersion"
+
+PATCH()
+{
+	echo 'AM_INIT_AUTOMAKE' >> xml/expat/configure.in
+}
+
+BUILD()
+{
+	aprInstallDir=$portPackageLinksDir/lib~libapr_1
+	expatInstallDir=$portPackageLinksDir/lib~libexpat
+
+	rm -rf aclocal.m4
+	mkdir -p m4
+	libtoolize -fci
+	aclocal --install -I m4
+	autoconf -f
+
+	cd xml/expat
+	mkdir -p m4
+	libtoolize -fci
+	aclocal --install -I m4
+	autoconf --force
+	autoheader
+	touch libtool.m4
+	cd ../..
+
+	# TODO: fix this hack!
+	cp /boot/system/bin/libtool .
+	ln -sfn $sourceDir/libtool /libtool
+
+	runConfigure ./configure \
+		--with-apr=$aprInstallDir \
+		--with-expat=$expatInstallDir
+	make $jobArgs
+}
+
+INSTALL()
+{
+	make install
+
+	# prepare develop/lib
+	prepareInstalledDevelLibs libaprutil-1
+	fixPkgconfig
+
+	# fix apu-1-config
+	fixDevelopLibDirReferences $binDir/apu-1-config
+
+	# remove superfluous .exp file
+	rm $libDir/aprutil.exp
+
+	# devel package
+	packageEntries devel \
+		$binDir \
+		$developDir
+}
+
+DESCRIPTION="
+The mission of the Apache Portable Runtime (APR) project is to create and \
+maintain software libraries that provide a predictable and consistent \
+interface to underlying platform-specific implementations. The primary goal is \
+to provide an API to which software developers may code and be assured of \
+predictable if not identical behaviour regardless of the platform on which \
+their software is built, relieving them of the need to code special-case \
+conditions to work around or take advantage of platform-specific deficiencies \
+or features.
+To give a brief overview, the primary core subsystems of APR 1.x include the \
+following:
+- atomic operations
+- dynamic Shared Object loading
+- file I/O
+- locks (mutexes, condition variables, etc)
+- memory management (high performance allocators)
+- memory-mapped files
+- multicast Sockets
+- network I/O
+- shared memory
+- thread and Process management
+- various data structures (tables, hashes, priority queues, etc)
+"
+
+# ----- devel package -------------------------------------------------------
+
+PROVIDES_devel="
+	apr_util_devel = portVersion compat >= 1
+	cmd:apu_1_config = $portVersion compat >= 1
+	devel:libaprutil_1 = 0.5.3 compat >= 0
+	"
+REQUIRES_devel="
+	apr_util == $portVersion base
+	"
diff --git a/dev-libs/apr_util/patches/apr_util-1.5.3.patch b/dev-libs/apr_util/patches/apr_util-1.5.3.patch
new file mode 100644
index 000000000..cfde8b9f4
--- /dev/null
+++ b/dev-libs/apr_util/patches/apr_util-1.5.3.patch
@@ -0,0 +1,45 @@
+diff -ur orig/apr-util-1.5.3/build/apu-conf.m4 apr_util-1.5.3/build/apu-conf.m4
+--- orig/apr-util-1.5.3/build/apu-conf.m4	2011-08-08 11:32:27.026738688 +0200
++++ apr_util-1.5.3/build/apu-conf.m4	2013-04-30 21:28:37.100401152 +0200
+@@ -145,10 +145,10 @@
+   else
+     # Add given path to standard search paths if appropriate:
+     if test "$withval" != "/usr"; then
+-      APR_ADDTO(LDFLAGS, [-L$withval/lib])
+-      APR_ADDTO(CPPFLAGS, [-I$withval/include])
+-      APR_ADDTO(APRUTIL_INCLUDES, [-I$withval/include])
+-      APR_ADDTO(APRUTIL_LDFLAGS, [-L$withval/lib])
++      APR_ADDTO(LDFLAGS, [-L$withval/develop/lib])
++      APR_ADDTO(CPPFLAGS, [-I$withval/develop/headers])
++      APR_ADDTO(APRUTIL_INCLUDES, [-I$withval/develop/headers])
++      APR_ADDTO(APRUTIL_LDFLAGS, [-L$withval/develop/lib])
+     fi
+     # ...and refuse to fall back on the builtin expat.
+     apu_try_builtin_expat=0
+diff -ur orig/apr-util-1.5.3/config.layout apr_util-1.5.3/config.layout
+--- orig/apr-util-1.5.3/config.layout	2005-02-09 13:18:43.064749568 +0100
++++ apr_util-1.5.3/config.layout	2013-04-30 21:27:27.079953920 +0200
+@@ -60,6 +60,23 @@
+     runtimedir:    ${localstatedir}/run
+ </Layout>
+ 
++#	Haiku Layout making use of finddir
++<Layout haiku>
++    prefix:        /boot/system
++    exec_prefix:   /boot/system
++    bindir:        /boot/system/bin
++    sbindir:       /boot/system/servers
++    libdir:        /boot/system/lib
++    libexecdir:    /boot/system/servers
++    mandir:        /boot/system/documentation/man
++    sysconfdir:    /boot/system/settings
++    datadir:       /boot/system/data
++    installbuilddir: /boot/system/develop/build
++    includedir:    /boot/system/include
++    localstatedir: /boot/system/var
++    runtimedir:    ${localstatedir}/log
++</Layout>
++
+ #   Mac OS X Server (Rhapsody)
+ <Layout Mac OS X Server>
+     prefix:        /Local/Library/WebServer
diff --git a/dev-libs/boehm_gc/boehm_gc-7.2d.recipe b/dev-libs/boehm_gc/boehm_gc-7.2d.recipe
index 06ea40d36..a2d049729 100644
--- a/dev-libs/boehm_gc/boehm_gc-7.2d.recipe
+++ b/dev-libs/boehm_gc/boehm_gc-7.2d.recipe
@@ -6,12 +6,12 @@ allocate memory basically as you normally would, without explicitly \
 deallocating memory that is no longer useful. The collector automatically \
 recycles memory when it determines that it can no longer be otherwise accessed.
 "
-HOMEPAGE="http://www.hpl.hp.com/personal/Hans_Boehm/gc/"
-SRC_URI="http://www.hpl.hp.com/personal/Hans_Boehm/gc/gc_source/gc-7.2d.tar.gz"
+HOMEPAGE="http://www.hboehm.info/gc/"
+SRC_URI="http://www.hboehm.info/gc/gc_source/gc-7.2d.tar.gz"
+CHECKSUM_SHA256="d9fe0ae8650d43746a48bfb394cab01a319f3809cee19f8ebd16aa985b511c5e"
 REVISION="2"
 ARCHITECTURES="x86 x86_gcc2 x86_64"
 SECONDARY_ARCHITECTURES="x86 x86_gcc2"
-CHECKSUM_MD5="91340b28c61753a789eb6077675d87d2"
 SOURCE_DIR="gc-7.2"
 
 PATCHES="boehm_gc-7.2d.patch"
diff --git a/dev-libs/boost/boost-1.55.0.recipe b/dev-libs/boost/boost-1.55.0.recipe
index c2cdb68d8..336a2f6f5 100644
--- a/dev-libs/boost/boost-1.55.0.recipe
+++ b/dev-libs/boost/boost-1.55.0.recipe
@@ -7,7 +7,7 @@ testing. It contains over eighty individual libraries.
 "
 HOMEPAGE="http://www.boost.org/" 
 SRC_URI="http://sourceforge.net/projects/boost/files/boost/1.55.0/boost_1_55_0.tar.bz2"
-CHECKSUM_MD5="d6eef4b4cacb2183f2bf265a5a03a354"
+CHECKSUM_SHA256="fff00023dd79486d444c8e29922f4072e1d451fc5a4d2b6075852ead7f2b7b52"
 REVISION="3"
 LICENSE="Boost v1.0"
 COPYRIGHT="1998-2013 Beman Dawes, David Abrahams, Rene Rivera, et al."
diff --git a/dev-libs/confuse/confuse-2.7.recipe b/dev-libs/confuse/confuse-2.7.recipe
index 755cbf8b9..f82b8537e 100644
--- a/dev-libs/confuse/confuse-2.7.recipe
+++ b/dev-libs/confuse/confuse-2.7.recipe
@@ -13,7 +13,7 @@ changed to not confuse itself with other similar libraries.
 "
 HOMEPAGE="http://www.nongnu.org/confuse/"
 SRC_URI="http://savannah.nongnu.org/download/confuse/confuse-2.7.tar.gz"
-CHECKSUM_MD5="45932fdeeccbb9ef4228f1c1a25e9c8f"
+CHECKSUM_SHA256="e32574fd837e950778dac7ade40787dd2259ef8e28acd6ede6847ca895c88778"
 LICENSE="ISC"
 COPYRIGHT="2002,2003,2007 Martin Hedenfalk"
 REVISION="1"
diff --git a/dev-libs/cyassl/cyassl-2.8.0.recipe b/dev-libs/cyassl/cyassl-2.8.0.recipe
index 5c64dbde6..4dbc09bff 100644
--- a/dev-libs/cyassl/cyassl-2.8.0.recipe
+++ b/dev-libs/cyassl/cyassl-2.8.0.recipe
@@ -4,8 +4,8 @@ A lightweight yet fully functional embedded SSL implementation.
 " 
 HOMEPAGE="http://yassl.com" 
 SRC_URI="http://yassl.com/cyassl-2.8.0.zip"
+CHECKSUM_SHA256="94dcac2dfa87b8474815241eee50f7192e7f315c8173ec209d2a3f752bba9a8d"
 REVISION="1"
-CHECKSUM_MD5="7465d4815af90eff01095fa1b031ce09"
 LICENSE="GNU GPL v2"
 COPYRIGHT="2006-2013 Sawtooth Consulting Ltd."
 
diff --git a/dev-libs/expat/expat-2.0.1.recipe b/dev-libs/expat/expat-2.0.1.recipe
index 5d03a77c1..379849856 100644
--- a/dev-libs/expat/expat-2.0.1.recipe
+++ b/dev-libs/expat/expat-2.0.1.recipe
@@ -11,9 +11,9 @@ COPYRIGHT="
 	"
 LICENSE="MIT"
 SRC_URI="http://iweb.dl.sourceforge.net/project/expat/expat/2.0.1/expat-2.0.1.tar.gz"
-CHECKSUM_MD5="ee8b492592568805593f81f8cdf2a04c"
+CHECKSUM_SHA256="847660b4df86e707c9150e33cd8c25bc5cd828f708c7418e765e3e983a2e5e93"
 REVISION="7"
-ARCHITECTURES="x86_gcc2 x86 x86_64"
+ARCHITECTURES="x86_gcc2 x86 x86_64 arm"
 SECONDARY_ARCHITECTURES="x86_gcc2 x86"
 
 PROVIDES="
diff --git a/dev-libs/fribidi/fribidi-0.19.5.recipe b/dev-libs/fribidi/fribidi-0.19.5.recipe
index 178af3c17..fe147211d 100644
--- a/dev-libs/fribidi/fribidi-0.19.5.recipe
+++ b/dev-libs/fribidi/fribidi-0.19.5.recipe
@@ -9,7 +9,7 @@ software in the Middle Eastern countries.
 "
 HOMEPAGE="http://fribidi.org/"
 SRC_URI="http://fribidi.org/download/fribidi-0.19.5.tar.bz2"
-CHECKSUM_MD5="925bafb97afee8a2fc2d0470c072a155"
+CHECKSUM_SHA256="501231e4260f83fccedae1cafe983a7de87082e3f5387e0b283d016f7f4cb428"
 REVISION="1"
 
 LICENSE="GNU LGPL v2.1"
diff --git a/dev-libs/glib/glib-1.2.10.recipe b/dev-libs/glib/glib-1.2.10.recipe
index 7e0a5fdaa..2e34bc13b 100644
--- a/dev-libs/glib/glib-1.2.10.recipe
+++ b/dev-libs/glib/glib-1.2.10.recipe
@@ -12,7 +12,7 @@ systems without major changes
 "
 HOMEPAGE="http://www.gtk.org/" 
 SRC_URI="http://ftp.gnome.org/pub/gnome/sources/glib/1.2/glib-1.2.10.tar.gz"
-CHECKSUM_MD5="6fe30dad87c77b91b632def29dd69ef9"
+CHECKSUM_SHA256="6e1ce7eedae713b11db82f11434d455d8a1379f783a79812cd2e05fc024a8d9f"
 LICENSE="GNU LGPL v2"
 COPYRIGHT="1995-1997  Peter Mattis, Spencer Kimball and Josh MacDonald
 	1991-2002 Free Software Foundation, Inc.
diff --git a/dev-libs/glib/glib2-2.38.1.recipe b/dev-libs/glib/glib2-2.38.1.recipe
index 3e9165a2e..f914b0dcd 100644
--- a/dev-libs/glib/glib2-2.38.1.recipe
+++ b/dev-libs/glib/glib2-2.38.1.recipe
@@ -12,7 +12,7 @@ systems without major changes
 "
 HOMEPAGE="http://www.gtk.org/" 
 SRC_URI="http://ftp.gnome.org/pub/gnome/sources/glib/2.38/glib-2.38.1.tar.xz"
-CHECKSUM_MD5="f3f6789151c1810f2fe23fe9ebb8b828"
+CHECKSUM_SHA256="01906c62ac666d2ab3183cc07261b2536fab7b211c6129ab66b119c2af56d159"
 LICENSE="GNU LGPL v2"
 COPYRIGHT="1995-1997  Peter Mattis, Spencer Kimball and Josh MacDonald
 	1991-2003 Free Software Foundation, Inc.
@@ -75,7 +75,7 @@ BUILD_PREREQUIRES="
 	cmd:aclocal
 	cmd:autoconf
 	cmd:make
-	cmd:pkg_config
+	cmd:pkg_config$secondaryArchSuffix
 	cmd:python
 	"
 
@@ -88,7 +88,11 @@ BUILD()
 	libtoolize --force --copy --install
 	aclocal
 	autoconf
-	runConfigure ./configure
+	runConfigure ./configure --disable-maintainer-mode
+
+	# There seem to be a problem with libtool, and without this some libraries
+	# would not be found during the build.
+	ln -s ../../glib/.libs gobject/.libs/lib
 	make $jobArgs
 }
 
diff --git a/dev-libs/gmp/gmp-5.1.1.recipe b/dev-libs/gmp/gmp-5.1.1.recipe
index 9318d8286..8f9f53dd8 100644
--- a/dev-libs/gmp/gmp-5.1.1.recipe
+++ b/dev-libs/gmp/gmp-5.1.1.recipe
@@ -11,7 +11,7 @@ languages including Ada, C++, C#, OCaml, Perl, PHP, and Python.
 "
 HOMEPAGE="http://gmplib.org/" 
 SRC_URI="ftp://ftp.gmplib.org/pub/gmp-5.1.1/gmp-5.1.1.tar.xz"
-CHECKSUM_MD5="485b1296e6287fa381e6015b19767989"
+CHECKSUM_SHA256="4bd64d782fdeb61aeed45b434fca5246d66baa9de76f87cba30c38460d8834c2"
 LICENSE="GNU GPL v3
 	GNU LGPL v3"
 COPYRIGHT="1991-2013 Free Software Foundation, Inc."
diff --git a/dev-libs/gmp/gmp-5.1.3.recipe b/dev-libs/gmp/gmp-5.1.3.recipe
new file mode 100644
index 000000000..8abc19575
--- /dev/null
+++ b/dev-libs/gmp/gmp-5.1.3.recipe
@@ -0,0 +1,73 @@
+SUMMARY="GMP - GNU Multiple Precision Arithmetic Library" 
+DESCRIPTION="
+The GNU Multiple Precision Arithmetic Library (GMP) is a free library for \
+arbitrary-precision arithmetic, operating on signed integers, rational numbers, \
+and floating point numbers. There are no practical limits to the precision \
+except the ones implied by the available memory in the machine GMP runs on \
+(operand dimension limit is 2^(32)-1 bits on 32-bit machines and 2^37 bits on \
+64-bit machines). GMP has a rich set of functions, and the functions have a \
+regular interface. The basic interface is for C but wrappers exist for other \
+languages including Ada, C++, C#, OCaml, Perl, PHP, and Python.
+"
+HOMEPAGE="http://gmplib.org/" 
+SRC_URI="http://ftp.gnu.org/gnu/gmp/gmp-5.1.3.tar.xz"
+CHECKSUM_SHA256="dee2eda37f4ff541f30019932db0c37f6f77a30ba3609234933b1818f9b07071"
+LICENSE="GNU GPL v3
+	GNU LGPL v3"
+COPYRIGHT="1991-2013 Free Software Foundation, Inc."
+REVISION="1"
+ARCHITECTURES="x86 x86_gcc2 x86_64"
+SECONDARY_ARCHITECTURES="x86_gcc2 x86"
+PROVIDES="gmp$secondaryArchSuffix = $portVersion compat >= 5.1
+	lib:libgmp$secondaryArchSuffix = 10.1.3 compat >= 10
+	"
+REQUIRES="
+	haiku$secondaryArchSuffix >= $haikuVersion
+	"
+BUILD_REQUIRES="
+	haiku${secondaryArchSuffix}_devel >= $haikuVersion
+	"
+BUILD_PREREQUIRES="
+	cmd:gcc$secondaryArchSuffix
+	cmd:libtool
+	cmd:autoconf
+	cmd:automake
+	cmd:make
+	"
+
+BUILD()
+{
+	libtoolize --force --copy --install
+	aclocal
+	autoconf
+	automake --add-missing
+	runConfigure ./configure 
+	make $jobArgs
+}
+
+INSTALL()
+{
+	make install includedir=$includeDir includeexecdir=$includeDir
+	
+	# prepare devel/lib
+	prepareInstalledDevelLibs libgmp
+
+	# devel package
+	packageEntries devel \
+		$developDir
+}
+
+TEST()
+{
+	make check
+}
+
+# ----- devel package 
+
+PROVIDES_devel="
+	gmp${secondaryArchSuffix}_devel = $portVersion
+	devel:libgmp$secondaryArchSuffix = 10.1.3 compat >= 0
+	"
+REQUIRES_devel="
+	gmp$secondaryArchSuffix == $portVersion base
+	"
diff --git a/dev-libs/gmp/gmp-6.0.0.recipe b/dev-libs/gmp/gmp-6.0.0.recipe
new file mode 100644
index 000000000..f276b0fad
--- /dev/null
+++ b/dev-libs/gmp/gmp-6.0.0.recipe
@@ -0,0 +1,73 @@
+SUMMARY="GMP - GNU Multiple Precision Arithmetic Library" 
+DESCRIPTION="
+The GNU Multiple Precision Arithmetic Library (GMP) is a free library for \
+arbitrary-precision arithmetic, operating on signed integers, rational numbers, \
+and floating point numbers. There are no practical limits to the precision \
+except the ones implied by the available memory in the machine GMP runs on \
+(operand dimension limit is 2^(32)-1 bits on 32-bit machines and 2^37 bits on \
+64-bit machines). GMP has a rich set of functions, and the functions have a \
+regular interface. The basic interface is for C but wrappers exist for other \
+languages including Ada, C++, C#, OCaml, Perl, PHP, and Python.
+"
+HOMEPAGE="http://gmplib.org/" 
+SRC_URI="http://ftp.gnu.org/gnu/gmp/gmp-6.0.0a.tar.xz"
+CHECKSUM_SHA256="9156d32edac6955bc53b0218f5f3763facb890b73a835d5e1b901dcf8eb8b764"
+LICENSE="GNU GPL v3
+	GNU LGPL v3"
+COPYRIGHT="1991-2014 Free Software Foundation, Inc."
+REVISION="1"
+ARCHITECTURES="x86 x86_gcc2 x86_64"
+SECONDARY_ARCHITECTURES="x86_gcc2 x86"
+PROVIDES="gmp$secondaryArchSuffix = $portVersion compat >= 6.0
+	lib:libgmp$secondaryArchSuffix = 10.2.0 compat >= 10
+	"
+REQUIRES="
+	haiku$secondaryArchSuffix >= $haikuVersion
+	"
+BUILD_REQUIRES="
+	haiku${secondaryArchSuffix}_devel >= $haikuVersion
+	"
+BUILD_PREREQUIRES="
+	cmd:gcc$secondaryArchSuffix
+	cmd:libtool
+	cmd:autoconf
+	cmd:automake
+	cmd:make
+	"
+
+BUILD()
+{
+	libtoolize --force --copy --install
+	aclocal
+	autoconf
+	automake --add-missing
+	runConfigure ./configure 
+	make $jobArgs
+}
+
+INSTALL()
+{
+	make install includedir=$includeDir includeexecdir=$includeDir
+	
+	# prepare devel/lib
+	prepareInstalledDevelLibs libgmp
+
+	# devel package
+	packageEntries devel \
+		$developDir
+}
+
+TEST()
+{
+	make check
+}
+
+# ----- devel package 
+
+PROVIDES_devel="
+	gmp${secondaryArchSuffix}_devel = $portVersion
+	devel:libgmp$secondaryArchSuffix = 10.2.0 compat >= 10
+	"
+REQUIRES_devel="
+	gmp$secondaryArchSuffix == $portVersion base
+	"
diff --git a/dev-libs/icu/icu-4.8.1.1.recipe b/dev-libs/icu/icu-4.8.1.1.recipe
index 440f6c6ad..79708cb1f 100644
--- a/dev-libs/icu/icu-4.8.1.1.recipe
+++ b/dev-libs/icu/icu-4.8.1.1.recipe
@@ -3,9 +3,9 @@ HOMEPAGE="http://www.icu-project.org"
 LICENSE="ICU"
 COPYRIGHT="1997-2011 IBM Corporation and others."
 SRC_URI="http://download.icu-project.org/files/icu4c/4.8.1.1/icu4c-4_8_1_1-src.tgz"
-CHECKSUM_MD5="ea93970a0275be6b42f56953cd332c17"
+CHECKSUM_SHA256="0a70491c5fdfc5a0fa7429f820da73951e07d59a268b3d8ffe052eec65820ca1"
 REVISION="4"
-ARCHITECTURES="x86_gcc2 x86 x86_64"
+ARCHITECTURES="x86_gcc2 x86 x86_64 arm"
 SECONDARY_ARCHITECTURES="x86_gcc2 x86"
 
 PATCHES="icu-4.8.1.1.patch"
@@ -28,6 +28,7 @@ BUILD_REQUIRES="
 	"
 BUILD_PREREQUIRES="
 	haiku${secondaryArchSuffix}_devel >= $haikuVersion
+	cmd:awk
 	cmd:gcc$secondaryArchSuffix
 	cmd:ld$secondaryArchSuffix
 	cmd:make
diff --git a/dev-libs/jansson/jansson-2.5.recipe b/dev-libs/jansson/jansson-2.5.recipe
index 2bba5cfb2..e5f8073c3 100644
--- a/dev-libs/jansson/jansson-2.5.recipe
+++ b/dev-libs/jansson/jansson-2.5.recipe
@@ -7,7 +7,7 @@ documentation, no dependencies on other libraries, full unicode support \
 "
 HOMEPAGE="http://www.digip.org/jansson/" 
 SRC_URI="http://www.digip.org/jansson/releases/jansson-2.5.tar.gz"
-CHECKSUM_MD5="46ac93bec48aacf207b67b51c8fbf7f1"
+CHECKSUM_SHA256="dd8bbfb38ad5031ce88e066b14d3b7e9c7113243daa7f4cde1994b7fc90bb1b1"
 LICENSE="MIT"
 COPYRIGHT="2009-2013 Petri Lehtinen
 	2011-2012 Basile Starynkevitch
diff --git a/dev-libs/libcdio/libcdio-0.82.recipe b/dev-libs/libcdio/libcdio-0.82.recipe
deleted file mode 100644
index cef7033b6..000000000
--- a/dev-libs/libcdio/libcdio-0.82.recipe
+++ /dev/null
@@ -1,27 +0,0 @@
-DESCRIPTION="A library to encapsulate CD-ROM reading and control" 
-HOMEPAGE="http://www.gnu.org/software/libcdio" 
-SRC_URI="ftp://ftp.gnu.org/gnu/libcdio/libcdio-0.82.tar.gz"
-REVISION="1"
-STATUS_HAIKU="stable"
-DEPEND="dev-libs/libiconv >= 1.12"
-CHECKSUM_MD5="1c29b18e01ab2b966162bc727bf3c360"
-BUILD()
-{
-	cd libcdio-0.82
-	libtoolize --force --copy --install
-	aclocal
-	autoconf
-	automake
-	./configure --prefix=`finddir B_COMMON_DIRECTORY`
-	make
-}
-
-INSTALL()
-{
-	cd libcdio-0.82
-	make install
-}
-
-LICENSE="GNU GPL v3"
-COPYRIGHT="2003-2009 Rocky Bernstein
-	1996-1998  Gerd Knorr and Heiko Eißfeldt"
diff --git a/dev-libs/libcdio/libcdio-0.83.recipe b/dev-libs/libcdio/libcdio-0.83.recipe
deleted file mode 100644
index 8de9b8fe9..000000000
--- a/dev-libs/libcdio/libcdio-0.83.recipe
+++ /dev/null
@@ -1,27 +0,0 @@
-DESCRIPTION="A library to encapsulate CD-ROM reading and control" 
-HOMEPAGE="http://www.gnu.org/software/libcdio" 
-SRC_URI="ftp://ftp.gnu.org/gnu/libcdio/libcdio-0.83.tar.gz"
-REVISION="1"
-STATUS_HAIKU="stable"
-DEPEND="dev-libs/libiconv >= 1.12"
-CHECKSUM_MD5="b9e0f1bccb142e697cd834fe56b6e6fb"
-BUILD()
-{
-	cd libcdio-0.83
-	libtoolize --force --copy --install
-	aclocal -I m4
-	autoconf
-	automake
-	./configure --prefix=`finddir B_COMMON_DIRECTORY`
-	make
-}
-
-INSTALL()
-{
-	cd libcdio-0.83
-	make install
-}
-
-LICENSE="GNU GPL v3"
-COPYRIGHT="2003-2011 Rocky Bernstein
-	1996-1998  Gerd Knorr and Heiko Eißfeldt"
diff --git a/dev-libs/libcdio/libcdio-0.90.recipe b/dev-libs/libcdio/libcdio-0.90.recipe
deleted file mode 100644
index 21184f10c..000000000
--- a/dev-libs/libcdio/libcdio-0.90.recipe
+++ /dev/null
@@ -1,28 +0,0 @@
-DESCRIPTION="A library to encapsulate CD-ROM reading and control"
-HOMEPAGE="http://www.gnu.org/software/libcdio"
-SRC_URI="ftp://ftp.gnu.org/gnu/libcdio/libcdio-0.90.tar.gz"
-REVISION="1"
-STATUS_HAIKU="stable"
-DEPEND="dev-libs/libiconv >= 1.12
-       dev-util/pkgconfig"
-CHECKSUM_MD5="1b245b023fb03a58d030fd2800db3247"
-BUILD()
-{
-       cd libcdio-0.90
-       libtoolize --force --copy --install
-       aclocal -I m4
-       autoconf
-       automake
-       ./configure --prefix=`finddir B_COMMON_DIRECTORY`
-        make
-}
-     
-INSTALL()
-{
-        cd libcdio-0.90
-        make install
-}
-     
-LICENSE="GNU GPL v3"
-COPYRIGHT="2003-2011 Rocky Bernstein
-      1996-1998  Gerd Knorr and Heiko Eißfeldt"
diff --git a/dev-libs/libcdio/libcdio-0.92.recipe b/dev-libs/libcdio/libcdio-0.92.recipe
new file mode 100644
index 000000000..468c53575
--- /dev/null
+++ b/dev-libs/libcdio/libcdio-0.92.recipe
@@ -0,0 +1,88 @@
+SUMMARY="A library to encapsulate CD-ROM reading and control"
+DESCRIPTION="
+The libcdio package contains a library for CD-ROM and CD image \
+access. Applications wishing to be oblivious of the OS- and \
+device-dependent properties of a CD-ROM or of the specific details of \
+various CD-image formats may benefit from using this library.
+"
+LICENSE="GNU GPL v3"
+COPYRIGHT="2002-2008,2010,2012, Rocky Bernstein and Herbert Valerio Riedel."
+HOMEPAGE="http://www.gnu.org/software/libcdio"
+SRC_URI="ftp://ftp.gnu.org/gnu/libcdio/libcdio-0.92.tar.gz"
+CHECKSUM_SHA256="3336bf352aff43b5023e41a6d23525172a3b4ee433c467bd0fab5b8becb33fad"
+REVISION="1"
+ARCHITECTURES="x86_gcc2 x86 x86_64"
+SECONDARY_ARCHITECTURES="x86_gcc2 x86"
+
+PATCHES="libcdio-0.92.patchset"
+
+PROVIDES="
+	libcdio$secondaryArchSuffix = $portVersion
+	cmd:cdda_player
+	cmd:cd_drive
+	cmd:cd_info
+	cmd:cd_read
+	cmd:iso_info
+	cmd:iso_read
+	cmd:mmc_tool
+	lib:libcdio$secondaryArchSuffix = 15.0.0 compat >= 15
+	lib:libcdio++$secondaryArchSuffix = 0.0.2 compat >= 0
+	lib:libiso9660$secondaryArchSuffix = 9.0.0 compat >= 9
+	lib:libiso9660++$secondaryArchSuffix = 0.0.0 compat >= 0
+	lib:libudf$secondaryArchSuffix = 0.0.0 compat >= 0
+	"
+
+REQUIRES="
+	haiku$secondaryArchSuffix >= $haikuVersion
+	lib:libiconv$secondaryArchSuffix
+	lib:libncurses$secondaryArchSuffix
+	"
+BUILD_REQUIRES="
+	devel:libiconv$secondaryArchSuffix
+	devel:libncurses$secondaryArchSuffix
+	"
+BUILD_PREREQUIRES="
+	haiku${secondaryArchSuffix}_devel >= $haikuVersion
+	cmd:make
+	cmd:gcc$secondaryArchSuffix
+	cmd:ld$secondaryArchSuffix
+	cmd:libtoolize
+	cmd:autoconf
+	cmd:automake
+	"
+
+BUILD()
+{
+	libtoolize --force --copy --install
+	aclocal -I m4
+	autoconf
+	automake
+	runConfigure ./configure
+	make   
+}
+
+INSTALL()
+{
+	make install
+
+	# set up the develop directory correctly
+	prepareInstalledDevelLibs libcdio
+
+	# devel package
+	packageEntries devel \
+		$developDir
+}
+
+# ----- devel package -------------------------------------------------------
+
+PROVIDES_devel="
+	libcdio${secondaryArchSuffix}_devel = $portVersion
+	devel:libcdio${secondaryArchSuffix} = 15.0.0 compat >= 15
+	devel:libcdio++${secondaryArchSuffix} = 0.0.2 compat >= 0
+	devel:libiso9660${secondaryArchSuffix} = 9.0.0 compat >= 9
+	devel:libiso9660++${secondaryArchSuffix} = 0.0.0 compat >= 0
+	devel:libudf${secondaryArchSuffix} = 0.0.0 compat >= 0
+	"
+REQUIRES_devel="
+	libcdio${secondaryArchSuffix} == $portVersion base
+	"
diff --git a/dev-libs/libcdio/patches/libcdio-0.82.patch b/dev-libs/libcdio/patches/libcdio-0.82.patch
deleted file mode 100644
index 4a63b6636..000000000
--- a/dev-libs/libcdio/patches/libcdio-0.82.patch
+++ /dev/null
@@ -1,20 +0,0 @@
-diff -urN libcdio-0.82/configure.ac libcdio-0.82-haiku/configure.ac
---- libcdio-0.82/configure.ac	2009-10-27 11:26:32.055574528 +0000
-+++ libcdio-0.82-haiku/configure.ac	2010-10-05 11:54:28.000000000 +0000
-@@ -246,7 +246,7 @@
- dnl empty_array_size
- AC_MSG_CHECKING([how to create empty arrays])
- 
--empty_array_size="xxxx"
-+empty_array_size="xxx"
- AC_TRY_COMPILE([],[struct { int foo; int bar[]; } doo;], empty_array_size="")
- 
- if test "x$empty_array_size" = "xxxx";then
-@@ -572,6 +572,7 @@
-     [AC_MSG_WARN([new enough libcddb not found. CDDB access disabled. Get libcddb from http://libcddb.sourceforge.net])
-     HAVE_CDDB=no])
-     AC_CHECK_LIB(socket, connect)
-+    AC_CHECK_LIB(network, connect)
-     AC_CHECK_FUNC(gethostbyname, , AC_CHECK_LIB(nsl, gethostbyname))
- fi
- 
diff --git a/dev-libs/libcdio/patches/libcdio-0.83.patch b/dev-libs/libcdio/patches/libcdio-0.83.patch
deleted file mode 100644
index 4f1ed285f..000000000
--- a/dev-libs/libcdio/patches/libcdio-0.83.patch
+++ /dev/null
@@ -1,20 +0,0 @@
-diff -urN libcdio-0.83/configure.ac libcdio-0.83-haiku/configure.ac
---- libcdio-0.83/configure.ac	2009-10-27 11:26:32.055574528 +0000
-+++ libcdio-0.83-haiku/configure.ac	2010-10-05 11:54:28.000000000 +0000
-@@ -246,7 +246,7 @@
- dnl empty_array_size
- AC_MSG_CHECKING([how to create empty arrays])
- 
--empty_array_size="xxxx"
-+empty_array_size="xxx"
- AC_TRY_COMPILE([],[struct { int foo; int bar[]; } doo;], empty_array_size="")
- 
- if test "x$empty_array_size" = "xxxx";then
-@@ -572,6 +572,7 @@
-     [AC_MSG_WARN([new enough libcddb not found. CDDB access disabled. Get libcddb from http://libcddb.sourceforge.net])
-     HAVE_CDDB=no])
-     AC_CHECK_LIB(socket, connect)
-+    AC_CHECK_LIB(network, connect)
-     AC_CHECK_FUNC(gethostbyname, , AC_CHECK_LIB(nsl, gethostbyname))
- fi
- 
diff --git a/dev-libs/libcdio/patches/libcdio-0.92.patchset b/dev-libs/libcdio/patches/libcdio-0.92.patchset
new file mode 100644
index 000000000..ebeacb701
--- /dev/null
+++ b/dev-libs/libcdio/patches/libcdio-0.92.patchset
@@ -0,0 +1,45 @@
+From 0773ee4a7e18c12b02a7e83fca1c3f9796f61e73 Mon Sep 17 00:00:00 2001
+From: Jerome Duval <jerome.duval@gmail.com>
+Date: Sat, 19 Apr 2014 21:36:18 +0000
+Subject: gcc2 build fix
+
+
+diff --git a/configure.ac b/configure.ac
+index d83b885..de089f1 100755
+--- a/configure.ac
++++ b/configure.ac
+@@ -241,7 +241,7 @@ AC_COMPILE_IFELSE([AC_LANG_PROGRAM([
+ dnl empty_array_size
+ AC_MSG_CHECKING([how to create empty arrays])
+ 
+-empty_array_size="xxxx"
++empty_array_size="xxx"
+ AC_TRY_COMPILE([],[struct { int foo; int bar[]; } doo;], empty_array_size="")
+ 
+ if test "x$empty_array_size" = "xxxx"; then
+@@ -623,6 +623,7 @@ if test "x$enable_cddb" != "xno"; then
+     [AC_MSG_WARN([new enough libcddb not found. CDDB access disabled. Get libcddb from http://libcddb.sourceforge.net])
+     HAVE_CDDB=no])
+     AC_CHECK_LIB(socket, connect)
++    AC_CHECK_LIB(network, connect)
+     AC_CHECK_FUNC(gethostbyname, , AC_CHECK_LIB(nsl, gethostbyname))
+ fi
+ 
+diff --git a/example/mmc1.c b/example/mmc1.c
+index 29991e7..66b7a67 100644
+--- a/example/mmc1.c
++++ b/example/mmc1.c
+@@ -90,9 +90,9 @@ main(int argc, const char *argv[])
+     {
+ 	driver_return_code_t i_status;
+ 	bool b_erasable;
++	cdio_mmc_feature_profile_t disctype;
+ 
+ 	i_status = mmc_get_disc_erasable(p_cdio, &b_erasable);
+-	cdio_mmc_feature_profile_t disctype;
+ 	if (DRIVER_OP_SUCCESS == i_status)
+ 	    printf("-- Disc is %serasable.\n", b_erasable ? "" : "not ");
+ 	else
+-- 
+1.8.3.4
+
diff --git a/dev-libs/libclaw/libclaw-1.7.4.recipe b/dev-libs/libclaw/libclaw-1.7.4.recipe
new file mode 100644
index 000000000..b9c8b138b
--- /dev/null
+++ b/dev-libs/libclaw/libclaw-1.7.4.recipe
@@ -0,0 +1,106 @@
+SUMMARY="Absolutely Wonderful C++ Library"
+DESCRIPTION="
+Claw is a generalist library written in C++ and providing various structures
+and algorithms, like containers, string algorithms, tweeners, Bézier curves and
+more.
+
+The story of Claw begins when I wanted to group all the small tools I have made
+along my studies at the university. The library progress from time to time,
+mostly when I need a new tool for Plee the Bear, a game I am actively working
+on.
+
+Claw wants to be standard compliant and as portable as possible. Of course,
+because I'm currently the only developer, the task is a little bit difficult
+and you could have some minor problems. If you experience any problem, please
+let me know by contacting me.
+
+Claw stands for \"C++ Library Absolutely Wonderful\".
+"
+HOMEPAGE="http://libclaw.sourceforge.net/" 
+SRC_URI="http://sourceforge.net/projects/libclaw/files/libclaw/$portVersion/libclaw-$portVersion.tar.gz"
+CHECKSUM_SHA256="0be289da7f43b1892575f14b27860af5d1e1f6961eae11653d64e625fd7924b7"
+
+REVISION="1"
+LICENSE="GNU LGPL v2.1"
+COPYRIGHT="2008-2014 Julien Jorge"
+ARCHITECTURES="x86 ?x86_64"
+if [ $effectiveTargetArchitecture != x86_gcc2 ]; then
+	ARCHITECTURES="$ARCHITECTURES x86_gcc2"
+else
+	ARCHITECTURES="$ARCHITECTURES !x86_gcc2"
+fi
+SECONDARY_ARCHITECTURES="x86"
+
+PROVIDES="
+	libclaw$secondaryArchSuffix = $portVersion
+	lib:libclaw_application$secondaryArchSuffix
+	lib:libclaw_configuration_file$secondaryArchSuffix
+	lib:libclaw_dynamic_library$secondaryArchSuffix
+	lib:libclaw_graphic$secondaryArchSuffix
+	lib:libclaw_logger$secondaryArchSuffix
+	lib:libclaw_net$secondaryArchSuffix
+	lib:libclaw_tween$secondaryArchSuffix
+	cmd:claw_config
+	"
+
+REQUIRES="
+	haiku$secondaryArchSuffix >= $haikuVersion
+	lib:libstdc++$secondaryArchSuffix
+	lib:libjpeg$secondaryArchSuffix
+	lib:libpng$secondaryArchSuffix
+	lib:libz$secondaryArchSuffix
+	"
+
+BUILD_REQUIRES="
+	haiku${secondaryArchSuffix}_devel >= $haikuVersion
+	devel:libjpeg$secondaryArchSuffix
+	devel:libpng$secondaryArchSuffix
+	devel:libz$secondaryArchSuffix
+	devel:libintl$secondaryArchSuffix
+	boost_devel${secondaryArchSuffix}
+	"
+
+BUILD_PREREQUIRES="
+	cmd:gcc$secondaryArchSuffix
+	cmd:ld$secondaryArchSuffix
+	cmd:cmake >= 3.0
+	cmd:make
+	"
+
+PATCHES="libclaw-$portVersion.patchset"
+BUILD()
+{
+	cmake . -DCMAKE_INSTALL_PREFIX=$prefix
+	make $jobArgs
+}
+
+INSTALL()
+{
+	make install
+
+	prepareInstalledDevelLibs libclaw_application libclaw_configuration_file \
+		libclaw_dynamic_library libclaw_graphic libclaw_logger libclaw_net \
+		libclaw_tween
+
+	packageEntries devel $developDir $libDir/libclaw/
+}
+
+TEST() {
+	true
+}
+
+PROVIDES_devel="
+	libclaw${secondaryArchSuffix}_devel = $portVersion
+	devel:libclaw_application$secondaryArchSuffix
+	devel:libclaw_configuration_file$secondaryArchSuffix
+	devel:libclaw_dynamic_library$secondaryArchSuffix
+	devel:libclaw_graphic$secondaryArchSuffix
+	devel:libclaw_logger$secondaryArchSuffix
+	devel:libclaw_net$secondaryArchSuffix
+	devel:libclaw_tween$secondaryArchSuffix
+	"
+
+REQUIRES_devel="
+	haiku$secondaryArchSuffix >= $haikuVersion
+	libclaw$secondaryArchSuffix == $portVersion base
+	"
diff --git a/dev-libs/libclaw/patches/libclaw-1.7.4.patchset b/dev-libs/libclaw/patches/libclaw-1.7.4.patchset
new file mode 100644
index 000000000..9d5527911
--- /dev/null
+++ b/dev-libs/libclaw/patches/libclaw-1.7.4.patchset
@@ -0,0 +1,146 @@
+From fa045ed22d1276b0c7deae6f5ca5cf71a58dbe3d Mon Sep 17 00:00:00 2001
+From: Adrien Destugues <pulkomandy@pulkomandy.tk>
+Date: Sat, 5 Apr 2014 18:04:49 +0200
+Subject: Add missing include.
+
+
+diff --git a/claw/socket_traits_unix.hpp b/claw/socket_traits_unix.hpp
+index 16761ab..bc471b0 100644
+--- a/claw/socket_traits_unix.hpp
++++ b/claw/socket_traits_unix.hpp
+@@ -31,6 +31,7 @@
+ #define __CLAW_SOCKET_TRAITS_UNIX_HPP__
+ 
+ #include <sys/types.h>
++#include <sys/select.h>
+ #include <sys/socket.h>
+ #include <sys/stat.h>
+ #include <netinet/in.h>
+-- 
+1.8.3.4
+
+
+From f8da4cf7165d68763faa5f3955c79b2f1fff7e32 Mon Sep 17 00:00:00 2001
+From: Adrien Destugues <pulkomandy@pulkomandy.tk>
+Date: Sat, 5 Apr 2014 18:09:50 +0200
+Subject: Fix installation paths for Haiku.
+
+
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index 0716825..66607b0 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -27,12 +27,20 @@ if(SVN_ENTRIES)
+   endif(Subversion_FOUND)
+ endif(SVN_ENTRIES)
+ 
+-set( CLAW_CODE_DIR claw/code/ )
++if (HAIKU)
++set( CLAW_INCLUDE_DIRECTORY "${CMAKE_INSTALL_PREFIX}/develop/headers/" )
++set( CLAW_INSTALLDIR_DOC data/doc/libclaw${CLAW_VERSION_MAJOR}/ )
++set( CLAW_TRANSLATIONS_INSTALL_DIR "data/locale" )
++set( CLAW_INSTALLDIR_SOURCE develop/headers/claw/ )
++else()
+ set( CLAW_INCLUDE_DIRECTORY "${CMAKE_INSTALL_PREFIX}/include/" )
+-set( CLAW_INSTALLDIR_SOURCE include/claw/ )
+-set( CLAW_INSTALLDIR_LIB lib/ )
+ set( CLAW_INSTALLDIR_DOC share/doc/libclaw${CLAW_VERSION_MAJOR}/ )
+ set( CLAW_TRANSLATIONS_INSTALL_DIR "share/locale" )
++set( CLAW_INSTALLDIR_SOURCE include/claw/ )
++endif()
++
++set( CLAW_CODE_DIR claw/code/ )
++set( CLAW_INSTALLDIR_LIB lib/ )
+ set( CLAW_EXECUTABLE_DIR bin/ )
+ 
+ set( CLAW_LIBRARIES
+diff --git a/cmake-module/CMakeLists.txt b/cmake-module/CMakeLists.txt
+index a08a799..c486c5c 100644
+--- a/cmake-module/CMakeLists.txt
++++ b/cmake-module/CMakeLists.txt
+@@ -3,7 +3,11 @@ cmake_minimum_required(VERSION 2.6)
+ project(claw:cmake-modules)
+ 
+ if( NOT CLAW_CMAKE_MODULES_INSTALL_PATH )
+-  set( CLAW_CMAKE_MODULES_INSTALL_PATH "share/cmake/libclaw" )
++  if(HAIKU)
++	  set( CLAW_CMAKE_MODULES_INSTALL_PATH "lib/${CMAKE_HAIKU_SECONDARY_ARCH}/libclaw/cmake/" )
++  else()
++    set( CLAW_CMAKE_MODULES_INSTALL_PATH "share/cmake/libclaw" )
++  endif()
+ endif( NOT CLAW_CMAKE_MODULES_INSTALL_PATH )
+ 
+ set( CLAW_CMAKE_MODULES
+diff --git a/desktop/locale/libclaw/CMakeLists.txt b/desktop/locale/libclaw/CMakeLists.txt
+index f0973ac..8de90bd 100644
+--- a/desktop/locale/libclaw/CMakeLists.txt
++++ b/desktop/locale/libclaw/CMakeLists.txt
+@@ -22,7 +22,7 @@ macro(GETTEXT_CREATE_TRANSLATIONS_CUSTOM _targetName _potFile _firstPoFile)
+ 
+       install(
+         FILES ${_gmoFile}
+-        DESTINATION share/locale/${_lang}/LC_MESSAGES
++		DESTINATION ${CLAW_TRANSLATIONS_INSTALL_DIR}/${_lang}/LC_MESSAGES
+         RENAME ${_potBasename}.mo
+         )
+       
+-- 
+1.8.3.4
+
+
+From 5850bb81673005cf0101b5470749792989a380eb Mon Sep 17 00:00:00 2001
+From: Adrien Destugues <pulkomandy@pulkomandy.tk>
+Date: Sun, 6 Apr 2014 14:34:30 +0200
+Subject: Fix claw-config to do the right thing.
+
+
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index 66607b0..89f0d4e 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -28,19 +28,20 @@ if(SVN_ENTRIES)
+ endif(SVN_ENTRIES)
+ 
+ if (HAIKU)
+-set( CLAW_INCLUDE_DIRECTORY "${CMAKE_INSTALL_PREFIX}/develop/headers/" )
+-set( CLAW_INSTALLDIR_DOC data/doc/libclaw${CLAW_VERSION_MAJOR}/ )
+-set( CLAW_TRANSLATIONS_INSTALL_DIR "data/locale" )
+-set( CLAW_INSTALLDIR_SOURCE develop/headers/claw/ )
++  set( CLAW_INCLUDE_DIRECTORY "${CMAKE_INSTALL_PREFIX}/develop/headers/${CMAKE_HAIKU_SECONDARY_ARCH}" )
++  set( CLAW_INSTALLDIR_DOC data/doc/libclaw${CLAW_VERSION_MAJOR}/ )
++  set( CLAW_TRANSLATIONS_INSTALL_DIR "data/locale" )
++  set( CLAW_INSTALLDIR_SOURCE develop/headers/${CMAKE_HAIKU_SECONDARY_ARCH}/claw/ )
++  set( CLAW_INSTALLDIR_LIB lib/${CMAKE_HAIKU_SECONDARY_ARCH}/ )
+ else()
+-set( CLAW_INCLUDE_DIRECTORY "${CMAKE_INSTALL_PREFIX}/include/" )
+-set( CLAW_INSTALLDIR_DOC share/doc/libclaw${CLAW_VERSION_MAJOR}/ )
+-set( CLAW_TRANSLATIONS_INSTALL_DIR "share/locale" )
+-set( CLAW_INSTALLDIR_SOURCE include/claw/ )
++  set( CLAW_INCLUDE_DIRECTORY "${CMAKE_INSTALL_PREFIX}/include/" )
++  set( CLAW_INSTALLDIR_DOC share/doc/libclaw${CLAW_VERSION_MAJOR}/ )
++  set( CLAW_TRANSLATIONS_INSTALL_DIR "share/locale" )
++  set( CLAW_INSTALLDIR_SOURCE include/claw/ )
++  set( CLAW_INSTALLDIR_LIB lib/ )
+ endif()
+ 
+ set( CLAW_CODE_DIR claw/code/ )
+-set( CLAW_INSTALLDIR_LIB lib/ )
+ set( CLAW_EXECUTABLE_DIR bin/ )
+ 
+ set( CLAW_LIBRARIES
+diff --git a/claw-config.in b/claw-config.in
+index 73b2b10..c0a8fa5 100755
+--- a/claw-config.in
++++ b/claw-config.in
+@@ -140,7 +140,7 @@ while test $# -gt 0; do
+       echo -I$CLAW_INCLUDE_DIRECTORY
+       ;;
+      --libs)
+-      libdirs="-L${exec_prefix}/lib "
++      libdirs="-L${exec_prefix}/@CLAW_INSTALLDIR_LIB@ "
+ 
+       echo -n "$libdirs"
+       echo $(print_libraries)
+-- 
+1.8.3.4
+
diff --git a/dev-libs/libdwarf/libdwarf-20130729.recipe b/dev-libs/libdwarf/libdwarf-20130729.recipe
index ff44cf1ac..223fa1316 100644
--- a/dev-libs/libdwarf/libdwarf-20130729.recipe
+++ b/dev-libs/libdwarf/libdwarf-20130729.recipe
@@ -25,7 +25,7 @@ been patched to make dwarfdump and dwarfgen haiku compatible as well.
 "
 HOMEPAGE="http://www.prevanders.net/dwarf.html"
 SRC_URI="http://www.prevanders.net/libdwarf-20130729.tar.gz"
-CHECKSUM_MD5="4cc5e48693f7b93b7aa0261e63c0e21d"
+CHECKSUM_SHA256="b6455d8616baf2883e2af91f006d6cbd583128fdfff46e3d1fae460bc223bb7b"
 LICENSE="
 	GNU GPL v2
 	GNU LGPL v2.1
diff --git a/dev-libs/libebml/libebml-1.3.0.recipe b/dev-libs/libebml/libebml-1.3.0.recipe
new file mode 100644
index 000000000..6bab30d64
--- /dev/null
+++ b/dev-libs/libebml/libebml-1.3.0.recipe
@@ -0,0 +1,65 @@
+SUMMARY="libebml is a C++ library to parse EBML content (read/write)."
+DESCRIPTION="libebml is a C++ library to parse EBML content (read/write)."
+HOMEPAGE="http://www.matroska.org/"
+SRC_URI="http://dl.matroska.org/downloads/libebml/libebml-1.3.0.tar.bz2"
+CHECKSUM_SHA256="83b074d6b62715aa0080406ea84d33df2e44b5d874096640233a4db49b8096de"
+
+REVISION="1"
+
+LICENSE="GNU LGPL v2.1"
+COPYRIGHT="2005-2013 CoreCodec, Inc."
+
+ARCHITECTURES="x86_gcc2 x86 ?x86_64"
+SECONDARY_ARCHITECTURES="x86_gcc2 x86"
+
+PROVIDES="
+	libebml$secondaryArchSuffix = $portVersion
+	lib:libebml$secondaryArchSuffix = 4
+	"
+REQUIRES="
+	haiku${secondaryArchSuffix} >= $haikuVersion
+	"
+BUILD_REQUIRES="
+	"
+BUILD_PREREQUIRES="
+	haiku${secondaryArchSuffix}_devel >= $haikuVersion
+	cmd:gcc$secondaryArchSuffix
+	cmd:ld$secondaryArchSuffix
+	cmd:make
+	cmd:sed
+	"
+
+PATCH()
+{
+	sed -i 's/^ifeq (BeOS/ifeq (Haiku/g' make/linux/Makefile
+	sed -i "s,/boot/home/config,$prefix,g" make/linux/Makefile
+	sed -i "s,^\(libdir\)=\(.*\)$,\1=$libDir,g" make/linux/Makefile
+	sed -i "s,^\(includedir\)=\(.*\)$,\1=$includeDir/ebml,g" make/linux/Makefile
+	sed -i 's/-Wextra//g' make/linux/Makefile
+	sed -i 's/\(#elif defined(__BEOS__)\)/\1 || defined(__HAIKU__)/g' \
+		ebml/c/libebml_t.h
+}
+
+BUILD()
+{
+	cd make/linux
+	make $jobArgs
+}
+
+INSTALL()
+{
+	cd make/linux
+	make install
+	
+	prepareInstalledDevelLibs libebml
+	
+	packageEntries devel $developDir
+}
+
+PROVIDES_devel="
+	libebml${secondaryArchSuffix}_devel = $portVersion
+	devel:libebml$secondaryArchSuffix = 4
+	"
+REQUIRES_devel="
+	libebml$secondaryArchSuffix == $portVersion base
+	"
diff --git a/dev-libs/libedit/libedit-2012_06_01_3.0.recipe b/dev-libs/libedit/libedit-2012_06_01_3.0.recipe
index cc9a3966f..7663a3d7a 100644
--- a/dev-libs/libedit/libedit-2012_06_01_3.0.recipe
+++ b/dev-libs/libedit/libedit-2012_06_01_3.0.recipe
@@ -9,29 +9,30 @@ LICENSE="BSD (3-clause)"
 COPYRIGHT="1992-2012 The NetBSD Foundation, Inc."
 HOMEPAGE="http://www.thrysoee.dk/editline/"
 SRC_URI="http://www.thrysoee.dk/editline/libedit-20120601-3.0.tar.gz"
-CHECKSUM_MD5="e50f6a7afb4de00c81650f7b1a0f5aea"
+CHECKSUM_SHA256="51f0f4b4a97b7ebab26e7b5c2564c47628cdb3042fd8ba8d0605c719d2541918"
 REVISION="1"
 ARCHITECTURES="x86_gcc2 x86 x86_64"
+SECONDARY_ARCHITECTURES="x86"
 
 PATCHES="libedit-2012_06_01_3.0.patch"
 
 PROVIDES="
-	libedit = $portVersion
-	lib:libedit = 0.0.41 compat >= 0
+	libedit$secondaryArchSuffix = $portVersion
+	lib:libedit$secondaryArchSuffix = 0.0.41 compat >= 0
 	"
 REQUIRES="
-	haiku >= $haikuVersion
-	lib:libncurses
+	haiku$secondaryArchSuffix >= $haikuVersion
+	lib:libncurses$secondaryArchSuffix
 	"
 BUILD_REQUIRES="
-	devel:libncurses
+	devel:libncurses$secondaryArchSuffix
 	"
 BUILD_PREREQUIRES="
-	haiku_devel >= $haikuVersion
+	haiku${secondaryArchSuffix}_devel >= $haikuVersion
 	cmd:aclocal
 	cmd:autoreconf
-	cmd:gcc
-	cmd:ld
+	cmd:gcc$secondaryArchSuffix
+	cmd:ld$secondaryArchSuffix
 	cmd:libtoolize
 	cmd:make
 	cmd:sed
@@ -63,9 +64,9 @@ INSTALL()
 # ----- devel package -------------------------------------------------------
 
 PROVIDES_devel="
-	libedit_devel = $portVersion
-	devel:libedit = 0.0.41 compat >= 0
+	libedit${secondaryArchSuffix}_devel = $portVersion
+	devel:libedit$secondaryArchSuffix = 0.0.41 compat >= 0
 	"
 REQUIRES_devel="
-	libedit == $portVersion base
+	libedit$secondaryArchSuffix == $portVersion base
 	"
diff --git a/dev-libs/libelf/libelf-0.8.13.recipe b/dev-libs/libelf/libelf-0.8.13.recipe
index 8184d88f7..6bf8245ee 100644
--- a/dev-libs/libelf/libelf-0.8.13.recipe
+++ b/dev-libs/libelf/libelf-0.8.13.recipe
@@ -8,7 +8,7 @@ compatible with it.
 "
 HOMEPAGE="http://www.mr511.de/software/english.html"
 SRC_URI="http://www.mr511.de/software/libelf-0.8.13.tar.gz"
-CHECKSUM_MD5="4136d7b4c04df68b686570afa26988ac"
+CHECKSUM_SHA256="591a9b4ec81c1f2042a97aa60564e0cb79d041c52faa7416acb38bc95bd2c76d"
 LICENSE="GNU LGPL v2"
 COPYRIGHT="1995-2008 Michael Riepe"
 REVISION="1"
diff --git a/dev-libs/libevent/libevent-1.4.14b.recipe b/dev-libs/libevent/libevent-1.4.14b.recipe
index 854e20439..c63da7b12 100644
--- a/dev-libs/libevent/libevent-1.4.14b.recipe
+++ b/dev-libs/libevent/libevent-1.4.14b.recipe
@@ -3,7 +3,7 @@ DESCRIPTION="The libevent API provides a mechanism to execute a callback functio
 libevent is meant to replace the event loop found in event driven network servers. An application just needs to call event_dispatch() and then add or remove events dynamically without having to change the event loop."
 HOMEPAGE="http://www.libevent.org/"
 SRC_URI="http://monkey.org/~provos/libevent-1.4.14b-stable.tar.gz"
-CHECKSUM_MD5="a00e037e4d3f9e4fe9893e8a2d27918c"
+CHECKSUM_SHA256="afa61b476a222ba43fc7cca2d24849ab0bbd940124400cb699915d3c60e46301"
 LICENSE="BSD (3-clause)"
 COPYRIGHT="2000-2007 Niels Provos, 2005 Nick Mathewson, and other contributors."
 
diff --git a/dev-libs/libevent/libevent-2.0.21.recipe b/dev-libs/libevent/libevent-2.0.21.recipe
index 1694fbb76..0bbaccf31 100644
--- a/dev-libs/libevent/libevent-2.0.21.recipe
+++ b/dev-libs/libevent/libevent-2.0.21.recipe
@@ -10,7 +10,7 @@ remove events dynamically without having to change the event loop.
 "
 HOMEPAGE="http://www.libevent.org/"
 SRC_URI="https://github.com/downloads/libevent/libevent/libevent-2.0.21-stable.tar.gz"
-CHECKSUM_MD5="b2405cc9ebf264aa47ff615d9de527a2"
+CHECKSUM_SHA256="22a530a8a5ba1cb9c080cba033206b17dacd21437762155c6d30ee6469f574f5"
 LICENSE="BSD (3-clause)"
 COPYRIGHT="2000-2007 Niels Provos, 2005 Nick Mathewson, and other contributors."
 
@@ -52,6 +52,7 @@ BUILD_PREREQUIRES="
 	cmd:aclocal
 	cmd:autoconf
 	cmd:automake
+	cmd:awk
 	cmd:gcc$secondaryArchSuffix
 	cmd:ld$secondaryArchSuffix
 	cmd:libtoolize
diff --git a/dev-libs/libffi/libffi-3.0.13.recipe b/dev-libs/libffi/libffi-3.0.13.recipe
index 5095715a4..c38b7cca6 100644
--- a/dev-libs/libffi/libffi-3.0.13.recipe
+++ b/dev-libs/libffi/libffi-3.0.13.recipe
@@ -4,7 +4,7 @@ A portable, high level programming interface to various calling conventions.
 "
 HOMEPAGE="http://sourceware.org/libffi" 
 SRC_URI="ftp://sourceware.org/pub/libffi/libffi-3.0.13.tar.gz"
-CHECKSUM_MD5="45f3b6dbc9ee7c7dfbbbc5feba571529"
+CHECKSUM_SHA256="1dddde1400c3bcb7749d398071af88c3e4754058d2d4c0b3696c2f82dc5cf11c"
 COPYRIGHT="1996-2013 Anthony Green, Red Hat, Inc and others."
 LICENSE="MIT"
 REVISION="1"
@@ -18,7 +18,7 @@ PROVIDES="
 	"
 
 REQUIRES="
-	haiku >= $haikuVersion
+	haiku$secondaryArchSuffix >= $haikuVersion
 	"
 
 BUILD_REQUIRES="
@@ -28,6 +28,7 @@ BUILD_PREREQUIRES="
 	haiku${secondaryArchSuffix}_devel >= $haikuVersion
 	cmd:gcc$secondaryArchSuffix
 	cmd:make
+	cmd:awk
 	"
 
 BUILD()
@@ -41,8 +42,8 @@ INSTALL()
 	make install
 
 	mkdir -p $includeDir
-	mv -f $libDir/$portVersionedName/include/*.h* $includeDir
-	rm -rf $libDir/$portVersionedName
+	mv -f $libDir/libffi-$portVersion/include/*.h* $includeDir
+	rm -rf $libDir/libffi-$portVersion
 	
 	prepareInstalledDevelLibs libffi
 	fixPkgconfig
diff --git a/dev-libs/libgcrypt/libgcrypt-1.5.3.recipe b/dev-libs/libgcrypt/libgcrypt-1.5.3.recipe
index dafd810d8..e618a82a1 100644
--- a/dev-libs/libgcrypt/libgcrypt-1.5.3.recipe
+++ b/dev-libs/libgcrypt/libgcrypt-1.5.3.recipe
@@ -6,7 +6,7 @@ LICENSE="GNU LGPL v3"
 COPYRIGHT="2000-2013 Free Software Foundation, Inc."
 HOMEPAGE="http://directory.fsf.org/project/libgcrypt/" 
 SRC_URI="ftp://ftp.gnupg.org/gcrypt/libgcrypt/libgcrypt-1.5.3.tar.bz2"
-CHECKSUM_MD5="993159b2924ae7b0e4eaff0743c2db35"
+CHECKSUM_SHA256="bcf5334e7da352c45de6aec5d2084ce9a1d30029ff4a4a5da13f1848874759d1"
 REVISION="1"
 ARCHITECTURES="x86"
 
diff --git a/dev-libs/libgpg_error/libgpg_error-1.12.recipe b/dev-libs/libgpg_error/libgpg_error-1.12.recipe
index c36798658..4a1311c1b 100644
--- a/dev-libs/libgpg_error/libgpg_error-1.12.recipe
+++ b/dev-libs/libgpg_error/libgpg_error-1.12.recipe
@@ -8,8 +8,8 @@ LICENSE="GNU LGPL v2.1"
 COPYRIGHT="2003-2013 g10 Code GmbH"
 HOMEPAGE="http://www.gnupg.org/related_software/libraries.en.html#lib-libgpg-error"
 SRC_URI="ftp://ftp.gnupg.org/gcrypt/libgpg-error/libgpg-error-1.12.tar.bz2"
+CHECKSUM_SHA256="cafc9ed6a87c53a35175d5a1220a96ca386696eef2fa059cc0306211f246e55f"
 REVISION="1"
-CHECKSUM_MD5="8f0eb41a344d19ac2aa9bd101dfb9ce6"
 ARCHITECTURES="x86"
 
 PROVIDES="
diff --git a/dev-libs/libiconv/libiconv-1.13.1.recipe b/dev-libs/libiconv/libiconv-1.13.1.recipe
index 2693709d4..fc79a1225 100644
--- a/dev-libs/libiconv/libiconv-1.13.1.recipe
+++ b/dev-libs/libiconv/libiconv-1.13.1.recipe
@@ -9,9 +9,9 @@ LICENSE="
 	"
 COPYRIGHT="2000-2009 Free Software Foundation, Inc."
 SRC_URI="http://ftp.gnu.org/pub/gnu/libiconv/libiconv-1.13.1.tar.gz"
-CHECKSUM_MD5="7ab33ebd26687c744a37264a330bbe9a"
+CHECKSUM_SHA256="55a36168306089009d054ccdd9d013041bfc3ab26be7033d107821f1c4949a49"
 REVISION="6"
-ARCHITECTURES="x86_gcc2 x86 x86_64"
+ARCHITECTURES="x86_gcc2 x86 x86_64 arm"
 SECONDARY_ARCHITECTURES="x86_gcc2 x86"
 
 PROVIDES="
diff --git a/dev-libs/libidl/libidl-0.6.8.recipe b/dev-libs/libidl/libidl-0.6.8.recipe
index 80788b342..af0895bf4 100644
--- a/dev-libs/libidl/libidl-0.6.8.recipe
+++ b/dev-libs/libidl/libidl-0.6.8.recipe
@@ -8,7 +8,7 @@ to be as reusable and portable as possible.
 "
 HOMEPAGE="http://andrewtv.org/libIDL/"
 SRC_URI="http://andrewtv.org/libIDL/libIDL-0.6.8.tar.gz"
-CHECKSUM_MD5="97e2da9229cdb0445719b6cf802c1782"
+CHECKSUM_SHA256="50e8f7674815e42a6e8be32610838d9b7da91b3043784d2b69d17b79c7203e7b"
 COPYRIGHT="1998-1999 Andrew T. Veliath"
 LICENSE="GNU LGPL v2"
 REVISION="1"
diff --git a/dev-libs/libidn/libidn-1.9.recipe b/dev-libs/libidn/libidn-1.9.recipe
index ddcd598ed..500642dcf 100644
--- a/dev-libs/libidn/libidn-1.9.recipe
+++ b/dev-libs/libidn/libidn-1.9.recipe
@@ -5,7 +5,7 @@ and IDNA specifications. Libidn's purpose is to encode and decode internationali
 "
 HOMEPAGE="http://www.gnu.org/software/libidn/"
 SRC_URI="http://ftpmirror.gnu.org/libidn/libidn-1.9.tar.gz"
-CHECKSUM_MD5="f4d794639564256a367566302611224e"
+CHECKSUM_SHA256="bd5d01e9e8b2d78b56828e7533a394239146cdca3965b4dd891508cbeb727470"
 
 ARCHITECTURES="x86_gcc2 x86 ?x86_64"
 SECONDARY_ARCHITECTURES="x86_gcc2 x86"
diff --git a/dev-libs/libpcre/libpcre-8.21.recipe b/dev-libs/libpcre/libpcre-8.21.recipe
index c062f62a0..a34e8ded8 100644
--- a/dev-libs/libpcre/libpcre-8.21.recipe
+++ b/dev-libs/libpcre/libpcre-8.21.recipe
@@ -14,7 +14,7 @@ COPYRIGHT="
 	2007-2011, Google Inc. All rights reserved.
 	"
 SRC_URI="http://sourceforge.net/projects/pcre/files/pcre/8.21/pcre-8.21.tar.bz2"
-CHECKSUM_MD5="0a7b592bea64b7aa7f4011fc7171a730"
+CHECKSUM_SHA256="a4b8509d11fc2764fb4e1415b764ad2c214459edc011ce48aeeb6bbe1ac599e3"
 REVISION="5"
 ARCHITECTURES="x86_gcc2 x86 x86_64"
 SECONDARY_ARCHITECTURES="x86 x86_gcc2"
diff --git a/dev-libs/libpcre/libpcre-8.33.recipe b/dev-libs/libpcre/libpcre-8.33.recipe
index 354ac78a7..d50c21a9b 100644
--- a/dev-libs/libpcre/libpcre-8.33.recipe
+++ b/dev-libs/libpcre/libpcre-8.33.recipe
@@ -14,7 +14,7 @@ COPYRIGHT="
 	2007-2011, Google Inc. All rights reserved.
 	"
 SRC_URI="ftp://ftp.csx.cam.ac.uk/pub/software/programming/pcre/pcre-8.33.tar.bz2"
-CHECKSUM_MD5="21514018448ac10062ece7a668fca949"
+CHECKSUM_SHA256="c603957a4966811c04af5f6048c71cfb4966ec93312d7b3118116ed9f3bc0478"
 REVISION="2"
 ARCHITECTURES="x86_gcc2 x86 x86_64"
 SECONDARY_ARCHITECTURES="x86 x86_gcc2"
diff --git a/dev-libs/libpcre/libpcre0-8.21.recipe b/dev-libs/libpcre/libpcre0-8.21.recipe
index e36e20b43..d9357b3fd 100644
--- a/dev-libs/libpcre/libpcre0-8.21.recipe
+++ b/dev-libs/libpcre/libpcre0-8.21.recipe
@@ -14,7 +14,7 @@ COPYRIGHT="
 	2007-2011, Google Inc. All rights reserved.
 	"
 SRC_URI="http://sourceforge.net/projects/pcre/files/pcre/8.21/pcre-8.21.tar.bz2"
-CHECKSUM_MD5="0a7b592bea64b7aa7f4011fc7171a730"
+CHECKSUM_SHA256="a4b8509d11fc2764fb4e1415b764ad2c214459edc011ce48aeeb6bbe1ac599e3"
 REVISION="6"
 ARCHITECTURES="x86_gcc2 x86 x86_64"
 SECONDARY_ARCHITECTURES="x86 x86_gcc2"
diff --git a/dev-libs/libpthread_stubs/libpthread_stubs-0.3.recipe b/dev-libs/libpthread_stubs/libpthread_stubs-0.3.recipe
index 63671d025..fdbd1df31 100644
--- a/dev-libs/libpthread_stubs/libpthread_stubs-0.3.recipe
+++ b/dev-libs/libpthread_stubs/libpthread_stubs-0.3.recipe
@@ -4,7 +4,7 @@ libpthread-stubs
 " 
 HOMEPAGE="http://xcb.freedesktop.org/" 
 SRC_URI="http://xcb.freedesktop.org/dist/libpthread-stubs-0.3.tar.gz"
-CHECKSUM_MD5="a09d928c4af54fe5436002345ef71138"
+CHECKSUM_SHA256="3031f466cf0b06de6b3ccbf2019d15c4fcf75229b7d226a711bc1885b3a82cde"
 REVISION="1"
 
 COPYRIGHT="2006 Diego Pettenò"
diff --git a/dev-libs/libsolv/libsolv-0.3.0_haiku_2013_10_01.recipe b/dev-libs/libsolv/libsolv-0.3.0_haiku_2013_10_01.recipe
index 1c16748c9..6347a39fa 100644
--- a/dev-libs/libsolv/libsolv-0.3.0_haiku_2013_10_01.recipe
+++ b/dev-libs/libsolv/libsolv-0.3.0_haiku_2013_10_01.recipe
@@ -1,13 +1,14 @@
 SUMMARY="A library for solving packages and reading repositories"
-DESCRIPTION="
-A Library for solving packages and reading repositories.
-"
+DESCRIPTION="A Library for solving packages and reading repositories."
 LICENSE="BSD (3-clause)"
 COPYRIGHT="2007-2013, Novell Inc."
 HOMEPAGE="http://github.com/openSUSE/libsolv"
-SRC_URI="git+git://github.com/weinhold/libsolv.git#01ed09a3e1f4637f72d4239fe3724fcafa39be94"
-REVISION="1"
-ARCHITECTURES="x86_gcc2 x86 x86_64"
+srcGitRev="01ed09a3e1f4637f72d4239fe3724fcafa39be94"
+SRC_URI="https://github.com/weinhold/libsolv/archive/$srcGitRev.tar.gz"
+CHECKSUM_SHA256="4e96208d44dc15ed7ac95a86f35790f34a2bb97c0f0aa3dc355263a54a6ea7e1"
+SRC_FILENAME="$portVersionedName.tar.gz"
+REVISION="2"
+ARCHITECTURES="x86_gcc2 x86 x86_64 ppc arm"
 SECONDARY_ARCHITECTURES="x86_gcc2 x86"
 
 PROVIDES="
@@ -33,6 +34,8 @@ BUILD_PREREQUIRES="
 	cmd:sed
 	"
 
+SOURCE_DIR="libsolv-$srcGitRev"
+
 PATCH()
 {
 	sed -i 's,${CMAKE_INSTALL_PREFIX}/bin',$binDir, CMakeLists.txt
diff --git a/dev-libs/libtar/libtar-1.2.20.recipe b/dev-libs/libtar/libtar-1.2.20.recipe
new file mode 100644
index 000000000..6bd5455df
--- /dev/null
+++ b/dev-libs/libtar/libtar-1.2.20.recipe
@@ -0,0 +1,81 @@
+SUMMARY="A C library for manipulating tar files."
+DESCRIPTION="
+libtar is a library for manipulating tar files from within C programs.
+Here are some of its features:
+
+  * Handles both POSIX tar file format and the GNU extensions.
+  * API provides functions for easy use, such as tar_extract_all().
+  * Also provides functions for more granular use, such as \
+tar_append_regfile().
+" 
+HOMEPAGE="http://repo.or.cz/w/libtar.git/" 
+SRC_URI="http://repo.or.cz/w/libtar.git/snapshot/0907a9034eaf2a57e8e4a9439f793f3f05d446cd.tar.gz"
+SRC_FILENAME="$portVersionedName.tar.gz"
+CHECKSUM_SHA256="d1b2660d0af735fed2d2a0c3369dda7bea7445a4b1ef2f2742b352b1e1eec5f8"
+REVISION="1"
+
+ARCHITECTURES="x86_gcc2 x86 x86_64"
+SECONDARY_ARCHITECTURES="x86_gcc2 x86"
+
+PROVIDES="
+	libtar${secondaryArchSuffix} = $portVersion
+	cmd:libtar
+	lib:libtar${secondaryArchSuffix} = 0.0.0 compat >= 0
+	"
+REQUIRES="
+	haiku${secondaryArchSuffix} >= $haikuVersion
+	"
+BUILD_REQUIRES="
+	haiku${secondaryArchSuffix}_devel >= $haikuVersion
+	"
+BUILD_PREREQUIRES="
+	cmd:cmake
+	cmd:make
+	cmd:gcc$secondaryArchSuffix
+	cmd:ld$secondaryArchSuffix
+	cmd:libtoolize
+	cmd:aclocal
+	cmd:autoconf
+	cmd:automake
+	cmd:autoheader
+	"
+
+SOURCE_DIR="$portName"
+
+BUILD()
+{
+	aclocal
+	libtoolize -fci
+	autoheader
+	automake --add-missing
+	autoconf
+	runConfigure ./configure
+	make $jobArgs
+}
+
+INSTALL()
+{
+	make install
+
+    prepareInstalledDevelLibs libtar
+    fixPkgconfig
+
+    # devel package
+    packageEntries devel \
+        $developDir
+}
+
+PROVIDES_devel="
+	libtar${secondaryArchSuffix}_devel = $portVersion
+	devel:libtar$secondaryArchSuffix = 0.0.0
+	"
+
+REQUIRES_devel="
+	libtar$secondaryArchSuffix == $portVersion base
+	"
+
+LICENSE="BSD (3-clause)"
+COPYRIGHT="
+	1998-2003  University of Illinois Board of Trustees
+	1998-2003  Mark D. Roth
+"
diff --git a/dev-libs/libxml2/libxml2-2.8.0.recipe b/dev-libs/libxml2/libxml2-2.8.0.recipe
index 199f4fb25..7f87250bd 100644
--- a/dev-libs/libxml2/libxml2-2.8.0.recipe
+++ b/dev-libs/libxml2/libxml2-2.8.0.recipe
@@ -3,7 +3,7 @@ HOMEPAGE="http://www.xmlsoft.org/"
 LICENSE="MIT"
 COPYRIGHT="1998-2003 Daniel Veillard.  All Rights Reserved."
 SRC_URI="ftp://xmlsoft.org/libxml2/libxml2-2.8.0.tar.gz"
-CHECKSUM_MD5="c62106f02ee00b6437f0fb9d370c1093"
+CHECKSUM_SHA256="f2e2d0e322685193d1affec83b21dc05d599e17a7306d7b90de95bb5b9ac622a"
 REVISION="7"
 ARCHITECTURES="x86_gcc2 x86 x86_64"
 SECONDARY_ARCHITECTURES="x86_gcc2 x86"
diff --git a/dev-libs/libxml2/libxml2-2.9.1.recipe b/dev-libs/libxml2/libxml2-2.9.1.recipe
index 9c374179c..b7a25eded 100644
--- a/dev-libs/libxml2/libxml2-2.9.1.recipe
+++ b/dev-libs/libxml2/libxml2-2.9.1.recipe
@@ -3,9 +3,9 @@ HOMEPAGE="http://www.xmlsoft.org/"
 LICENSE="MIT"
 COPYRIGHT="1998-2013 Daniel Veillard.  All Rights Reserved."
 SRC_URI="ftp://xmlsoft.org/libxml2/libxml2-2.9.1.tar.gz"
-CHECKSUM_MD5="9c0cfef285d5c4a5c80d00904ddab380"
-REVISION="1"
-ARCHITECTURES="!x86_gcc2 !x86 !x86_64"
+CHECKSUM_SHA256="fd3c64cb66f2c4ea27e934d275904d92cec494a8e8405613780cbc8a71680fdb"
+REVISION="2"
+ARCHITECTURES="!x86_gcc2 !x86 x86_64"
 SECONDARY_ARCHITECTURES="!x86_gcc2 !x86"
 
 PATCHES="libxml2-2.9.1.patchset"
diff --git a/dev-libs/libxslt/libxslt-1.1.28.recipe b/dev-libs/libxslt/libxslt-1.1.28.recipe
index 7ee4ccce9..747816d4b 100644
--- a/dev-libs/libxslt/libxslt-1.1.28.recipe
+++ b/dev-libs/libxslt/libxslt-1.1.28.recipe
@@ -3,7 +3,7 @@ HOMEPAGE="http://www.xmlsoft.org/"
 LICENSE="MIT"
 COPYRIGHT="2001-2002 Daniel Veillard.  All Rights Reserved."
 SRC_URI="ftp://xmlsoft.org/libxml2/libxslt-1.1.28.tar.gz"
-CHECKSUM_MD5="9667bf6f9310b957254fdcf6596600b7"
+CHECKSUM_SHA256="5fc7151a57b89c03d7b825df5a0fae0a8d5f05674c0e7cf2937ecec4d54a028c"
 REVISION="2"
 ARCHITECTURES="x86_gcc2 x86 x86_64"
 SECONDARY_ARCHITECTURES="x86_gcc2 x86 x86_64"
diff --git a/dev-libs/libzip/libzip-0.10.1.recipe b/dev-libs/libzip/libzip-0.10.1.recipe
index 4975d1381..10cae8a6e 100644
--- a/dev-libs/libzip/libzip-0.10.1.recipe
+++ b/dev-libs/libzip/libzip-0.10.1.recipe
@@ -2,7 +2,7 @@ SUMMARY="A C library for reading, creating, and modifying zip archives."
 DESCRIPTION="libzip is a C library for reading, creating, and modifying zip archives." 
 HOMEPAGE="http://www.nih.at/libzip/" 
 SRC_URI="http://www.nih.at/libzip/libzip-0.10.1.tar.bz2"
-CHECKSUM_MD5="d3e933ae049204badccf605f20aaecde"
+CHECKSUM_SHA256="5b1eaf60968cb22df49d73bcaa759961fb27451917ac76b275374c2ed260ce92"
 REVISION="1"
 
 ARCHITECTURES="x86_gcc2 x86 x86_64"
diff --git a/dev-libs/libzip/libzip-0.11.2.recipe b/dev-libs/libzip/libzip-0.11.2.recipe
index d4ae20650..b88c0d0d9 100644
--- a/dev-libs/libzip/libzip-0.11.2.recipe
+++ b/dev-libs/libzip/libzip-0.11.2.recipe
@@ -4,7 +4,7 @@ libzip is a C library for reading, creating, and modifying zip archives.
 " 
 HOMEPAGE="http://www.nih.at/libzip/" 
 SRC_URI="http://www.nih.at/libzip/libzip-0.11.2.tar.gz"
-CHECKSUM_MD5="c5437df15e4825d40cdc3ec8b9b7516c"
+CHECKSUM_SHA256="83db1fb43a961ff7d1d1b50e1c6bea09c67e6af867686d1fc92ecb7dc6cf98d5"
 REVISION="1"
 
 ARCHITECTURES="x86_gcc2 x86 x86_64"
diff --git a/dev-libs/lzo/lzo-2.06.recipe b/dev-libs/lzo/lzo-2.06.recipe
index 75ed95ee7..1798a7d80 100644
--- a/dev-libs/lzo/lzo-2.06.recipe
+++ b/dev-libs/lzo/lzo-2.06.recipe
@@ -22,7 +22,7 @@ LZO implements a number of algorithms with the following features:
 "
 HOMEPAGE="http://www.oberhumer.com/opensource/lzo/"
 SRC_URI="http://www.oberhumer.com/opensource/lzo/download/lzo-2.06.tar.gz"
-CHECKSUM_MD5="95380bd4081f85ef08c5209f4107e9f8"
+CHECKSUM_SHA256="ff79e6f836d62d3f86ef6ce893ed65d07e638ef4d3cb952963471b4234d43e73"
 REVISION="1"
 ARCHITECTURES="x86_gcc2 x86"
 SECONDARY_ARCHITECTURES="x86"
@@ -40,6 +40,7 @@ BUILD_PREREQUIRES="
 	haiku${secondaryArchSuffix}_devel >= $haikuVersion
 	cmd:gcc$secondaryArchSuffix
 	cmd:make
+	cmd:awk
 	"
 
 BUILD()
diff --git a/dev-libs/openssl/openssl-1.0.0d.recipe b/dev-libs/openssl/openssl-1.0.0d.recipe
index 9f940cc76..cdf43d957 100644
--- a/dev-libs/openssl/openssl-1.0.0d.recipe
+++ b/dev-libs/openssl/openssl-1.0.0d.recipe
@@ -15,7 +15,7 @@ conditions.
 "
 HOMEPAGE="http://www.openssl.org/"
 SRC_URI="http://www.openssl.org/source/openssl-1.0.0d.tar.gz"
-CHECKSUM_MD5="40b6ea380cc8a5bf9734c2f8bf7e701e"
+CHECKSUM_SHA256="92511d1f0caaa298dba250426f8e7d5d00b271847886d1adc62422778d6320db"
 LICENSE="OpenSSL"
 COPYRIGHT="
 	1995-1998 Eric Young
diff --git a/dev-libs/openssl/openssl-1.0.0j.recipe b/dev-libs/openssl/openssl-1.0.0j.recipe
index e10863f65..47c8745c0 100644
--- a/dev-libs/openssl/openssl-1.0.0j.recipe
+++ b/dev-libs/openssl/openssl-1.0.0j.recipe
@@ -15,14 +15,14 @@ conditions.
 "
 HOMEPAGE="http://www.openssl.org/"
 SRC_URI="http://www.openssl.org/source/openssl-1.0.0j.tar.gz"
-CHECKSUM_MD5="cbe4ac0d8f598680f68a951e04b0996b"
+CHECKSUM_SHA256="626fb8fcb3eb7e966edbe71553ff993d137f6e8a87b05051a3695e621098b8af"
 LICENSE="OpenSSL"
 COPYRIGHT="
 	1995-1998 Eric Young
 	1998-2012 The OpenSSL Project.
 	"
 REVISION="5"
-ARCHITECTURES="x86_gcc2 x86 x86_64"
+ARCHITECTURES="x86_gcc2 x86 x86_64 arm"
 SECONDARY_ARCHITECTURES="x86_gcc2 x86"
 
 PATCHES="openssl-1.0.0j.patch"
diff --git a/dev-libs/openssl/openssl-1.0.0l.recipe b/dev-libs/openssl/openssl-1.0.0l.recipe
new file mode 100644
index 000000000..0a3aeaeb7
--- /dev/null
+++ b/dev-libs/openssl/openssl-1.0.0l.recipe
@@ -0,0 +1,121 @@
+SUMMARY="Full-strength general purpose cryptography library (with SSL/TLS)"
+DESCRIPTION="
+The OpenSSL Project is a collaborative effort to develop a robust, \
+commercial-grade, full-featured, and Open Source toolkit implementing the \
+Secure Sockets Layer (SSL v2/v3) and Transport Layer Security (TLS v1) \
+protocols as well as a full-strength general purpose cryptography library. The \
+project is managed by a worldwide community of volunteers that use the \
+Internet to communicate, plan, and develop the OpenSSL toolkit and its related \
+documentation.
+OpenSSL is based on the excellent SSLeay library developed by Eric A. Young \
+and Tim J. Hudson. The OpenSSL toolkit is licensed under an Apache-style \
+licence, which basically means that you are free to get and use it for \
+commercial and non-commercial purposes subject to some simple license \
+conditions.
+"
+HOMEPAGE="http://www.openssl.org/"
+SRC_URI="http://www.openssl.org/source/openssl-$portVersion.tar.gz"
+CHECKSUM_SHA256="2a072e67d9e3ae900548c43d7936305ba576025bd083d1e91ff14d68ded1fdec"
+LICENSE="OpenSSL"
+COPYRIGHT="
+	1995-1998 Eric Young
+	1998-2012 The OpenSSL Project.
+	"
+REVISION="1"
+ARCHITECTURES="x86_gcc2 x86 x86_64 arm"
+SECONDARY_ARCHITECTURES="x86_gcc2 x86"
+
+PATCHES="openssl-$portVersion.patchset"
+
+PROVIDES="
+	openssl$secondaryArchSuffix = $portVersion compat >= 1.0.0
+	lib:libcrypto$secondaryArchSuffix = $portVersion compat >= 1.0.0
+	lib:libssl$secondaryArchSuffix = $portVersion compat >= 1.0.0
+	"
+if [ -z "$secondaryArchSuffix" ]; then
+	PROVIDES="$PROVIDES
+		cmd:c_rehash = $portVersion compat >= 1
+		cmd:openssl = $portVersion compat >= 1
+		"
+fi
+
+REQUIRES="
+	haiku$secondaryArchSuffix >= $haikuVersion
+	lib:libz$secondaryArchSuffix >= 1.2.3
+	"
+if [ -n "$secondaryArchSuffix" ]; then
+	REQUIRES="$REQUIRES
+		openssl == $portVersion base
+		"
+fi
+
+BUILD_REQUIRES="
+	devel:libz$secondaryArchSuffix >= 1.2.3
+	"
+BUILD_PREREQUIRES="
+	haiku${secondaryArchSuffix}_devel >= $haikuVersion
+	cmd:gcc${secondaryArchSuffix}
+	cmd:ld${secondaryArchSuffix}
+	cmd:make
+	cmd:perl >= 5
+	cmd:sed
+	"
+
+PATCH()
+{
+	# fix hard-coded perl path
+	sed -i 's,/usr/bin/perl,/bin/env perl,g' apps/tsget
+}
+
+BUILD()
+{
+	PERL="/bin/env perl" \
+	./config --prefix=$prefix --libdir=$relativeLibDir \
+		--openssldir=$dataRootDir/ssl \
+		zlib shared
+	make
+		# multi-job builds don't work correctly
+}
+
+INSTALL()
+{
+	make MANDIR=$manDir install
+
+	# move include dir to correct location
+	mkdir -p $(dirname $includeDir)
+	mv $prefix/include $includeDir
+
+	# prepare develop/lib
+	prepareInstalledDevelLibs libcrypto libssl
+	fixPkgconfig
+
+	# devel package
+	packageEntries devel \
+		$developDir \
+		$manDir/man3
+
+	# Remove stuff we don't need in the secondary architecture base package,
+	# since we make it depend on the primary package.
+	if [ -n "$secondaryArchSuffix" ]; then
+		rm -rf $prefix/bin
+		rm -rf $dataRootDir/ssl
+		rm -rf $documentationDir
+	fi
+}
+
+TEST()
+{
+	cd openssl-1.0.0j
+	make test
+}
+
+# ----- devel package -------------------------------------------------------
+
+PROVIDES_devel="
+	openssl${secondaryArchSuffix}_devel = $portVersion
+	devel:libcrypto${secondaryArchSuffix} = $portVersion compat >= 1.0.0
+	devel:libssl${secondaryArchSuffix} = $portVersion compat >= 1.0.0
+	"
+REQUIRES_devel="
+	openssl${secondaryArchSuffix} == $portVersion base
+	"
diff --git a/dev-libs/openssl/openssl-1.0.1e.recipe b/dev-libs/openssl/openssl-1.0.1g.recipe
similarity index 88%
rename from dev-libs/openssl/openssl-1.0.1e.recipe
rename to dev-libs/openssl/openssl-1.0.1g.recipe
index 4bc31bc28..fce0a8dc6 100644
--- a/dev-libs/openssl/openssl-1.0.1e.recipe
+++ b/dev-libs/openssl/openssl-1.0.1g.recipe
@@ -14,23 +14,23 @@ commercial and non-commercial purposes subject to some simple license \
 conditions.
 "
 HOMEPAGE="http://www.openssl.org/"
-SRC_URI="http://www.openssl.org/source/openssl-1.0.1e.tar.gz"
-CHECKSUM_MD5="66bf6f10f060d561929de96f9dfe5b8c"
+SRC_URI="http://www.openssl.org/source/openssl-1.0.1g.tar.gz"
+CHECKSUM_SHA256="53cb818c3b90e507a8348f4f5eaedb05d8bfe5358aabb508b7263cc670c3e028"
 LICENSE="OpenSSL"
 COPYRIGHT="
 	1995-1998 Eric Young
 	1998-2013 The OpenSSL Project.
 	"
-REVISION="5"
-ARCHITECTURES="?x86_gcc2 ?x86 ?x86_64"
-SECONDARY_ARCHITECTURES="?x86_gcc2 ?x86"
+REVISION="1"
+ARCHITECTURES="!x86_gcc2 !x86 !x86_64"
+SECONDARY_ARCHITECTURES="!x86_gcc2 !x86"
 
 PATCHES="openssl-1.0.1e.patchset"
 
 PROVIDES="
-	openssl$secondaryArchSuffix = $portVersion compat >= 1.0.1
-	lib:libcrypto$secondaryArchSuffix = $portVersion compat >= 1.0.1
-	lib:libssl$secondaryArchSuffix = $portVersion compat >= 1.0.1
+	openssl$secondaryArchSuffix = $portVersion compat >= 1.0.0
+	lib:libcrypto$secondaryArchSuffix = $portVersion compat >= 1.0.0
+	lib:libssl$secondaryArchSuffix = $portVersion compat >= 1.0.0
 	"
 if [ -z "$secondaryArchSuffix" ]; then
 	PROVIDES="$PROVIDES
diff --git a/dev-libs/openssl/patches/openssl-1.0.0l.patchset b/dev-libs/openssl/patches/openssl-1.0.0l.patchset
new file mode 100644
index 000000000..8b8e0ab62
--- /dev/null
+++ b/dev-libs/openssl/patches/openssl-1.0.0l.patchset
@@ -0,0 +1,579 @@
+From 4f6b8899f1231fbc3250dc17c63200007a51b2f5 Mon Sep 17 00:00:00 2001
+From: Jerome Duval <jerome.duval@gmail.com>
+Date: Thu, 15 May 2014 18:19:59 +0000
+Subject: import patch from 1.0.0j
+
+
+diff --git a/Configure b/Configure
+index cd849e3..0ff7727 100755
+--- a/Configure
++++ b/Configure
+@@ -583,6 +583,10 @@ my %table=(
+ "uClinux-dist","$ENV{'CC'}:\$(CFLAGS)::-D_REENTRANT::\$(LDFLAGS) \$(LDLIBS):BN_LLONG:::::::::::::::$ENV{'LIBSSL_dlfcn'}:linux-shared:-fPIC:-shared:.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR):$ENV{'RANLIB'}::",
+ "uClinux-dist64","$ENV{'CC'}:\$(CFLAGS)::-D_REENTRANT::\$(LDFLAGS) \$(LDLIBS):SIXTY_FOUR_BIT_LONG:::::::::::::::$ENV{'LIBSSL_dlfcn'}:linux-shared:-fPIC:-shared:.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR):$ENV{'RANLIB'}::",
+ 
++##### Haiku
++"haiku-x86",	"gcc:-DL_ENDIAN -O2 -fomit-frame-pointer -Wall::-D_REENTRANT::-lnetwork:BN_LLONG ${x86_gcc_des} ${x86_gcc_opts}:${x86_elf_asm}:dlfcn:haiku-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
++"haiku-x86_64",	"gcc:-m64 -DL_ENDIAN -O2 -Wall -DMD32_REG_T=int::-D_REENTRANT::-lnetwork:SIXTY_FOUR_BIT_LONG RC4_CHUNK DES_INT DES_UNROLL:${x86_64_asm}:elf:dlfcn:haiku-shared:-fPIC:-m64:.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR):::64",
++
+ );
+ 
+ my @MK1MF_Builds=qw(VC-WIN64I VC-WIN64A
+diff --git a/Makefile.shared b/Makefile.shared
+index e753f44..cce510f 100644
+--- a/Makefile.shared
++++ b/Makefile.shared
+@@ -594,10 +594,10 @@ symlink.hpux:
+ symlink.cygwin symlink.alpha-osf1 symlink.tru64 symlink.tru64-rpath symlink.beos:
+ 
+ # Compatibility targets
+-link_o.bsd-gcc-shared link_o.linux-shared link_o.gnu-shared: link_o.gnu
+-link_a.bsd-gcc-shared link_a.linux-shared link_a.gnu-shared: link_a.gnu
+-link_app.bsd-gcc-shared link_app.linux-shared link_app.gnu-shared: link_app.gnu
+-symlink.bsd-gcc-shared symlink.bsd-shared symlink.linux-shared symlink.gnu-shared: symlink.gnu
++link_o.bsd-gcc-shared link_o.linux-shared link_o.gnu-shared link_o.haiku-shared: link_o.gnu
++link_a.bsd-gcc-shared link_a.linux-shared link_a.gnu-shared link_a.haiku-shared: link_a.gnu
++link_app.bsd-gcc-shared link_app.linux-shared link_app.gnu-shared link_app.haiku-shared: link_app.gnu
++symlink.bsd-gcc-shared symlink.bsd-shared symlink.linux-shared symlink.gnu-shared symlink.haiku-shared: symlink.gnu
+ link_o.bsd-shared: link_o.bsd
+ link_a.bsd-shared: link_a.bsd
+ link_app.bsd-shared: link_app.bsd
+diff --git a/config b/config
+index 30e9a37..c2894cc 100755
+--- a/config
++++ b/config
+@@ -134,6 +134,14 @@ case "${SYSTEM}:${RELEASE}:${VERSION}:${MACHINE}" in
+ 	echo "${MACHINE}-dg-dgux"; exit 0
+ 	;;
+ 
++    Haiku:*:BePC)
++	echo "i586-pc-haiku"; exit 0
++	;;
++
++    Haiku:*:*)
++	echo "${MACHINE}-unknown-haiku"; exit 0
++	;;
++
+     HI-UX:*)
+ 	echo "${MACHINE}-hi-hiux"; exit 0
+ 	;;
+@@ -799,6 +807,9 @@ case "$GUESSOS" in
+ 	    options="$options no-asm"
+ 	fi
+ 	;;
++     i586-*-haiku) OUT="haiku-x86" ;;
++     x86_64-*-haiku) OUT="haiku-x86_64" ;;
++
+   # these are all covered by the catchall below
+   # *-dgux) OUT="dgux" ;;
+   mips-sony-newsos4) OUT="newsos4-gcc" ;;
+diff --git a/doc/apps/cms.pod b/doc/apps/cms.pod
+index a09588a..2d19d91 100644
+--- a/doc/apps/cms.pod
++++ b/doc/apps/cms.pod
+@@ -450,28 +450,28 @@ remains DER.
+ 
+ =over 4
+ 
+-=item 0
++=item C<0>
+ 
+ the operation was completely successfully.
+ 
+-=item 1 
++=item C<1>
+ 
+ an error occurred parsing the command options.
+ 
+-=item 2
++=item C<2>
+ 
+ one of the input files could not be read.
+ 
+-=item 3
++=item C<3>
+ 
+ an error occurred creating the CMS file or when reading the MIME
+ message.
+ 
+-=item 4
++=item C<4>
+ 
+ an error occurred decrypting or verifying the message.
+ 
+-=item 5
++=item C<5>
+ 
+ the message was verified correctly but an error occurred writing out
+ the signers certificates.
+diff --git a/doc/apps/genpkey.pod b/doc/apps/genpkey.pod
+index 1611b5c..c74d097 100644
+--- a/doc/apps/genpkey.pod
++++ b/doc/apps/genpkey.pod
+@@ -114,6 +114,8 @@ hexadecimal value if preceded by B<0x>. Default value is 65537.
+ 
+ The number of bits in the generated parameters. If not specified 1024 is used.
+ 
++=back
++
+ =head1 DH PARAMETER GENERATION OPTIONS
+ 
+ =over 4
+diff --git a/doc/apps/openssl.pod b/doc/apps/openssl.pod
+index 738142e..64a160c 100644
+--- a/doc/apps/openssl.pod
++++ b/doc/apps/openssl.pod
+@@ -287,8 +287,6 @@ SHA Digest
+ 
+ SHA-1 Digest
+ 
+-=back
+-
+ =item B<sha224>
+ 
+ SHA-224 Digest
+@@ -305,6 +303,8 @@ SHA-384 Digest
+ 
+ SHA-512 Digest
+ 
++=back
++
+ =head2 ENCODING AND CIPHER COMMANDS
+ 
+ =over 10
+diff --git a/doc/apps/smime.pod b/doc/apps/smime.pod
+index e4e89af..72c7b24 100644
+--- a/doc/apps/smime.pod
++++ b/doc/apps/smime.pod
+@@ -308,28 +308,28 @@ remains DER.
+ 
+ =over 4
+ 
+-=item 0
++=item C<0>
+ 
+ the operation was completely successfully.
+ 
+-=item 1 
++=item C<1>
+ 
+ an error occurred parsing the command options.
+ 
+-=item 2
++=item C<2>
+ 
+ one of the input files could not be read.
+ 
+-=item 3
++=item C<3>
+ 
+ an error occurred creating the PKCS#7 file or when reading the MIME
+ message.
+ 
+-=item 4
++=item C<4>
+ 
+ an error occurred decrypting or verifying the message.
+ 
+-=item 5
++=item C<5>
+ 
+ the message was verified correctly but an error occurred writing out
+ the signers certificates.
+diff --git a/doc/ssl/SSL_COMP_add_compression_method.pod b/doc/ssl/SSL_COMP_add_compression_method.pod
+index 42fa66b..80175a3 100644
+--- a/doc/ssl/SSL_COMP_add_compression_method.pod
++++ b/doc/ssl/SSL_COMP_add_compression_method.pod
+@@ -53,11 +53,11 @@ SSL_COMP_add_compression_method() may return the following values:
+ 
+ =over 4
+ 
+-=item 0
++=item C<0>
+ 
+ The operation succeeded.
+ 
+-=item 1
++=item C<1>
+ 
+ The operation failed. Check the error queue to find out the reason.
+ 
+diff --git a/doc/ssl/SSL_CTX_add_session.pod b/doc/ssl/SSL_CTX_add_session.pod
+index 82676b2..fd927f8 100644
+--- a/doc/ssl/SSL_CTX_add_session.pod
++++ b/doc/ssl/SSL_CTX_add_session.pod
+@@ -52,13 +52,13 @@ The following values are returned by all functions:
+ 
+ =over 4
+ 
+-=item 0
++=item C<0>
+ 
+  The operation failed. In case of the add operation, it was tried to add
+  the same (identical) session twice. In case of the remove operation, the
+  session was not found in the cache.
+ 
+-=item 1
++=item C<1>
+  
+  The operation succeeded.
+ 
+diff --git a/doc/ssl/SSL_CTX_load_verify_locations.pod b/doc/ssl/SSL_CTX_load_verify_locations.pod
+index 84a799f..de01065 100644
+--- a/doc/ssl/SSL_CTX_load_verify_locations.pod
++++ b/doc/ssl/SSL_CTX_load_verify_locations.pod
+@@ -100,13 +100,13 @@ The following return values can occur:
+ 
+ =over 4
+ 
+-=item 0
++=item C<0>
+ 
+ The operation failed because B<CAfile> and B<CApath> are NULL or the
+ processing at one of the locations specified failed. Check the error
+ stack to find out the reason.
+ 
+-=item 1
++=item C<1>
+ 
+ The operation succeeded.
+ 
+diff --git a/doc/ssl/SSL_CTX_set_client_CA_list.pod b/doc/ssl/SSL_CTX_set_client_CA_list.pod
+index 5e66133..bcf35dc 100644
+--- a/doc/ssl/SSL_CTX_set_client_CA_list.pod
++++ b/doc/ssl/SSL_CTX_set_client_CA_list.pod
+@@ -66,13 +66,13 @@ values:
+ 
+ =over 4
+ 
+-=item 0
++=item C<0>
+ 
+ A failure while manipulating the STACK_OF(X509_NAME) object occurred or
+ the X509_NAME could not be extracted from B<cacert>. Check the error stack
+ to find out the reason.
+ 
+-=item 1
++=item C<1>
+ 
+ The operation succeeded.
+ 
+diff --git a/doc/ssl/SSL_CTX_set_session_id_context.pod b/doc/ssl/SSL_CTX_set_session_id_context.pod
+index 58fc685..ed0a81c 100644
+--- a/doc/ssl/SSL_CTX_set_session_id_context.pod
++++ b/doc/ssl/SSL_CTX_set_session_id_context.pod
+@@ -64,13 +64,13 @@ return the following values:
+ 
+ =over 4
+ 
+-=item 0
++=item C<0>
+ 
+ The length B<sid_ctx_len> of the session id context B<sid_ctx> exceeded
+ the maximum allowed length of B<SSL_MAX_SSL_SESSION_ID_LENGTH>. The error
+ is logged to the error stack.
+ 
+-=item 1
++=item C<1>
+ 
+ The operation succeeded.
+ 
+diff --git a/doc/ssl/SSL_CTX_set_ssl_version.pod b/doc/ssl/SSL_CTX_set_ssl_version.pod
+index 254f2b4..5ea8f0d 100644
+--- a/doc/ssl/SSL_CTX_set_ssl_version.pod
++++ b/doc/ssl/SSL_CTX_set_ssl_version.pod
+@@ -42,11 +42,11 @@ and SSL_set_ssl_method():
+ 
+ =over 4
+ 
+-=item 0
++=item C<0>
+ 
+ The new choice failed, check the error stack to find out the reason.
+ 
+-=item 1
++=item C<1>
+ 
+ The operation succeeded.
+ 
+diff --git a/doc/ssl/SSL_CTX_use_psk_identity_hint.pod b/doc/ssl/SSL_CTX_use_psk_identity_hint.pod
+index 7e60df5..721e884 100644
+--- a/doc/ssl/SSL_CTX_use_psk_identity_hint.pod
++++ b/doc/ssl/SSL_CTX_use_psk_identity_hint.pod
+@@ -83,6 +83,8 @@ Return values from the server callback are interpreted as follows:
+ 
+ =over 4
+ 
++=over
++
+ =item > 0
+ 
+ PSK identity was found and the server callback has provided the PSK
+diff --git a/doc/ssl/SSL_clear.pod b/doc/ssl/SSL_clear.pod
+index d4df1bf..2da0b02 100644
+--- a/doc/ssl/SSL_clear.pod
++++ b/doc/ssl/SSL_clear.pod
+@@ -56,12 +56,12 @@ The following return values can occur:
+ 
+ =over 4
+ 
+-=item 0
++=item C<0>
+ 
+ The SSL_clear() operation could not be performed. Check the error stack to
+ find out the reason.
+ 
+-=item 1
++=item C<1>
+ 
+ The SSL_clear() operation was successful.
+ 
+diff --git a/doc/ssl/SSL_read.pod b/doc/ssl/SSL_read.pod
+index 7038cd2..3982b81 100644
+--- a/doc/ssl/SSL_read.pod
++++ b/doc/ssl/SSL_read.pod
+@@ -86,7 +86,7 @@ The following return values can occur:
+ The read operation was successful; the return value is the number of
+ bytes actually read from the TLS/SSL connection.
+ 
+-=item 0
++=item C<0>
+ 
+ The read operation was not successful. The reason may either be a clean
+ shutdown due to a "close notify" alert sent by the peer (in which case
+diff --git a/doc/ssl/SSL_session_reused.pod b/doc/ssl/SSL_session_reused.pod
+index da7d062..033d54c 100644
+--- a/doc/ssl/SSL_session_reused.pod
++++ b/doc/ssl/SSL_session_reused.pod
+@@ -27,11 +27,11 @@ The following return values can occur:
+ 
+ =over 4
+ 
+-=item 0
++=item C<0>
+ 
+ A new session was negotiated.
+ 
+-=item 1
++=item C<1>
+ 
+ A session was reused.
+ 
+diff --git a/doc/ssl/SSL_set_fd.pod b/doc/ssl/SSL_set_fd.pod
+index 7029112..59e1b2b 100644
+--- a/doc/ssl/SSL_set_fd.pod
++++ b/doc/ssl/SSL_set_fd.pod
+@@ -35,11 +35,11 @@ The following return values can occur:
+ 
+ =over 4
+ 
+-=item 0
++=item C<0>
+ 
+ The operation failed. Check the error stack to find out why.
+ 
+-=item 1
++=item C<1>
+ 
+ The operation succeeded.
+ 
+diff --git a/doc/ssl/SSL_set_session.pod b/doc/ssl/SSL_set_session.pod
+index 5f54714..d35e6d3 100644
+--- a/doc/ssl/SSL_set_session.pod
++++ b/doc/ssl/SSL_set_session.pod
+@@ -37,11 +37,11 @@ The following return values can occur:
+ 
+ =over 4
+ 
+-=item 0
++=item C<0>
+ 
+ The operation failed; check the error stack to find out the reason.
+ 
+-=item 1
++=item C<1>
+ 
+ The operation succeeded.
+ 
+diff --git a/doc/ssl/SSL_write.pod b/doc/ssl/SSL_write.pod
+index e013c12..30f9e2b 100644
+--- a/doc/ssl/SSL_write.pod
++++ b/doc/ssl/SSL_write.pod
+@@ -79,7 +79,7 @@ The following return values can occur:
+ The write operation was successful, the return value is the number of
+ bytes actually written to the TLS/SSL connection.
+ 
+-=item 0
++=item C<0>
+ 
+ The write operation was not successful. Probably the underlying connection
+ was closed. Call SSL_get_error() with the return value B<ret> to find out,
+-- 
+1.8.3.4
+
+
+From 0c4539d72e181675fcc7bd1fdbf3d5ebabed2d51 Mon Sep 17 00:00:00 2001
+From: Jerome Duval <jerome.duval@gmail.com>
+Date: Thu, 15 May 2014 19:58:00 +0000
+Subject: doc fixes
+
+
+diff --git a/doc/ssl/SSL_CTX_use_psk_identity_hint.pod b/doc/ssl/SSL_CTX_use_psk_identity_hint.pod
+index 721e884..d2644c6 100644
+--- a/doc/ssl/SSL_CTX_use_psk_identity_hint.pod
++++ b/doc/ssl/SSL_CTX_use_psk_identity_hint.pod
+@@ -98,7 +98,7 @@ data to B<psk> and return the length of the random data, so the
+ connection will fail with decryption_error before it will be finished
+ completely.
+ 
+-=item 0
++=item C<0>
+ 
+ PSK identity was not found. An "unknown_psk_identity" alert message
+ will be sent and the connection setup fails.
+-- 
+1.8.3.4
+
+
+From 94e239bab7b08aef02831852932696e7e472ea9f Mon Sep 17 00:00:00 2001
+From: Jerome Duval <jerome.duval@gmail.com>
+Date: Thu, 15 May 2014 20:16:41 +0000
+Subject: doc fixes
+
+
+diff --git a/doc/ssl/SSL_CTX_use_psk_identity_hint.pod b/doc/ssl/SSL_CTX_use_psk_identity_hint.pod
+index d2644c6..45f1ed5 100644
+--- a/doc/ssl/SSL_CTX_use_psk_identity_hint.pod
++++ b/doc/ssl/SSL_CTX_use_psk_identity_hint.pod
+@@ -83,8 +83,6 @@ Return values from the server callback are interpreted as follows:
+ 
+ =over 4
+ 
+-=over
+-
+ =item > 0
+ 
+ PSK identity was found and the server callback has provided the PSK
+-- 
+1.8.3.4
+
+
+From 5c9a621eef12a8bb020f7994014cd34d97daee0d Mon Sep 17 00:00:00 2001
+From: Jerome Duval <jerome.duval@gmail.com>
+Date: Thu, 15 May 2014 20:26:29 +0000
+Subject: doc fixes
+
+
+diff --git a/doc/ssl/SSL_accept.pod b/doc/ssl/SSL_accept.pod
+index b1c34d1..288203f 100644
+--- a/doc/ssl/SSL_accept.pod
++++ b/doc/ssl/SSL_accept.pod
+@@ -44,13 +44,13 @@ The following return values can occur:
+ 
+ =over 4
+ 
+-=item 0
++=item C<0>
+ 
+ The TLS/SSL handshake was not successful but was shut down controlled and
+ by the specifications of the TLS/SSL protocol. Call SSL_get_error() with the
+ return value B<ret> to find out the reason.
+ 
+-=item 1
++=item C<1>
+ 
+ The TLS/SSL handshake was successfully completed, a TLS/SSL connection has been
+ established.
+-- 
+1.8.3.4
+
+
+From 282293a280a46d39cfecb786c45749e6532392b9 Mon Sep 17 00:00:00 2001
+From: Jerome Duval <jerome.duval@gmail.com>
+Date: Thu, 15 May 2014 20:40:45 +0000
+Subject: doc fixes
+
+
+diff --git a/doc/ssl/SSL_connect.pod b/doc/ssl/SSL_connect.pod
+index 946ca89..e62a838 100644
+--- a/doc/ssl/SSL_connect.pod
++++ b/doc/ssl/SSL_connect.pod
+@@ -41,13 +41,13 @@ The following return values can occur:
+ 
+ =over 4
+ 
+-=item 0
++=item C<0>
+ 
+ The TLS/SSL handshake was not successful but was shut down controlled and
+ by the specifications of the TLS/SSL protocol. Call SSL_get_error() with the
+ return value B<ret> to find out the reason.
+ 
+-=item 1
++=item C<1>
+ 
+ The TLS/SSL handshake was successfully completed, a TLS/SSL connection has been
+ established.
+diff --git a/doc/ssl/SSL_do_handshake.pod b/doc/ssl/SSL_do_handshake.pod
+index 7f8cf24..88947ca 100644
+--- a/doc/ssl/SSL_do_handshake.pod
++++ b/doc/ssl/SSL_do_handshake.pod
+@@ -45,13 +45,13 @@ The following return values can occur:
+ 
+ =over 4
+ 
+-=item 0
++=item C<0>
+ 
+ The TLS/SSL handshake was not successful but was shut down controlled and
+ by the specifications of the TLS/SSL protocol. Call SSL_get_error() with the
+ return value B<ret> to find out the reason.
+ 
+-=item 1
++=item C<1>
+ 
+ The TLS/SSL handshake was successfully completed, a TLS/SSL connection has been
+ established.
+diff --git a/doc/ssl/SSL_set_shutdown.pod b/doc/ssl/SSL_set_shutdown.pod
+index 011a022..9139211 100644
+--- a/doc/ssl/SSL_set_shutdown.pod
++++ b/doc/ssl/SSL_set_shutdown.pod
+@@ -24,7 +24,7 @@ The shutdown state of an ssl connection is a bitmask of:
+ 
+ =over 4
+ 
+-=item 0
++=item C<0>
+ 
+ No shutdown setting, yet.
+ 
+diff --git a/doc/ssl/SSL_shutdown.pod b/doc/ssl/SSL_shutdown.pod
+index 42a89b7..d86ac7c 100644
+--- a/doc/ssl/SSL_shutdown.pod
++++ b/doc/ssl/SSL_shutdown.pod
+@@ -92,19 +92,19 @@ The following return values can occur:
+ 
+ =over 4
+ 
+-=item 0
++=item C<0>
+ 
+ The shutdown is not yet finished. Call SSL_shutdown() for a second time,
+ if a bidirectional shutdown shall be performed.
+ The output of L<SSL_get_error(3)|SSL_get_error(3)> may be misleading, as an
+ erroneous SSL_ERROR_SYSCALL may be flagged even though no error occurred.
+ 
+-=item 1
++=item C<1>
+ 
+ The shutdown was successfully completed. The "close notify" alert was sent
+ and the peer's "close notify" alert was received.
+ 
+-=item -1
++=item C<-1>
+ 
+ The shutdown was not successful because a fatal error occurred either
+ at the protocol level or a connection failure occurred. It can also occur if
+-- 
+1.8.3.4
+
diff --git a/dev-libs/uriparser/uriparser-0.7.9.recipe b/dev-libs/uriparser/uriparser-0.7.9.recipe
index 3bc01fff9..03e067273 100644
--- a/dev-libs/uriparser/uriparser-0.7.9.recipe
+++ b/dev-libs/uriparser/uriparser-0.7.9.recipe
@@ -4,7 +4,7 @@ Uriparser is a strictly RFC 3986 compliant URI parsing library in C.
 " 
 HOMEPAGE="http://uriparser.sourceforge.net/" 
 SRC_URI="http://downloads.sourceforge.net/project/uriparser/Sources/0.7.9/uriparser-0.7.9.tar.bz2"
-CHECKSUM_MD5="d9189834b909df8d672ecafc34186a58"
+CHECKSUM_SHA256="a1d8f1007757ca1cf68b49edbac50876100cdee23a54cf1214f257b9ce51100d"
 LICENSE="BSD (3-clause)"
 COPYRIGHT="2007 Weijia Song
 	2007-2008 Sebastian Pipping"
diff --git a/dev-perl/html_parser/html_parser-3.70.recipe b/dev-perl/html_parser/html_parser-3.70.recipe
index d6cff8476..746baa915 100644
--- a/dev-perl/html_parser/html_parser-3.70.recipe
+++ b/dev-perl/html_parser/html_parser-3.70.recipe
@@ -3,9 +3,9 @@
 SUMMARY="Encode or decode strings with HTML entities"
 HOMEPAGE="http://search.cpan.org/~gaas/HTML-Parser/"
 SRC_URI="http://search.cpan.org/CPAN/authors/id/G/GA/GAAS/HTML-Parser-3.70.tar.gz"
+CHECKSUM_SHA256="a9a18c79b1d2b315daedafe7598dc1068d562eaeaa5bd46265a6ebd2805446c1"
 REVISION="1"
 ARCHITECTURES="x86 x86_gcc2"
-CHECKSUM_MD5="efe7699f5ece3a230d730a3682359c08"
 PROVIDES="
 	html_parser = $portVersion
 	"
diff --git a/dev-perl/xml_parser/xml_parser-2.36.recipe b/dev-perl/xml_parser/xml_parser-2.36.recipe
index 3bbd70cec..67a5fcad6 100644
--- a/dev-perl/xml_parser/xml_parser-2.36.recipe
+++ b/dev-perl/xml_parser/xml_parser-2.36.recipe
@@ -4,8 +4,8 @@ XML-Parser - A perl module for parsing XML documents.
 "
 HOMEPAGE="http://search.cpan.org/~msergeant/XML-Parser-2.36/"
 SRC_URI="http://search.cpan.org/CPAN/authors/id/M/MS/MSERGEANT/XML-Parser-2.36.tar.gz"
+CHECKSUM_SHA256="9fd529867402456bd826fe0e5588d35b3a2e27e586a2fd838d1352b71c2ed73f"
 REVISION="1"
-CHECKSUM_MD5="1b868962b658bd87e1563ecd56498ded"
 COPYRIGHT="1998-2000 Larry Wall and Clark Cooper. All rights reserved."
 LICENSE="Artistic (Perl)"
 
diff --git a/dev-python/docutils/docutils-0.11.recipe b/dev-python/docutils/docutils-0.11.recipe
index 88d45fbb0..5d0125c4a 100644
--- a/dev-python/docutils/docutils-0.11.recipe
+++ b/dev-python/docutils/docutils-0.11.recipe
@@ -7,7 +7,7 @@ use, what-you-see-is-what-you-get plaintext markup language.
 "
 HOMEPAGE="http://docutils.sourceforge.net/"
 SRC_URI="http://sourceforge.net/projects/docutils/files/docutils/0.11/docutils-0.11.tar.gz"
-CHECKSUM_MD5="20ac380a18b369824276864d98ec0ad6"
+CHECKSUM_SHA256="9af4166adf364447289c5c697bb83c52f1d6f57e77849abcccd6a4a18a5e7ec9"
 COPYRIGHT="Günter Milde
 	John Gruber
 	Alex Fernández"
diff --git a/dev-python/dulwich/dulwich-0.9.1.recipe b/dev-python/dulwich/dulwich-0.9.1.recipe
index c33f62c28..a0ff8b3e4 100644
--- a/dev-python/dulwich/dulwich-0.9.1.recipe
+++ b/dev-python/dulwich/dulwich-0.9.1.recipe
@@ -6,7 +6,7 @@ extensions can be built for improved performance.
 "
 HOMEPAGE="http://www.samba.org/~jelmer/dulwich/"
 SRC_URI="https://pypi.python.org/packages/source/d/dulwich/dulwich-0.9.1.tar.gz"
-CHECKSUM_MD5="9a69b441d681e257b231321f8de6a110"
+CHECKSUM_SHA256="e9f69677b7428c57f6260f1876f075057c7e24907979b4da6e5fcad3c6852545"
 LICENSE="GNU GPL v2"
 COPYRIGHT="2008-2013 Jelmer Vernooij"
 REVISION="1"
diff --git a/dev-python/dulwich/dulwich-0.9.4.recipe b/dev-python/dulwich/dulwich-0.9.4.recipe
index 5f332140b..c93b166fa 100644
--- a/dev-python/dulwich/dulwich-0.9.4.recipe
+++ b/dev-python/dulwich/dulwich-0.9.4.recipe
@@ -6,7 +6,7 @@ extensions can be built for improved performance.
 "
 HOMEPAGE="http://www.samba.org/~jelmer/dulwich/"
 SRC_URI="https://pypi.python.org/packages/source/d/dulwich/dulwich-0.9.4.tar.gz"
-CHECKSUM_MD5="35209870f231cafe3f5a6c7c1daa3d20"
+CHECKSUM_SHA256="1cd555533d9a5cc319f5c68e21e31be190104ee1be5b5d3899a8a522e924b3fc"
 LICENSE="GNU GPL v2"
 COPYRIGHT="2008-2013 Jelmer Vernooij"
 REVISION="1"
diff --git a/dev-python/iniparse/iniparse-0.4.recipe b/dev-python/iniparse/iniparse-0.4.recipe
index a0b0d0378..a07bc555b 100644
--- a/dev-python/iniparse/iniparse-0.4.recipe
+++ b/dev-python/iniparse/iniparse-0.4.recipe
@@ -17,7 +17,7 @@ in applications like image galleries.
 "
 HOMEPAGE="http://code.google.com/p/iniparse/"
 SRC_URI="http://iniparse.googlecode.com/files/iniparse-0.4.tar.gz"
-CHECKSUM_MD5="5e573e9e9733d97623881ce9bbe5eca6"
+CHECKSUM_SHA256="abc1ee12d2cfb2506109072d6c21e40b6c75a3fe90a9c924327d80bc0d99c054"
 COPYRIGHT="2001-2008 Python Software Foundation
 2004-2009 Paramjit Oberoi
 2007 Tim Lauridsen"
diff --git a/dev-python/ordereddict/ordereddict-1.1.recipe b/dev-python/ordereddict/ordereddict-1.1.recipe
index e29d3c18d..68eb1e0dd 100644
--- a/dev-python/ordereddict/ordereddict-1.1.recipe
+++ b/dev-python/ordereddict/ordereddict-1.1.recipe
@@ -6,7 +6,7 @@ insertion/deletion/lookup and O(n) iteration/repr/copy/equality_testing).
 "
 HOMEPAGE="https://pypi.python.org/pypi/ordereddict"
 SRC_URI="https://pypi.python.org/packages/source/o/ordereddict/ordereddict-1.1.tar.gz"
-CHECKSUM_MD5="a0ed854ee442051b249bfad0f638bbec"
+CHECKSUM_SHA256="1c35b4ac206cef2d24816c89f89cf289dd3d38cf7c449bb3fab7bf6d43f01b1f"
 COPYRIGHT="2009 Raymond Hettinger"
 LICENSE="MIT"
 REVISION="1"
diff --git a/dev-python/pygments/pygments-1.6.recipe b/dev-python/pygments/pygments-1.6.recipe
index 63f48b4f1..833272325 100644
--- a/dev-python/pygments/pygments-1.6.recipe
+++ b/dev-python/pygments/pygments-1.6.recipe
@@ -14,7 +14,7 @@ ANSI sequences
 "
 HOMEPAGE="http://pygments.org/"
 SRC_URI="https://pypi.python.org/packages/source/P/Pygments/Pygments-1.6.tar.gz"
-CHECKSUM_MD5="a18feedf6ffd0b0cc8c8b0fbdb2027b1"
+CHECKSUM_SHA256="799ed4caf77516e54440806d8d9cd82a7607dfdf4e4fb643815171a4b5c921c0"
 COPYRIGHT="2006-2013 by the Pygments team, see AUTHORS"
 LICENSE="BSD (2-clause)"
 REVISION="1"
diff --git a/dev-python/setuptools/setuptools-0.6.recipe b/dev-python/setuptools/setuptools-0.6.recipe
deleted file mode 100644
index 36e7f49f0..000000000
--- a/dev-python/setuptools/setuptools-0.6.recipe
+++ /dev/null
@@ -1,28 +0,0 @@
-DESCRIPTION="
-Download, build, install, upgrade, and uninstall Python packages -- easily!
-"
-HOMEPAGE="http://pypi.python.org/pypi/setuptools"
-SRC_URI="http://pypi.python.org/packages/source/s/setuptools/setuptools-0.6c11.tar.gz"
-REVISION="1"
-STATUS_HAIKU="stable"
-DEPEND=""
-CHECKSUM_MD5="7df2a529a074f613b509fb44feefe74e"
-
-BUILD()
-{
-	cd setuptools-0.6c11
-	python setup.py build
-}
-
-INSTALL()
-{
-	cd setuptools-0.6c11
-	if [ -n "${DESTDIR}" ];then
-		python setup.py install --root=${DESTDIR}
-	else
-		python setup.py install
-	fi
-}
-
-LICENSE="Python"
-COPYRIGHT="2009, Phillip J. Eby"
diff --git a/dev-python/setuptools/setuptools-0.6c11.recipe b/dev-python/setuptools/setuptools-0.6c11.recipe
new file mode 100644
index 000000000..6bbaeaca5
--- /dev/null
+++ b/dev-python/setuptools/setuptools-0.6c11.recipe
@@ -0,0 +1,31 @@
+SUMMARY="Download, build, (un)install, upgrade, Python packages"
+DESCRIPTION="
+Download, build, install, upgrade, and uninstall Python packages -- easily!
+"
+HOMEPAGE="http://pypi.python.org/pypi/setuptools"
+SRC_URI="https://pypi.python.org/packages/source/s/setuptools/setuptools-$portVersion.tar.gz"
+CHECKSUM_SHA256="630fea9b726320b73ee3ca6ff61732cb32675b0389be658080fe46383b87a1d3"
+REVISION="1"
+
+ARCHITECTURES="!x86_gcc2"
+
+PROVIDES="
+	$portName = $portVersion
+	"
+
+BUILD_PREREQUIRES="
+	cmd:python
+	"
+
+BUILD()
+{
+	python setup.py build
+}
+
+INSTALL()
+{
+	python setup.py install --root=$portDir
+}
+
+LICENSE="Python"
+COPYRIGHT="2009-2014, Phillip J. Eby"
diff --git a/dev-python/setuptools/setuptools-3.3.recipe b/dev-python/setuptools/setuptools-3.3.recipe
new file mode 100644
index 000000000..f2389aa7f
--- /dev/null
+++ b/dev-python/setuptools/setuptools-3.3.recipe
@@ -0,0 +1,31 @@
+SUMMARY="Download, build, (un)install, upgrade, Python packages"
+DESCRIPTION="
+Download, build, install, upgrade, and uninstall Python packages -- easily!
+"
+HOMEPAGE="http://pypi.python.org/pypi/setuptools"
+SRC_URI="https://pypi.python.org/packages/source/s/setuptools/setuptools-$portVersion.tar.gz"
+CHECKSUM_SHA256="f3e6155f9bb62bfd59b7f6cc2ecda21aae903e6b585f8bc55e801609c5f7814f"
+REVISION="1"
+
+ARCHITECTURES="!x86_gcc2"
+
+PROVIDES="
+	$portName = $portVersion
+	"
+
+BUILD_PREREQUIRES="
+	cmd:python
+	"
+
+BUILD()
+{
+	python setup.py build
+}
+
+INSTALL()
+{
+	python setup.py install --root=$portDir
+}
+
+LICENSE="Python"
+COPYRIGHT="2009-2014, Phillip J. Eby"
diff --git a/dev-python/simpleparse/simpleparse-2.1.1a2.recipe b/dev-python/simpleparse/simpleparse-2.1.1a2.recipe
index 673b4ba77..28d4b3906 100644
--- a/dev-python/simpleparse/simpleparse-2.1.1a2.recipe
+++ b/dev-python/simpleparse/simpleparse-2.1.1a2.recipe
@@ -1,20 +1,36 @@
-DESCRIPTION="A Parser Generator for Python (w/mxTextTools derivative)"
+SUMMARY="A Parser Generator for Python (w/mxTextTools derivative)"
+DESCRIPTION="
+SimpleParse is a BSD-licensed Python package providing a simple and fast parser 
+generator using a modified version of the mxTextTools text-tagging engine.
+SimpleParse allows you to generate parsers directly from your EBNF grammar.
+Unlike most parser generators, SimpleParse generates single-pass parsers (there
+is no distinct tokenization stage), an approach taken from the predecessor
+project (mcf.pars) which attempted to create \"autonomously parsing regex
+objects\". The resulting parsers are not as generalized as those created by, for
+instance, the Earley algorithm, but they do tend to be useful for the parsing of
+computer file formats and the like (as distinct from natural language and
+similar \"hard\" parsing problems)."
 HOMEPAGE="http://simpleparse.sourceforge.net/"
 SRC_URI="http://downloads.sourceforge.net/project/simpleparse/simpleparse/2.1.1a2/SimpleParse-2.1.1a2.tar.gz"
+CHECKSUM_SHA256="9899df932c6805dbb6433c7395e696fd60723f463513933e925cc77314c6bbb8"
 REVISION="1"
-STATUS_HAIKU="stable"
-DEPEND=""
-CHECKSUM_MD5="9c4e13b4f9b087442f76e7382ba97e3b"
+ARCHITECTURES="!x86_gcc2"
+PROVIDES="
+	simpleparse = $portVersion
+	"
 
+BUILD_PREREQUIRES="
+	cmd:python
+	"
+
+SOURCE_DIR="SimpleParse-$portVersion"
 BUILD()
 {
-	cd SimpleParse-2.1.1a2
 	python setup.py build
 }
 
 INSTALL()
 {
-	cd SimpleParse-2.1.1a2
 	python setup.py install --root=${DESTDIR}
 
 }
diff --git a/dev-qt/qtcore/qtcore-4.8.5.git.recipe b/dev-qt/qtcore/qtcore-4.8.5.git.recipe
index ba6599176..6f448dad4 100644
--- a/dev-qt/qtcore/qtcore-4.8.5.git.recipe
+++ b/dev-qt/qtcore/qtcore-4.8.5.git.recipe
@@ -77,6 +77,8 @@ BUILD_PREREQUIRES="
 	cmd:g++$secondaryArchSuffix
 	cmd:ld$secondaryArchSuffix
 	cmd:perl
+	cmd:find
+	cmd:awk
 	"
 
 if [ "$targetArchitecture" = x86_gcc2 ];then
diff --git a/dev-scheme/chicken/chicken-4.8.0.5.recipe b/dev-scheme/chicken/chicken-4.8.0.5.recipe
index 7847f64ca..e92b84ac1 100644
--- a/dev-scheme/chicken/chicken-4.8.0.5.recipe
+++ b/dev-scheme/chicken/chicken-4.8.0.5.recipe
@@ -7,7 +7,7 @@ Linux, MacOS X, Windows, and many Unix flavours.
 "
 HOMEPAGE="http://www.call-cc.org/" 
 SRC_URI="http://code.call-cc.org/releases/4.8.0/chicken-4.8.0.5.tar.gz"
-CHECKSUM_MD5="a63d8a0b6bc58a97ec5cc4c4a19b308a"
+CHECKSUM_SHA256="5b9192951bc61cc19dd4963cceb93908bff46b6868d7927f19850e8973c430fb"
 REVISION="1"
 LICENSE="BSD (2-clause)"
 COPYRIGHT="2008-2013 The Chicken Team
diff --git a/dev-util/abi_compliance_checker/abi_compliance_checker-1.98.3.recipe b/dev-util/abi_compliance_checker/abi_compliance_checker-1.98.3.recipe
index 7f1f2b210..8493e7882 100644
--- a/dev-util/abi_compliance_checker/abi_compliance_checker-1.98.3.recipe
+++ b/dev-util/abi_compliance_checker/abi_compliance_checker-1.98.3.recipe
@@ -7,7 +7,7 @@ ABI (ABI=API+compiler ABI) that may break binary and/or source compatibility.
 "
 HOMEPAGE="ispras.linuxbase.org/index.php/ABI_compliance_checker" 
 SRC_URI="https://github.com/downloads/lvc/abi-compliance-checker/abi-compliance-checker-1.98.3.tar.gz"
-CHECKSUM_MD5="e2ca96bf71b014eefa11fe10a6f7d1f6"
+CHECKSUM_SHA256="d397530027ec781d53d80287a77f18a872b35720fbb1e559e0bda7e715607013"
 LICENSE="GNU GPL v2"
 COPYRIGHT="2009-2010 The Linux Foundation
 	2009-2011 Institute for System Programming, RAS
diff --git a/dev-util/astyle/astyle-2.03.recipe b/dev-util/astyle/astyle-2.03.recipe
index fe6b7776f..c9e945f34 100644
--- a/dev-util/astyle/astyle-2.03.recipe
+++ b/dev-util/astyle/astyle-2.03.recipe
@@ -6,7 +6,7 @@ line, or it can be incorporated as classes in another C++ program.
 "
 HOMEPAGE="http://astyle.sourceforge.net" 
 SRC_URI="http://sourceforge.net/projects/astyle/files/astyle/astyle%202.03/astyle_2.03_linux.tar.gz"
-CHECKSUM_MD5="ba84eaa8564155babd4ba1458d4eaa11"
+CHECKSUM_SHA256="22b5249a0b8c9fab3b3bcd467abcb3c6b4a78458b528028634a83dca4c6ca389"
 LICENSE="GNU LGPL v3"
 COPYRIGHT="1998-2002 by Tal Davidson
 		2006-2013 Jim Pattee"
diff --git a/dev-util/bakefile/bakefile-0.2.8.recipe b/dev-util/bakefile/bakefile-0.2.8.recipe
index f6cf041a0..579b3be2f 100644
--- a/dev-util/bakefile/bakefile-0.2.8.recipe
+++ b/dev-util/bakefile/bakefile-0.2.8.recipe
@@ -6,7 +6,7 @@ native makefile (autoconf's Makefile.in, Visual C++ project, bcc makefile etc.).
 "
 HOMEPAGE="http://www.bakefile.org"
 SRC_URI="http://sourceforge.net/projects/bakefile/files/bakefile/0.2.8/bakefile-0.2.8.tar.gz/download"
-CHECKSUM_MD5="874da5c9035514366b7723bc7657c71c"
+CHECKSUM_SHA256="e262b5edff1c9126cc32de7d3fcef5b24e997156f91f5a6eeccb45d29522fd1c"
 REVISION="1"
 LICENSE="MIT"
 COPYRIGHT="2003-2007 (c) Vaclav Slavik"
diff --git a/dev-util/ccache/ccache-3.1.9.recipe b/dev-util/ccache/ccache-3.1.9.recipe
index e9f64a9ad..aa59b7745 100644
--- a/dev-util/ccache/ccache-3.1.9.recipe
+++ b/dev-util/ccache/ccache-3.1.9.recipe
@@ -6,13 +6,13 @@ Supported languages are C, C++, Objective-C and Objective-C++.
 "
 HOMEPAGE="http://ccache.samba.org/"
 SRC_URI="http://samba.org/ftp/ccache/ccache-3.1.9.tar.bz2"
+CHECKSUM_SHA256="04d3e2e438ac8d4cc4b110b68cdd61bd59226c6588739a4a386869467f5ced7c"
 REVISION="1"
 
 LICENSE="GNU GPL v3"
 COPYRIGHT="2002-2007 Andrew Tridgell
 	2009-2013 Joel Rosdahl"
 
-CHECKSUM_MD5="65f48376a91d3651d6527ca568858be8"
 
 ARCHITECTURES="x86 x86_gcc2"
 
diff --git a/dev-util/cmake/cmake-2.8.11.2.recipe b/dev-util/cmake/cmake-2.8.11.2.recipe
index 13aaf7bcd..1da2a50f9 100644
--- a/dev-util/cmake/cmake-2.8.11.2.recipe
+++ b/dev-util/cmake/cmake-2.8.11.2.recipe
@@ -10,7 +10,7 @@ HOMEPAGE="http://www.cmake.org"
 LICENSE="CMake"
 COPYRIGHT="2002-2013 Kitware, Inc., Insight Consortium, All rights reserved."
 SRC_URI="http://www.cmake.org/files/v2.8/cmake-2.8.11.2.tar.gz"
-CHECKSUM_MD5="6f5d7b8e7534a5d9e1a7664ba63cf882"
+CHECKSUM_SHA256="b32acb483afdd14339941c6e4ec25f633d916a7a472653a0b00838771a6c0562"
 REVISION="7"
 ARCHITECTURES="x86_gcc2 x86 x86_64"
 
diff --git a/dev-util/cmake/cmake-2.8.5.recipe b/dev-util/cmake/cmake-2.8.5.recipe
index 0466d90ad..3f8de3c12 100644
--- a/dev-util/cmake/cmake-2.8.5.recipe
+++ b/dev-util/cmake/cmake-2.8.5.recipe
@@ -9,7 +9,7 @@ HOMEPAGE="http://www.cmake.org"
 LICENSE="CMake"
 COPYRIGHT="2002-2011 Kitware, Inc., Insight Consortium, All rights reserved."
 SRC_URI="http://www.cmake.org/files/v2.8/cmake-2.8.5.tar.gz"
-CHECKSUM_MD5="3c5d32cec0f4c2dc45f4c2e84f4a20c5"
+CHECKSUM_SHA256="5e18bff75f01656c64f553412a8905527e1b85efaf3163c6fb81ea5aaced0b91"
 REVISION="6"
 ARCHITECTURES="x86_gcc2 x86 x86_64"
 
diff --git a/dev-util/cmake/cmake-3.0.0_git.recipe b/dev-util/cmake/cmake-3.0.0_git.recipe
new file mode 100644
index 000000000..93b4bcb04
--- /dev/null
+++ b/dev-util/cmake/cmake-3.0.0_git.recipe
@@ -0,0 +1,72 @@
+SUMMARY="Cross platform Make"
+DESCRIPTION="
+CMake is a cross-platform, open-source build system. It is a family of tools \
+designed to build, test and package software. CMake is used to control the \
+software compilation process using simple platform and compiler independent \
+configuration files. CMake generates native makefiles and workspaces that can \
+be used in the compiler environment of your choice.
+"
+HOMEPAGE="http://www.cmake.org" 
+LICENSE="CMake"
+COPYRIGHT="2002-2014 Kitware, Inc., Insight Consortium, All rights reserved."
+SRC_URI="git+http://cmake.org/cmake.git"
+CHECKSUM_MD5="3f6e729a52e15cc3b1d58e2d1195c421"
+REVISION="1"
+ARCHITECTURES="?x86 ?x86_64"
+if [ $effectiveTargetArchitecture != x86_gcc2 ]; then
+	# x86_gcc2 is fine as primary target architecture as long as we're building
+	# for a different secondary architecture.
+	ARCHITECTURES="$ARCHITECTURES ?x86_gcc2"
+fi
+SECONDARY_ARCHITECTURES="?x86"
+
+PROVIDES="
+	cmake = $portVersion compat >= 3.0
+	cmd:cmake = $portVersion compat >= 3.0
+	cmd:ccmake = $portVersion compat >= 3.0
+	cmd:cpack = $portVersion compat >= 3.0
+	cmd:ctest = $portVersion compat >= 3.0
+	"
+REQUIRES="
+	haiku$secondaryArchSuffix >= $haikuVersion
+	lib:libncurses$secondaryArchSuffix
+	"
+BUILD_REQUIRES="
+	devel:libncurses$secondaryArchSuffix
+	"
+BUILD_PREREQUIRES="
+	haiku${secondaryArchSuffix}_devel >= $haikuVersion
+	haiku_devel >= $haikuVersion
+	cmd:gcc$secondaryArchSuffix
+	cmd:grep
+	cmd:ld$secondaryArchSuffix
+	cmd:libtool
+	cmd:make
+	cmd:sed
+	"
+PATCHES="cmake-$portVersion.patchset"
+#SOURCE_DIR="cmake-3.0.0-rc1"
+BUILD()
+{
+	./configure --prefix=$prefix \
+		--datadir=/$relativeDataDir/cmake \
+		--docdir=/$relativeDocDir \
+		--mandir=/$relativeManDir
+	make $jobArgs
+}
+
+INSTALL()
+{
+	make install
+
+	# No way to tell this to configure...
+	mv $prefix/share/aclocal $dataDir
+	rmdir $prefix/share
+}
+
+TEST()
+{
+	cp bin/ctest Bootstrap.cmk/
+	make test VERBOSE=1
+}
+
diff --git a/dev-util/cmake/cmake-3.0.0_rc1.recipe b/dev-util/cmake/cmake-3.0.0_rc1.recipe
new file mode 100644
index 000000000..718b4e4c2
--- /dev/null
+++ b/dev-util/cmake/cmake-3.0.0_rc1.recipe
@@ -0,0 +1,72 @@
+SUMMARY="Cross platform Make"
+DESCRIPTION="
+CMake is a cross-platform, open-source build system. It is a family of tools \
+designed to build, test and package software. CMake is used to control the \
+software compilation process using simple platform and compiler independent \
+configuration files. CMake generates native makefiles and workspaces that can \
+be used in the compiler environment of your choice.
+"
+HOMEPAGE="http://www.cmake.org" 
+LICENSE="CMake"
+COPYRIGHT="2002-2013 Kitware, Inc., Insight Consortium, All rights reserved."
+SRC_URI="http://www.cmake.org/files/v3.0/cmake-3.0.0-rc1.tar.gz"
+CHECKSUM_SHA256="f13ac75c2440cb81aa1c193cf4f3898092f72a0c2d43b7b02f8476a8e5e1d1e6"
+REVISION="7"
+ARCHITECTURES="x86 x86_64 arm"
+if [ $effectiveTargetArchitecture != x86_gcc2 ]; then
+	# x86_gcc2 is fine as primary target architecture as long as we're building
+	# for a different secondary architecture.
+	ARCHITECTURES="$ARCHITECTURES x86_gcc2"
+fi
+SECONDARY_ARCHITECTURES="x86"
+
+PROVIDES="
+	cmake = $portVersion compat >= 3.0
+	cmd:cmake = $portVersion compat >= 3.0
+	cmd:ccmake = $portVersion compat >= 3.0
+	cmd:cpack = $portVersion compat >= 3.0
+	cmd:ctest = $portVersion compat >= 3.0
+	"
+REQUIRES="
+	haiku$secondaryArchSuffix >= $haikuVersion
+	lib:libncurses$secondaryArchSuffix
+	"
+BUILD_REQUIRES="
+	devel:libncurses$secondaryArchSuffix
+	"
+BUILD_PREREQUIRES="
+	haiku${secondaryArchSuffix}_devel >= $haikuVersion
+	haiku_devel >= $haikuVersion
+	cmd:gcc$secondaryArchSuffix
+	cmd:grep
+	cmd:ld$secondaryArchSuffix
+	cmd:libtool
+	cmd:make
+	cmd:sed
+	"
+PATCHES="cmake-$portVersion.patchset"
+SOURCE_DIR="cmake-3.0.0-rc1"
+BUILD()
+{
+	./configure --prefix=$prefix \
+		--datadir=/$relativeDataDir/cmake \
+		--docdir=/$relativeDocDir \
+		--mandir=/$relativeManDir
+	make $jobArgs
+}
+
+INSTALL()
+{
+	make install
+
+	# No way to tell this to configure...
+	mv $prefix/share/aclocal $dataDir
+	rmdir $prefix/share
+}
+
+TEST()
+{
+	cp bin/ctest Bootstrap.cmk/
+	make test VERBOSE=1
+}
+
diff --git a/dev-util/cmake/cmake-3.0.0_rc3.recipe b/dev-util/cmake/cmake-3.0.0_rc3.recipe
new file mode 100644
index 000000000..c0f868f39
--- /dev/null
+++ b/dev-util/cmake/cmake-3.0.0_rc3.recipe
@@ -0,0 +1,73 @@
+SUMMARY="Cross platform Make"
+DESCRIPTION="
+CMake is a cross-platform, open-source build system. It is a family of tools \
+designed to build, test and package software. CMake is used to control the \
+software compilation process using simple platform and compiler independent \
+configuration files. CMake generates native makefiles and workspaces that can \
+be used in the compiler environment of your choice.
+"
+HOMEPAGE="http://www.cmake.org" 
+LICENSE="CMake"
+COPYRIGHT="2002-2013 Kitware, Inc., Insight Consortium, All rights reserved."
+SRC_URI="http://www.cmake.org/files/v3.0/cmake-3.0.0-rc3.tar.gz"
+CHECKSUM_SHA256="5d4fc1783825caa2a898374b7bf656652531984290f5969bf86e87222f16a2d3"
+REVISION="1"
+ARCHITECTURES="x86 x86_64"
+if [ $effectiveTargetArchitecture != x86_gcc2 ]; then
+	# x86_gcc2 is fine as primary target architecture as long as we're building
+	# for a different secondary architecture.
+	ARCHITECTURES="$ARCHITECTURES x86_gcc2"
+fi
+SECONDARY_ARCHITECTURES="x86"
+
+PROVIDES="
+	cmake = $portVersion compat >= 3.0
+	cmd:cmake = $portVersion compat >= 3.0
+	cmd:ccmake = $portVersion compat >= 3.0
+	cmd:cpack = $portVersion compat >= 3.0
+	cmd:ctest = $portVersion compat >= 3.0
+	"
+REQUIRES="
+	haiku$secondaryArchSuffix >= $haikuVersion
+	lib:libstdc++$secondaryArchSuffix
+	lib:libncurses$secondaryArchSuffix
+	"
+BUILD_REQUIRES="
+	devel:libncurses$secondaryArchSuffix
+	"
+BUILD_PREREQUIRES="
+	haiku${secondaryArchSuffix}_devel >= $haikuVersion
+	haiku_devel >= $haikuVersion
+	cmd:gcc$secondaryArchSuffix
+	cmd:grep
+	cmd:ld$secondaryArchSuffix
+	cmd:libtool
+	cmd:make
+	cmd:sed
+	"
+PATCHES="cmake-3.0.0_rc1.patchset"
+SOURCE_DIR="cmake-3.0.0-rc3"
+BUILD()
+{
+	./configure --prefix=$prefix \
+		--datadir=/$relativeDataDir/cmake \
+		--docdir=/$relativeDocDir \
+		--mandir=/$relativeManDir
+	make $jobArgs
+}
+
+INSTALL()
+{
+	make install
+
+	# No way to tell this to configure...
+	mv $prefix/share/aclocal $dataDir
+	rmdir $prefix/share
+}
+
+TEST()
+{
+	cp bin/ctest Bootstrap.cmk/
+	make test VERBOSE=1
+}
+
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 6fac71153..000000000
--- a/dev-util/cmake/patches/cmake-2.8-git.patch
+++ /dev/null
@@ -1,241 +0,0 @@
-diff -urN cmake-2.8.10.2-orig/Modules/FindLua51.cmake cmake-2.8.10.2/Modules/FindLua51.cmake
---- cmake-2.8-git-orig/Modules/FindLua51.cmake	2012-11-27 05:26:32.033030144 -0800
-+++ cmake-2.8-git/Modules/FindLua51.cmake	2012-12-03 12:02:17.644612096 -0800
-@@ -54,7 +54,7 @@
- 
- if(LUA_LIBRARY)
-   # include the math library for Unix
--  if(UNIX AND NOT APPLE AND NOT BEOS)
-+  if(UNIX AND NOT APPLE AND NOT BEOS AND NOT HAIKU)
-     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
-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.11.2.patchset b/dev-util/cmake/patches/cmake-2.8.11.2.patchset
index 2fd8b4d02..af4d9410e 100644
--- a/dev-util/cmake/patches/cmake-2.8.11.2.patchset
+++ b/dev-util/cmake/patches/cmake-2.8.11.2.patchset
@@ -1,4 +1,4 @@
-From b9cf2352503777e90fec9db9416f4bf6c793b1f4 Mon Sep 17 00:00:00 2001
+From 1d587bbcbad19d5159f6fea4a321bf6a07bd7105 Mon Sep 17 00:00:00 2001
 From: Adrien Destugues <pulkomandy@pulkomandy.tk>
 Date: Sat, 5 Oct 2013 16:26:02 +0200
 Subject: Several fixes to Haiku platform module
@@ -212,7 +212,7 @@ index 5c43052..f00cbd6 100644
 1.8.3.4
 
 
-From 99381ca06fb2d010a7b12ec413855f1c3a99c2c8 Mon Sep 17 00:00:00 2001
+From 0a6815d452ef64e7daff785a7fbf5732b21e95b3 Mon Sep 17 00:00:00 2001
 From: Adrien Destugues <pulkomandy@pulkomandy.tk>
 Date: Sat, 5 Oct 2013 16:31:36 +0200
 Subject: Remove use of B_COMMON_DIRECTORY
@@ -363,7 +363,7 @@ index ee5b9d8..1369dab 100644
 1.8.3.4
 
 
-From c9b1d5be9feb7d1d22f4aa6ef83edd4fb62ff97d Mon Sep 17 00:00:00 2001
+From 8708f2b2761e1467c96f42d9e4c83e645b601287 Mon Sep 17 00:00:00 2001
 From: Adrien Destugues <pulkomandy@pulkomandy.tk>
 Date: Sat, 5 Oct 2013 16:33:52 +0200
 Subject: Remove useless preprocessor checks
@@ -449,7 +449,7 @@ index 74ef1f8..3053cd8 100644
 1.8.3.4
 
 
-From 22ebddf5e418d248b74a966096e7c75400dba422 Mon Sep 17 00:00:00 2001
+From 658016cb993a786c2d5ff9ae96f28b60529f2868 Mon Sep 17 00:00:00 2001
 From: Adrien Destugues <pulkomandy@pulkomandy.tk>
 Date: Sat, 5 Oct 2013 16:59:25 +0200
 Subject: Include files cleanup
@@ -500,7 +500,7 @@ index 61c1572..fc0215e 100644
 1.8.3.4
 
 
-From 81f62c78a541298c4f989eade02bf48f8206fab2 Mon Sep 17 00:00:00 2001
+From 570101cdfddf50182bea0d3b24aa8fc5d980ab6c Mon Sep 17 00:00:00 2001
 From: Adrien Destugues <pulkomandy@pulkomandy.tk>
 Date: Sat, 5 Oct 2013 17:01:03 +0200
 Subject: FindSDL: Fix broken include paths
@@ -525,7 +525,7 @@ index fec142e..6adec1f 100644
 1.8.3.4
 
 
-From fd48834c43e75c3b151afb046f3a9025ab29adb7 Mon Sep 17 00:00:00 2001
+From 04575f63ff3b05cefba384667defda6e16b99a9d Mon Sep 17 00:00:00 2001
 From: Adrien Destugues <pulkomandy@pulkomandy.tk>
 Date: Mon, 14 Oct 2013 09:35:02 +0200
 Subject: Enable command-line length limitation on Haiku.
@@ -548,7 +548,7 @@ index 7e48cd7..3d15900 100644
 1.8.3.4
 
 
-From f37bdac542180d045d1bf213ee6d78ed0f46684a Mon Sep 17 00:00:00 2001
+From 296607343aab4e0e8762104ca2bff6da0973539c Mon Sep 17 00:00:00 2001
 From: Adrien Destugues <pulkomandy@pulkomandy.tk>
 Date: Thu, 17 Oct 2013 19:27:38 +0200
 Subject: Enable ELF support on Haiku
@@ -657,7 +657,7 @@ index 0000000..6b868bb
 1.8.3.4
 
 
-From 9721c802a88d20b2f724909e6cce07295002bedd Mon Sep 17 00:00:00 2001
+From 9e7428567599bd566aa8680e6e09ecee28c54bab Mon Sep 17 00:00:00 2001
 From: Adrien Destugues <pulkomandy@pulkomandy.tk>
 Date: Thu, 17 Oct 2013 19:35:25 +0200
 Subject: CPack: add Haiku hpkg support
@@ -1602,7 +1602,7 @@ index 0000000..ffa803d
 1.8.3.4
 
 
-From 4c66402a7b630969a74878a90af03c72edce3844 Mon Sep 17 00:00:00 2001
+From 85631af98a7204959db7cf8e9abedc52b1b7c2d6 Mon Sep 17 00:00:00 2001
 From: Adrien Destugues <pulkomandy@pulkomandy.tk>
 Date: Tue, 12 Nov 2013 15:15:33 +0100
 Subject: Remove remaining references to "common" directory.
@@ -1651,7 +1651,7 @@ index 825f851..a3ebe24 100644
 1.8.3.4
 
 
-From 95e14820c12369366cffae5050efabebf5b51c0d Mon Sep 17 00:00:00 2001
+From de31f720462b7589a7c44ca8c13a39abbd7f2191 Mon Sep 17 00:00:00 2001
 From: Adrien Destugues <pulkomandy@pulkomandy.tk>
 Date: Tue, 12 Nov 2013 15:48:13 +0100
 Subject: Fix compiler detection when distcc is involved
@@ -1699,7 +1699,7 @@ index a3ebe24..dd4c55e 100644
 1.8.3.4
 
 
-From 748a5f0f1db2efaf411655206b74a85f9417a9c9 Mon Sep 17 00:00:00 2001
+From 106b40a8444dde739ac5295b785474b7ca13ebb7 Mon Sep 17 00:00:00 2001
 From: Adrien Destugues <pulkomandy@pulkomandy.tk>
 Date: Fri, 22 Nov 2013 17:49:55 +0100
 Subject: CPack: fix architecture detection and packager check
@@ -1772,7 +1772,7 @@ index dd4c55e..36576d1 100644
 1.8.3.4
 
 
-From 6746cfb5f706471d49f243a036589be7f6f0e226 Mon Sep 17 00:00:00 2001
+From 876c0bffbbdf5c77ebc5f072f025e8cc3f6d0828 Mon Sep 17 00:00:00 2001
 From: Adrien Destugues <pulkomandy@pulkomandy.tk>
 Date: Sun, 5 Jan 2014 22:24:23 +0100
 Subject: Make sure the extraction of secondary arch works
@@ -1797,7 +1797,7 @@ index 36576d1..3d06566 100644
 1.8.3.4
 
 
-From 3f7e225897df9e71dee6745cca2ec4f1defd0298 Mon Sep 17 00:00:00 2001
+From 3a261e325314152375f3ec0a670c96416562847f Mon Sep 17 00:00:00 2001
 From: Adrien Destugues <pulkomandy@pulkomandy.tk>
 Date: Sun, 5 Jan 2014 22:46:37 +0100
 Subject: Fix search directories for SDL image,mixer,ttf.
@@ -1848,7 +1848,7 @@ index bb0ca91..91577d6 100644
 1.8.3.4
 
 
-From bef51860a4e8f12504d8fbd9f421624932f927ad Mon Sep 17 00:00:00 2001
+From bedbd8de5e3b520b82bfd8c69c6634db2e0a17f4 Mon Sep 17 00:00:00 2001
 From: Adrien Destugues <pulkomandy@pulkomandy.tk>
 Date: Mon, 13 Jan 2014 20:35:48 +0100
 Subject: FindFreetype: fix search path.
@@ -1870,3 +1870,44 @@ index 1df2399..31346a0 100644
 -- 
 1.8.3.4
 
+
+From 1b8453c65fdfddc529097fad179ded9e699eef90 Mon Sep 17 00:00:00 2001
+From: Rene Gollent <rene@gollent.com>
+Date: Mon, 3 Mar 2014 16:56:33 -0500
+Subject: Rework CPU frequency calculation to use newer topology APIs.
+
+
+diff --git a/Source/kwsys/SystemInformation.cxx b/Source/kwsys/SystemInformation.cxx
+index 9e2a93d..4b5ad8f 100644
+--- a/Source/kwsys/SystemInformation.cxx
++++ b/Source/kwsys/SystemInformation.cxx
+@@ -4354,8 +4354,25 @@ bool SystemInformationImplementation::QueryHaikuInfo()
+   system_info info;
+   get_system_info(&info);
+ 
++  uint32 topologyNodeCount = 0;
++  cpu_topology_node_info* topology = NULL;
++  get_cpu_topology_info(NULL, &topologyNodeCount);
++  if (topologyNodeCount != 0)
++    topology = new cpu_topology_node_info[topologyNodeCount];
++  get_cpu_topology_info(topology, &topologyNodeCount);
++
++  uint64 cpuFrequency = 0;
++  for (uint32 i = 0; i < topologyNodeCount; i++) {
++    if (topology[i].type == B_TOPOLOGY_CORE) {
++      cpuFrequency = topology[i].data.core.default_frequency;
++      break;
++    }
++  }
++
++  delete[] topology;
++
+   this->NumberOfPhysicalCPU = info.cpu_count;
+-  this->CPUSpeedInMHz = info.cpu_clock_speed / 1000000.0F;
++  this->CPUSpeedInMHz = cpuFrequency / 1000000.0f;
+ 
+   // Physical Memory
+   this->TotalPhysicalMemory = (info.max_pages * B_PAGE_SIZE) / (1024 * 1024) ;
+-- 
+1.8.3.4
+
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/cmake/patches/cmake-2.8.5.patch b/dev-util/cmake/patches/cmake-2.8.5.patch
deleted file mode 100644
index e99aeb04f..000000000
--- a/dev-util/cmake/patches/cmake-2.8.5.patch
+++ /dev/null
@@ -1,521 +0,0 @@
-diff -ur cmake-2.8.5_orig/bootstrap cmake-2.8.5/bootstrap
---- cmake-2.8.5_orig/bootstrap	2011-07-08 12:21:43.031981568 +0000
-+++ cmake-2.8.5/bootstrap	2011-07-09 17:59:50.059768832 +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 -ur cmake-2.8.5_orig/Modules/CheckForPthreads.c cmake-2.8.5/Modules/CheckForPthreads.c
---- cmake-2.8.5_orig/Modules/CheckForPthreads.c	2011-07-08 12:21:44.040632320 +0000
-+++ cmake-2.8.5/Modules/CheckForPthreads.c	2011-07-09 17:59:50.060817408 +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__)  && !defined(__HAIKU__) // (no usleep on BeOS 5.)
-+#if defined(__BEOS__) && !defined(__ZETA__) // (no usleep on BeOS 5.)
-   usleep(1); // for strange behavior on single-processor sun
- #endif
- 
-diff -ur cmake-2.8.5_orig/Modules/CMakeFortranCompilerId.F.in cmake-2.8.5/Modules/CMakeFortranCompilerId.F.in
---- cmake-2.8.5_orig/Modules/CMakeFortranCompilerId.F.in	2011-07-08 12:21:44.047448064 +0000
-+++ cmake-2.8.5/Modules/CMakeFortranCompilerId.F.in	2011-07-09 17:59:50.062128128 +0000
-@@ -74,12 +74,8 @@
-         PRINT *, 'INFO:platform[IRIX]'
- #elif defined(__hpux) || defined(__hpux__)
-         PRINT *, 'INFO:platform[HP-UX]'
--#elif defined(__HAIKU) || defined(__HAIKU__) || defined(_HAIKU)
-+#elif defined(__HAIKU__)
-         PRINT *, 'INFO:platform[Haiku]'
--#       if 0
--!       Haiku also defines __BEOS__ so we must
--!       put it prior to the check for __BEOS__
--#       endif
- #elif defined(__BeOS) || defined(__BEOS__) || defined(_BEOS)
-         PRINT *, 'INFO:platform[BeOS]'
- #elif defined(__QNX__) || defined(__QNXNTO__)
-diff -ur cmake-2.8.5_orig/Modules/CMakePlatformId.h.in cmake-2.8.5/Modules/CMakePlatformId.h.in
---- cmake-2.8.5_orig/Modules/CMakePlatformId.h.in	2011-07-08 12:21:44.048758784 +0000
-+++ cmake-2.8.5/Modules/CMakePlatformId.h.in	2011-07-09 17:59:50.063176704 +0000
-@@ -35,11 +35,8 @@
- #elif defined(__hpux) || defined(__hpux__)
- # define PLATFORM_ID "HP-UX"
- 
--#elif defined(__HAIKU) || defined(__HAIKU__) || defined(_HAIKU)
-+#elif 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.8.5_orig/Modules/FindGLUT.cmake cmake-2.8.5/Modules/FindGLUT.cmake
---- cmake-2.8.5_orig/Modules/FindGLUT.cmake	2011-07-08 12:21:44.063438848 +0000
-+++ cmake-2.8.5/Modules/FindGLUT.cmake	2011-07-09 18:02:18.662437888 +0000
-@@ -46,20 +46,22 @@
-       /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/
-       )
--    
--    FIND_LIBRARY( GLUT_Xi_LIBRARY Xi
--      /usr/openwin/lib
--      )
--    
--    FIND_LIBRARY( GLUT_Xmu_LIBRARY Xmu
--      /usr/openwin/lib
--      )
--    
-+    IF(NOT BEOS AND NOT HAIKU)
-+      FIND_LIBRARY( GLUT_Xi_LIBRARY Xi
-+        /usr/openwin/lib
-+        )
-+
-+      FIND_LIBRARY( GLUT_Xmu_LIBRARY Xmu
-+        /usr/openwin/lib
-+        )
-+    ENDIF(NOT BEOS AND NOT HAIKU)
-   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.
--    SET( GLUT_LIBRARIES
--      ${GLUT_glut_LIBRARY}
--      ${GLUT_Xmu_LIBRARY}
--      ${GLUT_Xi_LIBRARY} 
--      ${GLUT_cocoa_LIBRARY}
--      )
-+    IF(BEOS OR HAIKU)
-+      SET( GLUT_LIBRARIES
-+        ${GLUT_glut_LIBRARY}
-+        )
-+    ELSE(BEOS OR HAIKU)
-+      SET( GLUT_LIBRARIES
-+        ${GLUT_glut_LIBRARY}
-+        ${GLUT_Xmu_LIBRARY}
-+        ${GLUT_Xi_LIBRARY} 
-+        ${GLUT_cocoa_LIBRARY}
-+        )
-+    ENDIF(BEOS OR HAIKU)
-     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)
- 
--MARK_AS_ADVANCED(
--  GLUT_INCLUDE_DIR
--  GLUT_glut_LIBRARY
--  GLUT_Xmu_LIBRARY
--  GLUT_Xi_LIBRARY
--  )
-+IF(BEOS OR HAIKU)
-+  MARK_AS_ADVANCED(
-+    GLUT_INCLUDE_DIR
-+    GLUT_glut_LIBRARY
-+    )
-+ELSE(BEOS OR HAIKU)
-+  MARK_AS_ADVANCED(
-+    GLUT_INCLUDE_DIR
-+    GLUT_glut_LIBRARY
-+    GLUT_Xmu_LIBRARY
-+    GLUT_Xi_LIBRARY
-+    )
-+ENDIF(BEOS OR HAIKU)
-diff -ur cmake-2.8.5_orig/Modules/FindLua51.cmake cmake-2.8.5/Modules/FindLua51.cmake
---- cmake-2.8.5_orig/Modules/FindLua51.cmake	2011-07-08 12:21:44.066060288 +0000
-+++ cmake-2.8.5/Modules/FindLua51.cmake	2011-07-09 17:59:50.090439680 +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 AND NOT HAIKU)
-     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 AND NOT HAIKU)
- ENDIF(LUA_LIBRARY)
- 
- INCLUDE(${CMAKE_CURRENT_LIST_DIR}/FindPackageHandleStandardArgs.cmake)
-diff -ur cmake-2.8.5_orig/Modules/FindOpenGL.cmake cmake-2.8.5/Modules/FindOpenGL.cmake
---- cmake-2.8.5_orig/Modules/FindOpenGL.cmake	2011-07-08 12:21:44.066846720 +0000
-+++ cmake-2.8.5/Modules/FindOpenGL.cmake	2011-07-09 17:59:50.091488256 +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 -ur cmake-2.8.5_orig/Modules/Platform/Haiku.cmake cmake-2.8.5/Modules/Platform/Haiku.cmake
---- cmake-2.8.5_orig/Modules/Platform/Haiku.cmake	2011-07-08 12:21:44.016777216 +0000
-+++ cmake-2.8.5/Modules/Platform/Haiku.cmake	2011-07-10 23:52:01.025952256 +0000
-@@ -1,18 +1,25 @@
--SET(BEOS 1)
-+SET(HAIKU 1)
-+SET(UNIX 1)
- 
--SET(CMAKE_DL_LIBS root be)
-+SET(CMAKE_DL_LIBS "")
- SET(CMAKE_SHARED_LIBRARY_C_FLAGS "-fPIC")
--SET(CMAKE_SHARED_LIBRARY_CREATE_C_FLAGS "-nostart")
-+SET(CMAKE_SHARED_LIBRARY_CREATE_C_FLAGS "-shared")
- 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")
- 
--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_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
-+  )
- LIST(APPEND CMAKE_SYSTEM_INCLUDE_PATH /boot/develop/headers/3rdparty)
- LIST(APPEND CMAKE_SYSTEM_LIBRARY_PATH /boot/develop/lib/x86)
- 
-diff -ur cmake-2.8.5_orig/Source/cmCTest.cxx cmake-2.8.5/Source/cmCTest.cxx
---- cmake-2.8.5_orig/Source/cmCTest.cxx	2011-07-08 12:21:45.037486592 +0000
-+++ cmake-2.8.5/Source/cmCTest.cxx	2011-07-09 17:59:50.095682560 +0000
-@@ -53,7 +53,7 @@
- #include <cm_zlib.h>
- #include <cmsys/Base64.h>
- 
--#if defined(__BEOS__) && !defined(__HAIKU__)
-+#if defined(__BEOS__)
- #include <be/kernel/OS.h>   /* disable_debugger() API. */
- #endif
- 
-diff -ur cmake-2.8.5_orig/Source/cmExportCommand.cxx cmake-2.8.5/Source/cmExportCommand.cxx
---- cmake-2.8.5_orig/Source/cmExportCommand.cxx	2011-07-08 12:21:45.046923776 +0000
-+++ cmake-2.8.5/Source/cmExportCommand.cxx	2011-07-09 18:36:22.770179072 +0000
-@@ -20,7 +20,8 @@
- #include "cmExportBuildFileGenerator.h"
- 
- #if defined(__HAIKU__)
--#include <StorageKit.h>
-+#include <FindDirectory.h>
-+#include <StorageDefs.h>
- #endif
- 
- cmExportCommand::cmExportCommand()
-@@ -297,14 +298,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 -ur cmake-2.8.5_orig/Source/cmFindPackageCommand.cxx cmake-2.8.5/Source/cmFindPackageCommand.cxx
---- cmake-2.8.5_orig/Source/cmFindPackageCommand.cxx	2011-07-08 12:21:46.051118080 +0000
-+++ cmake-2.8.5/Source/cmFindPackageCommand.cxx	2011-07-09 18:26:27.005242880 +0000
-@@ -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,
-@@ -1292,12 +1294,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 -ur cmake-2.8.5_orig/Source/cmLocalGenerator.cxx cmake-2.8.5/Source/cmLocalGenerator.cxx
---- cmake-2.8.5_orig/Source/cmLocalGenerator.cxx	2011-07-08 12:21:46.065273856 +0000
-+++ cmake-2.8.5/Source/cmLocalGenerator.cxx	2011-07-09 18:30:30.565182464 +0000
-@@ -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 -ur cmake-2.8.5_orig/Source/CPack/cmCPackGenerator.cxx cmake-2.8.5/Source/CPack/cmCPackGenerator.cxx
---- cmake-2.8.5_orig/Source/CPack/cmCPackGenerator.cxx	2011-07-08 12:21:47.017563648 +0000
-+++ cmake-2.8.5/Source/CPack/cmCPackGenerator.cxx	2011-07-09 18:33:59.244842496 +0000
-@@ -27,7 +27,8 @@
- #include <algorithm>
- 
- #if defined(__HAIKU__)
--#include <StorageKit.h>
-+#include <FindDirectory.h>
-+#include <StorageDefs.h>
- #endif
- 
- //----------------------------------------------------------------------
-@@ -1206,10 +1207,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 -ur cmake-2.8.5_orig/Source/CPack/cmCPackGeneratorFactory.cxx cmake-2.8.5/Source/CPack/cmCPackGeneratorFactory.cxx
---- cmake-2.8.5_orig/Source/CPack/cmCPackGeneratorFactory.cxx	2011-07-08 12:21:47.017825792 +0000
-+++ cmake-2.8.5/Source/CPack/cmCPackGeneratorFactory.cxx	2011-07-09 17:59:50.096731136 +0000
-@@ -32,7 +32,7 @@
- #endif
- 
- #if !defined(_WIN32) && !defined(__APPLE__) \
-- && !defined(__QNXNTO__) && !defined(__BEOS__)
-+ && !defined(__QNXNTO__) && !defined(__BEOS__) && !defined(__HAIKU__)
- #  include "cmCPackDebGenerator.h"
- #  include "cmCPackRPMGenerator.h"
- #endif
-@@ -73,7 +73,7 @@
-     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.8.5_orig/Source/kwsys/ProcessUNIX.c cmake-2.8.5/Source/kwsys/ProcessUNIX.c
---- cmake-2.8.5_orig/Source/kwsys/ProcessUNIX.c	2011-07-08 12:21:48.042729472 +0000
-+++ cmake-2.8.5/Source/kwsys/ProcessUNIX.c	2011-07-09 17:59:50.100401152 +0000
-@@ -63,10 +63,6 @@
- #include <dirent.h>    /* DIR, dirent */
- #include <ctype.h>     /* isspace */
- 
--#ifdef __HAIKU__
--#undef __BEOS__
--#endif
--
- #if defined(__VMS)
- # define KWSYSPE_VMS_NONBLOCK , O_NONBLOCK
- #else
-diff -ur cmake-2.8.5_orig/Source/kwsys/SystemTools.cxx cmake-2.8.5/Source/kwsys/SystemTools.cxx
---- cmake-2.8.5_orig/Source/kwsys/SystemTools.cxx	2011-07-08 12:21:48.044826624 +0000
-+++ cmake-2.8.5/Source/kwsys/SystemTools.cxx	2011-07-09 17:59:50.103284736 +0000
-@@ -150,7 +150,7 @@
- #include <os/storage/Path.h>
- #endif
- 
--#if defined(__BEOS__) && !defined(__ZETA__) && !defined(__HAIKU__)
-+#if defined(__BEOS__) && !defined(__ZETA__)
- #include <be/kernel/OS.h>
- #include <be/storage/Path.h>
- 
-diff -ur cmake-2.8.5_orig/Source/kwsys/testDynamicLoader.cxx cmake-2.8.5/Source/kwsys/testDynamicLoader.cxx
---- cmake-2.8.5_orig/Source/kwsys/testDynamicLoader.cxx	2011-07-08 12:21:49.045613056 +0000
-+++ cmake-2.8.5/Source/kwsys/testDynamicLoader.cxx	2011-07-09 17:59:50.105119744 +0000
-@@ -15,7 +15,7 @@
- #include KWSYS_HEADER(ios/iostream)
- #include KWSYS_HEADER(stl/string)
- 
--#if defined(__BEOS__) && !defined(__HAIKU__)
-+#if defined(__BEOS__)
- #include <be/kernel/OS.h>  /* disable_debugger() API. */
- #endif
- 
-diff -ur cmake-2.8.5_orig/Source/kwsys/testProcess.c cmake-2.8.5/Source/kwsys/testProcess.c
---- cmake-2.8.5_orig/Source/kwsys/testProcess.c	2011-07-08 12:21:49.046399488 +0000
-+++ cmake-2.8.5/Source/kwsys/testProcess.c	2011-07-09 17:59:50.108265472 +0000
-@@ -32,7 +32,7 @@
- # pragma warn -8060 /* possibly incorrect assignment */
- #endif
- 
--#if defined(__BEOS__) && !defined(__ZETA__) && !defined(__HAIKU__)
-+#if defined(__BEOS__) && !defined(__ZETA__)
- /* 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.8.5_orig/Tests/Complex/Library/CMakeLists.txt cmake-2.8.5/Tests/Complex/Library/CMakeLists.txt
---- cmake-2.8.5_orig/Tests/Complex/Library/CMakeLists.txt	2011-07-08 12:21:50.003670016 +0000
-+++ cmake-2.8.5/Tests/Complex/Library/CMakeLists.txt	2011-07-09 17:59:50.114294784 +0000
-@@ -52,9 +52,9 @@
-   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(NOT BEOS AND NOT WIN32)
-+ENDIF(NOT BEOS AND NOT WIN32 AND NOT HAIKU)
- GET_TARGET_PROPERTY(FOO_BAR_VAR CMakeTestCLibraryShared FOO)
- IF(${FOO_BAR_VAR} MATCHES "BAR")
- ELSE(${FOO_BAR_VAR} MATCHES "BAR")
-diff -ur cmake-2.8.5_orig/Tests/ComplexOneConfig/Library/CMakeLists.txt cmake-2.8.5/Tests/ComplexOneConfig/Library/CMakeLists.txt
---- cmake-2.8.5_orig/Tests/ComplexOneConfig/Library/CMakeLists.txt	2011-07-08 12:21:50.007864320 +0000
-+++ cmake-2.8.5/Tests/ComplexOneConfig/Library/CMakeLists.txt	2011-07-09 17:59:50.116654080 +0000
-@@ -52,9 +52,9 @@
-   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(NOT BEOS AND NOT WIN32)
-+ENDIF(NOT BEOS AND NOT WIN32 AND NOT HAIKU)
- GET_TARGET_PROPERTY(FOO_BAR_VAR CMakeTestCLibraryShared FOO)
- IF(${FOO_BAR_VAR} MATCHES "BAR")
- ELSE(${FOO_BAR_VAR} MATCHES "BAR")
-diff -ur cmake-2.8.5_orig/Tests/ComplexRelativePaths/Library/CMakeLists.txt cmake-2.8.5/Tests/ComplexRelativePaths/Library/CMakeLists.txt
---- cmake-2.8.5_orig/Tests/ComplexRelativePaths/Library/CMakeLists.txt	2011-07-08 12:21:50.012320768 +0000
-+++ cmake-2.8.5/Tests/ComplexRelativePaths/Library/CMakeLists.txt	2011-07-09 17:59:50.119013376 +0000
-@@ -52,9 +52,9 @@
-   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(NOT BEOS AND NOT WIN32)
-+ENDIF(NOT BEOS AND NOT WIN32 AND NOT HAIKU)
- GET_TARGET_PROPERTY(FOO_BAR_VAR CMakeTestCLibraryShared FOO)
- IF(${FOO_BAR_VAR} MATCHES "BAR")
- ELSE(${FOO_BAR_VAR} MATCHES "BAR")
-diff -ur cmake-2.8.5_orig/Utilities/cmcurl/CMake/CurlTests.c cmake-2.8.5/Utilities/cmcurl/CMake/CurlTests.c
---- cmake-2.8.5_orig/Utilities/cmcurl/CMake/CurlTests.c	2011-07-08 12:21:54.052953088 +0000
-+++ cmake-2.8.5/Utilities/cmcurl/CMake/CurlTests.c	2011-07-09 17:59:50.122421248 +0000
-@@ -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 -ur cmake-2.8.5_orig/Utilities/cmcurl/select.c cmake-2.8.5/Utilities/cmcurl/select.c
---- cmake-2.8.5_orig/Utilities/cmcurl/select.c	2011-07-08 12:21:55.063176704 +0000
-+++ cmake-2.8.5/Utilities/cmcurl/select.c	2011-07-09 17:59:50.125829120 +0000
-@@ -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 -ur cmake-2.8.5_orig/Utilities/cmzlib/zconf.h cmake-2.8.5/Utilities/cmzlib/zconf.h
---- cmake-2.8.5_orig/Utilities/cmzlib/zconf.h	2011-07-08 12:21:58.054001664 +0000
-+++ cmake-2.8.5/Utilities/cmzlib/zconf.h	2011-07-09 17:59:50.128712704 +0000
-@@ -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 -ur cmake-2.8.5_orig/Utilities/cmzlib/zutil.h cmake-2.8.5/Utilities/cmzlib/zutil.h
---- cmake-2.8.5_orig/Utilities/cmzlib/zutil.h	2011-07-08 12:21:58.054525952 +0000
-+++ cmake-2.8.5/Utilities/cmzlib/zutil.h	2011-07-09 17:59:50.129761280 +0000
-@@ -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.5.patchset b/dev-util/cmake/patches/cmake-2.8.5.patchset
deleted file mode 100644
index 40215e05f..000000000
--- a/dev-util/cmake/patches/cmake-2.8.5.patchset
+++ /dev/null
@@ -1,664 +0,0 @@
-From 63b3bcd0d6804a07fe94d9af0fc7a7810fab538d Mon Sep 17 00:00:00 2001
-From: Ingo Weinhold <ingo_weinhold@gmx.de>
-Date: Sun, 16 Jun 2013 21:42:39 +0200
-Subject: Haiku specific changes
-
-
-diff --git a/Modules/CMakeFortranCompilerId.F.in b/Modules/CMakeFortranCompilerId.F.in
-index 4d25de0..f84852a 100644
---- a/Modules/CMakeFortranCompilerId.F.in
-+++ b/Modules/CMakeFortranCompilerId.F.in
-@@ -74,12 +74,8 @@
-         PRINT *, 'INFO:platform[IRIX]'
- #elif defined(__hpux) || defined(__hpux__)
-         PRINT *, 'INFO:platform[HP-UX]'
--#elif defined(__HAIKU) || defined(__HAIKU__) || defined(_HAIKU)
-+#elif defined(__HAIKU__)
-         PRINT *, 'INFO:platform[Haiku]'
--#       if 0
--!       Haiku also defines __BEOS__ so we must
--!       put it prior to the check for __BEOS__
--#       endif
- #elif defined(__BeOS) || defined(__BEOS__) || defined(_BEOS)
-         PRINT *, 'INFO:platform[BeOS]'
- #elif defined(__QNX__) || defined(__QNXNTO__)
-diff --git a/Modules/CMakePlatformId.h.in b/Modules/CMakePlatformId.h.in
-index cb3f40a..db98bc3 100644
---- a/Modules/CMakePlatformId.h.in
-+++ b/Modules/CMakePlatformId.h.in
-@@ -35,11 +35,8 @@
- #elif defined(__hpux) || defined(__hpux__)
- # define PLATFORM_ID "HP-UX"
- 
--#elif defined(__HAIKU) || defined(__HAIKU__) || defined(_HAIKU)
-+#elif 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 --git a/Modules/CheckForPthreads.c b/Modules/CheckForPthreads.c
-index d831078..02526fb 100644
---- a/Modules/CheckForPthreads.c
-+++ b/Modules/CheckForPthreads.c
-@@ -16,7 +16,7 @@ int main(int ac, char*av[]){
-   pthread_create(&tid[0], 0, runner, (void*)1);
-   pthread_create(&tid[1], 0, runner, (void*)2);
-   
--#if defined(__BEOS__) && !defined(__ZETA__)  && !defined(__HAIKU__) // (no usleep on BeOS 5.)
-+#if defined(__BEOS__) && !defined(__ZETA__) // (no usleep on BeOS 5.)
-   usleep(1); // for strange behavior on single-processor sun
- #endif
- 
-diff --git a/Modules/FindGLUT.cmake b/Modules/FindGLUT.cmake
-index af88997..8c0a733 100644
---- a/Modules/FindGLUT.cmake
-+++ b/Modules/FindGLUT.cmake
-@@ -46,20 +46,22 @@ ELSE (WIN32)
-       /usr/openwin/include
-       /opt/graphics/OpenGL/include
-       /opt/graphics/OpenGL/contrib/libglut
-+      /boot/system/develop/headers/os/opengl
-       )
-   
-     FIND_LIBRARY( GLUT_glut_LIBRARY glut
-       /usr/openwin/lib
-       )
--    
--    FIND_LIBRARY( GLUT_Xi_LIBRARY Xi
--      /usr/openwin/lib
--      )
--    
--    FIND_LIBRARY( GLUT_Xmu_LIBRARY Xmu
--      /usr/openwin/lib
--      )
--    
-+
-+    IF(NOT BEOS AND NOT HAIKU)
-+      FIND_LIBRARY( GLUT_Xi_LIBRARY Xi
-+        /usr/openwin/lib
-+        )
-+
-+      FIND_LIBRARY( GLUT_Xmu_LIBRARY Xmu
-+        /usr/openwin/lib
-+        )
-+    ENDIF(NOT BEOS AND NOT HAIKU)
-   ENDIF (APPLE)
-   
- ENDIF (WIN32)
-@@ -69,12 +71,18 @@ IF(GLUT_INCLUDE_DIR)
-   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.
--    SET( GLUT_LIBRARIES
--      ${GLUT_glut_LIBRARY}
--      ${GLUT_Xmu_LIBRARY}
--      ${GLUT_Xi_LIBRARY} 
--      ${GLUT_cocoa_LIBRARY}
--      )
-+    IF(BEOS OR HAIKU)
-+      SET( GLUT_LIBRARIES
-+        ${GLUT_glut_LIBRARY}
-+        )
-+    ELSE(BEOS OR HAIKU)
-+      SET( GLUT_LIBRARIES
-+        ${GLUT_glut_LIBRARY}
-+        ${GLUT_Xmu_LIBRARY}
-+        ${GLUT_Xi_LIBRARY} 
-+        ${GLUT_cocoa_LIBRARY}
-+        )
-+    ENDIF(BEOS OR HAIKU)
-     SET( GLUT_FOUND "YES" )
-     
-     #The following deprecated settings are for backwards compatibility with CMake1.4
-@@ -84,9 +92,16 @@ IF(GLUT_INCLUDE_DIR)
-   ENDIF(GLUT_glut_LIBRARY)
- ENDIF(GLUT_INCLUDE_DIR)
- 
--MARK_AS_ADVANCED(
--  GLUT_INCLUDE_DIR
--  GLUT_glut_LIBRARY
--  GLUT_Xmu_LIBRARY
--  GLUT_Xi_LIBRARY
--  )
-+IF(BEOS OR HAIKU)
-+  MARK_AS_ADVANCED(
-+    GLUT_INCLUDE_DIR
-+    GLUT_glut_LIBRARY
-+    )
-+ELSE(BEOS OR HAIKU)
-+  MARK_AS_ADVANCED(
-+    GLUT_INCLUDE_DIR
-+    GLUT_glut_LIBRARY
-+    GLUT_Xmu_LIBRARY
-+    GLUT_Xi_LIBRARY
-+    )
-+ENDIF(BEOS OR HAIKU)
-diff --git a/Modules/FindLua51.cmake b/Modules/FindLua51.cmake
-index 123fd5d..5047fbd 100644
---- a/Modules/FindLua51.cmake
-+++ b/Modules/FindLua51.cmake
-@@ -57,13 +57,13 @@ FIND_LIBRARY(LUA_LIBRARY
- 
- IF(LUA_LIBRARY)
-   # include the math library for Unix
--  IF(UNIX AND NOT APPLE)
-+  IF(UNIX AND NOT APPLE AND NOT BEOS AND NOT HAIKU)
-     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 AND NOT HAIKU)
- ENDIF(LUA_LIBRARY)
- 
- INCLUDE(${CMAKE_CURRENT_LIST_DIR}/FindPackageHandleStandardArgs.cmake)
-diff --git a/Modules/FindOpenGL.cmake b/Modules/FindOpenGL.cmake
-index 98d8808..1ac4de6 100644
---- a/Modules/FindOpenGL.cmake
-+++ b/Modules/FindOpenGL.cmake
-@@ -80,6 +80,7 @@ ELSE (WIN32)
-       /usr/share/doc/NVIDIA_GLX-1.0/include
-       /usr/openwin/share/include
-       /opt/graphics/OpenGL/include /usr/X11R6/include
-+      /boot/system/develop/headers/os/opengl
-     )
- 
-     FIND_PATH(OPENGL_xmesa_INCLUDE_DIR GL/xmesa.h
-diff --git a/Modules/Platform/Haiku.cmake b/Modules/Platform/Haiku.cmake
-index 8277a24..7eb0bd5 100644
---- a/Modules/Platform/Haiku.cmake
-+++ b/Modules/Platform/Haiku.cmake
-@@ -1,20 +1,121 @@
--SET(BEOS 1)
-+# process only once
-+IF(HAIKU)
-+  RETURN()
-+ENDIF(HAIKU)
- 
--SET(CMAKE_DL_LIBS root be)
-+SET(HAIKU 1)
-+SET(UNIX 1)
-+
-+SET(CMAKE_DL_LIBS "")
- SET(CMAKE_SHARED_LIBRARY_C_FLAGS "-fPIC")
--SET(CMAKE_SHARED_LIBRARY_CREATE_C_FLAGS "-nostart")
-+SET(CMAKE_SHARED_LIBRARY_CREATE_C_FLAGS "-shared")
- 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")
-+
-+# Determine, if the C or C++ compiler is configured for a secondary
-+# architecture. If so, that will change the search paths we set below. We check
-+# whether the compiler's library search paths contain a
-+# "/boot/system/develop/lib/<subdir>/", which we assume to be the secondary
-+# architecture specific subdirectory and extract the name of the architecture
-+# accordingly.
-+SET(HAIKU_COMPILER ${CMAKE_C_COMPILER})
-+IF ("${HAIKU_COMPILER}" STREQUAL "")
-+  SET(HAIKU_COMPILER ${CMAKE_CXX_COMPILER})
-+ENDIF ("${HAIKU_COMPILER}" STREQUAL "")
-+EXECUTE_PROCESS(
-+  COMMAND ${HAIKU_COMPILER} -print-search-dirs
-+  COMMAND sed -ne "/^libraries:/!d; s,libraries: =*\\(.*\\):,\\1,; s,:,\\n,gp"
-+  COMMAND sed -ne "/\\/boot\\/system\\/develop\\/lib\\/[^\\/]*\\/$/!d; s,.*/\\([^/]*\\)/$,\\1,; p"
-+  OUTPUT_VARIABLE CMAKE_HAIKU_SECONDARY_ARCH)
-+STRING(STRIP "${CMAKE_HAIKU_SECONDARY_ARCH}"
-+  CMAKE_HAIKU_SECONDARY_ARCH)
-+
-+IF ("${CMAKE_HAIKU_SECONDARY_ARCH}" STREQUAL "")
-+  SET(CMAKE_HAIKU_SECONDARY_ARCH_SUBDIR "")
-+  UNSET(CMAKE_HAIKU_SECONDARY_ARCH)
-+ELSE ("${CMAKE_HAIKU_SECONDARY_ARCH}" STREQUAL "")
-+  SET(CMAKE_HAIKU_SECONDARY_ARCH_SUBDIR "/${CMAKE_HAIKU_SECONDARY_ARCH}")
-+
-+  # Override CMAKE_*LIBRARY_ARCHITECTURE. This will cause FIND_LIBRARY to search
-+  # the libraries in the correct subdirectory first. It still isn't completely
-+  # correct, since the parent directories shouldn't be searched at all. The
-+  # primary architecture library might still be found, if there isn't one
-+  # installed for the secondary architecture or it is installed in a less
-+  # specific location.
-+  SET(CMAKE_LIBRARY_ARCHITECTURE ${CMAKE_HAIKU_SECONDARY_ARCH})
-+  SET(CMAKE_C_LIBRARY_ARCHITECTURE ${CMAKE_HAIKU_SECONDARY_ARCH})
-+  SET(CMAKE_CXX_LIBRARY_ARCHITECTURE ${CMAKE_HAIKU_SECONDARY_ARCH})
-+ENDIF ("${CMAKE_HAIKU_SECONDARY_ARCH}" STREQUAL "")
-+
-+LIST(APPEND CMAKE_SYSTEM_PREFIX_PATH
-+  /boot/common/non-packaged
-+  /boot/common
-+  /boot/system
-+  )
-+
-+LIST(APPEND CMAKE_HAIKU_COMMON_INCLUDE_DIRECTORIES
-+  /boot/common/non-packaged/develop/headers${CMAKE_HAIKU_SECONDARY_ARCH_SUBDIR}
-+  /boot/common/develop/headers${CMAKE_HAIKU_SECONDARY_ARCH_SUBDIR}
-+  /boot/system/develop/headers/os
-+  /boot/system/develop/headers/os/app
-+  /boot/system/develop/headers/os/device
-+  /boot/system/develop/headers/os/drivers
-+  /boot/system/develop/headers/os/game
-+  /boot/system/develop/headers/os/interface
-+  /boot/system/develop/headers/os/kernel
-+  /boot/system/develop/headers/os/locale
-+  /boot/system/develop/headers/os/mail
-+  /boot/system/develop/headers/os/media
-+  /boot/system/develop/headers/os/midi
-+  /boot/system/develop/headers/os/midi2
-+  /boot/system/develop/headers/os/net
-+  /boot/system/develop/headers/os/opengl
-+  /boot/system/develop/headers/os/storage
-+  /boot/system/develop/headers/os/support
-+  /boot/system/develop/headers/os/translation
-+  /boot/system/develop/headers/os/add-ons/graphics
-+  /boot/system/develop/headers/os/add-ons/input_server
-+  /boot/system/develop/headers/os/add-ons/screen_saver
-+  /boot/system/develop/headers/os/add-ons/tracker
-+  /boot/system/develop/headers/os/be_apps/Deskbar
-+  /boot/system/develop/headers/os/be_apps/NetPositive
-+  /boot/system/develop/headers/os/be_apps/Tracker
-+  /boot/system/develop/headers/3rdparty
-+  /boot/system/develop/headers/bsd
-+  /boot/system/develop/headers/glibc
-+  /boot/system/develop/headers/gnu
-+  /boot/system/develop/headers/posix
-+  /boot/system/develop/headers${CMAKE_HAIKU_SECONDARY_ARCH_SUBDIR}
-+  )
-+IF (CMAKE_HAIKU_SECONDARY_ARCH)
-+  LIST(APPEND CMAKE_HAIKU_COMMON_INCLUDE_DIRECTORIES
-+    /boot/system/develop/headers
-+    )
-+ENDIF (CMAKE_HAIKU_SECONDARY_ARCH)
-+
-+LIST(APPEND CMAKE_HAIKU_C_INCLUDE_DIRECTORIES
-+  ${CMAKE_HAIKU_COMMON_INCLUDE_DIRECTORIES}
-+  )
-+
-+LIST(APPEND CMAKE_HAIKU_CXX_INCLUDE_DIRECTORIES
-+  ${CMAKE_HAIKU_COMMON_INCLUDE_DIRECTORIES})
-+
-+LIST(APPEND CMAKE_SYSTEM_INCLUDE_PATH ${CMAKE_HAIKU_C_INCLUDE_DIRECTORIES})
-+
-+LIST(APPEND CMAKE_HAIKU_DEVELOP_LIB_DIRECTORIES
-+  /boot/common/non-packaged/develop/lib${CMAKE_HAIKU_SECONDARY_ARCH_SUBDIR}
-+  /boot/common/develop/lib${CMAKE_HAIKU_SECONDARY_ARCH_SUBDIR}
-+  /boot/system/develop/lib${CMAKE_HAIKU_SECONDARY_ARCH_SUBDIR}
-+  )
-+
-+LIST(APPEND CMAKE_PLATFORM_IMPLICIT_LINK_DIRECTORIES
-+  ${CMAKE_HAIKU_DEVELOP_LIB_DIRECTORIES}
-+  )
- 
--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)
-+LIST(APPEND CMAKE_SYSTEM_LIBRARY_PATH ${CMAKE_HAIKU_DEVELOP_LIB_DIRECTORIES})
- 
- IF(CMAKE_INSTALL_PREFIX_INITIALIZED_TO_DEFAULT)
-   SET(CMAKE_INSTALL_PREFIX "/boot/common" CACHE PATH
-diff --git a/Source/CPack/cmCPackGenerator.cxx b/Source/CPack/cmCPackGenerator.cxx
-index 7e5b26d..733c521 100644
---- a/Source/CPack/cmCPackGenerator.cxx
-+++ b/Source/CPack/cmCPackGenerator.cxx
-@@ -27,7 +27,8 @@
- #include <algorithm>
- 
- #if defined(__HAIKU__)
--#include <StorageKit.h>
-+#include <FindDirectory.h>
-+#include <StorageDefs.h>
- #endif
- 
- //----------------------------------------------------------------------
-@@ -1206,10 +1207,10 @@ const char* cmCPackGenerator::GetInstallPath()
-   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 --git a/Source/CPack/cmCPackGeneratorFactory.cxx b/Source/CPack/cmCPackGeneratorFactory.cxx
-index a04b403..878e8c0 100644
---- a/Source/CPack/cmCPackGeneratorFactory.cxx
-+++ b/Source/CPack/cmCPackGeneratorFactory.cxx
-@@ -32,7 +32,7 @@
- #endif
- 
- #if !defined(_WIN32) && !defined(__APPLE__) \
-- && !defined(__QNXNTO__) && !defined(__BEOS__)
-+ && !defined(__QNXNTO__) && !defined(__BEOS__) && !defined(__HAIKU__)
- #  include "cmCPackDebGenerator.h"
- #  include "cmCPackRPMGenerator.h"
- #endif
-@@ -73,7 +73,7 @@ cmCPackGeneratorFactory::cmCPackGeneratorFactory()
-     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 --git a/Source/cmCTest.cxx b/Source/cmCTest.cxx
-index 75a564e..83e3c6e 100644
---- a/Source/cmCTest.cxx
-+++ b/Source/cmCTest.cxx
-@@ -53,14 +53,10 @@
- #include <cm_zlib.h>
- #include <cmsys/Base64.h>
- 
--#if defined(__BEOS__) && !defined(__HAIKU__)
-+#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 --git a/Source/cmExportCommand.cxx b/Source/cmExportCommand.cxx
-index cb614d4..1954662 100644
---- a/Source/cmExportCommand.cxx
-+++ b/Source/cmExportCommand.cxx
-@@ -20,7 +20,8 @@
- #include "cmExportBuildFileGenerator.h"
- 
- #if defined(__HAIKU__)
--#include <StorageKit.h>
-+#include <FindDirectory.h>
-+#include <StorageDefs.h>
- #endif
- 
- cmExportCommand::cmExportCommand()
-@@ -297,14 +298,15 @@ void cmExportCommand::StorePackageRegistryDir(std::string const& package,
-                                               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 --git a/Source/cmFindPackageCommand.cxx b/Source/cmFindPackageCommand.cxx
-index 5f106bc..a2f9823 100644
---- a/Source/cmFindPackageCommand.cxx
-+++ b/Source/cmFindPackageCommand.cxx
-@@ -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,
-@@ -1292,12 +1294,13 @@ void cmFindPackageCommand::AddPrefixesUserRegistry()
- #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 --git a/Source/cmLocalGenerator.cxx b/Source/cmLocalGenerator.cxx
-index 7da35eb..5867030 100644
---- a/Source/cmLocalGenerator.cxx
-+++ b/Source/cmLocalGenerator.cxx
-@@ -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 @@ void cmLocalGenerator::GenerateInstallRules()
-     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 --git a/Source/kwsys/ProcessUNIX.c b/Source/kwsys/ProcessUNIX.c
-index 9c66a44..6fe4232 100644
---- a/Source/kwsys/ProcessUNIX.c
-+++ b/Source/kwsys/ProcessUNIX.c
-@@ -63,10 +63,6 @@ do.
- #include <dirent.h>    /* DIR, dirent */
- #include <ctype.h>     /* isspace */
- 
--#ifdef __HAIKU__
--#undef __BEOS__
--#endif
--
- #if defined(__VMS)
- # define KWSYSPE_VMS_NONBLOCK , O_NONBLOCK
- #else
-diff --git a/Source/kwsys/SystemTools.cxx b/Source/kwsys/SystemTools.cxx
-index eefa7f5..8798615 100644
---- a/Source/kwsys/SystemTools.cxx
-+++ b/Source/kwsys/SystemTools.cxx
-@@ -145,12 +145,7 @@ public:
- #define _chdir chdir
- #endif
- 
--#if defined(__HAIKU__)
--#include <os/kernel/OS.h>
--#include <os/storage/Path.h>
--#endif
--
--#if defined(__BEOS__) && !defined(__ZETA__) && !defined(__HAIKU__)
-+#if defined(__BEOS__) && !defined(__ZETA__)
- #include <be/kernel/OS.h>
- #include <be/storage/Path.h>
- 
-diff --git a/Source/kwsys/testDynamicLoader.cxx b/Source/kwsys/testDynamicLoader.cxx
-index a7adbca..16b89ad 100644
---- a/Source/kwsys/testDynamicLoader.cxx
-+++ b/Source/kwsys/testDynamicLoader.cxx
-@@ -15,14 +15,10 @@
- #include KWSYS_HEADER(ios/iostream)
- #include KWSYS_HEADER(stl/string)
- 
--#if defined(__BEOS__) && !defined(__HAIKU__)
-+#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 --git a/Source/kwsys/testProcess.c b/Source/kwsys/testProcess.c
-index 877002a..17a068c 100644
---- a/Source/kwsys/testProcess.c
-+++ b/Source/kwsys/testProcess.c
-@@ -32,7 +32,7 @@
- # pragma warn -8060 /* possibly incorrect assignment */
- #endif
- 
--#if defined(__BEOS__) && !defined(__ZETA__) && !defined(__HAIKU__)
-+#if defined(__BEOS__) && !defined(__ZETA__)
- /* 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 --git a/Tests/Complex/Library/CMakeLists.txt b/Tests/Complex/Library/CMakeLists.txt
-index 281e48a..7d8adb2 100644
---- a/Tests/Complex/Library/CMakeLists.txt
-+++ b/Tests/Complex/Library/CMakeLists.txt
-@@ -52,9 +52,9 @@ DEFINE_PROPERTY(
-   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(NOT BEOS AND NOT WIN32)
-+ENDIF(NOT BEOS AND NOT WIN32 AND NOT HAIKU)
- GET_TARGET_PROPERTY(FOO_BAR_VAR CMakeTestCLibraryShared FOO)
- IF(${FOO_BAR_VAR} MATCHES "BAR")
- ELSE(${FOO_BAR_VAR} MATCHES "BAR")
-diff --git a/Tests/ComplexOneConfig/Library/CMakeLists.txt b/Tests/ComplexOneConfig/Library/CMakeLists.txt
-index 281e48a..7d8adb2 100644
---- a/Tests/ComplexOneConfig/Library/CMakeLists.txt
-+++ b/Tests/ComplexOneConfig/Library/CMakeLists.txt
-@@ -52,9 +52,9 @@ DEFINE_PROPERTY(
-   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(NOT BEOS AND NOT WIN32)
-+ENDIF(NOT BEOS AND NOT WIN32 AND NOT HAIKU)
- GET_TARGET_PROPERTY(FOO_BAR_VAR CMakeTestCLibraryShared FOO)
- IF(${FOO_BAR_VAR} MATCHES "BAR")
- ELSE(${FOO_BAR_VAR} MATCHES "BAR")
-diff --git a/Tests/ComplexRelativePaths/Library/CMakeLists.txt b/Tests/ComplexRelativePaths/Library/CMakeLists.txt
-index 281e48a..7d8adb2 100644
---- a/Tests/ComplexRelativePaths/Library/CMakeLists.txt
-+++ b/Tests/ComplexRelativePaths/Library/CMakeLists.txt
-@@ -52,9 +52,9 @@ DEFINE_PROPERTY(
-   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(NOT BEOS AND NOT WIN32)
-+ENDIF(NOT BEOS AND NOT WIN32 AND NOT HAIKU)
- GET_TARGET_PROPERTY(FOO_BAR_VAR CMakeTestCLibraryShared FOO)
- IF(${FOO_BAR_VAR} MATCHES "BAR")
- ELSE(${FOO_BAR_VAR} MATCHES "BAR")
-diff --git a/Utilities/cmcurl/CMake/CurlTests.c b/Utilities/cmcurl/CMake/CurlTests.c
-index d74a4f0..c5ba7c2 100644
---- a/Utilities/cmcurl/CMake/CurlTests.c
-+++ b/Utilities/cmcurl/CMake/CurlTests.c
-@@ -38,7 +38,7 @@ main ()
- # 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 --git a/Utilities/cmcurl/select.c b/Utilities/cmcurl/select.c
-index 51adbcf..82f9dc2 100644
---- a/Utilities/cmcurl/select.c
-+++ b/Utilities/cmcurl/select.c
-@@ -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 --git a/Utilities/cmzlib/zconf.h b/Utilities/cmzlib/zconf.h
-index 6eb52d1..7a3b6fd 100644
---- a/Utilities/cmzlib/zconf.h
-+++ b/Utilities/cmzlib/zconf.h
-@@ -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 --git a/Utilities/cmzlib/zutil.h b/Utilities/cmzlib/zutil.h
-index 74ef1f8..3053cd8 100644
---- a/Utilities/cmzlib/zutil.h
-+++ b/Utilities/cmzlib/zutil.h
-@@ -147,12 +147,6 @@ extern const char * const z_errmsg[10]; /* indexed by 2-zlib_error */
- #  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/bootstrap b/bootstrap
-index c999888..c573a90 100755
---- a/bootstrap
-+++ b/bootstrap
-@@ -142,7 +142,9 @@ if ${cmake_system_mingw}; then
-     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/packages/cmake-${cmake_version}"
- else
-   cmake_default_prefix="/usr/local"
- fi
--- 
-1.7.10.2
-
diff --git a/dev-util/cmake/patches/cmake-3.0.0_git.patchset b/dev-util/cmake/patches/cmake-3.0.0_git.patchset
new file mode 100644
index 000000000..1c97ac007
--- /dev/null
+++ b/dev-util/cmake/patches/cmake-3.0.0_git.patchset
@@ -0,0 +1,1120 @@
+From d96821f7bb988822d4d24aea8a5f1eb68076b600 Mon Sep 17 00:00:00 2001
+From: Adrien Destugues <pulkomandy@pulkomandy.tk>
+Date: Mon, 3 Mar 2014 15:47:08 +0100
+Subject: Haiku: Enable CMake builtin ELF editor
+
+Co-Author: Brad King <brad.king@kitware.com>
+
+diff --git a/Source/CMakeLists.txt b/Source/CMakeLists.txt
+index 762470f..27d099d 100644
+--- a/Source/CMakeLists.txt
++++ b/Source/CMakeLists.txt
+@@ -18,6 +18,23 @@ else()
+ endif()
+ if(HAVE_ELF_H)
+   set(CMAKE_USE_ELF_PARSER 1)
++elseif(HAIKU)
++  # On Haiku, we need to include elf32.h from the private headers
++  set(CMake_HAIKU_INCLUDE_DIRS
++    /boot/system/develop/headers/private/system
++    /boot/system/develop/headers/private/system/arch/x86
++    )
++
++  set(CMAKE_REQUIRED_INCLUDES ${CMake_HAIKU_INCLUDE_DIRS})
++  CHECK_INCLUDE_FILE("elf32.h" HAVE_ELF32_H)
++  unset(CMAKE_REQUIRED_INCLUDES)
++
++  if(HAVE_ELF32_H)
++    set(CMAKE_USE_ELF_PARSER 1)
++  else()
++    unset(CMake_HAIKU_INCLUDE_DIRS)
++    set(CMAKE_USE_ELF_PARSER)
++  endif()
+ else()
+   set(CMAKE_USE_ELF_PARSER)
+ endif()
+@@ -57,6 +74,7 @@ include_directories(
+   ${CMAKE_EXPAT_INCLUDES}
+   ${CMAKE_TAR_INCLUDES}
+   ${CMAKE_COMPRESS_INCLUDES}
++  ${CMake_HAIKU_INCLUDE_DIRS}
+   )
+ 
+ # let cmake know it is supposed to use it
+diff --git a/Source/cmELF.cxx b/Source/cmELF.cxx
+index bc1c25b..dc6772c 100644
+--- a/Source/cmELF.cxx
++++ b/Source/cmELF.cxx
+@@ -23,6 +23,26 @@
+ #if defined(__OpenBSD__)
+ # include <stdint.h>
+ # include <elf_abi.h>
++#elif defined(__HAIKU__)
++# include <elf32.h>
++# include <elf64.h>
++  typedef struct Elf32_Ehdr Elf32_Ehdr;
++  typedef struct Elf32_Shdr Elf32_Shdr;
++  typedef struct Elf32_Sym Elf32_Sym;
++  typedef struct Elf32_Rel Elf32_Rel;
++  typedef struct Elf32_Rela Elf32_Rela;
++# define ELFMAG0 0x7F
++# define ELFMAG1 'E'
++# define ELFMAG2 'L'
++# define ELFMAG3 'F'
++# define ET_NONE 0
++# define ET_REL 1
++# define ET_EXEC 2
++# define ET_DYN 3
++# define ET_CORE 4
++# define EM_386 3
++# define EM_SPARC 2
++# define EM_PPC 20
+ #else
+ # include <elf.h>
+ #endif
+-- 
+1.8.3.4
+
+
+From 88fe347ab31291ec0535d4d4438717355544a191 Mon Sep 17 00:00:00 2001
+From: Adrien Destugues <pulkomandy@pulkomandy.tk>
+Date: Mon, 3 Mar 2014 15:57:05 +0100
+Subject: Haiku: Fix compiler detection when using distcc
+
+Also remove outdated include directories.
+
+diff --git a/Modules/Platform/Haiku.cmake b/Modules/Platform/Haiku.cmake
+index 825f851..dfc2664 100644
+--- a/Modules/Platform/Haiku.cmake
++++ b/Modules/Platform/Haiku.cmake
+@@ -21,18 +21,26 @@ set(CMAKE_EXE_EXPORTS_C_FLAG "-Wl,--export-dynamic")
+ # "/boot/system/develop/lib/<subdir>/", which we assume to be the secondary
+ # architecture specific subdirectory and extract the name of the architecture
+ # accordingly.
+-set(__HAIKU_COMPILER ${CMAKE_C_COMPILER})
+ 
+-if(NOT __HAIKU_COMPILER)
++# First of all, find a C or C++ compiler we can run. The "arg1" is necessary
++# here for compilers such as "distcc gcc-x86" or "ccache gcc-x86"
++# TODO See CMakeDetermineCompilerId.cmake for some more things we may want to do.
++if(CMAKE_C_COMPILER)
++  set(__HAIKU_COMPILER ${CMAKE_C_COMPILER})
++  string (STRIP "${CMAKE_C_COMPILER_ARG1}" __HAIKU_COMPILER_FLAGS)
++else()
+   set(__HAIKU_COMPILER ${CMAKE_CXX_COMPILER})
++  string (STRIP "${CMAKE_CXX_COMPILER_ARG1}" __HAIKU_COMPILER_FLAGS)
+ endif()
+ 
++
+ execute_process(
+-  COMMAND ${__HAIKU_COMPILER} -print-search-dirs
++  COMMAND ${__HAIKU_COMPILER} ${__HAIKU_COMPILER_FLAGS} -print-search-dirs
+   OUTPUT_VARIABLE _HAIKU_SEARCH_DIRS
++  RESULT_VARIABLE _HAIKU_SEARCH_DIRS_FOUND
+   OUTPUT_STRIP_TRAILING_WHITESPACE)
+ 
+-string(REGEX MATCH ".*\nlibraries: =?([^\n]*:)?/boot/system/develop/lib/([^/]*)/(:[^\n]*)?\n.*" _dummy "\n${_HAIKU_SEARCH_DIRS}\n")
++string(REGEX MATCH "libraries: =?([^\n]*:)?/boot/system/develop/lib/([^/]*)/?(:?\n+)" _dummy "${_HAIKU_SEARCH_DIRS}\n")
+ set(CMAKE_HAIKU_SECONDARY_ARCH "${CMAKE_MATCH_2}")
+ 
+ if(NOT CMAKE_HAIKU_SECONDARY_ARCH)
+@@ -53,14 +61,12 @@ else()
+ endif()
+ 
+ list(APPEND CMAKE_SYSTEM_PREFIX_PATH
+-  /boot/common/non-packaged
+-  /boot/common
++  /boot/system/non-packaged
+   /boot/system
+   )
+ 
+ LIST(APPEND CMAKE_HAIKU_COMMON_INCLUDE_DIRECTORIES
+-  /boot/common/non-packaged/develop/headers${CMAKE_HAIKU_SECONDARY_ARCH_SUBDIR}
+-  /boot/common/develop/headers${CMAKE_HAIKU_SECONDARY_ARCH_SUBDIR}
++  /boot/system/non-packaged/develop/headers${CMAKE_HAIKU_SECONDARY_ARCH_SUBDIR}
+   /boot/system/develop/headers/os
+   /boot/system/develop/headers/os/app
+   /boot/system/develop/headers/os/device
+@@ -108,8 +114,7 @@ LIST(APPEND CMAKE_HAIKU_CXX_INCLUDE_DIRECTORIES
+ LIST(APPEND CMAKE_SYSTEM_INCLUDE_PATH ${CMAKE_HAIKU_C_INCLUDE_DIRECTORIES})
+ 
+ LIST(APPEND CMAKE_HAIKU_DEVELOP_LIB_DIRECTORIES
+-  /boot/common/non-packaged/develop/lib${CMAKE_HAIKU_SECONDARY_ARCH_SUBDIR}
+-  /boot/common/develop/lib${CMAKE_HAIKU_SECONDARY_ARCH_SUBDIR}
++  /boot/system/non-packaged/develop/lib${CMAKE_HAIKU_SECONDARY_ARCH_SUBDIR}
+   /boot/system/develop/lib${CMAKE_HAIKU_SECONDARY_ARCH_SUBDIR}
+   )
+ 
+@@ -120,6 +125,6 @@ LIST(APPEND CMAKE_PLATFORM_IMPLICIT_LINK_DIRECTORIES
+ LIST(APPEND CMAKE_SYSTEM_LIBRARY_PATH ${CMAKE_HAIKU_DEVELOP_LIB_DIRECTORIES})
+ 
+ if(CMAKE_INSTALL_PREFIX_INITIALIZED_TO_DEFAULT)
+-  set(CMAKE_INSTALL_PREFIX "/boot/common" CACHE PATH
++  set(CMAKE_INSTALL_PREFIX "/boot/system" CACHE PATH
+     "Install path prefix, prepended onto install directories." FORCE)
+ endif()
+-- 
+1.8.3.4
+
+
+From 5d126e36b08d159cccb3eeddbfa3b9432b6521a3 Mon Sep 17 00:00:00 2001
+From: Adrien Destugues <pulkomandy@pulkomandy.tk>
+Date: Mon, 3 Mar 2014 15:51:49 +0100
+Subject: CPack: Add HPKG generation support
+
+Use "make package" to get an hpkg out of any cmake-based buildsystem.
+
+diff --git a/Modules/CPackHpkg.cmake b/Modules/CPackHpkg.cmake
+new file mode 100644
+index 0000000..772f422
+--- /dev/null
++++ b/Modules/CPackHpkg.cmake
+@@ -0,0 +1,296 @@
++##section Variables specific to CPack Haiku (HPKG) generator
++##end
++##module
++# - The builtin (binary) CPack Haiku generator (Haiku only)
++# CPackHaiku may be used to create Haiku packages using CPack.
++# CPackHaiku is a CPack generator thus it uses the CPACK_XXX variables
++# used by CPack : http://www.cmake.org/Wiki/CMake:CPackConfiguration.
++# CPackHaiku will work only on haiku as it uss the 'package' tool available
++# there. With the custom archive format and compression algorithm, there is
++# currently no better way.
++#
++# CPackHaiku has specific features which are controlled by
++# the specifics CPACK_HAIKU_XXX variables.You'll find a detailed usage on
++# the wiki:
++#  http://www.cmake.org/Wiki/CMake:CPackPackageGenerators#HAIKU_.28HAIKU_only.29
++# However as a handy reminder here comes the list of specific variables:
++##end
++#
++##variable
++# CPACK_HAIKU_PACKAGE_NAME
++#     Mandatory : YES
++#     Default   : CPACK_PACKAGE_NAME (lower case)
++#     The haiku package name
++##end
++##variable
++# CPACK_HAIKU_PACKAGE_VERSION
++#     Mandatory : YES
++#     Default   : CPACK_PACKAGE_VERSION
++#     The haiku package version
++##end
++##variable
++# CPACK_HAIKU_PACKAGE_REVISION
++#     Mandatory : YES
++#     Default   : 1
++#     The haiku package version
++##end
++##variable
++# CPACK_HAIKU_PACKAGE_ARCHITECTURE
++#     Mandatory : YES
++#     Default   : $ENV{BE_SYSTEM_CPU}, or x86_gcc2 if using gcc2.
++#     The haiku package architecture
++##end
++##variable
++# CPACK_HAIKU_PACKAGE_PACKAGER
++#     Mandatory : YES
++#     Default   : CPACK_PACKAGE_CONTACT
++#     The haiku package maintainer e-mail address
++##end
++##variable
++# CPACK_HAIKU_PACKAGE_VENDOR
++#     Mandatory : YES
++#     Default   : CPACK_PACKAGE_VENDOR
++#     The haiku package vendor
++##end
++##variable
++# CPACK_HAIKU_PACKAGE_DESCRIPTION
++#     Mandatory : YES
++#     Default   : CPACK_PACKAGE_DESCRIPTION
++#     The haiku package description
++##end
++##variable
++# CPACK_HAIKU_PACKAGE_DESCRIPTION_SUMMARY
++#     Mandatory : YES
++#     Default   : CPACK_PACKAGE_DESCRIPTION_SUMMARY
++#     The haiku package one-line description
++##end
++##variable
++# CPACK_HAIKU_PACKAGE_COPYRIGHT
++#     Mandatory : YES
++#     Default   : -
++#     The haiku package copyright holders
++##end
++##variable
++# CPACK_HAIKU_PACKAGE_LICENSES
++#     Mandatory : YES
++#     Default   : -
++#     The haiku package licenses. This must be available in /system/data/licenses,
++#     either provided by the package or one of the system-provided licenses.
++##end
++##variable
++# CPACK_HAIKU_PACKAGE_URL
++#     Mandatory : NO
++#     Default   : -
++#     The URL of the web site for this package, preferably (when applicable) the
++#     site from which the original source can be obtained and any additional
++#     upstream documentation or information may be found.
++#     The content of this field is a simple URL without any surrounding
++#     characters such as <>.
++##end
++##variable
++# CPACK_HAIKU_PACKAGE_DEBUG
++#     Mandatory : NO
++#     Default   : -
++#     May be set when invoking cpack in order to trace debug information
++#     during CPackHpkg run.
++##end
++##variable
++# CPACK_HAIKU_PACKAGE_PREREQUIRES
++#     Mandatory : NO
++#     Default   : -
++#     This is similar to REQUIRES, but the package will not be rebuilt. This
++#     makes it possible to have circular dependencies between prerequired
++#     packages
++##end
++##variable
++# CPACK_HAIKU_PACKAGE_SUPPLEMENTS
++#     Mandatory : NO
++#     Default   : -
++#     This field allow adding functionality to an existing package. This will
++#     be made visible to the original package in its private directory.
++#     It is used to declare that a package can enhance the functionality of another package.
++##end
++##variable
++# CPACK_HAIKU_PACKAGE_CONFLICTS
++#     Mandatory : NO
++#     Default   : -
++#     When one binary package declares a conflict with another using a Conflicts field,
++#     Haiku will refuse to allow them to be installed on the system at the same time.
++##end
++##variable
++# CPACK_HAIKU_PACKAGE_CONTROL_EXTRA
++#     Mandatory : NO
++#     Default   : -
++#     This variable allow advanced user to add other entries to the .PackageInfo file
++##end
++##variable
++# CPACK_HAIKU_<COMPONENT_>PACKAGE_PROVIDES
++#     Mandatory : YES
++#     Default   : -
++#     List of provided entries for the package, with version constraints.
++#     There should be an entry for each binary, application, library and add-on
++#     provided by the package. The packages always provides itself, there is no
++#     need for explicitly mentionning it in this variable.
++##end
++##variable
++# CPACK_HAIKU_<COMPONENT_>PACKAGE_REQUIRES
++#     Mandatory : NO
++#     Default   : -
++#     May be used to set package dependencies.
++##end
++
++
++#=============================================================================
++# Copyright 2007-2013 Kitware, Inc.
++# Copyright 2007-2009 Mathieu Malaterre <mathieu.malaterre@gmail.com>
++#
++# Distributed under the OSI-approved BSD License (the "License");
++# see accompanying file Copyright.txt for details.
++#
++# This software is distributed WITHOUT ANY WARRANTY; without even the
++# implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
++# See the License for more information.
++#=============================================================================
++# (To distribute this file outside of CMake, substitute the full
++#  License text for the above reference.)
++
++# CPack script for creating Haiku packages
++# Author: Adrien Destugues
++#
++# http://wiki.debian.org/HowToPackageForDebian
++
++if(CMAKE_BINARY_DIR)
++        message(FATAL_ERROR "CPackHpkg.cmake may only be used by CPack internally.")
++endif()
++
++if(NOT HAIKU)
++        message(FATAL_ERROR "CPackHpkg.cmake may only be used under Haiku.")
++endif()
++
++find_program(FAKEROOT_EXECUTABLE fakeroot)
++if(FAKEROOT_EXECUTABLE)
++  set(CPACK_DEBIAN_FAKEROOT_EXECUTABLE ${FAKEROOT_EXECUTABLE})
++endif()
++
++
++# Let's define the .PackageInfo file found in haiku package:
++
++# Package: (mandatory)
++if(NOT CPACK_HAIKU_PACKAGE_NAME)
++        string(TOLOWER "${CPACK_PACKAGE_NAME}" CPACK_HAIKU_PACKAGE_NAME)
++        string(REPLACE "_unspecified" "" CPACK_HAIKU_PACKAGE_NAME
++                "${CPACK_HAIKU_PACKAGE_NAME}")
++endif()
++
++# Version: (mandatory)
++if(NOT CPACK_HAIKU_PACKAGE_VERSION)
++  if(NOT CPACK_PACKAGE_VERSION)
++          message(FATAL_ERROR "CPackHpkg: Haiku package requires a package version")
++  endif()
++  set(CPACK_HAIKU_PACKAGE_VERSION ${CPACK_PACKAGE_VERSION})
++endif()
++
++# Revision: (mandatory)
++if(NOT CPACK_HAIKU_PACKAGE_REVISION)
++        set(CPACK_HAIKU_PACKAGE_REVISION 1)
++endif()
++
++# Architecture: (mandatory)
++if(NOT CPACK_HAIKU_PACKAGE_ARCHITECTURE)
++  if(NOT CMAKE_HAIKU_ARCHITECTURE)
++        message(FATAL_ERROR "CPackHpkg: Please set CPACK_HAIKU_PACKAGE_ARCHITECTURE or CMAKE_HAIKU_ARCHITECTURE")
++  endif()
++
++  set(CPACK_HAIKU_PACKAGE_ARCHITECTURE "${CMAKE_HAIKU_ARCHITECTURE}")
++endif()
++
++# have a look at get_property(result GLOBAL PROPERTY ENABLED_FEATURES),
++# this returns the successful find_package() calls, maybe this can help
++# Depends:
++# You should set: DEBIAN_PACKAGE_DEPENDS
++# TODO: automate 'objdump -p | grep NEEDED'
++if(NOT CPACK_HAIKU_PACKAGE_DEPENDS)
++        message(STATUS "CPACK_HAIKU_PACKAGE_DEPENDS not set, the package will have no dependencies.")
++endif()
++
++# Maintainer: (mandatory)
++if(NOT CPACK_HAIKU_PACKAGE_PACKAGER)
++  if(NOT CPACK_PACKAGE_CONTACT)
++          message(FATAL_ERROR "CPackHpkg: Haiku package requires a packager, set CPACK_PACKAGE_CONTACT or CPACK_HAIKU_PACKAGE_PACKAGER")
++  endif()
++  set(CPACK_HAIKU_PACKAGE_PACKAGER ${CPACK_PACKAGE_CONTACT})
++endif()
++
++# Vendor: (mandatory)
++if(NOT CPACK_HAIKU_PACKAGE_VENDOR)
++        if(NOT CPACK_PACKAGE_VENDOR)
++                message(FATAL_ERROR "CPackHpkg: Haiku package requires a vendor, set CPACK_PACKAGE_VENDOR or CPACK_HAIKU_PACKAGE_VENDOR")
++  endif()
++  set(CPACK_HAIKU_PACKAGE_VENDOR ${CPACK_PACKAGE_VENDOR})
++endif()
++
++# Copyright: (mandatory)
++if(NOT CPACK_HAIKU_PACKAGE_COPYRIGHT)
++        message(FATAL_ERROR "CPackHaiku: Haiku package requires a copyright for a package, set CPACK_HAIKU_PACKAGE_COPYRIGHT")
++endif()
++
++# License: (mandatory)
++if(NOT CPACK_HAIKU_PACKAGE_LICENSES)
++        message(FATAL_ERROR "CPackHaiku: Haiku package requires a copyright for a package, set CPACK_HAIKU_PACKAGE_LICENSES")
++endif()
++
++# Description: (mandatory)
++if(NOT CPACK_HAIKU_PACKAGE_DESCRIPTION)
++  if(NOT CPACK_PACKAGE_DESCRIPTION)
++          message(FATAL_ERROR "CPackHaiku: Haiku package requires a description for a package, set CPACK_PACKAGE_DESCRIPTION or CPACK_HAIKU_PACKAGE_DESCRIPTION")
++  endif()
++  set(CPACK_HAIKU_PACKAGE_DESCRIPTION ${CPACK_PACKAGE_DESCRIPTION})
++endif()
++
++# Summary: (mandatory)
++if(NOT CPACK_HAIKU_PACKAGE_DESCRIPTION_SUMMARY)
++        if(NOT CPACK_PACKAGE_DESCRIPTION_SUMMARY)
++                message(FATAL_ERROR "CPackHaiku: Haiku package requires a summary for a package, set CPACK_PACKAGE_DESCRIPTION_SUMMARY or CPACK_HAIKU_PACKAGE_DESCRIPTION_SUMMARY")
++  endif()
++  set(CPACK_HAIKU_PACKAGE_DESCRIPTION_SUMMARY ${CPACK_PACKAGE_DESCRIPTION_SUMMARY})
++endif()
++
++# Provides: (mandatory)
++if(NOT CPACK_HAIKU_PACKAGE_PROVIDES)
++        set(CPACK_HAIKU_PACKAGE_PROVIDES ${CPACK_HAIKU_PACKAGE_NAME})
++else()
++        set(CPACK_HAIKU_PACKAGE_PROVIDES ${CPACK_HAIKU_PACKAGE_NAME} ${CPACK_HAIKU_PACKAGE_PROVIDES})
++endif()
++
++# CPACK_DEBIAN_PACKAGE_CONTROL_EXTRA
++# This variable allow advanced user to add custom script to the control.tar.gz (inside the .deb archive)
++# Typical examples are:
++# - conffiles
++# - postinst
++# - postrm
++# - prerm"
++# Usage:
++# set(CPACK_DEBIAN_PACKAGE_CONTROL_EXTRA
++#    "${CMAKE_CURRENT_SOURCE_DIR/prerm;${CMAKE_CURRENT_SOURCE_DIR}/postrm")
++
++# Are we packaging components ?
++if(CPACK_HAIKU_PACKAGE_COMPONENT)
++        set(CPACK_HAIKU_PACKAGE_COMPONENT_PART_NAME "_${CPACK_HAIKU_PACKAGE_COMPONENT}")
++        string(TOLOWER "${CPACK_PACKAGE_NAME}${CPACK_HAIKU_PACKAGE_COMPONENT_PART_NAME}" CPACK_HAIKU_PACKAGE_NAME)
++else()
++        set(CPACK_HAIKU_PACKAGE_COMPONENT_PART_NAME "")
++endif()
++
++set(WDIR "${CPACK_TOPLEVEL_DIRECTORY}/${CPACK_PACKAGE_FILE_NAME}${CPACK_HAIKU_PACKAGE_COMPONENT_PART_PATH}")
++
++# Print out some debug information if we were asked for that
++if(CPACK_HAIKU_PACKAGE_DEBUG)
++   message("CPackHpkg:Debug: CPACK_TOPLEVEL_DIRECTORY          = ${CPACK_TOPLEVEL_DIRECTORY}")
++   message("CPackHpkg:Debug: CPACK_TOPLEVEL_TAG                = ${CPACK_TOPLEVEL_TAG}")
++   message("CPackHpkg:Debug: CPACK_TEMPORARY_DIRECTORY         = ${CPACK_TEMPORARY_DIRECTORY}")
++   message("CPackHpkg:Debug: CPACK_OUTPUT_FILE_NAME            = ${CPACK_OUTPUT_FILE_NAME}")
++   message("CPackHpkg:Debug: CPACK_OUTPUT_FILE_PATH            = ${CPACK_OUTPUT_FILE_PATH}")
++   message("CPackHpkg:Debug: CPACK_PACKAGE_FILE_NAME           = ${CPACK_PACKAGE_FILE_NAME}")
++   message("CPackHpkg:Debug: CPACK_PACKAGE_INSTALL_DIRECTORY   = ${CPACK_PACKAGE_INSTALL_DIRECTORY}")
++   message("CPackHpkg:Debug: CPACK_TEMPORARY_PACKAGE_FILE_NAME = ${CPACK_TEMPORARY_PACKAGE_FILE_NAME}")
++endif()
+diff --git a/Source/CMakeLists.txt b/Source/CMakeLists.txt
+index 27d099d..bbf979b 100644
+--- a/Source/CMakeLists.txt
++++ b/Source/CMakeLists.txt
+@@ -589,6 +589,12 @@ if(UNIX)
+     )
+ endif()
+ 
++if(HAIKU)
++  set(CPACK_SRCS ${CPACK_SRCS}
++    CPack/cmCPackHpkgGenerator.cxx
++  )
++endif()
++
+ if(WIN32)
+   set(CPACK_SRCS ${CPACK_SRCS}
+     CPack/WiX/cmCPackWIXGenerator.cxx
+diff --git a/Source/CPack/cmCPackGeneratorFactory.cxx b/Source/CPack/cmCPackGeneratorFactory.cxx
+index 9faf2b0..89cf7a8 100644
+--- a/Source/CPack/cmCPackGeneratorFactory.cxx
++++ b/Source/CPack/cmCPackGeneratorFactory.cxx
+@@ -42,6 +42,10 @@
+ #  include "WiX/cmCPackWIXGenerator.h"
+ #endif
+ 
++#ifdef __HAIKU__
++#  include "cmCPackHpkgGenerator.h"
++#endif
++
+ #include "cmCPackLog.h"
+ 
+ #if defined(__BORLANDC__)
+@@ -138,6 +142,13 @@ cmCPackGeneratorFactory::cmCPackGeneratorFactory()
+       cmCPackRPMGenerator::CreateGenerator);
+     }
+ #endif
++#if defined(__HAIKU__)
++  if (cmCPackHpkgGenerator::CanGenerate())
++  {
++    this->RegisterGenerator("HPKH", "Haiku Packages",
++      cmCPackHpkgGenerator::CreateGenerator);
++  }
++#endif
+ }
+ 
+ //----------------------------------------------------------------------
+diff --git a/Source/CPack/cmCPackHpkgGenerator.cxx b/Source/CPack/cmCPackHpkgGenerator.cxx
+new file mode 100644
+index 0000000..732777b
+--- /dev/null
++++ b/Source/CPack/cmCPackHpkgGenerator.cxx
+@@ -0,0 +1,509 @@
++/*============================================================================
++  CMake - Cross Platform Makefile Generator
++  Copyright 2000-2009 Kitware, Inc., Insight Software Consortium
++
++  Distributed under the OSI-approved BSD License (the "License");
++  see accompanying file Copyright.txt for details.
++
++  This software is distributed WITHOUT ANY WARRANTY; without even the
++  implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
++  See the License for more information.
++============================================================================*/
++#include "cmCPackHpkgGenerator.h"
++
++#include "cmSystemTools.h"
++#include "cmMakefile.h"
++#include "cmGeneratedFileStream.h"
++#include "cmCPackLog.h"
++
++#include <cmsys/SystemTools.hxx>
++#include <cmsys/Glob.hxx>
++
++#include <limits.h> // USHRT_MAX
++
++// NOTE:
++// Haiku .hpkg files are package using a custom compression and archive format.
++// The only way of creating them isusing the package tool provided with Haiku.
++
++//----------------------------------------------------------------------
++cmCPackHpkgGenerator::cmCPackHpkgGenerator()
++{
++}
++
++//----------------------------------------------------------------------
++cmCPackHpkgGenerator::~cmCPackHpkgGenerator()
++{
++}
++
++//----------------------------------------------------------------------
++int cmCPackHpkgGenerator::InitializeInternal()
++{
++  // Haiku packages are "rootless": the hierarchy inside them is relative to
++  // the package mount/install point.
++  this->SetOption("CPACK_PACKAGING_INSTALL_PREFIX", NULL);
++  if (cmSystemTools::IsOn(this->GetOption("CPACK_SET_DESTDIR")))
++    {
++    this->SetOption("CPACK_SET_DESTDIR", "I_OFF");
++    }
++  return this->Superclass::InitializeInternal();
++}
++
++//----------------------------------------------------------------------
++int cmCPackHpkgGenerator::PackageOnePack(std::string initialTopLevel,
++                                         std::string packageName)
++{
++  int retval = 1;
++  // Begin the archive for this pack
++  std::string localToplevel(initialTopLevel);
++  std::string packageFileName(
++    cmSystemTools::GetParentDirectory(toplevel.c_str())
++    );
++  std::string outputFileName(
++    std::string(this->GetOption("CPACK_PACKAGE_FILE_NAME"))
++    +"_"+packageName + this->GetOutputExtension()
++    );
++
++  cmCPackLogger(cmCPackLog::LOG_DEBUG,
++                "Packaging " << outputFileName << std::endl);
++
++  localToplevel += "/"+ packageName;
++  /* replace the TEMP DIRECTORY with the component one */
++  this->SetOption("CPACK_TEMPORARY_DIRECTORY",localToplevel.c_str());
++  packageFileName += "/"+ outputFileName;
++  /* replace proposed CPACK_OUTPUT_FILE_NAME */
++  this->SetOption("CPACK_OUTPUT_FILE_NAME",outputFileName.c_str());
++  /* replace the TEMPORARY package file name */
++  this->SetOption("CPACK_TEMPORARY_PACKAGE_FILE_NAME",
++                  packageFileName.c_str());
++  // Tell CPackHpkg.cmake the name of the component GROUP.
++  this->SetOption("CPACK_HAIKU_PACKAGE_COMPONENT",packageName.c_str());
++  // Tell CPackHpkg.cmake the path where the component is.
++  std::string component_path = "/";
++  component_path += packageName;
++  this->SetOption("CPACK_HAIKU_PACKAGE_COMPONENT_PART_PATH",
++                  component_path.c_str());
++  if (!this->ReadListFile("CPackHpkg.cmake"))
++    {
++    cmCPackLogger(cmCPackLog::LOG_ERROR,
++                  "Error while execution CPackHpkg.cmake" << std::endl);
++    retval = 0;
++    return retval;
++    }
++
++  cmsys::Glob gl;
++  std::string findExpr(this->GetOption("WDIR"));
++  findExpr += "/*";
++  gl.RecurseOn();
++  if ( !gl.FindFiles(findExpr) )
++    {
++    cmCPackLogger(cmCPackLog::LOG_ERROR,
++      "Cannot find any files in the installed directory" << std::endl);
++    return 0;
++    }
++  packageFiles = gl.GetFiles();
++
++  int res = createHpkg(packageName);
++  if (res != 1)
++    {
++    retval = 0;
++    }
++  // add the generated package to package file names list
++  packageFileNames.push_back(packageFileName);
++  return retval;
++}
++
++//----------------------------------------------------------------------
++int cmCPackHpkgGenerator::PackageComponents(bool ignoreGroup)
++{
++  int retval = 1;
++  /* Reset package file name list it will be populated during the
++   * component packaging run*/
++  packageFileNames.clear();
++  std::string initialTopLevel(this->GetOption("CPACK_TEMPORARY_DIRECTORY"));
++
++  cmCPackLogger(cmCPackLog::LOG_DEBUG,
++                "Packaging in components mode" << std::endl);
++
++  // The default behavior is to have one package by component group
++  // unless CPACK_COMPONENTS_IGNORE_GROUP is specified.
++  if (!ignoreGroup)
++    {
++    std::map<std::string, cmCPackComponentGroup>::iterator compGIt;
++    for (compGIt=this->ComponentGroups.begin();
++         compGIt!=this->ComponentGroups.end(); ++compGIt)
++      {
++      cmCPackLogger(cmCPackLog::LOG_VERBOSE, "Packaging component group: "
++                    << compGIt->first
++                    << std::endl);
++      // Begin the archive for this group
++      retval &= PackageOnePack(initialTopLevel,compGIt->first);
++      }
++    // Handle Orphan components (components not belonging to any groups)
++    std::map<std::string, cmCPackComponent>::iterator compIt;
++    for (compIt=this->Components.begin();
++         compIt!=this->Components.end(); ++compIt )
++      {
++      // Does the component belong to a group?
++      if (compIt->second.Group==NULL)
++        {
++        cmCPackLogger(cmCPackLog::LOG_VERBOSE,
++          "Component <"
++          << compIt->second.Name
++          << "> does not belong to any group, package it separately."
++          << std::endl);
++        // Begin the archive for this orphan component
++        retval &= PackageOnePack(initialTopLevel,compIt->first);
++        }
++      }
++    }
++  // CPACK_COMPONENTS_IGNORE_GROUPS is set
++  // We build 1 package per component
++  else
++    {
++    cmCPackLogger(cmCPackLog::LOG_DEBUG,
++                  "Groups are ignored" << std::endl);
++
++    std::map<std::string, cmCPackComponent>::iterator compIt;
++    for (compIt=this->Components.begin();
++         compIt!=this->Components.end(); ++compIt )
++      {
++      retval &= PackageOnePack(initialTopLevel,compIt->first);
++      }
++    }
++  return retval;
++}
++
++//----------------------------------------------------------------------
++int cmCPackHpkgGenerator::PackageComponentsAllInOne()
++{
++  int retval = 1;
++  std::string compInstDirName;
++  /* Reset package file name list it will be populated during the
++   * component packaging run*/
++  packageFileNames.clear();
++  std::string initialTopLevel(this->GetOption("CPACK_TEMPORARY_DIRECTORY"));
++
++  compInstDirName = "ALL_COMPONENTS_IN_ONE";
++
++  cmCPackLogger(cmCPackLog::LOG_VERBOSE,
++                "Packaging all groups in one package..."
++                "(CPACK_COMPONENTS_ALL_[GROUPS_]IN_ONE_PACKAGE is set)"
++                << std::endl);
++
++  cmCPackLogger(cmCPackLog::LOG_DEBUG,
++                "Packaging in all-in-one mode" << std::endl);
++
++  // The ALL GROUPS in ONE package case
++  std::string localToplevel(initialTopLevel);
++  std::string packageFileName(
++    cmSystemTools::GetParentDirectory(toplevel.c_str())
++    );
++  std::string outputFileName(
++    std::string(this->GetOption("CPACK_PACKAGE_FILE_NAME"))
++    + this->GetOutputExtension()
++    );
++  // all GROUP in one vs all COMPONENT in one
++  localToplevel += "/"+compInstDirName;
++
++  /* replace the TEMP DIRECTORY with the component one */
++  this->SetOption("CPACK_TEMPORARY_DIRECTORY",localToplevel.c_str());
++  packageFileName += "/"+ outputFileName;
++  /* replace proposed CPACK_OUTPUT_FILE_NAME */
++  this->SetOption("CPACK_OUTPUT_FILE_NAME",outputFileName.c_str());
++  /* replace the TEMPORARY package file name */
++  this->SetOption("CPACK_TEMPORARY_PACKAGE_FILE_NAME",
++                  packageFileName.c_str());
++  // Tell CPackHpkg.cmake the path where the component is.
++  std::string component_path = "/";
++  component_path += compInstDirName;
++  this->SetOption("CPACK_HPKG_PACKAGE_COMPONENT_PART_PATH",
++                  component_path.c_str());
++  if (!this->ReadListFile("CPackHpkg.cmake"))
++    {
++    cmCPackLogger(cmCPackLog::LOG_ERROR,
++                  "Error while execution CPackHpkg.cmake" << std::endl);
++    retval = 0;
++    return retval;
++    }
++
++  cmsys::Glob gl;
++  std::string findExpr(this->GetOption("WDIR"));
++  findExpr += "/*";
++  gl.RecurseOn();
++  if ( !gl.FindFiles(findExpr) )
++    {
++    cmCPackLogger(cmCPackLog::LOG_ERROR,
++      "Cannot find any files in the installed directory" << std::endl);
++    return 0;
++    }
++  packageFiles = gl.GetFiles();
++
++  int res = createHpkg();
++  if (res != 1)
++    {
++    retval = 0;
++    }
++  // add the generated package to package file names list
++  packageFileNames.push_back(packageFileName);
++  return retval;
++}
++
++//----------------------------------------------------------------------
++int cmCPackHpkgGenerator::PackageFiles()
++{
++  int retval = -1;
++
++  /* Are we in the component packaging case */
++  if (WantsComponentInstallation()) {
++  // CASE 1 : COMPONENT ALL-IN-ONE package
++  // If ALL GROUPS or ALL COMPONENTS in ONE package has been requested
++  // then the package file is unique and should be open here.
++  if (componentPackageMethod == ONE_PACKAGE)
++    {
++    return PackageComponentsAllInOne();
++    }
++  // CASE 2 : COMPONENT CLASSICAL package(s) (i.e. not all-in-one)
++  // There will be 1 package for each component group
++  // however one may require to ignore component group and
++  // in this case you'll get 1 package for each component.
++  else
++    {
++    return PackageComponents(componentPackageMethod ==
++                             ONE_PACKAGE_PER_COMPONENT);
++    }
++  }
++  // CASE 3 : NON COMPONENT package.
++  else
++    {
++    if (!this->ReadListFile("CPackHpkg.cmake"))
++      {
++      cmCPackLogger(cmCPackLog::LOG_ERROR,
++                    "Error while execution CPackHpkg.cmake" << std::endl);
++      retval = 0;
++      }
++    else
++      {
++      packageFiles = files;
++      return createHpkg();
++      }
++    }
++  return retval;
++}
++
++int cmCPackHpkgGenerator::createHpkg(std::string packageName)
++{
++  // .PackageInfo file
++  std::string infofilename;
++  infofilename = this->GetOption("WDIR");
++  infofilename += "/.PackageInfo";
++
++  std::string haiku_pkg_id = this->GetOption("CPACK_HAIKU_PACKAGE_NAME");
++  if(packageName == "Unspecified") {
++  // Remove package specifier for the "unspecified" package
++  haiku_pkg_id.erase(haiku_pkg_id.length() - packageName.length() - 1);
++  packageName = "";
++  } else if(packageName.length() > 0) {
++  packageName += "_";
++  }
++  // haiku policy enforce lower case for package name
++  std::string haiku_pkg_name = cmsys::SystemTools::LowerCase(haiku_pkg_id);
++
++  // mandatory entries:
++  const char* haiku_pkg_version =
++    this->GetOption("CPACK_HAIKU_PACKAGE_VERSION");
++  const char* haiku_pkg_revision =
++    this->GetOption("CPACK_HAIKU_PACKAGE_REVISION");
++  const char* haiku_pkg_arch =
++    this->GetOption("CPACK_HAIKU_PACKAGE_ARCHITECTURE");
++  const char* maintainer =  this->GetOption("CPACK_HAIKU_PACKAGE_PACKAGER");
++  const char* vendor =  this->GetOption("CPACK_HAIKU_PACKAGE_VENDOR");
++  const char* summary =
++    this->GetOption("CPACK_HAIKU_PACKAGE_DESCRIPTION_SUMMARY");
++  const char* desc =       this->GetOption("CPACK_HAIKU_PACKAGE_DESCRIPTION");
++  const char* copyrights = this->GetOption("CPACK_HAIKU_PACKAGE_COPYRIGHT");
++  const char* haiku_pkg_licenses =
++    this->GetOption("CPACK_HAIKU_PACKAGE_LICENSES");
++
++  // component-specific entries
++  std::string pkg_requires_option = "CPACK_HAIKU_" + packageName
++    + "PACKAGE_REQUIRES";
++  const char* haiku_pkg_dep = this->GetOption(pkg_requires_option.c_str());
++  std::string pkg_provides_option = "CPACK_HAIKU_" + packageName
++    + "PACKAGE_PROVIDES";
++  const char* haiku_pkg_provides =
++    this->GetOption(pkg_provides_option.c_str());
++
++  // optional entries
++  const char* haiku_pkg_url = this->GetOption("CPACK_HAIKU_PACKAGE_HOMEPAGE");
++  const char* haiku_pkg_enhances =
++    this->GetOption("CPACK_HAIKU_PACKAGE_ENHANCES");
++  const char* haiku_pkg_conflicts =
++    this->GetOption("CPACK_HAIKU_PACKAGE_CONFLICTS");
++  const char* haiku_pkg_replaces =
++    this->GetOption("CPACK_HAIKU_PACKAGE_REPLACES");
++
++  { // the scope is needed for cmGeneratedFileStream
++  cmGeneratedFileStream out(infofilename.c_str());
++  out << "name " << haiku_pkg_name << "\n";
++  out << "version " << haiku_pkg_version << "-" << haiku_pkg_revision << "\n";
++  out << "architecture " << haiku_pkg_arch << "\n";
++  if(haiku_pkg_dep && *haiku_pkg_dep)
++    {
++    out << "requires {";
++    std::vector<std::string> requiresList;
++    cmSystemTools::ExpandListArgument(haiku_pkg_dep, requiresList);
++    for(std::vector<std::string>::iterator i =
++          requiresList.begin(); i != requiresList.end(); ++i)
++      {
++      out << *i << "\n";
++      }
++
++    out << "}\n";
++    }
++  if(haiku_pkg_url && *haiku_pkg_url)
++    {
++    out << "urls " << haiku_pkg_url << "\n";
++    }
++  if (haiku_pkg_enhances && *haiku_pkg_enhances)
++    {
++    out << "freshens " << haiku_pkg_enhances << "\n";
++    }
++  if (haiku_pkg_conflicts && *haiku_pkg_conflicts)
++    {
++    out << "conflicts " << haiku_pkg_conflicts << "\n";
++    }
++  if (haiku_pkg_replaces && *haiku_pkg_replaces)
++    {
++    out << "replaces " << haiku_pkg_replaces << "\n";
++    }
++
++  out << "provides {";
++  std::vector<std::string> providesList;
++  cmSystemTools::ExpandListArgument(haiku_pkg_provides, providesList);
++  for(std::vector<std::string>::iterator i =
++        providesList.begin(); i != providesList.end(); ++i)
++    {
++    out << *i << "\n";
++    }
++
++  out << "}\n";
++
++  out << "licenses {";
++  std::vector<std::string> licensesList;
++  cmSystemTools::ExpandListArgument(haiku_pkg_licenses, licensesList);
++  for(std::vector<std::string>::iterator i =
++        licensesList.begin(); i != licensesList.end(); ++i)
++    {
++    out << "\"" << *i << "\"\n";
++    }
++
++  out << "}\n";
++
++  out << "copyrights {\"" << copyrights << "\"}\n";
++  out << "packager " << maintainer << "\n";
++  out << "vendor \"" << vendor << "\"\n";
++  out << "summary \"" << summary << "\"\n";
++  out << "description \"" << desc << "\"\n";
++  out << std::endl;
++  }
++
++  std::string cmd;
++  if (NULL != this->GetOption("CPACK_HAIKU_FAKEROOT_EXECUTABLE")) {
++  cmd += this->GetOption("CPACK_HAIKU_FAKEROOT_EXECUTABLE");
++  }
++  cmd += "package create ";
++  cmd += this->GetOption("CPACK_TEMPORARY_PACKAGE_FILE_NAME");
++
++  std::string output;
++  int retval = -1;
++  int res = cmSystemTools::RunSingleCommand(cmd.c_str(), &output,
++              &retval, this->GetOption("WDIR"), this->GeneratorVerbose, 0);
++
++  if ( !res || retval )
++    {
++    std::string tmpFile = this->GetOption("CPACK_TOPLEVEL_DIRECTORY");
++    tmpFile += "/Hpkg.log";
++    cmGeneratedFileStream ofs(tmpFile.c_str());
++    ofs << "# Run command: " << cmd.c_str() << std::endl
++        << "# Working directory: " << toplevel << std::endl
++        << "# Output:" << std::endl
++        << output.c_str() << std::endl;
++    cmCPackLogger(cmCPackLog::LOG_ERROR, "Problem running package command: "
++      << cmd.c_str() << std::endl
++      << "Please check " << tmpFile.c_str() << " for errors" << std::endl);
++    return 0;
++    }
++
++  const char* infoExtra =
++    this->GetOption("CPACK_HAIKU_PACKAGE_INFO_EXTRA");
++  if( infoExtra )
++    {
++    std::vector<std::string> controlExtraList;
++    cmSystemTools::ExpandListArgument(infoExtra, controlExtraList);
++    for(std::vector<std::string>::iterator i =
++          controlExtraList.begin(); i != controlExtraList.end(); ++i)
++      {
++      std::string filenamename =
++        cmsys::SystemTools::GetFilenameName(i->c_str());
++      std::string localcopy = this->GetOption("WDIR");
++      localcopy += "/";
++      localcopy += filenamename;
++      // if we can copy the file, it means it does exist, let's add it:
++      if( cmsys::SystemTools::CopyFileIfDifferent(
++            i->c_str(), localcopy.c_str()) )
++        {
++        // haiku is picky and need relative to ./ path in the tar.gz
++        cmd += " ./";
++        cmd += filenamename;
++        }
++      }
++    }
++  res = cmSystemTools::RunSingleCommand(cmd.c_str(), &output,
++          &retval, this->GetOption("WDIR"), this->GeneratorVerbose, 0);
++
++  if ( !res || retval )
++    {
++    std::string tmpFile = this->GetOption("CPACK_TOPLEVEL_DIRECTORY");
++    tmpFile += "/Hpkg.log";
++    cmGeneratedFileStream ofs(tmpFile.c_str());
++    ofs << "# Run command: " << cmd.c_str() << std::endl
++        << "# Working directory: " << toplevel << std::endl
++        << "# Output:" << std::endl
++        << output.c_str() << std::endl;
++    cmCPackLogger(cmCPackLog::LOG_ERROR, "Problem running tar command: "
++      << cmd.c_str() << std::endl
++      << "Please check " << tmpFile.c_str() << " for errors" << std::endl);
++    return 0;
++    }
++
++  return 1;
++}
++
++bool cmCPackHpkgGenerator::SupportsComponentInstallation() const
++{
++  return true;
++}
++
++std::string cmCPackHpkgGenerator::GetComponentInstallDirNameSuffix(
++  const std::string& componentName)
++{
++  if (componentPackageMethod == ONE_PACKAGE_PER_COMPONENT) {
++  return componentName;
++  }
++
++  if (componentPackageMethod == ONE_PACKAGE) {
++  return std::string("ALL_COMPONENTS_IN_ONE");
++  }
++  // We have to find the name of the COMPONENT GROUP
++  // the current COMPONENT belongs to.
++  std::string groupVar = "CPACK_COMPONENT_" +
++    cmSystemTools::UpperCase(componentName) + "_GROUP";
++  if (NULL != GetOption(groupVar.c_str()))
++    {
++    return std::string(GetOption(groupVar.c_str()));
++    }
++  else
++    {
++    return componentName;
++    }
++}
+diff --git a/Source/CPack/cmCPackHpkgGenerator.h b/Source/CPack/cmCPackHpkgGenerator.h
+new file mode 100644
+index 0000000..ffa803d
+--- /dev/null
++++ b/Source/CPack/cmCPackHpkgGenerator.h
+@@ -0,0 +1,82 @@
++/*============================================================================
++  CMake - Cross Platform Makefile Generator
++  Copyright 2000-2013 Kitware, Inc.
++
++  Distributed under the OSI-approved BSD License (the "License");
++  see accompanying file Copyright.txt for details.
++
++  This software is distributed WITHOUT ANY WARRANTY; without even the
++  implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
++  See the License for more information.
++============================================================================*/
++
++#ifndef cmCPackHpkgGenerator_h
++#define cmCPackHpkgGenerator_h
++
++
++#include "cmCPackGenerator.h"
++
++/** \class cmCPackHpkgGenerator
++ * \brief A generator for Haiku packages
++ *
++ */
++class cmCPackHpkgGenerator : public cmCPackGenerator
++{
++public:
++  cmCPackTypeMacro(cmCPackHpkgGenerator, cmCPackGenerator);
++
++  /**
++   * Construct generator
++   */
++  cmCPackHpkgGenerator();
++  virtual ~cmCPackHpkgGenerator();
++
++  static bool CanGenerate()
++    {
++#ifdef __HAIKU__
++    return true;
++#else
++    // Sorry! Need the "package" tool from Haiku!
++    return false;
++#endif
++    }
++
++protected:
++  virtual int InitializeInternal();
++  /**
++   * This method factors out the work done in component packaging case.
++   */
++  int PackageOnePack(std::string initialToplevel, std::string packageName);
++  /**
++   * The method used to package files when component
++   * install is used. This will create one
++   * archive for each component group.
++   */
++  int PackageComponents(bool ignoreGroup);
++  /**
++   * Special case of component install where all
++   * components will be put in a single installer.
++   */
++  int PackageComponentsAllInOne();
++  virtual int PackageFiles();
++  virtual const char* GetOutputExtension() { return ".hpkg"; }
++  virtual enum CPackSetDestdirSupport SupportsSetDestdir() const
++    {
++    return SETDESTDIR_UNSUPPORTED;
++    }
++
++  virtual bool SupportsAbsoluteDestination() const
++    {
++    return false;
++    }
++  virtual bool SupportsComponentInstallation() const;
++  virtual std::string GetComponentInstallDirNameSuffix(
++      const std::string& componentName);
++
++private:
++  int createHpkg(std::string packageName = "");
++  std::vector<std::string> packageFiles;
++
++};
++
++#endif
+-- 
+1.8.3.4
+
diff --git a/dev-util/cmake/patches/cmake-3.0.0_rc1.patchset b/dev-util/cmake/patches/cmake-3.0.0_rc1.patchset
new file mode 100644
index 000000000..09491fcba
--- /dev/null
+++ b/dev-util/cmake/patches/cmake-3.0.0_rc1.patchset
@@ -0,0 +1,1295 @@
+From cec0c89807f9215ea077b7e9c14dc9d053919bd6 Mon Sep 17 00:00:00 2001
+From: Adrien Destugues <pulkomandy@pulkomandy.tk>
+Date: Mon, 3 Mar 2014 15:47:08 +0100
+Subject: Allow use of elf relocation on Haiku.
+
+This is needed to use the Ninja generator, which doesn't support the
+alternative methods.
+
+diff --git a/Source/CMakeLists.txt b/Source/CMakeLists.txt
+index 175a034..ae9e32e 100644
+--- a/Source/CMakeLists.txt
++++ b/Source/CMakeLists.txt
+@@ -19,7 +19,14 @@ endif()
+ if(HAVE_ELF_H)
+   set(CMAKE_USE_ELF_PARSER 1)
+ else()
+-  set(CMAKE_USE_ELF_PARSER)
++  # Haiku has the same API in a different file.
++  CHECK_INCLUDE_FILE("elf32.h" HAVE_ELF32_H
++	  "-I/boot/system/develop/headers/private/system -I/boot/system/develop/headers/private/system/arch/x86")
++  if(HAVE_ELF32_H)
++    set(CMAKE_USE_ELF_PARSER 1)
++  else()
++    set(CMAKE_USE_ELF_PARSER)
++  endif()
+ endif()
+ 
+ set(EXECUTABLE_OUTPUT_PATH ${CMake_BIN_DIR})
+@@ -452,6 +459,14 @@ if(APPLE)
+   target_link_libraries(CMakeLib "-framework CoreFoundation")
+ endif()
+ 
++# On Haiku, we need to include elf32.h from the private headers
++if(HAVE_ELF32_H)
++  include_directories(
++	"/boot/system/develop/headers/private/system"
++	"/boot/system/develop/headers/private/system/arch/x86"
++  )
++endif()
++
+ # On some platforms we need the rpcrt4 library for the VS 7 generators.
+ if(CMAKE_BUILD_ON_VISUAL_STUDIO OR MINGW)
+   target_link_libraries(CMakeLib rpcrt4)
+@@ -558,6 +573,12 @@ if(UNIX)
+     )
+ endif()
+ 
++if(HAIKU)
++  set(CPACK_SRCS ${CPACK_SRCS}
++    CPack/cmCPackHpkgGenerator.cxx
++  )
++endif()
++
+ if(WIN32)
+   set(CPACK_SRCS ${CPACK_SRCS}
+     CPack/WiX/cmCPackWIXGenerator.cxx
+diff --git a/Source/cmNinjaNormalTargetGenerator.cxx b/Source/cmNinjaNormalTargetGenerator.cxx
+index 73ba815..28cf0f3 100644
+--- a/Source/cmNinjaNormalTargetGenerator.cxx
++++ b/Source/cmNinjaNormalTargetGenerator.cxx
+@@ -591,7 +591,7 @@ void cmNinjaNormalTargetGenerator::WriteLinkStatement()
+       cmSystemTools::GetEnv(forceRspFile) == 0) {
+ #ifdef _WIN32
+     commandLineLengthLimit = 8000 - linkRuleLength;
+-#elif defined(__linux) || defined(__APPLE__)
++#elif defined(__linux) || defined(__APPLE__) || defined(__HAIKU__)
+     // for instance ARG_MAX is 2096152 on Ubuntu or 262144 on Mac
+     commandLineLengthLimit = ((int)sysconf(_SC_ARG_MAX))-linkRuleLength-1000;
+ #else
+diff --git a/Source/elf.h b/Source/elf.h
+new file mode 100644
+index 0000000..6b868bb
+--- /dev/null
++++ b/Source/elf.h
+@@ -0,0 +1,42 @@
++/*
++ * 
++ * /boot/common/include/elf.h
++ * 
++ * -I/system/develop/headers/private/system
++ * -I/system/develop/headers/private/system/arch_x86
++ *
++ * As found on other platforms, for benefit of GHC Haskell compiler, 
++ * Donn
++ * */
++
++#ifdef __HAIKU__
++
++#include <elf32.h>
++#include <elf64.h>
++
++typedef struct Elf32_Ehdr Elf32_Ehdr;
++typedef struct Elf32_Shdr Elf32_Shdr;
++typedef struct Elf32_Sym Elf32_Sym;
++typedef struct Elf32_Rel Elf32_Rel;
++typedef struct Elf32_Rela Elf32_Rela;
++
++#define ELFMAG0 0x7F
++#define ELFMAG1 'E'
++#define ELFMAG2 'L'
++#define ELFMAG3 'F'
++
++#define ET_NONE 0
++#define ET_REL 1
++#define ET_EXEC 2
++#define ET_DYN 3
++#define ET_CORE 4
++
++#define EM_386 3
++#define EM_SPARC 2
++#define EM_PPC 20
++
++#else
++
++#include_next <elf.h>
++
++#endif
+-- 
+1.8.3.4
+
+
+From a9a536582f3d035673438734cf6872871fce3605 Mon Sep 17 00:00:00 2001
+From: Adrien Destugues <pulkomandy@pulkomandy.tk>
+Date: Mon, 3 Mar 2014 15:51:49 +0100
+Subject: Add HPKG generation support to CPack.
+
+Use "make package" to get an hpkg out of any cmake-based buildsystem.
+
+diff --git a/Modules/CPackHpkg.cmake b/Modules/CPackHpkg.cmake
+new file mode 100644
+index 0000000..9b6917f
+--- /dev/null
++++ b/Modules/CPackHpkg.cmake
+@@ -0,0 +1,297 @@
++##section Variables specific to CPack Haiku (HPKG) generator
++##end
++##module
++# - The builtin (binary) CPack Haiku generator (Haiku only)
++# CPackHaiku may be used to create Haiku packages using CPack.
++# CPackHaiku is a CPack generator thus it uses the CPACK_XXX variables
++# used by CPack : http://www.cmake.org/Wiki/CMake:CPackConfiguration.
++# CPackHaiku will work only on haiku as it uss the 'package' tool available
++# there. With the custom archive format and compression algorithm, there is
++# currently no better way.
++#
++# CPackHaiku has specific features which are controlled by
++# the specifics CPACK_HAIKU_XXX variables.You'll find a detailed usage on
++# the wiki:
++#  http://www.cmake.org/Wiki/CMake:CPackPackageGenerators#HAIKU_.28HAIKU_only.29
++# However as a handy reminder here comes the list of specific variables:
++##end
++#
++##variable
++# CPACK_HAIKU_PACKAGE_NAME
++#     Mandatory : YES
++#     Default   : CPACK_PACKAGE_NAME (lower case)
++#     The haiku package name
++##end
++##variable
++# CPACK_HAIKU_PACKAGE_VERSION
++#     Mandatory : YES
++#     Default   : CPACK_PACKAGE_VERSION
++#     The haiku package version
++##end
++##variable
++# CPACK_HAIKU_PACKAGE_REVISION
++#     Mandatory : YES
++#     Default   : 1
++#     The haiku package version
++##end
++##variable
++# CPACK_HAIKU_PACKAGE_ARCHITECTURE
++#     Mandatory : YES
++#     Default   : $ENV{BE_SYSTEM_CPU}, or x86_gcc2 if using gcc2.
++#     The haiku package architecture
++##end
++##variable
++# CPACK_HAIKU_PACKAGE_PACKAGER
++#     Mandatory : YES
++#     Default   : CPACK_PACKAGE_CONTACT
++#     The haiku package maintainer e-mail address
++##end
++##variable
++# CPACK_HAIKU_PACKAGE_VENDOR
++#     Mandatory : YES
++#     Default   : CPACK_PACKAGE_VENDOR
++#     The haiku package vendor
++##end
++##variable
++# CPACK_HAIKU_PACKAGE_DESCRIPTION
++#     Mandatory : YES
++#     Default   : CPACK_PACKAGE_DESCRIPTION
++#     The haiku package description
++##end
++##variable
++# CPACK_HAIKU_PACKAGE_DESCRIPTION_SUMMARY
++#     Mandatory : YES
++#     Default   : CPACK_PACKAGE_DESCRIPTION_SUMMARY
++#     The haiku package one-line description
++##end
++##variable
++# CPACK_HAIKU_PACKAGE_COPYRIGHT
++#     Mandatory : YES
++#     Default   : -
++#     The haiku package copyright holders
++##end
++##variable
++# CPACK_HAIKU_PACKAGE_LICENSES
++#     Mandatory : YES
++#     Default   : -
++#     The haiku package licenses. This must be available in /system/data/licenses,
++#     either provided by the package or one of the system-provided licenses.
++##end
++##variable
++# CPACK_HAIKU_PACKAGE_URL
++#     Mandatory : NO
++#     Default   : -
++#     The URL of the web site for this package, preferably (when applicable) the
++#     site from which the original source can be obtained and any additional
++#     upstream documentation or information may be found.
++#     The content of this field is a simple URL without any surrounding
++#     characters such as <>.
++##end
++##variable
++# CPACK_HAIKU_PACKAGE_DEBUG
++#     Mandatory : NO
++#     Default   : -
++#     May be set when invoking cpack in order to trace debug information
++#     during CPackHpkg run.
++##end
++##variable
++# CPACK_HAIKU_PACKAGE_PREREQUIRES
++#     Mandatory : NO
++#     Default   : -
++#     This is similar to REQUIRES, but the package will not be rebuilt. This
++#     makes it possible to have circular dependencies between prerequired
++#     packages
++##end
++##variable
++# CPACK_HAIKU_PACKAGE_SUPPLEMENTS
++#     Mandatory : NO
++#     Default   : -
++#     This field allow adding functionality to an existing package. This will
++#     be made visible to the original package in its private directory.
++#     It is used to declare that a package can enhance the functionality of another package.
++##end
++##variable
++# CPACK_HAIKU_PACKAGE_CONFLICTS
++#     Mandatory : NO
++#     Default   : -
++#     When one binary package declares a conflict with another using a Conflicts field,
++#     Haiku will refuse to allow them to be installed on the system at the same time.
++##end
++##variable
++# CPACK_HAIKU_PACKAGE_CONTROL_EXTRA
++#     Mandatory : NO
++#     Default   : -
++#     This variable allow advanced user to add other entries to the .PackageInfo file
++##end
++##variable
++# CPACK_HAIKU_<COMPONENT_>PACKAGE_PROVIDES
++#     Mandatory : YES
++#     Default   : -
++#     List of provided entries for the package, with version constraints.
++#     There should be an entry for each binary, application, library and add-on
++#     provided by the package. The packages always provides itself, there is no
++#     need for explicitly mentionning it in this variable.
++##end
++##variable
++# CPACK_HAIKU_<COMPONENT_>PACKAGE_REQUIRES
++#     Mandatory : NO
++#     Default   : -
++#     May be used to set package dependencies.
++##end
++
++
++#=============================================================================
++# Copyright 2007-2013 Kitware, Inc.
++# Copyright 2007-2009 Mathieu Malaterre <mathieu.malaterre@gmail.com>
++#
++# Distributed under the OSI-approved BSD License (the "License");
++# see accompanying file Copyright.txt for details.
++#
++# This software is distributed WITHOUT ANY WARRANTY; without even the
++# implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
++# See the License for more information.
++#=============================================================================
++# (To distribute this file outside of CMake, substitute the full
++#  License text for the above reference.)
++
++# CPack script for creating Haiku packages
++# Author: Adrien Destugues
++#
++# http://wiki.debian.org/HowToPackageForDebian
++
++if(CMAKE_BINARY_DIR)
++	message(FATAL_ERROR "CPackHpkg.cmake may only be used by CPack internally.")
++endif()
++
++if(NOT HAIKU)
++	message(FATAL_ERROR "CPackHpkg.cmake may only be used under Haiku.")
++endif()
++
++find_program(FAKEROOT_EXECUTABLE fakeroot)
++if(FAKEROOT_EXECUTABLE)
++  set(CPACK_DEBIAN_FAKEROOT_EXECUTABLE ${FAKEROOT_EXECUTABLE})
++endif()
++
++
++# Let's define the .PackageInfo file found in haiku package:
++
++# Package: (mandatory)
++if(NOT CPACK_HAIKU_PACKAGE_NAME)
++	string(TOLOWER "${CPACK_PACKAGE_NAME}" CPACK_HAIKU_PACKAGE_NAME)
++	string(REPLACE "_unspecified" "" CPACK_HAIKU_PACKAGE_NAME
++		"${CPACK_HAIKU_PACKAGE_NAME}")
++endif()
++
++# Version: (mandatory)
++if(NOT CPACK_HAIKU_PACKAGE_VERSION)
++  if(NOT CPACK_PACKAGE_VERSION)
++	  message(FATAL_ERROR "CPackHpkg: Haiku package requires a package version")
++  endif()
++  set(CPACK_HAIKU_PACKAGE_VERSION ${CPACK_PACKAGE_VERSION})
++endif()
++
++# Revision: (mandatory)
++if(NOT CPACK_HAIKU_PACKAGE_REVISION)
++	set(CPACK_HAIKU_PACKAGE_REVISION 1)
++endif()
++
++# Architecture: (mandatory)
++if(NOT CPACK_HAIKU_PACKAGE_ARCHITECTURE)
++  if(NOT CMAKE_HAIKU_ARCHITECTURE)
++	message(FATAL_ERROR "CPackHpkg: Please set CPACK_HAIKU_PACKAGE_ARCHITECTURE or CMAKE_HAIKU_ARCHITECTURE")
++  endif()
++
++  set(CPACK_HAIKU_PACKAGE_ARCHITECTURE "${CMAKE_HAIKU_ARCHITECTURE}")
++endif()
++
++# have a look at get_property(result GLOBAL PROPERTY ENABLED_FEATURES),
++# this returns the successful find_package() calls, maybe this can help
++# Depends:
++# You should set: DEBIAN_PACKAGE_DEPENDS
++# TODO: automate 'objdump -p | grep NEEDED'
++if(NOT CPACK_HAIKU_PACKAGE_DEPENDS)
++	message(STATUS "CPACK_HAIKU_PACKAGE_DEPENDS not set, the package will have no dependencies.")
++endif()
++
++# Maintainer: (mandatory)
++if(NOT CPACK_HAIKU_PACKAGE_PACKAGER)
++  if(NOT CPACK_PACKAGE_CONTACT)
++	  message(FATAL_ERROR "CPackHpkg: Haiku package requires a packager, set CPACK_PACKAGE_CONTACT or CPACK_HAIKU_PACKAGE_PACKAGER")
++  endif()
++  set(CPACK_HAIKU_PACKAGE_PACKAGER ${CPACK_PACKAGE_CONTACT})
++endif()
++
++# Vendor: (mandatory)
++if(NOT CPACK_HAIKU_PACKAGE_VENDOR)
++	if(NOT CPACK_PACKAGE_VENDOR)
++		message(FATAL_ERROR "CPackHpkg: Haiku package requires a vendor, set CPACK_PACKAGE_VENDOR or CPACK_HAIKU_PACKAGE_VENDOR")
++  endif()
++  set(CPACK_HAIKU_PACKAGE_VENDOR ${CPACK_PACKAGE_VENDOR})
++endif()
++
++# Copyright: (mandatory)
++if(NOT CPACK_HAIKU_PACKAGE_COPYRIGHT)
++	message(FATAL_ERROR "CPackHaiku: Haiku package requires a copyright for a package, set CPACK_HAIKU_PACKAGE_COPYRIGHT")
++endif()
++
++# License: (mandatory)
++if(NOT CPACK_HAIKU_PACKAGE_LICENSES)
++	message(FATAL_ERROR "CPackHaiku: Haiku package requires a copyright for a package, set CPACK_HAIKU_PACKAGE_LICENSES")
++endif()
++
++# Description: (mandatory)
++if(NOT CPACK_HAIKU_PACKAGE_DESCRIPTION)
++  if(NOT CPACK_PACKAGE_DESCRIPTION)
++	  message(FATAL_ERROR "CPackHaiku: Haiku package requires a description for a package, set CPACK_PACKAGE_DESCRIPTION or CPACK_HAIKU_PACKAGE_DESCRIPTION")
++  endif()
++  set(CPACK_HAIKU_PACKAGE_DESCRIPTION ${CPACK_PACKAGE_DESCRIPTION})
++endif()
++
++# Summary: (mandatory)
++if(NOT CPACK_HAIKU_PACKAGE_DESCRIPTION_SUMMARY)
++	if(NOT CPACK_PACKAGE_DESCRIPTION_SUMMARY)
++		message(FATAL_ERROR "CPackHaiku: Haiku package requires a summary for a package, set CPACK_PACKAGE_DESCRIPTION_SUMMARY or CPACK_HAIKU_PACKAGE_DESCRIPTION_SUMMARY")
++  endif()
++  set(CPACK_HAIKU_PACKAGE_DESCRIPTION_SUMMARY ${CPACK_PACKAGE_DESCRIPTION_SUMMARY})
++endif()
++
++# Provides: (mandatory)
++if(NOT CPACK_HAIKU_PACKAGE_PROVIDES)
++	set(CPACK_HAIKU_PACKAGE_PROVIDES ${CPACK_HAIKU_PACKAGE_NAME})
++else()
++	set(CPACK_HAIKU_PACKAGE_PROVIDES ${CPACK_HAIKU_PACKAGE_NAME} ${CPACK_HAIKU_PACKAGE_PROVIDES})
++endif()
++
++# CPACK_DEBIAN_PACKAGE_CONTROL_EXTRA
++# This variable allow advanced user to add custom script to the control.tar.gz (inside the .deb archive)
++# Typical examples are:
++# - conffiles
++# - postinst
++# - postrm
++# - prerm"
++# Usage:
++# set(CPACK_DEBIAN_PACKAGE_CONTROL_EXTRA
++#    "${CMAKE_CURRENT_SOURCE_DIR/prerm;${CMAKE_CURRENT_SOURCE_DIR}/postrm")
++
++# Are we packaging components ?
++if(CPACK_HAIKU_PACKAGE_COMPONENT)
++	set(CPACK_HAIKU_PACKAGE_COMPONENT_PART_NAME "_${CPACK_HAIKU_PACKAGE_COMPONENT}")
++	string(TOLOWER "${CPACK_PACKAGE_NAME}${CPACK_HAIKU_PACKAGE_COMPONENT_PART_NAME}" CPACK_HAIKU_PACKAGE_NAME)
++else()
++	set(CPACK_HAIKU_PACKAGE_COMPONENT_PART_NAME "")
++endif()
++
++set(WDIR "${CPACK_TOPLEVEL_DIRECTORY}/${CPACK_PACKAGE_FILE_NAME}${CPACK_HAIKU_PACKAGE_COMPONENT_PART_PATH}")
++
++# Print out some debug information if we were asked for that
++if(CPACK_HAIKU_PACKAGE_DEBUG)
++   message("CPackHpkg:Debug: CPACK_TOPLEVEL_DIRECTORY          = ${CPACK_TOPLEVEL_DIRECTORY}")
++   message("CPackHpkg:Debug: CPACK_TOPLEVEL_TAG                = ${CPACK_TOPLEVEL_TAG}")
++   message("CPackHpkg:Debug: CPACK_TEMPORARY_DIRECTORY         = ${CPACK_TEMPORARY_DIRECTORY}")
++   message("CPackHpkg:Debug: CPACK_OUTPUT_FILE_NAME            = ${CPACK_OUTPUT_FILE_NAME}")
++   message("CPackHpkg:Debug: CPACK_OUTPUT_FILE_PATH            = ${CPACK_OUTPUT_FILE_PATH}")
++   message("CPackHpkg:Debug: CPACK_PACKAGE_FILE_NAME           = ${CPACK_PACKAGE_FILE_NAME}")
++   message("CPackHpkg:Debug: CPACK_PACKAGE_INSTALL_DIRECTORY   = ${CPACK_PACKAGE_INSTALL_DIRECTORY}")
++   message("CPackHpkg:Debug: CPACK_TEMPORARY_PACKAGE_FILE_NAME = ${CPACK_TEMPORARY_PACKAGE_FILE_NAME}")
++endif()
++
+diff --git a/Source/CPack/cmCPackGeneratorFactory.cxx b/Source/CPack/cmCPackGeneratorFactory.cxx
+index b36c2a2..29d4c3c 100644
+--- a/Source/CPack/cmCPackGeneratorFactory.cxx
++++ b/Source/CPack/cmCPackGeneratorFactory.cxx
+@@ -42,6 +42,10 @@
+ #  include "WiX/cmCPackWIXGenerator.h"
+ #endif
+ 
++#ifdef __HAIKU__
++#  include "cmCPackHpkgGenerator.h"
++#endif
++
+ #include "cmCPackLog.h"
+ 
+ #if defined(__BORLANDC__)
+@@ -138,6 +142,13 @@ cmCPackGeneratorFactory::cmCPackGeneratorFactory()
+       cmCPackRPMGenerator::CreateGenerator);
+     }
+ #endif
++#if defined(__HAIKU__)
++  if (cmCPackHpkgGenerator::CanGenerate())
++  {
++    this->RegisterGenerator("HPKH", "Haiku Packages",
++      cmCPackHpkgGenerator::CreateGenerator);
++  }
++#endif
+ }
+ 
+ //----------------------------------------------------------------------
+diff --git a/Source/CPack/cmCPackHpkgGenerator.cxx b/Source/CPack/cmCPackHpkgGenerator.cxx
+new file mode 100644
+index 0000000..f4933cf
+--- /dev/null
++++ b/Source/CPack/cmCPackHpkgGenerator.cxx
+@@ -0,0 +1,509 @@
++/*============================================================================
++  CMake - Cross Platform Makefile Generator
++  Copyright 2000-2009 Kitware, Inc., Insight Software Consortium
++
++  Distributed under the OSI-approved BSD License (the "License");
++  see accompanying file Copyright.txt for details.
++
++  This software is distributed WITHOUT ANY WARRANTY; without even the
++  implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
++  See the License for more information.
++============================================================================*/
++#include "cmCPackHpkgGenerator.h"
++
++#include "cmSystemTools.h"
++#include "cmMakefile.h"
++#include "cmGeneratedFileStream.h"
++#include "cmCPackLog.h"
++
++#include <cmsys/SystemTools.hxx>
++#include <cmsys/Glob.hxx>
++
++#include <limits.h> // USHRT_MAX
++
++// NOTE:
++// Haiku .hpkg files are package using a custom compression and archive format.
++// The only way of creating them isusing the package tool provided with Haiku.
++
++//----------------------------------------------------------------------
++cmCPackHpkgGenerator::cmCPackHpkgGenerator()
++{
++}
++
++//----------------------------------------------------------------------
++cmCPackHpkgGenerator::~cmCPackHpkgGenerator()
++{
++}
++
++//----------------------------------------------------------------------
++int cmCPackHpkgGenerator::InitializeInternal()
++{
++  // Haiku packages are "rootless": the hierarchy inside them is relative to
++  // the package mount/install point.
++  this->SetOption("CPACK_PACKAGING_INSTALL_PREFIX", NULL);
++  if (cmSystemTools::IsOn(this->GetOption("CPACK_SET_DESTDIR")))
++    {
++    this->SetOption("CPACK_SET_DESTDIR", "I_OFF");
++    }
++  return this->Superclass::InitializeInternal();
++}
++
++//----------------------------------------------------------------------
++int cmCPackHpkgGenerator::PackageOnePack(std::string initialTopLevel,
++                                        std::string packageName)
++  {
++  int retval = 1;
++  // Begin the archive for this pack
++  std::string localToplevel(initialTopLevel);
++  std::string packageFileName(
++      cmSystemTools::GetParentDirectory(toplevel.c_str())
++  );
++  std::string outputFileName(
++      std::string(this->GetOption("CPACK_PACKAGE_FILE_NAME"))
++  +"_"+packageName + this->GetOutputExtension()
++  );
++
++  cmCPackLogger(cmCPackLog::LOG_DEBUG,
++    "Packaging " << outputFileName << std::endl);
++
++  localToplevel += "/"+ packageName;
++  /* replace the TEMP DIRECTORY with the component one */
++  this->SetOption("CPACK_TEMPORARY_DIRECTORY",localToplevel.c_str());
++  packageFileName += "/"+ outputFileName;
++  /* replace proposed CPACK_OUTPUT_FILE_NAME */
++  this->SetOption("CPACK_OUTPUT_FILE_NAME",outputFileName.c_str());
++  /* replace the TEMPORARY package file name */
++  this->SetOption("CPACK_TEMPORARY_PACKAGE_FILE_NAME",
++      packageFileName.c_str());
++  // Tell CPackHpkg.cmake the name of the component GROUP.
++  this->SetOption("CPACK_HAIKU_PACKAGE_COMPONENT",packageName.c_str());
++  // Tell CPackHpkg.cmake the path where the component is.
++  std::string component_path = "/";
++  component_path += packageName;
++  this->SetOption("CPACK_HAIKU_PACKAGE_COMPONENT_PART_PATH",
++                  component_path.c_str());
++  if (!this->ReadListFile("CPackHpkg.cmake"))
++    {
++    cmCPackLogger(cmCPackLog::LOG_ERROR,
++        "Error while execution CPackHpkg.cmake" << std::endl);
++    retval = 0;
++    return retval;
++    }
++
++  cmsys::Glob gl;
++  std::string findExpr(this->GetOption("WDIR"));
++  findExpr += "/*";
++  gl.RecurseOn();
++  if ( !gl.FindFiles(findExpr) )
++    {
++    cmCPackLogger(cmCPackLog::LOG_ERROR,
++        "Cannot find any files in the installed directory" << std::endl);
++    return 0;
++    }
++  packageFiles = gl.GetFiles();
++
++  int res = createHpkg(packageName);
++  if (res != 1)
++    {
++    retval = 0;
++    }
++  // add the generated package to package file names list
++  packageFileNames.push_back(packageFileName);
++  return retval;
++}
++
++//----------------------------------------------------------------------
++int cmCPackHpkgGenerator::PackageComponents(bool ignoreGroup)
++{
++  int retval = 1;
++  /* Reset package file name list it will be populated during the
++   * component packaging run*/
++  packageFileNames.clear();
++  std::string initialTopLevel(this->GetOption("CPACK_TEMPORARY_DIRECTORY"));
++
++  cmCPackLogger(cmCPackLog::LOG_DEBUG,
++    "Packaging in components mode" << std::endl);
++
++  // The default behavior is to have one package by component group
++  // unless CPACK_COMPONENTS_IGNORE_GROUP is specified.
++  if (!ignoreGroup)
++    {
++    std::map<std::string, cmCPackComponentGroup>::iterator compGIt;
++    for (compGIt=this->ComponentGroups.begin();
++        compGIt!=this->ComponentGroups.end(); ++compGIt)
++      {
++      cmCPackLogger(cmCPackLog::LOG_VERBOSE, "Packaging component group: "
++          << compGIt->first
++          << std::endl);
++      // Begin the archive for this group
++      retval &= PackageOnePack(initialTopLevel,compGIt->first);
++      }
++    // Handle Orphan components (components not belonging to any groups)
++    std::map<std::string, cmCPackComponent>::iterator compIt;
++    for (compIt=this->Components.begin();
++        compIt!=this->Components.end(); ++compIt )
++      {
++      // Does the component belong to a group?
++      if (compIt->second.Group==NULL)
++        {
++        cmCPackLogger(cmCPackLog::LOG_VERBOSE,
++            "Component <"
++            << compIt->second.Name
++            << "> does not belong to any group, package it separately."
++            << std::endl);
++        // Begin the archive for this orphan component
++        retval &= PackageOnePack(initialTopLevel,compIt->first);
++        }
++      }
++    }
++  // CPACK_COMPONENTS_IGNORE_GROUPS is set
++  // We build 1 package per component
++  else
++    {
++    cmCPackLogger(cmCPackLog::LOG_DEBUG,
++      "Groups are ignored" << std::endl);
++
++    std::map<std::string, cmCPackComponent>::iterator compIt;
++    for (compIt=this->Components.begin();
++         compIt!=this->Components.end(); ++compIt )
++      {
++      retval &= PackageOnePack(initialTopLevel,compIt->first);
++      }
++    }
++  return retval;
++}
++
++//----------------------------------------------------------------------
++int cmCPackHpkgGenerator::PackageComponentsAllInOne()
++{
++  int retval = 1;
++  std::string compInstDirName;
++  /* Reset package file name list it will be populated during the
++   * component packaging run*/
++  packageFileNames.clear();
++  std::string initialTopLevel(this->GetOption("CPACK_TEMPORARY_DIRECTORY"));
++
++  compInstDirName = "ALL_COMPONENTS_IN_ONE";
++
++  cmCPackLogger(cmCPackLog::LOG_VERBOSE,
++                "Packaging all groups in one package..."
++                "(CPACK_COMPONENTS_ALL_[GROUPS_]IN_ONE_PACKAGE is set)"
++      << std::endl);
++
++  cmCPackLogger(cmCPackLog::LOG_DEBUG,
++    "Packaging in all-in-one mode" << std::endl);
++
++  // The ALL GROUPS in ONE package case
++  std::string localToplevel(initialTopLevel);
++  std::string packageFileName(
++      cmSystemTools::GetParentDirectory(toplevel.c_str())
++                             );
++  std::string outputFileName(
++            std::string(this->GetOption("CPACK_PACKAGE_FILE_NAME"))
++            + this->GetOutputExtension()
++                            );
++  // all GROUP in one vs all COMPONENT in one
++  localToplevel += "/"+compInstDirName;
++
++  /* replace the TEMP DIRECTORY with the component one */
++  this->SetOption("CPACK_TEMPORARY_DIRECTORY",localToplevel.c_str());
++  packageFileName += "/"+ outputFileName;
++  /* replace proposed CPACK_OUTPUT_FILE_NAME */
++  this->SetOption("CPACK_OUTPUT_FILE_NAME",outputFileName.c_str());
++  /* replace the TEMPORARY package file name */
++  this->SetOption("CPACK_TEMPORARY_PACKAGE_FILE_NAME",
++      packageFileName.c_str());
++  // Tell CPackHpkg.cmake the path where the component is.
++  std::string component_path = "/";
++  component_path += compInstDirName;
++  this->SetOption("CPACK_HPKG_PACKAGE_COMPONENT_PART_PATH",
++                  component_path.c_str());
++  if (!this->ReadListFile("CPackHpkg.cmake"))
++    {
++    cmCPackLogger(cmCPackLog::LOG_ERROR,
++        "Error while execution CPackHpkg.cmake" << std::endl);
++    retval = 0;
++    return retval;
++    }
++
++  cmsys::Glob gl;
++  std::string findExpr(this->GetOption("WDIR"));
++  findExpr += "/*";
++  gl.RecurseOn();
++  if ( !gl.FindFiles(findExpr) )
++    {
++    cmCPackLogger(cmCPackLog::LOG_ERROR,
++    "Cannot find any files in the installed directory" << std::endl);
++    return 0;
++    }
++  packageFiles = gl.GetFiles();
++
++  int res = createHpkg();
++  if (res != 1)
++    {
++    retval = 0;
++    }
++  // add the generated package to package file names list
++  packageFileNames.push_back(packageFileName);
++  return retval;
++}
++
++//----------------------------------------------------------------------
++int cmCPackHpkgGenerator::PackageFiles()
++{
++  int retval = -1;
++
++  /* Are we in the component packaging case */
++  if (WantsComponentInstallation()) {
++    // CASE 1 : COMPONENT ALL-IN-ONE package
++    // If ALL GROUPS or ALL COMPONENTS in ONE package has been requested
++    // then the package file is unique and should be open here.
++    if (componentPackageMethod == ONE_PACKAGE)
++      {
++      return PackageComponentsAllInOne();
++      }
++    // CASE 2 : COMPONENT CLASSICAL package(s) (i.e. not all-in-one)
++    // There will be 1 package for each component group
++    // however one may require to ignore component group and
++    // in this case you'll get 1 package for each component.
++    else
++      {
++      return PackageComponents(componentPackageMethod ==
++                               ONE_PACKAGE_PER_COMPONENT);
++      }
++  }
++  // CASE 3 : NON COMPONENT package.
++  else
++    {
++    if (!this->ReadListFile("CPackHpkg.cmake"))
++      {
++      cmCPackLogger(cmCPackLog::LOG_ERROR,
++                    "Error while execution CPackHpkg.cmake" << std::endl);
++      retval = 0;
++      }
++    else
++      {
++      packageFiles = files;
++      return createHpkg();
++      }
++    }
++  return retval;
++}
++
++int cmCPackHpkgGenerator::createHpkg(std::string packageName)
++{
++  // .PackageInfo file
++  std::string infofilename;
++    infofilename = this->GetOption("WDIR");
++  infofilename += "/.PackageInfo";
++
++  std::string haiku_pkg_id = this->GetOption("CPACK_HAIKU_PACKAGE_NAME");
++  if(packageName == "Unspecified") {
++	  // Remove package specifier for the "unspecified" package
++	  haiku_pkg_id.erase(haiku_pkg_id.length() - packageName.length() - 1); 
++	  packageName = "";
++  } else if(packageName.length() > 0) {
++	  packageName += "_";
++  }
++  // haiku policy enforce lower case for package name
++  std::string haiku_pkg_name = cmsys::SystemTools::LowerCase(haiku_pkg_id);
++
++  // mandatory entries:
++  const char* haiku_pkg_version =
++                               this->GetOption("CPACK_HAIKU_PACKAGE_VERSION");
++  const char* haiku_pkg_revision =
++                               this->GetOption("CPACK_HAIKU_PACKAGE_REVISION");
++  const char* haiku_pkg_arch =
++                          this->GetOption("CPACK_HAIKU_PACKAGE_ARCHITECTURE");
++  const char* maintainer =  this->GetOption("CPACK_HAIKU_PACKAGE_PACKAGER");
++  const char* vendor =  this->GetOption("CPACK_HAIKU_PACKAGE_VENDOR");
++  const char* summary = this->GetOption("CPACK_HAIKU_PACKAGE_DESCRIPTION_SUMMARY");
++  const char* desc =       this->GetOption("CPACK_HAIKU_PACKAGE_DESCRIPTION");
++  const char* copyrights = this->GetOption("CPACK_HAIKU_PACKAGE_COPYRIGHT");
++  const char* haiku_pkg_licenses =
++                    this->GetOption("CPACK_HAIKU_PACKAGE_LICENSES");
++
++  // component-specific entries
++  std::string pkg_requires_option = "CPACK_HAIKU_" + packageName 
++    + "PACKAGE_REQUIRES";
++  const char* haiku_pkg_dep = this->GetOption(pkg_requires_option.c_str());
++  std::string pkg_provides_option = "CPACK_HAIKU_" + packageName
++    + "PACKAGE_PROVIDES";
++  const char* haiku_pkg_provides = this->GetOption(pkg_provides_option.c_str());
++
++  // optional entries
++  const char* haiku_pkg_url = this->GetOption("CPACK_HAIKU_PACKAGE_HOMEPAGE");
++  const char* haiku_pkg_enhances =
++                    this->GetOption("CPACK_HAIKU_PACKAGE_ENHANCES");
++  const char* haiku_pkg_conflicts =
++                    this->GetOption("CPACK_HAIKU_PACKAGE_CONFLICTS");
++  const char* haiku_pkg_replaces =
++                    this->GetOption("CPACK_HAIKU_PACKAGE_REPLACES");
++
++    { // the scope is needed for cmGeneratedFileStream
++    cmGeneratedFileStream out(infofilename.c_str());
++    out << "name " << haiku_pkg_name << "\n";
++    out << "version " << haiku_pkg_version << "-" << haiku_pkg_revision << "\n";
++    out << "architecture " << haiku_pkg_arch << "\n";
++    if(haiku_pkg_dep && *haiku_pkg_dep)
++      {
++      out << "requires {";
++      std::vector<std::string> requiresList;
++      cmSystemTools::ExpandListArgument(haiku_pkg_dep, requiresList);
++      for(std::vector<std::string>::iterator i =
++            requiresList.begin(); i != requiresList.end(); ++i)
++        {
++        out << *i << "\n";
++        }
++
++    out << "}\n";
++      }
++    if(haiku_pkg_url && *haiku_pkg_url)
++      {
++      out << "urls " << haiku_pkg_url << "\n";
++      }
++    if (haiku_pkg_enhances && *haiku_pkg_enhances)
++      {
++      out << "freshens " << haiku_pkg_enhances << "\n";
++      }
++    if (haiku_pkg_conflicts && *haiku_pkg_conflicts)
++      {
++      out << "conflicts " << haiku_pkg_conflicts << "\n";
++      }
++    if (haiku_pkg_replaces && *haiku_pkg_replaces)
++      {
++      out << "replaces " << haiku_pkg_replaces << "\n";
++      }
++
++    out << "provides {";
++    std::vector<std::string> providesList;
++    cmSystemTools::ExpandListArgument(haiku_pkg_provides, providesList);
++    for(std::vector<std::string>::iterator i =
++          providesList.begin(); i != providesList.end(); ++i)
++      {
++      out << *i << "\n";
++      }
++
++    out << "}\n";
++
++    out << "licenses {";
++    std::vector<std::string> licensesList;
++    cmSystemTools::ExpandListArgument(haiku_pkg_licenses, licensesList);
++    for(std::vector<std::string>::iterator i =
++          licensesList.begin(); i != licensesList.end(); ++i)
++      {
++      out << "\"" << *i << "\"\n";
++      }
++
++    out << "}\n";
++
++    out << "copyrights {\"" << copyrights << "\"}\n";
++    out << "packager " << maintainer << "\n";
++    out << "vendor \"" << vendor << "\"\n";
++    out << "summary \"" << summary << "\"\n";
++    out << "description \"" << desc << "\"\n";
++    out << std::endl;
++    }
++
++  std::string cmd;
++  if (NULL != this->GetOption("CPACK_HAIKU_FAKEROOT_EXECUTABLE")) {
++      cmd += this->GetOption("CPACK_HAIKU_FAKEROOT_EXECUTABLE");
++  }
++  cmd += "package create ";
++  cmd += this->GetOption("CPACK_TEMPORARY_PACKAGE_FILE_NAME");
++
++  std::string output;
++    int retval = -1;
++  int res = cmSystemTools::RunSingleCommand(cmd.c_str(), &output,
++      &retval, this->GetOption("WDIR"), this->GeneratorVerbose, 0);
++
++    if ( !res || retval )
++    {
++    std::string tmpFile = this->GetOption("CPACK_TOPLEVEL_DIRECTORY");
++    tmpFile += "/Hpkg.log";
++    cmGeneratedFileStream ofs(tmpFile.c_str());
++    ofs << "# Run command: " << cmd.c_str() << std::endl
++      << "# Working directory: " << toplevel << std::endl
++      << "# Output:" << std::endl
++      << output.c_str() << std::endl;
++    cmCPackLogger(cmCPackLog::LOG_ERROR, "Problem running package command: "
++      << cmd.c_str() << std::endl
++      << "Please check " << tmpFile.c_str() << " for errors" << std::endl);
++    return 0;
++    }
++
++    const char* infoExtra =
++      this->GetOption("CPACK_HAIKU_PACKAGE_INFO_EXTRA");
++  if( infoExtra )
++    {
++    std::vector<std::string> controlExtraList;
++    cmSystemTools::ExpandListArgument(infoExtra, controlExtraList);
++    for(std::vector<std::string>::iterator i =
++          controlExtraList.begin(); i != controlExtraList.end(); ++i)
++      {
++      std::string filenamename =
++        cmsys::SystemTools::GetFilenameName(i->c_str());
++      std::string localcopy = this->GetOption("WDIR");
++      localcopy += "/";
++      localcopy += filenamename;
++      // if we can copy the file, it means it does exist, let's add it:
++      if( cmsys::SystemTools::CopyFileIfDifferent(
++            i->c_str(), localcopy.c_str()) )
++        {
++        // haiku is picky and need relative to ./ path in the tar.gz
++        cmd += " ./";
++        cmd += filenamename;
++        }
++      }
++    }
++  res = cmSystemTools::RunSingleCommand(cmd.c_str(), &output,
++      &retval, this->GetOption("WDIR"), this->GeneratorVerbose, 0);
++
++    if ( !res || retval )
++    {
++    std::string tmpFile = this->GetOption("CPACK_TOPLEVEL_DIRECTORY");
++    tmpFile += "/Hpkg.log";
++    cmGeneratedFileStream ofs(tmpFile.c_str());
++    ofs << "# Run command: " << cmd.c_str() << std::endl
++      << "# Working directory: " << toplevel << std::endl
++      << "# Output:" << std::endl
++      << output.c_str() << std::endl;
++    cmCPackLogger(cmCPackLog::LOG_ERROR, "Problem running tar command: "
++      << cmd.c_str() << std::endl
++      << "Please check " << tmpFile.c_str() << " for errors" << std::endl);
++    return 0;
++    }
++
++  return 1;
++}
++
++bool cmCPackHpkgGenerator::SupportsComponentInstallation() const
++  {
++  return true;
++  }
++
++std::string cmCPackHpkgGenerator::GetComponentInstallDirNameSuffix(
++    const std::string& componentName)
++  {
++  if (componentPackageMethod == ONE_PACKAGE_PER_COMPONENT) {
++    return componentName;
++  }
++
++  if (componentPackageMethod == ONE_PACKAGE) {
++    return std::string("ALL_COMPONENTS_IN_ONE");
++  }
++  // We have to find the name of the COMPONENT GROUP
++  // the current COMPONENT belongs to.
++  std::string groupVar = "CPACK_COMPONENT_" +
++        cmSystemTools::UpperCase(componentName) + "_GROUP";
++    if (NULL != GetOption(groupVar.c_str()))
++      {
++      return std::string(GetOption(groupVar.c_str()));
++      }
++    else
++      {
++      return componentName;
++      }
++  }
++
++
+diff --git a/Source/CPack/cmCPackHpkgGenerator.h b/Source/CPack/cmCPackHpkgGenerator.h
+new file mode 100644
+index 0000000..ffa803d
+--- /dev/null
++++ b/Source/CPack/cmCPackHpkgGenerator.h
+@@ -0,0 +1,82 @@
++/*============================================================================
++  CMake - Cross Platform Makefile Generator
++  Copyright 2000-2013 Kitware, Inc.
++
++  Distributed under the OSI-approved BSD License (the "License");
++  see accompanying file Copyright.txt for details.
++
++  This software is distributed WITHOUT ANY WARRANTY; without even the
++  implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
++  See the License for more information.
++============================================================================*/
++
++#ifndef cmCPackHpkgGenerator_h
++#define cmCPackHpkgGenerator_h
++
++
++#include "cmCPackGenerator.h"
++
++/** \class cmCPackHpkgGenerator
++ * \brief A generator for Haiku packages
++ *
++ */
++class cmCPackHpkgGenerator : public cmCPackGenerator
++{
++public:
++  cmCPackTypeMacro(cmCPackHpkgGenerator, cmCPackGenerator);
++
++  /**
++   * Construct generator
++   */
++  cmCPackHpkgGenerator();
++  virtual ~cmCPackHpkgGenerator();
++
++  static bool CanGenerate()
++    {
++#ifdef __HAIKU__
++    return true;
++#else
++    // Sorry! Need the "package" tool from Haiku!
++    return false;
++#endif
++    }
++
++protected:
++  virtual int InitializeInternal();
++  /**
++   * This method factors out the work done in component packaging case.
++   */
++  int PackageOnePack(std::string initialToplevel, std::string packageName);
++  /**
++   * The method used to package files when component
++   * install is used. This will create one
++   * archive for each component group.
++   */
++  int PackageComponents(bool ignoreGroup);
++  /**
++   * Special case of component install where all
++   * components will be put in a single installer.
++   */
++  int PackageComponentsAllInOne();
++  virtual int PackageFiles();
++  virtual const char* GetOutputExtension() { return ".hpkg"; }
++  virtual enum CPackSetDestdirSupport SupportsSetDestdir() const
++    {
++    return SETDESTDIR_UNSUPPORTED;
++    }
++
++  virtual bool SupportsAbsoluteDestination() const
++    {
++    return false;
++    }
++  virtual bool SupportsComponentInstallation() const;
++  virtual std::string GetComponentInstallDirNameSuffix(
++      const std::string& componentName);
++
++private:
++  int createHpkg(std::string packageName = "");
++  std::vector<std::string> packageFiles;
++
++};
++
++#endif
+-- 
+1.8.3.4
+
+
+From 8637f997646e2e3af5e1cc2506a217c712dec978 Mon Sep 17 00:00:00 2001
+From: Adrien Destugues <pulkomandy@pulkomandy.tk>
+Date: Mon, 3 Mar 2014 15:57:05 +0100
+Subject: Haiku: Fix compiler detection when using distcc.
+
+Also remove outdated include directories.
+
+diff --git a/Modules/Platform/Haiku.cmake b/Modules/Platform/Haiku.cmake
+index 825f851..af6697a 100644
+--- a/Modules/Platform/Haiku.cmake
++++ b/Modules/Platform/Haiku.cmake
+@@ -21,18 +21,26 @@ set(CMAKE_EXE_EXPORTS_C_FLAG "-Wl,--export-dynamic")
+ # "/boot/system/develop/lib/<subdir>/", which we assume to be the secondary
+ # architecture specific subdirectory and extract the name of the architecture
+ # accordingly.
+-set(__HAIKU_COMPILER ${CMAKE_C_COMPILER})
+ 
+-if(NOT __HAIKU_COMPILER)
++# First of all, find a C or C++ compiler we can run. The "arg1" is necessary
++# here for compilers such as "distcc gcc-x86" or "ccache gcc-x86"
++# TODO See CMakeDetermineCompilerId.cmake for some more things we may want to do.
++if(CMAKE_C_COMPILER)
++  set(__HAIKU_COMPILER ${CMAKE_C_COMPILER})
++  string (STRIP "${CMAKE_C_COMPILER_ARG1}" __HAIKU_COMPILER_FLAGS)
++else()
+   set(__HAIKU_COMPILER ${CMAKE_CXX_COMPILER})
++  string (STRIP "${CMAKE_CXX_COMPILER_ARG1}" __HAIKU_COMPILER_FLAGS)
+ endif()
+ 
++
+ execute_process(
+-  COMMAND ${__HAIKU_COMPILER} -print-search-dirs
++	COMMAND ${__HAIKU_COMPILER} ${__HAIKU_COMPILER_FLAGS} -print-search-dirs
+   OUTPUT_VARIABLE _HAIKU_SEARCH_DIRS
++  RESULT_VARIABLE _HAIKU_SEARCH_DIRS_FOUND
+   OUTPUT_STRIP_TRAILING_WHITESPACE)
+ 
+-string(REGEX MATCH ".*\nlibraries: =?([^\n]*:)?/boot/system/develop/lib/([^/]*)/(:[^\n]*)?\n.*" _dummy "\n${_HAIKU_SEARCH_DIRS}\n")
++string(REGEX MATCH "libraries: =?([^\n]*:)?/boot/system/develop/lib/([^/]*)/(:[\n]*)?" _dummy "${_HAIKU_SEARCH_DIRS}\n")
+ set(CMAKE_HAIKU_SECONDARY_ARCH "${CMAKE_MATCH_2}")
+ 
+ if(NOT CMAKE_HAIKU_SECONDARY_ARCH)
+@@ -53,14 +61,12 @@ else()
+ endif()
+ 
+ list(APPEND CMAKE_SYSTEM_PREFIX_PATH
+-  /boot/common/non-packaged
+-  /boot/common
++  /boot/system/non-packaged
+   /boot/system
+   )
+ 
+ LIST(APPEND CMAKE_HAIKU_COMMON_INCLUDE_DIRECTORIES
+-  /boot/common/non-packaged/develop/headers${CMAKE_HAIKU_SECONDARY_ARCH_SUBDIR}
+-  /boot/common/develop/headers${CMAKE_HAIKU_SECONDARY_ARCH_SUBDIR}
++  /boot/system/non-packaged/develop/headers${CMAKE_HAIKU_SECONDARY_ARCH_SUBDIR}
+   /boot/system/develop/headers/os
+   /boot/system/develop/headers/os/app
+   /boot/system/develop/headers/os/device
+@@ -108,8 +114,7 @@ LIST(APPEND CMAKE_HAIKU_CXX_INCLUDE_DIRECTORIES
+ LIST(APPEND CMAKE_SYSTEM_INCLUDE_PATH ${CMAKE_HAIKU_C_INCLUDE_DIRECTORIES})
+ 
+ LIST(APPEND CMAKE_HAIKU_DEVELOP_LIB_DIRECTORIES
+-  /boot/common/non-packaged/develop/lib${CMAKE_HAIKU_SECONDARY_ARCH_SUBDIR}
+-  /boot/common/develop/lib${CMAKE_HAIKU_SECONDARY_ARCH_SUBDIR}
++  /boot/system/non-packaged/develop/lib${CMAKE_HAIKU_SECONDARY_ARCH_SUBDIR}
+   /boot/system/develop/lib${CMAKE_HAIKU_SECONDARY_ARCH_SUBDIR}
+   )
+ 
+@@ -120,6 +125,6 @@ LIST(APPEND CMAKE_PLATFORM_IMPLICIT_LINK_DIRECTORIES
+ LIST(APPEND CMAKE_SYSTEM_LIBRARY_PATH ${CMAKE_HAIKU_DEVELOP_LIB_DIRECTORIES})
+ 
+ if(CMAKE_INSTALL_PREFIX_INITIALIZED_TO_DEFAULT)
+-  set(CMAKE_INSTALL_PREFIX "/boot/common" CACHE PATH
++  set(CMAKE_INSTALL_PREFIX "/boot/system" CACHE PATH
+     "Install path prefix, prepended onto install directories." FORCE)
+ endif()
+-- 
+1.8.3.4
+
+
+From a0951c88746d915cc54fb9261ca4c9e56a22898c Mon Sep 17 00:00:00 2001
+From: Adrien Destugues <pulkomandy@pulkomandy.tk>
+Date: Mon, 3 Mar 2014 16:01:23 +0100
+Subject: Adjust header search paths for some modules.
+
+On haiku, the headers aren't in an 'include' directory, so these too
+restrictive search pathes are not working for us. Add a more tolerant
+alternative.
+
+diff --git a/Modules/FindFreetype.cmake b/Modules/FindFreetype.cmake
+index 6f03c86..f0f9fe1 100644
+--- a/Modules/FindFreetype.cmake
++++ b/Modules/FindFreetype.cmake
+@@ -62,7 +62,7 @@ find_path(FREETYPE_INCLUDE_DIR_ft2build ft2build.h
+     ENV GTKMM_BASEPATH
+     [HKEY_CURRENT_USER\\SOFTWARE\\gtkmm\\2.4;Path]
+     [HKEY_LOCAL_MACHINE\\SOFTWARE\\gtkmm\\2.4;Path]
+-  PATH_SUFFIXES include/freetype2 include
++  PATH_SUFFIXES include/freetype2 include freetype2
+ )
+ 
+ find_path(FREETYPE_INCLUDE_DIR_freetype2
+@@ -79,7 +79,7 @@ find_path(FREETYPE_INCLUDE_DIR_freetype2
+     ENV GTKMM_BASEPATH
+     [HKEY_CURRENT_USER\\SOFTWARE\\gtkmm\\2.4;Path]
+     [HKEY_LOCAL_MACHINE\\SOFTWARE\\gtkmm\\2.4;Path]
+-  PATH_SUFFIXES include/freetype2 include
++  PATH_SUFFIXES include/freetype2 include freetype2
+ )
+ 
+ find_library(FREETYPE_LIBRARY
+diff --git a/Modules/FindSDL_image.cmake b/Modules/FindSDL_image.cmake
+index e5173e3..da5799e 100644
+--- a/Modules/FindSDL_image.cmake
++++ b/Modules/FindSDL_image.cmake
+@@ -54,7 +54,7 @@ find_path(SDL_IMAGE_INCLUDE_DIR SDL_image.h
+   HINTS
+     ENV SDLIMAGEDIR
+     ENV SDLDIR
+-  PATH_SUFFIXES include/SDL include/SDL12 include/SDL11 include
++  PATH_SUFFIXES SDL include/SDL include/SDL12 include/SDL11 include
+ )
+ 
+ if(CMAKE_SIZEOF_VOID_P EQUAL 8)
+diff --git a/Modules/FindSDL_mixer.cmake b/Modules/FindSDL_mixer.cmake
+index 8f2f066..b6ece11 100644
+--- a/Modules/FindSDL_mixer.cmake
++++ b/Modules/FindSDL_mixer.cmake
+@@ -54,7 +54,7 @@ find_path(SDL_MIXER_INCLUDE_DIR SDL_mixer.h
+   HINTS
+     ENV SDLMIXERDIR
+     ENV SDLDIR
+-  PATH_SUFFIXES include/SDL include/SDL12 include/SDL11 include
++  PATH_SUFFIXES SDL include/SDL include/SDL12 include/SDL11 include
+ )
+ 
+ if(CMAKE_SIZEOF_VOID_P EQUAL 8)
+diff --git a/Modules/FindSDL_ttf.cmake b/Modules/FindSDL_ttf.cmake
+index 3f58ac1..c48fcbe 100644
+--- a/Modules/FindSDL_ttf.cmake
++++ b/Modules/FindSDL_ttf.cmake
+@@ -54,7 +54,7 @@ find_path(SDL_TTF_INCLUDE_DIR SDL_ttf.h
+   HINTS
+     ENV SDLTTFDIR
+     ENV SDLDIR
+-  PATH_SUFFIXES include/SDL include/SDL12 include/SDL11 include
++  PATH_SUFFIXES SDL include/SDL include/SDL12 include/SDL11 include
+ )
+ 
+ if(CMAKE_SIZEOF_VOID_P EQUAL 8)
+-- 
+1.8.3.4
+
+
+From 963b8828af64669032a8b03363e9e25844646bfc Mon Sep 17 00:00:00 2001
+From: Adrien Destugues <pulkomandy@pulkomandy.tk>
+Date: Mon, 3 Mar 2014 16:10:05 +0100
+Subject: Update CPU frequency detection code.
+
+The scheduler branch in Haiku changed the API for this.
+(patch already submitted upstream)
+
+diff --git a/Source/kwsys/SystemInformation.cxx b/Source/kwsys/SystemInformation.cxx
+index 5f20853..9c26380 100644
+--- a/Source/kwsys/SystemInformation.cxx
++++ b/Source/kwsys/SystemInformation.cxx
+@@ -4698,11 +4698,28 @@ bool SystemInformationImplementation::QueryHaikuInfo()
+ {
+ #if defined(__HAIKU__)
+ 
++  // CPU count
+   system_info info;
+   get_system_info(&info);
+-
+   this->NumberOfPhysicalCPU = info.cpu_count;
+-  this->CPUSpeedInMHz = info.cpu_clock_speed / 1000000.0F;
++
++  // CPU speed
++  uint32 topologyNodeCount = 0;
++  cpu_topology_node_info* topology = 0;
++  get_cpu_topology_info(0, &topologyNodeCount);
++  if (topologyNodeCount != 0)
++    topology = new cpu_topology_node_info[topologyNodeCount];
++  get_cpu_topology_info(topology, &topologyNodeCount);
++
++  for (uint32 i = 0; i < topologyNodeCount; i++) {
++    if (topology[i].type == B_TOPOLOGY_CORE) {
++      this->CPUSpeedInMHz = topology[i].data.core.default_frequency /
++        1000000.0f;
++      break;
++    }
++  }
++
++  delete[] topology;
+ 
+   // Physical Memory
+   this->TotalPhysicalMemory = (info.max_pages * B_PAGE_SIZE) / (1024 * 1024) ;
+-- 
+1.8.3.4
+
+
+From e8af83035ae75596f931c7e8a2b5b47d8160933a Mon Sep 17 00:00:00 2001
+From: Adrien Destugues <pulkomandy@pulkomandy.tk>
+Date: Mon, 10 Mar 2014 14:11:01 +0100
+Subject: Fix the architecture detection regexp again.
+
+Turns out it didn't work with the main compiler on a gcc4 install.
+This new regexp was written by GSoC candidate akshay1994, part of his efforts
+to build WebKit and fix one ticket for it. Thanks for getting through
+this!
+
+diff --git a/Modules/Platform/Haiku.cmake b/Modules/Platform/Haiku.cmake
+index af6697a..920ae8f 100644
+--- a/Modules/Platform/Haiku.cmake
++++ b/Modules/Platform/Haiku.cmake
+@@ -40,7 +40,7 @@ execute_process(
+   RESULT_VARIABLE _HAIKU_SEARCH_DIRS_FOUND
+   OUTPUT_STRIP_TRAILING_WHITESPACE)
+ 
+-string(REGEX MATCH "libraries: =?([^\n]*:)?/boot/system/develop/lib/([^/]*)/(:[\n]*)?" _dummy "${_HAIKU_SEARCH_DIRS}\n")
++string(REGEX MATCH "libraries: =?([^\n]*:)?/boot/system/develop/lib/([^/]*)/?(:?\n+)" _dummy "${_HAIKU_SEARCH_DIRS}\n")
+ set(CMAKE_HAIKU_SECONDARY_ARCH "${CMAKE_MATCH_2}")
+ 
+ if(NOT CMAKE_HAIKU_SECONDARY_ARCH)
+-- 
+1.8.3.4
+
diff --git a/dev-util/cppunit/cppunit-1.12.1.recipe b/dev-util/cppunit/cppunit-1.12.1.recipe
index ccad5254c..9394c30c3 100644
--- a/dev-util/cppunit/cppunit-1.12.1.recipe
+++ b/dev-util/cppunit/cppunit-1.12.1.recipe
@@ -1,23 +1,81 @@
-DESCRIPTION="C++ port of the famous JUnit framework for unit testing" 
-HOMEPAGE="http://cppunit.sourceforge.net/" 
-SRC_URI="http://sourceforge.net/projects/cppunit/files/cppunit/1.12.1/cppunit-1.12.1.tar.gz/download"
-CHECKSUM_MD5="bd30e9cf5523cdfc019b94f5e1d7fd19"
+SUMMARY="C++ unit testing framework"
+DESCRIPTION="
+CppUnit is a C++ unit testing framework. It started its life as a port of \
+JUnit to C++ by Michael Feathers.
+"
+HOMEPAGE="http://cppunit.sourceforge.net/"
+SRC_URI="http://downloads.sourceforge.net/cppunit/cppunit-1.12.1.tar.gz"
+CHECKSUM_SHA256="ac28a04c8e6c9217d910b0ae7122832d28d9917fa668bcc9e0b8b09acb4ea44a"
+LICENSE="GNU LGPL v2.1"
+COPYRIGHT="
+	Michael Feathers <mfeathers@objectmentor.com>
+	Jerome Lacoste <lacostej@altern.org>
+	E. Sommerlade <eric@sommerla.de>
+	Baptiste Lepilleur <gaiacrtn@free.fr> <blep@sourceforge.net>
+	Bastiaan Bakker <bastiaan.bakker@lifeline.nl>
+	Steve Robbins <smr99@sourceforge.net>
+	"
 REVISION="1"
-STATUS_HAIKU="stable"
-DEPEND=""
+ARCHITECTURES="x86 x86_gcc2"
+
+SOURCE_DIR="$portName-$portVersion"
+
+PROVIDES="
+	cppunit = $portVersion compat >= 1.12
+	cmd:cppunit_config = $portVersion compat >= 1.12
+	cmd:DllPlugInTester = $portVersion compat >= 1.12
+	lib:libcppunit = $portVersion compat >= 1.12
+	lib:libcppunit_1.12 = $portVersion compat >= 1.12
+	"
+REQUIRES="
+	haiku >= $haikuVersion
+	"
+BUILD_REQUIRES="
+	"
+BUILD_PREREQUIRES="
+	haiku_devel >= $haikuVersion
+	cmd:libtoolize
+	cmd:autoreconf
+	cmd:g++
+	cmd:ld
+	cmd:make
+	cmd:sed
+	"
+
+PATCH()
+{
+	# change obsolete macro
+	sed -i -e 's#AM_CONFIG_HEADER(\(.*\))#AC_CONFIG_HEADERS([\1])#g' \
+		configure.in
+}
+
 BUILD()
 {
-	cd cppunit-1.12.1
 	libtoolize --force --copy --install
 	autoreconf -i
-	./configure --prefix=`finddir B_COMMON_DIRECTORY`
-	make
+
+	# there seems to be a problem with dirname
+	sed -i -e 's#\/\* automatically generated \*\/#$ac_prefix_conf_INP#g' \
+		configure
+
+	runConfigure ./configure
+	make $jobArgs
 }
 
 INSTALL()
 {
-	cd cppunit-1.12.1
 	make install
+
+	prepareInstalledDevelLib libcppunit
+	fixPkgconfig
+
+	packageEntries devel $developDir
 }
 
-LICENSE="GNU LGPL v2.1"
+PROVIDES_devel="
+	cppunit_devel = $portVersion
+	devel:libcppunit = $portVersion compat >= 1.12
+	"
+REQUIRES_devel="
+	cppunit == $portVersion base
+	"
diff --git a/dev-util/cscope/cscope-15.7a.recipe b/dev-util/cscope/cscope-15.7a.recipe
index 3f01d4781..dd2641b9e 100644
--- a/dev-util/cscope/cscope-15.7a.recipe
+++ b/dev-util/cscope/cscope-15.7a.recipe
@@ -12,7 +12,7 @@ Allows searching code for:
 "
 HOMEPAGE="http://cscope.sourceforge.net/" 
 SRC_URI="http://sourceforge.net/projects/cscope/files/cscope/15.7a/cscope-15.7a.tar.bz2"
-CHECKSUM_MD5="da43987622ace8c36bbf14c15a350ec1"
+CHECKSUM_SHA256="02638bcba790bc8b0562f28dbe789e61794415079d94a676efc287d18dc96037"
 REVISION="1"
 ARCHITECTURES="x86 x86_gcc2"
 LICENSE="BSD (3-clause)"
diff --git a/dev-util/ctags/ctags-5.8.recipe b/dev-util/ctags/ctags-5.8.recipe
index 1ff3cd91a..341b7c862 100644
--- a/dev-util/ctags/ctags-5.8.recipe
+++ b/dev-util/ctags/ctags-5.8.recipe
@@ -6,7 +6,7 @@ HOMEPAGE="http://ctags.sourceforge.net/"
 COPYRIGHT="1996-2009, Darren Hiebert"
 LICENSE="GNU GPL v2"
 SRC_URI="http://prdownloads.sourceforge.net/ctags/ctags-5.8.tar.gz"
-CHECKSUM_MD5="c00f82ecdcc357434731913e5b48630d"
+CHECKSUM_SHA256="0e44b45dcabe969e0bbbb11e30c246f81abe5d32012db37395eb57d66e9e99c7"
 REVISION="3"
 ARCHITECTURES="x86_gcc2 x86 x86_64"
 
diff --git a/dev-util/fastdep/fastdep-0.16.recipe b/dev-util/fastdep/fastdep-0.16.recipe
index 6d925cb0d..39f5492ff 100644
--- a/dev-util/fastdep/fastdep-0.16.recipe
+++ b/dev-util/fastdep/fastdep-0.16.recipe
@@ -6,8 +6,8 @@ hardware, it is several orders of magnitude faster than gcc.
 "
 HOMEPAGE="http://www.irule.be/bvh/c++/fastdep/"
 SRC_URI="http://ports-space.haiku-files.org/dev-util/source/fastdep-0.16.tar.gz"
+CHECKSUM_SHA256="ce87d5aba71a38ad175c831f4f380498e04c22d75478310299812485b3202abb"
 REVISION="1"
-CHECKSUM_MD5="838c08b790a5dfe9a50a4aec7947bc54"
 LICENSE="GNU GPL v2"
 COPYRIGHT="2003 Bart Vanhauwaert"
 
diff --git a/dev-util/gdb/gdb-7.7.recipe b/dev-util/gdb/gdb-7.7.recipe
new file mode 100644
index 000000000..baf71ce9e
--- /dev/null
+++ b/dev-util/gdb/gdb-7.7.recipe
@@ -0,0 +1,71 @@
+SUMMARY="The GNU debugger"
+DESCRIPTION="
+GDB, the GNU Project debugger, allows you to see what is going on \`inside' another program while it executes -- or what another program was doing at the moment it crashed.
+
+GDB can do four main kinds of things (plus other things in support of these) to help you catch bugs in the act:
+
+ * Start your program, specifying anything that might affect its behavior.
+ * Make your program stop on specified conditions.
+ * Examine what has happened, when your program has stopped.
+ * Change things in your program, so you can experiment with correcting the effects of one bug and go on to learn about another.
+
+The program being debugged can be written in Ada, C, C++, Objective-C, Pascal (and many other languages). Those programs might be executing on the same machine as GDB (native) or on another machine (remote). GDB can run on most popular UNIX and Microsoft Windows variants.
+"
+
+HOMEPAGE="http://sourceware.org/gdb/"
+LICENSE="GNU GPL v3"
+COPYRIGHT="Free Software Foundation"
+
+SRC_URI="http://ftp.gnu.org/gnu/gdb/gdb-7.7.tar.bz2"
+CHECKSUM_SHA256="0404d1c6ee6b3ddd811722b5197944758d37b4591c216030effbac204f5a6c23"
+REVISION="1"
+
+PATCHES="gdb-7.7.patchset"
+
+ARCHITECTURES="!x86_64"
+
+PROVIDES="
+	gdb = $portVersion
+	cmd:gdb = $portVersion
+	"
+
+REQUIRES="
+	haiku >= $haikuVersion
+	lib:libiconv
+	lib:libintl
+	lib:libncurses
+	"
+
+BUILD_REQUIRES="
+	gettext
+	libiconv_devel
+	ncurses_devel
+	"
+
+BUILD_PREREQUIRES="
+	haiku_devel >= $haikuVersion
+	cmd:aclocal
+	cmd:autoconf
+	cmd:automake
+	cmd:autoreconf
+	cmd:awk
+	cmd:gcc
+	cmd:ld
+	cmd:make
+	"
+
+BUILD()
+{
+	cd gdb && autoreconf; cd ..
+	runConfigure ./configure
+	make $jobArgs
+}
+
+INSTALL()
+{
+	make install
+	mkdir -p /packaging/gdb/develop/lib
+	for i in libbfd.a libbfd.la libopcodes.a libopcodes.la; do
+		mv /packaging/gdb/lib/$i /packaging/gdb/develop/lib/$i
+	done
+}
diff --git a/dev-util/gdb/patches/gdb-7.7.patchset b/dev-util/gdb/patches/gdb-7.7.patchset
new file mode 100644
index 000000000..5f67a67d9
--- /dev/null
+++ b/dev-util/gdb/patches/gdb-7.7.patchset
@@ -0,0 +1,222 @@
+From d1451ae108bc3bef182ca16e5b1a625483346cfe Mon Sep 17 00:00:00 2001
+From: Jonathan Schleifer <js@webkeks.org>
+Date: Wed, 26 Mar 2014 02:26:37 +0100
+Subject: [PATCH 1/5] Add Haiku to config.bfd
+
+Merged the config.bfd from gdb-7.7 with the config.bfd from our
+buildtools.
+---
+ bfd/config.bfd | 24 ++++++++++++++++++++++--
+ 1 file changed, 22 insertions(+), 2 deletions(-)
+
+diff --git a/bfd/config.bfd b/bfd/config.bfd
+index 4edcc6a..91a72db 100644
+--- a/bfd/config.bfd
++++ b/bfd/config.bfd
+@@ -334,7 +334,7 @@ case "${targ}" in
+     ;;
+   arm-*-elf | arm-*-freebsd* | arm*-*-linux-* | arm*-*-conix* | \
+   arm*-*-uclinux* | arm-*-kfreebsd*-gnu | \
+-  arm*-*-eabi* )
++  arm*-*-eabi* | arm*-*-haiku*)
+     targ_defvec=bfd_elf32_littlearm_vec
+     targ_selvecs=bfd_elf32_bigarm_vec
+     ;;
+@@ -668,6 +668,11 @@ case "${targ}" in
+     targ_selvecs="bfd_elf32_i386_vec bfd_elf32_x86_64_vec i386linux_vec i386pei_vec x86_64pei_vec bfd_elf64_l1om_vec bfd_elf64_k1om_vec"
+     want64=true
+     ;;
++  x86_64-*-haiku*)
++    targ_defvec=bfd_elf64_x86_64_vec
++    targ_selvecs="bfd_elf32_i386_vec"
++    want64=true
++    ;;
+   x86_64-*-nacl*)
+     targ_defvec=bfd_elf32_x86_64_nacl_vec
+     targ_selvecs="bfd_elf32_i386_nacl_vec bfd_elf64_x86_64_nacl_vec bfd_elf32_bigarm_nacl_vec bfd_elf32_littlearm_nacl_vec"
+@@ -716,6 +721,9 @@ case "${targ}" in
+     targ_defvec=bfd_elf32_i386_vec
+     targ_selvecs="i386pe_vec i386pei_vec"
+     ;;
++  i[3-7]86-*-haiku*)
++    targ_defvec=bfd_elf32_i386_vec
++    ;;
+   i[3-7]86-*-interix*)
+     targ_defvec=i386pei_vec
+     targ_selvecs="i386pe_vec"
+@@ -907,7 +915,10 @@ case "${targ}" in
+     targ_selvecs=ieee_vec
+     targ_underscore=yes
+     ;;
+-
++  m68*-*-haiku*)
++    targ_defvec=bfd_elf32_m68k_vec
++    targ_selvecs="m68kcoff_vec ieee_vec"
++    ;;
+   m88*-harris-cxux* | m88*-*-dgux* | m88*-*-sysv4*)
+     targ_defvec=bfd_elf32_m88k_vec
+     targ_selvecs=m88kbcs_vec
+@@ -963,6 +974,10 @@ case "${targ}" in
+     targ_defvec=bfd_elf32_tradlittlemips_vec
+     targ_selvecs="bfd_elf32_tradbigmips_vec bfd_elf64_tradbigmips_vec bfd_elf64_tradlittlemips_vec ecoff_little_vec ecoff_big_vec"
+     ;;
++  mips*el-*-haiku*)
++    targ_defvec=bfd_elf32_littlemips_vec
++    targ_selvecs="bfd_elf32_bigmips_vec bfd_elf64_bigmips_vec bfd_elf64_littlemips_vec ecoff_little_vec ecoff_big_vec"
++    ;;
+   mips*-*-netbsd*)
+     targ_defvec=bfd_elf32_tradbigmips_vec
+     targ_selvecs="bfd_elf32_tradlittlemips_vec bfd_elf64_tradbigmips_vec bfd_elf64_tradlittlemips_vec ecoff_big_vec ecoff_little_vec"
+@@ -1276,6 +1291,11 @@ case "${targ}" in
+     targ_selvecs="mach_o_be_vec mach_o_le_vec mach_o_fat_vec pef_vec pef_xlib_vec sym_vec"
+     targ_archs="$targ_archs bfd_i386_arch"
+     ;;
++  powerpc-*-haiku*)
++    targ_defvec=bfd_elf32_powerpc_vec
++    targ_selvecs="rs6000coff_vec bfd_elf32_powerpcle_vec pef_vec pef_xlib_vec pmac_xcoff_vec ppcboot_vec"
++    targ_cflags=-D__HAIKU_TARGET__
++    ;;
+   powerpc-*-macos*)
+     targ_defvec=pmac_xcoff_vec
+     ;;
+-- 
+Jonathan
+
+
+From 95c56e69655292af02df81204a6957af8589f91e Mon Sep 17 00:00:00 2001
+From: Jonathan Schleifer <js@webkeks.org>
+Date: Wed, 26 Mar 2014 02:36:02 +0100
+Subject: [PATCH 2/5] Add Haiku to gdb/configure.tgt
+
+---
+ gdb/configure.tgt | 4 ++++
+ 1 file changed, 4 insertions(+)
+
+diff --git a/gdb/configure.tgt b/gdb/configure.tgt
+index 47e98d9..e7843f6 100644
+--- a/gdb/configure.tgt
++++ b/gdb/configure.tgt
+@@ -687,6 +687,10 @@ x86_64-*-openbsd*)
+ 			i387-tdep.o i386bsd-tdep.o i386obsd-tdep.o \
+ 			bsd-uthread.o solib-svr4.o"
+ 	;;
++x86_64-*-haiku*)
++	# Target: Haiku/x86_64
++	gdb_target_obs="amd64-tdep.o i386-tdep.o i387-tdep.o solib-svr4.o"
++	;;
+ xtensa*-*-linux*)	gdb_target=linux
+ 	# Target: GNU/Linux Xtensa
+ 	gdb_target_obs="xtensa-tdep.o xtensa-config.o xtensa-linux-tdep.o \
+-- 
+Jonathan
+
+
+From 809b3250039450b348f16aee7430d4c98b8ca2ec Mon Sep 17 00:00:00 2001
+From: Jonathan Schleifer <js@webkeks.org>
+Date: Wed, 26 Mar 2014 02:54:53 +0100
+Subject: [PATCH 3/5] Add gdb/config/i386/haiku64.mh
+
+---
+ gdb/config/i386/haiku64.mh | 2 ++
+ gdb/configure.host         | 1 +
+ 2 files changed, 3 insertions(+)
+ create mode 100644 gdb/config/i386/haiku64.mh
+
+diff --git a/gdb/config/i386/haiku64.mh b/gdb/config/i386/haiku64.mh
+new file mode 100644
+index 0000000..aa99883
+--- /dev/null
++++ b/gdb/config/i386/haiku64.mh
+@@ -0,0 +1,2 @@
++# Host: Haiku/x86_64
++NATDEPFILES= fork-child.o amd64-nat.o
+diff --git a/gdb/configure.host b/gdb/configure.host
+index 634213f..e91e8bd 100644
+--- a/gdb/configure.host
++++ b/gdb/configure.host
+@@ -183,6 +183,7 @@ x86_64-*-freebsd* | x86_64-*-kfreebsd*-gnu)
+ x86_64-*-netbsd* | x86_64-*-knetbsd*-gnu)
+ 			gdb_host=nbsd64 ;;
+ x86_64-*-openbsd*)	gdb_host=obsd64 ;;
++x86_64-*-haiku*)	gdb_host=haiku64 ;;
+ x86_64-*-mingw*)        gdb_host=mingw64
+ 			gdb_host_obs=mingw-hdep.o
+ 			;;
+-- 
+Jonathan
+
+
+From 4ed8b2a84a58416de1baf6d2222b377e1462a3d5 Mon Sep 17 00:00:00 2001
+From: Jonathan Schleifer <js@webkeks.org>
+Date: Wed, 26 Mar 2014 03:11:41 +0100
+Subject: [PATCH 4/5] Look for socketpair and gethostbyname in -lnetwork
+
+---
+ gdb/configure.ac | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/gdb/configure.ac b/gdb/configure.ac
+index 55f37d2..6fd12a7 100644
+--- a/gdb/configure.ac
++++ b/gdb/configure.ac
+@@ -510,10 +510,10 @@ AC_CHECK_FUNC(wctype, [],
+   [AC_CHECK_LIB(w, wctype)])
+ 
+ # Some systems (e.g. Solaris) have `gethostbyname' in libnsl.
+-AC_SEARCH_LIBS(gethostbyname, nsl)
++AC_SEARCH_LIBS(gethostbyname, [nsl network])
+ 
+ # Some systems (e.g. Solaris) have `socketpair' in libsocket.
+-AC_SEARCH_LIBS(socketpair, socket)
++AC_SEARCH_LIBS(socketpair, [socket network])
+ 
+ # Link in zlib if we can.  This allows us to read compressed debug sections.
+ AM_ZLIB
+-- 
+Jonathan
+
+
+From ede4bf96bdfa2e6f4f36d7e0056adc5cdec70058 Mon Sep 17 00:00:00 2001
+From: Jonathan Schleifer <js@webkeks.org>
+Date: Wed, 26 Mar 2014 03:17:18 +0100
+Subject: [PATCH 5/5] Remove autoconf version check
+
+---
+ config/override.m4 | 21 ---------------------
+ 1 file changed, 21 deletions(-)
+
+diff --git a/config/override.m4 b/config/override.m4
+index 52bd1c3..3af7e21 100644
+--- a/config/override.m4
++++ b/config/override.m4
+@@ -27,27 +27,6 @@ AC_DEFUN([AC_PREREQ], [frob])
+ m4_copy_force([_AC_PREREQ], [AC_PREREQ])
+ 
+ 
+-dnl Ensure exactly this Autoconf version is used
+-m4_ifndef([_GCC_AUTOCONF_VERSION],
+-  [m4_define([_GCC_AUTOCONF_VERSION], [2.64])])
+-
+-dnl Test for the exact version when AC_INIT is expanded.
+-dnl This allows to update the tree in steps (for testing)
+-dnl by putting
+-dnl   m4_define([_GCC_AUTOCONF_VERSION], [X.Y])
+-dnl in configure.ac before AC_INIT,
+-dnl without rewriting this file.
+-dnl Or for updating the whole tree at once with the definition above.
+-AC_DEFUN([_GCC_AUTOCONF_VERSION_CHECK],
+-[m4_if(m4_defn([_GCC_AUTOCONF_VERSION]),
+-  m4_defn([m4_PACKAGE_VERSION]), [],
+-  [m4_fatal([Please use exactly Autoconf ]_GCC_AUTOCONF_VERSION[ instead of ]m4_defn([m4_PACKAGE_VERSION])[.])])
+-])
+-m4_define([AC_INIT], m4_defn([AC_INIT])[
+-_GCC_AUTOCONF_VERSION_CHECK
+-])
+-
+-
+ dnl Ensure we do not use a buggy M4.
+ m4_if(m4_index([..wi.d.], [.d.]), [-1],
+   [m4_fatal(m4_do([m4 with buggy strstr detected.  Please install
+-- 
+Jonathan
+
diff --git a/dev-util/global/global-6.2.9.recipe b/dev-util/global/global-6.2.9.recipe
index 9b809a063..9293a643a 100644
--- a/dev-util/global/global-6.2.9.recipe
+++ b/dev-util/global/global-6.2.9.recipe
@@ -10,7 +10,7 @@ operating system like GNU and BSD.
 "
 HOMEPAGE="http://www.gnu.org/software/global/" 
 SRC_URI="http://ftp.gnu.org/pub/gnu/global/global-6.2.9.tar.gz"
-CHECKSUM_MD5="39a1dd6e537929b66600b9e54aae1a6b"
+CHECKSUM_SHA256="d8d831cbd9bac9f51598af316231290cc328e4f18dc29b58a2f2ae0fee44c303"
 REVISION="2"
 LICENSE="GNU GPL v3"
 COPYRIGHT="2000-2013 Tama Communications Corporation
diff --git a/dev-util/gperf/gperf-3.0.4.recipe b/dev-util/gperf/gperf-3.0.4.recipe
index b8707394d..c4196d033 100644
--- a/dev-util/gperf/gperf-3.0.4.recipe
+++ b/dev-util/gperf/gperf-3.0.4.recipe
@@ -14,7 +14,7 @@ HOMEPAGE="http://www.gnu.org/software/gperf/"
 COPYRIGHT="1989-1998, 2000-2004, 2006-2009 Free Software Foundation, Inc."
 LICENSE="GNU GPL v3"
 SRC_URI="http://ftp.gnu.org/pub/gnu/gperf/gperf-3.0.4.tar.gz"
-CHECKSUM_MD5="c1f1db32fb6598d6a93e6e88796a8632"
+CHECKSUM_SHA256="767112a204407e62dbc3106647cf839ed544f3cf5d0f0523aaa2508623aad63e"
 REVISION="1"
 ARCHITECTURES="x86_gcc2 x86 x86_64"
 
diff --git a/dev-util/idutils/idutils-4.6.recipe b/dev-util/idutils/idutils-4.6.recipe
index 70391fe32..5ec691dd9 100644
--- a/dev-util/idutils/idutils-4.6.recipe
+++ b/dev-util/idutils/idutils-4.6.recipe
@@ -12,7 +12,7 @@ organize, can benefit from the ID utilities.
 "
 HOMEPAGE="http://www.gnu.org/software/idutils/" 
 SRC_URI="http://ftp.gnu.org/gnu/idutils/idutils-4.6.tar.xz"
-CHECKSUM_MD5="99b572536377fcddb4d38e86a3c215fd"
+CHECKSUM_SHA256="8181f43a4fb62f6f0ccf3b84dbe9bec71ecabd6dfdcf49c6b5584521c888aac2"
 REVISION="2"
 LICENSE="GNU GPL v2"
 COPYRIGHT="1986-2012 Free Software Foundation, Inc."
diff --git a/dev-util/intltool/intltool-0.40.6.recipe b/dev-util/intltool/intltool-0.40.6.recipe
index 230613971..ec3709fec 100644
--- a/dev-util/intltool/intltool-0.40.6.recipe
+++ b/dev-util/intltool/intltool-0.40.6.recipe
@@ -12,7 +12,7 @@ files. This merge step will happen at build resp. installation time.
 "
 HOMEPAGE="http://freedesktop.org/wiki/Software/intltool"
 SRC_URI="ftp://ftp.gnome.org/pub/gnome/sources/intltool/0.40/intltool-0.40.6.tar.gz"
-CHECKSUM_MD5="8e40f9d1c7308eddbfd24b22cd540631"
+CHECKSUM_SHA256="36cd8fe249d0cc20918b6d4583267208bf74c8d541c67a5fe63316846344f9f7"
 
 LICENSE="GNU GPL v2"
 COPYRIGHT="1994-1996, 1999-2002, 2004, 2005 Free Software Foundation, Inc."
diff --git a/dev-util/patchutils/patchutils-0.3.3.recipe b/dev-util/patchutils/patchutils-0.3.3.recipe
index 85c76391e..d74818d29 100644
--- a/dev-util/patchutils/patchutils-0.3.3.recipe
+++ b/dev-util/patchutils/patchutils-0.3.3.recipe
@@ -20,7 +20,7 @@ contains a given regular expression.
 "
 HOMEPAGE="http://cyberelk.net/tim/patchutils/" 
 SRC_URI="http://cyberelk.net/tim/data/patchutils/stable/patchutils-0.3.3.tar.xz"
-CHECKSUM_MD5="b640b6b8af6183f83eacf7bd6d2460cb"
+CHECKSUM_SHA256="91f4e8451b2efcac5d40c966e42c175803450f0de94c926bfecc12c90070ad3c"
 REVISION="1"
 LICENSE="GNU GPL v2"
 COPYRIGHT="2001-2013 Tim Waugh"
diff --git a/dev-util/pkgconfig/pkgconfig-0.27.1.recipe b/dev-util/pkgconfig/pkgconfig-0.27.1.recipe
index 0baa93963..052d0e0aa 100644
--- a/dev-util/pkgconfig/pkgconfig-0.27.1.recipe
+++ b/dev-util/pkgconfig/pkgconfig-0.27.1.recipe
@@ -11,7 +11,7 @@ HOMEPAGE="http://pkg-config.freedesktop.org/wiki/"
 LICENSE="GNU GPL v2"
 COPYRIGHT="1998, 2001-2006 Red Hat Inc."
 SRC_URI="http://pkgconfig.freedesktop.org/releases/pkg-config-0.27.1.tar.gz"
-CHECKSUM_MD5="5392b4e3372879c5bf856173b418d6a2"
+CHECKSUM_SHA256="4f63d0df3035101b12949250da5231af49e3c3afcd8fb18554fa7c3cb92d8c17"
 REVISION="2"
 ARCHITECTURES="x86_gcc2 x86 x86_64"
 SECONDARY_ARCHITECTURES="x86_gcc2 x86"
@@ -35,10 +35,13 @@ BUILD_PREREQUIRES="
 	cmd:autoconf
 	cmd:automake
 	cmd:autoreconf
+	cmd:awk
+	cmd:find
 	cmd:gcc$secondaryArchSuffix
 	cmd:ld$secondaryArchSuffix
 	cmd:libtoolize
 	cmd:make
+	cmd:xargs
 	"
 
 SOURCE_DIR="pkg-config-0.27.1"
diff --git a/dev-util/ragel/ragel-6.8.recipe b/dev-util/ragel/ragel-6.8.recipe
index dc9cdeac4..99d3f3f2c 100644
--- a/dev-util/ragel/ragel-6.8.recipe
+++ b/dev-util/ragel/ragel-6.8.recipe
@@ -10,7 +10,7 @@ language syntax.
 "
 HOMEPAGE="http://www.complang.org/ragel"
 SRC_URI="http://www.complang.org/ragel/ragel-6.8.tar.gz"
-CHECKSUM_MD5="1bb39745ac23da449019f9f2cb4b0d01"
+CHECKSUM_SHA256="dd7f7d22f3a58147379bda61334d341c2caa0caf9f71897e3e4ec05c8f398764"
 
 REVISION="1"
 
diff --git a/dev-util/scons/scons-2.2.0.recipe b/dev-util/scons/scons-2.2.0.recipe
index e8a1e94ab..d5b49e719 100644
--- a/dev-util/scons/scons-2.2.0.recipe
+++ b/dev-util/scons/scons-2.2.0.recipe
@@ -9,9 +9,9 @@ easier, more reliable and faster way to build software.
 HOMEPAGE="http://www.scons.org/"
 LICENSE="MIT"
 COPYRIGHT="2001-2012 The SCons Foundation"
-SRC_URI="http://superb-dca3.dl.sourceforge.net/project/scons/scons/2.2.0/scons-2.2.0.tar.gz"
-CHECKSUM_MD5="f737f474a02d08156c821bd2d4d4b632"
-REVISION="2"
+SRC_URI="http://sourceforge.net/projects/scons/files/scons/2.2.0/scons-2.2.0.tar.gz"
+CHECKSUM_SHA256="f7fcd11a7af7ec13d587a2f7cf14a92e3223eea64bf078454a9856ec0ab465b9"
+REVISION="3"
 ARCHITECTURES="x86_gcc2 x86 x86_64"
 
 PATCHES="scons-2.2.0.patchset"
diff --git a/dev-util/scons/scons-2.3.1.recipe b/dev-util/scons/scons-2.3.1.recipe
new file mode 100644
index 000000000..34c143f5a
--- /dev/null
+++ b/dev-util/scons/scons-2.3.1.recipe
@@ -0,0 +1,53 @@
+SUMMARY="Open Source software construction tool"
+DESCRIPTION="
+SCons is an Open Source software construction tool—that is, a next-generation \
+build tool. Think of SCons as an improved, cross-platform substitute for the \
+classic Make utility with integrated functionality similar to \
+autoconf/automake and compiler caches such as ccache. In short, SCons is an \
+easier, more reliable and faster way to build software.
+"
+HOMEPAGE="http://www.scons.org/"
+LICENSE="MIT"
+COPYRIGHT="2001-2012 The SCons Foundation"
+SRC_URI="http://sourceforge.net/projects/scons/files/scons/$portVersion/scons-$portVersion.tar.gz"
+CHECKSUM_SHA256="091ab468f8e6084c30f3ae9fd48828e3884021401cfef4b713d13161ba120201"
+REVISION="3"
+ARCHITECTURES="x86_gcc2 x86 x86_64"
+
+PATCHES="scons-2.2.0.patchset"
+
+PROVIDES="
+	scons = $portVersion compat >= 2
+	cmd:scons = $portVersion compat >= 2
+	cmd:scons_$portVersion = $portVersion compat >= 2
+	cmd:scons_time = $portVersion compat >= 2
+	cmd:scons_time_$portVersion = $portVersion compat >= 2
+	cmd:sconsign = $portVersion compat >= 2
+	cmd:sconsign_$portVersion = $portVersion compat >= 2
+	"
+REQUIRES="
+	haiku >= $haikuVersion
+	cmd:python
+	"
+BUILD_REQUIRES="
+	"
+BUILD_PREREQUIRES="
+	cmd:python
+	"
+
+BUILD()
+{
+	for f in "script/scons script/scons-time script/sconsign"; do
+		sed -i -e "s@#! /usr/bin/env python@#! /bin/env python@" $f
+	done
+	python setup.py build
+}
+
+INSTALL()
+{
+	options="$options --prefix=$prefix"
+	options="$options --install-data=$documentationDir"
+	options="$options --symlink-scons"
+	options="$options --standard-lib"
+	python setup.py install $options
+}
diff --git a/dev-vcs/bzr/bzr-2.6.0.recipe b/dev-vcs/bzr/bzr-2.6.0.recipe
index 5b231d99d..140a71dff 100644
--- a/dev-vcs/bzr/bzr-2.6.0.recipe
+++ b/dev-vcs/bzr/bzr-2.6.0.recipe
@@ -8,10 +8,10 @@ is free software sponsored by Canonical.
 "
 HOMEPAGE="http://bazaar.canonical.com"
 SRC_URI="https://launchpadlibrarian.net/145980211/bzr-2.6.0.tar.gz"
+CHECKSUM_SHA256="0994797182eb828867eee81cccc79480bd2946c99304266bc427b902cf91dab0"
 REVISION="1"
 LICENSE="GNU GPL v2"
 COPYRIGHT="2005-2013 Canonical"
-CHECKSUM_MD5="28c86653d0df10d202c6b842deb0ea35"
 
 ARCHITECTURES="!x86 !x86_gcc2 !x86_64"
 
diff --git a/dev-vcs/cvs/cvs-1.12.13.1.recipe b/dev-vcs/cvs/cvs-1.12.13.1.recipe
index fed41739f..1658ea96b 100644
--- a/dev-vcs/cvs/cvs-1.12.13.1.recipe
+++ b/dev-vcs/cvs/cvs-1.12.13.1.recipe
@@ -37,7 +37,7 @@ COPYRIGHT="1986-2005 Free Software Foundation, Inc."
 LICENSE="GNU GPL v1
 	GNU LGPL v2"
 SRC_URI="ftp://ftp.ru.debian.org/gentoo-distfiles/distfiles/cvs-1.12.13.1.tar.bz2"
-CHECKSUM_MD5="cfd07b224956daaed53fb3063bece1bf"
+CHECKSUM_SHA256="de7f374d8c4ac414c04e8d44ce9a5d3da919825a6a332d747e299dc7a80c2218"
 REVISION="6"
 ARCHITECTURES="x86_gcc2 x86 x86_64"
 
diff --git a/dev-vcs/cvsps/cvsps-2.2b1.recipe b/dev-vcs/cvsps/cvsps-2.2b1.recipe
index b2d428fdc..7e2295506 100644
--- a/dev-vcs/cvsps/cvsps-2.2b1.recipe
+++ b/dev-vcs/cvsps/cvsps-2.2b1.recipe
@@ -12,7 +12,7 @@ HOMEPAGE="http://www.cobite.com/cvsps/"
 COPYRIGHT="2001-2003 David Mansfield"
 LICENSE="GNU GPL v2"
 SRC_URI="http://www.cobite.com/cvsps/cvsps-2.2b1.tar.gz"
-CHECKSUM_MD5="997580e8e283034995b9209076858c68"
+CHECKSUM_SHA256="6906acb3636cdb4a4a9d608111aec22a85530037cb08a62ed5eb74ca0b218f81"
 REVISION="1"
 ARCHITECTURES="x86 x86_64"
 if [ $effectiveTargetArchitecture != x86_gcc2 ]; then
diff --git a/dev-vcs/fossil/fossil-1.28.recipe b/dev-vcs/fossil/fossil-1.28.recipe
index 57d9d647e..2aee98bff 100644
--- a/dev-vcs/fossil/fossil-1.28.recipe
+++ b/dev-vcs/fossil/fossil-1.28.recipe
@@ -4,7 +4,7 @@ Simple, high-reliability, distributed software configuration management
 "
 HOMEPAGE="http://www.fossil-scm.org/" 
 SRC_URI="http://www.fossil-scm.org/download/fossil-src-20140127173344.tar.gz"
-CHECKSUM_MD5="e123c15c9b82b8bed2f4d1c5f8e19f8c"
+CHECKSUM_SHA256="aca7c5a7c39ae2880712020e089c9c12543ba656c71d8cf8ac50e3c8871baa80"
 REVISION="1"
 LICENSE="BSD (2-clause)"
 COPYRIGHT="2007 D. Richard Hipp"
diff --git a/dev-vcs/git/git-1.7.10.2.recipe b/dev-vcs/git/git-1.7.10.2.recipe
index 2cc4a79f3..fb4865ba4 100644
--- a/dev-vcs/git/git-1.7.10.2.recipe
+++ b/dev-vcs/git/git-1.7.10.2.recipe
@@ -12,14 +12,14 @@ LICENSE="GNU GPL v2"
 COPYRIGHT="2005-2012 Git Authors (see git web site for list)"
 
 SRC_URI="http://git-core.googlecode.com/files/git-1.7.10.2.tar.gz"
-CHECKSUM_MD5="2e2ee53243ab8e7cf10f15c5229c3fce"
+CHECKSUM_SHA256="335e978814659f328e377715b13a33336859275ae6f215bf28bbbb2ae711bb43"
 PATCHES="git-1.7.10.2.patch"
 
 SRC_URI_2="http://git-core.googlecode.com/files/git-manpages-1.7.10.2.tar.gz"
-CHECKSUM_MD5_2="79bae5456db8366803d28db867892d74"
+CHECKSUM_SHA256_2="bc57810ec8d87f7a10f320e31ceeb1f9eaf254e62e0f6414af67f17d0cf7d522"
 
 SRC_URI_3="http://git-core.googlecode.com/files/git-htmldocs-1.7.10.2.tar.gz"
-CHECKSUM_MD5_3="9c401a36aee40d68f5ca3513818e8f29"
+CHECKSUM_SHA256_3="4cb17519eb621060d657c71ba8b10d755a6ea71123642ed6cc73d24ce8f0b734"
 
 REVISION="2"
 
diff --git a/dev-vcs/git/git-1.8.3.4.recipe b/dev-vcs/git/git-1.8.3.4.recipe
index e9a4b9a69..6614006ac 100644
--- a/dev-vcs/git/git-1.8.3.4.recipe
+++ b/dev-vcs/git/git-1.8.3.4.recipe
@@ -12,16 +12,17 @@ LICENSE="GNU GPL v2"
 COPYRIGHT="2005-2012 Git Authors (see git web site for list)"
 
 SRC_URI="http://git-core.googlecode.com/files/git-1.8.3.4.tar.gz"
-CHECKSUM_MD5="80eec3201a5d012913d287b85adaee8e"
+CHECKSUM_SHA256="dfa2cdf2df92b4abe956b1e7586030381c4e39e89161ab789a660d8d1f24d9d9"
 PATCHES="git-1.8.3.4.patchset"
 
 SRC_URI_2="http://git-core.googlecode.com/files/git-manpages-1.8.3.4.tar.gz"
-CHECKSUM_MD5_2="86fd812754d25201fd72c7476045dfec"
+CHECKSUM_SHA256_2="6943c3b2362c107ab32d8ed81b8f4811c6e5a2eddd91b8e4188ccf6b4be2b740"
 
 SRC_URI_3="http://git-core.googlecode.com/files/git-htmldocs-1.8.3.4.tar.gz"
-CHECKSUM_MD5_3="be01cc4be1b946b053b69d12b422854a"
+CHECKSUM_SHA256_3="da13f9453489145d5aaefeb6535ce43621fdb7ff426c50304acf2c2e4430005c"
 
-REVISION="2"
+
+REVISION="4"
 
 ARCHITECTURES="x86_gcc2 x86 x86_64"
 
@@ -82,6 +83,7 @@ REQUIRES_arch="
 REQUIRES_cvs="
 	haiku >= $haikuVersion
 	git == $portVersion base
+	cmd:cvsps
 	"
 REQUIRES_daemon="
 	haiku >= $haikuVersion
@@ -117,6 +119,7 @@ BUILD_REQUIRES="
 BUILD_PREREQUIRES="
 	haiku_devel >= $haikuVersion
 	cmd:autoconf
+	cmd:find
 	cmd:gcc
 	cmd:gettext
 	cmd:ld
diff --git a/dev-vcs/mercurial/mercurial-2.2.2.recipe b/dev-vcs/mercurial/mercurial-2.2.2.recipe
index a601086c3..932a92806 100644
--- a/dev-vcs/mercurial/mercurial-2.2.2.recipe
+++ b/dev-vcs/mercurial/mercurial-2.2.2.recipe
@@ -6,7 +6,7 @@ HOMEPAGE="http://mercurial.selenic.com/"
 COPYRIGHT="2005-2012 Matt Mackall et al."
 LICENSE="GNU GPL v2"
 SRC_URI="http://mercurial.selenic.com/release/mercurial-2.2.2.tar.gz"
-CHECKSUM_MD5="9f59b5d71969cbb2671702cd2a7a5a11"
+CHECKSUM_SHA256="3489110ec11fefbd2cbdefb8d715d0a869cef3dd729aaf4d5141108f8be1600a"
 REVISION="5"
 ARCHITECTURES="x86_gcc2 x86 x86_64"
 
diff --git a/dev-vcs/mercurial/mercurial-2.8.1.recipe b/dev-vcs/mercurial/mercurial-2.8.1.recipe
index 8b4b88559..cb46dd3b6 100644
--- a/dev-vcs/mercurial/mercurial-2.8.1.recipe
+++ b/dev-vcs/mercurial/mercurial-2.8.1.recipe
@@ -6,7 +6,7 @@ HOMEPAGE="http://mercurial.selenic.com/"
 COPYRIGHT="2005-2012 Matt Mackall et al."
 LICENSE="GNU GPL v2"
 SRC_URI="http://mercurial.selenic.com/release/mercurial-2.8.1.tar.gz"
-CHECKSUM_MD5="bede5869f9b5d09ab3269bac472495e7"
+CHECKSUM_SHA256="d239a204cc76b6456b4121eaf35e584f33c510855865da0376dd1f708dd33366"
 REVISION="1"
 ARCHITECTURES="x86_gcc2 x86 x86_64"
 
diff --git a/dev-vcs/mercurial/mercurial-2.9.1.recipe b/dev-vcs/mercurial/mercurial-2.9.1.recipe
new file mode 100644
index 000000000..09d14f259
--- /dev/null
+++ b/dev-vcs/mercurial/mercurial-2.9.1.recipe
@@ -0,0 +1,56 @@
+SUMMARY="Free, distributed source control management tool"
+DESCRIPTION="
+Mercurial is a free, distributed source control management tool.
+"
+HOMEPAGE="http://mercurial.selenic.com/"
+COPYRIGHT="2005-2012 Matt Mackall et al."
+LICENSE="GNU GPL v2"
+SRC_URI="http://mercurial.selenic.com/release/mercurial-2.9.1.tar.gz"
+CHECKSUM_SHA256="a20fb1434ecbdb070ef955c7c292db9eb2676bfc1ac165e95ba73866623bc01a"
+REVISION="1"
+ARCHITECTURES="x86_gcc2 x86 x86_64"
+
+PATCHES="mercurial-2.8.1.patch"
+
+PROVIDES="
+	mercurial = $portVersion compat >= 2
+	cmd:hg = $portVersion compat >= 2
+	"
+
+REQUIRES="
+	haiku_devel >= $haikuVersion
+	cmd:python
+	cmd:nano
+	"
+
+BUILD_REQUIRES="
+	haiku_devel >= $haikuVersion
+	"
+
+BUILD_PREREQUIRES="
+	cmd:python
+	cmd:gcc
+	cmd:gettext
+	cmd:ld
+	cmd:make
+	cmd:msgfmt
+	"
+
+BUILD()
+{
+	$portPackageLinksDir/cmd~python/bin/python setup.py build --force
+}
+
+INSTALL()
+{
+	$portPackageLinksDir/cmd~python/bin/python setup.py install \
+		--prefix="$prefix" \
+		--install-headers="$includedir" \
+		--force
+}
+
+TEST()
+{
+	cd tests
+	python run-tests.py
+}
diff --git a/dev-vcs/mercurial/mercurial-2.9.2.recipe b/dev-vcs/mercurial/mercurial-2.9.2.recipe
new file mode 100644
index 000000000..540756cd4
--- /dev/null
+++ b/dev-vcs/mercurial/mercurial-2.9.2.recipe
@@ -0,0 +1,56 @@
+SUMMARY="Free, distributed source control management tool"
+DESCRIPTION="
+Mercurial is a free, distributed source control management tool.
+"
+HOMEPAGE="http://mercurial.selenic.com/"
+COPYRIGHT="2005-2014 Matt Mackall et al."
+LICENSE="GNU GPL v2"
+SRC_URI="http://mercurial.selenic.com/release/mercurial-$portVersion.tar.gz"
+CHECKSUM_SHA256="86462b3a1518e137cfe813dc273b8acb120ad71230a1813c0dc9335223b38f53"
+REVISION="1"
+ARCHITECTURES="x86_gcc2 x86 x86_64"
+
+PATCHES="mercurial-2.8.1.patch"
+
+PROVIDES="
+	mercurial = $portVersion compat >= 2
+	cmd:hg = $portVersion compat >= 2
+	"
+
+REQUIRES="
+	haiku_devel >= $haikuVersion
+	cmd:python
+	cmd:nano
+	"
+
+BUILD_REQUIRES="
+	haiku_devel >= $haikuVersion
+	"
+
+BUILD_PREREQUIRES="
+	cmd:python
+	cmd:gcc
+	cmd:gettext
+	cmd:ld
+	cmd:make
+	cmd:msgfmt
+	"
+
+BUILD()
+{
+	$portPackageLinksDir/cmd~python/bin/python setup.py build --force
+}
+
+INSTALL()
+{
+	$portPackageLinksDir/cmd~python/bin/python setup.py install \
+		--prefix="$prefix" \
+		--install-headers="$includedir" \
+		--force
+}
+
+TEST()
+{
+	cd tests
+	python run-tests.py
+}
diff --git a/dev-vcs/subversion/subversion-1.6.15.recipe b/dev-vcs/subversion/subversion-1.6.15.recipe
index 4b9a18eba..b6bf0d8f9 100644
--- a/dev-vcs/subversion/subversion-1.6.15.recipe
+++ b/dev-vcs/subversion/subversion-1.6.15.recipe
@@ -10,7 +10,7 @@ HOMEPAGE="http://subversion.apache.org"
 LICENSE="Apache-Subversion"
 COPYRIGHT="2010 The Apache Software Foundation"
 SRC_URI="http://subversion.tigris.org/downloads/subversion-1.6.15.tar.bz2"
-CHECKSUM_MD5="113fca1d9e4aa389d7dc2b210010fa69"
+CHECKSUM_SHA256="b2919d603a5f3c19f42e3265c4b930e2376c43b3969b90ef9c42b2f72d5aaa45"
 REVISION="5"
 ARCHITECTURES="x86_gcc2 ?x86"
 
diff --git a/dev-vcs/subversion/subversion-1.6.18.recipe b/dev-vcs/subversion/subversion-1.6.18.recipe
index f103e0369..1b24c5dd8 100644
--- a/dev-vcs/subversion/subversion-1.6.18.recipe
+++ b/dev-vcs/subversion/subversion-1.6.18.recipe
@@ -10,7 +10,7 @@ HOMEPAGE="http://subversion.apache.org"
 LICENSE="Apache-Subversion"
 COPYRIGHT="2010 The Apache Software Foundation"
 SRC_URI="http://subversion.tigris.org/downloads/subversion-1.6.18.tar.bz2"
-CHECKSUM_MD5="c5c662a5d19d047256fa333bd890a925"
+CHECKSUM_SHA256="b50f073336249565c12dca1a4f4fef830f1d7492b3d39747f1635da2a8c6f188"
 REVISION="6"
 ARCHITECTURES="x86_gcc2 x86 x86_64"
 
diff --git a/games-action/maelstrom/maelstrom-3.0.6.recipe b/games-action/maelstrom/maelstrom-3.0.6.recipe
index bbf3c5ad0..def64fb01 100644
--- a/games-action/maelstrom/maelstrom-3.0.6.recipe
+++ b/games-action/maelstrom/maelstrom-3.0.6.recipe
@@ -19,7 +19,7 @@ HOMEPAGE="http://www.libsdl.org/projects/Maelstrom"
 COPYRIGHT="Copyright (C) 1996-2005 Sam Lantinga"
 LICENSE="GNU GPL v2"
 SRC_URI="http://www.libsdl.org/projects/Maelstrom/src/Maelstrom-$portVersion.tar.gz"
-CHECKSUM_MD5="96aa6359538a6bd60b4198a792de578b"
+CHECKSUM_SHA256="e7983c2c7376cdcca1944db1706d92aedd529638cf13358c88a60df982ba7b46"
 REVISION="1"
 ARCHITECTURES="x86_gcc2 x86"
 SECONDARY_ARCHITECTURES="x86"
diff --git a/games-action/quake3/quake3-0.6.1.recipe b/games-action/quake3/quake3-0.6.1.recipe
index c05b539e4..65890bf45 100644
--- a/games-action/quake3/quake3-0.6.1.recipe
+++ b/games-action/quake3/quake3-0.6.1.recipe
@@ -11,7 +11,8 @@ HOMEPAGE="http://www.idsoftware.com"
 COPYRIGHT="Copyright (C) 1999-2005 Id Software, Inc."
 LICENSE="GNU GPL v2"
 SRC_URI="https://github.com/kallisti5/quake3/archive/$portVersion.tar.gz"
-CHECKSUM_MD5="d7f6106605ccd06ec94a3715f8aa34c5"
+CHECKSUM_SHA256="755fc8ea237bd6f296764c7e2ea84638797ec6ffd88a9e17a486a8ee1c666a95"
+SRC_FILENAME="quake3-$portVersion.tar.gz"
 REVISION="2"
 ARCHITECTURES="x86_gcc2 x86"
 SECONDARY_ARCHITECTURES="x86"
diff --git a/games-arcade/f1spirit/f1spirit-0.rc9.1615.recipe b/games-arcade/f1spirit/f1spirit-0.rc9.1615.recipe
index 9172d3076..71acbfcda 100644
--- a/games-arcade/f1spirit/f1spirit-0.rc9.1615.recipe
+++ b/games-arcade/f1spirit/f1spirit-0.rc9.1615.recipe
@@ -3,7 +3,7 @@ HOMEPAGE="http://www2.braingames.getput.com/f1spirit/"
 LICENSE="GNU GPL v2"
 COPYRIGHT="2002-2008 Brain Games"
 SRC_URI="http://braingames.jorito.net/f1spirit/f1spirit.src_0.rc9-1615.tgz"
-CHECKSUM_MD5="304935124a1bf48a4de9b39077655fe9"
+CHECKSUM_SHA256="fc1778dcec68ccd31b9da893abee67e64a7931a34c75a63f8563355b810acbd7"
 REVISION="1"
 ARCHITECTURES="x86_gcc2"
 
diff --git a/games-arcade/goonies/goonies-1.4.1528.recipe b/games-arcade/goonies/goonies-1.4.1528.recipe
index 3e3abc984..e0c0dcbf1 100644
--- a/games-arcade/goonies/goonies-1.4.1528.recipe
+++ b/games-arcade/goonies/goonies-1.4.1528.recipe
@@ -3,7 +3,7 @@ HOMEPAGE="http://www2.braingames.getput.com/goonies/"
 LICENSE="GNU GPL v2"
 COPYRIGHT="2006-2009 Brain Games"
 SRC_URI="http://braingames.jorito.net/goonies/downloads/goonies.src_1.4.1528.tgz"
-CHECKSUM_MD5="7c220958a0766fb716d2d0081c81e8bd"
+CHECKSUM_SHA256="9e9c1e67a41dfae512e975b6931828cdc82f07397921ca0a41a81c3020a73799"
 REVISION="1"
 ARCHITECTURES="x86"
 if [ $effectiveTargetArchitecture != x86_gcc2 ]; then
diff --git a/games-arcade/mog/mog-0.63.1548.recipe b/games-arcade/mog/mog-0.63.1548.recipe
index 235e7d813..238b0e768 100644
--- a/games-arcade/mog/mog-0.63.1548.recipe
+++ b/games-arcade/mog/mog-0.63.1548.recipe
@@ -3,7 +3,7 @@ HOMEPAGE="http://www2.braingames.getput.com/mog/"
 LICENSE="GNU GPL v2"
 COPYRIGHT="2002-2009 Brain Games"
 SRC_URI="http://braingames.jorito.net/mog/downloads/mog.src_0.63-1548.tgz"
-CHECKSUM_MD5="68604c258ce7347662777d853d895769"
+CHECKSUM_SHA256="707bbc1b167a55989916f803dbe55c288652fb54df6194be029c41be99e9ec3a"
 REVISION="1"
 ARCHITECTURES="x86_gcc2"
 
diff --git a/games-arcade/plee_the_bear/patches/plee_the_bear-0.7.0.patchset b/games-arcade/plee_the_bear/patches/plee_the_bear-0.7.0.patchset
new file mode 100644
index 000000000..fdd9681f1
--- /dev/null
+++ b/games-arcade/plee_the_bear/patches/plee_the_bear-0.7.0.patchset
@@ -0,0 +1,129 @@
+From 03033c51349e01d5d06ee74545a15a534525d785 Mon Sep 17 00:00:00 2001
+From: Adrien Destugues <pulkomandy@pulkomandy.tk>
+Date: Sun, 6 Apr 2014 14:54:36 +0200
+Subject: Fix search paths for SDL2 header files.
+
+
+diff --git a/bear/cmake-helper/FindSDL2.cmake b/bear/cmake-helper/FindSDL2.cmake
+index 7665a55..bcd3050 100644
+--- a/bear/cmake-helper/FindSDL2.cmake
++++ b/bear/cmake-helper/FindSDL2.cmake
+@@ -70,7 +70,7 @@
+ find_path(SDL2_INCLUDE_DIR SDL.h
+   HINTS
+     ENV SDL2DIR
+-  PATH_SUFFIXES include/SDL2 include
++  PATH_SUFFIXES include/SDL2 include SDL2
+ )
+ 
+ # SDL2-1.1 is the name used by FreeBSD ports...
+diff --git a/bear/cmake-helper/FindSDL2_mixer.cmake b/bear/cmake-helper/FindSDL2_mixer.cmake
+index 59ed911..d795965 100644
+--- a/bear/cmake-helper/FindSDL2_mixer.cmake
++++ b/bear/cmake-helper/FindSDL2_mixer.cmake
+@@ -40,7 +40,7 @@ find_path(SDL2_MIXER_INCLUDE_DIR SDL_mixer.h
+   HINTS
+     ENV SDL2MIXERDIR
+     ENV SDL2DIR
+-  PATH_SUFFIXES include/SDL2 include
++  PATH_SUFFIXES include/SDL2 include SDL2
+ )
+ 
+ if(NOT SDL2_MIXER_LIBRARY AND SDL2MIXER_LIBRARY)
+-- 
+1.8.3.4
+
+
+From 4a4404ab5a5b9c67925ec6d910ddc5f47fb1b910 Mon Sep 17 00:00:00 2001
+From: Adrien Destugues <pulkomandy@pulkomandy.tk>
+Date: Sun, 6 Apr 2014 17:02:35 +0200
+Subject: Link libintl on haiku.
+
+
+diff --git a/bear/bear-engine/running_bear/CMakeLists.txt b/bear/bear-engine/running_bear/CMakeLists.txt
+index 8b04d89..4fffd94 100644
+--- a/bear/bear-engine/running_bear/CMakeLists.txt
++++ b/bear/bear-engine/running_bear/CMakeLists.txt
+@@ -38,7 +38,7 @@ set(
+   ${CLAW_APPLICATION_LIBRARIES}
+   )
+ 
+-if(WIN32)
++if(WIN32 OR HAIKU)
+   set(
+     RUNNING_BEAR_LINK_LIBRARIES
+     ${RUNNING_BEAR_LINK_LIBRARIES}
+diff --git a/plee-the-bear/launcher/src/CMakeLists.txt b/plee-the-bear/launcher/src/CMakeLists.txt
+index 9ed5d32..ff88206 100644
+--- a/plee-the-bear/launcher/src/CMakeLists.txt
++++ b/plee-the-bear/launcher/src/CMakeLists.txt
+@@ -121,7 +121,7 @@ set(
+   ${CLAW_APPLICATION_LIBRARIES}
+   )
+ 
+-if(WIN32)
++if(WIN32 OR HAIKU)
+   set(
+     PTB_LAUNCHER_LINK_LIBRARIES
+     ${PTB_LAUNCHER_LINK_LIBRARIES}
+-- 
+1.8.3.4
+
+
+From 415c83accad83bf6677dd3d578ab6712582910b9 Mon Sep 17 00:00:00 2001
+From: Adrien Destugues <pulkomandy@pulkomandy.tk>
+Date: Sun, 6 Apr 2014 19:41:58 +0200
+Subject: Fix install directories.
+
+
+diff --git a/bear/cmake-helper/bear-config.cmake b/bear/cmake-helper/bear-config.cmake
+index e66d79e..b483445 100644
+--- a/bear/cmake-helper/bear-config.cmake
++++ b/bear/cmake-helper/bear-config.cmake
+@@ -47,7 +47,7 @@ if( NOT BEAR_ENGINE_INSTALL_LIBRARY_DIR )
+       "${BEAR_ENGINE_INSTALL_EXECUTABLE_DIR}"
+       )
+   else( WIN32 )
+-    set( BEAR_ENGINE_INSTALL_LIBRARY_DIR lib )
++	  set( BEAR_ENGINE_INSTALL_LIBRARY_DIR lib${CMAKE_HAIKU_SECONDARY_ARCH_SUBDIR} )
+   endif( WIN32 )
+ endif( NOT BEAR_ENGINE_INSTALL_LIBRARY_DIR )
+ 
+diff --git a/bear/cmake-module/CMakeLists.txt b/bear/cmake-module/CMakeLists.txt
+index e182689..24c2113 100644
+--- a/bear/cmake-module/CMakeLists.txt
++++ b/bear/cmake-module/CMakeLists.txt
+@@ -1,7 +1,7 @@
+ project(bear:cmake-modules)
+ 
+ if( NOT BEAR_CMAKE_MODULES_INSTALL_PATH )
+-  set( BEAR_CMAKE_MODULES_INSTALL_PATH "share/cmake/bear-engine" )
++  set( BEAR_CMAKE_MODULES_INSTALL_PATH "data/cmake/bear-engine" )
+ endif( NOT BEAR_CMAKE_MODULES_INSTALL_PATH )
+ 
+ set( BEAR_CMAKE_MODULES
+diff --git a/plee-the-bear/CMakeLists.txt b/plee-the-bear/CMakeLists.txt
+index 6a123d9..9bc8df3 100644
+--- a/plee-the-bear/CMakeLists.txt
++++ b/plee-the-bear/CMakeLists.txt
+@@ -23,7 +23,7 @@ include( docbook-to-man )
+ #-------------------------------------------------------------------------------
+ # where the game resources are installed
+ if( NOT PTB_INSTALL_DATA_DIR )
+-  set( PTB_INSTALL_DATA_DIR share/plee-the-bear )
++  set( PTB_INSTALL_DATA_DIR data/plee-the-bear )
+ endif( NOT PTB_INSTALL_DATA_DIR )
+ 
+ # where the game executables are installed
+@@ -154,7 +154,7 @@ subdirs(
+ 
+ install(
+   DIRECTORY "lib/item-description"
+-  DESTINATION "share/bear-factory/plee-the-bear"
++  DESTINATION "data/bear-factory/plee-the-bear"
+   FILE_PERMISSIONS OWNER_READ OWNER_WRITE
+   GROUP_READ
+   WORLD_READ
+-- 
+1.8.3.4
+
diff --git a/games-arcade/plee_the_bear/plee_the_bear-0.7.0.recipe b/games-arcade/plee_the_bear/plee_the_bear-0.7.0.recipe
new file mode 100644
index 000000000..55d0e5075
--- /dev/null
+++ b/games-arcade/plee_the_bear/plee_the_bear-0.7.0.recipe
@@ -0,0 +1,108 @@
+SUMMARY="A platform game in which you play an angry bear whose son has been kidnapped by god."
+HOMEPAGE="http://www.stuff-o-matic.com/plee-the-bear/"
+LICENSE="GNU GPL v3"
+COPYRIGHT="2012 Stuff O Matic"
+SRC_URI="http://www.stuff-o-matic.com/plee-the-bear/download/file.php?platform=source"
+CHECKSUM_SHA256="41dfe864fe2d791d6f99ba7cd330e22c94fce19d82909054eeac594aa4f2924e"
+SRC_FILENAME="plee-the-bear-0.7.0.tgz"
+
+REVISION="1"
+ARCHITECTURES="?x86"
+if [ $effectiveTargetArchitecture != x86_gcc2 ]; then
+	# x86_gcc2 is fine as primary target architecture as long as we're building
+	# for a different secondary architecture.
+	ARCHITECTURES="$ARCHITECTURES !x86_gcc2"
+fi
+SECONDARY_ARCHITECTURES="x86"
+
+PROVIDES="
+	plee_the_bear = $portVersion
+	cmd:plee_the_bear = $portVersion
+	lib:libbear_audio$secondaryArchSuffix
+	lib:libbear_communication$secondaryArchSuffix
+	lib:libbear_debug$secondaryArchSuffix
+	lib:libbear_engine$secondaryArchSuffix
+	lib:libbear_expr$secondaryArchSuffix
+	lib:libbear_generic_items$secondaryArchSuffix
+	lib:libbear_gui$secondaryArchSuffix
+	lib:libbear_input$secondaryArchSuffix
+	lib:libbear_net$secondaryArchSuffix
+	lib:libbear_text_interface$secondaryArchSuffix
+	lib:libbear_time$secondaryArchSuffix
+	lib:libbear_universe$secondaryArchSuffix
+	lib:libbear_visual$secondaryArchSuffix
+	"
+
+REQUIRES="
+	haiku$secondaryArchSuffix >= $haikuVersion
+	lib:libstdc++$secondaryArchSuffix
+	lib:libsdl2$secondaryArchSuffix
+	lib:libsdl$secondaryArchSuffix
+	lib:libsdl2_mixer$secondaryArchSuffix
+	lib:libintl$secondaryArchSuffix
+	lib:libGL$secondaryArchSuffix
+	lib:libjpeg$secondaryArchSuffix
+	lib:libpng$secondaryArchSuffix
+	lib:libz$secondaryArchSuffix
+	lib:libclaw_dynamic_library$secondaryArchSuffix
+	lib:libclaw_graphic$secondaryArchSuffix
+	lib:libclaw_net$secondaryArchSuffix
+	lib:libclaw_tween$secondaryArchSuffix
+	lib:libboost_system$secondaryArchSuffix
+	lib:libboost_thread$secondaryArchSuffix
+	lib:libboost_filesystem$secondaryArchSuffix
+	lib:libboost_regex$secondaryArchSuffix
+	lib:libfreetype$secondaryArchSuffix
+	"
+BUILD_REQUIRES="
+	devel:libsdl2$secondaryArchSuffix
+	devel:libsdl2_mixer$secondaryArchSuffix
+	devel:libsdl$secondaryArchSuffix
+	devel:sdl_mixer$secondaryArchSuffix
+	devel:libfreetype$secondaryArchSuffix
+	devel:libclaw_application$secondaryArchSuffix
+	devel:libz$secondaryArchSuffix
+	devel:libpng$secondaryArchSuffix
+	devel:libjpeg$secondaryArchSuffix
+	devel:libintl$secondaryArchSuffix
+	boost_devel${secondaryArchSuffix}
+	"
+BUILD_PREREQUIRES="
+	haiku${secondaryArchSuffix}_devel >= $haikuVersion
+	cmd:gcc$secondaryArchSuffix
+	cmd:ld$secondaryArchSuffix
+	cmd:make
+	cmd:cmake >= 3.0
+	"
+
+SOURCE_DIR="plee-the-bear-0.7.0-light"
+PATCHES="plee_the_bear-$portVersion.patchset"
+BUILD()
+{
+	cmake . -DBEAR_EDITORS_ENABLED=FALSE -DCMAKE_INSTALL_PREFIX=$prefix
+	make $jobArgs
+}
+
+INSTALL()
+{
+	make install
+	rm -r $prefix/share
+
+	addAppDeskbarSymlink $binDir/plee_the_bear "Plee the Bear"
+}
+
+# ----- DESCRIPTION -----------------------------------------------------------
+
+DESCRIPTION="
+Plee the Bear is a platform game in which you play an angry bear whose son has
+been kidnapped by god. Here is a guy hard to brave! Jump in this amazing journey
+to find and rescue your son. Because you want to rescue him, don't you? Or to
+slap him? Maybe both….
+
+With three levels of the storyline and four mini-games, Plee the Bear did
+received very positive criticisms. The players loved the fun, the graphics and
+the music; the community around the free software movement appreciated the
+overall process and the quality of the resources, remarkable for a free game;
+and the indie gaming community was pleasantly surprised by the technical skills
+and the details of the game.
+"
diff --git a/games-arcade/roadfighter/roadfighter-1.0.1269.recipe b/games-arcade/roadfighter/roadfighter-1.0.1269.recipe
index 2d0a61bf8..d4e9fc9d9 100644
--- a/games-arcade/roadfighter/roadfighter-1.0.1269.recipe
+++ b/games-arcade/roadfighter/roadfighter-1.0.1269.recipe
@@ -3,7 +3,7 @@ HOMEPAGE="http://www2.braingames.getput.com/roadf/"
 LICENSE="GNU GPL v2"
 COPYRIGHT="2003-2009 Brain Games"
 SRC_URI="http://braingames.jorito.net/roadfighter/downloads/roadfighter.src_1.0.1269.tgz"
-CHECKSUM_MD5="a1626dda4d17ae30bbdd9c1ede2cd555"
+CHECKSUM_SHA256="c6ed315c4b2bf25d598ffa6b5dfd471e7f187ff29b86fd3213054fb6be7c57e7"
 REVISION="1"
 ARCHITECTURES="x86_gcc2"
 
diff --git a/games-arcade/rocksndiamonds/rocksndiamonds-3.3.1.2.recipe b/games-arcade/rocksndiamonds/rocksndiamonds-3.3.1.2.recipe
index b95b6575c..4e90b7c02 100644
--- a/games-arcade/rocksndiamonds/rocksndiamonds-3.3.1.2.recipe
+++ b/games-arcade/rocksndiamonds/rocksndiamonds-3.3.1.2.recipe
@@ -3,7 +3,7 @@ HOMEPAGE="http://www.artsoft.org/rocksndiamonds/"
 LICENSE="GNU GPL v2"
 COPYRIGHT="2001-2013 Artsoft Entertainment"
 SRC_URI="http://www.artsoft.org/RELEASES/unix/rocksndiamonds/rocksndiamonds-3.3.1.2.tar.gz"
-CHECKSUM_MD5="9fb7d125a314f55c5148c0e47f9ebb42"
+CHECKSUM_SHA256="c117c20026299c6c935bd531ef9b0dc767731f600881d12ceb80c831483755f3"
 REVISION="1"
 ARCHITECTURES="x86"
 if [ $effectiveTargetArchitecture != x86_gcc2 ]; then
diff --git a/games-arcade/sdlscavenger/sdlscavenger-145.1.recipe b/games-arcade/sdlscavenger/sdlscavenger-145.1.recipe
index 8d8629d82..463f07e10 100644
--- a/games-arcade/sdlscavenger/sdlscavenger-145.1.recipe
+++ b/games-arcade/sdlscavenger/sdlscavenger-145.1.recipe
@@ -3,7 +3,7 @@ HOMEPAGE="http://sourceforge.net/projects/sdlscavenger/files/"
 LICENSE="GNU GPL v2"
 COPYRIGHT="1999-2010 Dave Ashley"
 SRC_URI="http://www.mirrorservice.org/sites/downloads.sourceforge.net/s/sd/sdlscavenger/sdlscav-145.1_2010_11_5.tgz"
-CHECKSUM_MD5="995dc8b6b1792e1c2c9ec253bcfafbfe"
+CHECKSUM_SHA256="c63666c0783d05b24895065781608994c43e4b359605be6806845b46f093d016"
 REVISION="1"
 ARCHITECTURES="x86_gcc2"
 
diff --git a/games-arcade/super_transball/super_transball-2.1.5.recipe b/games-arcade/super_transball/super_transball-2.1.5.recipe
index ee51e2c62..70e4fd1c2 100644
--- a/games-arcade/super_transball/super_transball-2.1.5.recipe
+++ b/games-arcade/super_transball/super_transball-2.1.5.recipe
@@ -3,7 +3,7 @@ HOMEPAGE="http://www2.braingames.getput.com/stransball2/default.asp"
 LICENSE="GNU GPL v2"
 COPYRIGHT="2003-2005 Brain Games"
 SRC_URI="http://www2.braingames.getput.com/stransball2/downloads/stransball2-v15-windows.zip"
-CHECKSUM_MD5="71214c96369fb78280b75725a51c1989"
+CHECKSUM_SHA256="644cf89c8b7084abe0451ff433db25b41e43da77d5d92edad8253baf48b018db"
 REVISION="1"
 ARCHITECTURES="x86_gcc2"
 
diff --git a/games-arcade/xrick/xrick-021212.recipe b/games-arcade/xrick/xrick-021212.recipe
index bef842bcb..e86a18b81 100644
--- a/games-arcade/xrick/xrick-021212.recipe
+++ b/games-arcade/xrick/xrick-021212.recipe
@@ -3,7 +3,7 @@ HOMEPAGE="http://www.bigorno.net/xrick"
 LICENSE="xrick"
 COPYRIGHT="2000-2006 Bigorno.net"
 SRC_URI="http://www.bigorno.net/xrick/xrick-021212.tgz"
-CHECKSUM_MD5="615190051481266710cb43ecd1fe930c"
+CHECKSUM_SHA256="aa8542120bec97a730258027a294bd16196eb8b3d66134483d085f698588fc2b"
 REVISION="1"
 ARCHITECTURES="x86_gcc2"
 
diff --git a/games-emulation/dosbox/dosbox-0.74.recipe b/games-emulation/dosbox/dosbox-0.74.recipe
index 80b46d765..3d2507a9a 100644
--- a/games-emulation/dosbox/dosbox-0.74.recipe
+++ b/games-emulation/dosbox/dosbox-0.74.recipe
@@ -13,7 +13,7 @@ DOSBox is totally free of charge and OpenSource.
 "
 HOMEPAGE="http://www.dosbox.com"
 SRC_URI="http://sourceforge.net/projects/dosbox/files/dosbox/0.74/dosbox-0.74.tar.gz/download"
-CHECKSUM_MD5="b9b240fa87104421962d14eee71351e8"
+CHECKSUM_SHA256="13f74916e2d4002bad1978e55727f302ff6df3d9be2f9b0e271501bd0a938e05"
 REVISION="1"
 LICENSE="GNU GPL v2"
 COPYRIGHT="2002-2013 The DosBox Team"
diff --git a/games-engines/love/love-0.9.0.recipe b/games-engines/love/love-0.9.0.recipe
index 506fe173a..e0756bc61 100644
--- a/games-engines/love/love-0.9.0.recipe
+++ b/games-engines/love/love-0.9.0.recipe
@@ -5,7 +5,7 @@ It's free, open-source, and works on Windows, Mac OS X and Linux.
 "
 HOMEPAGE="http://love2d.org/"
 SRC_URI="https://bitbucket.org/rude/love/downloads/love-0.9.0-linux-src.tar.gz"
-CHECKSUM_MD5="6591752af4e33f521d616d9b048aa894"
+CHECKSUM_SHA256="4f0d24945223fc3ba78f0a81799a179f06b97e9b0aea2c9c6ad532820a491611"
 REVISION="1"
 LICENSE="Zlib"
 COPYRIGHT="2010-2014 Löve"
@@ -59,15 +59,17 @@ BUILD_PREREQUIRES="
 	cmd:make
 	cmd:gcc$secondaryArchSuffix
 	cmd:ld$secondaryArchSuffix
-#	cmd:libtoolize
 	cmd:pkg_config$secondaryArchSuffix
+	cmd:awk
 "
 
 PATCHES="love-0.9.0.patchset"
 BUILD()
 {
 	runConfigure ./configure
-	make $jobArgs
+	# The pkg-config for freetype doesn't give this directory, which means
+	# there is no good way of finding it...
+	make $jobArgs CXXFLAGS="-I/system/develop/headers/x86/freetype2/ --std=c++11"
 }
 
 INSTALL()
diff --git a/games-engines/love/patches/love-0.9.0.patchset b/games-engines/love/patches/love-0.9.0.patchset
index 5dc81f5fd..ff417add8 100644
--- a/games-engines/love/patches/love-0.9.0.patchset
+++ b/games-engines/love/patches/love-0.9.0.patchset
@@ -1,4 +1,4 @@
-From 42a0ac9d4b717dccdb1c6f3d9615b702255574d2 Mon Sep 17 00:00:00 2001
+From 812eb4fa9c69400b4bd0c10e29db3ca14dc51bf0 Mon Sep 17 00:00:00 2001
 From: Adrien Destugues <pulkomandy@pulkomandy.tk>
 Date: Tue, 28 Jan 2014 20:25:18 +0100
 Subject: Hack Glee to compile (we don't need GLX!)
@@ -53,3 +53,27 @@ index 631cddc..42782ec 100644
 -- 
 1.8.3.4
 
+
+From cd63b6001a9dca28e0af9803b50f5127621ef1b7 Mon Sep 17 00:00:00 2001
+From: Adrien Destugues <pulkomandy@pulkomandy.tk>
+Date: Tue, 1 Apr 2014 22:32:15 +0200
+Subject: Remove dupliczte definition of __stdcall
+
+* Haiku defines that to empty already, for legacy reasons.
+
+diff --git a/src/modules/graphics/opengl/GLee.c b/src/modules/graphics/opengl/GLee.c
+index 850a87d..1f46525 100644
+--- a/src/modules/graphics/opengl/GLee.c
++++ b/src/modules/graphics/opengl/GLee.c
+@@ -55,7 +55,7 @@ typedef GLuint(*GLEE_LINK_FUNCTION)(void);
+ 
+ GLboolean __GLeeInited=GL_FALSE;
+ 
+-#ifndef _WIN32
++#if !defined(_WIN32) && !defined(__HAIKU__)
+ 	#define __stdcall  /* nothing */
+ #endif 
+ 
+-- 
+1.8.3.4
+
diff --git a/games-engines/scummvm/scummvm-1.6.0.recipe b/games-engines/scummvm/scummvm-1.6.0.recipe
index 8436356b1..03f773944 100644
--- a/games-engines/scummvm/scummvm-1.6.0.recipe
+++ b/games-engines/scummvm/scummvm-1.6.0.recipe
@@ -8,7 +8,8 @@ designed!
 "
 HOMEPAGE="http://scummvm.org"
 SRC_URI="http://prdownloads.sourceforge.net/scummvm/scummvm-1.6.0.tar.bz2?download"
-CHECKSUM_MD5="473c151ff44e3db7b603ecacd800a0d2"
+CHECKSUM_SHA256="396060da6a8f391438055c292a280048d29dc408c5b615db43256a86f0e57ec4"
+SRC_FILENAME="scummvm-$portVersion.tar.bz2"
 REVISION="1"
 LICENSE="GNU GPL v2"
 COPYRIGHT="2001-2013 ScummVM Team"
diff --git a/games-engines/solarus/solarus-1.1.1.recipe b/games-engines/solarus/solarus-1.1.1.recipe
index 7fbb49db8..efc7397bc 100644
--- a/games-engines/solarus/solarus-1.1.1.recipe
+++ b/games-engines/solarus/solarus-1.1.1.recipe
@@ -4,7 +4,7 @@ Solarus is an open-source Zelda-like 2D game engine.
 "
 HOMEPAGE="http://solarus-games.org"
 SRC_URI="http://www.solarus-games.org/downloads/solarus/solarus-1.1.1-src.tar.gz"
-CHECKSUM_MD5="168894091ce4b728889069c767a1532d"
+CHECKSUM_SHA256="5355e95edbd5234f57a8748d1417ca346468e5804e44293d2523b57367eb5615"
 REVISION="2"
 LICENSE="GNU GPL v3"
 COPYRIGHT="2006-2013 Christopho, Solarus"
diff --git a/games-kids/dragonmemory/dragonmemory-1.recipe b/games-kids/dragonmemory/dragonmemory-1.recipe
index 04658d7c2..5fa86c8b2 100644
--- a/games-kids/dragonmemory/dragonmemory-1.recipe
+++ b/games-kids/dragonmemory/dragonmemory-1.recipe
@@ -4,8 +4,10 @@ Dragon Memory is a simple but fun memory game with very detailed graphics and \
 addictive gameplay.
 "
 HOMEPAGE="http://sourceforge.net/projects/dragonmemory/" 
-SRC_URI="http://cznic.dl.sourceforge.net/project/dragonmemory/DragonMemory-source.tgz"
-SRC_URI2="http://heanet.dl.sourceforge.net/project/dragonmemory/DragonMemory-source.tgz"
+SRC_URI="http://cznic.dl.sourceforge.net/project/dragonmemory/DragonMemory-source.tgz
+    http://heanet.dl.sourceforge.net/project/dragonmemory/DragonMemory-source.tgz"
+SRC_FILENAME="DragonMemory-1-source.tgz"
+CHECKSUM_SHA256="e0d7ff168cc7a5e01247e4c290346bf26a8423e0fc7b7b3047f437451c8f37b5"
 REVISION="1"
 ARCHITECTURES="!x86_gcc2 !x86 !x86_64"
 SOURCE_DIR="DragonMemory"
diff --git a/games-kids/pipepanic/pipepanic-0.1.3.recipe b/games-kids/pipepanic/pipepanic-0.1.3.recipe
index cbdc2cb02..008eaee6d 100644
--- a/games-kids/pipepanic/pipepanic-0.1.3.recipe
+++ b/games-kids/pipepanic/pipepanic-0.1.3.recipe
@@ -5,7 +5,7 @@ shaped pipes together as possible within the time given.
 "
 HOMEPAGE="http://www.users.waitrose.com/~thunor/pipepanic/"
 SRC_URI="http://www.users.waitrose.com/~thunor/pipepanic/dload/pipepanic-0.1.3-source.tar.gz"
-CHECKSUM_MD5="99b68e990012b2f58c184b8ba9e4fb4d"
+CHECKSUM_SHA256="4b02249c92228b03f4cc3c1d999cacf3fe52c16df53c6bf76fc6c1e2caa74318"
 SOURCE_DIR="pipepanic-0.1.3-source"
 LICENSE="GNU GPL v2"
 COPYRIGHT="2005-2013 Thunor"
diff --git a/games-puzzle/gemz/gemz-0.97.0.recipe b/games-puzzle/gemz/gemz-0.97.0.recipe
index a36062743..d0891a46f 100644
--- a/games-puzzle/gemz/gemz-0.97.0.recipe
+++ b/games-puzzle/gemz/gemz-0.97.0.recipe
@@ -10,7 +10,7 @@ triggered, where chains are formed by the falling gems.
 "
 HOMEPAGE="http://sourceforge.net/projects/gemz/"
 SRC_URI="http://sourceforge.net/projects/gemz/files/gemz/Source/gemz-0.97.0.tgz/download"
-CHECKSUM_MD5="ea71e3cf9ee7f3b7f6d0a7f4cbe0af58"
+CHECKSUM_SHA256="8a61bf40e6e12d6764a1a6d4f99aec27f1c54a31f26ce09d13a6596a33d8ee5a"
 LICENSE="GNU GPL v2"
 COPYRIGHT="2003-2013 Jonathan Bilodeau"
 REVISION="1"
diff --git a/games-puzzle/mirrormagic/mirrormagic-2.0.2.recipe b/games-puzzle/mirrormagic/mirrormagic-2.0.2.recipe
index 0eeddcc0e..5da7e81e1 100644
--- a/games-puzzle/mirrormagic/mirrormagic-2.0.2.recipe
+++ b/games-puzzle/mirrormagic/mirrormagic-2.0.2.recipe
@@ -3,7 +3,7 @@ HOMEPAGE="http://www.artsoft.org/mirrormagic/"
 LICENSE="GNU GPL v2"
 COPYRIGHT="1989-2003 Artsoft Entertainment"
 SRC_URI="http://www.artsoft.org/RELEASES/unix/mirrormagic/mirrormagic-2.0.2.tar.gz"
-#CHECKSUM_MD5="10c03c69d2df6bcae9d835d18215978f"
+CHECKSUM_SHA256="79b3f13d493523438eeb988beffc272c804bc7a4361b83167a082c77e74b3ce2"
 REVISION="1"
 ARCHITECTURES="x86_gcc2"
 
diff --git a/games-puzzle/neverball/neverball-1.5.4.recipe b/games-puzzle/neverball/neverball-1.5.4.recipe
index 1853b7096..3d8e2d59c 100644
--- a/games-puzzle/neverball/neverball-1.5.4.recipe
+++ b/games-puzzle/neverball/neverball-1.5.4.recipe
@@ -7,7 +7,7 @@ HOMEPAGE="http://neverball.org"
 COPYRIGHT="2002-2010 The Neverball Team"
 LICENSE="GNU GPL v2"
 SRC_URI="http://neverball.org/neverball-1.5.4.tar.gz"
-CHECKSUM_MD5="c523b0f72c2035831310e821162f7bd7"
+CHECKSUM_SHA256="ea31ca9f6eec70c8e66eaa20d7ce9e48295fdb077313b97637c503b16b7b0da6"
 REVISION="1"
 ARCHITECTURES="x86 ?x86_64"
 if [ $effectiveTargetArchitecture != x86_gcc2 ]; then
diff --git a/games-puzzle/rezerwar/rezerwar-0.4.2.recipe b/games-puzzle/rezerwar/rezerwar-0.4.2.recipe
index 66a8f1365..decd12bc8 100644
--- a/games-puzzle/rezerwar/rezerwar-0.4.2.recipe
+++ b/games-puzzle/rezerwar/rezerwar-0.4.2.recipe
@@ -11,7 +11,7 @@ and techniques will help you achieve this goal faster.
 "
 HOMEPAGE="http://tamentis.com/projects/rezerwar/"
 SRC_URI="http://tamentis.com/projects/rezerwar/files/rezerwar-0.4.2.tar.gz"
-CHECKSUM_MD5="42018abe251e45ab8cc30133cde61ff8"
+CHECKSUM_SHA256="a93ca501803c2fdac0fb695d9a1eeed45807307316d28d3eb8abac8849fcaf02"
 LICENSE="BSD (2-clause)"
 COPYRIGHT="2008, 2009 Bertrand Janin"
 REVISION="1"
diff --git a/games-puzzle/sdllopan/sdllopan-10.recipe b/games-puzzle/sdllopan/sdllopan-10.recipe
index c466fc629..e670b58a6 100644
--- a/games-puzzle/sdllopan/sdllopan-10.recipe
+++ b/games-puzzle/sdllopan/sdllopan-10.recipe
@@ -3,7 +3,7 @@ HOMEPAGE="http://www.linuxmotors.com/sdllopan/"
 LICENSE="GNU GPL v2"
 COPYRIGHT="1999-2008 Dave Ashley"
 SRC_URI="http://www.linuxmotors.com/sdllopan/downloads/sdllopan-10.tgz"
-CHECKSUM_MD5="10c03c69d2df6bcae9d835d18215978f"
+CHECKSUM_SHA256="386de065bc8c3449c3b0b5e5651cb035cb1bdc242b425c865dd387c54ce708c3"
 REVISION="1"
 ARCHITECTURES="x86_gcc2"
 
diff --git a/games-rpg/fheroes2/fheroes2-r3182.recipe b/games-rpg/fheroes2/fheroes2-r3182.recipe
index 9e38cc47b..1466ba2a0 100644
--- a/games-rpg/fheroes2/fheroes2-r3182.recipe
+++ b/games-rpg/fheroes2/fheroes2-r3182.recipe
@@ -9,7 +9,7 @@ HOMEPAGE="http://sourceforge.net/projects/fheroes2/"
 LICENSE="GNU GPL v2"
 COPYRIGHT="2006-2013 Andrey Afletdinov"
 SRC_URI="https://sourceforge.net/projects/fheroes2/files/fheroes2/fheroes2-src-r3182.tgz/download"
-CHECKSUM_MD5="bb6cad25a9a83c603d00f7d4a4cb5c92"
+CHECKSUM_SHA256="1a64dafc5b9e6c37683509f151fa7fdbc6fe0ad95da437a15d275f24b93bda2e"
 REVISION="1"
 SOURCE_DIR="fheroes-src"
 
diff --git a/games-rpg/freedroidrpg/freedroidrpg-0.15.1.recipe b/games-rpg/freedroidrpg/freedroidrpg-0.15.1.recipe
index bf3b97059..864a53239 100644
--- a/games-rpg/freedroidrpg/freedroidrpg-0.15.1.recipe
+++ b/games-rpg/freedroidrpg/freedroidrpg-0.15.1.recipe
@@ -19,7 +19,7 @@ will find FreedroidRPG to be an exciting, fast-moving project in which they can\
 fully express their creativity."
 HOMEPAGE="http://freedroid.org"
 SRC_URI="http://sourceforge.net/projects/freedroid/files/freedroidRPG/freedroidRPG-0.15/freedroidRPG-0.15.1.tar.gz/download"
-CHECKSUM_MD5="b95ea6abae46bea6ee3ace9a1902f682"
+CHECKSUM_SHA256="3e0e0e901f05386f49b8dfa1a8b3582ea82347deb7fb8e94fc15bf8ad058ba08"
 LICENSE="GNU GPL v2"
 COPYRIGHT="2002-2010 The Freedroid team"
 REVISION="1"
diff --git a/games-simulation/corsix_th/corsix_th-0.30.recipe b/games-simulation/corsix_th/corsix_th-0.30.recipe
index 2a900a1f3..42ac22e3d 100644
--- a/games-simulation/corsix_th/corsix_th-0.30.recipe
+++ b/games-simulation/corsix_th/corsix_th-0.30.recipe
@@ -9,7 +9,8 @@ original game can be made.
 "
 HOMEPAGE="http://github.com/CorsixTH"
 SRC_URI="https://github.com/CorsixTH/CorsixTH/archive/v$portVersion.tar.gz"
-CHECKSUM_MD5="4557a02d61d7001c1c08960e30c417d7"
+CHECKSUM_SHA256="4947ebdc50b01fde0aca797250d50b9806b9e6f3f4323872fd914f033f4c92e7"
+SRC_FILENAME="CorsixTH-$portVersion.tar.gz"
 REVISION="1"
 ARCHITECTURES="x86"
 if [ $effectiveTargetArchitecture != x86_gcc2 ]; then
diff --git a/games-simulation/openttd/openttd-1.3.3.recipe b/games-simulation/openttd/openttd-1.3.3.recipe
index 7431f4476..3e0b35ebd 100644
--- a/games-simulation/openttd/openttd-1.3.3.recipe
+++ b/games-simulation/openttd/openttd-1.3.3.recipe
@@ -6,8 +6,8 @@ the original game as closely as possible while extending it with new features.
 "
 HOMEPAGE="http://www.openttd.org"
 SRC_URI="http://binaries.openttd.org/releases/$portVersion/openttd-$portVersion-source.tar.xz"
-CHECKSUM_MD5="97855877328d61d6c01833c8748a5b96"
-REVISION="1"
+CHECKSUM_SHA256="6991ed2c0170481800c3a92a1b43546821a658de91d3ac7efe868588387eca5d"
+REVISION="2"
 ARCHITECTURES="x86"
 if [ $effectiveTargetArchitecture != x86_gcc2 ]; then
 	# x86_gcc2 is fine as primary target architecture as long as we're building
@@ -17,7 +17,7 @@ fi
 SECONDARY_ARCHITECTURES="x86"
 
 PROVIDES="
-	openttd = $portVersion
+	openttd$secondaryArchSuffix = $portVersion
 	"
 
 REQUIRES="
@@ -30,6 +30,7 @@ REQUIRES="
 	openttd_gfx
 	openttd_sfx
 	openttd_msx
+	timgmsoundfont
 	"
 
 BUILD_REQUIRES="
diff --git a/games-simulation/openttd_gfx/openttd_gfx-0.4.7.recipe b/games-simulation/openttd_gfx/openttd_gfx-0.4.7.recipe
index 4037b43c4..f746dcd7f 100644
--- a/games-simulation/openttd_gfx/openttd_gfx-0.4.7.recipe
+++ b/games-simulation/openttd_gfx/openttd_gfx-0.4.7.recipe
@@ -9,7 +9,7 @@ have the files from the original Transport Tycoon Deluxe game.
 "
 HOMEPAGE="http://www.openttd.org"
 SRC_URI="http://binaries.openttd.org/extra/opengfx/$portVersion/opengfx-$portVersion-all.zip"
-CHECKSUM_MD5="7709afafb1e6429ee517a5c93a03316c"
+CHECKSUM_SHA256="10032c683f98b4d378c0651118a4858ae6d3f0a5059302dc3f96bfbfcdc67241"
 REVISION="1"
 ARCHITECTURES="any"
 
diff --git a/games-simulation/openttd_msx/openttd_msx-0.3.1.recipe b/games-simulation/openttd_msx/openttd_msx-0.3.1.recipe
index 4e4c492c1..d9290e4b2 100644
--- a/games-simulation/openttd_msx/openttd_msx-0.3.1.recipe
+++ b/games-simulation/openttd_msx/openttd_msx-0.3.1.recipe
@@ -9,7 +9,7 @@ have the files from the original Transport Tycoon Deluxe game.
 "
 HOMEPAGE="http://www.openttd.org"
 SRC_URI="http://binaries.openttd.org/extra/openmsx/$portVersion/openmsx-$portVersion-all.zip"
-CHECKSUM_MD5="858b79d44aea6de5e15d9d1439e86cc3"
+CHECKSUM_SHA256="92e293ae89f13ad679f43185e83fb81fb8cad47fe63f4af3d3d9f955130460f5"
 REVISION="1"
 ARCHITECTURES="any"
 
diff --git a/games-simulation/openttd_sfx/openttd_sfx-0.2.3.recipe b/games-simulation/openttd_sfx/openttd_sfx-0.2.3.recipe
index fad2ce4d4..098600f7b 100644
--- a/games-simulation/openttd_sfx/openttd_sfx-0.2.3.recipe
+++ b/games-simulation/openttd_sfx/openttd_sfx-0.2.3.recipe
@@ -9,7 +9,7 @@ have the files from the original Transport Tycoon Deluxe game.
 "
 HOMEPAGE="http://www.openttd.org"
 SRC_URI="http://binaries.openttd.org/extra/opensfx/$portVersion/opensfx-$portVersion-all.zip"
-CHECKSUM_MD5="3605b82f24153500c8a1804e4420168a"
+CHECKSUM_SHA256="6831b651b3dc8b494026f7277989a1d757961b67c17b75d3c2e097451f75af02"
 REVISION="1"
 ARCHITECTURES="any"
 
diff --git a/games-strategy/uqm/uqm-0.7.0.recipe b/games-strategy/uqm/uqm-0.7.0.recipe
index fa7e6f637..cf3618a3a 100644
--- a/games-strategy/uqm/uqm-0.7.0.recipe
+++ b/games-strategy/uqm/uqm-0.7.0.recipe
@@ -9,7 +9,7 @@ info page.
 "
 HOMEPAGE="http://sc2.sourceforge.net/"
 SRC_URI="http://prdownloads.sourceforge.net/sc2/uqm-0.7.0-source.tgz"
-CHECKSUM_MD5="f9018ea0493d7dac6a9e1006b00af7df"
+CHECKSUM_SHA256="a3695c5f7f0be7ec9c0f80ec569907b382023a1fee6e635532bd53b7b53bb221"
 REVISION="1"
 ARCHITECTURES="!x86 ?x86_64"
 if [ $effectiveTargetArchitecture != x86_gcc2 ]; then
diff --git a/games-strategy/vcmi/vcmi-0.94.recipe b/games-strategy/vcmi/vcmi-0.94.recipe
index 99180116d..b3e0bf244 100644
--- a/games-strategy/vcmi/vcmi-0.94.recipe
+++ b/games-strategy/vcmi/vcmi-0.94.recipe
@@ -8,7 +8,7 @@ You require the original game files to use this port
 "
 HOMEPAGE="http://vcmi.eu"
 SRC_URI="http://download.vcmi.eu/vcmi-0.94.tar.gz"
-CHECKSUM_MD5="faaf52b539c20455e198f58401eef645"
+CHECKSUM_SHA256="2a1ad60cd64e7d5cb0a9eda11c6bc1cbf8866035f95597e467591c958dfde4d7"
 REVISION="1"
 ARCHITECTURES="x86 x86_64"
 if [ $effectiveTargetArchitecture != x86_gcc2 ]; then
@@ -41,6 +41,7 @@ REQUIRES="
 	lib:libboost_system$secondaryArchSuffix
 	lib:libboost_thread$secondaryArchSuffix
 	lib:libboost_unit_test_framework$secondaryArchSuffix
+	lib:libstdc++$secondaryArchSuffix
 	"
 
 BUILD_REQUIRES="
diff --git a/haiku-apps/bescreencapture/bescreencapture-1.9.3.recipe b/haiku-apps/bescreencapture/bescreencapture-1.9.3.recipe
index dae0bc81a..67349650d 100644
--- a/haiku-apps/bescreencapture/bescreencapture-1.9.3.recipe
+++ b/haiku-apps/bescreencapture/bescreencapture-1.9.3.recipe
@@ -8,6 +8,8 @@ select.
 "
 HOMEPAGE="https://github.com/jackburton79/bescreencapture"
 SRC_URI="https://github.com/jackburton79/bescreencapture/archive/v1.9.3.tar.gz"
+CHECKSUM_SHA256="02e0a4657161e1cf4c9470d0693b3bd4521b7e001ea7d493c9730ec7315a1a79"
+SRC_FILENAME="bescreencapture-1.9.3.tar.gz"
 LICENSE="
 	BSD (3-clause)
 	MIT
diff --git a/haiku-apps/bescreencapture/bescreencapture-1.9.4.recipe b/haiku-apps/bescreencapture/bescreencapture-1.9.4.recipe
new file mode 100644
index 000000000..26ab91618
--- /dev/null
+++ b/haiku-apps/bescreencapture/bescreencapture-1.9.4.recipe
@@ -0,0 +1,52 @@
+SUMMARY="A screen recorder utility"
+DESCRIPTION="
+BeScreenCapture, created by Stefano Ceccherini, is a screen recorder utility \
+for Haiku. It allows you to record what happens on your screen, then save it \
+to any media format that Haiku supports.
+BeScreenCapture can record either the entire screen, or just a section you \
+select.
+"
+HOMEPAGE="https://github.com/jackburton79/bescreencapture"
+SRC_URI="https://github.com/jackburton79/bescreencapture/archive/v1.9.4.tar.gz"
+CHECKSUM_SHA256="c1f8d6230feb965cda03d01998b4953f4be34fbcc3d0735c6d0039fa5905bc8c"
+SRC_FILENAME="bescreencapture-1.9.4.tar.gz"
+LICENSE="
+	BSD (3-clause)
+	MIT
+	"
+COPYRIGHT="2014 Stefano Ceccherini"
+REVISION="1"
+ARCHITECTURES="x86_gcc2 x86 ?x86_64"
+
+PROVIDES="
+	bescreencapture = $portVersion
+	app:bescreencapture = $portVersion
+	"
+
+REQUIRES="
+	haiku >= $haikuVersion
+	"
+
+BUILD_REQUIRES="
+	haiku_devel >= $haikuVersion
+	"
+
+BUILD_PREREQUIRES="
+	makefile_engine
+	cmd:make
+	cmd:gcc
+	cmd:mkdepend
+	"
+
+BUILD()
+{
+	make OBJ_DIR=objects \
+		BUILDHOME=`finddir B_SYSTEM_DEVELOP_DIRECTORY`
+}
+
+INSTALL()
+{
+	mkdir -p $appsDir
+	cp -a objects/BeScreenCapture $appsDir
+	addAppDeskbarSymlink $appsDir/BeScreenCapture
+}
diff --git a/haiku-apps/clockwerk/clockwerk-78.recipe b/haiku-apps/clockwerk/clockwerk-78.recipe
deleted file mode 100644
index 8a47f0b94..000000000
--- a/haiku-apps/clockwerk/clockwerk-78.recipe
+++ /dev/null
@@ -1,26 +0,0 @@
-DESCRIPTION="
-Clockwerk is a multi-track audio/video compositing and animation software.
-"
-HOMEPAGE="http://dev.osdrawer.net/projects/clockwerk" 
-SRC_URI="svn+http://svn.osdrawer.net/clockwerk#78"
-REVISION="1"
-STATUS_HAIKU="stable"
-DEPEND=""
-#CHECKSUM_MD5=""
-BUILD()
-{
-	cd clockwerk-78
-	jam
-}
-
-INSTALL()
-{
-       cd clockwerk-78
-       mkdir -p ${DESTDIR}/`finddir B_APPS_DIRECTORY`/Clockwerk
-       cp generated/distro-haiku/* ${DESTDIR}/`finddir B_APPS_DIRECTORY`/Clockwerk
-}
-
-LICENSE="GNU GPL v2"
-COPYRIGHT="2002-2010 Stephan Aßmus
-	2005-2006 Axel Dörfler
-	2006-2009 Ingo Weinhold"
diff --git a/haiku-apps/digiclock/digiclock-1.0.recipe b/haiku-apps/digiclock/digiclock-1.0.recipe
new file mode 100644
index 000000000..4ede0549c
--- /dev/null
+++ b/haiku-apps/digiclock/digiclock-1.0.recipe
@@ -0,0 +1,44 @@
+SUMMARY="DigiClock Screensaver"
+DESCRIPTION="Based on BinaryClock by David Enderson. DigiClock uses filled rectangles and random colors."
+
+HOMEPAGE="https://github.com/bbjimmy/DigiClock"
+SRC_URI="git+https://github.com/bbjimmy/DigiClock.git#7c49eb1ec29b1eb1046f9d7911646e2d5f5e6def"
+
+LICENSE="GNU GPL v2"
+COPYRIGHT="2012 Jim Saxton, Fat Elk Software"
+
+ARCHITECTURES="x86_gcc2 x86 ?x86_64"
+
+PROVIDES="
+app:digiclock = $portVersion"
+
+REVISION="1"
+
+REQUIRES="
+	haiku$secondaryArchSuffix >= $haikuVersion"
+
+BUILD_REQUIRES="
+	haiku${secondaryArchSuffix}_devel >= $haikuVersion"
+
+BUILD_PREREQUIRES="
+	cmd:gcc$secondaryArchSuffix
+	cmd:make
+	makefile_engine"
+
+BUILD()
+{
+	cd source
+	make $jobArgs BUILDHOME=`finddir B_SYSTEM_DEVELOP_DIRECTORY`
+}
+
+INSTALL()
+{	
+	mkdir -p $addOnsDir/Screen\ Savers
+	cd source/objects*
+	cp DigiClock $addOnsDir/Screen\ Savers/DigiClock
+	mkdir -p $dataDir/FatElk
+	cd ..
+	unzip -o fatelk
+	cp "FAT ELK" $dataDir/FatElk/
+	cp "Fat Elk" $dataDir/FatElk/
+}
diff --git a/haiku-apps/dockbert/dockbert-1.0.2b1.recipe b/haiku-apps/dockbert/dockbert-1.0.2b1.recipe
index 12496574d..6530c7d16 100644
--- a/haiku-apps/dockbert/dockbert-1.0.2b1.recipe
+++ b/haiku-apps/dockbert/dockbert-1.0.2b1.recipe
@@ -1,7 +1,7 @@
 SUMMARY="DockBert adds a dock to your deskbar"
 DESCRIPTION="
 DockBert is a Deskbar modification. It adds a dock to your deskbar where you \
-may have shortcuts organized in "tabs", a tab of the running apps and some \
+may have shortcuts organized in \"tabs\", a tab of the running apps and some \
 other general eyecandy.
 "
 HOMEPAGE="https://github.com/HaikuArchives/DockBert"
diff --git a/haiku-apps/documentviewer/documentviewer-0.3.2.recipe b/haiku-apps/documentviewer/documentviewer-0.3.2.recipe
index 58d662cf4..7cc6abf2c 100644
--- a/haiku-apps/documentviewer/documentviewer-0.3.2.recipe
+++ b/haiku-apps/documentviewer/documentviewer-0.3.2.recipe
@@ -6,9 +6,10 @@ LICENSE="MIT"
 COPYRIGHT="2010-2012 Haiku, Inc"
 HOMEPAGE="http://haiku.bplaced.net/" 
 SRC_URI="http://haiku.bplaced.net/DocumentViewer/sources/documentviewer-0.3.2.zip"
-CHECKSUM_MD5="1fddc4292ecb14f343eb18b0bf723b13"
+CHECKSUM_SHA256="92449ddaa6013443bb97920a373e07b7cc43786ce25780d94b02cb9d5f3dd7d3"
 REVISION="2"
-ARCHITECTURES="x86"
+PATCHES="documentviewer-0.3.2.patchset"
+ARCHITECTURES="x86 x86_64"
 if [ $effectiveTargetArchitecture != x86_gcc2 ]; then
 	# x86_gcc2 is fine as primary target architecture as long as we're building
 	# for a different secondary architecture.
@@ -45,15 +46,18 @@ BUILD_REQUIRES="
 	"
 
 BUILD_PREREQUIRES="
-	cmd:jam
+	cmd:find
 	cmd:g++$secondaryArchSuffix
+	cmd:jam
 	"
 
 SOURCE_DIR="documentviewer-0.3.2"
 
 BUILD()
 {
-	jam
+	# Yes, the source package actually contains binaries...
+	find . \( -name '*.o' -or -name '*.a' \) -delete
+	jam -q
 }
 
 INSTALL()
diff --git a/haiku-apps/documentviewer/patches/documentviewer-0.3.2.patchset b/haiku-apps/documentviewer/patches/documentviewer-0.3.2.patchset
new file mode 100644
index 000000000..c36466e03
--- /dev/null
+++ b/haiku-apps/documentviewer/patches/documentviewer-0.3.2.patchset
@@ -0,0 +1,139 @@
+From 37a6e0dc8fa52531136c65ae8e0797bb1557fc89 Mon Sep 17 00:00:00 2001
+From: Jonathan Schleifer <js@webkeks.org>
+Date: Mon, 24 Mar 2014 22:12:11 +0100
+Subject: [PATCH] Fix compilation on x86_64
+
+---
+ application/Debug.h                    |  4 ++--
+ application/ImageButton.cpp            | 10 ++++++----
+ application/MainWindow.cpp             |  8 ++++----
+ application/Tools.h                    | 10 ++++++----
+ libs/columnlistview/ColumnListView.cpp |  4 ++--
+ 5 files changed, 20 insertions(+), 16 deletions(-)
+
+diff --git a/application/Debug.h b/application/Debug.h
+index 0cdf14a..ee14cef 100644
+--- a/application/Debug.h
++++ b/application/Debug.h
+@@ -91,7 +91,7 @@ public:
+         return( *this );
+     }
+ 
+-    Debug& operator<<(int32 number)
++    Debug& operator<<(long number)
+     {
+         fStr << number;
+         return *this;
+@@ -143,7 +143,7 @@ public:
+     Debug& operator<<(int)              { return *this; }
+     Debug& operator<<(uint)             { return *this; }
+     Debug& operator<<(char)             { return *this; }
+-    Debug& operator<<(int32)            { return *this; }
++    Debug& operator<<(long)            { return *this; }
+     bool const&  state(void)            { return fState; }
+     void Clear(void)                    {               }
+ 
+diff --git a/application/ImageButton.cpp b/application/ImageButton.cpp
+index fc1ed66..2609613 100644
+--- a/application/ImageButton.cpp
++++ b/application/ImageButton.cpp
+@@ -8,6 +8,8 @@
+  */
+ #include "ImageButton.h"
+ 
++#include <stdint.h>
++
+ #include <algorithm>
+ 
+ #include <Application.h>
+@@ -248,12 +250,12 @@ ImageButton::_RescaleBitmap(const BBitmap* src, int32 width, int32 height)
+ 	void* srcData = src->Bits();
+ 
+ 	for (int32 y = 0; y <= height; y++) {
+-		void* dstRow = (void*)((uint32)dstData + (uint32)(y * dstYOff));
+-		void* srcRow = (void*)((uint32)srcData + ((uint32)(y * dy) * srcYOff));
++		void* dstRow = (void*)((uintptr_t)dstData + (uintptr_t)(y * dstYOff));
++		void* srcRow = (void*)((uintptr_t)srcData + ((uintptr_t)(y * dy) * srcYOff));
+ 
+ 		for (int32 x = 0; x <= width; x++)
+-			memcpy((void*)((uint32)dstRow + (x * bpp)), (void*)((uint32)srcRow
+-                                              + ((uint32)(x * dx) * bpp)), bpp);
++			memcpy((void*)((uintptr_t)dstRow + (x * bpp)), (void*)((uintptr_t)srcRow
++                                              + ((uintptr_t)(x * dx) * bpp)), bpp);
+ 	}
+ 
+ 	return res;
+diff --git a/application/MainWindow.cpp b/application/MainWindow.cpp
+index e8002bd..af73601 100644
+--- a/application/MainWindow.cpp
++++ b/application/MainWindow.cpp
+@@ -316,10 +316,10 @@ MainWindow::_SaveSettings(void)
+     
+     if (fDocumentLayout != nullptr) {
+     	settings
+-        	<< "Split10"        << fSplitView1->ItemWeight(0L)
+-        	<< "Split11"        << fSplitView1->ItemWeight(1L)
+-        	<< "Split20"        << fSplitView2->ItemWeight(0L)
+-        	<< "Split21"        << fSplitView2->ItemWeight(1L)
++        	<< "Split10"        << fSplitView1->ItemWeight(0)
++        	<< "Split11"        << fSplitView1->ItemWeight(1)
++        	<< "Split20"        << fSplitView2->ItemWeight(0)
++        	<< "Split21"        << fSplitView2->ItemWeight(1)
+         	<< "RibbonTab"      << fRibbon->ActiveTab()
+         	<< "SidebarTab"     << fTabView1->Selection()
+         	<< "Fullscreen"     << (int32)fFullscreenIsOn
+diff --git a/application/Tools.h b/application/Tools.h
+index 4941ac0..f994a6b 100644
+--- a/application/Tools.h
++++ b/application/Tools.h
+@@ -9,6 +9,8 @@
+ #ifndef TOOLS_H
+ #define	TOOLS_H
+ 
++#include <stdint.h>
++
+ #include <memory>
+ #include <vector>
+ 
+@@ -266,12 +268,12 @@ public:
+ 		void* srcData = src->Bits();
+ 	
+ 		for (int32 y = 0; y <= height; y++) {
+-			void* dstRow = (void*)((uint32)dstData + (uint32)(y * dstYOff));
+-			void* srcRow = (void*)((uint32)srcData + ((uint32)(y * dy) * srcYOff));
++			void* dstRow = (void*)((uintptr_t)dstData + (uintptr_t)(y * dstYOff));
++			void* srcRow = (void*)((uintptr_t)srcData + ((uintptr_t)(y * dy) * srcYOff));
+ 	
+ 			for (int32 x = 0; x <= width; x++)
+-				memcpy((void*)((uint32)dstRow + (x * bpp)), (void*)((uint32)srcRow
+-	                                              + ((uint32)(x * dx) * bpp)), bpp);
++				memcpy((void*)((uintptr_t)dstRow + (x * bpp)), (void*)((uintptr_t)srcRow
++	                                              + ((uintptr_t)(x * dx) * bpp)), bpp);
+ 		}
+ 		
+ 		std::unique_ptr<BBitmap> bitmap(res);
+diff --git a/libs/columnlistview/ColumnListView.cpp b/libs/columnlistview/ColumnListView.cpp
+index baa05a2..fe3bbcb 100644
+--- a/libs/columnlistview/ColumnListView.cpp
++++ b/libs/columnlistview/ColumnListView.cpp
+@@ -454,7 +454,7 @@ BRow::BRow(float height)
+ BRow::~BRow()
+ {
+ 	while (true) {
+-		BField* field = (BField*) fFields.RemoveItem(0L);
++		BField* field = (BField*) fFields.RemoveItem(0);
+ 		if (field == 0)
+ 			break;
+ 
+@@ -750,7 +750,7 @@ BColumnListView::BColumnListView(const char* name, uint32 flags,
+ 
+ BColumnListView::~BColumnListView()
+ {
+-	while (BColumn* column = (BColumn*)fColumns.RemoveItem(0L))
++	while (BColumn* column = (BColumn*)fColumns.RemoveItem(0))
+ 		delete column;
+ }
+ 
+-- 
+1.8.3.4
+
diff --git a/haiku-apps/launchpad/launchpad-1.3.recipe b/haiku-apps/launchpad/launchpad-1.3.recipe
index 318d2ae6c..93e823650 100644
--- a/haiku-apps/launchpad/launchpad-1.3.recipe
+++ b/haiku-apps/launchpad/launchpad-1.3.recipe
@@ -3,8 +3,9 @@ DESCRIPTION="
 A simple BeOS application/file/folder launcher.
 "
 HOMEPAGE="http://sourceforge.net/projects/launchpad"
-SRC_URI="http://launchpad.cvs.sourceforge.net/viewvc/launchpad/buta/LaunchPad/?view=tar"
-#CHECKSUM_MD5="9001e130b7ceb90aaef9791b8fac1afb"
+SRC_URI="http://launchpad.cvs.sourceforge.net/viewvc/launchpad/buta/LaunchPad/?view=tar&pathrev=release-1-3-0"
+SRC_FILENAME="launchpad-1.3.tar.gz"
+CHECKSUM_MD5="9001e130b7ceb90aaef9791b8fac1afb"
 
 REVISION="1"
 LICENSE="BSD (3-clause)"
diff --git a/haiku-apps/paladin/paladin-1.3.recipe b/haiku-apps/paladin/paladin-1.3.recipe
index 685f27d32..b74ba4f5e 100644
--- a/haiku-apps/paladin/paladin-1.3.recipe
+++ b/haiku-apps/paladin/paladin-1.3.recipe
@@ -5,8 +5,8 @@ after BeOS' BeIDE.
 "
 HOMEPAGE="http://paladin.sourceforge.net"
 SRC_URI="http://sourceforge.net/projects/paladin/files/Paladin-1.3.src.zip/download"
+CHECKSUM_SHA256="5f804544f9cc489697d08eee5795b22de76961c62c3882af2cc15d095d7766f4"
 REVISION="2"
-CHECKSUM_MD5="5cf4b445f77626f71956ccc325ed77dc"
 LICENSE="MIT"
 COPYRIGHT="2008-2010 DarkWyrm"
 
diff --git a/haiku-apps/pe/pe-2.4.4_2014_03_18.recipe b/haiku-apps/pe/pe-2.4.4_2014_03_18.recipe
new file mode 100644
index 000000000..9a1829720
--- /dev/null
+++ b/haiku-apps/pe/pe-2.4.4_2014_03_18.recipe
@@ -0,0 +1,76 @@
+SUMMARY="A programmer's editor"
+DESCRIPTION="
+Pe is a native programmer's editor for Haiku. It features syntax highlighting \
+and a structural view for several programming language, as well as basic \
+support for Makefile and Jamfile project management.
+"
+HOMEPAGE="https://github.com/olta/pe"
+LICENSE="
+	BSD (4-clause)
+	MIT
+	"
+
+COPYRIGHT="
+	1996-2002 Maarteen Hekkelman
+	2003-2014 Team Pe
+	"
+
+srcrev="0c0b4928d863b58433e41fe76f59dc6170dff7c0"
+SOURCE_DIR="pe-$srcrev"
+SRC_URI="https://github.com/olta/pe/archive/$srcrev.tar.gz"
+CHECKSUM_SHA256="f43f0b919d514a16cfc51fa289d658af55b32a653ba1735ab21bec15b37e10b3"
+SRC_FILENAME="pe-$srcrev.tar.gz"
+
+
+REVISION="1"
+ARCHITECTURES="x86_gcc2 x86 x86_64"
+
+PROVIDES="
+	pe = $portVersion
+	app:Pe = $portVersion compat >= 2
+	cmd:lpe = $portVersion compat >= 2
+	"
+
+REQUIRES="
+	haiku
+	lib:libpcre
+	lib:libpcreposix
+	"
+
+BUILD_REQUIRES="
+	haiku_devel
+	devel:libpcre
+	devel:libpcreposix
+	"
+
+BUILD_PREREQUIRES="
+	cmd:bison
+	cmd:flex
+	cmd:gcc
+	cmd:jam
+	cmd:ld
+	"
+
+USER_SETTINGS_FILES="
+	settings/pe directory
+	"
+
+BUILD()
+{
+	jam -q
+		# multi-job builds don't work reliably
+}
+
+INSTALL()
+{
+	peDir=$appsDir/Pe
+
+	mkdir -p $appsDir
+	cp -a generated/distro $peDir
+	cp -a doc $peDir/Documentation
+
+	mkdir $binDir
+	ln -sfn $peDir/lpe $binDir
+
+	addAppDeskbarSymlink $peDir/Pe
+}
diff --git a/haiku-apps/recibe/recibe-1.0b1.recipe b/haiku-apps/recibe/recibe-1.0b1.recipe
index 5e7d89033..79355fe1a 100644
--- a/haiku-apps/recibe/recibe-1.0b1.recipe
+++ b/haiku-apps/recibe/recibe-1.0b1.recipe
@@ -6,7 +6,7 @@ database contains around 52,000 different recipes for you to try.
 HOMEPAGE="https://github.com/HaikuArchives/Recibe"
 SRC_URI="git://github.com/HaikuArchives/Recibe.git#c1d5a57264d8964a2592bc9b43588b3430bd48ad"
 SRC_URI_2="http://ports-space.haiku-files.org/recibe/recipes.db.zip#noarchive"
-CHECKSUM_MD5_2="1dda608c90b426521b69ab51311f0f15"
+CHECKSUM_SHA256_2="c0732e801dceead4ad37910a51e72dda0ae608892763b62bfe5d2ed403f63d15"
 LICENSE="MIT"
 COPYRIGHT="2007 DarkWyrm"
 REVISION="1"
diff --git a/haiku-apps/slayer/slayer-0.9.recipe b/haiku-apps/slayer/slayer-0.9.recipe
new file mode 100644
index 000000000..dd7343a1d
--- /dev/null
+++ b/haiku-apps/slayer/slayer-0.9.recipe
@@ -0,0 +1,39 @@
+SUMMARY="Team/thread manager"
+DESCRIPTION="
+Monitor CPU and memory usage for running thread and teams, adjust their 
+priorities or kill them.
+"
+LICENSE="GNU GPL v3"
+COPYRIGHT="1998 Arto Jalkanen."
+HOMEPAGE="https://github.com/pulkomandy/Slayer" 
+SRC_URI="git+https://github.com/pulkomandy/Slayer.git#f36790b1fe9"
+REVISION="1"
+ARCHITECTURES="?x86 x86_gcc2"
+
+PROVIDES="
+	slayer = $portVersion
+	app:slayer = $portVersion
+	"
+
+BUILD_REQUIRES="
+	haiku_devel >= $haikuVersion
+	makefile_engine
+	"
+
+BUILD_PREREQUIRES="
+	cmd:make
+	cmd:gcc
+	"
+
+BUILD()
+{
+	cd src
+	make $jobArgs
+}
+
+INSTALL()
+{
+	mkdir -p $appsDir
+	cp src/objects.*-release/Slayer $appsDir/Slayer
+	addAppDeskbarSymlink $appsDir/Slayer
+}
diff --git a/haiku-apps/vision/vision-0.9.7.r949.recipe b/haiku-apps/vision/vision-0.9.7.r949.recipe
index 2b0dabe2a..5eded6d46 100644
--- a/haiku-apps/vision/vision-0.9.7.r949.recipe
+++ b/haiku-apps/vision/vision-0.9.7.r949.recipe
@@ -3,12 +3,14 @@ DESCRIPTION="
 Vision is an IRC client for Haiku.
 "
 HOMEPAGE="http://vision.sourceforge.net/"
-SRC_URI="svn://svn.code.sf.net/p/vision/code/branches/0.9.7#949"
+SRC_URI="http://haiku-files.org/distfiles/vision-0.9.7.r949.tar.gz"
+CHECKSUM_SHA256="9718be3a3b374ae280728e6fc2257d5e5430574c4c81b8b1dabeee14eadee638"
 LICENSE="MPL v1.1"
 COPYRIGHT="1999-2010 The Vision Team"
-REVISION="2"
+REVISION="3"
 ARCHITECTURES="x86_gcc2 x86 x86_64"
 
+
 if [ $targetArchitecture != x86_gcc2 ]; then
 	PATCHES="vision-0.9.7-gcc4.patch"
 fi
@@ -25,6 +27,7 @@ BUILD_REQUIRES="
 	"
 BUILD_PREREQUIRES="
 	haiku_devel >= $haikuVersion
+	cmd:find
 	cmd:gcc
 	cmd:ld
 	cmd:make
diff --git a/haiku-apps/wonderbrush/wonderbrush-2.1.2.recipe b/haiku-apps/wonderbrush/wonderbrush-2.1.2.recipe
index 933a9a6fb..c108925a0 100644
--- a/haiku-apps/wonderbrush/wonderbrush-2.1.2.recipe
+++ b/haiku-apps/wonderbrush/wonderbrush-2.1.2.recipe
@@ -23,7 +23,7 @@ HOMEPAGE="http://yellowbites.com/wonderbrush.html"
 LICENSE="WonderBrush"
 COPYRIGHT="2005, Stephan Aßmus und Ingo Weinhold GbR"
 SRC_URI="http://yellowbites.com/downloads/WonderBrush-2.1.2-x86-gcc2-2013-01-02.zip#noarchive"
-CHECKSUM_MD5="28e64a56946c9f5aefa40486f35ffc77"
+CHECKSUM_SHA256="d0e9fad818c3f7900a475b80a249c9aa4eb118dc8498a6370a87e7a10fa42067"
 REVISION="5"
 ARCHITECTURES="x86_gcc2"
 if [ $effectiveTargetArchitecture = x86_gcc2 -a $targetArchitecture = x86 ]
diff --git a/haiku-apps/yab/yab-1.6.recipe b/haiku-apps/yab/yab-1.6.recipe
deleted file mode 100644
index 3fcda61c9..000000000
--- a/haiku-apps/yab/yab-1.6.recipe
+++ /dev/null
@@ -1,32 +0,0 @@
-SUMMARY="yab is an extended version of yabsic, a BASIC programming language"
-DESCRIPTION="
-yab is an extended version of yabasic, a BASIC programming language, with \
-special commands designed for BeOS, Haiku and Zeta.
-"
-HOMEPAGE="http://sourceforge.net/projects/yab-interpreter" 
-SRC_URI="http://ports-space.haiku-files.org/haiku-apps/source/yab-1.6.zip"
-REVISION="1"
-STATUS_HAIKU="stable"
-DEPEND=""
-CHECKSUM_MD5="071e8653265a60fea96cceab46f67e5b"
-BUILD()
-{
-	cd yab-1.6/src
-	make clean
-	make
-}
-
-INSTALL()
-{
-	cd yab-1.6
-	mkdir -p ${DESTDIR}/boot/apps/yab
-	cp -a src/yab ${DESTDIR}/boot/apps/yab
-	cp -a Documentation ${DESTDIR}/boot/apps/yab
-	cp -a Programs ${DESTDIR}/boot/apps/yab
-	cp -a yab-IDE ${DESTDIR}/boot/apps/yab
-}
-
-LICENSE="Artistic
-	GNU GPL v2"
-COPYRIGHT="1995-2006 Marc-Oliver Ihm (yabasic)
-	2006-2009 Jan Bungeroth (yab improvements)"
diff --git a/haiku-apps/yab/yab-1.7.recipe b/haiku-apps/yab/yab-1.7.recipe
deleted file mode 100644
index 580637ebe..000000000
--- a/haiku-apps/yab/yab-1.7.recipe
+++ /dev/null
@@ -1,59 +0,0 @@
-SUMMARY="yab is an extended version of yabsic, a BASIC programming language"
-DESCRIPTION="
-yab is an extended version of yabasic, a BASIC programming language, with \
-special commands designed for BeOS, Haiku and Zeta.
-"
-HOMEPAGE="http://sourceforge.net/projects/yab-interpreter"
-SRC_URI="git+https://github.com/HaikuArchives/Yab.git"
-REVISION="2"
-#CHECKSUM_MD5="2b465895d9eb2e8383f035dd67b88a20"
-LICENSE="Artistic
-	GNU GPL v2"
-COPYRIGHT="1995-2006 Marc-Oliver Ihm (yabasic)
-	2006-2009 Jan Bungeroth (yab improvements)"
-
-ARCHITECTURES="!x86_gcc2 !x86 !x86_64"
-SECONDARY_ARCHITECTURE="!x86_gcc2 !x86"
-
-#SOURCE_DIR="yab-$portVersion"
-
-PROVIDES="
-	yab$secondaryArchSuffix = $portVersion
-	cmd:yab$secondaryArchSuffix
-	"
-
-REQUIRES="
-	haiku$secondaryArchSuffix >= $haikuVersion
-	lib:ncurses$secondaryArchSuffix
-	"
-
-BUILD_REQUIRES="
-	haiku${secondaryArchSuffix}_devel >= $haikuVersion
-	devel:libncurses$secondaryArchSuffix
-	"
-
-BUILD_PREREQUIRES="
-	cmd:bison
-	cmd:flex
-	cmd:gcc$secondaryArchSuffix
-	cmd:make
-	cmd:mkdepend
-	cmd:perl
-	makefile_engine
-	"
-
-BUILD()
-{
-	cd src
-	make $jobArgs BUILDHOME=`finddir B_SYSTEM_DEVELOP_DIRECTORY`
-}
-
-INSTALL()
-{
-	$YABDIR=$appsDir/yab
-	mkdir -p ${YABDIR}
-	cp -a ${YABDIR}apps/yab
-	cp -a Documentation ${YABDIR}
-	cp -a Programs ${YABDIR}
-	cp -a yab-IDE ${YABDIR}
-}
diff --git a/haiku-apps/yab_ide/yab_ide-2.2.1.recipe b/haiku-apps/yab_ide/yab_ide-2.2.1.recipe
new file mode 100644
index 000000000..3352b6916
--- /dev/null
+++ b/haiku-apps/yab_ide/yab_ide-2.2.1.recipe
@@ -0,0 +1,77 @@
+SUMMARY="integrated development environment for yab."
+DESCRIPTION="
+Yab allows fast prototyping with simple and clean code. yab contains a large \
+number of BeAPI specific commands for GUI creation and much, much more.
+
+yab wouldn't be complete without the yab-IDE, a powerful development \
+environment, which of course is programmed in yab itself.
+"
+HOMEPAGE="http://sourceforge.net/projects/yab-interpreter"
+SRC_URI="git+https://github.com/HaikuArchives/Yab.git#a5681d8a3403c142eae0ad416a59abd2aa7a28e4"
+REVISION="2"
+
+LICENSE="Artistic"
+COPYRIGHT="1995-2006 Marc-Oliver Ihm (yabasic)
+	2006-2009 Jan Bungeroth (yab improvements)
+	2013 Jim Saxton (yab improvements)"
+
+ARCHITECTURES="x86_gcc2 x86 ?x86_64"
+
+PROVIDES="
+	yab_ide$secondaryArchSuffix = $portVersion
+		"
+
+REQUIRES="
+	haiku$secondaryArchSuffix >= $haikuVersion
+	lib:libncurses$secondaryArchSuffix
+	yab$secondaryArchSuffix >= 1.7.02 
+	devel:libncurses$secondaryArchSuffix
+	devel:libz$secondaryArchSuffix	
+	"
+
+BUILD_REQUIRES="
+	haiku${secondaryArchSuffix}_devel >= $haikuVersion
+	devel:libncurses$secondaryArchSuffix
+	devel:libz$secondaryArchSuffix	
+"
+
+BUILD_PREREQUIRES="
+	cmd:bison
+	cmd:flex
+	cmd:gcc$secondaryArchSuffix
+	cmd:make
+	cmd:mkdepend
+	cmd:perl
+	makefile_engine
+	"
+
+BUILD()
+{
+	cd src
+	make $jobArgs BUILDHOME=`finddir B_SYSTEM_DEVELOP_DIRECTORY`
+	unzip -o App_YAB.zip
+	copyattr App_YAB yab
+}
+
+INSTALL()
+{	
+	mkdir -p $binDir
+	mkdir -p tmp
+	mkdir -p tmp/buildfactory
+
+	cp -r src/* tmp/buildfactory
+	cp -r yab-IDE/BuildFactory/* tmp/buildfactory/
+	unzip -o tmp/buildfactory/parts/yabstuff.zip -d tmp/buildfactory/parts
+	cp yab-IDE/src/yab-IDE.yab  tmp/buildfactory/	
+
+	pushd tmp/buildfactory
+	BuildFactory.yab yab-IDE yab-IDE.yab application/x-vnd.yab-IDE	
+	popd
+
+	mkdir -p $appsDir
+	cp -r yab-IDE/ $appsDir/
+	cp  tmp/buildfactory/yab-IDE $appsDir/yab-IDE/
+	cp yab-IDE/src/yab-IDE.yab $appsDir/yab-IDE/src/
+
+	addAppDeskbarSymlink $appsDir/yab-IDE/yab-IDE "Yab IDE"
+}
diff --git a/haiku-data/be_book/be_book-2008_10_26.recipe b/haiku-data/be_book/be_book-2008_10_26.recipe
index e80c99ba6..964c1422e 100644
--- a/haiku-data/be_book/be_book-2008_10_26.recipe
+++ b/haiku-data/be_book/be_book-2008_10_26.recipe
@@ -4,7 +4,7 @@ HOMEPAGE="http://www.haiku-os.org/documents"
 COPYRIGHT="ACCESS Co., Ltd."
 LICENSE="Attribution-NonCommercial-NoDerivs 3.0 Unported"
 SRC_URI="http://haiku-files.org/files/data/bebook_20081026.zip"
-CHECKSUM_MD5="78d58b64a41ae4e8f84a14f22aea4adb"
+CHECKSUM_SHA256="8bd4836744c2542567b95b3b1cacf60333562e178d5cbcf3aa0a69a02d2f7a28"
 REVISION="1"
 ARCHITECTURES="any"
 DISABLE_SOURCE_PACKAGE=yes
diff --git a/haiku-data/ca_root_certificates/ca_root_certificates-2012_12_29.recipe b/haiku-data/ca_root_certificates/ca_root_certificates-2012_12_29.recipe
index 815ebd115..830975cc4 100644
--- a/haiku-data/ca_root_certificates/ca_root_certificates-2012_12_29.recipe
+++ b/haiku-data/ca_root_certificates/ca_root_certificates-2012_12_29.recipe
@@ -8,7 +8,7 @@ LICENSE="
 	GNU LGPL v2.1
 	"
 SRC_URI="http://haiku-files.org/files/data/cacert_121229.pem#noarchive"
-CHECKSUM_MD5="47961e7ef15667c93cd99be01b51f00a"
+CHECKSUM_SHA256="f5f79efd63440f2048ead91090eaca3102d13ea17a548f72f738778a534c646d"
 REVISION="1"
 ARCHITECTURES="any"
 DISABLE_SOURCE_PACKAGE=yes
diff --git a/haiku-data/timgmsoundfont/timgmsoundfont-2004_01_24.recipe b/haiku-data/timgmsoundfont/timgmsoundfont-2004_01_24.recipe
index 5ab8ee577..776afe35b 100644
--- a/haiku-data/timgmsoundfont/timgmsoundfont-2004_01_24.recipe
+++ b/haiku-data/timgmsoundfont/timgmsoundfont-2004_01_24.recipe
@@ -4,7 +4,7 @@ HOMEPAGE="http://ocmnet.com/saxguru/Timidity.htm"
 LICENSE="Public Domain"
 COPYRIGHT="2004 Tim Brechbill"
 SRC_URI="http://ocmnet.com/saxguru/TimGM6mb.sf2#noarchive"
-CHECKSUM_MD5="1f569cc40159a6bd9250f816225ae222"
+CHECKSUM_SHA256="82475b91a76de15cb28a104707d3247ba932e228bada3f47bba63c6b31aaf7a1"
 REVISION="4"
 ARCHITECTURES="any"
 DISABLE_SOURCE_PACKAGE=yes
diff --git a/haiku-games/puri/puri-0.3.9.1.recipe b/haiku-games/puri/puri-0.3.9.1.recipe
index 1a99d4213..f8f554ed6 100644
--- a/haiku-games/puri/puri-0.3.9.1.recipe
+++ b/haiku-games/puri/puri-0.3.9.1.recipe
@@ -5,7 +5,8 @@ online against other people.
 "
 HOMEPAGE="https://gitorious.org/puri-master-of-chess/puri/"
 SRC_URI="https://gitorious.org/puri-master-of-chess/puri/archive/59b5db4b337fc432b64a7d099f7b7e0fc8ece3c7.tar.gz"
-CHECKSUM_MD5="467d00355e3450e9d3b1d126afcf06a6"
+CHECKSUM_SHA256="9635f5af5c154855dfe6a1496caa3373dcabc4fe875039cd0f05c438576e83cd"
+SRC_FILENAME="puri-$portVersion.tar.gz"
 LICENSE="MIT"
 COPYRIGHT="2010-2012 Haiku Inc."
 REVISION="1"
diff --git a/haiku-games/w6/w6-1.7.recipe b/haiku-games/w6/w6-1.7.recipe
index 0149754d3..6130be20d 100644
--- a/haiku-games/w6/w6-1.7.recipe
+++ b/haiku-games/w6/w6-1.7.recipe
@@ -8,9 +8,9 @@ war simulation software.
 "
 HOMEPAGE="http://lema.link-u.com/be/"
 SRC_URI="http://lema.link-u.com/be/W6Haiku.zip"
-CHECKSUM_MD5="763e608d79ee6de6efe6dcb77600a331"
+CHECKSUM_SHA256="6393cb0f4d31728d575ccfc70d5c40153c610024163487d2e46b8db4e8aa3c58"
 SRC_URI_2="http://lema.link-u.com/be/W6forR5-with-sources.zip"
-CHECKSUM_MD5_2="4974a2ee05c68de6c5f7817d6be3bf97"
+CHECKSUM_SHA256_2="0e12d3a80d668a6d86c4d2ea67aa1c18d7ece5f218d2512b36f96cdf3071bbdf"
 REVISION="1"
 LICENSE="Public Domain"
 COPYRIGHT="1998-1999 Santiago Lema"
diff --git a/haiku-libs/ale/ale-0.9.1.recipe b/haiku-libs/ale/ale-0.9.1.recipe
new file mode 100644
index 000000000..e35c82949
--- /dev/null
+++ b/haiku-libs/ale/ale-0.9.1.recipe
@@ -0,0 +1,86 @@
+SUMMARY="ALE: GUI Editor to create and edit constraint-based layouts."
+DESCRIPTION="The Auckland Layout Editor (ALE) is a constraint-based layout \
+editor that is based on the BALMLayout layout class. The constraint-based \
+layout model is very powerful and can describe layouts that can't be described \
+with other layout models, like for example, the grid-bag layout model. Layouts \
+created with ALE are automatically resizable and non-overlapping. This means \
+while editing a layout you can't create a layout that has two overlapping \
+views. Furthermore, layouts created with ALE have no conflicting constraints.
+ALE provides a small but powerful set of edit operations. These edit \
+operations keep views automatically aligned to each other. This makes \
+creating and editing layouts very easy.
+For more information read:
+https://www.cs.auckland.ac.nz/~lutteroth/publications/ZeidlerEtAl2013-AucklandLayoutEditor.pdf
+or watch:
+http://www.youtube.com/watch?v=ZPv58AWWGRQ"
+HOMEPAGE="http://github.com/czeidler/ALEditor"
+srcGitRef="52a5a621e3c28fc04d46402fae263b9693bd68ab"
+CHECKSUM_SHA256="cda6bc713485c058b326bc79231a99c24abad36e7d0b68a9cbbc2b292092e683"
+SRC_FILENAME="ALEditor-52a5a621e3c28fc04d46402fae263b9693bd68ab.tar.gz"
+SOURCE_DIR="ALEditor-$srcGitRef"
+SRC_URI="https://github.com/czeidler/ALEditor/archive/$srcGitRef.tar.gz"
+COPYRIGHT="Copyright (C) 2009-2014 by UniAuckland Team"
+LICENSE="MIT"
+REVISION="1"
+ARCHITECTURES="x86 x86_gcc2"
+
+PROVIDES="
+	lib:libale = $portVersion
+	app:ALEditor = $portVersion
+	"
+REQUIRES="
+	haiku >= $haikuVersion
+	"
+BUILD_REQUIRES="
+	haiku >= $haikuVersion
+	"
+BUILD_PREREQUIRES="
+	haiku_devel >= $haikuVersion
+	cmd:gcc
+	cmd:ld
+	cmd:cmake
+	cmd:make
+	"
+
+BUILD()
+{
+	cmake .
+	make
+}
+
+INSTALL()
+{
+	mkdir -p $appsDir/ALEditor
+	cp ALEditor $appsDir/ALEditor/ALEditor
+	mkdir -p $libDir
+	cp libale.so $libDir/libale.so
+	
+	addAppDeskbarSymlink $appsDir/ALEditor/ALEditor ALEditor
+	
+	# copy development headers
+	headersALE="LayoutArchive.h"
+	headersALM="ALMGroup.h ALMLayout.h ALMLayoutBuilder.h Area.h Column.h Row.h Tab.h"
+	headersLinearSpec="Constraint.h LinearProgrammingTypes.h LinearSpec.h Summand.h Variable.h"
+	
+	mkdir -p $includeDir/ale
+	for file in $headersALE
+	do
+	cp headers/editor/${file} $includeDir/ale/${file}
+	done
+	
+	mkdir -p $includeDir/alm
+	for file in $headersALM
+	do
+	cp headers/haiku_private/alm/${file} $includeDir/alm/${file}
+	done
+	
+	mkdir -p $includeDir/linearspec
+	for file in $headersLinearSpec
+	do
+	cp headers/haiku_private/linearspec/${file} $includeDir/linearspec/${file}
+	done
+	
+	# copy example
+	mkdir -p $dataDir/ale/example
+	cp example/* $dataDir/ale/example/
+}
diff --git a/haiku-libs/haikuwebkit/haikuwebkit-1.1.3_2013_08_09.recipe b/haiku-libs/haikuwebkit/haikuwebkit-1.1.3_2013_08_09.recipe
index 7c044ab71..b54bb4539 100644
--- a/haiku-libs/haikuwebkit/haikuwebkit-1.1.3_2013_08_09.recipe
+++ b/haiku-libs/haikuwebkit/haikuwebkit-1.1.3_2013_08_09.recipe
@@ -14,7 +14,7 @@ LICENSE="
 	MIT
 	"
 SRC_URI="http://www.haiku-files.org/files/haiku-webkit-lastgood-no-tests-2013-08-09.tar.bz2"
-CHECKSUM_MD5="a6551b2573612678e9d2d27fda4fae48"
+CHECKSUM_SHA256="5df4e69bf765fffc030c431f5af9b3b285fe747cb9d355ef4657d461e025b245"
 REVISION="2"
 ARCHITECTURES="x86 x86_64"
 if [ $effectiveTargetArchitecture != x86_gcc2 ]; then
diff --git a/haiku-libs/haikuwebkit/haikuwebkit-1.2.0.recipe b/haiku-libs/haikuwebkit/haikuwebkit-1.2.0.recipe
index 4684c66ad..4d3551f9d 100644
--- a/haiku-libs/haikuwebkit/haikuwebkit-1.2.0.recipe
+++ b/haiku-libs/haikuwebkit/haikuwebkit-1.2.0.recipe
@@ -13,7 +13,7 @@ LICENSE="
 	MIT
 	"
 SRC_URI="http://pulkomandy.tk/drop/haikuwebkit_x86-1.2.0-Source.tar.bz2"
-CHECKSUM_MD5="eed765efa0fd7c0080ef362113671907"
+CHECKSUM_SHA256="b840d22eaf76f4b8fb14aa18e140a80abc0d58fa3c14694c978374c8fb4383d7"
 REVISION="1"
 ARCHITECTURES="x86 x86_64"
 if [ $effectiveTargetArchitecture != x86_gcc2 ]; then
diff --git a/haiku-libs/haikuwebkit/haikuwebkit-1.2.2.recipe b/haiku-libs/haikuwebkit/haikuwebkit-1.2.2.recipe
index 99a768da3..07d7b7124 100644
--- a/haiku-libs/haikuwebkit/haikuwebkit-1.2.2.recipe
+++ b/haiku-libs/haikuwebkit/haikuwebkit-1.2.2.recipe
@@ -13,7 +13,7 @@ LICENSE="
 	MIT
 	"
 SRC_URI="http://pulkomandy.tk/drop/haikuwebkit_x86-1.2.2-Source.tar.bz2"
-CHECKSUM_MD5="095cae2a51451639c7566611f498e295"
+CHECKSUM_SHA256="50688a5f78cbcc80dc2ec512effbcde36295560d2bbec0efaa9e0c679f303a42"
 REVISION="1"
 ARCHITECTURES="x86 x86_64"
 if [ $effectiveTargetArchitecture != x86_gcc2 ]; then
diff --git a/haiku-libs/haikuwebkit/haikuwebkit-1.2.3.recipe b/haiku-libs/haikuwebkit/haikuwebkit-1.2.3.recipe
index 0c0c48c53..0113d6281 100644
--- a/haiku-libs/haikuwebkit/haikuwebkit-1.2.3.recipe
+++ b/haiku-libs/haikuwebkit/haikuwebkit-1.2.3.recipe
@@ -13,7 +13,8 @@ LICENSE="
 	MIT
 	"
 SRC_URI="https://github.com/haiku/webkit/archive/1.2.3.tar.gz"
-CHECKSUM_MD5="07068bc8afa6038b6f34a6931d11f4ef"
+CHECKSUM_SHA256="4784781c36dfbf7d09fb41bedbe3777bdd216c5a25ed77463c49a8120c1777a1"
+SRC_FILENAME="haikuwebkit-1.2.3.tar.gz"
 REVISION="1"
 ARCHITECTURES="x86 x86_64"
 if [ $effectiveTargetArchitecture != x86_gcc2 ]; then
diff --git a/haiku-libs/haikuwebkit/haikuwebkit-1.2.4.recipe b/haiku-libs/haikuwebkit/haikuwebkit-1.2.4.recipe
new file mode 100644
index 000000000..3a5237b48
--- /dev/null
+++ b/haiku-libs/haikuwebkit/haikuwebkit-1.2.4.recipe
@@ -0,0 +1,101 @@
+SUMMARY="Open source web browser engine"
+DESCRIPTION="
+WebKit is an open source web browser engine. WebKit is also the name of the \
+Mac OS X system framework version of the engine that's used by Safari, \
+Dashboard, Mail, and many other OS X applications. WebKit's HTML and \
+JavaScript code began as a branch of the KHTML and KJS libraries from KDE.
+"
+HOMEPAGE="http://www.webkit.org/"
+COPYRIGHT="1998-2014 Apple Inc., Google Inc., et al"
+LICENSE="
+	GNU LGPL v2
+	GNU LGPL v2.1
+	MIT
+	"
+SRC_URI="https://github.com/haiku/webkit/archive/$portVersion.tar.gz"
+CHECKSUM_SHA256="891df5f95ad796c86691267912739ef774de0222073f9f8bfc91523a082eab49"
+SRC_FILENAME="haikuwebkit-$portVersion.tar.gz"
+REVISION="1"
+ARCHITECTURES="x86 x86_64"
+if [ $effectiveTargetArchitecture != x86_gcc2 ]; then
+	# x86_gcc2 is fine as primary target architecture as long as we're building
+	# for a different secondary architecture.
+	ARCHITECTURES="$ARCHITECTURES x86_gcc2"
+fi
+SECONDARY_ARCHITECTURES="x86"
+
+PROVIDES="
+	haikuwebkit$secondaryArchSuffix = $portVersion
+	lib:libWebKit$secondaryArchSuffix = $portVersion
+	"
+REQUIRES="
+	haiku$secondaryArchSuffix >= $haikuVersion
+	lib:libicuuc$secondaryArchSuffix
+	lib:libjpeg$secondaryArchSuffix
+	lib:libpng$secondaryArchSuffix
+	lib:libsqlite3$secondaryArchSuffix
+	lib:libxml2$secondaryArchSuffix
+	lib:libxslt$secondaryArchSuffix
+	lib:libz$secondaryArchSuffix
+	"
+	
+BUILD_REQUIRES="
+	haiku${secondaryArchSuffix}_devel >= $haikuVersion
+	haiku_devel >= $haikuVersion
+	devel:libicuuc$secondaryArchSuffix
+	devel:libjpeg$secondaryArchSuffix
+	devel:libpng$secondaryArchSuffix
+	devel:libsqlite3$secondaryArchSuffix
+	devel:libxml2$secondaryArchSuffix
+	devel:libxslt$secondaryArchSuffix
+	devel:libz$secondaryArchSuffix
+	"
+BUILD_PREREQUIRES="
+	cmd:pkg_config
+	cmd:flex
+	cmd:bison
+	cmd:gcc$secondaryArchSuffix
+	cmd:gperf
+	cmd:ld$secondaryArchSuffix
+	cmd:m4
+	cmd:make
+	cmd:perl
+	cmd:python
+	cmd:cmake
+	cmd:ruby
+	"
+
+SOURCE_DIR="webkit-$portVersion"
+
+BUILD()
+{
+	export PKG_CONFIG_LIBDIR="`finddir B_SYSTEM_DIRECTORY`/$relativeDevelopLibDir/pkgconfig"
+	Tools/Scripts/build-webkit --haiku --no-webkit2 \
+		--cmakeargs="-DCMAKE_INSTALL_PREFIX=$prefix"
+}
+
+INSTALL()
+{
+	cd WebKitBuild/Release
+	make install
+
+	rm $developLibDir/*
+	prepareInstalledDevelLibs libWebKit
+
+	# devel package
+	packageEntries devel \
+		$developDir
+}
+
+# ----- devel package -------------------------------------------------------
+
+PROVIDES_devel="
+	haikuwebkit${secondaryArchSuffix}_devel = $portVersion
+	devel:libjavascriptcore$secondaryArchSuffix = $portVersion
+	devel:libwebcore$secondaryArchSuffix = $portVersion
+	devel:libWebKit$secondaryArchSuffix = $portVersion
+	devel:libwtf$secondaryArchSuffix = $portVersion
+	"
+REQUIRES_devel="
+	haikuwebkit$secondaryArchSuffix == $portVersion base
+	"
diff --git a/haiku-libs/haikuwebkit/haikuwebkit-1.2.5.recipe b/haiku-libs/haikuwebkit/haikuwebkit-1.2.5.recipe
new file mode 100644
index 000000000..6d992ca9a
--- /dev/null
+++ b/haiku-libs/haikuwebkit/haikuwebkit-1.2.5.recipe
@@ -0,0 +1,104 @@
+SUMMARY="Open source web browser engine"
+DESCRIPTION="
+WebKit is an open source web browser engine. WebKit is also the name of the \
+Mac OS X system framework version of the engine that's used by Safari, \
+Dashboard, Mail, and many other OS X applications. WebKit's HTML and \
+JavaScript code began as a branch of the KHTML and KJS libraries from KDE.
+"
+HOMEPAGE="http://www.webkit.org/"
+COPYRIGHT="1998-2014 Apple Inc., Google Inc., et al"
+LICENSE="
+	GNU LGPL v2
+	GNU LGPL v2.1
+	MIT
+	"
+SRC_URI="https://github.com/haiku/webkit/archive/$portVersion.tar.gz"
+CHECKSUM_SHA256="751a4818c017deafb0b872e1ba83e6473ddcc7bbab278618acb1b99686a6b646"
+SRC_FILENAME="haikuwebkit-$portVersion.tar.gz"
+REVISION="2"
+ARCHITECTURES="x86 x86_64"
+if [ $effectiveTargetArchitecture != x86_gcc2 ]; then
+	# x86_gcc2 is fine as primary target architecture as long as we're building
+	# for a different secondary architecture.
+	ARCHITECTURES="$ARCHITECTURES x86_gcc2"
+fi
+SECONDARY_ARCHITECTURES="x86"
+
+
+PATCHES="haikuwebkit-1.2.5.patchset"
+
+PROVIDES="
+	haikuwebkit$secondaryArchSuffix = $portVersion
+	lib:libWebKit$secondaryArchSuffix = $portVersion
+	"
+REQUIRES="
+	haiku$secondaryArchSuffix >= $haikuVersion
+	lib:libicuuc$secondaryArchSuffix
+	lib:libjpeg$secondaryArchSuffix
+	lib:libpng$secondaryArchSuffix
+	lib:libsqlite3$secondaryArchSuffix
+	lib:libxml2$secondaryArchSuffix
+	lib:libxslt$secondaryArchSuffix
+	lib:libz$secondaryArchSuffix
+	"
+
+BUILD_REQUIRES="
+	haiku${secondaryArchSuffix}_devel >= $haikuVersion
+	haiku_devel >= $haikuVersion
+	devel:libicuuc$secondaryArchSuffix
+	devel:libjpeg$secondaryArchSuffix
+	devel:libpng$secondaryArchSuffix
+	devel:libsqlite3$secondaryArchSuffix
+	devel:libxml2$secondaryArchSuffix
+	devel:libxslt$secondaryArchSuffix
+	devel:libz$secondaryArchSuffix
+	"
+BUILD_PREREQUIRES="
+	cmd:pkg_config
+	cmd:flex
+	cmd:bison
+	cmd:gcc$secondaryArchSuffix
+	cmd:gperf
+	cmd:ld$secondaryArchSuffix
+	cmd:m4
+	cmd:make
+	cmd:perl
+	cmd:python
+	cmd:cmake
+	cmd:ruby
+	"
+
+SOURCE_DIR="webkit-$portVersion"
+
+BUILD()
+{
+	export PKG_CONFIG_LIBDIR="`finddir B_SYSTEM_DIRECTORY`/$relativeDevelopLibDir/pkgconfig"
+	Tools/Scripts/build-webkit --haiku --no-webkit2 \
+		--cmakeargs="-DCMAKE_INSTALL_PREFIX=$prefix"
+}
+
+INSTALL()
+{
+	cd WebKitBuild/Release
+	make install
+
+	rm $developLibDir/*
+	prepareInstalledDevelLibs libWebKit
+
+	# devel package
+	packageEntries devel \
+		$developDir
+}
+
+# ----- devel package -------------------------------------------------------
+
+PROVIDES_devel="
+	haikuwebkit${secondaryArchSuffix}_devel = $portVersion
+	devel:libjavascriptcore$secondaryArchSuffix = $portVersion
+	devel:libwebcore$secondaryArchSuffix = $portVersion
+	devel:libWebKit$secondaryArchSuffix = $portVersion
+	devel:libwtf$secondaryArchSuffix = $portVersion
+	"
+REQUIRES_devel="
+	haikuwebkit$secondaryArchSuffix == $portVersion base
+	"
diff --git a/haiku-libs/haikuwebkit/haikuwebkit-1.3.0.recipe b/haiku-libs/haikuwebkit/haikuwebkit-1.3.0.recipe
new file mode 100644
index 000000000..cd1262412
--- /dev/null
+++ b/haiku-libs/haikuwebkit/haikuwebkit-1.3.0.recipe
@@ -0,0 +1,109 @@
+SUMMARY="Open source web browser engine"
+DESCRIPTION="
+WebKit is an open source web browser engine. WebKit is also the name of the \
+Mac OS X system framework version of the engine that's used by Safari, \
+Dashboard, Mail, and many other OS X applications. WebKit's HTML and \
+JavaScript code began as a branch of the KHTML and KJS libraries from KDE.
+"
+HOMEPAGE="http://www.webkit.org/"
+COPYRIGHT="1998-2014 Apple Inc., Google Inc., et al"
+LICENSE="
+	GNU LGPL v2
+	GNU LGPL v2.1
+	MIT
+	"
+SRC_URI="https://github.com/haiku/webkit/archive/$portVersion.tar.gz"
+CHECKSUM_SHA256="6466ca02d5f1bd3632bcfff5451af8fae15f62696afba1231e11ac10a961449c"
+SRC_FILENAME="haikuwebkit-$portVersion.tar.gz"
+REVISION="2"
+ARCHITECTURES="x86 x86_64"
+if [ $effectiveTargetArchitecture != x86_gcc2 ]; then
+	# x86_gcc2 is fine as primary target architecture as long as we're building
+	# for a different secondary architecture.
+	ARCHITECTURES="$ARCHITECTURES x86_gcc2"
+fi
+SECONDARY_ARCHITECTURES="x86"
+
+
+if [ $effectiveTargetArchitecture == x86_64 ]; then
+	PATCHES="haikuwebkit-1.2.5.patchset"
+fi
+
+PROVIDES="
+	haikuwebkit$secondaryArchSuffix = $portVersion
+	lib:libWebKit$secondaryArchSuffix = $portVersion
+	cmd:jsc$secondaryArchSuffix
+	"
+REQUIRES="
+	haiku$secondaryArchSuffix >= $haikuVersion
+	lib:libicuuc$secondaryArchSuffix
+	lib:libjpeg$secondaryArchSuffix
+	lib:libpng$secondaryArchSuffix
+	lib:libsqlite3$secondaryArchSuffix
+	lib:libxml2$secondaryArchSuffix
+	lib:libxslt$secondaryArchSuffix
+	lib:libz$secondaryArchSuffix
+	lib:libavcodec$secondaryArchSuffix
+	"
+
+BUILD_REQUIRES="
+	haiku${secondaryArchSuffix}_devel >= $haikuVersion
+	haiku_devel >= $haikuVersion
+	devel:libicuuc$secondaryArchSuffix
+	devel:libjpeg$secondaryArchSuffix
+	devel:libpng$secondaryArchSuffix
+	devel:libsqlite3$secondaryArchSuffix
+	devel:libxml2$secondaryArchSuffix
+	devel:libxslt$secondaryArchSuffix
+	devel:libz$secondaryArchSuffix
+	devel:libavcodec$secondaryArchSuffix
+	"
+BUILD_PREREQUIRES="
+	cmd:pkg_config
+	cmd:flex
+	cmd:bison
+	cmd:gcc$secondaryArchSuffix
+	cmd:gperf
+	cmd:ld$secondaryArchSuffix
+	cmd:m4
+	cmd:make
+	cmd:perl
+	cmd:python
+	cmd:cmake
+	cmd:ruby
+	"
+
+SOURCE_DIR="webkit-$portVersion"
+
+BUILD()
+{
+	export PKG_CONFIG_LIBDIR="`finddir B_SYSTEM_DIRECTORY`/$relativeDevelopLibDir/pkgconfig"
+	Tools/Scripts/build-webkit --haiku --no-webkit2 \
+		--cmakeargs="-DCMAKE_INSTALL_PREFIX=$prefix"
+}
+
+INSTALL()
+{
+	cd WebKitBuild/Release
+	make install
+
+	rm $developLibDir/*
+	prepareInstalledDevelLibs libWebKit
+
+	# devel package
+	packageEntries devel \
+		$developDir
+}
+
+# ----- devel package -------------------------------------------------------
+
+PROVIDES_devel="
+	haikuwebkit${secondaryArchSuffix}_devel = $portVersion
+	devel:libjavascriptcore$secondaryArchSuffix = $portVersion
+	devel:libwebcore$secondaryArchSuffix = $portVersion
+	devel:libWebKit$secondaryArchSuffix = $portVersion
+	devel:libwtf$secondaryArchSuffix = $portVersion
+	"
+REQUIRES_devel="
+	haikuwebkit$secondaryArchSuffix == $portVersion base
+	"
diff --git a/haiku-libs/haikuwebkit/haikuwebkit-1.3.1.recipe b/haiku-libs/haikuwebkit/haikuwebkit-1.3.1.recipe
new file mode 100644
index 000000000..8f4f94b61
--- /dev/null
+++ b/haiku-libs/haikuwebkit/haikuwebkit-1.3.1.recipe
@@ -0,0 +1,112 @@
+SUMMARY="Open source web browser engine"
+DESCRIPTION="
+WebKit is an open source web browser engine. WebKit is also the name of the \
+Mac OS X system framework version of the engine that's used by Safari, \
+Dashboard, Mail, and many other OS X applications. WebKit's HTML and \
+JavaScript code began as a branch of the KHTML and KJS libraries from KDE.
+"
+HOMEPAGE="http://www.webkit.org/"
+COPYRIGHT="1998-2014 Apple Inc., Google Inc., et al"
+LICENSE="
+	GNU LGPL v2
+	GNU LGPL v2.1
+	MIT
+	"
+SRC_URI="https://github.com/haiku/webkit/archive/$portVersion.tar.gz"
+CHECKSUM_SHA256="a1992fd1001d85d431b469addf62451eccd8d491c14a82b1a4fd478c731aa41d"
+SRC_FILENAME="haikuwebkit-$portVersion.tar.gz"
+REVISION="1"
+ARCHITECTURES="x86 x86_64"
+if [ $effectiveTargetArchitecture != x86_gcc2 ]; then
+	# x86_gcc2 is fine as primary target architecture as long as we're building
+	# for a different secondary architecture.
+	ARCHITECTURES="$ARCHITECTURES x86_gcc2"
+fi
+SECONDARY_ARCHITECTURES="x86"
+
+
+if [ $effectiveTargetArchitecture == x86_64 ]; then
+	PATCHES="haikuwebkit-1.2.5.patchset"
+fi
+
+PROVIDES="
+	haikuwebkit$secondaryArchSuffix = $portVersion
+	lib:libWebKit$secondaryArchSuffix = $portVersion
+	cmd:jsc$secondaryArchSuffix
+	"
+REQUIRES="
+	haiku$secondaryArchSuffix >= $haikuVersion
+	lib:libicuuc$secondaryArchSuffix
+	lib:libjpeg$secondaryArchSuffix
+	lib:libpng$secondaryArchSuffix
+	lib:libsqlite3$secondaryArchSuffix
+	lib:libxml2$secondaryArchSuffix
+	lib:libxslt$secondaryArchSuffix
+	lib:libz$secondaryArchSuffix
+	lib:libavcodec$secondaryArchSuffix
+	lib:libexecinfo$secondaryArchSuffix
+	lib:libstdc++$secondaryArchSuffix
+	"
+
+BUILD_REQUIRES="
+	haiku${secondaryArchSuffix}_devel >= $haikuVersion
+	haiku_devel >= $haikuVersion
+	devel:libicuuc$secondaryArchSuffix
+	devel:libjpeg$secondaryArchSuffix
+	devel:libpng$secondaryArchSuffix
+	devel:libsqlite3$secondaryArchSuffix
+	devel:libxml2$secondaryArchSuffix
+	devel:libxslt$secondaryArchSuffix
+	devel:libz$secondaryArchSuffix
+	devel:libavcodec$secondaryArchSuffix
+	devel:libexecinfo$secondaryArchSuffix
+	"
+BUILD_PREREQUIRES="
+	cmd:pkg_config
+	cmd:flex
+	cmd:bison
+	cmd:gcc$secondaryArchSuffix
+	cmd:gperf
+	cmd:ld$secondaryArchSuffix
+	cmd:m4
+	cmd:make
+	cmd:perl
+	cmd:python
+	cmd:cmake
+	cmd:ruby
+	"
+
+SOURCE_DIR="webkit-$portVersion"
+
+BUILD()
+{
+	export PKG_CONFIG_LIBDIR="`finddir B_SYSTEM_DIRECTORY`/$relativeDevelopLibDir/pkgconfig"
+	Tools/Scripts/build-webkit --haiku --no-webkit2 \
+		--cmakeargs="-DCMAKE_INSTALL_PREFIX=$prefix"
+}
+
+INSTALL()
+{
+	cd WebKitBuild/Release
+	make install
+
+	rm $developLibDir/*
+	prepareInstalledDevelLibs libWebKit
+
+	# devel package
+	packageEntries devel \
+		$developDir
+}
+
+# ----- devel package -------------------------------------------------------
+
+PROVIDES_devel="
+	haikuwebkit${secondaryArchSuffix}_devel = $portVersion
+	devel:libjavascriptcore$secondaryArchSuffix = $portVersion
+	devel:libwebcore$secondaryArchSuffix = $portVersion
+	devel:libWebKit$secondaryArchSuffix = $portVersion
+	devel:libwtf$secondaryArchSuffix = $portVersion
+	"
+REQUIRES_devel="
+	haikuwebkit$secondaryArchSuffix == $portVersion base
+	"
diff --git a/haiku-libs/haikuwebkit/patches/haikuwebkit-1.2.5.patchset b/haiku-libs/haikuwebkit/patches/haikuwebkit-1.2.5.patchset
new file mode 100644
index 000000000..d4c97a1f8
--- /dev/null
+++ b/haiku-libs/haikuwebkit/patches/haikuwebkit-1.2.5.patchset
@@ -0,0 +1,29 @@
+From 77b90ebb44229f5e920e95d517cd153c5c3c0ce8 Mon Sep 17 00:00:00 2001
+From: Jonathan Schleifer <js@webkeks.org>
+Date: Wed, 19 Mar 2014 00:52:39 +0100
+Subject: [PATCH] Fix compilation on x86_64
+
+---
+ Source/JavaScriptCore/offlineasm/asm.rb | 6 +++++-
+ 1 file changed, 5 insertions(+), 1 deletion(-)
+
+diff --git a/Source/JavaScriptCore/offlineasm/asm.rb b/Source/JavaScriptCore/offlineasm/asm.rb
+index 8fe6228..0f5849c 100644
+--- a/Source/JavaScriptCore/offlineasm/asm.rb
++++ b/Source/JavaScriptCore/offlineasm/asm.rb
+@@ -209,7 +209,11 @@ class Assembler
+     
+     def self.labelReference(labelName)
+         if !$emitWinAsm
+-            "\" LOCAL_REFERENCE(#{labelName}) \""
++            if labelName == 'llint_throw_from_slow_path_trampoline'
++                "\" GLOBAL_REFERENCE(#{labelName}) \""
++            else
++                "\" LOCAL_REFERENCE(#{labelName}) \""
++            end
+         else
+             "#{labelName}"
+         end
+-- 
+Jonathan
+
diff --git a/haiku-libs/libprefs/libprefs-1.2.5.recipe b/haiku-libs/libprefs/libprefs-1.2.5.recipe
index dd7217fdc..d6306bfb8 100644
--- a/haiku-libs/libprefs/libprefs-1.2.5.recipe
+++ b/haiku-libs/libprefs/libprefs-1.2.5.recipe
@@ -4,7 +4,7 @@ Shared library to take care your preferences.
 "
 HOMEPAGE="ftp://ftp.icm.edu.pl/vol/rzm1/beos/contrib/libraries"
 SRC_URI="ftp://ftp.icm.edu.pl/vol/rzm1/beos/contrib/libraries/libprefs125.zip"
-CHECKSUM_MD5="890f1fc84b7402505ac2536f4d1c5075"
+CHECKSUM_SHA256="39532c9c6c69f915a6d99fde4fd827a5bdb676ee0cf00558b6956fc91db9a737"
 REVISION="1"
 LICENSE="Public Domain"
 COPYRIGHT="1998 libprefs@mindcontrol.org"
diff --git a/kde-misc/kdiff3/kdiff3-0.9.97.recipe b/kde-misc/kdiff3/kdiff3-0.9.97.recipe
index 7fad1ae2c..3e0ac1ec4 100644
--- a/kde-misc/kdiff3/kdiff3-0.9.97.recipe
+++ b/kde-misc/kdiff3/kdiff3-0.9.97.recipe
@@ -15,7 +15,7 @@ KDiff3 is a diff and merge program that:
 "
 HOMEPAGE="http://kdiff3.sourceforge.net/"
 SRC_URI="http://sourceforge.net/projects/kdiff3/files/kdiff3/0.9.97/kdiff3-0.9.97.tar.gz"
-CHECKSUM_MD5="30a71b474956c369ed7b38c6db080fc4"
+CHECKSUM_SHA256="e3b716bb449c814d8c30817ec1ca23fba0ed9eee5a635e766c1f2b90ddb75a2a"
 COPYRIGHT="2002-2012 by Joachim Eibl"
 LICENSE="GNU GPL v2"
 REVISION="1"
diff --git a/media-fonts/anonymous_pro/anonymous_pro-1.002.001.recipe b/media-fonts/anonymous_pro/anonymous_pro-1.002.001.recipe
index 3bcd70549..c3b0ad6dd 100644
--- a/media-fonts/anonymous_pro/anonymous_pro-1.002.001.recipe
+++ b/media-fonts/anonymous_pro/anonymous_pro-1.002.001.recipe
@@ -7,7 +7,7 @@ European languages, as well as Greek and Cyrillic.
 "
 HOMEPAGE="http://www.marksimonson.com/fonts/view/anonymous-pro"
 SRC_URI="http://www.marksimonson.com/assets/content/fonts/AnonymousPro-1.002.zip"
-CHECKSUM_MD5="bb5141b20b9d69b3190be03e5706c8b7"
+CHECKSUM_SHA256="86665847a51cdfb58a1e1dfd8b1ba33f183485affe50b53e3304f63d3d3552ab"
 LICENSE="SIL Open Font License v1.1"
 COPYRIGHT="2009 Mark Simonson, with reserved font name Anonymous Pro"
 REVISION="1"
diff --git a/media-fonts/arabeyes_fonts/arabeyes_fonts-1.1.recipe b/media-fonts/arabeyes_fonts/arabeyes_fonts-1.1.recipe
index 180a1911c..9a1b7b09a 100644
--- a/media-fonts/arabeyes_fonts/arabeyes_fonts-1.1.recipe
+++ b/media-fonts/arabeyes_fonts/arabeyes_fonts-1.1.recipe
@@ -7,9 +7,9 @@ contributions.
 "
 HOMEPAGE="http://projects.arabeyes.org/project.php?proj=Khotot" 
 SRC_URI="http://sourceforge.net/projects/arabeyes/files/Fonts/ae_fonts/ae_fonts1_ttf_1.1.tar.bz2"
+CHECKSUM_SHA256="c517f6ac0643d2416101c9b375be38ec4fe7810b7ad3a1465438dd45b819e054"
 REVISION="1"
 DEPEND=""
-CHECKSUM_MD5="11000a74da50b461b374f711392f1d46"
 LICENSE="GNU GPL v2"
 COPYRIGHT="2003-2007 Arabeyes.org
 	2002-2005 Free Software Foundation"
diff --git a/media-fonts/cantarell/cantarell-0.0.7.recipe b/media-fonts/cantarell/cantarell-0.0.7.recipe
index d0f36a012..b25153a71 100644
--- a/media-fonts/cantarell/cantarell-0.0.7.recipe
+++ b/media-fonts/cantarell/cantarell-0.0.7.recipe
@@ -10,7 +10,7 @@ included in Google Fonts too.
 "
 HOMEPAGE="http://wiki.gnome.org/CantarellFonts"
 SRC_URI="http://ftp.gnome.org/pub/GNOME/sources/cantarell-fonts/0.0/cantarell-fonts-0.0.7.tar.bz2"
-CHECKSUM_MD5="6202c98fd65faab44cdabcaf4947ca5f"
+CHECKSUM_SHA256="79f69beca780d84c7c5753566d801ca14e46b6c111ec71527e37ae29377c2c79"
 LICENSE="SIL Open Font License v1.1"
 COPYRIGHT="2009-2011 Understanding Limited, 2010-2011 Jakub Steiner"
 REVISION="1"
diff --git a/media-fonts/cardo/cardo-1.04.recipe b/media-fonts/cardo/cardo-1.04.recipe
index 8fea9105b..c3c3274c7 100644
--- a/media-fonts/cardo/cardo-1.04.recipe
+++ b/media-fonts/cardo/cardo-1.04.recipe
@@ -8,7 +8,7 @@ small capitals and a variety of punctuation and space characters.
 "
 HOMEPAGE="http://scholarsfonts.net/cardofnt.html"
 SRC_URI="http://scholarsfonts.net/cardo104.zip"
-CHECKSUM_MD5="e48dadccd31a74667b0369d7e98e660f"
+CHECKSUM_SHA256="9401db6357cb71fa1f8791323679f81d6b0473d6280a7ec8abdf11b5e52f455f"
 LICENSE="SIL Open Font License v1.1"
 COPYRIGHT="2004–2011 David J. Perry, with Reserved Font Name Cardo"
 REVISION="1"
diff --git a/media-fonts/courier_prime/courier_prime-1.0.recipe b/media-fonts/courier_prime/courier_prime-1.0.recipe
index 581007de6..309374cbe 100644
--- a/media-fonts/courier_prime/courier_prime-1.0.recipe
+++ b/media-fonts/courier_prime/courier_prime-1.0.recipe
@@ -7,8 +7,8 @@ should not change.
 "
 HOMEPAGE="http://quoteunquoteapps.com/courierprime/"
 SRC_URI="http://quoteunquoteapps.com/downloads/courier-prime.zip"
+CHECKSUM_SHA256="d5d4faf1bee0d1f52bab1103cbfdfb354976331c86f999c110c22a098cb12d73"
 REVISION="1"
-CHECKSUM_MD5="cf79336ce1cf439560a5364ab7856738"
 LICENSE="SIL Open Font License v1.1"
 COPYRIGHT="2013 Quote-Unquote Apps"
 
diff --git a/media-fonts/droid/droid-113.recipe b/media-fonts/droid/droid-113.recipe
index 127930829..2b908a4b0 100644
--- a/media-fonts/droid/droid-113.recipe
+++ b/media-fonts/droid/droid-113.recipe
@@ -7,7 +7,7 @@ application menus, web browsers and for other screen text.
 "
 HOMEPAGE="http://www.droidfonts.com" 
 SRC_URI="http://ports-space.haiku-files.org/media-fonts/source/droid-113.tar.gz"
-CHECKSUM_MD5="4e11069eedc2ceda6b1cec7fd5939039"
+CHECKSUM_SHA256="c9339f0f1aaa055f8b06a2b28c1c3fb5ddffe6c6a6a7a7735fc0ad93d0eab12f"
 LICENSE="Apache v2"
 COPYRIGHT="2005-2008 The Android Open Source Project"
 REVISION="1"
diff --git a/media-fonts/droid/droid-4.3_r2.2.recipe b/media-fonts/droid/droid-4.3_r2.2.recipe
index 144f6ff0f..0b802f2c0 100644
--- a/media-fonts/droid/droid-4.3_r2.2.recipe
+++ b/media-fonts/droid/droid-4.3_r2.2.recipe
@@ -8,7 +8,7 @@ application menus, web browsers and for other screen text.
 HOMEPAGE="http://www.droidfonts.com" 
 # source zip extracted from git clone https://android.googlesource.com/platform/frameworks/base tag android-4.3_r2.2 /data/fonts
 SRC_URI="http://ports-space.haiku-files.org/media-fonts/source/droid-4.3_r2.2.zip"
-CHECKSUM_MD5="a91c8129ac25f160ca83e23d77c00862"
+CHECKSUM_SHA256="221133c329efdb2b911c18ef222eeb3fcb011e5be7c37623e68faa90c15b8cd0"
 LICENSE="Apache v2"
 COPYRIGHT="2005-2008 The Android Open Source Project"
 REVISION="1"
diff --git a/media-fonts/humor_sans/humor_sans-1.0.recipe b/media-fonts/humor_sans/humor_sans-1.0.recipe
index 83265443b..f010cebeb 100644
--- a/media-fonts/humor_sans/humor_sans-1.0.recipe
+++ b/media-fonts/humor_sans/humor_sans-1.0.recipe
@@ -5,7 +5,7 @@ focus on computer science or everything else.
 "
 HOMEPAGE="http://antiyawn.com/uploads/humorsans.html"
 SRC_URI="http://antiyawn.com/uploads/Humor-Sans-1.0.ttf"
-CHECKSUM_MD5="acdc29df52454684fe8f3184f6477290"
+CHECKSUM_SHA256="2ded6a27448c9ed30aaff177744e2bcf1e52e0aab018b2a8be64565df633318f"
 LICENSE="SIL Open Font License v1.1"
 COPYRIGHT="2009, Michael Ciuffo, with Reserved Font Name Humor-Sans"
 REVISION="1"
diff --git a/media-fonts/lohit/lohit-2.3.8.recipe b/media-fonts/lohit/lohit-2.3.8.recipe
index a2194be41..f1da927e3 100644
--- a/media-fonts/lohit/lohit-2.3.8.recipe
+++ b/media-fonts/lohit/lohit-2.3.8.recipe
@@ -10,7 +10,7 @@ some other Wikimedia Foundation sites.
 "
 HOMEPAGE="http://fedorahosted.org/lohit"
 SRC_URI="http://rbhalera.fedorapeople.org/released/lohit/lohit-fonts-2.3.8.tar.gz"
-CHECKSUM_MD5="f3b5c3cd8e370f1669d44cec3eab1f2b"
+CHECKSUM_SHA256="68091ab047f9e4e22f069f802dceac52994267f126dc238b3815eed217a02991"
 LICENSE="GNU GPL v2"
 COPYRIGHT="2004-2011 Red Hat"
 REVISION="1"
diff --git a/media-fonts/roboto/roboto-1.2.recipe b/media-fonts/roboto/roboto-1.2.recipe
index a26b34920..825c43caf 100644
--- a/media-fonts/roboto/roboto-1.2.recipe
+++ b/media-fonts/roboto/roboto-1.2.recipe
@@ -13,7 +13,7 @@ style for each weight.
 "
 HOMEPAGE="http://www.google.com/fonts/specimen/Roboto"
 SRC_URI="http://developer.android.com/downloads/design/roboto-1.2.zip"
-CHECKSUM_MD5="45bfbcd71a74d73c6d2c97994abb7e00"
+CHECKSUM_SHA256="5101b5bdb3b7b14cc922a771ba068bfcae8634467c1f446bc89bc2b4f8b4f1b5"
 LICENSE="Apache v2"
 COPYRIGHT="2013 Christian Robertson"
 REVISION="1"
diff --git a/media-fonts/terminus_ttf/terminus_ttf-4.38.2.recipe b/media-fonts/terminus_ttf/terminus_ttf-4.38.2.recipe
new file mode 100644
index 000000000..36a0677d4
--- /dev/null
+++ b/media-fonts/terminus_ttf/terminus_ttf-4.38.2.recipe
@@ -0,0 +1,32 @@
+SUMMARY="TTF version of the Terminus font"
+DESCRIPTION="Terminus TTF is a TrueType version of the great Terminus Font, a fixed-width bitmap font optimized for long work with computers"
+HOMEPAGE="http://files.ax86.net/terminus-ttf/"
+SRC_URI="http://files.ax86.net/terminus-ttf/files/$portVersion/terminus-ttf-$portVersion.zip"
+CHECKSUM_SHA256="95896b5711e8c96cae180e3c8c837f23618c611e1aebc40639bc983d519dd5bd"
+SOURCE_DIR="terminus-ttf-$portVersion"
+REVISION="1"
+ARCHITECTURES="x86 x86_gcc2 x86_64"
+LICENSE="SIL Open Font License v1.1"
+COPYRIGHT="2010 Dimitar Toshkov Zhekov
+	2011 Tilman Blumenbach"
+
+PROVIDES="
+	terminus_ttf = $portVersion
+	"
+BUILD_PREREQUIRES="
+	cmd:cp
+	cmd:mkdir
+	"
+
+
+BUILD()
+{
+	echo "No building required."
+}
+
+INSTALL()
+{
+	FONTDIR=$fontsDir/terminus-ttf
+	mkdir -p ${FONTDIR}
+	cp -r *.ttf ${FONTDIR}/
+}
diff --git a/media-fonts/ubuntu_font_family/ubuntu_font_family-0.80.recipe b/media-fonts/ubuntu_font_family/ubuntu_font_family-0.80.recipe
index b2f6ff263..9d4763f48 100644
--- a/media-fonts/ubuntu_font_family/ubuntu_font_family-0.80.recipe
+++ b/media-fonts/ubuntu_font_family/ubuntu_font_family-0.80.recipe
@@ -7,7 +7,7 @@ operating systems. It was designed by Dalton Maag in 2010 and now it covers \
 "
 HOMEPAGE="http://font.ubuntu.com"
 SRC_URI="http://font.ubuntu.com/download/ubuntu-font-family-0.80.zip"
-CHECKSUM_MD5="a1fc70f5a5b1d096ab8310886cddaa1c"
+CHECKSUM_SHA256="107170099bbc3beae8602b97a5c423525d363106c3c24f787d43e09811298e4c"
 LICENSE="Ubuntu Font License 1.0"
 COPYRIGHT="2011 Canonical Ltd."
 REVISION="3"
diff --git a/media-fonts/vollkorn/vollkorn-2.1.recipe b/media-fonts/vollkorn/vollkorn-2.1.recipe
index 34ccf77f6..63bf217a8 100644
--- a/media-fonts/vollkorn/vollkorn-2.1.recipe
+++ b/media-fonts/vollkorn/vollkorn-2.1.recipe
@@ -7,7 +7,7 @@ for headlines and titles.
 "
 HOMEPAGE="http://friedrichalthausen.de/vollkorn/"
 SRC_URI="http://friedrichalthausen.de/wp-content/plugins/cimy-counter/cc_redirect.php?cc=Vollkorn%202.0&fn=http://friedrichalthausen.de/Vollkorn-2.1.zip"
-CHECKSUM_MD5="dd38725c293bc73774ff77744674fe13"
+CHECKSUM_SHA256="2eaa427dbe42e37bfdc182c1e3446abdc889806fe0b6c9a14e0fc0c3acc997f5"
 LICENSE="SIL Open Font License v1.1"
 COPYRIGHT="Friedrich Althausen"
 REVISION="1"
diff --git a/media-fonts/wqy_microhei/wqy_microhei-0.2.0~beta.recipe b/media-fonts/wqy_microhei/wqy_microhei-0.2.0~beta.recipe
index c9293868e..38e19e6bb 100644
--- a/media-fonts/wqy_microhei/wqy_microhei-0.2.0~beta.recipe
+++ b/media-fonts/wqy_microhei/wqy_microhei-0.2.0~beta.recipe
@@ -4,7 +4,7 @@ A droid derived Sans-Serif style CJK font.
 "
 HOMEPAGE="http://wenq.org/wqy2/index.cgi?Home" 
 SRC_URI="http://sourceforge.net/projects/wqy/files/wqy-microhei/0.2.0-beta/wqy-microhei-0.2.0-beta.tar.gz"
-CHECKSUM_MD5="a124c5c6606f4f3b733d3477380e9d2f"
+CHECKSUM_SHA256="2802ac8023aa36a66ea6e7445854e3a078d377ffff42169341bd237871f7213e"
 LICENSE="
 	Apache v2
 	GNU GPL v3
diff --git a/media-fonts/wqy_zenhei/wqy_zenhei-0.9.45.recipe b/media-fonts/wqy_zenhei/wqy_zenhei-0.9.45.recipe
index b0237ab2d..c04558372 100644
--- a/media-fonts/wqy_zenhei/wqy_zenhei-0.9.45.recipe
+++ b/media-fonts/wqy_zenhei/wqy_zenhei-0.9.45.recipe
@@ -4,7 +4,7 @@ WenQuanYi Hei-Ti Style (sans-serif) Chinese outline font.
 "
 HOMEPAGE="http://wenq.org/wqy2/index.cgi?Home" 
 SRC_URI="http://sourceforge.net/projects/wqy/files/wqy-zenhei/0.9.45%20%28Fighting-state%20RC1%29/wqy-zenhei-0.9.45.tar.gz"
-CHECKSUM_MD5="4c6c3f4e902dd5ee0a121e8c41d040bd"
+CHECKSUM_SHA256="e4b7e306475bf9427d1757578f0e4528930c84c44eaa3f167d4c42f110ee75d6"
 LICENSE="
 	GNU GPL v2
 	GNU GPL v2 with font embedding exception
diff --git a/media-gfx/graphviz/graphviz-2.26.3.recipe b/media-gfx/graphviz/graphviz-2.26.3.recipe
index 195ab55f2..57d2937f9 100644
--- a/media-gfx/graphviz/graphviz-2.26.3.recipe
+++ b/media-gfx/graphviz/graphviz-2.26.3.recipe
@@ -16,7 +16,7 @@ HOMEPAGE="http://www.graphviz.org/"
 LICENSE="CPL v1.0"
 COPYRIGHT="1994-2010 AT&T Corp."
 SRC_URI="http://www.graphviz.org/pub/graphviz/stable/SOURCES/graphviz-2.26.3.tar.gz"
-CHECKSUM_MD5="6f45946fa622770c45609778c0a982ee"
+CHECKSUM_SHA256="f410996e69b1095237c2128deae5fc7b6ce99055b095271abb14447bc2f37fa1"
 REVISION="2"
 ARCHITECTURES="!x86_gcc2"
 
diff --git a/media-gfx/optipng/optipng-0.7.4.recipe b/media-gfx/optipng/optipng-0.7.4.recipe
index 70904deb4..3edbfe0c4 100644
--- a/media-gfx/optipng/optipng-0.7.4.recipe
+++ b/media-gfx/optipng/optipng-0.7.4.recipe
@@ -6,7 +6,7 @@ formats, such as BMP, GIF, PNM and TIFF, to PNG files.
 "
 HOMEPAGE="http://optipng.sourceforge.net/"
 SRC_URI="http://prdownloads.sourceforge.net/optipng/optipng-0.7.4.tar.gz"
-CHECKSUM_MD5="8853d89aaf859065e95dcdf98b6bed73"
+CHECKSUM_SHA256="520b5d5a9405dbdc5c905dd0cff87211e69c4ed2059744037510e613fe8237ff"
 LICENSE="Zlib"
 COPYRIGHT="2001-2012 Cosmin Truta"
 REVISION="2"
diff --git a/media-gfx/pngcrush/pngcrush-1.7.67.recipe b/media-gfx/pngcrush/pngcrush-1.7.67.recipe
index d22d55e7a..cfb6c50e6 100644
--- a/media-gfx/pngcrush/pngcrush-1.7.67.recipe
+++ b/media-gfx/pngcrush/pngcrush-1.7.67.recipe
@@ -8,8 +8,9 @@ used to remove unwanted ancillary chunks, or to add certain chunks including \
 gAMA, tRNS, iCCP, and textual chunks.
 "
 HOMEPAGE="http://pmt.sourceforge.net/pngcrush/" 
-SRC_URI="http://sourceforge.net/projects/pmt/files/pngcrush/1.7.67/pngcrush-1.7.67-nolib.tar.xz"
-CHECKSUM_MD5="682318b86be2e01056b8dba7b90dee01"
+SRC_URI="http://sourceforge.net/projects/pmt/files/pngcrush/old-versions/1.7/1.7.67/pngcrush-1.7.67-nolib.tar.xz/download"
+CHECKSUM_SHA256="1ed050059f38504ca9eeef5bfae88fe8c69905e7337e454254cf2fad20f8e83c"
+SRC_FILENAME="pngcrush-1.7.67-nolib.tar.xz"
 REVISION="1"
 LICENSE="LibPNG"
 COPYRIGHT="1998-2009 Glenn Randers-Pehrson
diff --git a/media-gfx/qrencode/qrencode-3.3.0.recipe b/media-gfx/qrencode/qrencode-3.3.0.recipe
new file mode 100644
index 000000000..9ed1ed1ed
--- /dev/null
+++ b/media-gfx/qrencode/qrencode-3.3.0.recipe
@@ -0,0 +1,74 @@
+SUMMARY="QR Code encoding library"
+DESCRIPTION="
+QLibqrencode is a library for encoding data in a QR Code symbol, a kind of 2D \
+symbology that can be scanned by handy terminals such as a mobile phone with \
+CCD. The capacity of QR Code is up to 7000 digits or 4000 characters, and has \
+high robustness.
+
+Libqrencode accepts a string or a list of data chunks then encodes in a QR Code \
+symbol as a bitmap array. While other QR Code applications generate an image \
+file, using libqrencode allows applications to render QR Code symbols from raw \
+bitmap data directly. This library also contains a command-line utility outputs \
+a QR Code symbol as a PNG image. It will help light-weight CGI programs.
+"
+HOMEPAGE="http://fukuchi.org/works/qrencode/"
+COPYRIGHT="
+	Copyright (C) 2006-2012 Kentaro Fukuchi
+	"
+LICENSE="GNU LGPL v2.1"
+SRC_URI="http://fukuchi.org/works/qrencode/qrencode-$portVersion.tar.gz"
+CHECKSUM_SHA256="499b2c86c218b16378e2496fefc858e4db4271c048336a29df9cc5754413d1d1"
+REVISION="1"
+ARCHITECTURES="x86_gcc2 x86 x86_64"
+SECONDARY_ARCHITECTURES="x86_gcc2 x86"
+
+PROVIDES="
+	qrencode$secondaryArchSuffix = $portVersion
+	lib:libqrencode$secondaryArchSuffix  = 3.3.0 compat >= 3
+	"
+REQUIRES="
+	haiku$secondaryArchSuffix >= $haikuVersion
+	lib:libpng$secondaryArchSuffix
+	lib:libz$secondaryArchSuffix
+	"
+BUILD_REQUIRES="
+	devel:libpng$secondaryArchSuffix
+	devel:libz$secondaryArchSuffix
+	"
+BUILD_PREREQUIRES="
+	haiku${secondaryArchSuffix}_devel >= $haikuVersion
+	cmd:gcc$secondaryArchSuffix
+	cmd:ld$secondaryArchSuffix
+	cmd:make
+	cmd:pkg_config
+	cmd:sed
+	cmd:awk
+	"
+
+BUILD()
+{
+	runConfigure ./configure --without-tools \
+		--enable-static
+	make $jobArgs
+}
+
+INSTALL()
+{
+	make install
+
+	prepareInstalledDevelLibs libqrencode
+
+	# devel package
+	packageEntries devel \
+		$developDir
+}
+
+# ----- devel package -------------------------------------------------------
+
+PROVIDES_devel="
+	qrencode${secondaryArchSuffix}_devel = $portVersion compat >= 3
+	devel:libqrencode$secondaryArchSuffix = 3.3.0 compat >= 3
+	"
+REQUIRES_devel="
+	qrencode$secondaryArchSuffix == $portVersion
+	"
diff --git a/media-gfx/tuxpaint/tuxpaint-0.9.2x_cvs.recipe b/media-gfx/tuxpaint/tuxpaint-0.9.2x_cvs.recipe
index 380eaa8f1..4576a755e 100644
--- a/media-gfx/tuxpaint/tuxpaint-0.9.2x_cvs.recipe
+++ b/media-gfx/tuxpaint/tuxpaint-0.9.2x_cvs.recipe
@@ -5,7 +5,7 @@ tuxpaint - Drawing program designed for young children.
 HOMEPAGE="http://www.tuxpaint.org/" 
 #SRC_URI="cvs://:pserver:anonymous@tuxpaint.cvs.sourceforge.net:/cvsroot/tuxpaint/tuxpaint"
 SRC_URI="http://ports-space.haiku-files.org/source/tuxpaint-snapshot-2013-11-06.zip"
-CHECKSUM_MD5="5de3581c15b73e88a1925bf37e172519"
+CHECKSUM_SHA256="8eca858c590b7aad4cfebe252ea1e5745d043bd46c18bc4c4e5bb59fd47d41d3"
 COPYRIGHT="2002-2010 Bill Kendrick and others"
 LICENSE="GNU GPL v2"
 REVISION="1"
diff --git a/media-libs/a52dec/a52dec-0.7.4.recipe b/media-libs/a52dec/a52dec-0.7.4.recipe
index 4ae118226..dd1fb5342 100644
--- a/media-libs/a52dec/a52dec-0.7.4.recipe
+++ b/media-libs/a52dec/a52dec-0.7.4.recipe
@@ -4,7 +4,7 @@ A library for decoding ATSC A/52 streams used in DVD's.
 "
 HOMEPAGE="http://liba52.sourceforge.net/" 
 SRC_URI="http://liba52.sourceforge.net/files/a52dec-0.7.4.tar.gz"
-CHECKSUM_MD5="caa9f5bc44232dc8aeea773fea56be80"
+CHECKSUM_SHA256="a21d724ab3b3933330194353687df82c475b5dfb997513eef4c25de6c865ec33"
 REVISION="1"
 LICENSE="GNU GPL v2"
 COPYRIGHT="Copyright (C) 1999-2002 Aaron Holtzman and Michel Lespinasse"
diff --git a/media-libs/aalib/aalib-1.4rc4.recipe b/media-libs/aalib/aalib-1.4rc4.recipe
index 207b18b92..f47de0ca0 100644
--- a/media-libs/aalib/aalib-1.4rc4.recipe
+++ b/media-libs/aalib/aalib-1.4rc4.recipe
@@ -5,8 +5,8 @@ still and moving images into ASCII art.
 "
 HOMEPAGE="http://aa-project.sourceforge.net/aalib/" 
 SRC_URI="http://prdownloads.sourceforge.net/aa-project/aalib-1.4rc4.tar.gz"
+CHECKSUM_SHA256="0b214b98850f559e0a9ef7282de2ff336b094e1aacedefff3ffa50f07711db58"
 SOURCE_DIR="aalib-1.4.0"
-CHECKSUM_MD5="d5aa8e9eae07b7441298b5c30490f6a6"
 REVISION="2"
 LICENSE="Public Domain"
 COPYRIGHT="1997 Jam Hubicka"
diff --git a/media-libs/allegro/allegro-4.4.1.1.recipe b/media-libs/allegro/allegro-4.4.1.1.recipe
index 1af7266cd..3ba492d44 100644
--- a/media-libs/allegro/allegro-4.4.1.1.recipe
+++ b/media-libs/allegro/allegro-4.4.1.1.recipe
@@ -4,7 +4,7 @@ Allegro game programming library.
 "
 HOMEPAGE="http://alleg.sourceforge.net/" 
 SRC_URI="http://sourceforge.net/projects/alleg/files/allegro/4.4.1.1/allegro-4.4.1.1.tar.gz/download"
-CHECKSUM_MD5="0f1cfff8f2cf88e5c91a667d9fd386ec"
+CHECKSUM_SHA256="4e29884cba88b289da5b22da93e8760d68a197d093b23f61e994f3594760d782"
 LICENSE="Allegro"
 COPYRIGHT="1998-2010 Shawn Hargreaves et al."
 
diff --git a/media-libs/allegro/allegro-4.4.2.recipe b/media-libs/allegro/allegro-4.4.2.recipe
index 87e9171da..21e488176 100644
--- a/media-libs/allegro/allegro-4.4.2.recipe
+++ b/media-libs/allegro/allegro-4.4.2.recipe
@@ -14,7 +14,7 @@ but has since received contributions from hundreds of people over the net.
 "
 HOMEPAGE="http://alleg.sourceforge.net/" 
 SRC_URI="http://sourceforge.net/projects/alleg/files/allegro/4.4.2/allegro-4.4.2.tar.gz/download"
-CHECKSUM_MD5="4db71b0460fc99926ae91d223199c2e6"
+CHECKSUM_SHA256="1b21e7577dbfada02d85ca4510bd22fedaa6ce76fde7f4838c7c1276eb840fdc"
 LICENSE="Allegro"
 COPYRIGHT="1998-2010 Shawn Hargreaves et al."
 
diff --git a/media-libs/devil/devil-1.7.8.recipe b/media-libs/devil/devil-1.7.8.recipe
index 07d610fb8..37c4df4f9 100644
--- a/media-libs/devil/devil-1.7.8.recipe
+++ b/media-libs/devil/devil-1.7.8.recipe
@@ -1,8 +1,8 @@
 SUMMARY="A full-featured cross-platform image library" 
 HOMEPAGE="http://openil.sourceforge.net/" 
 SRC_URI="http://sourceforge.net/projects/openil/files/DevIL/1.7.8/DevIL-1.7.8.tar.gz/download"
+CHECKSUM_SHA256="682ffa3fc894686156337b8ce473c954bf3f4fb0f3ecac159c73db632d28a8fd"
 REVISION="1"
-CHECKSUM_MD5="7918f215524589435e5ec2e8736d5e1d"
 ARCHITECTURES="x86_gcc2 x86"
 SECONDARY_ARCHITECTURES="x86"
 
diff --git a/media-libs/djvulibre/djvulibre-3.5.25.recipe b/media-libs/djvulibre/djvulibre-3.5.25.recipe
index 6417992af..04ad3e511 100644
--- a/media-libs/djvulibre/djvulibre-3.5.25.recipe
+++ b/media-libs/djvulibre/djvulibre-3.5.25.recipe
@@ -9,9 +9,9 @@ COPYRIGHT="2002  Leon Bottou and Yann Le Cun.
 	2001  AT&T
 	1999-2001 LizardTech, Inc."
 SRC_URI="http://downloads.sourceforge.net/project/djvu/DjVuLibre/3.5.25/djvulibre-3.5.25.2.tar.gz"
-CHECKSUM_MD5="994e2ff1d4ae6a763764dfe20509826e"
+CHECKSUM_SHA256="619becf24cf2b9289d5102a19bb81424f68008f90ded841085f07c32e5d48158"
 REVISION="1"
-ARCHITECTURES="x86"
+ARCHITECTURES="x86 x86_64"
 if [ $effectiveTargetArchitecture != x86_gcc2 ]; then
 	# x86_gcc2 is fine as primary target architecture as long as we're building
 	# for a different secondary architecture.
diff --git a/media-libs/faac/faac-1.28.recipe b/media-libs/faac/faac-1.28.recipe
index 939e75850..46e973316 100644
--- a/media-libs/faac/faac-1.28.recipe
+++ b/media-libs/faac/faac-1.28.recipe
@@ -4,7 +4,7 @@ FAAC is an MPEG-4 and MPEG-2 AAC encoder.
 "
 HOMEPAGE="http://www.audiocoding.com/"
 SRC_URI="http://downloads.sourceforge.net/faac/faac-1.28.tar.bz2"
-CHECKSUM_MD5="c5dde68840cefe46532089c9392d1df0"
+CHECKSUM_SHA256="aac475e59d38ae9e29bff760e26bf72b507ccec037a6837cc33e3ac1db3ef352"
 REVISION="1"
 
 LICENSE="GNU GPL v2"
diff --git a/media-libs/fitz/fitz-1.1.recipe b/media-libs/fitz/fitz-1.1.recipe
index 9fbaf4f3d..3f2988792 100644
--- a/media-libs/fitz/fitz-1.1.recipe
+++ b/media-libs/fitz/fitz-1.1.recipe
@@ -9,9 +9,9 @@ HOMEPAGE="http://code.google.com/p/mupdf/"
 LICENSE="GNU GPL v3"
 COPYRIGHT="2007 Free Software Foundation, Inc."
 SRC_URI="http://mupdf.googlecode.com/files/mupdf-1.1-source.tar.gz"
-CHECKSUM_MD5="f7b5fd753f40aca207e9afd70d8f8edf"
+CHECKSUM_SHA256="e54666bbe1d9f0a5464349bfbeffcf676c4a0fcad3efb89eba1f20d4ac991f34"
 REVISION="1"
-ARCHITECTURES="x86"
+ARCHITECTURES="x86 x86_64"
 if [ $effectiveTargetArchitecture != x86_gcc2 ]; then
 	# x86_gcc2 is fine as primary target architecture as long as we're building
 	# for a different secondary architecture.
@@ -59,7 +59,7 @@ BUILD()
 {
 	# work around broken header layout in our freetype_devel package
 	XCFLAGS="-I/boot/system/develop/headers/freetype2" \
-	make libs
+	make $jobArgs libs
 }
 
 INSTALL()
diff --git a/media-libs/flac/flac-1.3.0.recipe b/media-libs/flac/flac-1.3.0.recipe
index 820fe16ce..5318d0c9f 100644
--- a/media-libs/flac/flac-1.3.0.recipe
+++ b/media-libs/flac/flac-1.3.0.recipe
@@ -9,7 +9,7 @@ stereo) just like you would an MP3 file.
 "
 HOMEPAGE="http://flac.sourceforge.net/" 
 SRC_URI="http://downloads.xiph.org/releases/flac/flac-1.3.0.tar.xz"
-CHECKSUM_MD5="13b5c214cee8373464d3d65dee362cdd"
+CHECKSUM_SHA256="fa2d64aac1f77e31dfbb270aeb08f5b32e27036a52ad15e69a77e309528010dc"
 REVISION="1"
 
 LICENSE="GNU LGPL v2.1
diff --git a/media-libs/fontconfig/fontconfig-2.11.0.recipe b/media-libs/fontconfig/fontconfig-2.11.0.recipe
index 65b7f1ff4..de95c866c 100644
--- a/media-libs/fontconfig/fontconfig-2.11.0.recipe
+++ b/media-libs/fontconfig/fontconfig-2.11.0.recipe
@@ -4,7 +4,7 @@ Fontconfig is a library for font customization and configuration.
 "
 HOMEPAGE="http://www.freedesktop.org/wiki/Software/fontconfig" 
 SRC_URI="http://www.freedesktop.org/software/fontconfig/release/fontconfig-2.11.0.tar.bz2"
-CHECKSUM_MD5="000bd4baf7aefa828e03414d0c8c7dc5"
+CHECKSUM_SHA256="cb0e0ef6f03bc8568e95653840bb07d5859dc89d7ce2cade9d94fcccf8c1a467"
 LICENSE="MIT"
 COPYRIGHT="2000-2005, 2006-2007 Keith Packard
 	2005 Patrick Lam
@@ -36,12 +36,16 @@ REQUIRES="
 	lib:libfreetype$secondaryArchSuffix
 	lib:libxml2$secondaryArchSuffix
 	lib:libz$secondaryArchSuffix
+	lib:libpng$secondaryArchSuffix
+	lib:libbz2$secondaryArchSuffix
 	"
 
 BUILD_REQUIRES="
 	devel:libfreetype$secondaryArchSuffix
 	devel:libxml2$secondaryArchSuffix
 	devel:libz$secondaryArchSuffix
+	devel:libpng$secondaryArchSuffix
+	devel:libbz2$secondaryArchSuffix
 	"
 
 BUILD_PREREQUIRES="
@@ -73,7 +77,7 @@ BUILD()
 	autoconf
 	automake
 	FONTS_DIR=`finddir B_SYSTEM_FONTS_DIRECTORY`
-	FONTS_DIR3=`finddir B_BEOS_FONTS_DIRECTORY`
+	FONTS_DIR2=`finddir B_BEOS_FONTS_DIRECTORY`
 	FONTS_DIR3=`finddir B_USER_FONTS_DIRECTORY`
 	CACHE_DIR=`finddir B_USER_CACHE_DIRECTORY`
 	runConfigure ./configure \
diff --git a/media-libs/freetype/freetype-2.4.9.recipe b/media-libs/freetype/freetype-2.4.9.recipe
index dba3da6f5..83847869c 100644
--- a/media-libs/freetype/freetype-2.4.9.recipe
+++ b/media-libs/freetype/freetype-2.4.9.recipe
@@ -8,7 +8,7 @@ HOMEPAGE="http://www.freetype.org"
 LICENSE="FreeType"
 COPYRIGHT="1996-2012 David Turner, Robert Wilhelm, Werner Lemberg, et al."
 SRC_URI="http://download.savannah.gnu.org/releases/freetype/freetype-2.4.9.tar.bz2"
-CHECKSUM_MD5="77a893dae81fd5b896632715ca041179"
+CHECKSUM_SHA256="c4204ac1d48e99d4375a2f32bf4f3f92780a9d9f015e64e57e852f6c004859b9"
 REVISION="3"
 ARCHITECTURES="x86_gcc2 x86 x86_64"
 SECONDARY_ARCHITECTURES="x86_gcc2 x86"
diff --git a/media-libs/freetype/freetype-2.5.2.recipe b/media-libs/freetype/freetype-2.5.2.recipe
index e0034a33f..804038989 100644
--- a/media-libs/freetype/freetype-2.5.2.recipe
+++ b/media-libs/freetype/freetype-2.5.2.recipe
@@ -8,9 +8,9 @@ HOMEPAGE="http://www.freetype.org"
 LICENSE="FreeType"
 COPYRIGHT="1996-2013 David Turner, Robert Wilhelm, Werner Lemberg, et al."
 SRC_URI="http://download.savannah.gnu.org/releases/freetype/freetype-2.5.2.tar.bz2"
-CHECKSUM_MD5="10e8f4d6a019b124088d18bc26123a25"
-REVISION="2"
-ARCHITECTURES="x86_gcc2 x86 x86_64"
+CHECKSUM_SHA256="4ff4bd393aa01071ec7b849d035508a505a78f88b2bcf25ff11e58e43c0b9def"
+REVISION="3"
+ARCHITECTURES="x86_gcc2 x86 x86_64 arm"
 SECONDARY_ARCHITECTURES="x86_gcc2 x86"
 
 PROVIDES="
@@ -54,6 +54,12 @@ INSTALL()
 	prepareInstalledDevelLibs libfreetype
 	fixPkgconfig
 
+	# Freetype headers are in a freetype2 subdirectory, but fixPkgconfig removes
+	# that from the pkg-config file, making it difficult for other ports to use
+	# freetype with pkg-config.
+	sed -i -e "s,^includedir=.*,includedir=$prefix/$relativeIncludeDir/freetype2," \
+   		$developLibDir/pkgconfig/freetype2.pc
+
 	# devel package
 	packageEntries devel \
 		$binDir \
diff --git a/media-libs/gd/gd-2.1.recipe b/media-libs/gd/gd-2.1.recipe
index cbe8ec99a..3094fafc9 100644
--- a/media-libs/gd/gd-2.1.recipe
+++ b/media-libs/gd/gd-2.1.recipe
@@ -1,8 +1,8 @@
 SUMMARY="GD is an open source library for the dynamic creation of images by programmers." 
 DESCRIPTION="GD is an open source library for the dynamic creation of images by programmers." 
 HOMEPAGE="http://www.libgd.org" 
-SRC_URI="https://bitbucket.org/libgd/gd-libgd/downloads/lbgd-2.1.0.tar.xz"
-CHECKSUM_MD5="39ac48e6d5e0012a3bd2248a0102f209"
+SRC_URI="https://bitbucket.org/libgd/gd-libgd/downloads/libgd-2.1.0.tar.xz"
+CHECKSUM_SHA256="fa6665dfe3d898019671293c84d77067a3d2ede50884dbcb6df899d508370e5a"
 REVISION="1"
 COPYRIGHT="1999-2013 "
 LICENSE="LIBGD"
diff --git a/media-libs/giflib/giflib-5.0.5.recipe b/media-libs/giflib/giflib-5.0.5.recipe
index 0902facd3..b4a66d6d0 100644
--- a/media-libs/giflib/giflib-5.0.5.recipe
+++ b/media-libs/giflib/giflib-5.0.5.recipe
@@ -17,7 +17,7 @@ deference to local conventions. :-)
 SUMMARY="giflib - A library for processing GIFs"
 HOMEPAGE="http://sourceforge.net/projects/giflib/" 
 SRC_URI="http://sourceforge.net/projects/giflib/files/giflib-5.x/giflib-5.0.5.tar.bz2/download"
-CHECKSUM_MD5="c3262ba0a3dad31ba876fb5ba1d71a02"
+CHECKSUM_SHA256="606d8a366b1c625ab60d62faeca807a799a2b9e88cbdf2a02bfcdf4429bf8609"
 LICENSE="MIT"
 COPYRIGHT="1997-2007 Eric S. Raymond and Toshio Kuratomi"
 REVISION="2"
diff --git a/media-libs/glew/glew-1.10.0.recipe b/media-libs/glew/glew-1.10.0.recipe
index 8de973375..f50cf6bbf 100644
--- a/media-libs/glew/glew-1.10.0.recipe
+++ b/media-libs/glew/glew-1.10.0.recipe
@@ -5,65 +5,79 @@ C/C++ extension loading library. GLEW provides efficient run-time mechanisms \
 for determining which OpenGL extensions are supported on the target platform.
 "
 LICENSE="BSD (3-clause)"
-COPYRIGHT="2007 The Kronos Group Inc. 
-	2002-2007 Milan Ikits 
-	2002-2007 Marcelo E. Magallon 
-	2002 Lev Povalahev"
-HOMEPAGE="http://glew.sourceforge.net" 
+COPYRIGHT="
+	2007 The Kronos Group Inc.
+	2002-2007 Milan Ikits
+	2002-2007 Marcelo E. Magallon
+	2002 Lev Povalahev
+	"
+HOMEPAGE="http://glew.sourceforge.net"
 SRC_URI="http://downloads.sourceforge.net/project/glew/glew/${portVersion}/glew-${portVersion}.tgz"
-REVISION="1"
-CHECKSUM_MD5="2f09e5e6cb1b9f3611bcac79bc9c2d5d"
+CHECKSUM_SHA256="99c41320b63f6860869b5fb9af9a1854b15582796c64ee3dfd7096dc0c89f307"
+REVISION="4"
 
 ARCHITECTURES="x86 ?x86_gcc2 ?x86_64"
+SECONDARY_ARCHITECTURES="?x86_gcc2 ?x86 ?x86_64"
 
-PATCHES="glew-1.10.0.patch"
+PATCHES="glew-1.10.0.patchset"
 
 PROVIDES="
 	glew$secondaryArchSuffix = $portVersion
-	lib:libGLEW
+	lib:libGLEW$secondaryArchSuffix = $portVersion
 	"
-
 REQUIRES="
-        haiku$secondaryArchSuffix >= $haikuVersion
-	lib:libGL
+	haiku$secondaryArchSuffix >= $haikuVersion
+	lib:libGL$secondaryArchSuffix
 	"
-
 BUILD_REQUIRES="
-	devel:libGL
-        "
-
+	devel:libGL$secondaryArchSuffix
+	"
 BUILD_PREREQUIRES="
 	haiku${secondaryArchSuffix}_devel >= $haikuVersion
-	cmd:aclocal
-	cmd:autoconf
-	cmd:automake
 	cmd:gcc$secondaryArchSuffix
+	cmd:g++$secondaryArchSuffix
 	cmd:ld$secondaryArchSuffix
 	cmd:make
 	"
 
-SOURCE_DIR="glew-${portVersion}"
-
 BUILD()
 {
-	make GLEW_DEST=$prefix BINDIR=$binDir LIBDIR=$libDir INCDIR=$includeDir
+	make $jobArgs GLEW_DEST=$prefix BINDIR=$binDir LIBDIR=$libDir INCDIR=$includeDir
 }
 
 INSTALL()
 {
 	make install GLEW_DEST=$prefix BINDIR=$binDir LIBDIR=$libDir INCDIR=$includeDir
+	make install.bin GLEW_DEST=$prefix BINDIR=$binDir LIBDIR=$libDir INCDIR=$includeDir
 
+	prepareInstalledDevelLib libGLEW
 	fixPkgconfig
 
-	packageEntries devel \
-		$developDir
+	packageEntries devel $developDir
+	packageEntries util $binDir
 }
 
 # ----- devel package -------------------------------------
 PROVIDES_devel="
-        libGLEW${secondaryArchSuffix}_devel = $portVersion
-        "
+	glew${secondaryArchSuffix}_devel = $portVersion
+	devel:libGLEW$secondaryArchSuffix = $portVersion
+	"
 
 REQUIRES_devel="
-        libGLEW$secondaryArchSuffix == $portVersion base
-        "
+	glew$secondaryArchSuffix == $portVersion base
+	"
+
+# ----- util package --------------------------------------
+PROVIDES_util="
+	glew${secondaryArchSuffix}_util = $portVersion
+	cmd:glewinfo$secondaryArchSuffix
+	cmd:visualinfo$secondaryArchSuffix
+	"
+
+REQUIRES_util="
+	glew$secondaryArchSuffix == $portVersion base
+	haiku$secondaryArchSuffix >= $haikuVersion
+	lib:libGL$secondaryArchSuffix
+	lib:libGLEW$secondaryArchSuffix
+	lib:libstdc++$secondaryArchSuffix
+	"
diff --git a/media-libs/glew/patches/glew-1.10.0.patch b/media-libs/glew/patches/glew-1.10.0.patchset
similarity index 55%
rename from media-libs/glew/patches/glew-1.10.0.patch
rename to media-libs/glew/patches/glew-1.10.0.patchset
index 9ec82005f..54c2fa3ef 100644
--- a/media-libs/glew/patches/glew-1.10.0.patch
+++ b/media-libs/glew/patches/glew-1.10.0.patchset
@@ -1,9 +1,61 @@
-diff -Naur glew-1.10.0/config/Makefile.haiku glew-1.10.0-haiku/config/Makefile.haiku
---- glew-1.10.0/config/Makefile.haiku	1970-01-01 00:00:00.000000000 +0000
-+++ glew-1.10.0-haiku/config/Makefile.haiku	2013-10-30 22:18:49.161480704 +0000
-@@ -0,0 +1,29 @@
+From 9e62b8084f970f94b9df86f0764284b042bf822b Mon Sep 17 00:00:00 2001
+From: Kacper Kasper <kacperkasper@gmail.com>
+Date: Mon, 7 Apr 2014 16:48:59 +0200
+Subject: Haiku support
+
+
+diff --git a/Makefile b/Makefile
+index e6f08a7..24b9d22 100644
+--- a/Makefile
++++ b/Makefile
+@@ -179,12 +179,15 @@ glewmx.pc: glew.pc.in
+ 
+ # GLEW utility programs
+ 
+-BIN.LIBS = -Llib $(LDFLAGS.DYNAMIC) -l$(NAME) $(LDFLAGS.EXTRA) $(LDFLAGS.GL)
++BIN.LIBS = -Llib $(LDFLAGS.DYNAMIC) -l$(NAME) $(LDFLAGS.EXTRA) $(LDFLAGS.GL) -lbe -lstdc++
+ 
+ GLEWINFO.BIN       := glewinfo$(BIN.SUFFIX)
+ GLEWINFO.BIN.SRC   := src/glewinfo.c
++GLEWINFO.BIN.HAIKU := src/glewinfo_haiku.cpp
+ GLEWINFO.BIN.OBJ   := $(addprefix tmp/$(SYSTEM)/default/shared/,$(notdir $(GLEWINFO.BIN.SRC)))
+ GLEWINFO.BIN.OBJ   := $(GLEWINFO.BIN.OBJ:.c=.o)
++GLEWINFO.BIN.HAIKU_OBJ   := $(addprefix tmp/$(SYSTEM)/default/shared/,$(notdir $(GLEWINFO.BIN.HAIKU)))
++GLEWINFO.BIN.HAIKU_OBJ   := $(GLEWINFO.BIN.HAIKU_OBJ:.cpp=.o)
+ 
+ VISUALINFO.BIN     := visualinfo$(BIN.SUFFIX)
+ VISUALINFO.BIN.SRC := src/visualinfo.c
+@@ -202,8 +205,8 @@ endif
+ bin:
+ 	mkdir bin
+ 
+-bin/$(GLEWINFO.BIN): $(GLEWINFO.BIN.OBJ) lib/$(LIB.SHARED)
+-	$(CC) $(CFLAGS) -o $@ $(GLEWINFO.BIN.OBJ) $(BIN.LIBS)
++bin/$(GLEWINFO.BIN): $(GLEWINFO.BIN.OBJ) $(GLEWINFO.BIN.HAIKU_OBJ) lib/$(LIB.SHARED)
++	$(CC) $(CFLAGS) -o $@ $(GLEWINFO.BIN.OBJ) $(GLEWINFO.BIN.HAIKU_OBJ) $(BIN.LIBS)
+ ifneq ($(STRIP),)
+ 	$(STRIP) -x $@
+ endif
+@@ -218,6 +221,10 @@ $(GLEWINFO.BIN.OBJ): $(GLEWINFO.BIN.SRC) include/GL/glew.h include/GL/wglew.h in
+ 	@mkdir -p $(dir $@)
+ 	$(CC) -DGLEW_NO_GLU $(CFLAGS) $(CFLAGS.SO) -o $@ -c $<
+ 
++$(GLEWINFO.BIN.HAIKU_OBJ): $(GLEWINFO.BIN.HAIKU) include/GL/glew.h include/GL/wglew.h include/GL/glxew.h
++	@mkdir -p $(dir $@)
++	$(CXX) -DGLEW_NO_GLU $(CXXFLAGS) $(CXXFLAGS.SO) -o $@ -c $<
++
+ $(VISUALINFO.BIN.OBJ): $(VISUALINFO.BIN.SRC) include/GL/glew.h include/GL/wglew.h include/GL/glxew.h
+ 	@mkdir -p $(dir $@)
+ 	$(CC) -DGLEW_NO_GLU $(CFLAGS) $(CFLAGS.SO) -o $@ -c $<
+diff --git a/config/Makefile.haiku b/config/Makefile.haiku
+new file mode 100644
+index 0000000..57bf3d6
+--- /dev/null
++++ b/config/Makefile.haiku
+@@ -0,0 +1,30 @@
 +NAME = $(GLEW_NAME)
 +CC = cc
++CXX = g++
 +LD = cc
 +ifneq (undefined, $(origin GLEW_MX))
 +	CFLAGS.EXTRA = -DGLEW_MX
@@ -31,9 +83,10 @@ diff -Naur glew-1.10.0/config/Makefile.haiku glew-1.10.0-haiku/config/Makefile.h
 +LIB.STATIC.MX = lib$(NAME)mx.a
 +LDFLAGS.SO.MX = -shared -Wl,-soname=$(LIB.SONAME.MX)
 +
-diff -Naur glew-1.10.0/src/glew.c glew-1.10.0-haiku/src/glew.c
---- glew-1.10.0/src/glew.c	2013-07-22 14:11:22.008912896 +0000
-+++ glew-1.10.0-haiku/src/glew.c	2013-10-30 23:18:58.931135488 +0000
+diff --git a/src/glew.c b/src/glew.c
+index d075b52..daff07d 100644
+--- a/src/glew.c
++++ b/src/glew.c
 @@ -33,7 +33,7 @@
  
  #if defined(_WIN32)
@@ -52,7 +105,7 @@ diff -Naur glew-1.10.0/src/glew.c glew-1.10.0-haiku/src/glew.c
  #include <dlfcn.h>
  #include <stdio.h>
  #include <stdlib.h>
-@@ -162,7 +162,7 @@
+@@ -162,7 +162,7 @@ void* NSGLGetProcAddress (const GLubyte *name)
  #  define glewGetProcAddress(name) wglGetProcAddress((LPCSTR)name)
  #elif defined(__APPLE__) && !defined(GLEW_APPLE_GLX)
  #  define glewGetProcAddress(name) NSGLGetProcAddress(name)
@@ -61,7 +114,7 @@ diff -Naur glew-1.10.0/src/glew.c glew-1.10.0-haiku/src/glew.c
  #  define glewGetProcAddress(name) dlGetProcAddress(name)
  #elif defined(__ANDROID__)
  #  define glewGetProcAddress(name) NULL /* TODO */
-@@ -12324,7 +12324,7 @@
+@@ -12324,7 +12324,7 @@ GLenum GLEWAPIENTRY wglewContextInit (WGLEW_CONTEXT_ARG_DEF_LIST)
    return GLEW_OK;
  }
  
@@ -70,7 +123,7 @@ diff -Naur glew-1.10.0/src/glew.c glew-1.10.0-haiku/src/glew.c
  
  PFNGLXGETCURRENTDISPLAYPROC __glewXGetCurrentDisplay = NULL;
  
-@@ -13432,7 +13432,7 @@
+@@ -13432,7 +13432,7 @@ GLenum glxewContextInit (GLXEW_CONTEXT_ARG_DEF_LIST)
    return GLEW_OK;
  }
  
@@ -79,7 +132,7 @@ diff -Naur glew-1.10.0/src/glew.c glew-1.10.0-haiku/src/glew.c
  
  /* ------------------------------------------------------------------------ */
  
-@@ -13472,7 +13472,7 @@
+@@ -13472,7 +13472,7 @@ GLboolean glewExperimental = GL_FALSE;
  
  #if defined(_WIN32)
  extern GLenum GLEWAPIENTRY wglewContextInit (void);
@@ -88,7 +141,7 @@ diff -Naur glew-1.10.0/src/glew.c glew-1.10.0-haiku/src/glew.c
  extern GLenum GLEWAPIENTRY glxewContextInit (void);
  #endif /* _WIN32 */
  
-@@ -13483,7 +13483,7 @@
+@@ -13483,7 +13483,7 @@ GLenum GLEWAPIENTRY glewInit (void)
    if ( r != 0 ) return r;
  #if defined(_WIN32)
    return wglewContextInit();
@@ -97,7 +150,7 @@ diff -Naur glew-1.10.0/src/glew.c glew-1.10.0-haiku/src/glew.c
    return glxewContextInit();
  #else
    return r;
-@@ -17616,7 +17616,7 @@
+@@ -17616,7 +17616,7 @@ GLboolean GLEWAPIENTRY wglewIsSupported (const char* name)
    return ret;
  }
  
@@ -106,9 +159,10 @@ diff -Naur glew-1.10.0/src/glew.c glew-1.10.0-haiku/src/glew.c
  
  #if defined(GLEW_MX)
  GLboolean glxewContextIsSupported (const GLXEWContext* ctx, const char* name)
-diff -Naur glew-1.10.0/src/glewinfo.c glew-1.10.0-haiku/src/glewinfo.c
---- glew-1.10.0/src/glewinfo.c	2013-07-22 14:11:22.009699328 +0000
-+++ glew-1.10.0-haiku/src/glewinfo.c	2013-10-30 23:39:14.891551744 +0000
+diff --git a/src/glewinfo.c b/src/glewinfo.c
+index ad44f72..d65d702 100644
+--- a/src/glewinfo.c
++++ b/src/glewinfo.c
 @@ -35,7 +35,7 @@
  #include <GL/glew.h>
  #if defined(_WIN32)
@@ -118,7 +172,7 @@ diff -Naur glew-1.10.0/src/glewinfo.c glew-1.10.0-haiku/src/glewinfo.c
  #include <GL/glxew.h>
  #endif
  
-@@ -51,7 +51,7 @@
+@@ -51,7 +51,7 @@ GLEWContext _glewctx;
  #ifdef _WIN32
  WGLEWContext _wglewctx;
  #define wglewGetContext() (&_wglewctx)
@@ -127,7 +181,7 @@ diff -Naur glew-1.10.0/src/glewinfo.c glew-1.10.0-haiku/src/glewinfo.c
  GLXEWContext _glxewctx;
  #define glxewGetContext() (&_glxewctx)
  #endif
-@@ -59,7 +59,7 @@
+@@ -59,7 +59,7 @@ GLXEWContext _glxewctx;
  
  #if defined(_WIN32)
  GLboolean glewCreateContext (int* pixelformat);
@@ -136,32 +190,123 @@ diff -Naur glew-1.10.0/src/glewinfo.c glew-1.10.0-haiku/src/glewinfo.c
  GLboolean glewCreateContext (const char* display, int* visual);
  #else
  GLboolean glewCreateContext ();
-@@ -10613,6 +10613,22 @@
+@@ -10613,6 +10613,13 @@ void glewDestroyContext ()
  
  /* ------------------------------------------------------------------------ */
  
 +#elif defined(__HAIKU__)
 +
-+GLboolean glewCreateContext ()
-+{
-+	// TODO: Haiku: We need to call C++ code here :-/
-+  	return GL_FALSE;
-+}
-+
-+void glewDestroyContext ()
-+{
-+	// TODO: Haiku: We need to call C++ code here :-/
-+}
-+
++extern GLboolean glewCreateContext ();
++extern void glewDestroyContext ();
 +
 +/* ------------------------------------------------------------------------ */
 +
  #else /* __UNIX || (__APPLE__ && GLEW_APPLE_GLX) */
  
  Display* dpy = NULL;
-diff -Naur glew-1.10.0/src/visualinfo.c glew-1.10.0-haiku/src/visualinfo.c
---- glew-1.10.0/src/visualinfo.c	2013-07-22 14:11:22.007340032 +0000
-+++ glew-1.10.0-haiku/src/visualinfo.c	2013-10-30 21:54:43.389808128 +0000
+diff --git a/src/glewinfo_haiku.cpp b/src/glewinfo_haiku.cpp
+new file mode 100644
+index 0000000..3d32d00
+--- /dev/null
++++ b/src/glewinfo_haiku.cpp
+@@ -0,0 +1,93 @@
++/*
++ * glewinfo Haiku glue code
++ * Copyright 2013 Kacper Kasper <kacperkasper@gmail.com>
++ * All rights reserved. Distributed under the terms of the MIT license.
++ */
++
++#include <Application.h>
++#include <Window.h>
++#include <GLView.h>
++
++class GLEWInfoView : public BGLView {
++public:
++	GLEWInfoView(BRect frame, uint32 type);
++	virtual void AttachedToWindow(void);
++
++	void ContextInit() { LockGL(); }
++	void ContextDestroy() { UnlockGL(); }
++};
++
++GLEWInfoView::GLEWInfoView(BRect frame, uint32 type)
++	: BGLView(frame, "GLEWInfoView", B_FOLLOW_ALL_SIDES, 0, type)
++{
++}
++
++void GLEWInfoView::AttachedToWindow(void)
++{
++	LockGL();
++	BGLView::AttachedToWindow();
++	UnlockGL();
++}
++
++class GLEWInfoWindow : public BWindow {
++public:
++	GLEWInfoWindow(BRect frame, uint32 type);
++	virtual bool QuitRequested();
++
++private:
++	GLEWInfoView *view;
++};
++
++GLEWInfoWindow::GLEWInfoWindow(BRect frame, uint32 type)
++	: BWindow(frame, "GLEWInfoWindow", B_TITLED_WINDOW, B_QUIT_ON_WINDOW_CLOSE)
++{
++	AddChild(view = new GLEWInfoView(Bounds(), type));
++	view->ContextInit();
++}
++
++bool GLEWInfoWindow::QuitRequested()
++{
++	view->ContextDestroy();
++
++	view->RemoveSelf();
++
++	delete view;
++
++	return true;
++}
++
++class GLEWInfoApp : public BApplication
++{
++public:
++	GLEWInfoApp();
++	~GLEWInfoApp();
++
++private:
++	GLEWInfoWindow *window;
++};
++
++GLEWInfoApp::GLEWInfoApp()
++	: BApplication("application/x-vnd.glew-GLEWInfo")
++{
++	BRect rect = BRect(0, 0, 1, 1);
++	window = new GLEWInfoWindow(rect, BGL_RGB | BGL_DOUBLE);
++}
++
++GLEWInfoApp::~GLEWInfoApp()
++{
++	window->Quit();
++}
++
++GLEWInfoApp *app;
++
++extern "C" GLboolean glewCreateContext ()
++{
++	app = new GLEWInfoApp();
++
++  	return GL_FALSE;
++}
++
++extern "C" void glewDestroyContext ()
++{
++	delete app;
++}
+diff --git a/src/visualinfo.c b/src/visualinfo.c
+index b8bb59e..742fdd6 100644
+--- a/src/visualinfo.c
++++ b/src/visualinfo.c
 @@ -37,7 +37,7 @@
  #include <GL/wglew.h>
  #elif defined(__APPLE__) && !defined(GLEW_APPLE_GLX)
@@ -171,7 +316,7 @@ diff -Naur glew-1.10.0/src/visualinfo.c glew-1.10.0-haiku/src/visualinfo.c
  #include <GL/glxew.h>
  #endif
  
-@@ -47,7 +47,7 @@
+@@ -47,7 +47,7 @@ GLEWContext _glewctx;
  #  ifdef _WIN32
  WGLEWContext _wglewctx;
  #    define wglewGetContext() (&_wglewctx)
@@ -180,7 +325,7 @@ diff -Naur glew-1.10.0/src/visualinfo.c glew-1.10.0-haiku/src/visualinfo.c
  GLXEWContext _glxewctx;
  #    define glxewGetContext() (&_glxewctx)
  #  endif
-@@ -61,7 +61,7 @@
+@@ -61,7 +61,7 @@ typedef struct GLContextStruct
    HGLRC rc;
  #elif defined(__APPLE__) && !defined(GLEW_APPLE_GLX)
    AGLContext ctx, octx;
@@ -189,7 +334,7 @@ diff -Naur glew-1.10.0/src/visualinfo.c glew-1.10.0-haiku/src/visualinfo.c
    Display* dpy;
    XVisualInfo* vi;
    GLXContext ctx;
-@@ -129,7 +129,7 @@
+@@ -129,7 +129,7 @@ main (int argc, char** argv)
    err = glewContextInit(glewGetContext());
  #  ifdef _WIN32
    err = err || wglewContextInit(wglewGetContext());
@@ -198,7 +343,7 @@ diff -Naur glew-1.10.0/src/visualinfo.c glew-1.10.0-haiku/src/visualinfo.c
    err = err || glxewContextInit(glxewGetContext());
  #  endif
  #else
-@@ -182,6 +182,8 @@
+@@ -182,6 +182,8 @@ main (int argc, char** argv)
    }
  #elif defined(__APPLE__) && !defined(GLEW_APPLE_GLX)
    
@@ -207,7 +352,7 @@ diff -Naur glew-1.10.0/src/visualinfo.c glew-1.10.0-haiku/src/visualinfo.c
  #else
    /* GLX extensions */
    fprintf(file, "GLX extensions (GLX_): \n");
-@@ -598,6 +600,16 @@
+@@ -598,6 +600,16 @@ VisualInfo (GLContext* ctx)
  */
  }
  
@@ -224,7 +369,7 @@ diff -Naur glew-1.10.0/src/visualinfo.c glew-1.10.0-haiku/src/visualinfo.c
  #else /* GLX */
  
  void
-@@ -1074,6 +1086,31 @@
+@@ -1074,6 +1086,31 @@ void DestroyContext (GLContext* ctx)
  
  /* ------------------------------------------------------------------------ */
  
@@ -256,3 +401,6 @@ diff -Naur glew-1.10.0/src/visualinfo.c glew-1.10.0-haiku/src/visualinfo.c
  #else /* __UNIX || (__APPLE__ && GLEW_APPLE_GLX) */
  
  void InitContext (GLContext* ctx)
+-- 
+1.8.3.4
+
diff --git a/media-libs/guilib/guilib-1.2.1.recipe b/media-libs/guilib/guilib-1.2.1.recipe
index d3c519a4a..3533dac45 100644
--- a/media-libs/guilib/guilib-1.2.1.recipe
+++ b/media-libs/guilib/guilib-1.2.1.recipe
@@ -5,7 +5,7 @@ like button, scrollbar, and image.
 "
 HOMEPAGE="http://www.libsdl.org/projects/GUIlib/" 
 SRC_URI="http://www.libsdl.org/projects/GUIlib/src/GUIlib-1.2.1.tar.gz"
-CHECKSUM_MD5="a0114b925d79d6c66161e24cbeaa88b1"
+CHECKSUM_SHA256="3b383e537238048f4712395a38b9e3c65475d1dc93413e557f1b0a39c88f68df"
 LICENSE="Public Domain"
 COPYRIGHT="Public Domain"
 
diff --git a/media-libs/ilmbase/ilmbase-2.1.0.recipe b/media-libs/ilmbase/ilmbase-2.1.0.recipe
index b1d704c3f..0cfc787f9 100644
--- a/media-libs/ilmbase/ilmbase-2.1.0.recipe
+++ b/media-libs/ilmbase/ilmbase-2.1.0.recipe
@@ -11,7 +11,7 @@ HOMEPAGE="http://www.openexr.com"
 LICENSE="BSD (3-clause)"
 COPYRIGHT="2002-2011 Industrial Light & Magic"
 SRC_URI="http://download.savannah.nongnu.org/releases/openexr/ilmbase-2.1.0.tar.gz"
-CHECKSUM_MD5="8ba2f608191ad020e50277d8a3ba0850"
+CHECKSUM_SHA256="1e841ad89c5761940b07a125e6909ad22fe9fe0f99eadef45e0cca4efc6819b4"
 REVISION="1"
 
 ARCHITECTURES="x86 ?x86_64"
diff --git a/media-libs/im/im-3.8.recipe b/media-libs/im/im-3.8.recipe
index 699806d6f..c0de5b612 100644
--- a/media-libs/im/im-3.8.recipe
+++ b/media-libs/im/im-3.8.recipe
@@ -1,7 +1,7 @@
 SUMMARY="IM is a toolkit for Digital Imaging."
 HOMEPAGE="http://www.tecgraf.puc-rio.br/im/"
 SRC_URI="http://freefr.dl.sourceforge.net/project/imtoolkit/3.8.1/Docs%20and%20Sources/im-3.8.1_Sources.tar.gz"
-CHECKSUM_MD5="7cb22f5a145463fc943198faf31c76f1"
+CHECKSUM_SHA256="bf005ec22d240382dacd047ac4ed82110cfb702f8dc4ce3607059ecec60a78c8"
 REVISION="1"
 ARCHITECTURES="x86_gcc2"
 SECONDARY_ARCHITECTURES="x86"
diff --git a/media-libs/jasper/jasper-1.900.1.recipe b/media-libs/jasper/jasper-1.900.1.recipe
index 55fccc3b5..29ca2f471 100644
--- a/media-libs/jasper/jasper-1.900.1.recipe
+++ b/media-libs/jasper/jasper-1.900.1.recipe
@@ -7,8 +7,8 @@ the JasPer Software Reference Manual.
 "
 HOMEPAGE="http://www.ece.uvic.ca/~mdadams/jasper/"
 SRC_URI="http://www.ece.uvic.ca/~mdadams/jasper/software/jasper-1.900.1.zip"
+CHECKSUM_SHA256="6b905a9c2aca2e275544212666eefc4eb44d95d0a57e4305457b407fe63f9494"
 REVISION="1"
-CHECKSUM_MD5="a342b2b4495b3e1394e161eb5d85d754"
 
 LICENSE="JasPer v2"
 COPYRIGHT="1999-2007 Michael D. Adams"
diff --git a/media-libs/jbig2dec/jbig2dec-0.11.recipe b/media-libs/jbig2dec/jbig2dec-0.11.recipe
index 61ad9bbf1..df2951fee 100644
--- a/media-libs/jbig2dec/jbig2dec-0.11.recipe
+++ b/media-libs/jbig2dec/jbig2dec-0.11.recipe
@@ -8,11 +8,11 @@ ratios on the order of 100:1.
 "
 HOMEPAGE="http://jbig2dec.sourceforge.net/" 
 SRC_URI="http://sourceforge.net/projects/jbig2dec/files/jbig2dec/0.11/jbig2dec-0.11.tar.gz"
-CHECKSUM_MD5="1f61e144852c86563fee6e5ddced63f1"
+CHECKSUM_SHA256="7e2d8330b36f2765da22043d174827bee0f30db8d78c330904f363275c7dd0b9"
 LICENSE="GNU GPL v3"
 COPYRIGHT="2001-2009 Artifex Software, Inc."
 REVISION="1"
-ARCHITECTURES="x86"
+ARCHITECTURES="x86 x86_64"
 if [ $effectiveTargetArchitecture != x86_gcc2 ]; then
 	# x86_gcc2 is fine as primary target architecture as long as we're building
 	# for a different secondary architecture.
@@ -64,7 +64,7 @@ BUILD()
 	automake --add-missing
 	autoconf
 	runConfigure ./configure
-	make
+	make $jobArgs
 }
 
 INSTALL()
diff --git a/media-libs/jgmod/jgmod-0.99.recipe b/media-libs/jgmod/jgmod-0.99.recipe
index a5b1bcb32..7907ab95d 100644
--- a/media-libs/jgmod/jgmod-0.99.recipe
+++ b/media-libs/jgmod/jgmod-0.99.recipe
@@ -1,16 +1,40 @@
-DESCRIPTION="jgmod is a MOD music playing add-on library for Allegro" 
+SUMMARY="jgmod is a MOD music playing add-on library for Allegro" 
+DESCRIPTION="
+JGMOD is a mod library for MOD musics. It is built on top of Allegro lower
+level digital sound routines. Currently supports MOD, S3M, XM, Unreal
+S3M (in UMX extension), and JGM under DJGPP, Mingw32, MSVC, Linux and BEOS.
+"
+
 HOMEPAGE="http://guan.is-a-geek.com/jgmod/jgmod.html" 
 COPYRIGHT="1997-2002 Guan Foo Wah"
 LICENSE="JGMOD"
 SRC_URI="http://guan.is-a-geek.com/jgmod/jgmod.zip"
+CHECKSUM_SHA256="5d34c446904ddf2c6e3ee2272e6d4a9e6b1b4e59701237c5f4c961999623c77a"
+SRC_FILENAME="jgmod-$portVersion.zip"
 REVISION="2"
-STATUS_HAIKU="stable"
-DEPEND="media-libs/allegro >= 4.4"
-CHECKSUM_MD5="0e6e540ffadced9283251a7f86c106fe"
+ARCHITECTURES="x86_gcc2"
 
+PROVIDES="
+	jgmod = $portVersion
+	lib:libjgmod
+	"
+REQUIRES="
+	lib:liballeg >= 4.4
+	"
+
+BUILD_REQUIRES="
+	haiku_devel >= $haikuVersion
+	devel:liballeg
+	"
+BUILD_PREREQUIRES="
+	cmd:find
+	cmd:gcc
+	cmd:make
+	"
+
+SOURCE_DIR="jgmod"
 BUILD()
 {
-	cd jgmod
 	chmod 777 ./fixbe.sh
 	./fixbe.sh
 	cd src
@@ -19,16 +43,18 @@ BUILD()
 
 INSTALL()
 {
-	cd jgmod/src
-    if [ -n ${DESTDIR} ];then
-		mkdir -p ${DESTDIR}/boot/common/lib
-		mkdir -p ${DESTDIR}/boot/common/include
-		make install \
-		CPLIBDEST=${DESTDIR}/boot/common/lib \
-		CPINCDEST=${DESTDIR}/boot/common/include
-	else
-		make install \
-		CPLIBDEST=/boot/common/lib \
-		CPINCDEST=/boot/common/include
-	fi
+	cd src
+	mkdir -p $libDir $includeDir
+	make install CPLIBDEST=$libDir CPINCDEST=$includeDir
+
+	prepareInstalledDevelLib libjgmod
+	packageEntries devel $developDir
 }
+
+PROVIDES_devel="
+	devel:libjgmod
+	"
+
+REQUIRES_devel="
+	jgmod == $portVersion base
+	"
diff --git a/media-libs/jpeg/jpeg-8d.recipe b/media-libs/jpeg/jpeg-8d.recipe
index 8b4856a45..d2cbbe6f0 100644
--- a/media-libs/jpeg/jpeg-8d.recipe
+++ b/media-libs/jpeg/jpeg-8d.recipe
@@ -13,7 +13,7 @@ HOMEPAGE="http://www.ijg.org"
 LICENSE="JPEG"
 COPYRIGHT="1991-2013, Thomas G. Lane, Guido Vollbeding.  All Rights Reserved"
 SRC_URI="http://www.ijg.org/files/jpegsrc.v8d.tar.gz"
-CHECKSUM_MD5="52654eb3b2e60c35731ea8fc87f1bd29"
+CHECKSUM_SHA256="00029b1473f0f0ea72fbca3230e8cb25797fbb27e58ae2e46bb8bf5a806fe0b3"
 REVISION="2"
 ARCHITECTURES="x86_gcc2 ?x86 ?x86_64"
 SECONDARY_ARCHITECTURES="x86_gcc2 ?x86"
diff --git a/media-libs/jpeg/jpeg-9.recipe b/media-libs/jpeg/jpeg-9.recipe
index 9c7591b4f..0ee9396a2 100644
--- a/media-libs/jpeg/jpeg-9.recipe
+++ b/media-libs/jpeg/jpeg-9.recipe
@@ -13,9 +13,9 @@ HOMEPAGE="http://www.ijg.org"
 LICENSE="JPEG"
 COPYRIGHT="1991-2013, Thomas G. Lane, Guido Vollbeding.  All Rights Reserved"
 SRC_URI="http://www.ijg.org/files/jpegsrc.v9.tar.gz"
-CHECKSUM_MD5="b397211ddfd506b92cd5e02a22ac924d"
+CHECKSUM_SHA256="c4e29e9375aaf60b4b79db87a58b063fb5b84f923bee97a88280b3d159e7e535"
 REVISION="3"
-ARCHITECTURES="x86_gcc2 x86 x86_64"
+ARCHITECTURES="x86_gcc2 x86 x86_64 arm"
 SECONDARY_ARCHITECTURES="x86_gcc2 x86"
 
 PATCHES="jpeg-9.patchset"
diff --git a/media-libs/lcms/lcms-2.5.recipe b/media-libs/lcms/lcms-2.5.recipe
index a433a71bd..8e676e8bb 100644
--- a/media-libs/lcms/lcms-2.5.recipe
+++ b/media-libs/lcms/lcms-2.5.recipe
@@ -9,7 +9,7 @@ approved as an International Standard, ISO 15076-1, in 2005.
 "
 HOMEPAGE="http://littlecms.com/" 
 SRC_URI="http://downloads.sourceforge.net/project/lcms/lcms/2.5/lcms2-2.5.tar.gz"
-CHECKSUM_MD5="396d106600251441ff195fcaa277d10b"
+CHECKSUM_SHA256="6727772b44470a2111dba53b9ce4c952b87e7d1b72a31c5ebdf44ba6eb0aa72b"
 REVISION="1"
 LICENSE="MIT"
 COPYRIGHT="2007 Marti Maria"
diff --git a/media-libs/leptonica/leptonica-1.69.recipe b/media-libs/leptonica/leptonica-1.69.recipe
index 8686430c7..9e26cdd58 100644
--- a/media-libs/leptonica/leptonica-1.69.recipe
+++ b/media-libs/leptonica/leptonica-1.69.recipe
@@ -9,7 +9,7 @@ and image analysis operations. It's long list of features includes:
 "
 HOMEPAGE="http://code.google.com/p/leptonica"
 SRC_URI="http://www.leptonica.org/source/leptonica-1.69.tar.gz"
-CHECKSUM_MD5="d4085c302cbcab7f9af9d3d6f004ab22"
+CHECKSUM_SHA256="3eb7669dcda7e417f399bb3698414ea523270797dfd36c59b08ef37a3fe0a72d"
 LICENSE="BSD (2-clause)"
 COPYRIGHT="2001-2012 Dan Bloomberg"
 REVISION="1"
diff --git a/media-libs/libao/libao-1.0.0.recipe b/media-libs/libao/libao-1.0.0.recipe
index 117a0d370..f528e8b2c 100644
--- a/media-libs/libao/libao-1.0.0.recipe
+++ b/media-libs/libao/libao-1.0.0.recipe
@@ -8,7 +8,7 @@ sndio.
 "
 HOMEPAGE="http://xiph.org/ao/" 
 SRC_URI="http://downloads.xiph.org/releases/ao/libao-1.0.0.tar.gz"
-CHECKSUM_MD5="08283fbe1f587619053a156254afecec"
+CHECKSUM_SHA256="d0fe2c7e4afb8e45e8a3693fe9fde5402dbc2faecfb68a25e9c0cd711817b82a"
 
 LICENSE="GNU GPL v2"
 COPYRIGHT="1999 Aaron Holtzman
diff --git a/media-libs/libao/libao-1.1.0.recipe b/media-libs/libao/libao-1.1.0.recipe
new file mode 100644
index 000000000..ff820d0a3
--- /dev/null
+++ b/media-libs/libao/libao-1.1.0.recipe
@@ -0,0 +1,89 @@
+SUMMARY="A cross platform audio library"
+DESCRIPTION="
+Libao is a cross-platform audio library that allows programs to output audio \
+using a simple API on a wide variety of platforms. It currently supports Null \
+output, WAV files, AU files, RAW files, OSS, ALSA, aRts, PulseAudio, esd, Mac \
+OS X, Windows, AIX, Sun/NetBSD/OpenBSD, IRIX, NAS, RoarAudio and OpenBSD's \
+sndio.
+"
+HOMEPAGE="http://xiph.org/ao/"
+
+SRC_URI="http://downloads.xiph.org/releases/ao/libao-1.1.0.tar.gz"
+CHECKSUM_SHA256="29de5bb9b1726ba890455ef7e562d877df87811febb0d99ee69164b88c171bd4"
+
+LICENSE="GNU GPL v2"
+COPYRIGHT="1999 Aaron Holtzman
+	2000 Rik Hemsley
+	2000 Timothy J. Wood
+	2000-2001 Stan Seibert
+	2001 Christian Weisgerber
+	2001 Wil Mahan
+	2002 Stefan Tibus
+	2008 Alexandre Ratchov
+	2008-2010 Philipp 'ph3-der-loewe' Schafft
+	2010-2011 Monty"
+
+REVISION="1"
+
+ARCHITECTURES="x86_gcc2 x86"
+SECONDARY_ARCHITECTURES="x86_gcc2 x86"
+
+PROVIDES="
+	libao$secondaryArchSuffix = $portVersion
+	lib:libao$secondaryArchSuffix = 1.1.0 compat >= 0
+	"
+REQUIRES="
+	haiku$secondaryArchSuffix >= $haikuVersion
+	"
+BUILD_REQUIRES="
+	haiku${secondaryArchSuffix}_devel >= $haikuVersion
+	"
+BUILD_PREREQUIRES="
+	cmd:aclocal
+	cmd:autoconf
+	cmd:automake
+	cmd:gcc$secondaryArchSuffix
+	cmd:ld$secondaryArchSuffix
+	cmd:libtoolize
+	cmd:make
+	cmd:pkg_config
+	"
+
+PATCHES="libao-1.1.0.patchset"
+
+BUILD()
+{
+#	sed -i 's/$(datadir)\/aclocal/`finddir B_COMMON_DATA_DIRECTORY`\/aclocal/g' M*
+	libtoolize --force --copy --install
+	aclocal
+	autoconf
+	automake
+	runConfigure ./configure
+	make $jobArgs
+}
+
+INSTALL()
+{
+	make install
+	prepareInstalledDevelLibs libao
+	fixPkgconfig
+
+	# move include dir to correct location
+	mkdir -p $(dirname $includeDir)
+	mv $prefix/include $includeDir
+
+	# devel package
+	packageEntries devel \
+		$dataDir \
+		$developDir
+}
+
+# ----- devel package -------------------------------------------------------
+
+PROVIDES_devel="
+	libao${secondaryArchSuffix}_devel = $portVersion
+	devel:libao$secondaryArchSuffix = 1.1.0 compat >= 0
+	"
+REQUIRES_devel="
+	libao$secondaryArchSuffix == $portVersion base
+	"
diff --git a/media-libs/libao/patches/libao-1.1.0.patchset b/media-libs/libao/patches/libao-1.1.0.patchset
new file mode 100644
index 000000000..b3aef87c9
--- /dev/null
+++ b/media-libs/libao/patches/libao-1.1.0.patchset
@@ -0,0 +1,436 @@
+From e8e1c83dd8c8593921201152278fa7d9ab093ba4 Mon Sep 17 00:00:00 2001
+From: Julian Harnath <julian.harnath@rwth-aachen.de>
+Date: Mon, 24 Mar 2014 21:30:27 +0100
+Subject: Add Haiku Media Kit audio output driver.
+
+
+diff --git a/configure.ac b/configure.ac
+index b5aba33..eb60271 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -30,13 +30,15 @@ dnl Check for programs
+ dnl ====================================
+ 
+ cflags_save="$CFLAGS"
++cppflags_save="$CPPFLAGS"
+ AC_PROG_CC
++AC_PROG_CXX
+ AC_LIBTOOL_WIN32_DLL
+ AC_LIBTOOL_DLOPEN
+ AM_PROG_LIBTOOL
+ 
+ dnl ====================================
+-dnl Check dlopen 
++dnl Check dlopen
+ dnl ====================================
+ 
+ dnl Currently use this to disable plugin support dlfcn.h
+@@ -68,6 +70,7 @@ if test -z "$GCC"; then
+                 PLUGIN_LDFLAGS="-export-dynamic -avoid-version"
+                 DEBUG="-g"
+                 CFLAGS="-O"
++                CPPFLAGS="-O"
+                 PROFILE="-g -p" ;;
+         esac
+ else
+@@ -92,10 +95,12 @@ else
+                 PLUGIN_LDFLAGS="-export-dynamic -avoid-version"
+                 DEBUG="-g -Wall -D__NO_MATH_INLINES -fsigned-char"
+                 CFLAGS="-O20 -D__NO_MATH_INLINES -fsigned-char"
++                CPPFLAGS="-O20 -D__NO_MATH_INLINES -fsigned-char"
+                 PROFILE="-O20 -g -pg -D__NO_MATH_INLINES -fsigned-char" ;;
+         esac
+ fi
+ CFLAGS="$CFLAGS $cflags_save -DAO_BUILDING_LIBAO"
++CPPFLAGS="$CPPFLAGS $cppflags_save -DAO_BUILDING_LIBAO"
+ DEBUG="$DEBUG $cflags_save -DAO_BUILDING_LIBAO"
+ PROFILE="$PROFILE $cflags_save -DAO_BUILDING_LIBAO"
+ 
+@@ -111,7 +116,7 @@ case $host in
+     *-mingw*|*-cygwin*)
+ 	LIBAO_LA_LDFLAGS="-no-undefined"
+ 	;;
+-    *)	
++    *)
+ 	LIBAO_LA_LDFLAGS=""
+ 	;;
+ esac
+@@ -151,7 +156,7 @@ case $host in
+     *hpux*)
+ 	DLOPEN_FLAG='(RTLD_LAZY)'
+ 	SHARED_LIB_EXT='.sl'
+-	;;    
++	;;
+     *openbsd* | *netbsd* | *solaris2.7 | *darwin*)
+ 	DLOPEN_FLAG='(RTLD_LAZY)'
+ 	SHARED_LIB_EXT='.so'
+@@ -194,7 +199,7 @@ AC_SUBST(SIZE16)
+ AC_SUBST(SIZE32)
+ 
+ dnl ======================================
+-dnl Disable default use of SLP in roar 
++dnl Disable default use of SLP in roar
+ dnl until such time as SLP doesn't block
+ dnl indefinitely
+ dnl ======================================
+@@ -212,7 +217,7 @@ fi
+ AC_SUBST([SLP_DEF])
+ 
+ dnl ======================================
+-dnl Detect possible output devices 
++dnl Detect possible output devices
+ dnl ======================================
+ 
+ dnl Check for WMM
+@@ -309,7 +314,7 @@ if test "x$enable_broken_oss" = "xyes"; then
+    AC_DEFINE(BROKEN_OSS)
+    AC_MSG_WARN(Broken OSS API workaround enabled.  See README for details.)
+ fi
+-   
++
+ dnl Check for Sun audio
+ 
+ have_sun="no";
+@@ -424,7 +429,7 @@ if test "$BUILD_NAS" = "yes"; then
+    AC_PATH_XTRA
+    AC_CHECK_LIB(Xau, XauFileName, have_nas=yes, have_nas=no, $X_LIBS)
+    AC_CHECK_LIB(audio, AuOpenServer, dummy="no-op", have_nas=no, -lXau $X_LIBS)
+-   
++
+    ac_save_CPPFLAGS="$CPPFLAGS"
+    CPPFLAGS="$CPPFLAGS $X_CFLAGS"
+    AC_CHECK_HEADER(audio/audiolib.h, dummy="no-op", have_nas=no)
+@@ -458,6 +463,12 @@ fi
+ 
+ AM_CONDITIONAL(HAVE_PULSE,test "x$have_pulse" = xyes)
+ 
++dnl Check for Haiku audio
++
++have_haiku="no";
++AC_CHECK_HEADERS(MediaDefs.h, have_haiku=yes)
++AM_CONDITIONAL(HAVE_HAIKU,test "${have_haiku}" = yes)
++
+ dnl Orphaned driver.  We'll probably dump it soon.
+ AM_CONDITIONAL(HAVE_SOLARIS,test "x$have_solaris" = xyes)
+ 
+@@ -465,7 +476,7 @@ dnl Plugins get special LDFLAGS
+ AC_SUBST(PLUGIN_LDFLAGS)
+ 
+ 
+-AC_OUTPUT([Makefile src/Makefile doc/Makefile include/Makefile include/ao/Makefile include/ao/os_types.h src/plugins/Makefile src/plugins/esd/Makefile src/plugins/oss/Makefile src/plugins/alsa/Makefile src/plugins/sun/Makefile src/plugins/irix/Makefile src/plugins/arts/Makefile src/plugins/macosx/Makefile src/plugins/nas/Makefile src/plugins/pulse/Makefile src/plugins/sndio/Makefile src/plugins/roar/Makefile ao.pc])
++AC_OUTPUT([Makefile src/Makefile doc/Makefile include/Makefile include/ao/Makefile include/ao/os_types.h src/plugins/Makefile src/plugins/esd/Makefile src/plugins/oss/Makefile src/plugins/alsa/Makefile src/plugins/sun/Makefile src/plugins/irix/Makefile src/plugins/arts/Makefile src/plugins/macosx/Makefile src/plugins/nas/Makefile src/plugins/pulse/Makefile src/plugins/sndio/Makefile src/plugins/roar/Makefile src/plugins/haiku/Makefile ao.pc])
+ 
+ AS_AC_EXPAND(LIBDIR, ${libdir})
+ AS_AC_EXPAND(INCLUDEDIR, ${includedir})
+@@ -486,6 +497,7 @@ AC_MSG_RESULT([
+     ALSA live output: ............ ${have_alsa}
+     ARTS live output: ............ ${have_arts}
+     ESD live output: ............. ${have_esd}
++    HAIKU live output: ........... ${have_haiku}
+     IRIX live output: ............ ${have_irix}
+     MACOSX live output: .......... ${have_macosx}
+     NAS live output: ............. ${have_nas}
+diff --git a/src/plugins/Makefile.am b/src/plugins/Makefile.am
+index 1af2303..1b417d4 100644
+--- a/src/plugins/Makefile.am
++++ b/src/plugins/Makefile.am
+@@ -1,4 +1,4 @@
+ ## Process this file with automake to produce Makefile.in
+ 
+ AUTOMAKE_OPTIONS = foreign
+-SUBDIRS = oss esd arts alsa sun irix macosx nas pulse sndio roar
++SUBDIRS = oss esd arts alsa sun irix macosx nas pulse sndio roar haiku
+diff --git a/src/plugins/haiku/Makefile.am b/src/plugins/haiku/Makefile.am
+new file mode 100644
+index 0000000..596c664
+--- /dev/null
++++ b/src/plugins/haiku/Makefile.am
+@@ -0,0 +1,25 @@
++## Process this file with automake to produce Makefile.in
++
++AUTOMAKE_OPTIONS = foreign
++
++if HAVE_HAIKU
++
++haikultlibs = libhaiku.la
++haikusources = ao_haiku.cpp
++
++else
++
++haikultlibs =
++haikusources =
++
++endif
++
++INCLUDES = -I$(top_builddir)/include/ao -I$(top_srcdir)/include
++
++libdir = $(plugindir)
++lib_LTLIBRARIES = $(haikultlibs)
++
++libhaiku_la_LDFLAGS = @PLUGIN_LDFLAGS@ -lbe -lmedia
++libhaiku_la_SOURCES = $(haikusources)
++
++EXTRA_DIST = ao_haiku.cpp
+diff --git a/src/plugins/haiku/ao_haiku.cpp b/src/plugins/haiku/ao_haiku.cpp
+new file mode 100644
+index 0000000..58d9dcb
+--- /dev/null
++++ b/src/plugins/haiku/ao_haiku.cpp
+@@ -0,0 +1,254 @@
++/*
++ *  ao_haiku.cpp
++ *
++ *      Copyright (C) Julian Harnath - March 2014
++ *
++ *  This file is part of libao, a cross-platform audio output library.  See
++ *  README for a history of this source code.
++ *
++ *  libao is free software; you can redistribute it and/or modify
++ *  it under the terms of the GNU General Public License as published by
++ *  the Free Software Foundation; either version 2, or (at your option)
++ *  any later version.
++ *
++ *  libao is distributed in the hope that it will be useful,
++ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
++ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
++ *  GNU General Public License for more details.
++ *
++ *  You should have received a copy of the GNU General Public License
++ *  along with GNU Make; see the file COPYING.  If not, write to
++ *  the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.
++ *
++ ********************************************************************/
++
++#include <algorithm>
++#include <string.h>
++#include <stdio.h>
++
++#include <MediaDefs.h>
++#include <MediaRoster.h>
++#include <OS.h>
++#include <SoundPlayer.h>
++
++#include <ao/ao.h>
++#include <ao/plugin.h>
++
++
++static char* ao_haiku_options[] = {
++	"matrix"
++};
++
++
++struct ao_info ao_haiku_info = {
++	AO_TYPE_LIVE,
++	"Haiku Media Kit Output",
++	"haiku",
++	"Julian Harnath <julian.harnath@rwth-aachen.de>",
++	"Outputs to the Haiku Media Kit",
++	AO_FMT_NATIVE,
++	30,
++	ao_haiku_options,
++	sizeof(ao_haiku_options) / sizeof(*ao_haiku_options)
++};
++
++
++typedef struct ao_haiku_internal {
++	media_raw_audio_format* format;
++	BSoundPlayer* sound_player;
++
++	sem_id new_buffer;
++	sem_id buffer_done;
++
++	uint8* buffer;
++	size_t buffer_size;
++	size_t buffer_filled;
++} ao_haiku_internal;
++
++
++int
++ao_plugin_test()
++{
++	BSoundPlayer testPlayer;
++	return testPlayer.InitCheck() == B_OK ? 1 :0;
++}
++
++
++ao_info*
++ao_plugin_driver_info()
++{
++	return &ao_haiku_info;
++}
++
++
++int
++ao_plugin_device_init(ao_device* device)
++{
++	ao_haiku_internal* const internal = (ao_haiku_internal*)calloc(1,
++		sizeof(ao_haiku_internal));
++	if (internal == NULL)
++		return 0;
++
++	internal->format = (media_raw_audio_format*)malloc(
++		sizeof(media_raw_audio_format));
++	if (internal->format == NULL) {
++		free(internal);
++		return 0;
++	}
++
++	internal->new_buffer = create_sem(0, "New buffer request");
++	internal->buffer_done = create_sem(1, "Buffer done");
++
++	device->output_matrix_order = AO_OUTPUT_MATRIX_FIXED;
++	device->internal = internal;
++
++	return 1;
++}
++
++
++int
++ao_plugin_set_option(ao_device* device, const char* key, const char* value)
++{
++	return 1;
++}
++
++
++static void
++fill_buffer(void* cookie, void* buffer, size_t size,
++	const media_raw_audio_format& format)
++{
++	ao_haiku_internal* const internal = (ao_haiku_internal*)cookie;
++
++	internal->buffer = (uint8*)buffer;
++	internal->buffer_size = size;
++	internal->buffer_filled = 0;
++	release_sem(internal->new_buffer);
++	acquire_sem(internal->buffer_done);
++}
++
++
++int
++ao_plugin_open(ao_device* device, ao_sample_format* format)
++{
++	ao_haiku_internal* const internal = (ao_haiku_internal*)device->internal;
++	media_raw_audio_format* const mediaRawFormat = internal->format;
++
++	mediaRawFormat->frame_rate = format->rate;
++	mediaRawFormat->channel_count = device->output_channels;
++
++	switch (format->bits) {
++		case 8:
++			mediaRawFormat->format = media_raw_audio_format::B_AUDIO_CHAR;
++			break;
++		case 16:
++			mediaRawFormat->format = media_raw_audio_format::B_AUDIO_SHORT;
++			break;
++		case 32:
++			mediaRawFormat->format = media_raw_audio_format::B_AUDIO_INT;
++			break;
++		default:
++			aerror("Unsupported sample bit depth");
++			return 0;
++	}
++
++	device->driver_byte_format = AO_FMT_NATIVE;
++	if (B_HOST_IS_LENDIAN)
++		mediaRawFormat->byte_order = B_MEDIA_LITTLE_ENDIAN;
++	else
++		mediaRawFormat->byte_order = B_MEDIA_BIG_ENDIAN;
++
++	mediaRawFormat->buffer_size = BMediaRoster::Roster()->AudioBufferSizeFor(
++		mediaRawFormat->channel_count, mediaRawFormat->format,
++		mediaRawFormat->frame_rate, B_UNKNOWN_BUS) * 2;
++
++	internal->sound_player = new BSoundPlayer(mediaRawFormat, "ao player",
++		fill_buffer, NULL, internal);
++
++	if (internal->sound_player->InitCheck() != B_OK) {
++		delete internal->sound_player;
++		internal->sound_player = NULL;
++		return 0;
++	}
++
++	internal->sound_player->SetVolume(1.0);
++	internal->sound_player->Start();
++	internal->sound_player->SetHasData(false);
++
++	if (device->inter_matrix == NULL) {
++		if (device->output_channels <= 2)
++			device->inter_matrix = strdup("L,R");
++	}
++
++	return 1;
++}
++
++
++int
++ao_plugin_play(ao_device* device, const char* output_samples,
++	uint_32 num_bytes)
++{
++	ao_haiku_internal* const internal = (ao_haiku_internal*)device->internal;
++	BSoundPlayer* const soundPlayer = internal->sound_player;
++
++	if (num_bytes == 0) {
++		soundPlayer->SetHasData(false);
++		return 1;
++	}
++
++	soundPlayer->SetHasData(true);
++	acquire_sem(internal->new_buffer);
++
++	size_t bytesLeft = num_bytes;
++	while (bytesLeft > 0) {
++		if (internal->buffer_filled == internal->buffer_size) {
++			// Request another buffer from BSoundPlayer
++			release_sem(internal->buffer_done);
++			acquire_sem(internal->new_buffer);
++		}
++
++		const size_t copyBytes = std::min(bytesLeft, internal->buffer_size
++			- internal->buffer_filled);
++		memcpy(internal->buffer + internal->buffer_filled, output_samples,
++			copyBytes);
++		internal->buffer_filled += copyBytes;
++		output_samples += copyBytes;
++		bytesLeft -= copyBytes;
++	}
++
++	if (internal->buffer_filled < internal->buffer_size) {
++		// Continue filling this buffer the next time this function is called
++		release_sem(internal->new_buffer);
++	} else {
++		// Buffer is full
++		release_sem(internal->buffer_done);
++		soundPlayer->SetHasData(false);
++	}
++
++	return 1;
++}
++
++
++int
++ao_plugin_close(ao_device* device)
++{
++	ao_haiku_internal* const internal = (ao_haiku_internal*)device->internal;
++
++	release_sem(internal->buffer_done);
++	internal->sound_player->SetHasData(false);
++	internal->sound_player->Stop();
++	delete internal->sound_player;
++
++	return 1;
++}
++
++
++void
++ao_plugin_device_clear(ao_device* device)
++{
++	ao_haiku_internal* const internal = (ao_haiku_internal*)device->internal;
++
++	free(internal->format);
++	delete_sem(internal->new_buffer);
++	delete_sem(internal->buffer_done);
++	free(internal);
++}
+-- 
+1.8.3.4
+
diff --git a/media-libs/libart_lgpl/libart_lgpl-2.3.21.recipe b/media-libs/libart_lgpl/libart_lgpl-2.3.21.recipe
index 8c2cf2c7c..ed5b69483 100644
--- a/media-libs/libart_lgpl/libart_lgpl-2.3.21.recipe
+++ b/media-libs/libart_lgpl/libart_lgpl-2.3.21.recipe
@@ -11,7 +11,7 @@ display.
 "
 HOMEPAGE="http://www.levien.com/libart/"
 SRC_URI="http://ftp.gnome.org/pub/gnome/sources/libart_lgpl/2.3/libart_lgpl-2.3.21.tar.gz"
-CHECKSUM_MD5="722471ec8ae084af4293126d06b60880"
+CHECKSUM_SHA256="2a10b1c884bb37c7bd5c5eba59dbd0d28bf68e64a42d7f2083c836f60f8e98fa"
 REVISION="1"
 LICENSE="GNU LGPL v2.1"
 COPYRIGHT="2001-2010 Mathieu Lacage and Raph Levien"
diff --git a/media-libs/libcoverart/libcoverart-1.0.0.recipe b/media-libs/libcoverart/libcoverart-1.0.0.recipe
index 0bb5dd5bb..a8987319e 100644
--- a/media-libs/libcoverart/libcoverart-1.0.0.recipe
+++ b/media-libs/libcoverart/libcoverart-1.0.0.recipe
@@ -5,7 +5,7 @@ capabilites to their applications.
 "
 HOMEPAGE="http://musicbrainz.org/doc/libcoverart" 
 SRC_URI="https://github.com/downloads/metabrainz/libcoverart/libcoverart-1.0.0.tar.gz"
-CHECKSUM_MD5="6380056bb4bc1a69790e706b4d506f50"
+CHECKSUM_SHA256="e4cb78939003a4b5e5c4db68e42e86fbbbea5e69d3166b43ca01a7065916a121"
 LICENSE="GNU LGPL v2"
 COPYRIGHT="2012 Andrew Hawkins"
 REVISION="1"
diff --git a/media-libs/libdvdcss/libdvdcss-1.2.10.recipe b/media-libs/libdvdcss/libdvdcss-1.2.10.recipe
deleted file mode 100644
index 74e037a57..000000000
--- a/media-libs/libdvdcss/libdvdcss-1.2.10.recipe
+++ /dev/null
@@ -1,23 +0,0 @@
-DESCRIPTION="libdvdcss" 
-HOMEPAGE="http://www.videolan.org/developers/libdvdcss.html" 
-SRC_URI="http://download.videolan.org/pub/libdvdcss/1.2.10/libdvdcss-1.2.10.tar.gz"
-CHECKSUM_MD5="7b03a9571c3a85d801330c7772cd69c4"
-REVISION="1"
-STATUS_HAIKU="stable"
-DEPEND=""
-BUILD()
-{
-	cd libdvdcss-1.2.10
-	libtoolize --force --copy --install
-	aclocal
-	autoconf
-	automake
-	./configure --prefix=`finddir B_COMMON_DIRECTORY`
-	make
-}
-
-INSTALL()
-{
-	cd libdvdcss-1.2.10
-	make install
-}
diff --git a/media-libs/libdvdcss/libdvdcss-1.2.12.recipe b/media-libs/libdvdcss/libdvdcss-1.2.12.recipe
index ef479fbcd..dfc6bda65 100644
--- a/media-libs/libdvdcss/libdvdcss-1.2.12.recipe
+++ b/media-libs/libdvdcss/libdvdcss-1.2.12.recipe
@@ -7,9 +7,9 @@ HOMEPAGE="http://www.videolan.org/developers/libdvdcss.html"
 LICENSE="GNU GPL v2"
 COPYRIGHT="Copyright (C) 1998-2008 VideoLAN"
 SRC_URI="http://download.videolan.org/pub/libdvdcss/1.2.12/libdvdcss-1.2.12.tar.bz2"
-CHECKSUM_MD5="2218a193900e3203aa10dc24cdf54275"
+CHECKSUM_SHA256="72465395d494f609b180cab23f9679acf6083fb821bd84979a8e70f7b795db5d"
 REVISION="1"
-ARCHITECTURES="x86_gcc2 ?x86 ?x86_64"
+ARCHITECTURES="x86_gcc2 x86 x86_64"
 SECONDARY_ARCHITECTURES="x86_gcc2 ?x86"
 
 PATCHES="libdvdcss-${portVersion}.patch"
diff --git a/media-libs/libdvdcss/patches/libdvdcss-1.2.10.patch b/media-libs/libdvdcss/patches/libdvdcss-1.2.10.patch
deleted file mode 100644
index 9a3235803..000000000
--- a/media-libs/libdvdcss/patches/libdvdcss-1.2.10.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -urN libdvdcss-1.2.10/configure.ac libdvdcss-1.2.10-haiku/configure.ac
---- libdvdcss-1.2.10/configure.ac	2009-02-28 19:51:59.000000000 +0000
-+++ libdvdcss-1.2.10-haiku/configure.ac	2009-02-28 19:39:44.000000000 +0000
-@@ -35,7 +35,7 @@
-                  AC_DEFINE(SYS_CYGWIN, 1, Have a Cygwin system.))
-     AC_DEFINE(WIN32, 1, Using Win32.)
-     ;;
--  xbeos*)
-+  xbeos*|xhaiku*)
-     AC_DEFINE(SYS_BEOS, 1, Have a BeOS system.)
-     ;;
-   x*msvc*)
diff --git a/media-libs/libdvdnav/libdvdnav-4.1.3.recipe b/media-libs/libdvdnav/libdvdnav-4.1.3.recipe
deleted file mode 100644
index 31ec8bbc1..000000000
--- a/media-libs/libdvdnav/libdvdnav-4.1.3.recipe
+++ /dev/null
@@ -1,26 +0,0 @@
-DESCRIPTION="libdvdnav" 
-HOMEPAGE="http://www.mplayerhq.hu/design7/news.html" 
-SRC_URI="http://www.mplayerhq.hu/MPlayer/releases/dvdnav/libdvdnav-4.1.3.tar.bz2"
-CHECKSUM_MD5="d62383c45b28816771e283515f2c27fa"
-REVISION="1"
-STATUS_HAIKU="stable"
-DEPEND="media-libs/libdvdcss >= 1.20.10
-	media-libs/libdvdread >= 4.1.3"
-BUILD()
-{
-	cd libdvdnav-4.1.3
-	./autogen.sh
-	CFLAGS="-I/boot/common/include -DHAVE_DVDCSS_DVDCSS_H " \
-	./configure --prefix=`finddir B_COMMON_DIRECTORY`
-	make
-}
-
-INSTALL()
-{
-	cd libdvdnav-4.1.3
-	make install
-}
-
-LICENSE="GNU GPL v2"
-COPYRIGHT="2000 Rich Wareham
-	2001-2004 the dvdnav project"
diff --git a/media-libs/libdvdnav/libdvdnav-4.2.0.recipe b/media-libs/libdvdnav/libdvdnav-4.2.0.recipe
index 7692b7c50..86105c68c 100644
--- a/media-libs/libdvdnav/libdvdnav-4.2.0.recipe
+++ b/media-libs/libdvdnav/libdvdnav-4.2.0.recipe
@@ -8,7 +8,7 @@ LICENSE="GNU GPL v2"
 COPYRIGHT="2000 Rich Wareham
 	2001-2004 the dvdnav project"
 SRC_URI="http://dvdnav.mplayerhq.hu/releases/libdvdnav-4.2.0.tar.bz2"
-CHECKSUM_MD5="53be8903f9802e101929a3451203bbf6"
+CHECKSUM_SHA256="8c971b08276c89ddcecd26fc44204460fd250dc57346f03476d3077188c47550"
 REVISION="1"
 
 ARCHITECTURES="x86_gcc2 ?x86 ?x86_64"
diff --git a/media-libs/libdvdnav/libdvdnav-4.2.1.recipe b/media-libs/libdvdnav/libdvdnav-4.2.1.recipe
new file mode 100644
index 000000000..3b139d378
--- /dev/null
+++ b/media-libs/libdvdnav/libdvdnav-4.2.1.recipe
@@ -0,0 +1,82 @@
+SUMMARY="Easy use of sophisticated DVD navigation features"
+DESCRIPTION="
+libdvdnav allows easy use of sophisticated DVD navigation features such as \
+DVD menus, multiangle playback and even interactive DVD games.
+"
+HOMEPAGE="http://dvdnav.mplayerhq.hu/"
+LICENSE="GNU GPL v2"
+COPYRIGHT="2000 Rich Wareham
+	2001-2004 the dvdnav project"
+SRC_URI="http://dvdnav.mplayerhq.hu/releases/libdvdnav-$portVersion.tar.xz"
+CHECKSUM_SHA256="7fca272ecc3241b6de41bbbf7ac9a303ba25cb9e0c82aa23901d3104887f2372"
+REVISION="1"
+
+ARCHITECTURES="x86_gcc2 x86 x86_64"
+SECONDARY_ARCHITECTURES="x86_gcc2 ?x86"
+
+PATCHES="libdvdnav-4.2.0.patch"
+
+PROVIDES="
+	libdvdnav${secondaryArchSuffix} = $portVersion
+	lib:libdvdnav
+	cmd:dvdnav_config
+	"
+
+REQUIRES="
+	haiku${secondaryArchSuffix} >= $haikuVersion
+	libdvdread${secondaryArchSuffix}
+	libdvdcss${secondaryArchSuffix}
+	"
+
+BUILD_REQUIRES="
+	haiku${secondaryArchSuffix} >= $haikuVersion
+	"
+
+BUILD_PREREQUIRES="
+	haiku${secondaryArchSuffix}_devel >= $haikuVersion
+	libdvdread${secondaryArchSuffix}_devel
+	libdvdcss${secondaryArchSuffix}_devel
+	cmd:gcc${secondaryArchSuffix}
+	cmd:ld${secondaryArchSuffix}
+	cmd:make
+	cmd:libtoolize
+	cmd:aclocal
+	cmd:autoconf
+	cmd:pkg_config
+	"
+
+SOURCE_DIR="libdvdnav-${portVersion}"
+
+BUILD()
+{
+	./autogen.sh
+	runConfigure ./configure --enable-shared --enable-static
+	make $jobArgs
+}
+
+INSTALL()
+{
+	make install
+
+	# move headers to the correct location
+	mkdir -p $(dirname $includeDir)
+	mv $prefix/include $includeDir/
+
+	# prepare develop/lib
+	prepareInstalledDevelLibs libdvdnav libdvdnavmini
+	fixPkgconfig
+
+	packageEntries devel \
+		$developDir
+}
+
+# ----- devel package -------------------------------------------------------
+
+PROVIDES_devel="
+	libdvdnav${secondaryArchSuffix}_devel = $portVersion
+	devel:libdvdnav$secondaryArchSuffix = $portVersion
+	devel:libdvdnavmini$secondaryArchSuffix = $portVersion
+	"
+REQUIRES_devel="
+	libdvdnav$secondaryArchSuffix == $portVersion base
+	"
diff --git a/media-libs/libdvdnav/patches/libdvdnav-4.1.3.patch b/media-libs/libdvdnav/patches/libdvdnav-4.1.3.patch
deleted file mode 100644
index 8850c5401..000000000
--- a/media-libs/libdvdnav/patches/libdvdnav-4.1.3.patch
+++ /dev/null
@@ -1,33 +0,0 @@
-diff -urN libdvdnav-4.1.3/configure.ac libdvdnav-4.1.3-haiku/configure.ac
---- libdvdnav-4.1.3/configure.ac	2009-02-19 07:41:01.000000000 +0000
-+++ libdvdnav-4.1.3-haiku/configure.ac	2009-02-19 07:33:27.000000000 +0000
-@@ -145,6 +145,8 @@
-     ;;
-   *mingw32* | *cygwin*)
-     ;;
-+  *haiku*)
-+    ;; 
-   *)
-     AC_CHECK_LIB(pthread, pthread_create,
- 	[THREAD_LIBS="-lpthread"],
-@@ -165,6 +167,8 @@
-   *cygwin*)
-     LDFLAGS="-no-undefined $LDFLAGS"
-     ;;
-+  *haiku*)
-+    ;;
-   *)
-     AC_CHECK_LIB(c, dlopen,
- 	         DYNAMIC_LD_LIBS="",
-diff -urN libdvdnav-4.1.3/src/remap.c libdvdnav-4.1.3-haiku/src/remap.c
---- libdvdnav-4.1.3/src/remap.c	2009-02-19 07:41:01.000000000 +0000
-+++ libdvdnav-4.1.3-haiku/src/remap.c	2009-02-19 08:35:48.000000000 +0000
-@@ -28,7 +28,7 @@
- 
- #ifndef _MSC_VER
- #include <sys/param.h>
--#include <sys/fcntl.h>
-+#include <fcntl.h>
- #else
- #ifndef MAXPATHLEN
- #define MAXPATHLEN 255
diff --git a/media-libs/libdvdread/libdvdread-4.2.0.recipe b/media-libs/libdvdread/libdvdread-4.2.0.recipe
index 1b3bbc56a..131107030 100644
--- a/media-libs/libdvdread/libdvdread-4.2.0.recipe
+++ b/media-libs/libdvdread/libdvdread-4.2.0.recipe
@@ -11,7 +11,7 @@ COPYRIGHT="1998-1999 Eric Smith
 	2000-2002 Björn Englund
 	2000-2003 Håkan Hjort, et al."
 SRC_URI="http://dvdnav.mplayerhq.hu/releases/libdvdread-4.2.0.tar.bz2"
-CHECKSUM_MD5="ab7a19d3ab1a437ae754ef477d6231a4"
+CHECKSUM_SHA256="0bea15da842a4b04a482b009d72dcc6d9c9524ccc1bf67e5748319ec5ada8097"
 REVISION="1"
 
 ARCHITECTURES="x86_gcc2 ?x86 ?x86_64"
diff --git a/media-libs/libdvdread/libdvdread-4.2.1.recipe b/media-libs/libdvdread/libdvdread-4.2.1.recipe
new file mode 100644
index 000000000..be2de068d
--- /dev/null
+++ b/media-libs/libdvdread/libdvdread-4.2.1.recipe
@@ -0,0 +1,79 @@
+SUMMARY="A simple foundation for reading DVD video disks"
+DESCRIPTION="
+libdvdread provides a simple foundation for reading DVD video disks. It \
+provides the functionality that is required to access many DVDs. libdvdread \
+parses IFO files, reads NAV-blocks, and performs CSS authentication and \
+descrambling (if an external libdvdcss library is installed).
+"
+HOMEPAGE="http://dvdnav.mplayerhq.hu"
+LICENSE="GNU GPL v2"
+COPYRIGHT="1998-1999 Eric Smith
+	2000-2002 Björn Englund
+	2000-2003 Håkan Hjort, et al."
+SRC_URI="http://dvdnav.mplayerhq.hu/releases/libdvdread-$portVersion.tar.xz"
+CHECKSUM_SHA256="af9b98f049580a6521d56c978b736d3d609562dd12955e11d50e26d97542dcd4"
+REVISION="1"
+
+ARCHITECTURES="x86_gcc2 x86 x86_64"
+SECONDARY_ARCHITECTURES="x86_gcc2 ?x86"
+
+PATCHES="libdvdread-4.2.0.patch"
+
+PROVIDES="
+	libdvdread${secondaryArchSuffix} = $portVersion
+	lib:libdvdread
+	cmd:dvdread_config
+	"
+
+REQUIRES="
+	haiku${secondaryArchSuffix} >= $haikuVersion
+	"
+
+BUILD_REQUIRES="
+	haiku${secondaryArchSuffix} >= $haikuVersion
+	"
+
+BUILD_PREREQUIRES="
+	haiku${secondaryArchSuffix}_devel >= $haikuVersion
+	cmd:gcc${secondaryArchSuffix}
+	cmd:ld${secondaryArchSuffix}
+	cmd:make
+	cmd:libtoolize
+	cmd:aclocal
+	cmd:autoconf
+	"
+
+SOURCE_DIR="libdvdread-${portVersion}"
+
+BUILD()
+{
+	./autogen.sh
+	runConfigure ./configure --enable-shared --enable-static
+	make $jobArgs
+}
+
+INSTALL()
+{
+	make install
+
+	# move headers to the correct location
+	mkdir -p $(dirname $includeDir)
+	mv $prefix/include $includeDir/
+
+	# prepare develop/lib
+	prepareInstalledDevelLibs libdvdread
+	fixPkgconfig
+
+	packageEntries devel \
+		$developDir
+}
+
+# ----- devel package -------------------------------------------------------
+
+PROVIDES_devel="
+	libdvdread${secondaryArchSuffix}_devel = $portVersion
+	devel:libdvdread$secondaryArchSuffix = $portVersion
+	"
+REQUIRES_devel="
+	libdvdread$secondaryArchSuffix == $portVersion base
+	"
diff --git a/media-libs/libebur128/libebur128-1.0.1.recipe b/media-libs/libebur128/libebur128-1.0.1.recipe
new file mode 100644
index 000000000..cbf386d89
--- /dev/null
+++ b/media-libs/libebur128/libebur128-1.0.1.recipe
@@ -0,0 +1,73 @@
+SUMMARY="A library implementing the EBU R128 loudness standard"
+DESCRIPTION="
+libebur128 is a library that implements the EBU R 128 standard for loudness \
+normalisation.
+"
+HOMEPAGE="https://github.com/jiixyj/libebur128"
+LICENSE="MIT"
+COPYRIGHT="2011 Jan Kokemüller"
+SRC_URI="https://github.com/jiixyj/libebur128/archive/v$portVersion.tar.gz"
+SRC_FILENAME="$portVersionedName.tar.gz"
+CHECKSUM_SHA256="01aa7aed90c593944eeb3087a6f965557dc708de360bf1a589b3babb021e7336"
+REVISION="1"
+ARCHITECTURES="x86_gcc2 ?x86 ?x86_64"
+SECONDARY_ARCHITECTURES="?x86_gcc2 x86"
+
+PROVIDES="
+	libebur128$secondaryArchSuffix = $portVersion
+	lib:libebur128$secondaryArchSuffix = 1.0.1 compat >= 1
+	"
+REQUIRES="
+	haiku$secondaryArchSuffix >= $haikuVersion
+	"
+#	lib:libspeexdsp$secondaryArchSuffix
+
+BUILD_REQUIRES="
+	"
+#	devel:libspeexdsp$secondaryArchSuffix
+BUILD_PREREQUIRES="
+	haiku${secondaryArchSuffix}_devel >= $haikuVersion
+	cmd:gcc$secondaryArchSuffix
+	cmd:ld$secondaryArchSuffix
+	cmd:cmake
+	cmd:make
+	cmd:pkg_config
+	cmd:sed
+	"
+
+PATCH()
+{
+	sed -i 's,include)','"develop/headers")', ebur128/CMakeLists.txt
+}
+
+BUILD()
+{
+	rm -Rf build
+	mkdir build
+	cd build
+	cmake -DENABLE_INTERNAL_QUEUE_H=1 -DCMAKE_INSTALL_PREFIX:PATH=$prefix ..
+	make $jobArgs VERBOSE=1
+}
+
+INSTALL()
+{
+	cd build
+	make install
+
+	prepareInstalledDevelLibs libebur128
+	fixPkgconfig
+
+	# devel package
+	packageEntries devel \
+		$developDir
+}
+
+# ----- devel package -------------------------------------------------------
+
+PROVIDES_devel="
+	libebur128${secondaryArchSuffix}_devel = $portVersion
+	devel:libebur128$secondaryArchSuffix = 1.0.1 compat >= 1
+	"
+REQUIRES_devel="
+	libebur128$secondaryArchSuffix == $portVersion
+	"
diff --git a/media-libs/libid3tag/libid3tag-0.15.1b.recipe b/media-libs/libid3tag/libid3tag-0.15.1b.recipe
index 207c25f23..dba9704d1 100644
--- a/media-libs/libid3tag/libid3tag-0.15.1b.recipe
+++ b/media-libs/libid3tag/libid3tag-0.15.1b.recipe
@@ -1,32 +1,62 @@
+SUMMARY="The MAD id3tag library" 
 DESCRIPTION="The MAD id3tag library" 
 HOMEPAGE="http://www.underbit.com/products/mad/" 
-SRC_URI="ftp://ftp.mars.org/pub/mpeg/libid3tag-0.15.1b.tar.gz"
+SRC_URI="ftp://ftp.mars.org/pub/mpeg/$portName-$portVersion.tar.gz"
+CHECKSUM_SHA256="63da4f6e7997278f8a3fef4c6a372d342f705051d1eeb6a46a86b03610e26151"
 REVISION="1"
-STATUS_HAIKU="stable"
-DEPEND=""
-CHECKSUM_MD5="e5808ad997ba32c498803822078748c3"
+ARCHITECTURES="x86_gcc2"
+
+PROVIDES="
+	$portName = $portVersion
+	lib:libid3tag = 0.3.0 compat = 0
+"
+
+REQUIRES="
+	haiku >= $haikuVersion
+	lib:libz
+	"
+
+BUILD_REQUIRES="
+	haiku_devel >= $haikuVersion
+	devel:libz
+	"
+BUILD_PREREQUIRES="
+	cmd:libtoolize
+	cmd:autoconf
+	cmd:make
+	cmd:gcc
+	"
+
+PATCHES="$portName-$portVersion.patchset"
 BUILD()
 {
-	cd libid3tag-0.15.1b
 	libtoolize --force --copy --install
 	aclocal
 	autoconf
-	./configure --prefix=`finddir B_COMMON_DIRECTORY`
+	runConfigure ./configure
 	make
 }
 
 INSTALL()
 {
-	cd libid3tag-0.15.1b
 	make install
+	prepareInstalledDevelLib libid3tag
+	packageEntries devel $developDir
 }
 
 TEST()
 {
-	cd libid3tag-0.15.1b
-#	make test
-#	make check
+	make test
+	make check
 }
 
 LICENSE="GNU GPL v2"
 COPYRIGHT="2000-2004 Underbit Technologies, Inc."
+
+PROVIDES_devel="
+	devel:libid3tag
+"
+
+REQUIRES_devel="
+	$portName == $portVersion base
+"
diff --git a/media-libs/libid3tag/patches/libid3tag-0.15.1b.patchset b/media-libs/libid3tag/patches/libid3tag-0.15.1b.patchset
new file mode 100644
index 000000000..bc3650265
--- /dev/null
+++ b/media-libs/libid3tag/patches/libid3tag-0.15.1b.patchset
@@ -0,0 +1,22 @@
+From 2e29df8743bf7230cc122b0a6a255f625e8f46a7 Mon Sep 17 00:00:00 2001
+From: Adrien Destugues <pulkomandy@pulkomandy.tk>
+Date: Sun, 30 Mar 2014 13:20:55 +0200
+Subject: AM_CONFIG_HEADER > AC_CONFIG_HEADER
+
+
+diff --git a/configure.ac b/configure.ac
+index a0a0237..a754f06 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -28,7 +28,7 @@ AC_CONFIG_SRCDIR([id3tag.h])
+ 
+ AM_INIT_AUTOMAKE
+ 
+-AM_CONFIG_HEADER([config.h])
++AC_CONFIG_HEADER([config.h])
+ 
+ dnl System type.
+ 
+-- 
+1.8.3.4
+
diff --git a/media-libs/libiptcdata/libiptcdata-1.0.4.recipe b/media-libs/libiptcdata/libiptcdata-1.0.4.recipe
index 19d59fc75..579d1f6a2 100644
--- a/media-libs/libiptcdata/libiptcdata-1.0.4.recipe
+++ b/media-libs/libiptcdata/libiptcdata-1.0.4.recipe
@@ -12,7 +12,8 @@ COPYRIGHT="
 	"
 LICENSE="GNU LGPL v2.1"
 SRC_URI="http://prdownloads.sourceforge.net/libiptcdata/libiptcdata-1.0.4.tar.gz?download"
-CHECKSUM_MD5="af886556ecb129b694f2d365d03d95a8"
+CHECKSUM_SHA256="79f63b8ce71ee45cefd34efbb66e39a22101443f4060809b8fc29c5eebdcee0e"
+SRC_FILENAME="libiptcdata-1.0.4.tar.gz"
 REVISION="1"
 ARCHITECTURES="x86_gcc2 ?x86 ?x86_64"
 
diff --git a/media-libs/libmad/libmad-0.15.1b.recipe b/media-libs/libmad/libmad-0.15.1b.recipe
index 1bb2dc0aa..5f0a6533c 100644
--- a/media-libs/libmad/libmad-0.15.1b.recipe
+++ b/media-libs/libmad/libmad-0.15.1b.recipe
@@ -7,7 +7,7 @@ MP3) -- are fully implemented.
 "
 HOMEPAGE="http://mad.sourceforge.net/" 
 SRC_URI="ftp://ftp.mars.org/pub/mpeg/libmad-0.15.1b.tar.gz"
-CHECKSUM_MD5="1be543bc30c56fb6bea1d7bf6a64e66c"
+CHECKSUM_SHA256="bbfac3ed6bfbc2823d3775ebb931087371e142bb0e9bb1bee51a76a6e0078690"
 LICENSE="GNU GPL v2"
 COPYRIGHT="2000-2004 Underbit Technologies, Inc."
 REVISION="1"
diff --git a/media-libs/libmatroska/libmatroska-1.4.1.recipe b/media-libs/libmatroska/libmatroska-1.4.1.recipe
new file mode 100644
index 000000000..6a1ea69d7
--- /dev/null
+++ b/media-libs/libmatroska/libmatroska-1.4.1.recipe
@@ -0,0 +1,68 @@
+SUMMARY="libmatroska is a C++ libary to parse Matroska files."
+DESCRIPTION="libmatroska is a C++ libary to parse Matroska files."
+HOMEPAGE="http://www.matroska.org/"
+SRC_URI="http://dl.matroska.org/downloads/libmatroska/libmatroska-1.4.1.tar.bz2"
+CHECKSUM_SHA256="086f21873e925679babdabf793c3bb85c353d0cd79423543a3355e08e8a4efb7"
+
+REVISION="1"
+
+LICENSE="GNU LGPL v2.1"
+COPYRIGHT="2005-2013 CoreCodec, Inc."
+
+ARCHITECTURES="x86_gcc2 x86 ?x86_64"
+SECONDARY_ARCHITECTURES="x86_gcc2 x86"
+
+PROVIDES="
+	libmatroska$secondaryArchSuffix = $portVersion
+	lib:libmatroska$secondaryArchSuffix = 6
+	"
+REQUIRES="
+	haiku${secondaryArchSuffix} >= $haikuVersion
+	lib:libebml$secondaryArchSuffix
+	"
+BUILD_REQUIRES="
+	devel:libebml$secondaryArchSuffix
+	"
+BUILD_PREREQUIRES="
+	haiku${secondaryArchSuffix}_devel >= $haikuVersion
+	cmd:gcc$secondaryArchSuffix
+	cmd:ld$secondaryArchSuffix
+	cmd:make
+	cmd:sed
+	"
+
+PATCH()
+{
+	sed -i 's/^ifeq (BeOS/ifeq (Haiku/g' make/linux/Makefile
+	sed -i "s,/boot/home/config,$prefix,g" make/linux/Makefile
+	sed -i "s,^\(libdir\)=\(.*\)$,\1=$libDir,g" make/linux/Makefile
+	sed -i "s,^\(includedir\)=\(.*\)$,\1=$includeDir/matroska,g" \
+		make/linux/Makefile
+	sed -i 's/-Wextra//g' make/linux/Makefile
+}
+
+BUILD()
+{
+	cd make/linux
+	make $jobArgs \
+		LIBEBML_INCLUDE_DIR=`finddir B_SYSTEM_DIRECTORY`/$relativeIncludeDir \
+		LIBEBML_LIB_DIR=`finddir B_SYSTEM_DIRECTORY`/$relativeDevelopLibDir
+}
+
+INSTALL()
+{
+	cd make/linux
+	make install
+	
+	prepareInstalledDevelLibs libmatroska
+	
+	packageEntries devel $developDir
+}
+
+PROVIDES_devel="
+	libmatroska${secondaryArchSuffix}_devel = $portVersion
+	devel:libmatroska$secondaryArchSuffix = 6
+	"
+REQUIRES_devel="
+	libmatroska$secondaryArchSuffix == $portVersion base
+	"
diff --git a/media-libs/libmikmod/libmikmod-3.1.14.recipe b/media-libs/libmikmod/libmikmod-3.1.14.recipe
index 608ebdb56..c1b0eac5c 100644
--- a/media-libs/libmikmod/libmikmod-3.1.14.recipe
+++ b/media-libs/libmikmod/libmikmod-3.1.14.recipe
@@ -4,7 +4,7 @@ libmikmod is a library supporting many formats, including mod, s3m, it, and xm.
 "
 HOMEPAGE="http://mikmod.sourceforge.net" 
 SRC_URI="http://sourceforge.net/projects/mikmod/files/libmikmod/3.1.14/libmikmod-3.1.14.tar.gz"
-CHECKSUM_MD5="825af2c81348d0934b8a730427e7038b"
+CHECKSUM_SHA256="fd78b67a74c802fee9040cd1f53d629beb985933585dd7d2f3bc69b069b321cd"
 LICENSE="GNU LGPL v2.1"
 COPYRIGHT="1998-2004 Jean-Paul Mikkers, Jake Stine, Frank Loemker, Steve McIntyre, Peter Amstutz, and Miodrag Vallat."
 REVISION="1"
diff --git a/media-libs/libmikmod/libmikmod-3.3.3.recipe b/media-libs/libmikmod/libmikmod-3.3.3.recipe
index 3840f27ed..b4550673d 100644
--- a/media-libs/libmikmod/libmikmod-3.3.3.recipe
+++ b/media-libs/libmikmod/libmikmod-3.3.3.recipe
@@ -4,7 +4,7 @@ libmikmod is a library supporting many formats, including mod, s3m, it, and xm.
 "
 HOMEPAGE="http://mikmod.sourceforge.net" 
 SRC_URI="http://sourceforge.net/projects/mikmod/files/libmikmod/3.3.3/libmikmod-3.3.3.tar.gz"
-CHECKSUM_MD5="0e0f9bce8f8e598ca292b41e0ae385c8"
+CHECKSUM_SHA256="79f02478c5abd8b2af73df4cc5f9d52625aa044327c01563168e270cf79b2437"
 LICENSE="GNU LGPL v2.1"
 COPYRIGHT="1998-2004 Jean-Paul Mikkers, Jake Stine, Frank Loemker, Steve McIntyre, Peter Amstutz, and Miodrag Vallat."
 REVISION="2"
diff --git a/media-libs/libmkv/libmkv-0.6.5.1.recipe b/media-libs/libmkv/libmkv-0.6.5.1.recipe
index 463b7dd5d..4734cdedf 100644
--- a/media-libs/libmkv/libmkv-0.6.5.1.recipe
+++ b/media-libs/libmkv/libmkv-0.6.5.1.recipe
@@ -6,7 +6,8 @@ HOMEPAGE="https://github.com/saintdev/libmkv"
 COPYRIGHT="Copyright (C) 2007 libmkv"
 LICENSE="GNU GPL v2"
 SRC_URI="https://github.com/saintdev/libmkv/archive/0.6.5.1.tar.gz"
-CHECKSUM_MD5="6ae2de7789cfff34dcc0d571a90f0e82"
+CHECKSUM_SHA256="41f08a08bab354f9834fda1dcdd1dcf4a0c67ad18021eb980f808654464cef00"
+SRC_FILENAME="libmkv-0.6.5.1.tar.gz"
 REVISION="1"
 
 ARCHITECTURES="x86_gcc2 ?x86 ?x86_64"
diff --git a/media-libs/libmng/libmng-1.0.10.recipe b/media-libs/libmng/libmng-1.0.10.recipe
index 2d4f7e16b..17a189b25 100644
--- a/media-libs/libmng/libmng-1.0.10.recipe
+++ b/media-libs/libmng/libmng-1.0.10.recipe
@@ -7,7 +7,8 @@ HOMEPAGE="http://www.libmng.com"
 COPYRIGHT="2000-2007 Gerard Juyn"
 LICENSE="LIBMNG"
 SRC_URI="http://prdownloads.sourceforge.net/libmng/libmng-1.0.10.tar.gz?download"
-CHECKSUM_MD5="a464ae7d679781beebdf7440d144b7bd"
+CHECKSUM_SHA256="03a79dac9b9316d37227057614a248a946f997c4d1a3437fb569e9a63897f911"
+SRC_FILENAME="libmng-1.0.10.tar.gz"
 REVISION="1"
 
 ARCHITECTURES="?x86_gcc2 ?x86"
diff --git a/media-libs/libmodplug/libmodplug-0.8.8.4.recipe b/media-libs/libmodplug/libmodplug-0.8.8.4.recipe
index 3f41da654..7716782ae 100644
--- a/media-libs/libmodplug/libmodplug-0.8.8.4.recipe
+++ b/media-libs/libmodplug/libmodplug-0.8.8.4.recipe
@@ -26,7 +26,7 @@ Plays all types of MIDI files (*.mid):
 "
 HOMEPAGE="http://modplug-xmms.sourceforge.net" 
 SRC_URI="http://sourceforge.net/projects/modplug-xmms/files/libmodplug/0.8.8.4/libmodplug-0.8.8.4.tar.gz"
-CHECKSUM_MD5="fddc3c704c5489de2a3cf0fedfec59db"
+CHECKSUM_SHA256="5c5ee13dddbed144be26276e5f102da17ff5b1c992f3100389983082da2264f7"
 
 LICENSE="Public Domain"
 COPYRIGHT="Public Domain"
diff --git a/media-libs/libmp4v2/libmp4v2-2.0.0.recipe b/media-libs/libmp4v2/libmp4v2-2.0.0.recipe
index fb647883e..d74622119 100644
--- a/media-libs/libmp4v2/libmp4v2-2.0.0.recipe
+++ b/media-libs/libmp4v2/libmp4v2-2.0.0.recipe
@@ -6,7 +6,7 @@ HOMEPAGE="https://code.google.com/p/mp4v2/"
 LICENSE="MPL v1.1"
 COPYRIGHT="Kona Blend, Copyright (C) 2008."
 SRC_URI="https://mp4v2.googlecode.com/files/mp4v2-2.0.0.tar.bz2"
-CHECKSUM_MD5="c91f06711225b34b4c192c9114887b14"
+CHECKSUM_SHA256="0319b9a60b667cf10ee0ec7505eb7bdc0a2e21ca7a93db96ec5bd758e3428338"
 REVISION="1"
 ARCHITECTURES="!x86_gcc2 x86 ?x86_64"
 SECONDARY_ARCHITECTURES="!x86_gcc2 x86"
diff --git a/media-libs/libmpeg2/libmpeg2-0.5.1.recipe b/media-libs/libmpeg2/libmpeg2-0.5.1.recipe
index ae67dade9..4aec337ff 100644
--- a/media-libs/libmpeg2/libmpeg2-0.5.1.recipe
+++ b/media-libs/libmpeg2/libmpeg2-0.5.1.recipe
@@ -9,7 +9,7 @@ COPYRIGHT="
 	Copyright (C) 1999-2000 Aaron Holtzman <aholtzma@ess.engr.uvic.ca>
 	"
 SRC_URI="http://libmpeg2.sourceforge.net/files/libmpeg2-0.5.1.tar.gz"
-CHECKSUM_MD5="0f92c7454e58379b4a5a378485bbd8ef"
+CHECKSUM_SHA256="dee22e893cb5fc2b2b6ebd60b88478ab8556cb3b93f9a0d7ce8f3b61851871d4"
 REVISION="1"
 ARCHITECTURES="x86_gcc2 ?x86 ?x86_64"
 SECONDARY_ARCHITECTURES="x86_gcc2 ?x86"
diff --git a/media-libs/libogg/libogg-1.3.0.recipe b/media-libs/libogg/libogg-1.3.0.recipe
index 2f2eb42e1..e17286a0d 100644
--- a/media-libs/libogg/libogg-1.3.0.recipe
+++ b/media-libs/libogg/libogg-1.3.0.recipe
@@ -19,7 +19,7 @@ HOMEPAGE="http://www.xiph.org"
 LICENSE="BSD (3-clause)"
 COPYRIGHT="1994-2011 Xiph.Org Foundation"
 SRC_URI="http://downloads.xiph.org/releases/ogg/libogg-1.3.0.tar.gz"
-CHECKSUM_MD5="0a7eb40b86ac050db3a789ab65fe21c2"
+CHECKSUM_SHA256="a8de807631014615549d2356fd36641833b8288221cea214f8a72750efe93780"
 REVISION="2"
 ARCHITECTURES="x86_gcc2 x86 x86_64"
 SECONDARY_ARCHITECTURES="x86_gcc2 x86"
diff --git a/media-libs/libopus/libopus-1.1.recipe b/media-libs/libopus/libopus-1.1.recipe
index 82d6d4895..f1ff978ad 100644
--- a/media-libs/libopus/libopus-1.1.recipe
+++ b/media-libs/libopus/libopus-1.1.recipe
@@ -10,7 +10,7 @@ HOMEPAGE="http://www.opus-codec.org"
 COPYRIGHT="2001-2014 Xiph.org"
 LICENSE="BSD (3-clause)"
 SRC_URI="http://downloads.xiph.org/releases/opus/opus-1.1.tar.gz"
-CHECKSUM_MD5="c5a8cf7c0b066759542bc4ca46817ac6"
+CHECKSUM_SHA256="b9727015a58affcf3db527322bf8c4d2fcf39f5f6b8f15dbceca20206cbe1d95"
 REVISION="1"
 ARCHITECTURES="x86_gcc2 ?x86 ?x86_64"
 SECONDARY_ARCHITECTURES="x86_gcc2 ?x86 ?x86_64"
diff --git a/media-libs/libpng/libpng-1.5.12.recipe b/media-libs/libpng/libpng-1.5.12.recipe
index d5a71e263..1ad5e69c5 100644
--- a/media-libs/libpng/libpng-1.5.12.recipe
+++ b/media-libs/libpng/libpng-1.5.12.recipe
@@ -10,8 +10,8 @@ COPYRIGHT="
 	1995-1996 Guy Eric Schalnat, Group 42, Inc.
 	"
 LICENSE="LibPNG"
-SRC_URI="http://prdownloads.sourceforge.net/libpng/libpng-1.5.12.tar.gz?download"
-CHECKSUM_MD5="8ea7f60347a306c5faf70b977fa80e28"
+SRC_URI="http://prdownloads.sourceforge.net/libpng/libpng-1.5.12.tar.gz"
+CHECKSUM_SHA256="aae4c469f5f03e7c180708fc547335ad1e29854bfdda992196e9c39d2447e9f6"
 REVISION="3"
 ARCHITECTURES="x86_gcc2 x86 x86_64"
 SECONDARY_ARCHITECTURES="x86_gcc2 x86"
diff --git a/media-libs/libpng/libpng-1.6.10.recipe b/media-libs/libpng/libpng-1.6.10.recipe
new file mode 100644
index 000000000..5168fa134
--- /dev/null
+++ b/media-libs/libpng/libpng-1.6.10.recipe
@@ -0,0 +1,81 @@
+SUMMARY="Portable Network Graphics library"
+DESCRIPTION="
+libpng is the official PNG reference library. It supports almost all PNG \
+features, is extensible, and has been extensively tested for over 17 years
+"
+HOMEPAGE="http://www.libpng.org"
+COPYRIGHT="
+	1998-2013 Glenn Randers-Pehrson
+	1996-1997 Andreas Dilger
+	1995-1996 Guy Eric Schalnat, Group 42, Inc.
+	"
+LICENSE="LibPNG"
+SRC_URI="http://prdownloads.sourceforge.net/libpng/libpng-$portVersion.tar.gz"
+CHECKSUM_SHA256="b0206a22b49c91fc5521b2cfb1c251433a37aed0a645bc504ab3d061f27e4d51"
+REVISION="1"
+ARCHITECTURES="x86_gcc2 x86 x86_64 arm"
+SECONDARY_ARCHITECTURES="x86_gcc2 x86"
+
+PROVIDES="
+	libpng$secondaryArchSuffix = $portVersion compat >= 1.6
+	lib:libpng$secondaryArchSuffix = 16.10.0 compat >= 16
+	lib:libpng16$secondaryArchSuffix = 16.10.0 compat >= 16
+	"
+REQUIRES="
+	haiku$secondaryArchSuffix >= $haikuVersion
+	lib:libz$secondaryArchSuffix
+	"
+BUILD_REQUIRES="
+	haiku${secondaryArchSuffix}_devel >= $haikuVersion
+	devel:libz$secondaryArchSuffix >= 1.0.4
+	"
+BUILD_PREREQUIRES="
+	cmd:aclocal
+	cmd:autoconf
+	cmd:automake
+	cmd:gcc$secondaryArchSuffix
+	cmd:ld$secondaryArchSuffix
+	cmd:libtool >= 2.4.2
+	cmd:make
+	"
+
+BUILD()
+{
+	aclocal
+	libtoolize --force --copy --install
+	aclocal
+	autoconf
+	runConfigure ./configure
+	make $jobArgs
+}
+
+INSTALL()
+{
+	make install
+
+	prepareInstalledDevelLibs libpng libpng16
+	fixPkgconfig
+
+	# devel package
+	packageEntries devel \
+		$binDir \
+		$developDir \
+		$manDir/man3
+}
+
+# ----- devel package -------------------------------------------------------
+
+PROVIDES_devel="
+	libpng${secondaryArchSuffix}_devel = $portVersion compat >= 1.6
+	cmd:libpng_config$secondaryArchSuffix = $portVersion compat >= 1.6
+	cmd:libpng16_config$secondaryArchSuffix = $portVersion compat >= 1.6
+	cmd:pngfix$secondaryArchSuffix = $portVersion compat >= 1.6
+	cmd:png_fix_itxt$secondaryArchSuffix = $portVersion compat >= 1.6
+	devel:libpng$secondaryArchSuffix = 16.10.0 compat >= 16
+	devel:libpng16$secondaryArchSuffix = 16.10.0 compat >= 16
+	"
+REQUIRES_devel="
+	libpng$secondaryArchSuffix == $portVersion base
+	haiku$secondaryArchSuffix >= $haikuVersion
+	lib:libz$secondaryArchSuffix
+	"
diff --git a/media-libs/libpng/libpng-1.6.8.recipe b/media-libs/libpng/libpng-1.6.8.recipe
index b768b365d..f5a0d382e 100644
--- a/media-libs/libpng/libpng-1.6.8.recipe
+++ b/media-libs/libpng/libpng-1.6.8.recipe
@@ -11,7 +11,7 @@ COPYRIGHT="
 	"
 LICENSE="LibPNG"
 SRC_URI="http://prdownloads.sourceforge.net/libpng/libpng-1.6.8.tar.gz"
-CHECKSUM_MD5="29b7065906e2551508a0d7eacd19174e"
+CHECKSUM_SHA256="32c7acf1608b9c8b71b743b9780adb7a7b347563dbfb4a5263761056da44cc96"
 REVISION="1"
 ARCHITECTURES="x86_gcc2 x86 x86_64"
 SECONDARY_ARCHITECTURES="x86_gcc2 x86"
diff --git a/media-libs/libsdl/libsdl-1.2.15.recipe b/media-libs/libsdl/libsdl-1.2.15.recipe
index 5c54fa62b..34959ed5d 100644
--- a/media-libs/libsdl/libsdl-1.2.15.recipe
+++ b/media-libs/libsdl/libsdl-1.2.15.recipe
@@ -6,8 +6,8 @@ OpenGL.
 "
 HOMEPAGE="http://www.libsdl.org/" 
 SRC_URI="http://www.libsdl.org/release/SDL-1.2.15.tar.gz"
-CHECKSUM_MD5="9d96df8417572a2afb781a7c4c811a85"
-REVISION="4"
+CHECKSUM_SHA256="d6d316a793e5e348155f0dd93b979798933fb98aa1edebcc108829d6474aad00"
+REVISION="6"
 LICENSE="GNU LGPL v2.1"
 COPYRIGHT="1997-2012 Sam Lantinga"
 
@@ -25,17 +25,11 @@ REQUIRES="
 	haiku$secondaryArchSuffix >= $haikuVersion
 	lib:libGL$secondaryArchSuffix
 	lib:libglu$secondaryArchSuffix
-	lib:libpng$secondaryArchSuffix
-	lib:libjpeg$secondaryArchSuffix
-#	lib:libtiff$secondaryArchSuffix
 	"
 
 BUILD_REQUIRES="
 	devel:libGL$secondaryArchSuffix
 	devel:libglu$secondaryArchSuffix
-	devel:libpng$secondaryArchSuffix
-	devel:libjpeg$secondaryArchSuffix
-#	devel:libtiff$secondaryArchSuffix
 	"
 
 BUILD_PREREQUIRES="
diff --git a/media-libs/libsdl/patches/libsdl-1.2.15.patchset b/media-libs/libsdl/patches/libsdl-1.2.15.patchset
index fa82bad92..8d2190833 100644
--- a/media-libs/libsdl/patches/libsdl-1.2.15.patchset
+++ b/media-libs/libsdl/patches/libsdl-1.2.15.patchset
@@ -247,3 +247,143 @@ index f2b19a2..2cb94ee 100644
 -- 
 1.8.3.4
 
+From a1a8ccda9449d9f0dc61708fcc35530fbbaf7644 Mon Sep 17 00:00:00 2001
+From: Jonathan Schleifer <js@webkeks.org>
+Date: Fri, 28 Mar 2014 18:04:12 +0100
+Subject: [PATCH] Fix compilation on x86_64
+
+Also cleans up and fixes warnings.
+---
+ src/video/SDL_sysvideo.h          |  8 ++++++++
+ src/video/SDL_video.c             |  2 +-
+ src/video/bwindow/SDL_sysvideo.cc | 22 +++++++++-------------
+ src/video/bwindow/SDL_sysyuv.cc   |  3 ++-
+ 4 files changed, 20 insertions(+), 15 deletions(-)
+
+diff --git a/src/video/SDL_sysvideo.h b/src/video/SDL_sysvideo.h
+index 436450e..b45a8a9 100644
+--- a/src/video/SDL_sysvideo.h
++++ b/src/video/SDL_sysvideo.h
+@@ -24,6 +24,10 @@
+ #ifndef _SDL_sysvideo_h
+ #define _SDL_sysvideo_h
+ 
++#if defined(__BEOS__) || defined(__HAIKU__)
++#include <os/kernel/image.h>
++#endif
++
+ #include "SDL_mouse.h"
+ #define SDL_PROTOTYPES_ONLY
+ #include "SDL_syswm.h"
+@@ -296,7 +300,11 @@ struct SDL_VideoDevice {
+ 		int swap_control;
+ 		int driver_loaded;
+ 		char driver_path[256];
++#if defined(__BEOS__) || defined(__HAIKU__)
++		image_id dll_handle;
++#else
+ 		void* dll_handle;
++#endif
+ 	} gl_config;
+ 
+ 	/* * * */
+diff --git a/src/video/SDL_video.c b/src/video/SDL_video.c
+index 46285c9..255cafb 100644
+--- a/src/video/SDL_video.c
++++ b/src/video/SDL_video.c
+@@ -222,7 +222,7 @@ int SDL_VideoInit (const char *driver_name, Uint32 flags)
+ 
+ 	/* Set some very sane GL defaults */
+ 	video->gl_config.driver_loaded = 0;
+-	video->gl_config.dll_handle = NULL;
++	video->gl_config.dll_handle = 0;
+ 	video->gl_config.red_size = 3;
+ 	video->gl_config.green_size = 3;
+ 	video->gl_config.blue_size = 2;
+diff --git a/src/video/bwindow/SDL_sysvideo.cc b/src/video/bwindow/SDL_sysvideo.cc
+index a26f18b..5d4077f 100644
+--- a/src/video/bwindow/SDL_sysvideo.cc
++++ b/src/video/bwindow/SDL_sysvideo.cc
+@@ -644,17 +644,13 @@ static void BE_NormalUpdate(_THIS, int numrects, SDL_Rect *rects)
+ int BE_GL_LoadLibrary(_THIS, const char *path)
+ {
+ 	if (path == NULL) {
+-		if (_this->gl_config.dll_handle == NULL) {
++		if (_this->gl_config.dll_handle == 0) {
+ 			image_info info;
+ 			int32 cookie = 0;
+ 			while (get_next_image_info(0,&cookie,&info) == B_OK) {
+ 				void *location = NULL;
+-#ifdef __HAIKU__
+ 				if (get_image_symbol(info.id,"glBegin",B_SYMBOL_TYPE_ANY,&location) == B_OK) { // This is how it actually works in Haiku
+-#else
+-				if (get_image_symbol((image_id)cookie,"glBegin",B_SYMBOL_TYPE_ANY,&location) == B_OK) { // I don't know if that *did* work in BeOS
+-#endif
+-					_this->gl_config.dll_handle = (void*)info.id;
++					_this->gl_config.dll_handle = info.id;
+ 					_this->gl_config.driver_loaded = 1;
+ 					SDL_strlcpy(_this->gl_config.driver_path, "libGL.so", SDL_arraysize(_this->gl_config.driver_path));
+ 				}
+@@ -666,7 +662,7 @@ int BE_GL_LoadLibrary(_THIS, const char *path)
+ 			to load BGLView, which should be reloaded from new lib.
+ 			So for now just "load" linked libGL.so :(
+ 		*/
+-		if (_this->gl_config.dll_handle == NULL) {
++		if (_this->gl_config.dll_handle == 0) {
+ 			return BE_GL_LoadLibrary(_this, NULL);
+ 		}
+ 
+@@ -688,10 +684,10 @@ int BE_GL_LoadLibrary(_THIS, const char *path)
+ 		}*/
+ 	}
+ 
+-	if (_this->gl_config.dll_handle != NULL) {
++	if (_this->gl_config.dll_handle != 0) {
+ 		return 0;
+ 	} else {
+-		_this->gl_config.dll_handle = NULL;
++		_this->gl_config.dll_handle = 0;
+ 		_this->gl_config.driver_loaded = 0;
+ 		*_this->gl_config.driver_path = '\0';
+ 		return -1;
+@@ -700,10 +696,10 @@ int BE_GL_LoadLibrary(_THIS, const char *path)
+ 
+ void* BE_GL_GetProcAddress(_THIS, const char *proc)
+ {
+-	if (_this->gl_config.dll_handle != NULL) {
++	if (_this->gl_config.dll_handle != 0) {
+ 		void *location = NULL;
+ 		status_t err;
+-		if ((err = get_image_symbol((image_id)_this->gl_config.dll_handle, proc, B_SYMBOL_TYPE_ANY, &location)) == B_OK) {
++		if ((err = get_image_symbol(_this->gl_config.dll_handle, proc, B_SYMBOL_TYPE_ANY, &location)) == B_OK) {
+ 			return location;
+ 		} else {
+ 			SDL_SetError("Couldn't find OpenGL symbol");
+@@ -835,8 +831,8 @@ void BE_VideoQuit(_THIS)
+ 	}
+ 
+ #if SDL_VIDEO_OPENGL
+-	if (_this->gl_config.dll_handle != NULL)
+-		unload_add_on((image_id)_this->gl_config.dll_handle);
++	if (_this->gl_config.dll_handle != 0)
++		unload_add_on(_this->gl_config.dll_handle);
+ #endif
+ 
+ 	SDL_QuitBeApp();
+diff --git a/src/video/bwindow/SDL_sysyuv.cc b/src/video/bwindow/SDL_sysyuv.cc
+index 7c71b00..f2fef10 100644
+--- a/src/video/bwindow/SDL_sysyuv.cc
++++ b/src/video/bwindow/SDL_sysyuv.cc
+@@ -66,7 +66,8 @@ BBitmap * BE_GetOverlayBitmap(BRect bounds, color_space cs) {
+ 		uint32 aligned_height = r.source.height_alignment + 1;
+ 		if (height % aligned_height > 0) {
+ 			fprintf(stderr,"GetOverlayBitmap failed height alignment\n");
+-			fprintf(stderr,"- height = %lu, aligned_height = %lu\n",height,aligned_height);
++			fprintf(stderr,"- height = %" B_PRIu32 ", "
++				"aligned_height = %" B_PRIu32 "\n", height, aligned_height);
+ 			delete bbitmap;
+ 			return 0;
+ 		}
+-- 
+Jonathan
+
diff --git a/media-libs/libsdl2/libsdl2-2.0.0.recipe b/media-libs/libsdl2/libsdl2-2.0.0.recipe
index 717587889..e7ec94f24 100644
--- a/media-libs/libsdl2/libsdl2-2.0.0.recipe
+++ b/media-libs/libsdl2/libsdl2-2.0.0.recipe
@@ -7,7 +7,7 @@ emulators, and popular games.
 "
 HOMEPAGE="http://www.libsdl.org/"
 SRC_URI="http://www.libsdl.org/release/SDL2-2.0.0.tar.gz"
-CHECKSUM_MD5="beec89afb6edcc6f0abc4114f2e6bcf7"
+CHECKSUM_SHA256="6f6ac8153d90e06a118474d5400624ae82b3d3e080915505db27cebc52b27178"
 REVISION="1"
 LICENSE="Zlib"
 COPYRIGHT="1997-2013 Sam Lantinga"
diff --git a/media-libs/libsdl2/libsdl2-2.0.1.recipe b/media-libs/libsdl2/libsdl2-2.0.1.recipe
index 0c0c62e83..629ef9b12 100644
--- a/media-libs/libsdl2/libsdl2-2.0.1.recipe
+++ b/media-libs/libsdl2/libsdl2-2.0.1.recipe
@@ -7,7 +7,7 @@ emulators, and popular games.
 "
 HOMEPAGE="http://www.libsdl.org/"
 SRC_URI="http://www.libsdl.org/release/SDL2-2.0.1.tar.gz"
-CHECKSUM_MD5="0eb97039488bf463e775295f7b18b227"
+CHECKSUM_SHA256="0ae7e902a26777614a011fe7053ca7e8b14843db3c42ca117564d208cf6732f0"
 REVISION="3"
 LICENSE="Zlib"
 COPYRIGHT="1997-2013 Sam Lantinga"
diff --git a/media-libs/libtheora/libtheora-1.1.1.recipe b/media-libs/libtheora/libtheora-1.1.1.recipe
index d4e0ecb13..2cb0f3e1a 100644
--- a/media-libs/libtheora/libtheora-1.1.1.recipe
+++ b/media-libs/libtheora/libtheora-1.1.1.recipe
@@ -16,7 +16,7 @@ HOMEPAGE="http://www.theora.org/"
 LICENSE="BSD (3-clause)"
 COPYRIGHT="2002-2009 Xiph.Org Foundation"
 SRC_URI="http://downloads.xiph.org/releases/theora/libtheora-1.1.1.tar.bz2"
-CHECKSUM_MD5="292ab65cedd5021d6b7ddd117e07cd8e"
+CHECKSUM_SHA256="b6ae1ee2fa3d42ac489287d3ec34c5885730b1296f0801ae577a35193d3affbc"
 REVISION="2"
 ARCHITECTURES="x86_gcc2 x86 x86_64"
 SECONDARY_ARCHITECTURES="x86_gcc2 x86"
diff --git a/media-libs/libvisio/libvisio-0.0.31.recipe b/media-libs/libvisio/libvisio-0.0.31.recipe
new file mode 100644
index 000000000..cf57ff1e8
--- /dev/null
+++ b/media-libs/libvisio/libvisio-0.0.31.recipe
@@ -0,0 +1,101 @@
+SUMMARY="A library providing ability to interpret and import visio diagrams"
+DESCRIPTION="
+	Libvisio is library providing ability to interpret and import visio \
+	diagrams into various applications. You can find it being used in \
+	libreoffice.
+	"
+HOMEPAGE="http://www.freedesktop.org/wiki/Software/libvisio/"
+SRC_URI="http://dev-www.libreoffice.org/src/libvisio-0.0.31.tar.gz"
+LICENSE="
+	GNU GPL v2
+	GNU LGPL v2.1
+	MPL v1.1
+	"
+COPYRIGHT="
+	2011 Fridrich Strba
+	2011 Eilidh McAdam
+	"
+REVISION="2"
+CHECKSUM_SHA256="4805b530eb79a9817d5daa3f069ef24959f439c0c0c80f12d30f9bc67b00cf90"
+
+ARCHITECTURES="x86 ?x86_64"
+if [ $effectiveTargetArchitecture != x86_gcc2 ]; then
+	# x86_gcc2 is fine as primary target architecture as long as we're building
+	# for a different secondary architecture.
+	ARCHITECTURES="$ARCHITECTURES x86_gcc2"
+fi
+SECONDARY_ARCHITECTURES="x86"
+
+PROVIDES="
+	$portName$secondaryArchSuffix = $portVersion
+	cmd:vsd2raw$secondaryArchSuffix
+	cmd:vsd2text$secondaryArchSuffix
+	cmd:vsd2xhtml$secondaryArchSuffix
+	cmd:vss2raw$secondaryArchSuffix
+	cmd:vss2text$secondaryArchSuffix
+	cmd:vss2xhtml$secondaryArchSuffix
+	lib:libvisio_0.0$secondaryArchSuffix = $portVersion compat >= 0
+	"
+REQUIRES="
+	haiku$secondaryArchSuffix >= $haikuVersion
+	lib:libicui18n$secondaryArchSuffix
+	lib:libicuuc$secondaryArchSuffix
+	lib:libicudata$secondaryArchSuffix
+	lib:libwpd_0.9$secondaryArchSuffix
+	lib:libwpg_0.2$secondaryArchSuffix
+	lib:libxml2$secondaryArchSuffix
+	lib:libz$secondaryArchSuffix
+	"
+BUILD_REQUIRES="
+	boost_devel$secondaryArchSuffix >= 1.36
+	devel:libicui18n$secondaryArchSuffix
+	devel:libicuuc$secondaryArchSuffix
+	devel:libicudata$secondaryArchSuffix
+	devel:libwpd_0.9$secondaryArchSuffix
+	devel:libwpg_0.2$secondaryArchSuffix
+	devel:libxml2$secondaryArchSuffix
+	devel:libz$secondaryArchSuffix
+	"
+BUILD_PREREQUIRES="
+	haiku${secondaryArchSuffix}_devel >= $haikuVersion
+	pkgconfig$secondaryArchSuffix >= 0.27
+	cmd:aclocal
+	cmd:libtoolize
+	cmd:autoconf
+	cmd:automake
+	cmd:gcc$secondaryArchSuffix
+	cmd:ld$secondaryArchSuffix
+	cmd:make
+	cmd:perl
+	cmd:gperf
+	cmd:icu_config$secondaryArchSuffix
+	cmd:sed
+	"
+
+BUILD()
+{
+	libtoolize --force --copy --install
+	aclocal
+	autoconf
+	automake
+	runConfigure ./configure
+	make $jobArgs
+}
+
+INSTALL()
+{
+	make install
+
+	prepareInstalledDevelLibs libvisio-0.0
+	fixPkgconfig
+
+	packageEntries devel $developDir
+}
+
+PROVIDES_devel="
+	libvisio${secondaryArchSuffix}_devel = $portVersion
+	devel:libvisio_0.0$secondaryArchSuffix = $portVersion compat >= 0
+	"
+REQUIRES_devel="
+	$portName$secondaryArchSuffix == $portVersion base
+	"
diff --git a/media-libs/libvorbis/libvorbis-1.3.2.recipe b/media-libs/libvorbis/libvorbis-1.3.2.recipe
index 91e28d8bf..a06d8beef 100644
--- a/media-libs/libvorbis/libvorbis-1.3.2.recipe
+++ b/media-libs/libvorbis/libvorbis-1.3.2.recipe
@@ -14,7 +14,7 @@ HOMEPAGE="http://www.xiph.org/vorbis/"
 LICENSE="BSD (3-clause)"
 COPYRIGHT="1994-2010 Xiph.Org Foundation"
 SRC_URI="http://downloads.xiph.org/releases/vorbis/libvorbis-1.3.2.tar.gz"
-CHECKSUM_MD5="c870b9bd5858a0ecb5275c14486d9554"
+CHECKSUM_SHA256="eeb4dcada143846dfba760d982954a02f82e08845cbc33871f5dac547b8b6124"
 REVISION="2"
 ARCHITECTURES="x86_gcc2 x86 x86_64"
 SECONDARY_ARCHITECTURES="x86_gcc2 x86"
diff --git a/media-libs/libvorbis/libvorbis-1.3.4.recipe b/media-libs/libvorbis/libvorbis-1.3.4.recipe
new file mode 100644
index 000000000..6e2f4f144
--- /dev/null
+++ b/media-libs/libvorbis/libvorbis-1.3.4.recipe
@@ -0,0 +1,84 @@
+SUMMARY="Ogg Vorbis audio compression format library"
+DESCRIPTION="
+Ogg Vorbis is a fully open, non-proprietary, patent-and-royalty-free, \
+general-purpose compressed audio format for mid to high quality (8kHz-48.0kHz, \
+16+ bit, polyphonic) audio and music at fixed and variable bitrates from 16 to \
+128 kbps/channel. This places Vorbis in the same competitive class as audio \
+representations such as MPEG-4 (AAC), and similar to, but higher performance \
+than MPEG-1/2 audio layer 3, MPEG-4 audio (TwinVQ), WMA and PAC.
+The bitstream format for Vorbis I was frozen Monday, May 8th 2000. All \
+bitstreams encoded since will remain compatible with all future releases of \
+Vorbis.
+"
+HOMEPAGE="http://www.xiph.org/vorbis/"
+LICENSE="BSD (3-clause)"
+COPYRIGHT="1994-2010 Xiph.Org Foundation"
+SRC_URI="http://downloads.xiph.org/releases/vorbis/libvorbis-$portVersion.tar.gz"
+CHECKSUM_SHA256="eee09a0a13ec38662ff949168fe897a25d2526529bc7e805305f381c219a1ecb"
+REVISION="1"
+ARCHITECTURES="x86_gcc2 x86 x86_64"
+SECONDARY_ARCHITECTURES="x86_gcc2 x86"
+
+PATCHES="libvorbis-1.3.4.patchset"
+
+PROVIDES="
+	libvorbis$secondaryArchSuffix = $portVersion
+	lib:libvorbis$secondaryArchSuffix = 0.4.7 compat >= 0
+	lib:libvorbisenc$secondaryArchSuffix = 2.0.10 compat >= 2
+	lib:libvorbisfile$secondaryArchSuffix = 3.3.6 compat >= 3
+	"
+REQUIRES="
+	haiku$secondaryArchSuffix >= $haikuVersion
+	lib:libogg$secondaryArchSuffix
+	"
+BUILD_REQUIRES="
+	devel:libogg$secondaryArchSuffix
+	"
+BUILD_PREREQUIRES="
+	haiku${secondaryArchSuffix}_devel >= $haikuVersion
+	cmd:aclocal
+	cmd:autoconf
+	cmd:automake
+	cmd:gcc$secondaryArchSuffix
+	cmd:ld$secondaryArchSuffix
+	cmd:libtoolize
+	cmd:make
+	cmd:pkg_config
+	"
+
+BUILD()
+{
+	libtoolize -fci
+	mkdir -p m4
+	aclocal --install -I m4
+	autoconf
+	automake
+	runConfigure ./configure \
+		--docdir $developDocDir
+	make $jobArgs
+}
+
+INSTALL()
+{
+	make install
+
+	prepareInstalledDevelLibs libvorbis libvorbisenc libvorbisfile
+	fixPkgconfig
+
+	# devel package
+	packageEntries devel \
+		$dataDir \
+		$developDir
+}
+
+# ----- devel package -------------------------------------------------------
+
+PROVIDES_devel="
+	libvorbis${secondaryArchSuffix}_devel = $portVersion
+	devel:libvorbis$secondaryArchSuffix = 0.4.7 compat >= 0
+	devel:libvorbisenc$secondaryArchSuffix = 2.0.10 compat >= 2
+	devel:libvorbisfile$secondaryArchSuffix = 3.3.6 compat >= 3
+	"
+REQUIRES_devel="
+	libvorbis$secondaryArchSuffix == $portVersion
+	"
diff --git a/media-libs/libvorbis/patches/libvorbis-1.3.4.patchset b/media-libs/libvorbis/patches/libvorbis-1.3.4.patchset
new file mode 100644
index 000000000..b3f3167d7
--- /dev/null
+++ b/media-libs/libvorbis/patches/libvorbis-1.3.4.patchset
@@ -0,0 +1,83 @@
+From 70dcb91819b2acac447344c2ad6b0c5c89dfa630 Mon Sep 17 00:00:00 2001
+From: Ingo Weinhold <ingo_weinhold@gmx.de>
+Date: Tue, 11 Jun 2013 17:54:49 +0200
+Subject: applying patch libvorbis-1.3.2.patch
+
+
+diff --git a/configure.ac b/configure.ac
+index 98b78ac..4b881b6 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -206,6 +206,10 @@ else
+ 		DEBUG="-g -Wall -W -D_REENTRANT -D__NO_MATH_INLINES -fsigned-char"
+ 		CFLAGS="-O20 -Wall -W -ffast-math -D_REENTRANT -fsigned-char"
+ 		PROFILE="-pg -g -O20 -ffast-math -D_REENTRANT -fsigned-char";;
++ 	*-*-haiku*)
++		DEBUG="-g -Wall -D__NO_MATH_INLINES -fsigned-char"
++		CFLAGS="-O20 -Wall -D__NO_MATH_INLINES -fsigned-char"
++		PROFILE="-O20 -g -pg -D__NO_MATH_INLINES -fsigned-char" ;;
+  	*)
+ 		DEBUG="-g -Wall -Wextra -D__NO_MATH_INLINES -fsigned-char"
+ 		CFLAGS="-O20 -Wall -Wextra -D__NO_MATH_INLINES -fsigned-char"
+-- 
+1.7.5
+
+
+From ef7dac90d78c39bb3990d66ff932d50bc1ea98d3 Mon Sep 17 00:00:00 2001
+From: Ingo Weinhold <ingo_weinhold@gmx.de>
+Date: Tue, 11 Jun 2013 18:06:31 +0200
+Subject: doc/*/Makefile.am: remove hard-coded docdir
+
+
+diff --git a/doc/Makefile.am b/doc/Makefile.am
+index 2870528..6d7851b 100644
+--- a/doc/Makefile.am
++++ b/doc/Makefile.am
+@@ -2,8 +2,6 @@
+ 
+ SUBDIRS = libvorbis vorbisfile vorbisenc
+ 
+-docdir = $(datadir)/doc/$(PACKAGE)-$(VERSION)
+-
+ ### all of the static docs, commited to SVN and included as is
+ static_docs = \
+ 	rfc5215.xml \
+diff --git a/doc/libvorbis/Makefile.am b/doc/libvorbis/Makefile.am
+index 0bcc135..aea57e9 100644
+--- a/doc/libvorbis/Makefile.am
++++ b/doc/libvorbis/Makefile.am
+@@ -1,7 +1,5 @@
+ ## Process this file with automake to produce Makefile.in
+ 
+-docdir = $(datadir)/doc/$(PACKAGE)-$(VERSION)/libvorbis
+-
+ doc_DATA = index.html reference.html style.css vorbis_comment.html\
+   vorbis_info.html vorbis_analysis_blockout.html vorbis_analysis_buffer.html\
+   vorbis_analysis_headerout.html vorbis_analysis_init.html \
+diff --git a/doc/vorbisenc/Makefile.am b/doc/vorbisenc/Makefile.am
+index bbab3c5..008586e 100644
+--- a/doc/vorbisenc/Makefile.am
++++ b/doc/vorbisenc/Makefile.am
+@@ -1,7 +1,5 @@
+ ## Process this file with automake to produce Makefile.in
+ 
+-docdir = $(datadir)/doc/$(PACKAGE)-$(VERSION)/vorbisenc
+-
+ doc_DATA = changes.html examples.html index.html ovectl_ratemanage2_arg.html \
+ 	ovectl_ratemanage_arg.html overview.html reference.html style.css\
+ 	vorbis_encode_ctl.html vorbis_encode_init.html vorbis_encode_setup_init.html \
+diff --git a/doc/vorbisfile/Makefile.am b/doc/vorbisfile/Makefile.am
+index fb27d44..faa6352 100644
+--- a/doc/vorbisfile/Makefile.am
++++ b/doc/vorbisfile/Makefile.am
+@@ -1,7 +1,5 @@
+ ## Process this file with automake to produce Makefile.in
+ 
+-docdir = $(datadir)/doc/$(PACKAGE)-$(VERSION)/vorbisfile
+-
+ doc_DATA = OggVorbis_File.html callbacks.html chaining_example_c.html\
+ 	chainingexample.html crosslap.html datastructures.html decoding.html\
+ 	example.html exampleindex.html fileinfo.html index.html\
+-- 
+1.7.5
+
diff --git a/media-libs/libvpx/libvpx-1.0.0.recipe b/media-libs/libvpx/libvpx-1.0.0.recipe
index e0f70756b..6752a37dc 100644
--- a/media-libs/libvpx/libvpx-1.0.0.recipe
+++ b/media-libs/libvpx/libvpx-1.0.0.recipe
@@ -13,7 +13,7 @@ COPYRIGHT="2009-2012 Google Inc.,
            The Mozilla Foundation and
            The Xiph.Org Foundation"
 SRC_URI="http://webm.googlecode.com/files/libvpx-v1.0.0.tar.bz2"
-CHECKSUM_MD5="d987b5140412edd37d2c6b10c29ad484"
+CHECKSUM_SHA256="07cedb0a19a44e6d81d75f52eea864f59ef10c6c725cb860431bec6641eafe21"
 REVISION="2"
 ARCHITECTURES="x86_gcc2 x86 x86_64"
 SECONDARY_ARCHITECTURES="x86_gcc2 x86"
@@ -43,6 +43,7 @@ BUILD_PREREQUIRES="
 	haiku${secondaryArchSuffix}_devel >= $haikuVersion
 	cmd:gcc$secondaryArchSuffix
 	cmd:ld$secondaryArchSuffix
+	cmd:awk
 	cmd:make
 	cmd:perl
 	cmd:yasm
diff --git a/media-libs/libwebp/libwebp-0.3.1.recipe b/media-libs/libwebp/libwebp-0.3.1.recipe
index 0da139be5..3c4af73b3 100644
--- a/media-libs/libwebp/libwebp-0.3.1.recipe
+++ b/media-libs/libwebp/libwebp-0.3.1.recipe
@@ -4,7 +4,7 @@ A library for encoding and decoding WebP image files.
 "
 HOMEPAGE="http://code.google.com/p/webp"
 SRC_URI="http://webp.googlecode.com/files/libwebp-0.3.1.tar.gz"
-CHECKSUM_MD5="dc862bb4006d819b7587767a9e83d31f"
+CHECKSUM_SHA256="b37932c625322a69fe4e9b88884b5c7aed2b3eaf9fd5e5b480aee339a92e6ee7"
 LICENSE="BSD (3-clause)"
 COPYRIGHT="2011 Google Inc."
 REVISION="1"
diff --git a/media-libs/openal/openal-1.13.0.recipe b/media-libs/openal/openal-1.13.0.recipe
index 9d0d640c7..e615bc967 100644
--- a/media-libs/openal/openal-1.13.0.recipe
+++ b/media-libs/openal/openal-1.13.0.recipe
@@ -4,7 +4,7 @@ OpenAL - A software implementation of the OpenAL 3D audio API.
 "
 HOMEPAGE="http://kcat.strangesoft.net/openal.html" 
 SRC_URI="http://kcat.strangesoft.net/openal-releases/openal-soft-1.13.tar.bz2"
-CHECKSUM_MD5="58b7d2809790c70681b825644c5f3614"
+CHECKSUM_SHA256="dc735b8b2ab21f6ec54b4262f150a7e0527ae42aa975a1965b9342df1520443c"
 REVISION="2"
 LICENSE="GNU LGPL v2.1"
 COPYRIGHT="1999-2000 Loki Software
diff --git a/media-libs/openexr/openexr-2.1.0.recipe b/media-libs/openexr/openexr-2.1.0.recipe
index e05c89722..e410de738 100644
--- a/media-libs/openexr/openexr-2.1.0.recipe
+++ b/media-libs/openexr/openexr-2.1.0.recipe
@@ -12,7 +12,7 @@ HOMEPAGE="http://www.openexr.com"
 LICENSE="BSD (3-clause)"
 COPYRIGHT="2002-2011 Industrial Light & Magic"
 SRC_URI="http://download.savannah.nongnu.org/releases/openexr/openexr-2.1.0.tar.gz"
-CHECKSUM_MD5="33735d37d2ee01c6d8fbd0df94fb8b43"
+CHECKSUM_SHA256="54486b454073c1dcb5ae9892cf0f730ffefe62f38176325281505093fd218a14"
 REVISION="1"
 
 ARCHITECTURES="x86 ?x86_64"
diff --git a/media-libs/openjpeg/openjpeg-1.5.0.recipe b/media-libs/openjpeg/openjpeg-1.5.0.recipe
index abef1970b..410ecbbc4 100644
--- a/media-libs/openjpeg/openjpeg-1.5.0.recipe
+++ b/media-libs/openjpeg/openjpeg-1.5.0.recipe
@@ -18,9 +18,9 @@ COPYRIGHT="2002-2012, Communications and Remote Sensing Laboratory, Universite c
 	2001-2003 David Janssens"
 HOMEPAGE="http://www.openjpeg.org/" 
 SRC_URI="http://openjpeg.googlecode.com/files/openjpeg-1.5.0.tar.gz"
-CHECKSUM_MD5="e5d66193ddfa59a87da1eb08ea86293b"
+CHECKSUM_SHA256="c9908fab44432a2ed2550c457cb7e736da6d7c326f1203d23d1082d992364ace"
 REVISION="1"
-ARCHITECTURES="x86"
+ARCHITECTURES="x86 x86_64"
 if [ $effectiveTargetArchitecture != x86_gcc2 ]; then
 	# x86_gcc2 is fine as primary target architecture as long as we're building
 	# for a different secondary architecture.
diff --git a/media-libs/portaudio/portaudio-19.recipe b/media-libs/portaudio/portaudio-19.recipe
index 7075a6359..29a4c7f80 100644
--- a/media-libs/portaudio/portaudio-19.recipe
+++ b/media-libs/portaudio/portaudio-19.recipe
@@ -4,7 +4,7 @@ Port Audio is a free, cross-platform, audio I/O library.
 "
 HOMEPAGE="http://portaudio.com"
 SRC_URI="http://portaudio.com/archives/pa_stable_v19_20111121.tgz"
-CHECKSUM_MD5="25c85c1cc5e9e657486cbc299c6c035a"
+CHECKSUM_SHA256="9c26d1330d506496789edafe55b0386f20d83c4aa2c0e3f81fbeb0f114ab1b99"
 LICENSE="MIT"
 COPYRIGHT="1999-2011 Ross Bencina and Phil Burk"
 
diff --git a/media-libs/sdl2_image/sdl2_image-2.0.0.recipe b/media-libs/sdl2_image/sdl2_image-2.0.0.recipe
new file mode 100644
index 000000000..6f470243e
--- /dev/null
+++ b/media-libs/sdl2_image/sdl2_image-2.0.0.recipe
@@ -0,0 +1,89 @@
+SUMMARY="Simple Direct Media Layer Image Library"
+DESCRIPTION="
+SDL_image is an image file loading library. It loads images as SDL surfaces, \
+and supports the following formats: BMP, GIF, JPEG, LBM, PCX, PNG, PNM, TGA, \
+TIFF, WEBP, XCF, XPM, XV
+to include those shared libraries. libpng depends on libz, and libtiff depends \
+on both libz and libjpeg.
+"
+HOMEPAGE="http://www.libsdl.org/projects/SDL_image" 
+SRC_URI="https://www.libsdl.org/projects/SDL_image/release/SDL2_image-2.0.0.tar.gz"
+CHECKSUM_SHA256="b29815c73b17633baca9f07113e8ac476ae66412dec0d29a5045825c27a47234"
+REVISION="2"
+LICENSE="Zlib"
+COPYRIGHT="1997-2013 Sam Lantinga"
+
+ARCHITECTURES="x86 ?x86_gcc2"
+SECONDARY_ARCHITECTURES="x86 ?x86_gcc2"
+
+PROVIDES="
+	sdl2_image${secondaryArchSuffix} = $portVersion
+	lib:libSDL2_image${secondaryArchSuffix}
+	"
+
+REQUIRES="
+	haiku${secondaryArchSuffix} >= $haikuVersion
+	lib:libSDL2${secondaryArchSuffix}
+	lib:libGL$secondaryArchSuffix
+	lib:libjpeg$secondaryArchSuffix
+	lib:libpng$secondaryArchSuffix
+	lib:libtiff$secondaryArchSuffix
+	lib:libgif$secondaryArchSuffix
+	lib:libwebp$secondaryArchSuffix
+	lib:libGL$secondaryArchSuffix
+	lib:libz$secondaryArchSuffix
+	"
+
+BUILD_REQUIRES="
+	haiku${secondaryArchSuffix}_devel >= $haikuVersion
+	devel:libGL${secondaryArchSuffix}
+	devel:libSDL2${secondaryArchSuffix}
+    devel:libjpeg$secondaryArchSuffix
+    devel:libpng$secondaryArchSuffix
+    devel:libtiff$secondaryArchSuffix
+    devel:libgif$secondaryArchSuffix
+    devel:libwebp$secondaryArchSuffix
+    devel:libz$secondaryArchSuffix
+	"
+
+BUILD_PREREQUIRES="
+	cmd:libtoolize
+	cmd:aclocal
+	cmd:automake
+	cmd:autoconf
+	cmd:gcc$secondaryArchSuffix
+	cmd:ld$secondaryArchSuffix
+	cmd:make
+	"
+
+SOURCE_DIR="SDL2_image-$portVersion"
+
+BUILD()
+{
+	libtoolize --copy --force --install
+	aclocal --install -I acinclude
+	autoconf
+	runConfigure ./configure --with-x=no
+	make $jobArgs
+}
+
+INSTALL()
+{
+	make install
+
+	prepareInstalledDevelLibs libSDL2_image libSDL2_image-2.0
+	fixPkgconfig
+
+	packageEntries devel \
+		$developDir
+}
+
+PROVIDES_devel="
+	sdl2_image${secondaryArchSuffix}_devel = ${portVersion} compat >= 1.2
+	devel:sdl2_image$secondaryArchSuffix = ${portVersion} compat >= 1.2
+	devel:libSDL2_image$secondaryArchSuffix = 2.0_0.10.1 compat >= 2.0_0
+	"
+
+REQUIRES_devel="
+	sdl2_image$secondaryArchSuffix == $portVersion base
+	"
diff --git a/media-libs/sdl2_mixer/sdl2_mixer-2.0.0.recipe b/media-libs/sdl2_mixer/sdl2_mixer-2.0.0.recipe
index 3d4a50699..e00c741e7 100644
--- a/media-libs/sdl2_mixer/sdl2_mixer-2.0.0.recipe
+++ b/media-libs/sdl2_mixer/sdl2_mixer-2.0.0.recipe
@@ -7,7 +7,7 @@ Ogg Vorbis, and SMPEG MP3 libraries.
 "
 HOMEPAGE="http://www.libsdl.org/projects/SDL_mixer/" 
 SRC_URI="http://www.libsdl.org/projects/SDL_mixer/release/SDL2_mixer-2.0.0.tar.gz"
-CHECKSUM_MD5="65f6d80df073a1fb3bb537fbda031b50"
+CHECKSUM_SHA256="a8ce0e161793791adeff258ca6214267fdd41b3c073d2581cd5265c8646f725b"
 LICENSE="Zlib"
 COPYRIGHT="1997-2012 Sam Lantinga"
 REVISION="1"
@@ -28,7 +28,7 @@ PROVIDES="
 REQUIRES="
 	haiku$secondaryArchSuffix >= $haikuVersion
 	lib:libGL$secondaryArchSuffix # No clue, it wants it
-	lib:libSDL2$secondaryArchSuffix
+	lib:libSDL2_2.0$secondaryArchSuffix
 	lib:libogg$secondaryArchSuffix
 	lib:libflac$secondaryArchSuffix
 #	lib:libfluidsynth$secondaryArchSuffix
@@ -79,6 +79,7 @@ INSTALL()
 	make install
 
 	prepareInstalledDevelLibs libSDL2_mixer
+	prepareInstalledDevelLibs libSDL2_mixer-2.0
 	fixPkgconfig
 
 	packageEntries devel \
@@ -89,6 +90,7 @@ PROVIDES_devel="
 	sdl2_mixer${secondaryArchSuffix}_devel = $portVersion compat >= 2.0
 	devel:sdl2_mixer$secondaryArchSuffix = $portVersion compat >= 2.0
 	devel:libSDL2_mixer$secondaryArchSuffix = $portVersion compat >= 2.0
+	devel:libSDL2_mixer_2.0$secondaryArchSuffix = $portVersion compat >= 2.0
 	"
 
 REQUIRES_devel="
diff --git a/media-libs/sdl2_ttf/sdl2_ttf-2.0.12.recipe b/media-libs/sdl2_ttf/sdl2_ttf-2.0.12.recipe
index 8b29df37b..112dd0826 100644
--- a/media-libs/sdl2_ttf/sdl2_ttf-2.0.12.recipe
+++ b/media-libs/sdl2_ttf/sdl2_ttf-2.0.12.recipe
@@ -9,7 +9,7 @@ without much effort.
 "
 HOMEPAGE="http://www.libsdl.org/projects/SDL_ttf" 
 SRC_URI="http://www.libsdl.org/projects/SDL_ttf/release/SDL2_ttf-2.0.12.tar.gz"
-CHECKSUM_MD5="79787216b56cb4707f39d538f2225e00"
+CHECKSUM_SHA256="8728605443ea1cca5cad501dc34dc0cb15135d1e575551da6d151d213d356f6e"
 REVISION="2"
 LICENSE="Zlib"
 COPYRIGHT="1997-2013 Sam Lantinga"
diff --git a/media-libs/sdl_gfx/sdl_gfx-2.0.24.recipe b/media-libs/sdl_gfx/sdl_gfx-2.0.24.recipe
index 7d779a8f4..1d1b4882a 100644
--- a/media-libs/sdl_gfx/sdl_gfx-2.0.24.recipe
+++ b/media-libs/sdl_gfx/sdl_gfx-2.0.24.recipe
@@ -6,7 +6,7 @@ which implemented a interpolating rotozoomer for SDL_surfaces.
 "
 HOMEPAGE="http://www.ferzkopp.net/joomla/content/view/19/14/" 
 SRC_URI="http://www.ferzkopp.net/Software/SDL_gfx-2.0/SDL_gfx-2.0.24.tar.gz"
-CHECKSUM_MD5="838514185ff9a3b6377760aaa52fef8a"
+CHECKSUM_SHA256="30ad38c3e17586e5212ce4a43955adf26463e69a24bb241f152493da28d59118"
 LICENSE="Zlib"
 COPYRIGHT="1999-2012 A. Schiffler"
 
diff --git a/media-libs/sdl_image/sdl_image-1.2.12.recipe b/media-libs/sdl_image/sdl_image-1.2.12.recipe
index cbf07aca7..84f343fea 100644
--- a/media-libs/sdl_image/sdl_image-1.2.12.recipe
+++ b/media-libs/sdl_image/sdl_image-1.2.12.recipe
@@ -10,8 +10,8 @@ on both libz and libjpeg.
 "
 HOMEPAGE="http://www.libsdl.org/projects/SDL_image" 
 SRC_URI="http://www.libsdl.org/projects/SDL_image/release/SDL_image-1.2.12.tar.gz"
-CHECKSUM_MD5="a0f9098ebe5400f0bdc9b62e60797ecb"
-REVISION="2"
+CHECKSUM_SHA256="0b90722984561004de84847744d566809dbb9daf732a9e503b91a1b5a84e5699"
+REVISION="3"
 LICENSE="Zlib"
 COPYRIGHT="1997-2012 Sam Lantinga"
 
@@ -42,7 +42,7 @@ BUILD_REQUIRES="
 	devel:libSDL$secondaryArchSuffix
 	devel:libjpeg$secondaryArchSuffix
 	devel:libpng$secondaryArchSuffix
-#	devel:libtiff$secondaryArchSuffix
+	devel:libtiff$secondaryArchSuffix
 	devel:libgif$secondaryArchSuffix
 	devel:libwebp$secondaryArchSuffix
 	devel:libz$secondaryArchSuffix
@@ -53,10 +53,10 @@ BUILD_PREREQUIRES="
 	cmd:autoconf
 	cmd:gcc$secondaryArchSuffix
 	cmd:ld$secondaryArchSuffix
-	cmd:libtool
+	cmd:libtoolize
 	cmd:make
 	cmd:pkg_config$secondaryArchSuffix
-	cmd:sdl_config
+	cmd:sdl_config$secondaryArchSuffix
 	"
 
 SOURCE_DIR="SDL_image-1.2.12"
@@ -67,7 +67,7 @@ BUILD()
 	aclocal --install -I acinclude
 	./autogen.sh
 	runConfigure ./configure \
-		--enable-bmp --enable-lbm --enable-pcx --enable-png \
+		--enable-bmp --enable-lbm --enable-pcx --enable-png --enable-tif \
 		--enable-pnm --enable-tga --enable-xcf --enable-xpm --enable-xv \
 		--enable-gif --enable-jpg --disable-jpg-shared --enable-webp
 	make
diff --git a/media-libs/sdl_mixer/sdl_mixer-1.2.12.recipe b/media-libs/sdl_mixer/sdl_mixer-1.2.12.recipe
index 79a16be82..427515563 100644
--- a/media-libs/sdl_mixer/sdl_mixer-1.2.12.recipe
+++ b/media-libs/sdl_mixer/sdl_mixer-1.2.12.recipe
@@ -7,10 +7,10 @@ Ogg Vorbis, and SMPEG MP3 libraries.
 "
 HOMEPAGE="http://www.libsdl.org/projects/SDL_mixer/" 
 SRC_URI="http://www.libsdl.org/projects/SDL_mixer/release/SDL_mixer-1.2.12.tar.gz"
-CHECKSUM_MD5="e03ff73d77a55e3572ad0217131dc4a1"
+CHECKSUM_SHA256="1644308279a975799049e4826af2cfc787cad2abb11aa14562e402521f86992a"
 LICENSE="Zlib"
 COPYRIGHT="1997-2012 Sam Lantinga"
-REVISION="2"
+REVISION="3"
 
 ARCHITECTURES="x86_gcc2 x86 x86_64"
 SECONDARY_ARCHITECTURES="x86_gcc2 x86"
@@ -89,7 +89,6 @@ INSTALL()
 }
 
 PROVIDES_devel="
-	sdl_mixer${secondaryArchSuffix}_devel = $portVersion compat >= 1.2
 	devel:sdl_mixer$secondaryArchSuffix = 1.2.12 compat >= 1.2
 	devel:libSDL_mixer$secondaryArchSuffix = 1.2_0.12.0 compat >= 0
 	devel:libSDL_mixer_1.2$secondaryArchSuffix = 0.12.0 compat >= 0
diff --git a/media-libs/sdl_net/sdl_net-1.2.8.recipe b/media-libs/sdl_net/sdl_net-1.2.8.recipe
index 274a831ca..509996d36 100644
--- a/media-libs/sdl_net/sdl_net-1.2.8.recipe
+++ b/media-libs/sdl_net/sdl_net-1.2.8.recipe
@@ -4,12 +4,12 @@ This is a small simple cross-platform networking library for SDL.
 "
 HOMEPAGE="http://www.libsdl.org/projects/SDL_net" 
 SRC_URI="http://www.libsdl.org/projects/SDL_net/release/SDL_net-1.2.8.tar.gz"
-CHECKSUM_MD5="20e64e61d65662db66c379034f11f718"
+CHECKSUM_SHA256="5f4a7a8bb884f793c278ac3f3713be41980c5eedccecff0260411347714facb4"
 LICENSE="Zlib"
 COPYRIGHT="1997-2012 Sam Lantinga"
-REVISION="3"
-ARCHITECTURES="x86 x86_gcc2"
-SECONDARY_ARCHITECTURES="x86_gcc2 x86 x86_64"
+REVISION="4"
+ARCHITECTURES="x86 x86_gcc2 x86_64"
+SECONDARY_ARCHITECTURES="x86"
 
 PROVIDES="
 	sdl_net$secondaryArchSuffix = $portVersion
@@ -65,7 +65,7 @@ INSTALL()
 }
 
 PROVIDES_devel="
-	sdl_net${secondaryArchSuffix} = $portVersion compat >= 1.2
+	devel:sdl_net${secondaryArchSuffix} = $portVersion compat >= 1.2
 	devel:libSDL_net$secondaryArchSuffix = 1.2_0.8.0 compat >= 0
 	devel:libSDL_net_1.2$secondaryArchSuffix = 0.8.0 compat >= 0
 	"
diff --git a/media-libs/sdl_sound/sdl_sound-1.0.3.recipe b/media-libs/sdl_sound/sdl_sound-1.0.3.recipe
index c5bda8025..0b448df44 100644
--- a/media-libs/sdl_sound/sdl_sound-1.0.3.recipe
+++ b/media-libs/sdl_sound/sdl_sound-1.0.3.recipe
@@ -8,7 +8,7 @@ HOMEPAGE="http://www.icculus.org/SDL_sound"
 SRC_URI="hg+http://hg.icculus.org/icculus/SDL_sound#release-1.0.3"
 LICENSE="GNU LGPL v2.1"
 COPYRIGHT="2001-2009 Ryan C. Gordon"
-REVISION="2"
+REVISION="3"
 
 ARCHITECTURES="x86_gcc2 x86 x86_64"
 SECONDARY_ARCHITECTURES="x86_gcc2 x86"
@@ -55,10 +55,10 @@ BUILD_PREREQUIRES="
 	cmd:autoconf
 	cmd:gcc$secondaryArchSuffix
 	cmd:ld$secondaryArchSuffix
-	cmd:libtool
+	cmd:libtoolize
 	cmd:make
-	cmd:pkg_config
-	cmd:sdl_config
+	cmd:pkg_config$secondaryArchSuffix
+	cmd:sdl_config$secondaryArchSuffix
 	"
 
 SOURCE_DIR="SDL_sound-$portVersion"
diff --git a/media-libs/sdl_ttf/sdl_ttf-2.0.11.recipe b/media-libs/sdl_ttf/sdl_ttf-2.0.11.recipe
index b41253f69..da25c21da 100644
--- a/media-libs/sdl_ttf/sdl_ttf-2.0.11.recipe
+++ b/media-libs/sdl_ttf/sdl_ttf-2.0.11.recipe
@@ -9,7 +9,7 @@ without much effort.
 "
 HOMEPAGE="http://www.libsdl.org/projects/SDL_ttf/release-1.2.html" 
 SRC_URI="http://www.libsdl.org/projects/SDL_ttf/release/SDL_ttf-2.0.11.tar.gz"
-CHECKSUM_MD5="61e29bd9da8d245bc2471d1b2ce591aa"
+CHECKSUM_SHA256="724cd895ecf4da319a3ef164892b72078bd92632a5d812111261cde248ebcdb7"
 LICENSE="Zlib"
 COPYRIGHT="1997-2012 Sam Lantinga"
 
diff --git a/media-libs/sge/sge-030809.recipe b/media-libs/sge/sge-030809.recipe
index 29897775a..0a830b65c 100644
--- a/media-libs/sge/sge-030809.recipe
+++ b/media-libs/sge/sge-030809.recipe
@@ -4,7 +4,7 @@ SDL Graphics Extension
 "
 HOMEPAGE="http://www.etek.chalmers.se/~e8cal1/sge/" 
 SRC_URI="http://ports-space.haiku-files.org/source/sge-030809.tar.gz"
-CHECKSUM_MD5="a76975665b6a2bf189130fa2c8821caf"
+CHECKSUM_SHA256="25cfbe59ab99647254e69d25984707045492c2a5d1b15f27d999d0284a7110fc"
 LICENSE="GNU LGPL v2.1"
 COPYRIGHT="1999-2003 Anders Lindstrom"
 
diff --git a/media-libs/smpeg/smpeg-0.4.5.recipe b/media-libs/smpeg/smpeg-0.4.5.recipe
index 3ad3c54f6..36349d702 100644
--- a/media-libs/smpeg/smpeg-0.4.5.recipe
+++ b/media-libs/smpeg/smpeg-0.4.5.recipe
@@ -6,13 +6,14 @@ since only the MPEG-1 standard is unencumbered with software patents in the \
 United States.
 "
 HOMEPAGE="http://www.icculus.org/smpeg" 
-SRC_URI="svn://svn.icculus.org/smpeg/tags/release_0_4_5"
+SRC_URI="http://www.libsdl.org/projects/SDL_mixer/libs/old/smpeg-0.4.5.zip"
+CHECKSUM_SHA256="8d4e4a6bc1892279ae7727e192df0ad0cef5927d50090f846e0bf3ba1b8f3d41"
 LICENSE="GNU LGPL v2"
 COPYRIGHT="1999-2004 Sam Lantinga, Joe Tennies."
 REVISION="2"
 
-ARCHITECTURES="x86 x86_gcc2"
-SECONDARY_ARCHITECTURES="x86_gcc2 x86 ?x86_64"
+ARCHITECTURES="x86 x86_gcc2 x86_64"
+SECONDARY_ARCHITECTURES="x86"
 
 PROVIDES="
 	smpeg$secondaryArchSuffix = 0.4.5 compat >= 0
@@ -25,6 +26,7 @@ PROVIDES="
 	
 REQUIRES="
 	haiku$secondaryArchSuffix
+	lib:libstdc++$secondaryArchSuffix
 	lib:libglu$secondaryArchSuffix
 	lib:libSDL_1.2$secondaryArchSuffix
 	lib:libGL$secondaryArchSuffix
@@ -56,8 +58,10 @@ BUILD()
 	aclocal --install -I acinclude
 	automake --foreign --add-missing
 	autoconf
+	chmod +x configure
 
 	runConfigure ./configure
+
 	make $jobArgs
 }
 
diff --git a/media-libs/speex/speex-1.2~rc1.recipe b/media-libs/speex/speex-1.2~rc1.recipe
index ea360cc25..915f0ce63 100644
--- a/media-libs/speex/speex-1.2~rc1.recipe
+++ b/media-libs/speex/speex-1.2~rc1.recipe
@@ -19,7 +19,7 @@ COPYRIGHT="
 	1992-1994 Jutta Degener, Carsten Bormann
 	"
 SRC_URI="http://downloads.xiph.org/releases/speex/speex-1.2rc1.tar.gz"
-CHECKSUM_MD5="c4438b22c08e5811ff10e2b06ee9b9ae"
+CHECKSUM_SHA256="342f30dc57bd4a6dad41398365baaa690429660b10d866b7d508e8f1179cb7a6"
 REVISION="2"
 ARCHITECTURES="x86_gcc2 x86 x86_64"
 SECONDARY_ARCHITECTURES="x86_gcc2 x86"
diff --git a/media-libs/taglib/taglib-1.7.2.recipe b/media-libs/taglib/taglib-1.7.2.recipe
index 19335c3fb..225255902 100644
--- a/media-libs/taglib/taglib-1.7.2.recipe
+++ b/media-libs/taglib/taglib-1.7.2.recipe
@@ -7,7 +7,7 @@ TrueAudio, WAV, AIFF, MP4 and ASF files.
 "
 HOMEPAGE="http://github.com/taglib" 
 SRC_URI="http://taglib.github.io/releases/taglib-1.7.2.tar.gz" 
-CHECKSUM_MD5="b0a9e797d3833fb933c7c3176de3d720"
+CHECKSUM_SHA256="38f7e5283b594021b28426a61339cffbf2d503b450338b02f651fab1b0b42899"
 COPYRIGHT="2002-2012 Scott Wheeler"
 LICENSE="GNU LGPL v2
 	MPL v1.1
diff --git a/media-libs/taglib/taglib-1.9.1.recipe b/media-libs/taglib/taglib-1.9.1.recipe
index ea69da15d..be5d31fba 100644
--- a/media-libs/taglib/taglib-1.9.1.recipe
+++ b/media-libs/taglib/taglib-1.9.1.recipe
@@ -4,7 +4,7 @@ TagLib Audio Meta-Data Library.
 "
 HOMEPAGE="http://github.com/taglib" 
 SRC_URI="http://taglib.github.io/releases/taglib-1.9.1.tar.gz" 
-CHECKSUM_MD5="0d35df96822bbd564c5504cb3c2e4d86"
+CHECKSUM_SHA256="72d371cd1419a87ae200447a53bff2be219283071e80fd12337928cc967dc71a"
 COPYRIGHT="2002-2013 Scott Wheeler"
 LICENSE="GNU LGPL v2
 	MPL v1.1
diff --git a/media-libs/tiff/tiff-3.9.6.recipe b/media-libs/tiff/tiff-3.9.6.recipe
index 4b8cd9b5b..962371475 100644
--- a/media-libs/tiff/tiff-3.9.6.recipe
+++ b/media-libs/tiff/tiff-3.9.6.recipe
@@ -6,7 +6,7 @@ TIFF.
 "
 HOMEPAGE="http://www.libtiff.org" 
 SRC_URI="ftp://ftp.remotesensing.org/pub/libtiff/tiff-3.9.6.tar.gz"
-CHECKSUM_MD5="6920f3bf628d791d49f268b83612ed23"
+CHECKSUM_SHA256="0fba119156236074343a14afbd3a47907e3a5952c9c86102305d4eeb06ad6833"
 REVISION="1"
 LICENSE="MIT"
 COPYRIGHT="1988-1997 Sam Leffler
diff --git a/media-libs/tiff/tiff-4.0.2.recipe b/media-libs/tiff/tiff-4.0.2.recipe
index aa382b618..215787964 100644
--- a/media-libs/tiff/tiff-4.0.2.recipe
+++ b/media-libs/tiff/tiff-4.0.2.recipe
@@ -4,29 +4,33 @@ TIFF the Tag Image File Format, is a widely used format for storing image \
 data. Included in this software is a library, libtiff, for reading and writing \
 TIFF.
 "
-HOMEPAGE="http://www.libtiff.org" 
+HOMEPAGE="http://www.libtiff.org"
 SRC_URI="ftp://ftp.remotesensing.org/pub/libtiff/tiff-4.0.2.tar.gz"
-CHECKSUM_MD5="04a08fa1e07e696e820a0c3f32465a13"
+CHECKSUM_SHA256="aa29f1f5bfe3f443c3eb4dac472ebde15adc8ff0464b83376f35e3b2fef935da"
 REVISION="1"
 LICENSE="MIT"
 COPYRIGHT="1988-1997 Sam Leffler
 	1991-1997 Silicon Graphics, Inc."
 
-REVISION="1"
-ARCHITECTURES="!x86_gcc2 ?x86 ?x86_64"
-SECONDARY_ARCHITECTURES="!x86_gcc2 ?x86"
+REVISION="3"
+ARCHITECTURES="x86_gcc2 x86 ?x86_64"
+SECONDARY_ARCHITECTURES="x86_gcc2 x86"
 
 PROVIDES="
 	tiff$secondaryArchSuffix = $portVersion compat >= 4
-	lib:libtiff$secondaryArchSuffix = $portVersion compat >= 4
+	lib:libtiff$secondaryArchSuffix = 5.1.0 compat >= 5
+	lib:libtiffxx$secondaryArchSuffix = 5.1.0 compat >= 5
 	"
 REQUIRES="
 	haiku$secondaryArchSuffix >= $haikuVersion
-	lib:libGL
-	lib:libjpeg
-	lib:libz
+	lib:libGL$secondaryArchSuffix
+	lib:libjpeg$secondaryArchSuffix
+	lib:libz$secondaryArchSuffix
 	"
 BUILD_REQUIRES="
+	devel:libGL$secondaryArchSuffix
+	devel:libjpeg$secondaryArchSuffix
+	devel:libz$secondaryArchSuffix
 	"
 BUILD_PREREQUIRES="
 	haiku${secondaryArchSuffix}_devel >= $haikuVersion
@@ -39,6 +43,14 @@ BUILD_PREREQUIRES="
 	cmd:make
 	"
 
+PATCH()
+{
+	if [ $effectiveTargetArchitecture == x86_gcc2 ]; then
+		sed -i 's/ios::pos_type/streampos/g' libtiff/tif_stream.cxx
+		sed -i 's/ios::off_type/streamoff/g' libtiff/tif_stream.cxx
+	fi
+}
+
 BUILD()
 {
 	aclocal
@@ -46,7 +58,7 @@ BUILD()
 	automake --add-missing
 	autoconf
 	autoheader
-	runConfigure ./configure
+	runConfigure ./configure --with-docdir=$documentationDir/$portName
 #		--enable-shared
 	make $jobArgs
 }
@@ -55,7 +67,8 @@ INSTALL()
 {
 	make install
 
-	prepareInstalledDevelLibs libtiff
+	prepareInstalledDevelLibs libtiff libtiffxx
+	fixPkgconfig
 
 	# devel package
 	packageEntries devel \
@@ -79,7 +92,8 @@ INSTALL()
 
 PROVIDES_devel="
 	tiff${secondaryArchSuffix}_devel = $portVersion compat >= 4
-	devel:libtiff$secondaryArchSuffix = $portVersion compat >= 4
+	devel:libtiff$secondaryArchSuffix = 5.1.0 compat >= 5
+	devel:libtiffxx$secondaryArchSuffix = 5.1.0 compat >= 5
 	"
 REQUIRES_devel="
 	tiff$secondaryArchSuffix == $portVersion base
@@ -90,33 +104,35 @@ REQUIRES_devel="
 if [ -z "$secondaryArchSuffix" ]; then
 	SUMMARY_tools="The TIFF tools"
 	PROVIDES_tools="
-		tiff_tools = $portVersion compat >= 4
-		cmd:bmp2tiff = $portVersion compat >= 4
-		cmd:fax2ps = $portVersion compat >= 4
-		cmd:fax2tiff = $portVersion compat >= 4
-		cmd:gif2tiff = $portVersion compat >= 4
-		cmd:pal2rgb = $portVersion compat >= 4
-		cmd:ppm2tiff = $portVersion compat >= 4
-		cmd:ras2tiff = $portVersion compat >= 4
-		cmd:raw2tiff = $portVersion compat >= 4
-		cmd:rgb2ycbcr = $portVersion compat >= 4
-		cmd:thumbnail = $portVersion compat >= 4
-		cmd:tiff2bw = $portVersion compat >= 4
-		cmd:tiff2pdf = $portVersion compat >= 4
-		cmd:tiff2ps = $portVersion compat >= 4
-		cmd:tiff2rgba = $portVersion compat >= 4
-		cmd:tiffcmp = $portVersion compat >= 4
-		cmd:tiffcp = $portVersion compat >= 4
-		cmd:tiffcrop = $portVersion compat >= 4
-		cmd:tiffdither = $portVersion compat >= 4
-		cmd:tiffdump = $portVersion compat >= 4
-		cmd:tiffinfo = $portVersion compat >= 4
-		cmd:tiffmedian = $portVersion compat >= 4
-		cmd:tiffset = $portVersion compat >= 4
-		cmd:tiffsplit = $portVersion compat >= 4     
+		tiff_tools = $portVersion
+		cmd:bmp2tiff
+		cmd:fax2ps
+		cmd:fax2tiff
+		cmd:gif2tiff
+		cmd:pal2rgb
+		cmd:ppm2tiff
+		cmd:ras2tiff
+		cmd:raw2tiff
+		cmd:rgb2ycbcr
+		cmd:thumbnail
+		cmd:tiff2bw
+		cmd:tiff2pdf
+		cmd:tiff2ps
+		cmd:tiff2rgba
+		cmd:tiffcmp
+		cmd:tiffcp
+		cmd:tiffcrop
+		cmd:tiffdither
+		cmd:tiffdump
+		cmd:tiffinfo
+		cmd:tiffmedian
+		cmd:tiffset
+		cmd:tiffsplit
 		"
 	REQUIRES_tools="
 		haiku >= $haikuVersion
 		tiff == $portVersion base
+		lib:libjpeg
+		lib:libz
 		"
 fi
diff --git a/media-libs/vigra/vigra-1.10.0.recipe b/media-libs/vigra/vigra-1.10.0.recipe
new file mode 100644
index 000000000..78ec8b860
--- /dev/null
+++ b/media-libs/vigra/vigra-1.10.0.recipe
@@ -0,0 +1,104 @@
+SUMMARY="Vision with Generic Algorithms"
+DESCRIPTION="
+	C++ computer vision library with emphasize on customizable \
+	algorithms and data structures.
+	"
+LICENSE="MIT"
+COPYRIGHT="1998-2013 by Ullrich Koethe"
+HOMEPAGE="http://ukoethe.github.io/vigra/"
+SRC_URI="https://github.com/ukoethe/vigra/archive/Version-1-10-0.tar.gz"
+SRC_FILENAME="$portVersionedName.tar.gz"
+CHECKSUM_SHA256="406f6fcbcea2e92f681a7b844487c29049d338f5b2b25f8145e67bcb518c7ef8"
+REVISION="2"
+
+ARCHITECTURES="x86 ?x86_gcc2 ?x86_64"
+SECONDARY_ARCHITECTURES="x86 ?x86_gcc2"
+
+SOURCE_DIR="vigra-Version-1-10-0"
+
+PROVIDES="
+	vigra$secondaryArchSuffix = $portVersion
+	lib:libvigraimpex$secondaryArchSuffix = 5.1.10.0 compat >= 5
+"
+REQUIRES="
+	haiku$secondaryArchSuffix >= $haikuVersion
+	lib:libjpeg$secondaryArchSuffix
+	lib:libpng$secondaryArchSuffix
+	lib:libtiff$secondaryArchSuffix
+	lib:libHalf$secondaryArchSuffix
+	lib:libIex_2_1$secondaryArchSuffix
+	lib:libImath_2_1$secondaryArchSuffix
+	lib:libIlmImf_Imf_2_1$secondaryArchSuffix
+	lib:libIlmThread_2_1$secondaryArchSuffix
+	lib:libfftw$secondaryArchSuffix
+	lib:libz$secondaryArchSuffix
+"
+BUILD_REQUIRES="
+	devel:libjpeg$secondaryArchSuffix
+	devel:libpng$secondaryArchSuffix
+	devel:libtiff$secondaryArchSuffix
+	devel:libHalf$secondaryArchSuffix
+	devel:libIex$secondaryArchSuffix
+	devel:libImath$secondaryArchSuffix
+	devel:libIlmImf$secondaryArchSuffix
+	devel:libfftw$secondaryArchSuffix
+	devel:libz$secondaryArchSuffix
+"
+BUILD_PREREQUIRES="
+	haiku${secondaryArchSuffix}_devel >= $haikuVersion
+	cmd:cmake
+	cmd:g++$secondaryArchSuffix
+	cmd:ld$secondaryArchSuffix
+	cmd:make
+"
+
+BUILD()
+{
+	mkdir -p build
+	cd build
+	cmake -DCMAKE_INSTALL_PREFIX=$prefix -DWITH_HDF5=0 -DWITH_VIGRANUMPY=0 \
+		-DWITH_OPENEXR=1 ../
+	make $jobArgs
+}
+
+INSTALL()
+{
+	cd build
+	make install
+
+	# we did not generate documentation
+	rm -rf $prefix/doc
+
+	# move headers
+	mkdir -p $includeDir
+	mv $prefix/include/* $includeDir
+
+	rm -rf $prefix/include
+
+	prepareInstalledDevelLib libvigraimpex
+
+	# move CMake scripts...
+	# FIXME: ...which probably won't work
+	mv $libDir/$portName $developLibDir
+	sed -i "s#/include/#/$relativeIncludeDir/#g" \
+		$developLibDir/$portName/VigraConfig.cmake
+
+	packageEntries devel $developDir bin/vigra-config
+}
+
+TEST()
+{
+	# FIXME: these tests fail, probably due to wrong paths
+	cd build
+	make test
+}
+
+PROVIDES_devel="
+	vigra${secondaryArchSuffix}_devel = $portVersion
+	cmd:vigra_config$secondaryArchSuffix
+	cmd:python # vigra-config is python script
+	devel:libvigraimpex$secondaryArchSuffix = 5.1.10.0 compat >= 5
+	"
+REQUIRES_devel="
+	vigra$secondaryArchSuffix == $portVersion base
+	"
diff --git a/media-libs/vigra/vigra-1.8.0.recipe b/media-libs/vigra/vigra-1.8.0.recipe
deleted file mode 100644
index e05e7b3c5..000000000
--- a/media-libs/vigra/vigra-1.8.0.recipe
+++ /dev/null
@@ -1,23 +0,0 @@
-DESCRIPTION="C++ computer vision library with emphasize on customizable algorithms and data structures. " 
-HOMEPAGE="http://hci.iwr.uni-heidelberg.de/vigra/" 
-SRC_URI="http://hci.iwr.uni-heidelberg.de/vigra/vigra-1.8.0-src.tar.gz"
-CHECKSUM_MD5="15c5544448e529ee60020758ab6be264"
-REVISION="1"
-STATUS_HAIKU="stable"
-MESSAGE="The port only builds with gcc4. Use 'setgcc gcc4' before building."
-DEPEND="cmake"
-BUILD()
-{
-	cd vigra-1.8.0
-	cmake CMakelists.txt
-	make 	
-}
-
-INSTALL()
-{
-	cd vigra-1.8.0
-	make install
-}
-
-LICENSE="MIT"
-COPYRIGHT="1998-2010 by Ullrich Koethe"
diff --git a/media-sound/bladeenc/bladeenc-0.94.2.recipe b/media-sound/bladeenc/bladeenc-0.94.2.recipe
index e3ee994b4..026d861a4 100644
--- a/media-sound/bladeenc/bladeenc-0.94.2.recipe
+++ b/media-sound/bladeenc/bladeenc-0.94.2.recipe
@@ -5,8 +5,8 @@ ISO reference code. It is mostly intended for high quality encoding in high \
 bitrates.
 "
 HOMEPAGE="http://bladeenc.mp3.no/" 
-SRC_URI="ftp://ftp.free.fr/.mirrors1/ftp.gentoo.org/distfiles/bladeenc-0.94.2-src-stable.tar.gz"
-CHECKSUM_MD5="9b9f6eafe1637a48a67f0a0f8f6e71ad"
+SRC_URI="ftp://ftp.netbsd.org/pub/pkgsrc/distfiles/bladeenc-0.94.2-src-stable.tar.gz"
+CHECKSUM_SHA256="c5e9dd180f28d1865599d0755e36fa1a4c146bb5e1b7ba9ad099955261fc1164"
 REVISION="2"
 LICENSE="GNU LGPL v2.1"
 COPYRIGHT="1998-2000 Tord Jansson"
diff --git a/media-sound/fluidsynth/fluidsynth-1.1.6.recipe b/media-sound/fluidsynth/fluidsynth-1.1.6.recipe
index 280903bf3..0cdc1a3c3 100644
--- a/media-sound/fluidsynth/fluidsynth-1.1.6.recipe
+++ b/media-sound/fluidsynth/fluidsynth-1.1.6.recipe
@@ -5,7 +5,7 @@ specifications.
 "
 HOMEPAGE="http://www.fluidsynth.org/" 
 SRC_URI="http://sourceforge.net/projects/fluidsynth/files/fluidsynth-1.1.6/fluidsynth-1.1.6.tar.bz2/download"
-CHECKSUM_MD5="f6e696690e989098f70641364fdffad7"
+CHECKSUM_SHA256="d28b47dfbf7f8e426902ae7fa2981d821fbf84f41da9e1b85be933d2d748f601"
 LICENSE="GNU LGPL v2.1"
 COPYRIGHT="2007-2012 Josh Green, Pedro Lopez-Cabanillas, David Henningsson"
 
diff --git a/media-sound/gogo_no_coda/gogo_no_coda-3.13.recipe b/media-sound/gogo_no_coda/gogo_no_coda-3.13.recipe
index cddb0fdbc..e5bc65ec6 100644
--- a/media-sound/gogo_no_coda/gogo_no_coda-3.13.recipe
+++ b/media-sound/gogo_no_coda/gogo_no_coda-3.13.recipe
@@ -4,8 +4,9 @@ Mp3 encoder based on LAME3.88, which is optimized for Enhanced 3D \
 Now!/SSE/SSE2 and dual-CPUs.
 "
 HOMEPAGE="https://github.com/teragonaudio/gogo-no-coda"
-SRC_URI="https://github.com/teragonaudio/gogo-no-coda/archive/master.zip"
-CHECKSUM_MD5="7b3008a0aba2578a2b428ba538452e87"
+SRC_URI="https://github.com/teragonaudio/gogo-no-coda/archive/82b1c8ccab661df3413c16435a957da393f93fcb.zip"
+CHECKSUM_SHA256="b176cd1c9ced968704b238d27ba63746086e614b6ebc7900c77d371f426e0002"
+SRC_FILENAME="gogo_no_coda-$portVersion.zip"
 LICENSE="GNU LGPL v2"
 COPYRIGHT="2001-2003 Respective gogo-no-coda creators"
 REVISION="1"
@@ -34,7 +35,7 @@ BUILD_PREREQUIRES="
 	cmd:nasm
 	"
 
-SOURCE_DIR="gogo-no-coda-master"
+SOURCE_DIR="gogo-no-coda-82b1c8ccab661df3413c16435a957da393f93fcb"
 
 BUILD()
 {
diff --git a/media-sound/lame/lame-3.99.5.recipe b/media-sound/lame/lame-3.99.5.recipe
index 00e206980..71bd387db 100644
--- a/media-sound/lame/lame-3.99.5.recipe
+++ b/media-sound/lame/lame-3.99.5.recipe
@@ -10,7 +10,7 @@ competitors.
 "
 HOMEPAGE="http://lame.sourceforge.net/" 
 SRC_URI="http://downloads.sourceforge.net/project/lame/lame/3.99/lame-3.99.5.tar.gz"
-CHECKSUM_MD5="84835b313d4a8b68f5349816d33e07ce"
+CHECKSUM_SHA256="24346b4158e4af3bd9f2e194bb23eb473c75fb7377011523353196b19b9a23ff"
 LICENSE="GNU LGPL v2"
 COPYRIGHT="1998-2012 Mike Cheng et al."
 REVISION="2"
diff --git a/media-sound/milkytracker/milkytracker-0.90.86.recipe b/media-sound/milkytracker/milkytracker-0.90.86.recipe
index c6491283d..e626d920b 100644
--- a/media-sound/milkytracker/milkytracker-0.90.86.recipe
+++ b/media-sound/milkytracker/milkytracker-0.90.86.recipe
@@ -20,7 +20,7 @@ COPYRIGHT="1994-2013
 LICENSE="GNU GPL v3
 	New-BSD"
 SRC_URI="http://www.milkytracker.org/files/milkytracker-0.90.86.tar.bz2"
-CHECKSUM_MD5="1ef462969cf54ba61748d4d878b5747e"
+CHECKSUM_SHA256="eb93000ed4855e198dfb02df54f3e3536dc891084ca47cdd5393121137ba3bed"
 REVISION="1"
 ARCHITECTURES="x86_gcc2 ?x86"
 
diff --git a/media-sound/mpg123/mpg123-1.12.1.recipe b/media-sound/mpg123/mpg123-1.12.1.recipe
index 9910ad713..8049b4f75 100644
--- a/media-sound/mpg123/mpg123-1.12.1.recipe
+++ b/media-sound/mpg123/mpg123-1.12.1.recipe
@@ -5,10 +5,10 @@ Layer 1, 2 and 3.
 "
 HOMEPAGE="http://www.mpg123.org/" 
 SRC_URI="http://sourceforge.net/projects/mpg123/files/mpg123/1.12.1/mpg123-1.12.1.tar.bz2/download"
+CHECKSUM_SHA256="f3cfe305832c4a6a56d105ec1b47e7963d5d809cb17447ee93ae2330f2365a72"
 REVISION="1"
 ARCHITECTURES="x86_gcc2 x86"
 SECONDARY_ARCHITECTURES="x86"
-CHECKSUM_MD5="e7d810a75d22954169f1530a436aca4c"
 #DEPEND="media-libs/libsdl >= 1.2"
 
 PROVIDES="
@@ -26,6 +26,7 @@ BUILD_PREREQUIRES="
 	cmd:gcc$secondaryArchSuffix
 	cmd:ld$secondaryArchSuffix
 	cmd:make
+	cmd:awk
 	"
 
 PATCHES="mpg123-1.12.1.patch"
diff --git a/media-sound/opensound/opensound-232d0de71550.recipe b/media-sound/opensound/opensound-232d0de71550.recipe
deleted file mode 100644
index 21c69c1f3..000000000
--- a/media-sound/opensound/opensound-232d0de71550.recipe
+++ /dev/null
@@ -1,28 +0,0 @@
-DESCRIPTION="Open Sound System"
-HOMEPAGE="http://developer.opensound.com/"
-SRC_URI="hg+http://opensound.hg.sourceforge.net:8000/hgroot/opensound/opensound/#232d0de71550"
-REVISION="1"
-STATUS_HAIKU="stable"
-DEPEND=""
-BUILD()
-{
-	cd opensound-232d0de71550
-	mkdir -p build
-	cd build
-	../configure --config-midi=NO --config-vmix=NO
-	make
-}
-
-INSTALL()
-{
-	cd opensound-232d0de71550/build
-	if [ -n "${DESTDIR}" ];then
-		make package
-		mkdir -p ${DESTDIR}/boot
-		cp -R prototype/* ${DESTDIR}/boot
-	else
-		make install
-	fi
-}
-LICENSE="BSD (2-clause)"
-COPYRIGHT="1996-2009"
diff --git a/media-sound/opensound/opensound-4.2_git.recipe b/media-sound/opensound/opensound-4.2_git.recipe
index ba5948e39..6b89f1540 100644
--- a/media-sound/opensound/opensound-4.2_git.recipe
+++ b/media-sound/opensound/opensound-4.2_git.recipe
@@ -28,11 +28,11 @@ BUILD_PREREQUIRES="
 	haiku${secondaryArchSuffix}_devel >= $haikuVersion
 	cmd:gcc$secondaryArchSuffix
 	cmd:ld$secondaryArchSuffix
+	cmd:awk
+	cmd:find
 	cmd:make
 	"
 
-PATCHES="opensound-4.2_git.patchset"
-
 GLOBAL_WRITABLE_FILES="settings/kernel/drivers directory keep-old"
 
 BUILD()
diff --git a/media-sound/opensound/opensound-cac211efd60d.recipe b/media-sound/opensound/opensound-cac211efd60d.recipe
deleted file mode 100644
index 149d67b74..000000000
--- a/media-sound/opensound/opensound-cac211efd60d.recipe
+++ /dev/null
@@ -1,28 +0,0 @@
-DESCRIPTION="Open Sound System" 
-HOMEPAGE="http://developer.opensound.com/" 
-SRC_URI="hg+http://mercurial.opensound.com/#cac211efd60d"
-REVISION="1"
-STATUS_HAIKU="stable"
-DEPEND=""
-BUILD()
-{
-	cd opensound-cac211efd60d
-	mkdir -p build
-	cd build
-	../configure
-	make
-}
-
-INSTALL()
-{
-	cd opensound-cac211efd60d/build
-	if [ -n "${DESTDIR}" ];then
-		make package
-		mkdir -p ${DESTDIR}/boot
-		cp -R prototype/* ${DESTDIR}/boot
-	else
-		make install
-	fi
-}
-LICENSE="BSD (2-clause)"
-COPYRIGHT="1996-2009"
diff --git a/media-sound/opensound/patches/opensound-232d0de71550.patch b/media-sound/opensound/patches/opensound-232d0de71550.patch
deleted file mode 100644
index 6c5b1c1a7..000000000
--- a/media-sound/opensound/patches/opensound-232d0de71550.patch
+++ /dev/null
@@ -1,30 +0,0 @@
-diff -up opensound-232d0de71550/kernel/OS/BeOS/os_beos.c.orig opensound-232d0de71550/kernel/OS/BeOS/os_beos.c
---- opensound-232d0de71550/kernel/OS/BeOS/os_beos.c.orig	2010-05-08 16:22:20.327417856 -0600
-+++ opensound-232d0de71550/kernel/OS/BeOS/os_beos.c	2010-05-08 16:23:05.004194304 -0600
-@@ -1076,6 +1076,8 @@ osdev_create (dev_info_t * dip, int dev_
- 				   osdev->dip->pciinfo.function,
- 				   "oss", osdev) != B_OK) {
-       	cmn_err (CE_WARN, "Could not reserve PCI device\n");
-+      	/* make sure the card isn't uninitialized on driver unload */
-+      	oss_num_cards--;
-       	/* XXX: CLEANUP! */
-         return NULL;
-       }
-diff -up opensound-232d0de71550/setup/BeOS/build.sh.orig opensound-232d0de71550/setup/BeOS/build.sh
---- opensound-232d0de71550/setup/BeOS/build.sh.orig	2010-05-08 16:22:21.177471488 -0600
-+++ opensound-232d0de71550/setup/BeOS/build.sh	2010-05-08 16:23:17.108003328 -0600
-@@ -36,12 +36,12 @@ mkdir -p prototype/$BEOS_SYSTEM/add-ons/
- #hack for now
- #mkdir -p prototype/$BEOS_SYSTEM/add-ons/kernel/media/oss
- mkdir -p prototype/$BEOS_SYSTEM/add-ons/kernel/drivers/bin
--mkdir -p prototype/$BEOS_SYSTEM/add-ons/kernel/drivers/dev/audio/multi
-+#mkdir -p prototype/$BEOS_SYSTEM/add-ons/kernel/drivers/dev/audio/multi
- mkdir -p prototype/$BEOS_SYSTEM/add-ons/kernel/drivers/dev/audio/oss
- #hack for now
- mkdir -p prototype/$BEOS_SYSTEM/add-ons/kernel/drivers/dev/oss
- ln -s ../../bin/${DRVPREFIX}loader prototype/$BEOS_SYSTEM/add-ons/kernel/drivers/dev/oss/
--ln -s ../bin/${DRVPREFIX}loader prototype/$BEOS_SYSTEM/add-ons/kernel/drivers/dev/
-+#ln -s ../bin/${DRVPREFIX}loader prototype/$BEOS_SYSTEM/add-ons/kernel/drivers/dev/
- #hack: install bins for now
- mkdir -p prototype/home/config/bin
- mkdir -p prototype/home/config/settings/kernel/drivers
diff --git a/media-sound/opensound/patches/opensound-4.2_git.patchset b/media-sound/opensound/patches/opensound-4.2_git.patchset
deleted file mode 100644
index ea93ac167..000000000
--- a/media-sound/opensound/patches/opensound-4.2_git.patchset
+++ /dev/null
@@ -1,197 +0,0 @@
-From f5c773104f0df79a24197a2d66b704c1001ccf6d Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Fran=C3=A7ois=20Revol?= <revol@free.fr>
-Date: Sun, 23 Feb 2014 00:30:41 +0100
-Subject: [PATCH 1/5] beos: make sure rejected card isn't uninitialized on
- driver unload
-
-Only mark a card available after having reserved the device in Haiku,
-to make sure we don't leave ghost devices.
-
-diff --git a/kernel/OS/BeOS/os_beos.c b/kernel/OS/BeOS/os_beos.c
-index 08587c5..111e6b1 100644
---- a/kernel/OS/BeOS/os_beos.c
-+++ b/kernel/OS/BeOS/os_beos.c
-@@ -1057,7 +1057,6 @@ osdev_create (dev_info_t * dip, int dev_type, int instance, const char *nick,
-   osdev->dip = dip;
-   //osdev->osid = dip;
-   osdev->unloaded = 0;
--  osdev->available = 1;
-   osdev->first_mixer = -1;
-   osdev->instance = instance;
-   osdev->dev_type = dev_type;
-@@ -1096,6 +1095,8 @@ osdev_create (dev_info_t * dip, int dev_type, int instance, const char *nick,
-       return NULL;
-     }
- 
-+  osdev->available = 1;
-+
- /*
-  * Create the device handle
-  */
--- 
-1.8.3.4
-
-
-From e446f041c4dee02c56ad57629861fb1884cf84a8 Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Fran=C3=A7ois=20Revol?= <revol@free.fr>
-Date: Sun, 23 Feb 2014 01:16:34 +0100
-Subject: [PATCH 2/5] beos: Fix Haiku build
-
-The spinlock type was changed to a struct so we now use an
-initializer macro.
-
-diff --git a/kernel/OS/BeOS/os_beos.h b/kernel/OS/BeOS/os_beos.h
-index 1e8f0b5..31fd27e 100644
---- a/kernel/OS/BeOS/os_beos.h
-+++ b/kernel/OS/BeOS/os_beos.h
-@@ -171,6 +171,11 @@ extern int oss_create_uio (uio_t * uiop, char *buf, size_t count, uio_rw_t rw,
-  * Mutexes
-  */
- 
-+/* Haiku defines a specific initializer now, BeOS just used 0. */
-+#ifndef B_INITIALIZE_SPINLOCK
-+#define B_INITIALIZE_SPINLOCK(spinlock) do { *spinlock = 0; } while (false)
-+#endif
-+
- #ifdef MUTEX_CHECKS
- /* Debugging version */
- struct _oss_mutex_t
-@@ -198,7 +203,7 @@ extern void debug_mutex_exit (oss_mutex_t * mutex, char *file, int line, oss_nat
- #define MUTEX_EXIT(mutex, flags)			debug_mutex_exit(&mutex, __FILE__, __LINE__, NULL)
- #else
- typedef spinlock oss_mutex_t;
--#define MUTEX_INIT(osdev, mutex, hier)			{ mutex = 0; }
-+#define MUTEX_INIT(osdev, mutex, hier)			B_INITIALIZE_SPINLOCK(&(mutex))
- #define MUTEX_CLEANUP(mutex)			
- #define MUTEX_ENTER_IRQDISABLE(mutex, flags)	\
- { \
--- 
-1.8.3.4
-
-
-From 3686b589095719be3f24b2dd6aea706f9b9a3877 Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Fran=C3=A7ois=20Revol?= <revol@free.fr>
-Date: Sun, 23 Feb 2014 01:49:47 +0100
-Subject: [PATCH 3/5] beos: Fix Haiku package
-
-The kernel library symlink has moved in Haiku, check for it.
-
-diff --git a/setup/BeOS/build.sh b/setup/BeOS/build.sh
-index 045a599..4d10060 100644
---- a/setup/BeOS/build.sh
-+++ b/setup/BeOS/build.sh
-@@ -90,16 +90,23 @@ core=prototype/$BEOS_SYSTEM/add-ons/kernel/media/oss
- # no midi yet
- rm target/modules/oss_midiloop.o
- 
-+for k in /boot/develop/lib/x86/_KERNEL_ /boot/system/develop/lib/_KERNEL_; do
-+	if [ -e "$k" ]; then
-+		KERNEL="$k"
-+		break
-+	fi
-+done
-+
- # try to build all in a single bin for now...
- # driver_beos.o shouldn' be in, oh well...
- # R5 has symbols like __ucmpdi2 but not Haiku, so use libgcc
--gcc -o $core target/objects/*.o target/modules/*.o -nostdlib -lgcc /boot/develop/lib/x86/_KERNEL_ || exit 1
-+gcc -o $core target/objects/*.o target/modules/*.o -nostdlib -lgcc $KERNEL || exit 1
- setvermime $core
- 
- # except the loader driver...
- # using the same bin works in BeOS but not in Haiku.
- drv=prototype/$BEOS_SYSTEM/add-ons/kernel/drivers/bin/${DRVPREFIX}loader
--gcc -o $drv target/objects/driver_beos.o -nostdlib /boot/develop/lib/x86/_KERNEL_ || exit 1
-+gcc -o $drv target/objects/driver_beos.o -nostdlib $KERNEL || exit 1
- setvermime $drv
- 
- rm -f devlist.txt
--- 
-1.8.3.4
-
-
-From 9af17237da3955bd579a87616d5914d3aa54b435 Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Fran=C3=A7ois=20Revol?= <revol@free.fr>
-Date: Sun, 23 Feb 2014 01:51:10 +0100
-Subject: [PATCH 4/5] beos: Avoid loading OSS too early at boot
-
-Give precedence to the native driver, the /dev symlink was a hack
-to force loading OSS earlier than native drivers.
-
-diff --git a/setup/BeOS/build.sh b/setup/BeOS/build.sh
-index 4d10060..ef22ec9 100644
---- a/setup/BeOS/build.sh
-+++ b/setup/BeOS/build.sh
-@@ -41,7 +41,9 @@ mkdir -p prototype/$BEOS_SYSTEM/add-ons/kernel/drivers/dev/audio/oss
- #hack for now
- mkdir -p prototype/$BEOS_SYSTEM/add-ons/kernel/drivers/dev/oss
- ln -s ../../bin/${DRVPREFIX}loader prototype/$BEOS_SYSTEM/add-ons/kernel/drivers/dev/oss/
--ln -s ../bin/${DRVPREFIX}loader prototype/$BEOS_SYSTEM/add-ons/kernel/drivers/dev/
-+# Avoid loading OSS too early at boot,
-+# the media addon will probe /dev/audio/oss anyway
-+#ln -s ../bin/${DRVPREFIX}loader prototype/$BEOS_SYSTEM/add-ons/kernel/drivers/dev/
- #hack: install bins for now
- mkdir -p prototype/home/config/bin
- mkdir -p prototype/home/config/settings/kernel/drivers
--- 
-1.8.3.4
-
-
-From 288e5eeb0e37b5aae36f31781243769b4e5bed1e Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Fran=C3=A7ois=20Revol?= <revol@free.fr>
-Date: Sun, 23 Feb 2014 02:32:05 +0100
-Subject: [PATCH 5/5] beos: Allow installing into passed system directory
-
-Since Haiku switched to package-management we can provide proper
-packages that can be easily uninstalled.
-The package will be built by haikuporter though for now.
-
-diff --git a/setup/BeOS/build.sh b/setup/BeOS/build.sh
-index ef22ec9..2fc0cd1 100644
---- a/setup/BeOS/build.sh
-+++ b/setup/BeOS/build.sh
-@@ -4,7 +4,9 @@
- 
- #BEOS_SYSTEM=beos/system
- # to install as user addons
--BEOS_SYSTEM=home/config
-+BEOS_SYSTEM=${SYSTEM_DIR:-home/config}
-+ADDONS_DIR=$BEOS_SYSTEM/add-ons
-+BIN_DIR=$BEOS_SYSTEM/bin
- 
- DRVPREFIX=oss_
- 
-@@ -36,7 +38,6 @@ mkdir -p prototype/$BEOS_SYSTEM/add-ons/kernel/media
- #hack for now
- #mkdir -p prototype/$BEOS_SYSTEM/add-ons/kernel/media/oss
- mkdir -p prototype/$BEOS_SYSTEM/add-ons/kernel/drivers/bin
--mkdir -p prototype/$BEOS_SYSTEM/add-ons/kernel/drivers/dev/audio/multi
- mkdir -p prototype/$BEOS_SYSTEM/add-ons/kernel/drivers/dev/audio/oss
- #hack for now
- mkdir -p prototype/$BEOS_SYSTEM/add-ons/kernel/drivers/dev/oss
-@@ -45,9 +46,9 @@ ln -s ../../bin/${DRVPREFIX}loader prototype/$BEOS_SYSTEM/add-ons/kernel/drivers
- # the media addon will probe /dev/audio/oss anyway
- #ln -s ../bin/${DRVPREFIX}loader prototype/$BEOS_SYSTEM/add-ons/kernel/drivers/dev/
- #hack: install bins for now
--mkdir -p prototype/home/config/bin
-+mkdir -p prototype/$BIN_DIR
- mkdir -p prototype/home/config/settings/kernel/drivers
--mkdir -p prototype/home/Desktop
-+#mkdir -p prototype/home/Desktop
- 
- #cp $SRCDIR/include/soundcard.h prototype/usr/include/sys
- 
-@@ -57,8 +58,8 @@ mkdir -p prototype/home/Desktop
- #cp $SRCDIR/kernel/framework/include/midiparser.h prototype/$OSSLIBDIR/include/
- 
- (cd target/bin; rm -f ossrecord; ln -s ossplay ossrecord)
--cp -f target/bin/* prototype/home/config/bin
--cp -f target/sbin/* prototype/home/config/bin
-+cp -f target/bin/* prototype/$BIN_DIR/
-+cp -f target/sbin/* prototype/$BIN_DIR/
- 
- #cp -R $SRCDIR/oss/* prototype/$OSSLIBDIR
- 
--- 
-1.8.3.4
-
diff --git a/media-sound/opensound/patches/opensound-cac211efd60d.patch b/media-sound/opensound/patches/opensound-cac211efd60d.patch
deleted file mode 100644
index 9e3887593..000000000
--- a/media-sound/opensound/patches/opensound-cac211efd60d.patch
+++ /dev/null
@@ -1,30 +0,0 @@
-diff -up opensound-cac211efd60d/kernel/OS/BeOS/os_beos.c.orig opensound-cac211efd60d/kernel/OS/BeOS/os_beos.c
---- opensound-cac211efd60d/kernel/OS/BeOS/os_beos.c.orig	2010-05-08 16:22:20.327417856 -0600
-+++ opensound-cac211efd60d/kernel/OS/BeOS/os_beos.c	2010-05-08 16:23:05.004194304 -0600
-@@ -1076,6 +1076,8 @@ osdev_create (dev_info_t * dip, int dev_
- 				   osdev->dip->pciinfo.function,
- 				   "oss", osdev) != B_OK) {
-       	cmn_err (CE_WARN, "Could not reserve PCI device\n");
-+      	/* make sure the card isn't uninitialized on driver unload */
-+      	oss_num_cards--;
-       	/* XXX: CLEANUP! */
-         return NULL;
-       }
-diff -up opensound-cac211efd60d/setup/BeOS/build.sh.orig opensound-cac211efd60d/setup/BeOS/build.sh
---- opensound-cac211efd60d/setup/BeOS/build.sh.orig	2010-05-08 16:22:21.177471488 -0600
-+++ opensound-cac211efd60d/setup/BeOS/build.sh	2010-05-08 16:23:17.108003328 -0600
-@@ -36,12 +36,12 @@ mkdir -p prototype/$BEOS_SYSTEM/add-ons/
- #hack for now
- #mkdir -p prototype/$BEOS_SYSTEM/add-ons/kernel/media/oss
- mkdir -p prototype/$BEOS_SYSTEM/add-ons/kernel/drivers/bin
--mkdir -p prototype/$BEOS_SYSTEM/add-ons/kernel/drivers/dev/audio/multi
-+#mkdir -p prototype/$BEOS_SYSTEM/add-ons/kernel/drivers/dev/audio/multi
- mkdir -p prototype/$BEOS_SYSTEM/add-ons/kernel/drivers/dev/audio/oss
- #hack for now
- mkdir -p prototype/$BEOS_SYSTEM/add-ons/kernel/drivers/dev/oss
- ln -s ../../bin/${DRVPREFIX}loader prototype/$BEOS_SYSTEM/add-ons/kernel/drivers/dev/oss/
--ln -s ../bin/${DRVPREFIX}loader prototype/$BEOS_SYSTEM/add-ons/kernel/drivers/dev/
-+#ln -s ../bin/${DRVPREFIX}loader prototype/$BEOS_SYSTEM/add-ons/kernel/drivers/dev/
- #hack: install bins for now
- mkdir -p prototype/home/config/bin
- mkdir -p prototype/home/config/settings/kernel/drivers
diff --git a/media-sound/protrekkr/patches/protrekkr-2.5.4.patchset b/media-sound/protrekkr/patches/protrekkr-2.5.4.patchset
new file mode 100644
index 000000000..f043f4802
--- /dev/null
+++ b/media-sound/protrekkr/patches/protrekkr-2.5.4.patchset
@@ -0,0 +1,815 @@
+From 4662e2c5030efdf290f6320eaf077abc820eb51e Mon Sep 17 00:00:00 2001
+From: Adrien Destugues <pulkomandy@pulkomandy.tk>
+Date: Tue, 4 Mar 2014 21:49:16 +0100
+Subject: Import initial patch.
+
+
+diff --git a/makefile.haiku b/makefile.haiku
+new file mode 100644
+index 0000000..efbfd22
+--- /dev/null
++++ b/makefile.haiku
+@@ -0,0 +1,199 @@
++CXX = g++-x86
++
++LIBS = src/extralibs/tinyxml/tinyxml.o \
++       src/extralibs/tinyxml/tinyxmlparser.o \
++       src/extralibs/tinyxml/tinystr.o \
++       src/extralibs/tinyxml/tinyxmlerror.o \
++       -lSDL -lsdldraw -lz -lstdc++ -lsupc++ -lgame
++
++FLAGS = -O2 -fno-strict-aliasing -ffast-math -fno-rtti -fno-exceptions -I/usr/local/include -L/usr/local/lib -Lsrc/extralibs/sdl_draw -Lsrc/extralibs/zlib-1.2.3 -fpermissive \
++        -D __GCC__ -D __NO_MIDI__ -D __MOT_SWAP__
++
++EXEOBJS = ptk.o \
++          editor_303.o editor_pattern.o editor_sequencer.o editor_track.o editor_track_fx.o \
++          patterns_blocks.o editor_synth.o editor_sample.o editor_fx_setup.o editor_setup.o \
++          editor_diskio.o editor_reverb.o editor_instrument.o editor_midi.o \
++          samples_pack.o files_list.o files.o mods.o patterns.o reverbs.o midi_cfg.o \
++          bits.o pack.o tinypack.o words.o wputils.o \
++          config.o 303s.o synths.o insts.o ptps.o \
++          midi.o midi_dispatch.o \
++          timer.o main.o \
++          misc_draw.o draw_primitives.o requesters.o xml.o gadgets.o \
++          samples_ops.o aiff.o riff.o \
++          spline.o tb_303.o wavpack.o samples_unpack.o replay.o synth.o endianness.o \
++          sounddriver_haiku.o
++
++all: protrekkr
++
++clean: RemObj
++
++RemObj:
++	-rm -f $(EXEOBJS)
++
++protrekkr: $(EXEOBJS)
++	(cd src/extralibs/sdl_draw; make -f makefile.haiku)
++	(cd src/extralibs/tinyxml; make)
++	(cd src/extralibs/zlib-1.2.3; make)
++	$(CXX) -o ./release/distrib/ptk_haiku -L./ $(FLAGS) $(EXEOBJS) $(LIBS)
++	strip -s -x ./release/distrib/ptk_haiku
++	chmod +x ./release/distrib/ptk_haiku
++#	-rm -f $(EXEOBJS)
++	
++ptk.o: src/ptk.cpp
++	$(CXX) -c -o $(@) $(FLAGS) $<
++
++editor_303.o: src/editors/editor_303.cpp
++	$(CXX) -c -o $(@) $(FLAGS) $<
++
++editor_pattern.o: src/editors/editor_pattern.cpp
++	$(CXX) -c -o $(@) $(FLAGS) $<
++
++editor_sequencer.o: src/editors/editor_sequencer.cpp
++	$(CXX) -c -o $(@) $(FLAGS) $<
++
++editor_track.o: src/editors/editor_track.cpp
++	$(CXX) -c -o $(@) $(FLAGS) $<
++
++editor_track_fx.o: src/editors/editor_track_fx.cpp
++	$(CXX) -c -o $(@) $(FLAGS) $<
++
++patterns_blocks.o: src/editors/patterns_blocks.cpp
++	$(CXX) -c -o $(@) $(FLAGS) $<
++
++editor_synth.o: src/editors/editor_synth.cpp
++	$(CXX) -c -o $(@) $(FLAGS) $<
++
++editor_sample.o: src/editors/editor_sample.cpp
++	$(CXX) -c -o $(@) $(FLAGS) $<
++
++editor_fx_setup.o: src/editors/editor_fx_setup.cpp
++	$(CXX) -c -o $(@) $(FLAGS) $<
++
++editor_setup.o: src/editors/editor_setup.cpp
++	$(CXX) -c -o $(@) $(FLAGS) $<
++
++editor_diskio.o: src/editors/editor_diskio.cpp
++	$(CXX) -c -o $(@) $(FLAGS) $<
++
++editor_reverb.o: src/editors/editor_reverb.cpp
++	$(CXX) -c -o $(@) $(FLAGS) $<
++
++editor_instrument.o: src/editors/editor_instrument.cpp
++	$(CXX) -c -o $(@) $(FLAGS) $<
++
++editor_midi.o: src/editors/editor_midi.cpp
++	$(CXX) -c -o $(@) $(FLAGS) $<
++
++samples_pack.o: src/samples/samples_pack.cpp
++	$(CXX) -c -o $(@) $(FLAGS) $<
++
++files_list.o: src/files/files_list.cpp
++	$(CXX) -c -o $(@) $(FLAGS) $<
++
++files.o: src/files/files.cpp
++	$(CXX) -c -o $(@) $(FLAGS) $<
++
++mods.o: src/files/mods.cpp
++	$(CXX) -c -o $(@) $(FLAGS) $<
++
++patterns.o: src/files/patterns.cpp
++	$(CXX) -c -o $(@) $(FLAGS) $<
++
++reverbs.o: src/files/reverbs.cpp
++	$(CXX) -c -o $(@) $(FLAGS) $<
++
++midi_cfg.o: src/files/midi_cfg.cpp
++	$(CXX) -c -o $(@) $(FLAGS) $<
++
++config.o: src/files/config.cpp
++	$(CXX) -c -o $(@) $(FLAGS) $<
++
++303s.o: src/files/303s.cpp
++	$(CXX) -c -o $(@) $(FLAGS) $<
++
++synths.o: src/files/synths.cpp
++	$(CXX) -c -o $(@) $(FLAGS) $<
++
++insts.o: src/files/insts.cpp
++	$(CXX) -c -o $(@) $(FLAGS) $<
++
++ptps.o: src/files/ptps.cpp
++	$(CXX) -c -o $(@) $(FLAGS) $<
++
++midi.o: src/midi/midi.cpp
++	$(CXX) -c -o $(@) $(FLAGS) $<
++
++RtMidi.o: src/midi/RtMidi.cpp
++	$(CXX) -c -o $(@) $(FLAGS) $<
++
++midi_dispatch.o: src/midi/midi_dispatch.cpp
++	$(CXX) -c -o $(@) $(FLAGS) $<
++
++timer.o: src/support/timer.cpp
++	$(CXX) -c -o $(@) $(FLAGS) $<
++
++main.o: src/support/main.cpp
++	$(CXX) -c -o $(@) $(FLAGS) $<
++
++misc_draw.o: src/ui/misc_draw.cpp
++	$(CXX) -c -o $(@) $(FLAGS) $<
++
++draw_primitives.o: src/ui/draw_primitives.cpp
++	$(CXX) -c -o $(@) $(FLAGS) $<
++
++requesters.o: src/ui/requesters.cpp
++	$(CXX) -c -o $(@) $(FLAGS) $<
++
++xml.o: src/ui/xml.cpp
++	$(CXX) -c -o $(@) $(FLAGS) $<
++
++gadgets.o: src/ui/gadgets.cpp
++	$(CXX) -c -o $(@) $(FLAGS) $<
++
++samples_ops.o: src/samples/samples_ops.cpp
++	$(CXX) -c -o $(@) $(FLAGS) $<
++
++aiff.o: src/samples/aiff/aiff.cpp
++	$(CXX) -c -o $(@) $(FLAGS) $<
++
++riff.o: src/samples/wav/riff.cpp
++	$(CXX) -c -o $(@) $(FLAGS) $<
++
++spline.o: release/distrib/replay/lib/spline.cpp
++	$(CXX) -c -o $(@) $(FLAGS) $<
++
++tb_303.o: release/distrib/replay/lib/tb_303.cpp
++	$(CXX) -c -o $(@) $(FLAGS) $<
++
++wavpack.o: release/distrib/replay/lib/wavpack.cpp
++	$(CXX) -c -o $(@) $(FLAGS) $<
++
++samples_unpack.o: release/distrib/replay/lib/samples_unpack.cpp
++	$(CXX) -c -o $(@) $(FLAGS) $<
++
++replay.o: release/distrib/replay/lib/replay.cpp
++	$(CXX) -c -o $(@) $(FLAGS) $<
++
++synth.o: release/distrib/replay/lib/synth.cpp
++	$(CXX) -c -o $(@) $(FLAGS) $<
++
++endianness.o: release/distrib/replay/lib/endianness.cpp
++	$(CXX) -c -o $(@) $(FLAGS) $<
++
++sounddriver_haiku.o: release/distrib/replay/lib/sounddriver/sounddriver_haiku.cpp
++	$(CXX) -c -o $(@) $(FLAGS) $<
++
++bits.o: src/samples/wavpack/bits.cpp
++	$(CXX) -c -o $(@) $(FLAGS) $<
++
++pack.o: src/samples/wavpack/pack.cpp
++	$(CXX) -c -o $(@) $(FLAGS) $<
++
++words.o: src/samples/wavpack/words.cpp
++	$(CXX) -c -o $(@) $(FLAGS) $<
++
++wputils.o: src/samples/wavpack/wputils.cpp
++	$(CXX) -c -o $(@) $(FLAGS) $<
++
++tinypack.o: src/samples/wavpack/tinypack.cpp
++	$(CXX) -c -o $(@) $(FLAGS) $<
+diff --git a/release/distrib/replay/lib/include/replay.h b/release/distrib/replay/lib/include/replay.h
+index 1945eab..51778e4 100644
+--- a/release/distrib/replay/lib/include/replay.h
++++ b/release/distrib/replay/lib/include/replay.h
+@@ -49,6 +49,8 @@
+ #include "../sounddriver/include/sounddriver_aos4.h"
+ #elif defined(__PSP__)
+ #include "../sounddriver/include/sounddriver_psp.h"
++#elif defined(__HAIKU__)
++#include "../sounddriver/include/sounddriver_haiku.h"
+ #else
+ #error "Can't work without any sound driver !"
+ #endif
+diff --git a/release/distrib/replay/lib/replay.cpp b/release/distrib/replay/lib/replay.cpp
+index ea2ee35..f720cd1 100644
+--- a/release/distrib/replay/lib/replay.cpp
++++ b/release/distrib/replay/lib/replay.cpp
+@@ -43,6 +43,10 @@
+ #define int32 int32_t
+ #endif
+ 
++#if defined(__HAIKU__)
++#include <SupportDefs.h>
++#endif
++
+ #if !defined(__STAND_ALONE__)
+ #include "../../../../src/midi/include/midi.h"
+ #include "../../../../src/include/variables.h"
+diff --git a/release/distrib/replay/lib/sounddriver/include/sounddriver_haiku.h b/release/distrib/replay/lib/sounddriver/include/sounddriver_haiku.h
+new file mode 100644
+index 0000000..294c6f8
+--- /dev/null
++++ b/release/distrib/replay/lib/sounddriver/include/sounddriver_haiku.h
+@@ -0,0 +1,84 @@
++// ------------------------------------------------------
++// Protrekkr
++// Based on Juan Antonio Arguelles Rius's NoiseTrekker.
++//
++// Copyright (C) 2008-2010 Franck Charlet.
++// All rights reserved.
++//
++// Redistribution and use in source and binary forms, with or without
++// modification, are permitted provided that the following conditions
++// are met:
++//
++//  1. Redistributions of source code must retain the above copyright notice,
++//     this list of conditions and the following disclaimer.
++//
++//  2. Redistributions in binary form must reproduce the above copyright notice,
++//     this list of conditions and the following disclaimer in the documentation
++//     and/or other materials provided with the distribution.
++//
++// THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS "AS IS" AND
++// ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
++// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
++// ARE DISCLAIMED. IN NO EVENT SHALL FRANCK CHARLET OR CONTRIBUTORS BE LIABLE
++// FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
++// DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
++// OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
++// HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
++// LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
++// OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
++// SUCH DAMAGE.
++// ------------------------------------------------------
++
++#ifndef _SOUNDDRIVER_LINUX_H_
++#define _SOUNDDRIVER_LINUX_H_
++
++// ------------------------------------------------------
++// Includes
++#include <stdio.h>
++#include <stdlib.h>
++#include <fcntl.h>
++#include <unistd.h>
++#include <sys/ioctl.h>
++#include <pthread.h>
++#include <float.h>
++#include <memory.h>
++#include <math.h>
++
++#define STDCALL
++
++#define TRUE 1
++#define FALSE 0
++
++// ------------------------------------------------------
++// Constants
++#define AUDIO_PCM_FREQ 44100
++
++#define AUDIO_DBUF_CHANNELS 2
++#define AUDIO_DBUF_RESOLUTION 16
++
++// ------------------------------------------------------
++// Types
++typedef unsigned int Uint32;
++typedef unsigned char Uint8;
++
++// ------------------------------------------------------
++// Functions
++extern int AUDIO_Latency;
++extern int AUDIO_Milliseconds;
++
++#if !defined(__STAND_ALONE__) && !defined(__WINAMP__)
++void Message_Error(char *Message);
++#endif
++
++int AUDIO_Init_Driver(void (STDCALL *Mixer)(Uint8 *, Uint32));
++int AUDIO_Create_Sound_Buffer(int milliseconds);
++void AUDIO_Stop_Sound_Buffer(void);
++void AUDIO_Stop_Driver(void);
++void AUDIO_Play(void);
++void AUDIO_Stop(void);
++int AUDIO_IsPlaying(void);
++float AUDIO_GetTime(void);
++int AUDIO_GetSamples(void);
++void AUDIO_ResetTimer(void);
++
++#endif
+diff --git a/release/distrib/replay/lib/sounddriver/sounddriver_haiku.cpp b/release/distrib/replay/lib/sounddriver/sounddriver_haiku.cpp
+new file mode 100644
+index 0000000..7791631
+--- /dev/null
++++ b/release/distrib/replay/lib/sounddriver/sounddriver_haiku.cpp
+@@ -0,0 +1,213 @@
++// ------------------------------------------------------
++// Protrekkr
++// Based on Juan Antonio Arguelles Rius's NoiseTrekker.
++//
++// Copyright (C) 2008-2010 Franck Charlet.
++// All rights reserved.
++//
++// Redistribution and use in source and binary forms, with or without
++// modification, are permitted provided that the following conditions
++// are met:
++//
++//  1. Redistributions of source code must retain the above copyright notice,
++//     this list of conditions and the following disclaimer.
++//
++//  2. Redistributions in binary form must reproduce the above copyright notice,
++//     this list of conditions and the following disclaimer in the documentation
++//     and/or other materials provided with the distribution.
++//
++// THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS "AS IS" AND
++// ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
++// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
++// ARE DISCLAIMED. IN NO EVENT SHALL FRANCK CHARLET OR CONTRIBUTORS BE LIABLE
++// FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
++// DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
++// OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
++// HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
++// LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
++// OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
++// SUCH DAMAGE.
++// ------------------------------------------------------
++
++// ------------------------------------------------------
++// Includes
++#include "include/sounddriver_haiku.h"
++#include <game/StreamingGameSound.h>
++#include <media/MediaDefs.h>
++
++#include <assert.h>
++
++// ------------------------------------------------------
++// Variables
++unsigned int AUDIO_To_Fill;
++int AUDIO_Samples;
++int AUDIO_Play_Flag;
++float AUDIO_Timer;
++
++int volatile AUDIO_Acknowledge;
++BStreamingGameSound* AUDIO_Device;
++Uint32 Amount;
++
++int AUDIO_SoundBuffer_Size;
++int AUDIO_Latency;
++int AUDIO_Milliseconds = 20;
++int AUDIO_16Bits;
++
++// ------------------------------------------------------
++// Functions
++int AUDIO_Create_Sound_Buffer(int milliseconds);
++void AUDIO_Stop_Sound_Buffer(void);
++void (STDCALL *AUDIO_Mixer)(Uint8 *, Uint32);
++void AUDIO_Mixer_Fill_Buffer(void *, Uint32);
++void AUDIO_Synth_Play(void);
++
++// ------------------------------------------------------
++// Name: AUDIO_Thread()
++// Desc: Audio rendering
++static void AUDIO_Callback(void* cookie, void* inBuffer, size_t byteCount, BStreamingGameSound* device)
++{
++	assert(byteCount != 0);
++    if(AUDIO_Play_Flag)
++    {
++        AUDIO_Mixer((Uint8 *) inBuffer, byteCount);
++    }
++    else
++    {
++        unsigned int i;
++        char *pSamples = (char *) inBuffer;
++        for(i = 0; i < byteCount; i++)
++        {
++            pSamples[i] = 0;
++        }
++    }
++    AUDIO_Samples += byteCount;
++    AUDIO_Timer = ((((float) AUDIO_Samples) * (1.0f / (float) AUDIO_Latency)) * 1000.0f);
++}
++
++// ------------------------------------------------------
++// Name: AUDIO_Init_Driver()
++// Desc: Init the audio driver
++int AUDIO_Init_Driver(void (*Mixer)(Uint8 *, Uint32))
++{
++    AUDIO_Mixer = Mixer;
++
++    AUDIO_Device = 0;
++    return(AUDIO_Create_Sound_Buffer(AUDIO_Milliseconds));
++}
++
++// ------------------------------------------------------
++// Name: AUDIO_Create_Sound_Buffer()
++// Desc: Create an audio buffer of given milliseconds
++int AUDIO_Create_Sound_Buffer(int milliseconds)
++{
++    int num_fragments;
++    int frag_size;
++    int found_pcmformat = TRUE;
++
++    if(milliseconds < 10) milliseconds = 10;
++    if(milliseconds > 250) milliseconds = 250;
++
++    num_fragments = 6;
++    frag_size = (int) (AUDIO_PCM_FREQ * (milliseconds / 1000.0f));
++
++    AUDIO_16Bits = TRUE;
++
++	struct gs_audio_format format;
++	format.frame_rate = AUDIO_PCM_FREQ;
++	format.channel_count = AUDIO_DBUF_CHANNELS;
++	format.format = gs_audio_format::B_GS_S16;
++	format.byte_order = B_MEDIA_LITTLE_ENDIAN;
++	format.buffer_size = 4096 * num_fragments;
++
++	AUDIO_Device = new BStreamingGameSound(4096, &format);
++	assert(AUDIO_Device->InitCheck() == B_OK);
++
++    AUDIO_SoundBuffer_Size = format.buffer_size;
++
++    AUDIO_Latency = AUDIO_SoundBuffer_Size;
++	assert(AUDIO_Latency != 0);
++
++	AUDIO_Device->SetStreamHook(&AUDIO_Callback, NULL);
++	AUDIO_Device->StartPlaying();
++    return(TRUE);
++}
++
++// ------------------------------------------------------
++// Name: AUDIO_Wait_For_Thread()
++// Desc: Wait for a command acknowledgment from the thread
++void AUDIO_Wait_For_Thread(void)
++{
++    usleep(10);
++}
++
++// ------------------------------------------------------
++// Name: AUDIO_Play()
++// Desc: Play the sound buffer endlessly
++void AUDIO_Play(void)
++{
++    AUDIO_ResetTimer();
++    AUDIO_Play_Flag = TRUE;
++    AUDIO_Wait_For_Thread();
++}
++
++// ------------------------------------------------------
++// Name: AUDIO_IsPlaying()
++// Desc: Return the playing state of the sound buffer
++int AUDIO_IsPlaying(void)
++{
++    return(AUDIO_Play_Flag);
++}
++
++// ------------------------------------------------------
++// Name: AUDIO_ResetTimer()
++// Desc: Reset the samples counter
++void AUDIO_ResetTimer(void)
++{
++    AUDIO_Samples = 0;
++    AUDIO_Timer = 0.0f;
++}
++
++// ------------------------------------------------------
++// Name: AUDIO_GetTime()
++// Desc: Return the played time in milliseconds
++float AUDIO_GetTime(void)
++{
++    return(AUDIO_Timer);
++}
++
++// ------------------------------------------------------
++// Name: AUDIO_GetSamples()
++// Desc: Return the played time in milliseconds
++int AUDIO_GetSamples(void)
++{
++    return(AUDIO_Samples);
++}
++
++// ------------------------------------------------------
++// Name: AUDIO_Stop()
++// Desc: Stop the sound buffer
++void AUDIO_Stop(void)
++{
++    AUDIO_Play_Flag = FALSE;
++    AUDIO_Wait_For_Thread();
++}
++
++// ------------------------------------------------------
++// Name: AUDIO_Stop_Sound_Buffer()
++// Desc: Release the audio buffer
++void AUDIO_Stop_Sound_Buffer(void)
++{
++    AUDIO_Stop();
++	AUDIO_Device->StopPlaying();
++}
++
++// ------------------------------------------------------
++// Name: AUDIO_Stop_Driver()
++// Desc: Stop everything
++void AUDIO_Stop_Driver(void)
++{
++    AUDIO_Stop_Sound_Buffer();
++    delete AUDIO_Device;
++    AUDIO_Device = 0;
++}
++
+diff --git a/release/distrib/replay/lib/wavpack.cpp b/release/distrib/replay/lib/wavpack.cpp
+index 4ced7c6..942d30d 100644
+--- a/release/distrib/replay/lib/wavpack.cpp
++++ b/release/distrib/replay/lib/wavpack.cpp
+@@ -33,6 +33,8 @@
+ // SUCH DAMAGE.
+ // ------------------------------------------------------
+ 
++#include <stdint.h>
++ 
+ #include "include/samples_unpack.h"
+ #include "include/wavpack.h"
+ 
+diff --git a/src/editors/editor_instrument.cpp b/src/editors/editor_instrument.cpp
+index 83312cf..0cb4db7 100644
+--- a/src/editors/editor_instrument.cpp
++++ b/src/editors/editor_instrument.cpp
+@@ -44,6 +44,10 @@
+ #include "../files/include/files.h"
+ #include "../ui/include/requesters.h"
+ 
++#if defined(__HAIKU__)
++#include <SupportDefs.h>
++#endif
++
+ // ------------------------------------------------------
+ // Variables
+ extern REQUESTER Overwrite_Requester;
+diff --git a/src/editors/editor_pattern.cpp b/src/editors/editor_pattern.cpp
+index e4674ac..29d4dec 100644
+--- a/src/editors/editor_pattern.cpp
++++ b/src/editors/editor_pattern.cpp
+@@ -38,6 +38,10 @@
+ #include "include/editor_instrument.h"
+ #include "include/editor_sequencer.h"
+ 
++#if defined(__HAIKU__)
++#include <SupportDefs.h>
++#endif
++
+ // ------------------------------------------------------
+ // Constants
+ #define POS_HORIZ_SLIDER 716
+diff --git a/src/extralibs/sdl_draw/makefile.haiku b/src/extralibs/sdl_draw/makefile.haiku
+new file mode 100644
+index 0000000..e321d5d
+--- /dev/null
++++ b/src/extralibs/sdl_draw/makefile.haiku
+@@ -0,0 +1,26 @@
++LIBFLAGS = -c
++FLAGS = -O2 -D G_OS_WIN32 -D __LINUX__ -D __GCC__
++LIBOBJS = draw_hline.o draw_line.o draw_pixel.o draw_vline.o
++
++all: sdldraw
++clean: RemLibObj
++
++RemLibObj:
++	-rm -f $(LIBOBJS)
++	
++sdldraw: $(LIBOBJS)
++	ar -d libsdldraw.a
++	ar -r libsdldraw.a $(LIBOBJS)
++	-rm -f $(LIBOBJS)
++
++draw_hline.o: src/draw_hline.cpp
++	g++-x86 -o $(@) $(LIBFLAGS) $(FLAGS) src/draw_hline.cpp
++
++draw_line.o: src/draw_line.cpp
++	g++-x86 -o $(@) $(LIBFLAGS) $(FLAGS) src/draw_line.cpp
++
++draw_pixel.o: src/draw_pixel.cpp
++	g++-x86 -o $(@) $(LIBFLAGS) $(FLAGS) src/draw_pixel.cpp
++
++draw_vline.o: src/draw_vline.cpp
++	g++-x86 -o $(@) $(LIBFLAGS) $(FLAGS) src/draw_vline.cpp
+diff --git a/src/extralibs/tinyxml/makefile.haiku b/src/extralibs/tinyxml/makefile.haiku
+new file mode 100644
+index 0000000..5ffb952
+--- /dev/null
++++ b/src/extralibs/tinyxml/makefile.haiku
+@@ -0,0 +1,130 @@
++#****************************************************************************
++#
++# Makefile for TinyXml test.
++# Lee Thomason
++# www.grinninglizard.com
++#
++# This is a GNU make (gmake) makefile
++#****************************************************************************
++
++# DEBUG can be set to YES to include debugging info, or NO otherwise
++DEBUG          := NO
++
++# PROFILE can be set to YES to include profiling info, or NO otherwise
++PROFILE        := NO
++
++# TINYXML_USE_STL can be used to turn on STL support. NO, then STL
++# will not be used. YES will include the STL files.
++TINYXML_USE_STL := NO
++
++#****************************************************************************
++
++CC     := gcc
++CXX    := g++
++LD     := g++
++AR     := ar rc
++RANLIB := ranlib
++
++DEBUG_CFLAGS     := -Wall -Wno-format -g -DDEBUG
++RELEASE_CFLAGS   := -Wall -Wno-unknown-pragmas -Wno-format -O3
++
++LIBS		 :=
++
++DEBUG_CXXFLAGS   := ${DEBUG_CFLAGS} 
++RELEASE_CXXFLAGS := ${RELEASE_CFLAGS}
++
++DEBUG_LDFLAGS    := -g
++RELEASE_LDFLAGS  :=
++
++ifeq (YES, ${DEBUG})
++   CFLAGS       := ${DEBUG_CFLAGS}
++   CXXFLAGS     := ${DEBUG_CXXFLAGS}
++   LDFLAGS      := ${DEBUG_LDFLAGS}
++else
++   CFLAGS       := ${RELEASE_CFLAGS}
++   CXXFLAGS     := ${RELEASE_CXXFLAGS}
++   LDFLAGS      := ${RELEASE_LDFLAGS}
++endif
++
++ifeq (YES, ${PROFILE})
++   CFLAGS   := ${CFLAGS} -pg -O3
++   CXXFLAGS := ${CXXFLAGS} -pg -O3
++   LDFLAGS  := ${LDFLAGS} -pg
++endif
++
++#****************************************************************************
++# Preprocessor directives
++#****************************************************************************
++
++ifeq (YES, ${TINYXML_USE_STL})
++  DEFS := -DTIXML_USE_STL
++else
++  DEFS :=
++endif
++
++#****************************************************************************
++# Include paths
++#****************************************************************************
++
++#INCS := -I/usr/include/g++-2 -I/usr/local/include
++INCS :=
++
++
++#****************************************************************************
++# Makefile code common to all platforms
++#****************************************************************************
++
++CFLAGS   := ${CFLAGS}   ${DEFS}
++CXXFLAGS := ${CXXFLAGS} ${DEFS}
++
++#****************************************************************************
++# Targets of the build
++#****************************************************************************
++
++OUTPUT := xmltest
++
++all: ${OUTPUT}
++
++
++#****************************************************************************
++# Source files
++#****************************************************************************
++
++SRCS := tinyxml.cpp tinyxmlparser.cpp xmltest.cpp tinyxmlerror.cpp tinystr.cpp
++
++# Add on the sources for libraries
++SRCS := ${SRCS}
++
++OBJS := $(addsuffix .o,$(basename ${SRCS}))
++
++#****************************************************************************
++# Output
++#****************************************************************************
++
++${OUTPUT}: ${OBJS}
++	${LD} -o $@ ${LDFLAGS} ${OBJS} ${LIBS} ${EXTRA_LIBS}
++
++#****************************************************************************
++# common rules
++#****************************************************************************
++
++# Rules for compiling source files to object files
++%.o : %.cpp
++	${CXX} -c ${CXXFLAGS} ${INCS} $< -o $@
++
++%.o : %.c
++	${CC} -c ${CFLAGS} ${INCS} $< -o $@
++
++dist:
++	bash makedistlinux
++
++clean:
++	-rm -f core ${OBJS} ${OUTPUT}
++
++depend:
++	#makedepend ${INCS} ${SRCS}
++
++tinyxml.o: tinyxml.h tinystr.h
++tinyxmlparser.o: tinyxml.h tinystr.h
++xmltest.o: tinyxml.h tinystr.h
++tinyxmlerror.o: tinyxml.h tinystr.h
+diff --git a/src/files/files_list.cpp b/src/files/files_list.cpp
+index 6cd2848..fed9828 100644
+--- a/src/files/files_list.cpp
++++ b/src/files/files_list.cpp
+@@ -286,7 +286,7 @@ void Set_Current_Dir(void)
+     }
+ }
+ 
+-#if defined(__LINUX__) || defined(__MACOSX__)
++#if defined(__LINUX__) || defined(__MACOSX__) || defined(__HAIKU__)
+ int list_file(const char *fpath, const struct stat *sb, int typeflag, struct FTW *ftwbuf)
+ {
+     int i;
+diff --git a/src/samples/include/samples_ops.h b/src/samples/include/samples_ops.h
+index 3b0a640..752427b 100644
+--- a/src/samples/include/samples_ops.h
++++ b/src/samples/include/samples_ops.h
+@@ -37,6 +37,10 @@
+ #include "../../include/variables.h"
+ #include "../../ui/include/misc_draw.h"
+ 
++#if defined(__HAIKU__)
++#include <SupportDefs.h>
++#endif
++
+ // ------------------------------------------------------
+ // Variables
+ extern int cur_sample_buffer;
+diff --git a/src/support/main.cpp b/src/support/main.cpp
+index c08685a..bd4c97b 100644
+--- a/src/support/main.cpp
++++ b/src/support/main.cpp
+@@ -59,6 +59,10 @@
+ #include <mach-o/dyld.h>
+ #endif
+ 
++#if defined(__HAIKU__)
++#include <libgen.h>
++#endif
++
+ #if defined(__AMIGAOS4__) || defined(__AROS__)
+ const char *AMIGA_VERSION = "\0$VER: " TITLE " " VER_VER "." VER_REV "." VER_REVSMALL "\0";
+ #endif
+@@ -444,6 +448,9 @@ extern SDL_NEED int SDL_main(int argc, char *argv[])
+     }
+     CHDIR(ExePath);
+ 
++#elif defined(__HAIKU__)
++	chdir(dirname(argv[0]));
++    GETCWD(ExePath, MAX_PATH);
+ #elif defined(__AMIGAOS4__) || defined(__AROS__)
+     CHDIR("/PROGDIR/");
+     GETCWD(ExePath, MAX_PATH);
+-- 
+1.8.3.4
+
diff --git a/media-sound/protrekkr/protrekkr-2.5.4.recipe b/media-sound/protrekkr/protrekkr-2.5.4.recipe
new file mode 100644
index 000000000..134b90153
--- /dev/null
+++ b/media-sound/protrekkr/protrekkr-2.5.4.recipe
@@ -0,0 +1,56 @@
+SUMMARY="Tracker program to create small sized electronic music"
+DESCRIPTION="
+ProTrekkr (formerly known as NoiseTrekker by Juan Antonio Arguelles Rius aka \
+Arguru) is a tracker program combining a software synthesizer together with a \
+traditional samples tracker which can be used to create electronic music (like \
+psytrance, trance goa, hard acid, IDM, chip, techno, etc.) for small sized \
+intros, demos or games.
+"
+HOMEPAGE="http://code.google.com/p/protrekkr/"
+COPYRIGHT="2008-2010 Franck Charlet.
+Based on Juan Antonio Arguelles Rius's NoiseTrekker.
+	"
+LICENSE="BSD (3-clause)"
+SRC_URI="svn+http://protrekkr.googlecode.com/svn/trunk/#670"
+REVISION="2"
+ARCHITECTURES="x86"
+if [ $effectiveTargetArchitecture != x86_gcc2 ]; then
+	# x86_gcc2 is fine as primary target architecture as long as we're building
+	# for a different secondary architecture.
+	ARCHITECTURES="$ARCHITECTURES x86_gcc2"
+fi
+SECONDARY_ARCHITECTURES="x86"
+
+PROVIDES="
+	protrekkr${secondaryArchSuffix} = $portVersion
+	app:Protrekkr = $portVersion
+	"
+
+REQUIRES="
+	haiku${secondaryArchSuffix} >= $haikuVersion
+	lib:libSDL$secondaryArchSuffix
+	"
+BUILD_REQUIRES="
+	devel:libSDL$secondaryArchSuffix
+	"
+BUILD_PREREQUIRES="
+	haiku${secondaryArchSuffix}_devel >= $haikuVersion
+	cmd:gcc${secondaryArchSuffix}
+	cmd:ld${secondaryArchSuffix}
+	cmd:make
+	"
+
+PATCHES="protrekkr-2.5.4.patchset"
+BUILD()
+{
+	make -f makefile.haiku
+}
+
+INSTALL()
+{
+	TARGET_DIR=$appsDir/Protrekkr
+	mkdir -p $TARGET_DIR
+	cd release/distrib
+	cp -r history.txt instruments license.txt modules presets ptk_haiku replay reverbs skins $TARGET_DIR
+	addAppDeskbarSymlink $TARGET_DIR/ptk_haiku Protrekkr
+}
diff --git a/media-sound/vorbis_tools/vorbis_tools-1.4.0.recipe b/media-sound/vorbis_tools/vorbis_tools-1.4.0.recipe
index 2b0eb890e..a0e9d737a 100644
--- a/media-sound/vorbis_tools/vorbis_tools-1.4.0.recipe
+++ b/media-sound/vorbis_tools/vorbis_tools-1.4.0.recipe
@@ -4,7 +4,7 @@ vorbis-tools - tools for using the Ogg Vorbis sound file format.
 "
 HOMEPAGE="http://www.vorbis.com/" 
 SRC_URI="http://downloads.xiph.org/releases/vorbis/vorbis-tools-1.4.0.tar.gz"
-CHECKSUM_MD5="567e0fb8d321b2cd7124f8208b8b90e6"
+CHECKSUM_SHA256="a389395baa43f8e5a796c99daf62397e435a7e73531c9f44d9084055a05d22bc"
 REVISION="1"
 LICENSE="GNU GPL v2"
 COPYRIGHT="2000-2005 Michael Smith, Stan Seibert and other contributers"
diff --git a/media-video/ffmpeg/ffmpeg-0.10.2.recipe b/media-video/ffmpeg/ffmpeg-0.10.2.recipe
index e3faca548..e0e59173a 100644
--- a/media-video/ffmpeg/ffmpeg-0.10.2.recipe
+++ b/media-video/ffmpeg/ffmpeg-0.10.2.recipe
@@ -13,12 +13,12 @@ COPYRIGHT="
 	2003-2012 the FFmpeg developers
 	"
 SRC_URI="http://www.ffmpeg.org/releases/ffmpeg-0.10.2.tar.bz2"
-CHECKSUM_MD5="de1bd5fc4bbf3ef730a5361ee596fedd"
+CHECKSUM_SHA256="2d990012091c07849843c456eb34ad015a00f45a66cba5be7c81a28e45fb6711"
 REVISION="5"
 ARCHITECTURES="x86_gcc2 x86 x86_64"
 SECONDARY_ARCHITECTURES="x86_gcc2 x86"
 
-if [ $targetArchitecture == x86_gcc2 ]; then
+if [ $effectiveTargetArchitecture == x86_gcc2 ]; then
 	PATCHES="ffmpeg-0.10.2-gcc2.patch"
 fi
 
@@ -65,6 +65,7 @@ BUILD_PREREQUIRES="
 	haiku${secondaryArchSuffix}_devel >= $haikuVersion
 	cmd:gcc$secondaryArchSuffix
 	cmd:ld$secondaryArchSuffix
+	cmd:awk
 	cmd:make
 	cmd:perl
 	cmd:pkg_config
diff --git a/media-video/ffmpeg/ffmpeg-0.11.1.recipe b/media-video/ffmpeg/ffmpeg-0.11.1.recipe
index 7012ca25f..fbf5c1998 100644
--- a/media-video/ffmpeg/ffmpeg-0.11.1.recipe
+++ b/media-video/ffmpeg/ffmpeg-0.11.1.recipe
@@ -1,33 +1,161 @@
+SUMMARY="Audio and video recording, conversion, and streaming library"
 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"
+LICENSE="
+	GNU LGPL v2.1
+	GNU GPL v2
+	"
+COPYRIGHT="
+	2000-2003 Fabrice Bellard
+	2003-2012 the FFmpeg developers
+	"
 SRC_URI="http://www.ffmpeg.org/releases/ffmpeg-0.11.1.tar.bz2"
-CHECKSUM_MD5="ff8cb914f657e164dd60ea1008b555a8"
+CHECKSUM_SHA256="b01ddfb6352c84810879988f43172c5f7be555697edb929625845c7bb953fa96"
 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"
+ARCHITECTURES="x86"
+if [ $effectiveTargetArchitecture != x86_gcc2 ]; then
+	ARCHITECTURES="$ARCHITECTURES x86_gcc2"
+fi
+SECONDARY_ARCHITECTURES="x86"
+
+PROVIDES="
+	ffmpeg$secondaryArchSuffix = $portVersion compat >= 0.11
+	lib:libavcodec$secondaryArchSuffix = 53.61.100 compat >= 53
+	lib:libavdevice$secondaryArchSuffix = 53.4.100 compat >= 53
+	lib:libavfilter$secondaryArchSuffix = 2.61.100 compat >= 2
+	lib:libavformat$secondaryArchSuffix = 53.32.100 compat >= 53
+	lib:libavutil$secondaryArchSuffix = 51.35.100 compat >= 51
+	lib:libswresample$secondaryArchSuffix = 0.6.100 compat >= 0
+	lib:libswscale$secondaryArchSuffix = 2.1.100 compat >= 2
+	"
+if [ -z "$secondaryArchSuffix" ]; then
+	PROVIDES="$PROVIDES
+		cmd:ffmpeg = $portVersion compat >= 0.11
+		cmd:ffprobe = $portVersion compat >= 0.11
+		cmd:ffserver = $portVersion compat >= 0.11
+		"
+fi
+
+REQUIRES="
+	haiku$secondaryArchSuffix >= $haikuVersion
+	lib:libbz2$secondaryArchSuffix
+	lib:libogg$secondaryArchSuffix
+	lib:libspeex$secondaryArchSuffix
+	lib:libtheoradec$secondaryArchSuffix
+	lib:libtheoraenc$secondaryArchSuffix
+	lib:libvorbis$secondaryArchSuffix
+	lib:libvorbisenc$secondaryArchSuffix
+	lib:libvpx$secondaryArchSuffix
+	lib:libz$secondaryArchSuffix
+	"
+BUILD_REQUIRES="
+	devel:libbz2$secondaryArchSuffix
+	devel:libogg$secondaryArchSuffix
+	devel:libspeex$secondaryArchSuffix
+	devel:libtheora$secondaryArchSuffix
+	devel:libvorbis$secondaryArchSuffix
+	devel:libvpx$secondaryArchSuffix
+	devel:libz$secondaryArchSuffix
+	"
+BUILD_PREREQUIRES="
+	haiku${secondaryArchSuffix}_devel >= $haikuVersion
+	cmd:gcc$secondaryArchSuffix
+	cmd:ld$secondaryArchSuffix
+	cmd:awk
+	cmd:make
+	cmd:perl
+	cmd:pkg_config
+	cmd:texi2html
+	cmd:yasm
+	"
+
+GLOBAL_WRITABLE_FILES="
+	settings/ffserver.conf
+	"
+
+PATCH()
+{
+	# patch hard-coded config file path
+	sed -i "s,/etc/ffserver.conf,$sysconfDir/ffserver.conf," \
+		ffserver.c \
+		doc/ffserver.texi
+
+	# patch hard-coded paths to perl
+	sed -i "s,/usr/bin/perl,$portPackageLinksDir/cmd~perl/bin/perl," \
+		Doxyfile \
+		doc/texi2pod.pl
+}
+
 BUILD()
 {
-	cd ffmpeg-0.11.1
-	./configure --prefix=`finddir B_COMMON_DIRECTORY` --disable-debug --enable-shared \
-		--enable-libvorbis --enable-libspeex --enable-libtheora --enable-libvpx \
-		--datadir=`finddir B_COMMON_DATA_DIRECTORY`
-	make
+	# not an auto tools configure
+	./configure \
+		--prefix=$prefix \
+		--bindir=$binDir \
+		--datadir=$dataDir/$portName \
+		--incdir=$includeDir \
+		--libdir=$libDir \
+		--shlibdir=$libDir \
+		--mandir=$manDir \
+		--disable-debug \
+		--enable-shared \
+		--enable-libvorbis \
+		--enable-libspeex \
+		--enable-libtheora \
+		--enable-libvpx
+	make $jobArgs
 }
 
 INSTALL()
 {
-	cd ffmpeg-0.11.1
 	make install
+
+	rm $binDir/ffprobe
+		# TODO: Determine and fix what is wrong with ffprobe! The executable
+		# seems to be broken. The NEEDED entries in the dynamic section look
+		# weird and the runtime loader fails relocating with "Operation not
+		# allowed".
+
+	prepareInstalledDevelLibs \
+		libavcodec \
+		libavdevice \
+		libavfilter \
+		libavformat \
+		libavutil \
+		libswresample \
+		libswscale
+	fixPkgconfig
+
+	# include the documented ffserver.conf
+	mkdir -p $docDir
+	cp doc/ffserver.conf $docDir
+
+	# devel package
+	packageEntries devel \
+		$developDir
+
+	# Remove stuff we don't need in the secondary architecture base package.
+	if [ -n "$secondaryArchSuffix" ]; then
+		rm -rf $prefix/bin
+		rm -rf $documentationDir
+	fi
 }
 
-LICENSE="GNU LGPL v2.1
-	GNU GPL v2"
-COPYRIGHT="2000-2003 Fabrice Bellard
-	2003-2012 the FFmpeg developers"
+# ----- devel package -------------------------------------------------------
+
+PROVIDES_devel="
+	ffmpeg${secondaryArchSuffix}_devel = $portVersion compat >= 0.11
+	devel:libavcodec$secondaryArchSuffix = 53.61.100 compat >= 53
+	devel:libavdevice$secondaryArchSuffix = 53.4.100 compat >= 53
+	devel:libavfilter$secondaryArchSuffix = 2.61.100 compat >= 2
+	devel:libavformat$secondaryArchSuffix = 53.32.100 compat >= 53
+	devel:libavutil$secondaryArchSuffix = 51.35.100 compat >= 51
+	devel:libswresample$secondaryArchSuffix = 0.6.100 compat >= 0
+	devel:libswscale$secondaryArchSuffix = 2.1.100 compat >= 2
+	"
+REQUIRES_devel="
+	ffmpeg$secondaryArchSuffix == $portVersion
+	"
diff --git a/media-video/gnash/gnash-0.8.10.recipe b/media-video/gnash/gnash-0.8.10.recipe
index afe466e19..3df4afd0a 100644
--- a/media-video/gnash/gnash-0.8.10.recipe
+++ b/media-video/gnash/gnash-0.8.10.recipe
@@ -4,26 +4,26 @@ Gnash is a player for the Adobe Flash technology.
 "
 HOMEPAGE="http://www.gnu.org/software/gnash/"
 SRC_URI="ftp://ftp.gnu.org/pub/gnu/gnash/0.8.10/gnash-0.8.10.tar.bz2"
-CHECKSUM_MD5="63e9f79c41d93d48c5a2fa94856548c4"
+CHECKSUM_SHA256="9625072e45df92baa2c28fc9999d4e2deb66bc827530baedfad2e4e2292d1224"
 COPYRIGHT="2005-2012 Free Software Foundation"
 LICENSE="GNU GPL v3"
-REVISION="1"
+REVISION="2"
 
 ARCHITECTURES="!x86 !x86_64"
 if [ $effectiveTargetArchitecture != x86_gcc2 ]; then
-	ARCHITECTURES="$ARCHITECTURES !x86_gcc2"
-else
-	ARCHITECTURES="$ARCHITECTURES !x86_gcc2"
+	ARCHITECTURES="$ARCHITECTURES x86_gcc2"
 fi
-SECONDARY_ARCHITECTURES="!x86 !x86_64"
+SECONDARY_ARCHITECTURES="!x86"
 
 PROVIDES="
 	gnash$secondaryArchSuffix = $portVersion
+	app:Gnash = $portVersion
 "
 REQUIRES="
 	haiku$secondaryArchSuffix >= $haikuVersion
 	lib:libsdl$secondaryArchSuffix
 	lib:libz$secondaryArchSuffix
+	lib:libbz2$secondaryArchSuffix
 	lib:libpng$secondaryArchSuffix
 	lib:libjpeg$secondaryArchSuffix
 	lib:libgif$secondaryArchSuffix
@@ -36,18 +36,21 @@ REQUIRES="
 	lib:libboost_iostreams$secondaryArchSuffix
 	lib:libboost_serialization$secondaryArchSuffix
 	lib:libboost_date_time$secondaryArchSuffix
+	lib:libboost_system$secondaryArchSuffix
 	lib:libssl$secondaryArchSuffix
 	lib:libcrypto$secondaryArchSuffix
 	lib:libsdl_sound$secondaryArchSuffix
 	lib:libagg$secondaryArchSuffix
-	#lib:libfreetype$secondaryArchSuffix
+	lib:libfreetype$secondaryArchSuffix
 	#lib:libfontconfig$secondaryArchSuffix
 	lib:libiconv$secondaryArchSuffix
+	lib:libintl$secondaryArchSuffix
 "
 BUILD_REQUIRES="
 	haiku${secondaryArchSuffix}_devel >= $haikuVersion
 	devel:libsdl$secondaryArchSuffix
 	devel:libz$secondaryArchSuffix
+	devel:libbz2$secondaryArchSuffix
 	devel:libpng$secondaryArchSuffix
 	devel:libjpeg$secondaryArchSuffix
 	devel:libgif$secondaryArchSuffix
@@ -61,43 +64,51 @@ BUILD_REQUIRES="
 	devel:libboost_iostreams$secondaryArchSuffix
 	devel:libboost_serialization$secondaryArchSuffix
 	devel:libboost_date_time$secondaryArchSuffix
+	devel:libboost_system$secondaryArchSuffix
 	devel:libssl$secondaryArchSuffix
 	devel:libcrypto$secondaryArchSuffix
 	devel:libsdl_sound$secondaryArchSuffix
 	devel:libagg$secondaryArchSuffix
 	#devel:libfontconfig$secondaryArchSuffix
-	#devel:libfreetype$secondaryArchSuffix
+	devel:libfreetype$secondaryArchSuffix
 	devel:libiconv$secondaryArchSuffix
+	devel:libintl$secondaryArchSuffix
 "
 BUILD_PREREQUIRES="
-	cmd:pkg_config
 	cmd:gcc$secondaryArchSuffix
 	cmd:ld$secondaryArchSuffix
 	cmd:make
+	cmd:awk
+	cmd:sed
+	cmd:libtoolize
+	cmd:aclocal
+	cmd:autoconf
+	cmd:automake
+	cmd:pkg_config$secondaryArchSuffix
+	cmd:sdl_config$secondaryArchSuffix
+	cmd:xargs
 "
 
-SOURCE_DIR="gnash-0.8.10"
-
-PATCHES="
-	GnashImageGif.patch
-	utility.patch
-"
+PATCHES="gnash-0.8.10.patchset"
 
 BUILD()
-{	
-	INCLUDE_DIR=`finddir B_SYSTEM_DIRECTORY`/$relativeIncludeDir 
+{
+	INCLUDE_DIR=`finddir B_SYSTEM_DIRECTORY`/$relativeIncludeDir
 	LIB_DIR=`finddir B_SYSTEM_DIRECTORY`/$relativeDevelopLibDir
 	
-	export PKG_CONFIG_LIBDIR="`finddir B_SYSTEM_DIRECTORY`/$relativeDevelopLibDir/pkgconfig"
-
-	./configure --enable-renderer=agg --enable-media=ffmpeg \
-		--enable-gui=sdl --enable-sound=sdl --without-gconf --disable-extensions \
-		--with-agg-incl=$INCLUDE_DIR/agg \
-		--with-agg-lib=$LIB_DIR
-		--includedir=$INCLUDE_DIR
-		--bindir=$appsDir
-		--libdir=$LIB_DIR
-	make
+	libtoolize --force --copy --install
+	aclocal
+	autoconf
+	automake
+	runConfigure ./configure --enable-renderer=agg --enable-media=ffmpeg \
+		--enable-gui=sdl --enable-sound=sdl --without-gconf \
+		--disable-extensions \
+		--with-boost-incl=$INCLUDE_DIR/boost \
+		--with-boost-lib=$LIB_DIR \
+		--includedir=$includeDir \
+		--bindir=$appsDir \
+		--libdir=$libDir
+	make $jobArgs
 }
 INSTALL()
 {
diff --git a/media-video/gnash/patches/GnashImageGif.patch b/media-video/gnash/patches/GnashImageGif.patch
deleted file mode 100644
index 3d3e502c7..000000000
--- a/media-video/gnash/patches/GnashImageGif.patch
+++ /dev/null
@@ -1,14 +0,0 @@
-diff --git a/libbase/GnashImageGif.cpp b/libbase/GnashImageGif.cpp
-index eeba4b7..bddb452 100644
---- a/libbase/GnashImageGif.cpp
-+++ b/libbase/GnashImageGif.cpp
-@@ -269,7 +269,8 @@ GifInput::processRecord(GifRecordType record)
- void
- GifInput::read()
- {
--    _gif = DGifOpen(_inStream.get(), &readData); 
-+	int error_code;
-+    _gif = DGifOpen(_inStream.get(), &readData, &error_code); 
- 
-     GifRecordType record;
- 
diff --git a/media-video/gnash/patches/gnash-0.8.10.patchset b/media-video/gnash/patches/gnash-0.8.10.patchset
new file mode 100644
index 000000000..01be8c9cd
--- /dev/null
+++ b/media-video/gnash/patches/gnash-0.8.10.patchset
@@ -0,0 +1,49 @@
+From 27ea051c05dcc53eb9ea2359f7e71eaacc8c2ada Mon Sep 17 00:00:00 2001
+From: Kacper Kasper <kacperkasper@gmail.com>
+Date: Thu, 24 Apr 2014 22:18:34 +0000
+Subject: fix Haiku build
+
+
+diff --git a/libbase/GnashImageGif.cpp b/libbase/GnashImageGif.cpp
+index eeba4b7..bddb452 100644
+--- a/libbase/GnashImageGif.cpp
++++ b/libbase/GnashImageGif.cpp
+@@ -269,7 +269,8 @@ GifInput::processRecord(GifRecordType record)
+ void
+ GifInput::read()
+ {
+-    _gif = DGifOpen(_inStream.get(), &readData); 
++	int error_code;
++    _gif = DGifOpen(_inStream.get(), &readData, &error_code); 
+ 
+     GifRecordType record;
+ 
+diff --git a/libbase/utility.h b/libbase/utility.h
+index 8b9f48c..51ea858 100644
+--- a/libbase/utility.h
++++ b/libbase/utility.h
+@@ -61,7 +61,7 @@ namespace std
+ };
+ #endif
+ 
+-#if defined(__HAIKU__)
++#if defined(__HAIKU_OLD)
+ namespace std {
+ 	class wstring : public std::basic_string<char>
+ 	{
+diff --git a/macros/boost.m4 b/macros/boost.m4
+index 845aaae..5788f57 100644
+--- a/macros/boost.m4
++++ b/macros/boost.m4
+@@ -37,7 +37,7 @@ AC_DEFUN([GNASH_PATH_BOOST],
+   boost_headers="detail/lightweight_mutex.hpp thread/thread.hpp multi_index_container.hpp multi_index/key_extractors.hpp thread/mutex.hpp program_options/options_description.hpp iostreams/stream.hpp"
+   dnl this is a list of *required* libraries. If any of these are missing, this
+   dnl test will return a failure, and Gnash won't build.
+-  boost_libs="thread program_options iostreams"
++  boost_libs="thread program_options iostreams system"
+ 
+   dnl this is a list of *recommended* libraries. If any of these are missing, this
+   dnl test will return a warning, and Gnash will build, but testing won't work.
+-- 
+1.8.3.4
+
diff --git a/media-video/gnash/patches/utility.patch b/media-video/gnash/patches/utility.patch
deleted file mode 100644
index 865733ee0..000000000
--- a/media-video/gnash/patches/utility.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-diff --git a/libbase/utility.h b/libbase/utility.h
-index 8b9f48c..51ea858 100644
---- a/libbase/utility.h
-+++ b/libbase/utility.h
-@@ -61,7 +61,7 @@ namespace std
- };
- #endif
- 
--#if defined(__HAIKU__)
-+#if defined(__HAIKU_OLD)
- namespace std {
- 	class wstring : public std::basic_string<char>
- 	{
diff --git a/net-dialup/minicom/minicom-2.6.2.recipe b/net-dialup/minicom/minicom-2.6.2.recipe
index 7db45c7d7..2874f1726 100644
--- a/net-dialup/minicom/minicom-2.6.2.recipe
+++ b/net-dialup/minicom/minicom-2.6.2.recipe
@@ -5,7 +5,7 @@ terminals. It has a dialing directory and auto zmodem download.
 "
 HOMEPAGE="https://alioth.debian.org/projects/minicom/"
 SRC_URI="https://alioth.debian.org/frs/download.php/file/3869/minicom-2.6.2.tar.gz"
-CHECKSUM_MD5="203c56c4b447f45e2301b0cc4e83da3c"
+CHECKSUM_SHA256="f3cf215f7914ffa5528e398962176102ad74df27ba38958142f56aa6d15c9168"
 COPYRIGHT="
 	1991,1992,1993,1994,1995,1996 Miquel van Smoorenburg."
 LICENSE="GNU GPL v2"
diff --git a/net-dns/c_ares/c_ares-1.10.0.recipe b/net-dns/c_ares/c_ares-1.10.0.recipe
index 691e39bec..59540d256 100644
--- a/net-dns/c_ares/c_ares-1.10.0.recipe
+++ b/net-dns/c_ares/c_ares-1.10.0.recipe
@@ -8,7 +8,7 @@ with graphical user interfaces.
 "
 HOMEPAGE="http://c-ares.haxx.se/"
 SRC_URI="http://c-ares.haxx.se/download/c-ares-1.10.0.tar.gz"
-CHECKSUM_MD5="1196067641411a75d3cbebe074fd36d8"
+CHECKSUM_SHA256="3d701674615d1158e56a59aaede7891f2dde3da0f46a6d3c684e0ae70f52d3db"
 COPYRIGHT="
 	2004-2013 by Daniel Stenberg et al
 	1998-2013 by the Massachusetts Institute of Technology
diff --git a/net-ftp/lftp/lftp-4.4.16.recipe b/net-ftp/lftp/lftp-4.4.16.recipe
new file mode 100644
index 000000000..ad2406a01
--- /dev/null
+++ b/net-ftp/lftp/lftp-4.4.16.recipe
@@ -0,0 +1,114 @@
+SUMMARY="A sophisticated file transfer program with command line interface."
+HOMEPAGE="http://lftp.yar.ru"
+COPYRIGHT="1996-2012 by Alexander V. Lukyanov"
+LICENSE="GNU GPL v3"
+SRC_URI="http://lftp.yar.ru/ftp/lftp-$portVersion.tar.gz"
+CHECKSUM_SHA256="441f472f9d3f13b0861fbf3e45f5d08d8cf999d2229b4ee446815d52ad673bf2"
+REVISION="1"
+ARCHITECTURES="!x86_gcc2 x86 x86_64 arm"
+
+PATCHES="lftp-$portVersion.patchset"
+
+GLOBAL_WRITABLE_FILES="
+	settings/lftp.conf keep-old
+"
+
+PROVIDES="
+	lftp = $portVersion
+	lib:liblftp_jobs$secondaryArchSuffix = 0.0.0 compat >= 0
+	lib:liblftp_tasks$secondaryArchSuffix = 0.0.0 compat >= 0
+	"
+	
+if [ -z "$secondaryArchSuffix" ]; then
+	PROVIDES="$PROVIDES
+		cmd:lftp = $portVersion compat >= 4
+		cmd:lftpget = $portVersion compat >= 4
+		"
+fi
+
+REQUIRES="
+	haiku$secondaryArchSuffix >= $haikuVersion
+	ca_root_certificates
+	lib:libreadline$secondaryArchSuffix
+	lib:libcrypto$secondaryArchSuffix
+	lib:libz$secondaryArchSuffix
+	"
+BUILD_REQUIRES="
+	haiku${secondaryArchSuffix}_devel >= $haikuVersion
+	devel:libreadline$secondaryArchSuffix
+	devel:libcrypto$secondaryArchSuffix
+	devel:libz$secondaryArchSuffix
+	"
+BUILD_PREREQUIRES="
+	cmd:autoconf
+	cmd:automake
+	cmd:aclocal
+	cmd:gcc$secondaryArchSuffix
+	cmd:ld$secondaryArchSuffix
+	cmd:libtoolize
+	cmd:make
+	cmd:find
+	cmd:pkg_config
+	cmd:sed
+	"
+
+PATCH()
+{
+	sed -i configure.ac -e 's|^AM_CONFIG_HEADER|AC_CONFIG_HEADERS|g'
+}
+
+BUILD()
+{
+	libtoolize --force --copy --install
+	aclocal -I m4
+	autoconf
+	automake
+	runConfigure ./configure --with-openssl --enable-static \
+		--with-modules
+	make $jobArgs
+}
+
+INSTALL()
+{
+	make install
+	
+	# prepare develop/lib
+	prepareInstalledDevelLibs liblftp-jobs liblftp-tasks
+	fixPkgconfig
+
+	# devel package
+	packageEntries devel \
+		$developDir
+		
+	# Remove stuff we don't need in the secondary architecture base package.
+	if [ -n "$secondaryArchSuffix" ]; then
+		rm -rf $binDir
+		rm -rf $documentationDir
+	fi
+}
+
+TEST()
+{
+	make check
+}
+
+DESCRIPTION="
+lftp is sophisticated file transfer program with command line interface. It \
+supports FTP, HTTP, FISH, SFTP and FILE (local FS) protocols. GNU Readline \
+library is used for input. BitTorrent protocol is supported as built-in \
+torrent command.
+Low level stuff supported: ftp proxy, http proxy, ftp over http, opie/skey, \
+fxp transfers, automatic retrying on non-fatal errors and timeouts, ipv6, \
+socks, http/1.1, sftp v3-v6.
+"
+
+# ----- devel package -------------------------------------------------------
+
+PROVIDES_devel="
+	lftp${secondaryArchSuffix}_devel = $portVersion
+	devel:liblftp_jobs$secondaryArchSuffix = 0.0.0 compat >= 0
+	devel:liblftp_tasks$secondaryArchSuffix = 0.0.0 compat >= 0
+	"
+REQUIRES_devel="
+	lftp$secondaryArchSuffix == $portVersion base
+	"
diff --git a/net-irc/quassel/quassel-0.9.2.recipe b/net-irc/quassel/quassel-0.9.2.recipe
index b94053ac4..a3725e308 100644
--- a/net-irc/quassel/quassel-0.9.2.recipe
+++ b/net-irc/quassel/quassel-0.9.2.recipe
@@ -11,7 +11,7 @@ available.
 "
 HOMEPAGE="http://quassel-irc.org"
 SRC_URI="http://quassel-irc.org/pub/quassel-0.9.2.tar.bz2"
-CHECKSUM_MD5="4ed88d288f60290f4459d3e68d61b037"
+CHECKSUM_SHA256="f04d01602509c1d950602502e5f51aba47d99c73a9c70e77c563bb7749fc53c0"
 REVISION="2"
 LICENSE="
 	GNU GPL v2
diff --git a/net-libs/enet/enet-1.3.0.recipe b/net-libs/enet/enet-1.3.0.recipe
index 59b36e7fe..f6240277b 100644
--- a/net-libs/enet/enet-1.3.0.recipe
+++ b/net-libs/enet/enet-1.3.0.recipe
@@ -10,7 +10,7 @@ portable, and easily embeddable.
 "
 HOMEPAGE="http://enet.bespin.org" 
 SRC_URI="http://enet.bespin.org/download/enet-1.3.0.tar.gz"
-CHECKSUM_MD5="3ea50cc5f2f4bbea32abae0d50b64e3c"
+CHECKSUM_SHA256="200c271b218979db3bce6d9e60659d3f35a52d698c4972f20eb91a52f0d8d62c"
 ARCHITECTURES="x86_gcc2 ?x86 ?x86_64"
 SECONDARY_ARCHITECTURES="?x86_gcc2 ?x86"
 REVISION="1"
diff --git a/net-libs/gloox/gloox-1.0.9.recipe b/net-libs/gloox/gloox-1.0.9.recipe
index f846d7488..161170ba2 100644
--- a/net-libs/gloox/gloox-1.0.9.recipe
+++ b/net-libs/gloox/gloox-1.0.9.recipe
@@ -6,7 +6,7 @@ HOMEPAGE="http://camaya.net/gloox/"
 LICENSE="GNU GPL v2"
 COPYRIGHT="2002-2012 Jakob Schröter"
 SRC_URI="http://camaya.net/download/gloox-1.0.9.tar.bz2"
-CHECKSUM_MD5="48fc9aa5210c2a1ce253751a4d38e19c"
+CHECKSUM_SHA256="143dd50e1edc4eb1d304fa28bdd6ab9e53b60c37c1726dd0e34c06c51f9a453e"
 REVISION="1"
 ARCHITECTURES="x86 ?x86_64"
 if [ $effectiveTargetArchitecture != x86_gcc2 ]; then
diff --git a/net-misc/axel/axel-2.4.recipe b/net-misc/axel/axel-2.4.recipe
index e9e5d418b..51f909eed 100644
--- a/net-misc/axel/axel-2.4.recipe
+++ b/net-misc/axel/axel-2.4.recipe
@@ -6,8 +6,8 @@ no dependencies and is lightweight, so it might be useful as a wget clone on \
 byte-critical systems.
 "
 HOMEPAGE="http://axel.alioth.debian.org/"
-SRC_URI="https://alioth.debian.org/frs/download.php/file/3015/axel-2.4.tar.gz"
-CHECKSUM_MD5="a2a762fce0c96781965c8f9786a3d09d"
+SRC_URI="http://pkgs.fedoraproject.org/repo/pkgs/axel/axel-2.4.tar.gz/a2a762fce0c96781965c8f9786a3d09d/axel-2.4.tar.gz"
+CHECKSUM_SHA256="359a57ab4e354bcb6075430d977c59d33eb3e2f1415a811948fa8ae657ca8036"
 REVISION="1"
 LICENSE="GNU GPL v2"
 COPYRIGHT="2001 Wilmer van der Gaast."
diff --git a/net-misc/curl/curl-7.26.0.recipe b/net-misc/curl/curl-7.26.0.recipe
index 50cf2a890..118a6c17a 100644
--- a/net-misc/curl/curl-7.26.0.recipe
+++ b/net-misc/curl/curl-7.26.0.recipe
@@ -3,7 +3,7 @@ HOMEPAGE="http://curl.haxx.se"
 COPYRIGHT="1996-2012, Daniel Stenberg, <daniel@haxx.se>. All rights reserved."
 LICENSE="Curl"
 SRC_URI="http://curl.haxx.se/download/curl-7.26.0.tar.bz2"
-CHECKSUM_MD5="bfa80f01b3d300359cfb4d409b6136a3"
+CHECKSUM_SHA256="fced262f16eb6bfcdcea15e04a7905ffcb5ff04b14a19ca35b9df86d6720d26a"
 REVISION="5"
 ARCHITECTURES="x86_gcc2 x86 x86_64"
 SECONDARY_ARCHITECTURES="x86_gcc2 x86"
diff --git a/net-misc/curl/curl-7.32.0.recipe b/net-misc/curl/curl-7.32.0.recipe
index 83e96b664..d6f22e2d5 100644
--- a/net-misc/curl/curl-7.32.0.recipe
+++ b/net-misc/curl/curl-7.32.0.recipe
@@ -3,7 +3,7 @@ HOMEPAGE="http://curl.haxx.se"
 COPYRIGHT="1996-2013, Daniel Stenberg, <daniel@haxx.se>. All rights reserved."
 LICENSE="Curl"
 SRC_URI="http://curl.haxx.se/download/curl-7.32.0.tar.bz2"
-CHECKSUM_MD5="30d04b0a8c43c6770039d1bf033dfe79"
+CHECKSUM_SHA256="8e3db42548e01407cb2f1407660c0f528b89ec7afda6264442fc2b229b95223b"
 REVISION="1"
 ARCHITECTURES="?x86_gcc2 ?x86"
 SECONDARY_ARCHITECTURES="?x86_gcc2 ?x86"
diff --git a/net-misc/curl/curl-7.33.0.recipe b/net-misc/curl/curl-7.33.0.recipe
index 016be6fae..9de062176 100644
--- a/net-misc/curl/curl-7.33.0.recipe
+++ b/net-misc/curl/curl-7.33.0.recipe
@@ -3,7 +3,7 @@ HOMEPAGE="http://curl.haxx.se"
 COPYRIGHT="1996-2013, Daniel Stenberg, <daniel@haxx.se>. All rights reserved."
 LICENSE="Curl"
 SRC_URI="http://curl.haxx.se/download/curl-7.33.0.tar.bz2"
-CHECKSUM_MD5="57409d6bf0bd97053b8378dbe0cadcef"
+CHECKSUM_SHA256="0afde4cd949e2658eddc3cda675b19b165eea1af48ac5f3e1ec160792255d1b3"
 REVISION="1"
 ARCHITECTURES="?x86_gcc2 ?x86"
 SECONDARY_ARCHITECTURES="?x86_gcc2 ?x86"
diff --git a/net-misc/curl/curl-7.35.0.recipe b/net-misc/curl/curl-7.35.0.recipe
index cd8e51ab9..ed0c3cfa5 100644
--- a/net-misc/curl/curl-7.35.0.recipe
+++ b/net-misc/curl/curl-7.35.0.recipe
@@ -3,9 +3,9 @@ HOMEPAGE="http://curl.haxx.se"
 COPYRIGHT="1996-2014, Daniel Stenberg, <daniel@haxx.se>. All rights reserved."
 LICENSE="Curl"
 SRC_URI="http://curl.haxx.se/download/curl-7.35.0.tar.bz2"
-CHECKSUM_MD5="c18fbdd031adb0529ae09fce399f2d10"
+CHECKSUM_SHA256="d774d1701454f1b7d331c2075fc4f6dd972bddc2d171f43645ef3647c7fc0d83"
 REVISION="1"
-ARCHITECTURES="x86_gcc2 x86"
+ARCHITECTURES="x86_gcc2 x86 x86_64"
 SECONDARY_ARCHITECTURES="x86_gcc2 x86"
 
 PATCHES=""
diff --git a/net-misc/curl/curl-7.36.0.recipe b/net-misc/curl/curl-7.36.0.recipe
new file mode 100644
index 000000000..423d98cab
--- /dev/null
+++ b/net-misc/curl/curl-7.36.0.recipe
@@ -0,0 +1,116 @@
+SUMMARY="A commandline-tool and library for downloading data from URLs"
+HOMEPAGE="http://curl.haxx.se"
+COPYRIGHT="1996-2014, Daniel Stenberg, <daniel@haxx.se>. All rights reserved."
+LICENSE="Curl"
+SRC_URI="http://curl.haxx.se/download/curl-7.36.0.tar.bz2"
+CHECKSUM_SHA256="1fbe82b89bcd6b7ccda8cb0ff076edc60e911595030e27689f4abd5ef7f3cfcd"
+REVISION="1"
+ARCHITECTURES="x86_gcc2 x86 x86_64 arm"
+SECONDARY_ARCHITECTURES="x86_gcc2 x86"
+
+PATCHES=""
+
+PROVIDES="
+	curl$secondaryArchSuffix = $portVersion
+	lib:libcurl$secondaryArchSuffix = 4.2.0 compat >= 4
+	"
+if [ -z "$secondaryArchSuffix" ]; then
+	PROVIDES="$PROVIDES
+		cmd:curl = $portVersion compat >= 7.16
+		"
+fi
+
+REQUIRES="
+	haiku$secondaryArchSuffix >= $haikuVersion
+	ca_root_certificates
+	lib:libssl$secondaryArchSuffix
+	lib:libz$secondaryArchSuffix
+	"
+BUILD_REQUIRES="
+	devel:libssl$secondaryArchSuffix
+	devel:libz$secondaryArchSuffix
+	"
+BUILD_PREREQUIRES="
+	haiku${secondaryArchSuffix}_devel >= $haikuVersion
+	cmd:autoconf
+	cmd:gcc$secondaryArchSuffix
+	cmd:ld$secondaryArchSuffix
+	cmd:libtoolize
+	cmd:make
+	cmd:nroff
+	"
+
+BUILD()
+{
+	certsInstallDir="$portPackageLinksDir/ca_root_certificates"
+	certsDir="$certsInstallDir/$relativeDataRootDir/ssl"
+
+	libtoolize --force --copy --install
+	autoconf
+	runConfigure ./configure \
+		--enable-ipv6 --enable-manual \
+		--with-ca-bundle="$certsDir/CARootCertificates.pem"
+	make $jobArgs
+}
+
+INSTALL()
+{
+	make install
+
+	# prepare develop/lib
+	prepareInstalledDevelLibs libcurl
+	fixPkgconfig
+
+	# fix curl-config
+	fixDevelopLibDirReferences $binDir/curl-config
+	sed -i -e "s,--libexecdir=$developLibDir,--libexecdir=$libExecDir,g" \
+		-e "s,--libdir=$developLibDir,--libdir=$libDir,g" $binDir/curl-config
+
+	# install html documentation for curl
+	mkdir -p "$docDir"
+	install -c -m 644 "docs/curl.html" "$docDir"
+
+	# install html development documentation for libcurl
+	mkdir -p "$developDocDir"
+	for h in docs/libcurl/*.html; do 
+		install -c -m 644 "$h" "$developDocDir"
+	done
+
+	# devel package
+	packageEntries devel \
+		$binDir/curl-config \
+		$developDir \
+		$manDir/man3
+
+	# Remove stuff we don't need in the secondary architecture base package.
+	if [ -n "$secondaryArchSuffix" ]; then
+		rm -rf $binDir
+		rm -rf $documentationDir
+	fi
+}
+
+TEST()
+{
+	make check
+}
+
+DESCRIPTION="
+Curl is a command line tool for transferring data with URL syntax, supporting \
+DICT, FILE, FTP, FTPS, Gopher, HTTP, HTTPS, IMAP, IMAPS, LDAP, LDAPS, POP3, \
+POP3S, RTMP, RTSP, SCP, SFTP, SMTP, SMTPS, Telnet and TFTP. curl supports SSL \
+certificates, HTTP POST, HTTP PUT, FTP uploading, HTTP form based upload, \
+proxies, cookies, user+password authentication (Basic, Digest, NTLM, \
+Negotiate, kerberos...), file transfer resume, proxy tunneling and a busload \
+of other useful tricks.
+"
+
+# ----- devel package -------------------------------------------------------
+
+PROVIDES_devel="
+	curl${secondaryArchSuffix}_devel = $portVersion
+	cmd:curl_config$secondaryArchSuffix = $portVersion compat >= 7.16
+	devel:libcurl$secondaryArchSuffix = 4.2.0 compat >= 4
+	"
+REQUIRES_devel="
+	curl$secondaryArchSuffix == $portVersion base
+	"
diff --git a/net-misc/muscle/muscle-6.00.recipe b/net-misc/muscle/muscle-6.00.recipe
index 192b1346e..4fd593b09 100644
--- a/net-misc/muscle/muscle-6.00.recipe
+++ b/net-misc/muscle/muscle-6.00.recipe
@@ -15,7 +15,7 @@ COPYRIGHT="2000-2009 Meyer Sound Laboratories Inc."
 LICENSE="BSD (3-clause)"
 HOMEPAGE="https://public.msli.com/lcs/muscle/index.html"
 SRC_URI="https://public.msli.com/lcs/muscle/muscle6.00.zip"
-CHECKSUM_MD5="06eda494fc9bd2fcf847939160be0e61"
+CHECKSUM_SHA256="b12abe12b5cc4aa93126f86ae07a4bcd02ee8d89d692789435debd5becc53437"
 REVISION="1"
 
 ARCHITECTURES="!x86_gcc2 x86 ?x86_64"
diff --git a/net-misc/neon/neon-0.29.6.recipe b/net-misc/neon/neon-0.29.6.recipe
index bc7d6ba8a..97beb5a63 100644
--- a/net-misc/neon/neon-0.29.6.recipe
+++ b/net-misc/neon/neon-0.29.6.recipe
@@ -20,7 +20,7 @@ HOMEPAGE="http://www.webdav.org/neon/"
 LICENSE="GNU LGPL v2"
 COPYRIGHT="1999-2011 Joe Orton"
 SRC_URI="http://www.webdav.org/neon/neon-0.29.6.tar.gz"
-CHECKSUM_MD5="591e0c82e6979e7e615211b386b8f6bc"
+CHECKSUM_SHA256="9c640b728d6dc80ef1e48f83181166ab6bc95309cece5537e01ffdd01b96eb43"
 REVISION="8"
 
 ARCHITECTURES="x86_gcc2 x86 x86_64"
diff --git a/net-misc/openssh/openssh-5.8p2.recipe b/net-misc/openssh/openssh-5.8p2.recipe
index fa9c4a16a..546a3b3dd 100644
--- a/net-misc/openssh/openssh-5.8p2.recipe
+++ b/net-misc/openssh/openssh-5.8p2.recipe
@@ -6,7 +6,7 @@ SRC_URI="
 	http://ftp.openbsd.org/pub/OpenBSD/OpenSSH/portable/openssh-5.8p2.tar.gz
 	http://obsd.cec.mtu.edu/pub/OpenBSD/OpenSSH/portable/openssh-5.8p2.tar.gz
 	"
-CHECKSUM_MD5="0541579adf9d55abb15ef927048d372e"
+CHECKSUM_SHA256="5c35ec7c966ce05cc4497ac59c0b54a556e55ae7368165cc8c4129694654f314"
 REVISION="4"
 ARCHITECTURES="x86_gcc2 ?x86"
 
diff --git a/net-misc/openssh/openssh-6.0p1.recipe b/net-misc/openssh/openssh-6.0p1.recipe
index 07657236a..01ee39429 100644
--- a/net-misc/openssh/openssh-6.0p1.recipe
+++ b/net-misc/openssh/openssh-6.0p1.recipe
@@ -3,7 +3,7 @@ HOMEPAGE="http://www.openssh.com/"
 LICENSE="OpenSSH"
 COPYRIGHT="2005-2012 Tatu Ylonen et al."
 SRC_URI="http://openbsd.mirrorcatalogs.com/pub/OpenBSD/OpenSSH/portable/openssh-6.0p1.tar.gz"
-CHECKSUM_MD5="3c9347aa67862881c5da3f3b1c08da7b"
+CHECKSUM_SHA256="589d48e952d6c017e667873486b5df63222f9133d417d0002bd6429d9bd882de"
 REVISION="8"
 ARCHITECTURES="x86_gcc2 x86 x86_64"
 
diff --git a/net-misc/openssh/openssh-6.5p1.recipe b/net-misc/openssh/openssh-6.5p1.recipe
index c34e81a1f..dfcdd1f0f 100644
--- a/net-misc/openssh/openssh-6.5p1.recipe
+++ b/net-misc/openssh/openssh-6.5p1.recipe
@@ -16,9 +16,9 @@ HOMEPAGE="http://www.openssh.com/"
 LICENSE="OpenSSH"
 COPYRIGHT="2005-2014 Tatu Ylonen et al."
 SRC_URI="http://openbsd.mirrorcatalogs.com/pub/OpenBSD/OpenSSH/portable/openssh-6.5p1.tar.gz"
+CHECKSUM_SHA256="a1195ed55db945252d5a1730d4a2a2a5c1c9a6aa01ef2e5af750a962623d9027"
 SRC_URI="http://openbsd.locaweb.com.br/pub/OpenBSD/OpenSSH/portable/openssh-6.5p1.tar.gz"
 #SRC_URI="http://mindrot.org/openssh_snap/openssh-SNAP-20140127.tar.gz"
-CHECKSUM_MD5="a084e7272b8cbd25afe0f5dce4802fef"
 REVISION="1"
 
 ARCHITECTURES="x86_gcc2 x86 x86_64"
diff --git a/net-misc/openssh/openssh-6.6p1.recipe b/net-misc/openssh/openssh-6.6p1.recipe
new file mode 100644
index 000000000..d1e94ed76
--- /dev/null
+++ b/net-misc/openssh/openssh-6.6p1.recipe
@@ -0,0 +1,135 @@
+SUMMARY="Secure Shell Client and Server (Remote Login Program)"
+DESCRIPTION="
+OpenSSH is a FREE version of the SSH connectivity tools that technical users \
+of the Internet rely on. Users of telnet, rlogin, and ftp may not realize that \
+their password is transmitted across the Internet unencrypted, but it is. \
+OpenSSH encrypts all traffic (including passwords) to effectively eliminate \
+eavesdropping, connection hijacking, and other attacks. Additionally, OpenSSH \
+provides secure tunneling capabilities and several authentication methods, and \
+supports all SSH protocol versions.
+The OpenSSH suite replaces rlogin and telnet with the ssh program, rcp with \
+scp, and ftp with sftp. Also included is sshd (the server side of the \
+package), and the other utilities like ssh-add, ssh-agent, ssh-keysign, \
+ssh-keyscan, ssh-keygen and sftp-server.
+"
+HOMEPAGE="http://www.openssh.com/"
+LICENSE="OpenSSH"
+COPYRIGHT="2005-2014 Tatu Ylonen et al."
+SRC_URI="http://openbsd.mirrorcatalogs.com/pub/OpenBSD/OpenSSH/portable/openssh-6.6p1.tar.gz"
+CHECKSUM_SHA256="48c1f0664b4534875038004cc4f3555b8329c2a81c1df48db5c517800de203bb"
+SRC_URI="http://openbsd.locaweb.com.br/pub/OpenBSD/OpenSSH/portable/openssh-6.6p1.tar.gz"
+REVISION="1"
+
+ARCHITECTURES="?x86_gcc2 ?x86 ?x86_64"
+
+PATCHES="sshd_config.patch
+		pathnames.patch"
+
+ADDITIONAL_FILES="sshd_keymaker.sh"
+
+PROVIDES="
+	openssh = $portVersion compat >= 5
+	cmd:scp = $portVersion compat >= 5
+	cmd:sftp = $portVersion compat >= 5
+	cmd:sftp_server = $portVersion compat >= 5
+	cmd:slogin = $portVersion compat >= 5
+	cmd:ssh = $portVersion compat >= 5
+	cmd:ssh_add = $portVersion compat >= 5
+	cmd:ssh_agent = $portVersion compat >= 5
+	cmd:ssh_keygen = $portVersion compat >= 5
+	cmd:ssh_keyscan = $portVersion compat >= 5
+	cmd:ssh_keysign = $portVersion compat >= 5
+	cmd:ssh_pkcs11_helper = $portVersion compat >= 5
+	cmd:sshd = $portVersion compat >= 5
+	"
+REQUIRES="
+	haiku >= $haikuVersion
+	cmd:login
+	cmd:passwd
+	lib:libcrypto
+	lib:libedit
+	lib:libncurses
+	lib:libssl
+	lib:libz
+	"
+BUILD_REQUIRES="
+	devel:libcrypto
+	devel:libedit
+	devel:libncurses
+	devel:libssl
+	devel:libz
+	"
+BUILD_PREREQUIRES="
+	haiku_devel >= $haikuVersion
+	cmd:aclocal
+	cmd:autoconf
+	cmd:automake
+	cmd:gcc
+	cmd:ld
+	cmd:libtoolize
+	cmd:make
+	cmd:pkg_config
+	"
+
+GLOBAL_WRITABLE_FILES="
+	settings/ssh directory keep-old
+	"
+USER_SETTINGS_FILES="
+	settings/ssh directory
+	"
+POST_INSTALL_SCRIPTS="
+	$relativePostInstallDir/sshd_keymaker.sh
+	"
+sshdUserHomeDir="/packages/$portVersionedName-$REVISION/.self/$relativeDataDir/openssh/empty"
+PACKAGE_USERS="
+	sshd real-name \"sshd user\" home \"$sshdUserHomeDir\" shell \"/bin/true\"
+	"
+PACKAGE_GROUPS="sshd"
+
+
+PATCH()
+{
+	echo 'AC_CONFIG_MACRO_DIR([m4])' >> configure.ac
+}
+
+SOURCE_DIR="openssh"
+
+BUILD()
+{
+	mkdir -p m4
+	aclocal --install -I m4
+	libtoolize --force --copy
+	aclocal -I m4
+	autoconf
+	defaultPath=".:/boot/home/config/non-packaged/bin:/boot/home/config/bin"
+	defaultPath+=":/boot/common/non-packaged/bin:/boot/common/bin:/bin"
+	defaultPath+=":/boot/common/apps:/boot/common/preferences:/boot/system/apps"
+	defaultPath+=":/boot/system/preferences"
+
+	# Note: override sysconfdir and libexecdir since ssh doesn't create
+	# subdirectories as it should.
+	PATH_PASSWD_PROG=$portPackageLinksDir/cmd~passwd/bin/passwd \
+	LOGIN_PROGRAM=$portPackageLinksDir/cmd~login/bin/login \
+	runConfigure ./configure \
+		--sysconfdir=$sysconfDir/ssh \
+		--libexecdir=$libExecDir/openssh \
+		--with-privsep-path=$dataDir/openssh/empty \
+		--with-pid-dir=$prefix/var/run \
+		--with-default-path="$defaultPath" \
+		--with-md5-passwords \
+		--disable-utmpx \
+		--with-libedit
+	make $jobArgs
+}
+
+INSTALL()
+{
+	make install-nokeys
+	mkdir -p $postInstallDir
+	cp -f $portDir/additional-files/sshd_keymaker.sh $postInstallDir
+}
+
+TEST()
+{
+	make tests
+}
diff --git a/net-misc/rsync/rsync-3.1.0.recipe b/net-misc/rsync/rsync-3.1.0.recipe
index c37066845..f6d4197ac 100644
--- a/net-misc/rsync/rsync-3.1.0.recipe
+++ b/net-misc/rsync/rsync-3.1.0.recipe
@@ -8,7 +8,7 @@ of the link beforehand.
 "
 HOMEPAGE="http://rsync.samba.org/"
 SRC_URI="http://rsync.samba.org/ftp/rsync/src/rsync-3.1.0.tar.gz"
-CHECKSUM_MD5="3be148772a33224771a8d4d2a028b132"
+CHECKSUM_SHA256="81ca23f77fc9b957eb9845a6024f41af0ff0c619b7f38576887c63fa38e2394e"
 LICENSE="GNU GPL v3"
 COPYRIGHT="1996-2013 by Andrew Tridgell, Wayne Davison, and others."
 REVISION="2"
diff --git a/net-misc/tor/tor-0.2.4.20.recipe b/net-misc/tor/tor-0.2.4.20.recipe
index c4e71ae77..65e3224be 100644
--- a/net-misc/tor/tor-0.2.4.20.recipe
+++ b/net-misc/tor/tor-0.2.4.20.recipe
@@ -36,8 +36,8 @@ Tor hides you among the other users on the network, so the more populous and \
 diverse the user base for Tor is, the more your anonymity will be protected.
 "
 HOMEPAGE="https://www.torproject.org"
-SRC_URI="https://www.torproject.org/dist/tor-0.2.4.20.tar.gz"
-CHECKSUM_MD5="a8cd8e3b3a3f6a7770f2c22d280f19b8"
+SRC_URI="https://archive.torproject.org/tor-package-archive/tor-0.2.4.20.tar.gz"
+CHECKSUM_SHA256="ccc51747cbcbf98f658c34d5c693ff8a868698da0349d056e98287ef2e294d9f"
 
 REVISION="1"
 
diff --git a/net-misc/wget/wget-1.14.recipe b/net-misc/wget/wget-1.14.recipe
index a1f31e1c4..808e63fda 100644
--- a/net-misc/wget/wget-1.14.recipe
+++ b/net-misc/wget/wget-1.14.recipe
@@ -6,10 +6,10 @@ scripts.
 "
 HOMEPAGE="http://www.gnu.org/software/wget" 
 SRC_URI="http://ftp.gnu.org/gnu/wget/wget-1.14.tar.gz"
-CHECKSUM_MD5="12edc291dba8127f2e9696e69f36299e"
+CHECKSUM_SHA256="f3a6898e3a765bb94435b04a6668db9e5d19b3e90e0c69a503a2773ae936c269"
 LICENSE="GNU GPL v3"
 COPYRIGHT="1996-2012 Free Software Foundation"
-REVISION="1"
+REVISION="2"
 ARCHITECTURES="x86_gcc2 ?x86 ?x86_64"
 SECONDARY_ARCHITECTURES="x86"
 
@@ -45,6 +45,10 @@ USER_SETTINGS_FILES="
 	settings/wgetrc
 	"
 
+GLOBAL_WRITABLE_FILES="
+	settings/wgetrc keep-old
+"
+
 PATCHES="
 	wget-1.14.patch
 	wget-1.14-build-fixes.patch
@@ -63,6 +67,8 @@ BUILD()
 INSTALL()
 {
 	make install
+	# Tells wget where to find certificates
+	echo "ca_certificate=/boot/system/data/ssl/CARootCertificates.pem" > $settingsDir/wgetrc
 }
 
 TEST()
diff --git a/net-misc/youtube_dl/youtube_dl-2013.12.20.recipe b/net-misc/youtube_dl/youtube_dl-2013.12.20.recipe
index ccfa3082e..0ae2bd54d 100644
--- a/net-misc/youtube_dl/youtube_dl-2013.12.20.recipe
+++ b/net-misc/youtube_dl/youtube_dl-2013.12.20.recipe
@@ -8,7 +8,7 @@ to download these videos by itself.
 "
 HOMEPAGE="http://rg3.github.io/youtube-dl/index.html"
 SRC_URI="https://yt-dl.org/downloads/2013.12.20/youtube-dl-2013.12.20.tar.gz"
-CHECKSUM_MD5="be0cf52206f9ba3f5f841deec3ce3bde"
+CHECKSUM_SHA256="eb83b2112c7098c32ab66f9051900e2a35d24992ba98e7ca74ef10a16e061933"
 REVISION="1"
 LICENSE="Public Domain"
 COPYRIGHT="2006-2013 Ricardo Garcia Gonzalez"
diff --git a/net-misc/youtube_dl/youtube_dl-2014.01.08.recipe b/net-misc/youtube_dl/youtube_dl-2014.01.08.recipe
index d36f33b21..ab2f3a393 100644
--- a/net-misc/youtube_dl/youtube_dl-2014.01.08.recipe
+++ b/net-misc/youtube_dl/youtube_dl-2014.01.08.recipe
@@ -8,7 +8,7 @@ to download these videos by itself.
 "
 HOMEPAGE="http://rg3.github.io/youtube-dl/index.html"
 SRC_URI="https://yt-dl.org/downloads/2014.01.08/youtube-dl-2014.01.08.tar.gz"
-CHECKSUM_MD5="bb3e523b7e4e59ac64ce9a48fda86de7"
+CHECKSUM_SHA256="9b33c9d034d1fb50234719e5ffff948707944dfe406f376e6fae4cc185910329"
 REVISION="1"
 LICENSE="Public Domain"
 COPYRIGHT="2006-2014 Ricardo Garcia Gonzalez"
diff --git a/net-misc/youtube_dl/youtube_dl-2014.01.23.recipe b/net-misc/youtube_dl/youtube_dl-2014.01.23.recipe
index 4eff35af6..f53022f16 100644
--- a/net-misc/youtube_dl/youtube_dl-2014.01.23.recipe
+++ b/net-misc/youtube_dl/youtube_dl-2014.01.23.recipe
@@ -8,7 +8,7 @@ to download these videos by itself.
 "
 HOMEPAGE="http://rg3.github.io/youtube-dl/index.html"
 SRC_URI="https://yt-dl.org/downloads/2014.01.23.4/youtube-dl-2014.01.23.4.tar.gz"
-CHECKSUM_MD5="d9e89ffc9ff572317151e22cac4b3a00"
+CHECKSUM_SHA256="a96d562be51aeb817b9952bff8c65ecab737575b7104381ce62185397408dc72"
 REVISION="1"
 LICENSE="Public Domain"
 COPYRIGHT="2006-2014 Ricardo Garcia Gonzalez"
diff --git a/net-misc/youtube_dl/youtube_dl-2014.02.08.recipe b/net-misc/youtube_dl/youtube_dl-2014.02.08.recipe
index ffa310056..be59ab6bf 100644
--- a/net-misc/youtube_dl/youtube_dl-2014.02.08.recipe
+++ b/net-misc/youtube_dl/youtube_dl-2014.02.08.recipe
@@ -8,7 +8,7 @@ to download these videos by itself.
 "
 HOMEPAGE="http://rg3.github.io/youtube-dl/index.html"
 SRC_URI="https://yt-dl.org/downloads/2014.02.08.2/youtube-dl-2014.02.08.2.tar.gz"
-CHECKSUM_MD5="f596733308b25eb650c244cbc9428e19"
+CHECKSUM_SHA256="068e598f32b817d9218bc6998a13112eb9d068942b82f8cda442458e398f4780"
 REVISION="1"
 LICENSE="Public Domain"
 COPYRIGHT="2006-2014 Ricardo Garcia Gonzalez"
diff --git a/net-p2p/transmission/transmission-2.82.recipe b/net-p2p/transmission/transmission-2.82.recipe
index 80831ba04..b6e83958e 100644
--- a/net-p2p/transmission/transmission-2.82.recipe
+++ b/net-p2p/transmission/transmission-2.82.recipe
@@ -33,7 +33,7 @@ per-torrent speed limits, and more.
 "
 HOMEPAGE="http://www.transmissionbt.com/"
 SRC_URI="https://transmission.cachefly.net/transmission-2.82.tar.xz"
-CHECKSUM_MD5="a5ef870c0410b12d10449c2d36fa4661"
+CHECKSUM_SHA256="3996651087df67a85f1e1b4a92b1b518ddefdd84c654b8df6fbccb0b91f03522"
 
 REVISION="1"
 
diff --git a/net-print/gutenprint/gutenprint-5.2.9.recipe b/net-print/gutenprint/gutenprint-5.2.9.recipe
new file mode 100644
index 000000000..05359c2ff
--- /dev/null
+++ b/net-print/gutenprint/gutenprint-5.2.9.recipe
@@ -0,0 +1,85 @@
+SUMMARY="Suite of printer drivers"
+DESCRIPTION="
+Gutenprint, formerly named Gimp-Print, is a suite of printer \
+drivers that may be used with most common UNIX print spooling \
+systems, including CUPS, lpr, LPRng, or others.  These drivers \
+provide high quality printing for UNIX (including Macintosh OS X \
+10.3 and newer) and Linux systems in many cases equal to or better \
+than proprietary vendor-supplied drivers.  Gutenprint also \
+includes an enhanced print plug-in for the GIMP image editor, \
+replacing the Gimp-Print 4.2-based plugin supplied with GIMP 1.2, \
+2.0, and 2.2, and offering an alternative with additional \
+capabilities to the GtkPrint-based plugin supplied with GIMP 2.4 \
+and beyond."
+HOMEPAGE="http://gimp-print.sourceforge.net"
+COPYRIGHT="
+	1999-2010 by the authors of Gutenprint
+	"
+LICENSE="GNU GPL v2"
+SRC_URI="http://prdownloads.sourceforge.net/gimp-print/gutenprint-5.2.9.tar.bz2"
+CHECKSUM_SHA256="4b27e4f06f32d30271df89ecb6089bb11bcf2caec5f60b0909e083095354bca0"
+REVISION="1"
+ARCHITECTURES="x86_gcc2 x86 x86_64"
+SECONDARY_ARCHITECTURES="x86_gcc2 x86"
+
+PATCHES="gutenprint-$portVersion.patchset"
+
+PROVIDES="
+	gutenprint$secondaryArchSuffix = $portVersion compat >= 5
+	cmd:escputil$secondaryArchSuffix = $portVersion compat >= 5
+	cmd:testpattern$secondaryArchSuffix = $portVersion compat >= 5
+	lib:libgutenprint$secondaryArchSuffix = 2.1.0 compat >= 2
+	"
+REQUIRES="
+	haiku$secondaryArchSuffix >= $haikuVersion
+	"
+BUILD_REQUIRES="
+	haiku${secondaryArchSuffix}_devel >= $haikuVersion
+	"
+BUILD_PREREQUIRES="
+	cmd:aclocal
+	cmd:autoconf
+	cmd:automake
+	cmd:gcc$secondaryArchSuffix
+	cmd:ld$secondaryArchSuffix
+	cmd:libtoolize
+	cmd:make
+	cmd:sed
+	"
+PATCH()
+{
+	# git doesn't handle correctly multilines with straybackspaces.
+	sed -i '/#define DECLARE_MODEUSES.*/ {N;N;N;N;N; s/#define DECLARE_MODEUSES.*\}/#define DECLARE_MODEUSES(name) static const canon_modeuselist_t name##_modeuselist = \{ #name, sizeof(name##_modeuses) \/ sizeof(canon_modeuse_t), name##_modeuses \}/g}' src/main/canon-media-mode.h
+}
+
+
+BUILD()
+{
+	runConfigure ./configure
+	make $jobArgs
+}
+
+INSTALL()
+{
+	make install
+	
+	rmdir $prefix/sbin
+
+	prepareInstalledDevelLibs libgutenprint
+	fixPkgconfig
+
+	# devel package
+	packageEntries devel \
+		$developDir \
+		$manDir/man1
+}
+
+# ----- devel package -------------------------------------------------------
+
+PROVIDES_devel="
+	gutenprint${secondaryArchSuffix}_devel = $portVersion compat >= 5
+	devel:libgutenprint$secondaryArchSuffix = 2.1.0 compat >= 2
+	"
+REQUIRES_devel="
+	gutenprint$secondaryArchSuffix == $portVersion base
+	"
diff --git a/net-print/gutenprint/patches/gutenprint-5.2.9.patchset b/net-print/gutenprint/patches/gutenprint-5.2.9.patchset
new file mode 100644
index 000000000..2a1b8ae4a
--- /dev/null
+++ b/net-print/gutenprint/patches/gutenprint-5.2.9.patchset
@@ -0,0 +1,94 @@
+From 0c0e500f1ef9a22ed62ed28cd74905b1704722c7 Mon Sep 17 00:00:00 2001
+From: Jerome Duval <jerome.duval@gmail.com>
+Date: Thu, 8 May 2014 16:34:31 +0000
+Subject: undef PAGESIZE on HAIKU
+
+* gcc2 build fix on pixma_parse.c
+
+diff --git a/src/testpattern/testpattern.c b/src/testpattern/testpattern.c
+index 624d7d6..6ac0fe9 100644
+--- a/src/testpattern/testpattern.c
++++ b/src/testpattern/testpattern.c
+@@ -38,6 +38,9 @@
+ #include <stdio.h>
+ #include <math.h>
+ #include <string.h>
++#ifdef __HAIKU__
++#undef PAGESIZE
++#endif
+ #include "testpattern.h"
+ #include <gutenprint/gutenprint-intl.h>
+ #include <errno.h>
+diff --git a/src/testpattern/testpatternl.c b/src/testpattern/testpatternl.c
+index e8ec86b..9953d25 100644
+--- a/src/testpattern/testpatternl.c
++++ b/src/testpattern/testpatternl.c
+@@ -20,6 +20,9 @@
+ #include <string.h>
+ #include <errno.h>
+ #include <stdlib.h>
++#ifdef __HAIKU__
++#undef PAGESIZE
++#endif
+ 
+ /* end standard C headers. */
+ 
+diff --git a/src/testpattern/testpatternl.l b/src/testpattern/testpatternl.l
+index 16cb38c..bf164e4 100644
+--- a/src/testpattern/testpatternl.l
++++ b/src/testpattern/testpatternl.l
+@@ -29,6 +29,9 @@
+ #include <string.h>
+ #include <stdio.h>
+ #include <stdlib.h>
++#ifdef __HAIKU__
++#undef PAGESIZE
++#endif
+ #include "testpattern.h"
+ 
+ #define YY_NO_UNPUT
+diff --git a/src/testpattern/testpatterny.c b/src/testpattern/testpatterny.c
+index 818087e..ea0e141 100644
+--- a/src/testpattern/testpatterny.c
++++ b/src/testpattern/testpatterny.c
+@@ -78,6 +78,9 @@
+ #include <string.h>
+ #include <stdio.h>
+ #include <stdlib.h>
++#ifdef __HAIKU__
++#undef PAGESIZE
++#endif
+ #include "testpattern.h"
+ 
+ extern int mylineno;
+diff --git a/src/testpattern/testpatterny.y b/src/testpattern/testpatterny.y
+index 229109a..6c6e8f8 100644
+--- a/src/testpattern/testpatterny.y
++++ b/src/testpattern/testpatterny.y
+@@ -29,6 +29,9 @@
+ #include <string.h>
+ #include <stdio.h>
+ #include <stdlib.h>
++#ifdef __HAIKU__
++#undef PAGESIZE
++#endif
+ #include "testpattern.h"
+ 
+ extern int mylineno;
+diff --git a/test/pixma_parse.c b/test/pixma_parse.c
+index 0fc368b..d5f23f8 100644
+--- a/test/pixma_parse.c
++++ b/test/pixma_parse.c
+@@ -638,8 +638,8 @@ static int process(FILE* in, FILE* out,int verbose,unsigned int maxw,unsigned in
+ 					
+ 					
+ 				}else if(buf[0]==0x1 && buf[1]==0x0 && buf[2]==0x1){
+-					fprintf(stderr," 1bit-per pixel\n");
+ 					int num_colors = cnt*3; /*no idea yet! 3 for iP4000 */
++					fprintf(stderr," 1bit-per pixel\n");
+ 					/*num_colors=9;*/
+ 					/*for(i=0;i<MAX_COLORS;i++){*/
+ 					for(i=0;i<num_colors;i++){
+-- 
+1.8.3.4
+
diff --git a/net-wireless/wpa_supplicant/wpa_supplicant-0.7.3.recipe b/net-wireless/wpa_supplicant/wpa_supplicant-0.7.3.recipe
index fbc7508ad..b9e421490 100644
--- a/net-wireless/wpa_supplicant/wpa_supplicant-0.7.3.recipe
+++ b/net-wireless/wpa_supplicant/wpa_supplicant-0.7.3.recipe
@@ -9,7 +9,7 @@ negotiation with a WPA Authenticator and it controls the roaming and IEEE \
 "
 HOMEPAGE="http://hostap.epitest.fi/wpa_supplicant/" 
 SRC_URI="http://hostap.epitest.fi/releases/wpa_supplicant-0.7.3.tar.gz"
-CHECKSUM_MD5="f516f191384a9a546e3f5145c08addda"
+CHECKSUM_SHA256="d0cd50caa85346ccc376dcda5ed3c258eef19a93b3cade39d25760118ad59443"
 LICENSE="
 	BSD (2-clause)
 	GNU GPL v2
diff --git a/net-wireless/wpa_supplicant/wpa_supplicant-2.0.recipe b/net-wireless/wpa_supplicant/wpa_supplicant-2.0.recipe
index 4980380b6..bab3e1cdf 100644
--- a/net-wireless/wpa_supplicant/wpa_supplicant-2.0.recipe
+++ b/net-wireless/wpa_supplicant/wpa_supplicant-2.0.recipe
@@ -9,7 +9,7 @@ negotiation with a WPA Authenticator and it controls the roaming and IEEE \
 "
 HOMEPAGE="http://hostap.epitest.fi/wpa_supplicant/"
 SRC_URI="http://hostap.epitest.fi/releases/wpa_supplicant-2.0.tar.gz"
-CHECKSUM_MD5="3be2ebfdcced52e00eda0afe2889839d"
+CHECKSUM_SHA256="2c115609fbb5223d51381084a5c944455a8afcda81d584173ff55ba233379e09"
 LICENSE="
 	BSD (2-clause)
 	GNU GPL v2
diff --git a/sci-libs/fftw/fftw-3.2.2.recipe b/sci-libs/fftw/fftw-3.2.2.recipe
index c360c865f..9212d62b2 100644
--- a/sci-libs/fftw/fftw-3.2.2.recipe
+++ b/sci-libs/fftw/fftw-3.2.2.recipe
@@ -15,7 +15,7 @@ Transform in the West.
 "
 HOMEPAGE="http://www.fftw.org/"
 SRC_URI="http://www.fftw.org/fftw-3.2.2.tar.gz"
-CHECKSUM_MD5="b616e5c91218cc778b5aa735fefb61ae"
+CHECKSUM_SHA256="6aa7ae65ee49eb99004f15899f9bb77f54759122f1a350041e81e096157d768f"
 LICENSE="GNU GPL v2"
 COPYRIGHT="
 	2003, 2007-2008 Matteo Frigo
diff --git a/sci-libs/fftw/fftw-3.3.3.recipe b/sci-libs/fftw/fftw-3.3.3.recipe
new file mode 100644
index 000000000..3b267ebdf
--- /dev/null
+++ b/sci-libs/fftw/fftw-3.3.3.recipe
@@ -0,0 +1,70 @@
+SUMMARY="Fast C library for the Discrete Fourier Transform"
+DESCRIPTION="
+FFTW is a C subroutine library for computing the discrete Fourier transform \
+(DFT) in one or more dimensions, of arbitrary input size, and of both real and \
+complex data (as well as of even/odd data, i.e. the discrete cosine/sine \
+transforms or DCT/DST). We believe that FFTW, which is free software, should \
+become the FFT library of choice for most applications.
+Our benchmarks, performed on on a variety of platforms, show that FFTW's \
+performance is typically superior to that of other publicly available FFT \
+software, and is even competitive with vendor-tuned codes. In contrast to \
+vendor-tuned codes, however, FFTW's performance is portable: the same program \
+will perform well on most architectures without modification. Hence the name, \
+FFTW, which stands for the somewhat whimsical title of Fastest Fourier \
+Transform in the West.
+"
+HOMEPAGE="http://www.fftw.org/"
+SRC_URI="http://www.fftw.org/fftw-3.3.3.tar.gz"
+CHECKSUM_SHA256="85cdfc0a0ba10d8fa4f0f8e733aac1a5936c859832a9e3d5c0731fb5c54a97f3"
+LICENSE="GNU GPL v2"
+COPYRIGHT="
+	2003, 2007-2011 Matteo Frigo
+	2003, 2007-2011 Massachusetts Institute of Technology
+	"
+REVISION="1"
+ARCHITECTURES="x86 x86_gcc2 x86_64"
+SECONDARY_ARCHITECTURES="x86_gcc2 x86"
+
+PROVIDES="
+	libfftw$secondaryArchSuffix = $portVersion compat >= 3
+	lib:libfftw$secondaryArchSuffix = $portVersion compat >= 3
+	cmd:fftw_wisdom
+	cmd:fftw_wisdom_to_conf
+	"
+
+REQUIRES="
+	haiku$secondaryArchSuffix >= $haikuVersion
+	"
+
+BUILD_REQUIRES="
+	"
+
+BUILD_PREREQUIRES="
+	haiku${secondaryArchSuffix}_devel >= $haikuVersion
+	cmd:gcc$secondaryArchSuffix
+	cmd:ld$secondaryArchSuffix
+	cmd:awk
+	cmd:find
+	cmd:make
+	"
+
+BUILD()
+{
+	runConfigure ./configure
+	make $jobArgs
+}
+
+INSTALL()
+{
+	make install
+	prepareInstalledDevelLib libfftw3
+	packageEntries devel $developDir
+}
+
+PROVIDES_devel="
+	libfftw${secondaryArchSuffix}_devel = $portVersion compat >= 3
+	devel:libfftw${secondaryArchSuffix} = $portVersion compat >= 3
+	"
+REQUIRES_devel="
+	libfftw$secondaryArchSuffix == $portVersion base
+	"
diff --git a/sci-libs/fftw/fftw-3.3.4.recipe b/sci-libs/fftw/fftw-3.3.4.recipe
new file mode 100644
index 000000000..dcefbe609
--- /dev/null
+++ b/sci-libs/fftw/fftw-3.3.4.recipe
@@ -0,0 +1,72 @@
+SUMMARY="Fast C library for the Discrete Fourier Transform"
+DESCRIPTION="
+FFTW is a C subroutine library for computing the discrete Fourier transform \
+(DFT) in one or more dimensions, of arbitrary input size, and of both real and \
+complex data (as well as of even/odd data, i.e. the discrete cosine/sine \
+transforms or DCT/DST). We believe that FFTW, which is free software, should \
+become the FFT library of choice for most applications.
+Our benchmarks, performed on on a variety of platforms, show that FFTW's \
+performance is typically superior to that of other publicly available FFT \
+software, and is even competitive with vendor-tuned codes. In contrast to \
+vendor-tuned codes, however, FFTW's performance is portable: the same program \
+will perform well on most architectures without modification. Hence the name, \
+FFTW, which stands for the somewhat whimsical title of Fastest Fourier \
+Transform in the West.
+"
+HOMEPAGE="http://www.fftw.org/"
+SRC_URI="http://www.fftw.org/fftw-$portVersion.tar.gz"
+CHECKSUM_SHA256="8f0cde90929bc05587c3368d2f15cd0530a60b8a9912a8e2979a72dbe5af0982"
+LICENSE="GNU GPL v2"
+COPYRIGHT="
+	2003, 2007-2011 Matteo Frigo
+	2003, 2007-2011 Massachusetts Institute of Technology
+	"
+REVISION="3"
+ARCHITECTURES="x86 x86_gcc2 x86_64"
+SECONDARY_ARCHITECTURES="x86_gcc2 x86"
+
+PROVIDES="
+	libfftw$secondaryArchSuffix = $portVersion compat >= 3
+	lib:libfftw$secondaryArchSuffix = $portVersion compat >= 3
+	cmd:fftw_wisdom$secondaryArchSuffix
+	cmd:fftw_wisdom_to_conf$secondaryArchSuffix
+	"
+
+REQUIRES="
+	haiku$secondaryArchSuffix >= $haikuVersion
+	"
+
+BUILD_REQUIRES="
+	"
+
+BUILD_PREREQUIRES="
+	haiku${secondaryArchSuffix}_devel >= $haikuVersion
+	cmd:gcc$secondaryArchSuffix
+	cmd:ld$secondaryArchSuffix
+	cmd:awk
+	cmd:find
+	cmd:make
+	"
+
+BUILD()
+{
+	runConfigure ./configure
+	make $jobArgs
+}
+
+INSTALL()
+{
+	make install
+	prepareInstalledDevelLib libfftw3
+	fixPkgconfig
+	packageEntries devel $developDir
+}
+
+PROVIDES_devel="
+	libfftw${secondaryArchSuffix}_devel = $portVersion compat >= 3
+	devel:libfftw$secondaryArchSuffix = $portVersion compat >= 3
+	devel:libfftw3$secondaryArchSuffix = $portVersion compat >= 3
+	"
+REQUIRES_devel="
+	libfftw$secondaryArchSuffix == $portVersion base
+	"
diff --git a/sci-mathematics/pari/pari-2.7.0.recipe b/sci-mathematics/pari/pari-2.7.0.recipe
new file mode 100644
index 000000000..abf2ceeb3
--- /dev/null
+++ b/sci-mathematics/pari/pari-2.7.0.recipe
@@ -0,0 +1,80 @@
+SUMMARY="A specialized computer algebra system."
+DESCRIPTION="
+PARI/GP is a specialized computer algebra system, primarily aimed at number \
+theorists, but has been put to good use in many other different fields, from \
+topology or numerical analysis to physics.
+Although quite an amount of symbolic manipulation is possible, PARI does \
+badly compared to systems like Axiom, Magma, Maple, Mathematica, Maxima, or \
+Reduce on such tasks, e.g.~multivariate polynomials, formal integration, \
+etc. On the other hand, the three main advantages of the system are its \
+speed, the possibility of using directly data types which are familiar to \
+mathematicians, and its extensive algebraic number theory module (from \
+the above-mentioned systems, only Magma provides similar features).
+"
+HOMEPAGE="http://pari.math.u-bordeaux.fr/"
+SRC_URI="http://pari.math.u-bordeaux.fr/pub/pari/unix/pari-$portVersion.tar.gz"
+CHECKSUM_SHA256="ffe9940194b4a1274d8aa690d985e11539be36fcdd2215b74c39b30470a567c2"
+LICENSE="GNU GPL v2"
+COPYRIGHT="
+	2000-2014 The PARI Group, Bordeaux
+	"
+REVISION="1"
+ARCHITECTURES="x86 ?x86_gcc2 x86_64"
+SECONDARY_ARCHITECTURES="?x86_gcc2 x86"
+
+PATCHES="$portVersionedName.patchset"
+
+PROVIDES="
+	pari$secondaryArchSuffix = $portVersion compat >= 2
+	cmd:gp
+	cmd:gp_2.7
+	cmd:gphelp
+	cmd:tex2mail
+	lib:libpari_gmp$secondaryArchSuffix = $portVersion compat >= 2
+	"
+
+REQUIRES="
+	haiku$secondaryArchSuffix >= $haikuVersion
+	lib:libgmp$secondaryArchSuffix
+	lib:libncurses$secondaryArchSuffix
+	"
+
+BUILD_REQUIRES="
+	haiku${secondaryArchSuffix}_devel >= $haikuVersion
+	devel:libgmp$secondaryArchSuffix
+	devel:libncurses$secondaryArchSuffix
+	"
+
+BUILD_PREREQUIRES="
+	cmd:gcc$secondaryArchSuffix
+	cmd:ld$secondaryArchSuffix
+	cmd:make
+	cmd:sed
+	"
+
+BUILD()
+{
+	./Configure --prefix=$prefix --bindir=$binDir --includedir=$includeDir \
+		--libdir=$libDir --mandir=$manDir --datadir=$dataDir \
+		--sysdatadir=$sysDataDir
+	cd Ohaiku-*
+	make $jobArgs all
+	cd ..
+}
+
+INSTALL()
+{
+	make install
+	rm $libDir/libpari.so
+	prepareInstalledDevelLib libpari-gmp
+	fixPkgconfig
+	packageEntries devel $developDir
+}
+
+PROVIDES_devel="
+	pari${secondaryArchSuffix}_devel = $portVersion compat >= 2
+	devel:libpari_gmp$secondaryArchSuffix = $portVersion compat >= 2
+	"
+REQUIRES_devel="
+	pari$secondaryArchSuffix == $portVersion base
+	"
diff --git a/sci-mathematics/pari/patches/pari-2.7.0.patchset b/sci-mathematics/pari/patches/pari-2.7.0.patchset
new file mode 100644
index 000000000..6c490c68f
--- /dev/null
+++ b/sci-mathematics/pari/patches/pari-2.7.0.patchset
@@ -0,0 +1,89 @@
+From c34479129ddc5c5517c534a5650af347fa3fc537 Mon Sep 17 00:00:00 2001
+From: Jerome Duval <jerome.duval@gmail.com>
+Date: Sat, 10 May 2014 12:15:25 +0000
+Subject: we only use release versions, no point in checking .git
+
+
+diff --git a/config/version b/config/version
+index 6583ea3..4ec323e 100644
+--- a/config/version
++++ b/config/version
+@@ -19,14 +19,6 @@ patchlevel_verbose=
+ 
+ case "$stat" in # $stat rewritten by config/settar ?
+   *git-*) patchlevel_verbose="[ $stat ]";;
+-  *) if test -d "$TOP/.git"; then
+-       t=`git rev-list HEAD 2>/dev/null | wc -l` # ~ svn revision number
+-       T=`git log -1 --pretty=format:%h` # commit hash
+-       if test -z "$t"; then t=0; fi
+-       vcsversion=$t-$T
+-       status="$stat $vcsversion"
+-       patchlevel_verbose="[ $status ]"
+-     fi
+ esac
+ version=$VersionMajor.$VersionMinor
+ pari_release="$version.$patch"
+-- 
+1.8.3.4
+
+
+From 1ef615f242aa68b60b9ce3c4f23c0e628688c266 Mon Sep 17 00:00:00 2001
+From: Jerome Duval <jerome.duval@gmail.com>
+Date: Sat, 10 May 2014 12:44:58 +0000
+Subject: Haiku support.
+
+
+diff --git a/config/arch-osname b/config/arch-osname
+index 5da1bc8..515bcfd 100755
+--- a/config/arch-osname
++++ b/config/arch-osname
+@@ -74,6 +74,8 @@ if test -n "$myuname"; then
+             case $arch in i386-*) arch=i386;;esac;;
+   aix)      arch=`uname -p`;
+             case $arch in powerpc) arch=ppc;;esac;;
++  haiku)	arch=`uname -p`
++  		;;
+   esac
+ fi
+ echo $arch-$osname
+diff --git a/config/get_dlld b/config/get_dlld
+index 2272aac..10632d5 100644
+--- a/config/get_dlld
++++ b/config/get_dlld
+@@ -9,7 +9,7 @@ DLSUFFIX=so
+ soname=.$soname_num
+ do_dll=yes
+ case "$osname" in
+-  gnu*|aix|osf1|solaris|linux|freebsd|netbsd)
++  gnu*|aix|osf1|solaris|linux|freebsd|netbsd|haiku)
+     case $pari_release_verbose in
+       *STABLE*)      sodest=.$version.$patch;; # released version
+       *DEVELOPMENT*) sodest=.$patch.0.0;;      # unstable version
+diff --git a/config/get_ld b/config/get_ld
+index 9a8482d..ec7b9da 100644
+--- a/config/get_ld
++++ b/config/get_ld
+@@ -3,6 +3,7 @@
+ _ld_list='LD LDFLAGS LIBS runpathprexix LDneedsWl LDused GNULDused'
+ case "$osname" in
+   darwin) LIBS= ;;
++  haiku) LIBS= ;;
+   osf1)   LIBS='-lm -lots';;
+   *)      LIBS=-lm;;
+ esac
+diff --git a/config/get_libc b/config/get_libc
+index 513a983..1e42fdd 100644
+--- a/config/get_libc
++++ b/config/get_libc
+@@ -2,7 +2,7 @@
+ exe=$osname-$arch-tmp$$
+ _has_list=
+ echo Looking in C lib for some symbols...
+-extra_flags=-lm
++#extra_flags=-lm
+ list=exp2; . ./look
+ list=log2; . ./look
+ extra_flags=
+-- 
+1.8.3.4
+
diff --git a/sys-apps/dialog/dialog-1.2.recipe b/sys-apps/dialog/dialog-1.2.recipe
new file mode 100644
index 000000000..2ba53b43e
--- /dev/null
+++ b/sys-apps/dialog/dialog-1.2.recipe
@@ -0,0 +1,43 @@
+SUMMARY="Display TUI widgets for shell scripts"
+DESCRIPTION="
+Dialog is an application used in shell scripts which displays text user\
+interface widgets. It uses the curses or ncurses library.
+"
+HOMEPAGE="http://invisible-island.net/dialog/"
+COPYRIGHT="1999-2014 Thomas E. Dickey"
+LICENSE="GNU LGPL v2"
+SRC_URI="ftp://invisible-island.net/dialog/dialog.tar.gz"
+CHECKSUM_SHA256="ccf07eedf147ac901aff1d984ab63ddd6986b615ddf67435f270d5462ea4ca81"
+SRC_FILENAME="dialog-$portVersion.tar.gz"
+REVISION="1"
+
+ARCHITECTURES="x86_gcc2 x86 x86_64"
+
+PROVIDES="
+	dialog = $portVersion
+	cmd:dialog = $portVersion
+"
+REQUIRES="
+	haiku >= $haikuVersion
+	lib:libncurses
+"
+BUILD_REQUIRES="
+	haiku_devel >= $haikuVersion
+	devel:libncurses
+"
+BUILD_PREREQUIRES="
+	cmd:gcc
+	cmd:ld
+	cmd:make
+"
+SOURCE_DIR="dialog-1.2-20140219"
+
+BUILD()
+{
+	./configure --bindir=$binDir
+	make
+}
+INSTALL()
+{
+	make install
+}
diff --git a/sys-apps/diffutils/diffutils-3.3.recipe b/sys-apps/diffutils/diffutils-3.3.recipe
index b391f8e44..241b5b983 100644
--- a/sys-apps/diffutils/diffutils-3.3.recipe
+++ b/sys-apps/diffutils/diffutils-3.3.recipe
@@ -18,9 +18,9 @@ LICENSE="GNU GPL v3"
 COPYRIGHT="1992-2013 Free Software Foundation, Inc."
 HOMEPAGE="http://www.gnu.org/software/diffutils/" 
 SRC_URI="http://ftp.gnu.org/pub/gnu/diffutils/diffutils-3.3.tar.xz"
-CHECKSUM_MD5="99180208ec2a82ce71f55b0d7389f1b3"
+CHECKSUM_SHA256="a25e89a8ab65fded1731e4186be1bb25cda967834b6df973599cdcd5abdfc19c"
 REVISION="2"
-ARCHITECTURES="x86 x86_gcc2"
+ARCHITECTURES="x86 x86_gcc2 x86_64"
 
 PROVIDES="
 	diffutils = $portVersion
@@ -38,6 +38,8 @@ BUILD_PREREQUIRES="
 	haiku_devel >= $haikuVersion
 	cmd:make
 	cmd:gcc
+	cmd:awk
+	cmd:sed
 	"
 
 PATCHES="diffutils-3.3.patchset"
diff --git a/sys-apps/dmidecode/dmidecode-2.12.recipe b/sys-apps/dmidecode/dmidecode-2.12.recipe
index 64b99c1ac..e9de9980f 100644
--- a/sys-apps/dmidecode/dmidecode-2.12.recipe
+++ b/sys-apps/dmidecode/dmidecode-2.12.recipe
@@ -5,7 +5,7 @@ BIOS according to the SMBIOS/DMI standard
 "
 HOMEPAGE="http://www.nongnu.org/dmidecode/"
 SRC_URI="http://download.savannah.gnu.org/releases/dmidecode/dmidecode-2.12.tar.gz"
-CHECKSUM_MD5="02ee243e1ecac7fe0d04428aec85f63a"
+CHECKSUM_SHA256="5a8214b99c1762f4510bd92baa279336e5fed6e5cd2e418d46d95a4ecc783922"
 REVISION="2"
 LICENSE="GNU GPL v2"
 COPYRIGHT="2000-2002 Alan Cox, 2002-2010 Jean Delvare"
diff --git a/sys-apps/dtc/dtc-1.4.0.recipe b/sys-apps/dtc/dtc-1.4.0.recipe
index d3250e9ad..5ce728515 100644
--- a/sys-apps/dtc/dtc-1.4.0.recipe
+++ b/sys-apps/dtc/dtc-1.4.0.recipe
@@ -8,28 +8,34 @@ LICENSE="GNU GPL v2"
 COPYRIGHT="2005 David Gibson, IBM Corporation"
 REVISION="1"
 
-ARCHITECTURES="x86"
+ARCHITECTURES="x86 x86_64"
+if [ $effectiveTargetArchitecture != x86_gcc2 ]; then
+	# x86_gcc2 is fine as primary target architecture as long as we're building
+	# for a different secondary architecture.
+	ARCHITECTURES="$ARCHITECTURES x86_gcc2"
+fi
+SECONDARY_ARCHITECTURES="x86"
 
 PROVIDES="
-	dtc = $portVersion
+	dtc$secondaryArchSuffix = $portVersion
 	cmd:convert_dtsv0 = $portVersion
 	cmd:dtc = $portVersion
 	cmd:dtdiff = $portVersion
 	cmd:fdtdump = $portVersion
 	cmd:fdtget = $portVersion
 	cmd:fdtput = $portVersion
-	lib:libfdt = $portVersion
-	lib:libfdt_1.4.0 = $portVersion
-	devel:libfdt = $portVersion
+	lib:libfdt$secondaryArchSuffix = $portVersion
+	lib:libfdt_1.4.0$secondaryArchSuffix = $portVersion
+	devel:libfdt$secondaryArchSuffix = $portVersion
 	"
 
 REQUIRES="
-	haiku >= $haikuVersion
+	haiku$secondaryArchSuffix >= $haikuVersion
 	"
 
 BUILD_PREREQUIRES="
-	haiku_devel >= $haikuVersion
-	cmd:bison >= 2.5
+	haiku${secondaryArchSuffix}_devel >= $haikuVersion
+	cmd:bison$secondaryArchSuffix >= 2.5
 	cmd:flex
 	cmd:gcc$secondaryArchSuffix
 	cmd:make
@@ -44,7 +50,7 @@ BUILD()
 
 INSTALL()
 {
-	make install PREFIX=$prefix INCLUDEDIR=$includeDir
+	make install PREFIX=$prefix INCLUDEDIR=$includeDir LIBDIR=$libDir
 
 	prepareInstalledDevelLibs libfdt
 }
diff --git a/sys-apps/ed/ed-1.7.recipe b/sys-apps/ed/ed-1.7.recipe
index a9e0fc477..9facb3434 100644
--- a/sys-apps/ed/ed-1.7.recipe
+++ b/sys-apps/ed/ed-1.7.recipe
@@ -6,7 +6,7 @@ HOMEPAGE="http://www.gnu.org/software/ed/"
 COPYRIGHT="1992-2010 Free Software Foundation, Inc."
 LICENSE="GNU GPL v3"
 SRC_URI="http://www.mirrorservice.org/sites/ftp.gnu.org/gnu/ed/ed-1.7.tar.gz"
-CHECKSUM_MD5="0aa4e2428e325203d0d7c3e86c961b1c"
+CHECKSUM_SHA256="894241019a5ff2b7816d20c5bd5a7048fb8f336ca52e97b3cc88d45b16472031"
 REVISION="1"
 ARCHITECTURES="x86_gcc2 x86"
 
diff --git a/sys-apps/file/file-5.15.recipe b/sys-apps/file/file-5.15.recipe
index 1d595b308..81e6bb741 100644
--- a/sys-apps/file/file-5.15.recipe
+++ b/sys-apps/file/file-5.15.recipe
@@ -8,7 +8,7 @@ exact release number).
 "
 HOMEPAGE="ftp://ftp.astron.com/pub/file/"
 SRC_URI="ftp://ftp.astron.com/pub/file/file-5.15.tar.gz"
-CHECKSUM_MD5="3f99565532f548d7540912c4642d1ede"
+CHECKSUM_SHA256="4bd52cc614d6488127c0bddc208a2855481744d76ff0878d9c173d2a6ed564e4"
 REVISION="1"
 LICENSE="BSD (2-clause)"
 COPYRIGHT="
diff --git a/sys-apps/findutils/findutils-4.4.2.recipe b/sys-apps/findutils/findutils-4.4.2.recipe
index c2c8b1e38..0cc92166a 100644
--- a/sys-apps/findutils/findutils-4.4.2.recipe
+++ b/sys-apps/findutils/findutils-4.4.2.recipe
@@ -13,9 +13,9 @@ HOMEPAGE="http://www.gnu.org/software/findutils"
 COPYRIGHT="1994-2011 Free Software Foundation, Inc."
 LICENSE="GNU GPL v3"
 SRC_URI="http://ftp.gnu.org/gnu/findutils/findutils-4.4.2.tar.gz"
-CHECKSUM_MD5="351cc4adb07d54877fa15f75fb77d39f"
+CHECKSUM_SHA256="434f32d171cbc0a5e72cfc5372c6fc4cb0e681f8dce566a0de5b6fccd702b62a"
 REVISION="1"
-ARCHITECTURES="x86_gcc2 x86 x86_64"
+ARCHITECTURES="x86_gcc2 x86 x86_64 arm"
 
 PROVIDES="
 	findutils = $portVersion compat >= 4
diff --git a/sys-apps/gawk/gawk-3.1.8.recipe b/sys-apps/gawk/gawk-3.1.8.recipe
index e2e5a4cdf..1e2211fd4 100644
--- a/sys-apps/gawk/gawk-3.1.8.recipe
+++ b/sys-apps/gawk/gawk-3.1.8.recipe
@@ -11,11 +11,11 @@ DESCRIPTION="
 	makes it possible to handle simple data-reformatting jobs with just a 
 	few lines of code.
 	"
-HOMEPAGE="http://www.gnu.org/software/coreutils" 
+HOMEPAGE="http://www.gnu.org/s/gawk" 
 SRC_URI="http://ftp.gnu.org/gnu/gawk/gawk-3.1.8.tar.bz2"
-CHECKSUM_MD5="52b41c6c4418b3226dfb8f82076193bb"
+CHECKSUM_SHA256="5dbc7b2c4c328711337c2aacd09a122c7313122262e3ff034590f014067412b4"
 REVISION="2"
-ARCHITECTURES="x86_gcc2 x86"
+ARCHITECTURES="x86_gcc2 x86 x86_64"
 
 PROVIDES="
 	gawk = $portVersion compat >= 3
@@ -31,17 +31,19 @@ BUILD_PREREQUIRES="
 	haiku_devel >= $haikuVersion
 	cmd:gcc
 	cmd:ld
-    cmd:libtoolize
+	cmd:libtoolize
 	cmd:make
-    cmd:sed
+	cmd:sed
 	"
 
+defineDebugInfoPackage gawk \
+	$binDir/gawk
 
 BUILD()
 {
 	libtoolize --force --copy --install
-	./configure $configureDirArgs
-	make
+	runConfigure ./configure
+	make $jobArgs
 }
 
 INSTALL()
diff --git a/sys-apps/gawk/gawk-4.0.1.recipe b/sys-apps/gawk/gawk-4.0.1.recipe
deleted file mode 100644
index 2ae99b32d..000000000
--- a/sys-apps/gawk/gawk-4.0.1.recipe
+++ /dev/null
@@ -1,25 +0,0 @@
-DESCRIPTION="GNU awk"
-HOMEPAGE="http://www.gnu.org/software/coreutils"
-SRC_URI="http://ftp.gnu.org/gnu/gawk/gawk-4.0.1.tar.gz"
-CHECKSUM_MD5="bab2bda483e9f32be65b43b8dab39fa5"
-STATUS_HAIKU="stable"
-REVISION="1"
-BUILD()
-{
-	cd gawk-4.0.1
-	libtoolize --force --copy --install
-	./configure --prefix=`finddir B_COMMON_DIRECTORY` \
-		--datarootdir=`finddir B_COMMON_DATA_DIRECTORY` \
-		--libexecdir=`finddir B_COMMON_LIB_DIRECTORY` \
-		--mandir=`finddir B_COMMON_DOCUMENTATION_DIRECTORY`/man
-	make		
-}
-
-INSTALL()
-{
-	cd gawk-4.0.1
-	make install
-}
-
-LICENSE="GNU GPL v3"
-COPYRIGHT="2012 Free Software Foundation, Inc."
\ No newline at end of file
diff --git a/sys-apps/gawk/gawk-4.1.0.recipe b/sys-apps/gawk/gawk-4.1.0.recipe
new file mode 100644
index 000000000..5fe68e1fb
--- /dev/null
+++ b/sys-apps/gawk/gawk-4.1.0.recipe
@@ -0,0 +1,68 @@
+SUMMARY="A pattern scanning and processing language" 
+DESCRIPTION="
+	If you are like many computer users, you would frequently like to make 
+	changes in various text files wherever certain patterns appear, or 
+	extract data from parts of certain lines while discarding the rest. To 
+	write a program to do this in a language such as C or Pascal is a 
+	time-consuming inconvenience that may take many lines of code. The job 
+	is easy with awk, especially the GNU implementation: gawk.
+
+	The awk utility interprets a special-purpose programming language that 
+	makes it possible to handle simple data-reformatting jobs with just a 
+	few lines of code.
+	"
+HOMEPAGE="http://www.gnu.org/s/gawk" 
+SRC_URI="http://ftp.gnu.org/gnu/gawk/gawk-4.1.0.tar.gz"
+CHECKSUM_SHA256="79f81b09bc3cce50e083f78acc0f91783821ad30866615d30dd1731f17ec440b"
+REVISION="2"
+ARCHITECTURES="x86_gcc2 x86 x86_64 arm"
+PATCHES="gawk-4.1.0.patchset"
+
+PROVIDES="
+	gawk = $portVersion compat >= 4
+	cmd:awk = $portVersion compat >= 4
+	cmd:gawk = $portVersion compat >= 4
+	cmd:igawk = $portVersion compat >= 4
+	"
+REQUIRES="
+	haiku >= $haikuVersion
+	"
+BUILD_REQUIRES="
+	"
+BUILD_PREREQUIRES="
+	haiku_devel >= $haikuVersion
+	cmd:aclocal
+	cmd:autoconf
+	cmd:automake
+	cmd:gcc
+	cmd:ld
+	cmd:libtoolize
+	cmd:make
+	cmd:makeinfo
+	cmd:sed
+	"
+
+defineDebugInfoPackage gawk \
+	$binDir/gawk
+
+BUILD()
+{
+	libtoolize --force --copy --install
+	runConfigure ./configure \
+		--disable-rpath --with-gnu-ld
+	sed -i '/.*HAVE_WCTYPE_H.*/c\#undef HAVE_WCTYPE_H' config.h
+	make $jobArgs
+}
+
+INSTALL()
+{
+	make install
+}
+
+TEST()
+{
+	make check
+}
+
+LICENSE="GNU GPL v3"
+COPYRIGHT="1983-2013 Free Software Foundation, Inc."
diff --git a/sys-apps/gawk/patches/gawk-4.1.0.patchset b/sys-apps/gawk/patches/gawk-4.1.0.patchset
new file mode 100644
index 000000000..992aa9cdb
--- /dev/null
+++ b/sys-apps/gawk/patches/gawk-4.1.0.patchset
@@ -0,0 +1,28 @@
+From e5661558712bbd6f1e688fb564732bd3ca80ac63 Mon Sep 17 00:00:00 2001
+From: Jerome Duval <jerome.duval@gmail.com>
+Date: Tue, 25 Feb 2014 19:38:04 +0000
+Subject: avoids unsupported CFLAGS
+
+
+diff --git a/extension/configure.ac b/extension/configure.ac
+index 53ed588..d9b41f5 100644
+--- a/extension/configure.ac
++++ b/extension/configure.ac
+@@ -47,10 +47,10 @@ dnl AC_PROG_INSTALL
+ 
+ AC_SUBST([pkgextensiondir], ['${libdir}/gawk'])
+ 
+-if test "$GCC" = yes
+-then
+-	CFLAGS="$CFLAGS -Wall -Wextra"
+-fi
++#if test "$GCC" = yes
++#then
++#	CFLAGS="$CFLAGS -Wall -Wextra"
++#fi
+ 
+ AC_MSG_CHECKING([for special development options])
+ if test -f $srcdir/../.developing
+-- 
+1.8.3.4
+
diff --git a/sys-apps/grep/grep-2.14.recipe b/sys-apps/grep/grep-2.14.recipe
index d0dc428e3..d6dc8d915 100644
--- a/sys-apps/grep/grep-2.14.recipe
+++ b/sys-apps/grep/grep-2.14.recipe
@@ -7,12 +7,12 @@ HOMEPAGE="http://www.gnu.org/software/grep/"
 LICENSE="GNU GPL v3"
 COPYRIGHT="1992-2012 Free Software Foundation, Inc."
 SRC_URI="http://ports-space.haiku-files.org/source/grep-2.14.tar.bz2"
-CHECKSUM_MD5="db55b9fc67d8c0895f3c73e94e2aebe3"
+CHECKSUM_SHA256="0aa728dbb92eeec776f9551fcee1931717984a91cfd8c3df3dfb40709243ae6f"
 # XZ file format:
 #SRC_URI="http://ftp.gnu.org/pub/gnu/grep/grep-2.14.tar.xz"
 #CHECKSUM_MD5="d4a3f03849d1e17ce56ab76aa5a24cab"
 REVISION="5"
-ARCHITECTURES="x86_gcc2 x86 x86_64"
+ARCHITECTURES="x86_gcc2 x86 x86_64 arm"
 
 PATCHES="grep-2.14-gcc2.patch"
 
diff --git a/sys-apps/groff/groff-1.20.1.recipe b/sys-apps/groff/groff-1.20.1.recipe
index 85c775947..e56eace55 100644
--- a/sys-apps/groff/groff-1.20.1.recipe
+++ b/sys-apps/groff/groff-1.20.1.recipe
@@ -5,11 +5,11 @@ mixed with formatting commands and produces formatted output.
 "
 HOMEPAGE="http://www.gnu.org/software/groff/"
 SRC_URI="http://ftp.gnu.org/gnu/groff/groff-1.20.1.tar.gz"
-CHECKSUM_MD5="48fa768dd6fdeb7968041dd5ae8e2b02"
+CHECKSUM_SHA256="b645878135cb620c6c417c5601bfe96172245af12045540d7344938b4c2cd805"
 LICENSE="GNU GPL v3"
 COPYRIGHT="2003-2009 Free Software Foundation, Inc."
 REVISION="3"
-ARCHITECTURES="x86_gcc2 x86 x86_64"
+ARCHITECTURES="x86_gcc2 x86 x86_64 arm"
 
 PROVIDES="
 	groff = $portVersion compat >= 1.20
diff --git a/sys-apps/less/additional-files/sysless.in b/sys-apps/less/additional-files/sysless.in
new file mode 100644
index 000000000..5a252a059
--- /dev/null
+++ b/sys-apps/less/additional-files/sysless.in
@@ -0,0 +1,8 @@
+#command
+\177	back-screen
+^H		back-screen
+#line-edit
+\177	backspace
+^H		backspace
+#env
+LESS=-R -M
diff --git a/sys-apps/less/less-451.recipe b/sys-apps/less/less-451.recipe
index d3d123289..ca0233aa8 100644
--- a/sys-apps/less/less-451.recipe
+++ b/sys-apps/less/less-451.recipe
@@ -7,16 +7,18 @@ termcap (or terminfo on some systems), so it can run on a variety of \
 terminals. There is even limited support for hardcopy terminals.
 "
 HOMEPAGE="http://www.gnu.org/software/less/" 
-SRC_URI="http://ftp.gnu.org/gnu/less/less-451.tar.gz"
-CHECKSUM_MD5="765f082658002b2b46b86af4a0da1842"
+SRC_URI="http://ftp.gnu.org/gnu/less/less-$portVersion.tar.gz"
+CHECKSUM_SHA256="9fe8287c647afeafb4149c5dedaeacfd20971ed7c26c7553794bb750536b5f57"
 LICENSE="GNU GPL v3"
 COPYRIGHT="1984-2012 Mark Nudelman"
-REVISION="2"
+REVISION="4"
 ARCHITECTURES="x86_gcc2 x86 x86_64"
 
 PROVIDES="
-	less = 451
+	less = $portVersion
 	cmd:less
+	cmd:lessecho
+	cmd:lesskey
 	"
 
 REQUIRES="
@@ -39,14 +41,27 @@ BUILD_PREREQUIRES="
 
 PATCHES="less-451.patch"
 
+GLOBAL_WRITABLE_FILES="
+	settings/etc/sysless.src keep-old
+	settings/etc/sysless keep-old
+"
+
 BUILD()
 {
 	autoconf
-	runConfigure ./configure --with-editor=nano
+	runConfigure ./configure --with-editor=nano \
+		--sysconfdir=$settingsDir/etc
 	make
 }
 
 INSTALL()
 {
 	make install
+
+	syslessDir=$settingsDir/etc
+	mkdir $syslessDir
+	cp "$portDir/additional-files/sysless.in" \
+		"$syslessDir/sysless.src"
+	$binDir/lesskey -o "$syslessDir/sysless" \
+		"$syslessDir/sysless.src" 		
 }
diff --git a/sys-apps/man/man-1.6g.recipe b/sys-apps/man/man-1.6g.recipe
index cf3de4c0e..a1da4b5ef 100644
--- a/sys-apps/man/man-1.6g.recipe
+++ b/sys-apps/man/man-1.6g.recipe
@@ -4,10 +4,10 @@ Standard commands to read man pages.
 "
 HOMEPAGE="http://primates.ximian.com/~flucifredi/man/"
 SRC_URI="http://primates.ximian.com/~flucifredi/man/man-1.6g.tar.gz"
-CHECKSUM_MD5="ba154d5796928b841c9c69f0ae376660"
+CHECKSUM_SHA256="ccdcb8c3f4e0080923d7e818f0e4a202db26c46415eaef361387c20995b8959f"
 LICENSE="GNU GPL v2"
 COPYRIGHT="1989-2012 Free Software Foundation, Inc."
-REVISION="3"
+REVISION="4"
 ARCHITECTURES="x86_gcc2 x86 x86_64"
 
 PATCHES="man-1.6g.patchset"
diff --git a/sys-apps/man/patches/man-1.6g.patchset b/sys-apps/man/patches/man-1.6g.patchset
index 6fefdfc58..f2d53565b 100644
--- a/sys-apps/man/patches/man-1.6g.patchset
+++ b/sys-apps/man/patches/man-1.6g.patchset
@@ -182,3 +182,28 @@ index 72f37a5..c838d25 100755
 -- 
 1.8.3.4
 
+From ccf2eb07650cdeb9dbcc91d5bb271ee95a8da4ac Mon Sep 17 00:00:00 2001
+From: Jonathan Schleifer <js@webkeks.org>
+Date: Thu, 27 Mar 2014 21:56:39 +0100
+Subject: [PATCH] Add -R to less options to fix formattings
+
+---
+ configure | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/configure b/configure
+index c838d25..2bf534e 100755
+--- a/configure
++++ b/configure
+@@ -26,7 +26,7 @@ LANGOPT="+lang {$LANGUAGES|all|none}"
+ # (Indeed, -r may cause the terminal to get into funny states.
+ # Very inconvenient. For viewing pages in strange locales, set LC_*.)
+ #
+-DEFAULTLESSOPT="-is"
++DEFAULTLESSOPT="-isR"
+ #
+ # Note that not creating any cat directories (/var/cache/man or so)
+ # and not making man suid or sgid is recommended.
+-- 
+Jonathan
+
diff --git a/sys-apps/most/most-pre5.1_15.recipe b/sys-apps/most/most-pre5.1_15.recipe
index 3ae9447b4..29375790b 100644
--- a/sys-apps/most/most-pre5.1_15.recipe
+++ b/sys-apps/most/most-pre5.1_15.recipe
@@ -6,7 +6,7 @@ scroll left and right. Why settle for less?
 "
 HOMEPAGE="http://www.jedsoft.org/most/"
 SRC_URI="http://www.jedsoft.org/snapshots/most-pre5.1-15.tar.gz"
-CHECKSUM_MD5="5894e7acde3ff14e16595b147ca4d2fb"
+CHECKSUM_SHA256="b1b3078d855c810e8b697e4c35054e84d9c738ee960c1cc33429b246c28e1024"
 LICENSE="GNU GPL v2"
 COPYRIGHT="2004-2013 John E. Davis"
 REVISION="1"
diff --git a/sys-apps/pciutils/pciutils-3.2.1.recipe b/sys-apps/pciutils/pciutils-3.2.1.recipe
index 4b77d4ab8..596d423ce 100644
--- a/sys-apps/pciutils/pciutils-3.2.1.recipe
+++ b/sys-apps/pciutils/pciutils-3.2.1.recipe
@@ -2,7 +2,7 @@ SUMMARY="Various utilities dealing with the PCI bus"
 DESCRIPTION="Various utilities dealing with the PCI bus"
 HOMEPAGE="http://mj.ucw.cz/sw/pciutils/"
 SRC_URI="ftp://atrey.karlin.mff.cuni.cz/pub/linux/pci/pciutils-3.2.1.tar.gz"
-CHECKSUM_MD5="fdc92c4665bb169022ffe730b3c08313"
+CHECKSUM_SHA256="b31131b721fa26378b4af61b1c49986ff40fe590bc210545b210b6b774337858"
 REVISION="1"
 LICENSE="GNU GPL v2"
 COPYRIGHT="1997-2012 Martin Mares"
diff --git a/sys-apps/sed/sed-4.2.1.recipe b/sys-apps/sed/sed-4.2.1.recipe
index f9628efdb..69ce16c5b 100644
--- a/sys-apps/sed/sed-4.2.1.recipe
+++ b/sys-apps/sed/sed-4.2.1.recipe
@@ -11,9 +11,9 @@ HOMEPAGE="http://www.gnu.org/software/sed"
 COPYRIGHT="1989-2009 Free Software Foundation, Inc."
 LICENSE="GNU GPL v3"
 SRC_URI="http://ftp.gnu.org/gnu/sed/sed-4.2.1.tar.gz"
-CHECKSUM_MD5="f0fd4d7da574d4707e442285fd2d3b86"
+CHECKSUM_SHA256="8773541ce097fdc4c5b9e7da12a82dffbb30cd91f7bc169f52f05f93b7fc3060"
 REVISION="6"
-ARCHITECTURES="x86_gcc2 x86 x86_64"
+ARCHITECTURES="x86_gcc2 x86 x86_64 arm"
 
 PATCHES="sed-4.2.1.patchset"
 
diff --git a/sys-apps/texinfo/texinfo-4.13a.recipe b/sys-apps/texinfo/texinfo-4.13a.recipe
index a5401abc8..eabd45d6b 100644
--- a/sys-apps/texinfo/texinfo-4.13a.recipe
+++ b/sys-apps/texinfo/texinfo-4.13a.recipe
@@ -6,9 +6,9 @@ HOMEPAGE="http://www.gnu.org/software/texinfo/"
 COPYRIGHT="1992-2008 Free Software Foundation, Inc."
 LICENSE="GNU GPL v3"
 SRC_URI="http://ftp.gnu.org/gnu/texinfo/texinfo-4.13a.tar.gz"
-CHECKSUM_MD5="71ba711519209b5fb583fed2b3d86fcb"
+CHECKSUM_SHA256="1303e91a1c752b69a32666a407e9fbdd6e936def4b09bc7de30f416301530d68"
 REVISION="7"
-ARCHITECTURES="x86_gcc2 x86 x86_64"
+ARCHITECTURES="x86_gcc2 x86 x86_64 arm"
 
 PATCHES="texinfo-4.13a.patch"
 
diff --git a/sys-apps/which/which-2.20.recipe b/sys-apps/which/which-2.20.recipe
index 6b4e0aa4e..3eb419671 100644
--- a/sys-apps/which/which-2.20.recipe
+++ b/sys-apps/which/which-2.20.recipe
@@ -3,9 +3,9 @@ HOMEPAGE="http://carlo17.home.xs4all.nl/which/"
 COPYRIGHT="Free Software Foundation"
 LICENSE="GNU GPL v2"
 SRC_URI="http://ftp.gnu.org/gnu/which/which-2.20.tar.gz"
-CHECKSUM_MD5="95be0501a466e515422cde4af46b2744"
+CHECKSUM_SHA256="d417b65c650d88ad26a208293c1c6e3eb60d4b6d847f01ff8f66aca63e2857f8"
 REVISION="2"
-ARCHITECTURES="x86_gcc2 x86 x86_64"
+ARCHITECTURES="x86_gcc2 x86 x86_64 arm"
 
 PATCHES="which-2.20.patch"
 
diff --git a/sys-devel/autoconf/autoconf-2.67xz.recipe b/sys-devel/autoconf/autoconf-2.67xz.recipe
deleted file mode 100644
index f83fde14b..000000000
--- a/sys-devel/autoconf/autoconf-2.67xz.recipe
+++ /dev/null
@@ -1,22 +0,0 @@
-DESCRIPTION="autoconf - Used to create autoconfiguration files" 
-HOMEPAGE="http://www.gnu.org/software/autoconf/" 
-SRC_URI="http://ftpmirror.gnu.org/autoconf/autoconf-2.67.tar.xz"
-CHECKSUM_MD5="1da24eebe4e6a774e4039242a4f06aad"
-REVISION="1"
-STATUS_HAIKU="stable"
-DEPEND=""
-BUILD()
-{
-	cd autoconf-2.67
-	./configure --prefix=`finddir B_COMMON_DIRECTORY`
-	make
-}
-
-INSTALL()
-{
-	cd autoconf-2.67
-	make install
-}
-LICENSE="GNU GPL v2
-	GNU GPL v3"
-COPYRIGHT="1992-2010 Free Software Foundation, Inc."
diff --git a/sys-devel/autoconf/autoconf-2.68.recipe b/sys-devel/autoconf/autoconf-2.68.recipe
index 72e390ea1..218fbb37e 100644
--- a/sys-devel/autoconf/autoconf-2.68.recipe
+++ b/sys-devel/autoconf/autoconf-2.68.recipe
@@ -7,7 +7,7 @@ options.
 "
 HOMEPAGE="http://www.gnu.org/software/autoconf/" 
 SRC_URI="http://ftp.gnu.org/gnu/autoconf/autoconf-2.68.tar.bz2"
-CHECKSUM_MD5="864d785215aa60d627c91fcb21b05b07"
+CHECKSUM_SHA256="c491fb273fd6d4ca925e26ceed3d177920233c76d542b150ff35e571454332c8"
 REVISION="5"
 ARCHITECTURES="x86_gcc2 ?x86"
 LICENSE="
diff --git a/sys-devel/autoconf/autoconf-2.69.recipe b/sys-devel/autoconf/autoconf-2.69.recipe
index 3d6f64316..3dc015cb1 100644
--- a/sys-devel/autoconf/autoconf-2.69.recipe
+++ b/sys-devel/autoconf/autoconf-2.69.recipe
@@ -12,9 +12,9 @@ LICENSE="
 	GNU GPL v3
 	"
 SRC_URI="http://ftp.gnu.org/gnu/autoconf/autoconf-2.69.tar.gz"
-CHECKSUM_MD5="82d05e03b93e45f5a39b828dc9c6c29b"
-REVISION="5"
-ARCHITECTURES="x86_gcc2 x86 x86_64"
+CHECKSUM_SHA256="954bd69b391edc12d6a4a51a2dd1476543da5c6bbf05a95b59dc0dd6fd4c2969"
+REVISION="6"
+ARCHITECTURES="x86_gcc2 x86 x86_64 arm"
 
 PATCHES='autoconf-2.69.patchset'
 
@@ -41,10 +41,11 @@ BUILD_REQUIRES="
 	"
 BUILD_PREREQUIRES="
 	haiku_devel >= $haikuVersion
-	cmd:automake >= 1.13.1
-	cmd:autoreconf >= 2.60
+	cmd:awk
+	cmd:m4
 	cmd:make
 	cmd:makeinfo
+	cmd:perl >= 5
 	cmd:sed
 	"
 
@@ -52,8 +53,6 @@ BUILD_PACKAGE_ACTIVATION_PHASE=INSTALL
 
 BUILD()
 {
-	autoreconf
-
 	# make sure that the build system doesn't try to update the manpages,
 	# as that requires help2man, which isn't available
 	touch man/*.1
diff --git a/sys-devel/automake/automake-1.11.1.recipe b/sys-devel/automake/automake-1.11.1.recipe
index 9e86a795a..e45e5928f 100644
--- a/sys-devel/automake/automake-1.11.1.recipe
+++ b/sys-devel/automake/automake-1.11.1.recipe
@@ -9,7 +9,7 @@ HOMEPAGE="http://www.gnu.org/software/automake/"
 COPYRIGHT="2009 Free Software Foundation, Inc."
 LICENSE="GNU GPL v2"
 SRC_URI="http://ftp.gnu.org/gnu/automake/automake-1.11.1.tar.gz"
-CHECKSUM_MD5="4ee7f0ff5f0e467d58b6bd5da96b1c74"
+CHECKSUM_SHA256="b7b37c0c0f09a286cf55cad408d74aef97774d73d744c88c396ff7957045d4cb"
 REVISION="5"
 ARCHITECTURES="x86_gcc2 ?x86"
 
diff --git a/sys-devel/automake/automake-1.12.2.recipe b/sys-devel/automake/automake-1.12.2.recipe
index b6ea56418..862b64139 100644
--- a/sys-devel/automake/automake-1.12.2.recipe
+++ b/sys-devel/automake/automake-1.12.2.recipe
@@ -9,7 +9,7 @@ HOMEPAGE="http://www.gnu.org/software/automake/"
 COPYRIGHT="2012 Free Software Foundation, Inc."
 LICENSE="GNU GPL v2"
 SRC_URI="http://ftp.gnu.org/gnu/automake/automake-1.12.2.tar.gz"
-CHECKSUM_MD5="e620cb9e0259159341c0e0d6b712b67a"
+CHECKSUM_SHA256="b2eef742f42730831d1af2fe0e5b954e2b60773e2e9922ba6280cdd0ab4a5d00"
 REVISION="4"
 ARCHITECTURES="x86_gcc2 x86"
 
diff --git a/sys-devel/automake/automake-1.13.1.recipe b/sys-devel/automake/automake-1.13.1.recipe
index 8139a7ee7..9ee7a526d 100644
--- a/sys-devel/automake/automake-1.13.1.recipe
+++ b/sys-devel/automake/automake-1.13.1.recipe
@@ -9,9 +9,9 @@ HOMEPAGE="http://www.gnu.org/software/automake/"
 COPYRIGHT="2013 Free Software Foundation, Inc."
 LICENSE="GNU GPL v2"
 SRC_URI="http://ftp.gnu.org/gnu/automake/automake-1.13.1.tar.gz"
-CHECKSUM_MD5="78a0ef8216b0556b44508e7b5b0c0847"
+CHECKSUM_SHA256="51bc10031847e9965c4f2c16a0a66552309ce28ea82b1afa8cef736643ebaa27"
 REVISION="4"
-ARCHITECTURES="x86_gcc2 x86 x86_64"
+ARCHITECTURES="x86_gcc2 x86 x86_64 arm"
 
 PROVIDES="
 	automake = $portVersion compat >= 1.13
@@ -34,6 +34,7 @@ BUILD_REQUIRES="
 BUILD_PREREQUIRES="
 	haiku_devel >= $haikuVersion
 	cmd:autoconf >= 2.60
+	cmd:find
 	cmd:gcc
 	cmd:ld
 	cmd:make
diff --git a/sys-devel/avr_binutils/avr_binutils-2.24_2014_03_19.recipe b/sys-devel/avr_binutils/avr_binutils-2.24_2014_03_19.recipe
new file mode 100644
index 000000000..d0c11395c
--- /dev/null
+++ b/sys-devel/avr_binutils/avr_binutils-2.24_2014_03_19.recipe
@@ -0,0 +1,149 @@
+SUMMARY="Assembler, linker and binary tools for Atmel AVR"
+HOMEPAGE="http://www.gnu.org/software/binutils"
+
+srcGitRev="c20a732df8f8b6d0f32c872817f3a0498a5c4761"
+SRC_URI="https://github.com/haiku/buildtools/archive/$srcGitRev.tar.gz"
+CHECKSUM_SHA256="6d3b677cd8ef777bf6fb3186a15b5122e46345595a996370325c758b3d8a4ab6"
+SRC_FILENAME="binutils-$portVersion.tar.gz"
+REVISION="5"
+LICENSE="
+	GNU GPL v2
+	GNU LGPL v2
+	"
+COPYRIGHT="1988-2013 Free Software Foundation, Inc."
+
+
+ARCHITECTURES="x86 x86_64 arm"
+if [ $effectiveTargetArchitecture != x86_gcc2 ]; then
+	# x86_gcc2 is fine as primary target architecture as long as we're building
+	# for a different secondary architecture.
+	ARCHITECTURES="$ARCHITECTURES x86_gcc2"
+fi
+SECONDARY_ARCHITECTURES="x86"
+
+PROVIDES="
+	avr_binutils$secondaryArchSuffix = $portVersion compat >= 2.23
+	cmd:avr_addr2line$secondaryArchSuffix = $portVersion compat >= 2.23
+	cmd:avr_ar$secondaryArchSuffix = $portVersion compat >= 2.23
+	cmd:avr_as$secondaryArchSuffix = $portVersion compat >= 2.23
+	cmd:avr_c++filt$secondaryArchSuffix = $portVersion compat >= 2.23
+	cmd:avr_elfedit$secondaryArchSuffix = $portVersion compat >= 2.23
+	cmd:avr_gprof$secondaryArchSuffix = $portVersion compat >= 2.23
+	cmd:avr_ld$secondaryArchSuffix = $portVersion compat >= 2.23
+	cmd:avr_ld.bfd$secondaryArchSuffix = $portVersion compat >= 2.23
+	cmd:avr_nm$secondaryArchSuffix = $portVersion compat >= 2.23
+	cmd:avr_objcopy$secondaryArchSuffix = $portVersion compat >= 2.23
+	cmd:avr_objdump$secondaryArchSuffix = $portVersion compat >= 2.23
+	cmd:avr_ranlib$secondaryArchSuffix = $portVersion compat >= 2.23
+	cmd:avr_readelf$secondaryArchSuffix = $portVersion compat >= 2.23
+	cmd:avr_size$secondaryArchSuffix = $portVersion compat >= 2.23
+	cmd:avr_strings$secondaryArchSuffix = $portVersion compat >= 2.23
+	cmd:avr_strip$secondaryArchSuffix = $portVersion compat >= 2.23
+	lib:avr_libbfd_2.24$secondaryArchSuffix = $portVersion compat >= 2.23
+	lib:avr_libopcodes_2.24$secondaryArchSuffix = $portVersion compat >= 2.23
+	"
+
+REQUIRES="
+	haiku$secondaryArchSuffix >= $haikuVersion
+	"
+BUILD_REQUIRES="
+	cmd:find
+	cmd:xargs
+	"
+BUILD_PREREQUIRES="
+	haiku${secondaryArchSuffix}_devel >= $haikuVersion
+	cmd:autoconf
+	cmd:awk
+	cmd:find
+	cmd:flex
+	cmd:gcc$secondaryArchSuffix
+	cmd:ld$secondaryArchSuffix
+	cmd:make
+	cmd:makeinfo
+	cmd:sed
+	cmd:strip
+	cmd:tar
+	cmd:xargs
+	"
+
+SOURCE_DIR="buildtools-$srcGitRev/binutils"
+BUILD_PACKAGE_ACTIVATION_PHASE=INSTALL
+
+sourceDir=$(pwd)
+relativeInstallDir="develop/tools/avr"
+installDir="$prefix/$relativeInstallDir"
+objectsDir=$(pwd)/../${portVersionedName}-obj
+
+BUILD()
+{
+	rm -rf $objectsDir
+
+	# Touch all *.info files, as newer texinfos don't like their format
+	(cd $sourceDir; find . -name \*.info | xargs touch)
+
+	mkdir -p $objectsDir
+	cd $objectsDir
+
+	CFLAGS=-O2 CXXFLAGS=-O2 runConfigure "$sourceDir/configure" \
+		--exec-prefix=$installDir \
+		--includedir=$includeDir/binutils \
+		--docdir=$docDir \
+		--disable-nls --target=avr
+
+	make $jobArgs
+}
+
+INSTALL()
+{
+	cd $objectsDir
+
+	make install
+
+	# no info documentation
+	rm -r $infoDir
+
+	### Strip #################################################
+
+	echo "Strip debug info"
+
+	strip --strip-debug $binDir/*
+
+	### Symlinks ##############################################
+
+	echo "Creating required symlinks"
+
+	# There are copies of a subset of the commands below installDir. We
+	# overwrite those with symlinks to the ones in binDir.
+	for file in $installDir/avr/bin/*; do
+		symlinkRelative -sfn $binDir/avr-$(basename $file) $file
+	done
+
+	### Cleanup #################################################
+
+	echo "Cleanup"
+
+	# delete man pages for commands that we aren't including
+	cd $manDir
+	for cmd in dlltool nlmconv windmc windres; do
+		rm -f man1/$cmd.1
+	done
+}
+
+DESCRIPTION="
+The GNU Binutils are a collection of binary tools. The main ones are:
+- ld - the GNU linker.
+- as - the GNU assembler.
+But they also include:
+- addr2line - Converts addresses into filenames and line numbers.
+- ar - A utility for creating, modifying and extracting from archives.
+- c++filt - Filter to demangle encoded C++ symbols.
+- nm - Lists symbols from object files.
+- objcopy - Copys and translates object files.
+- objdump - Displays information from object files.
+- ranlib - Generates an index to the contents of an archive.
+- readelf - Displays information from any ELF format object file.
+- size - Lists the section sizes of an object or archive file.
+- strings - Lists printable strings from files.
+- strip - Discards symbols.
+The tools of this package can be used for cross-builds to Atmel AVR.
+"
diff --git a/sys-devel/avr_gcc/avr_gcc-4.8.2_2014_03_20.recipe b/sys-devel/avr_gcc/avr_gcc-4.8.2_2014_03_20.recipe
new file mode 100644
index 000000000..351b97fdd
--- /dev/null
+++ b/sys-devel/avr_gcc/avr_gcc-4.8.2_2014_03_20.recipe
@@ -0,0 +1,119 @@
+SUMMARY="C/C++ cross-compiler for Atmel AVR"
+DESCRIPTION="
+Compiler for Atmel AVR platform.
+"
+HOMEPAGE="http://gcc.gnu.org"
+
+srcGitRev="c20a732df8f8b6d0f32c872817f3a0498a5c4761"
+SRC_URI="https://github.com/haiku/buildtools/archive/$srcGitRev.tar.gz"
+CHECKSUM_SHA256="6d3b677cd8ef777bf6fb3186a15b5122e46345595a996370325c758b3d8a4ab6"
+SRC_FILENAME="$portVersionedName.tar.gz"
+REVISION="1"
+LICENSE="
+	GNU GPL v2
+	GNU LGPL v2
+	"
+COPYRIGHT="1988-2013 Free Software Foundation, Inc."
+
+
+ARCHITECTURES="x86 x86_64 arm"
+if [ $effectiveTargetArchitecture != x86_gcc2 ]; then
+	# x86_gcc2 is fine as primary target architecture as long as we're building
+	# for a different secondary architecture.
+	ARCHITECTURES="$ARCHITECTURES x86_gcc2"
+fi
+SECONDARY_ARCHITECTURES="x86"
+
+PROVIDES="
+	avr_gcc$secondaryArchSuffix = $portVersion compat >= 4
+	cmd:avr_c++$secondaryArchSuffix = $portVersion compat >= 4
+	cmd:avr_cc$secondaryArchSuffix = $portVersion compat >= 4
+	cmd:avr_cpp$secondaryArchSuffix = $portVersion compat >= 4
+	cmd:avr_g++$secondaryArchSuffix = $portVersion compat >= 4
+	cmd:avr_gcc$secondaryArchSuffix = $portVersion compat >= 4
+	cmd:avr_gcc_4.8.2$secondaryArchSuffix = $portVersion compat >= 4
+	cmd:avr_gcov$secondaryArchSuffix = $portVersion compat >= 4
+	lib:avr_libstdc++$secondaryArchSuffix = $portVersion compat >= 4
+	"
+
+REQUIRES="
+	haiku$secondaryArchSuffix >= $haikuVersion
+	cmd:avr_as$secondaryArchSuffix
+	lib:libstdc++$secondaryArchSuffix
+	"
+BUILD_REQUIRES="
+	cmd:avr_as$secondaryArchSuffix
+	"
+BUILD_PREREQUIRES="
+	haiku${secondaryArchSuffix}_devel >= $haikuVersion
+	cmd:autoconf
+	cmd:awk
+	cmd:bison
+	cmd:find
+	cmd:flex
+	cmd:gcc$secondaryArchSuffix
+	cmd:ld$secondaryArchSuffix
+	cmd:make
+	cmd:makeinfo
+	cmd:sed
+	cmd:strip
+	cmd:tar
+	cmd:xargs
+	"
+
+SOURCE_DIR="buildtools-$srcGitRev/gcc"
+
+sourceDir=$(pwd)
+relativeInstallDir="develop/tools/avr"
+installDir="$prefix/$relativeInstallDir"
+objectsDir=$(pwd)/../${portVersionedName}-obj
+
+BUILD()
+{
+	rm -rf $objectsDir
+
+	# Touch some files generated by bison, so that bison won't run to update
+	# them. Fixes issues with newer bison versions.
+	# And while at it, touch gperf target, too (as gperf may not be installed).
+	(cd $sourceDir/gcc; touch c-parse.c c-parse.h cexp.c cp/parse.c \
+		cp/parse.h c-gperf.h)
+
+	mkdir -p $objectsDir
+	cd $objectsDir
+
+	# Setting a quoted string in an environment variable is ugly.
+	echo '#define LIBRARY_PATH_ENV "AVR_LIBRARY_PATH"' > haiku_host.h
+
+	CXXFLAGS="-O2 -include $objectsDir/haiku_host.h" \
+	CFLAGS="-O2 -U_FORTIFY_SOURCE" "$sourceDir/configure" \
+		--build=$effectiveTargetMachineTriple \
+		--prefix=$installDir --libexecdir=$installDir/lib --mandir=$manDir \
+		--docdir=$docDir --disable-nls --disable-libssp --with-gnu-ld \
+		--enable-languages=c,c++ --enable-lto --enable-frame-pointer \
+		--with-pkgversion=$(echo $portVersion | cut -c 7-) --target=avr
+
+	make $jobArgs
+}
+
+INSTALL()
+{
+	cd $objectsDir
+
+	make install-strip
+
+	### Symlinks ##############################################
+
+	echo "Creating required symlinks"
+
+	# make all tools available via default paths
+	mkdir -p $binDir
+	for f in c++ cc cpp g++ gcc gcov; do
+		symlinkRelative -sfn $installDir/bin/avr-$f $binDir
+	done
+
+	### Cleanup ###############################################
+
+	echo "Cleanup"
+	rm -rf $installDir/info
+	rm -rf $installDir/share
+}
diff --git a/sys-devel/bc/bc-1.06.recipe b/sys-devel/bc/bc-1.06.recipe
index 91c6ccb79..b6dfbdef9 100644
--- a/sys-devel/bc/bc-1.06.recipe
+++ b/sys-devel/bc/bc-1.06.recipe
@@ -6,7 +6,7 @@ statements. bc is a utility included in the POSIX P1003.2/D11 draft standard.
 "
 HOMEPAGE="http://www.gnu.org/software/bc/bc.html" 
 SRC_URI="http://ftp.gnu.org/gnu/bc/bc-1.06.tar.gz"
-CHECKSUM_MD5="d44b5dddebd8a7a7309aea6c36fda117"
+CHECKSUM_SHA256="4ef6d9f17c3c0d92d8798e35666175ecd3d8efac4009d6457b5c99cea72c0e33"
 REVISION="2"
 LICENSE="GNU GPL v2
 	GNU LGPL v2.1"
diff --git a/sys-devel/binutils/binutils-2.23.2_2013_04_09.recipe b/sys-devel/binutils/binutils-2.23.2_2013_04_09.recipe
index a46e0ce23..4ff223f07 100644
--- a/sys-devel/binutils/binutils-2.23.2_2013_04_09.recipe
+++ b/sys-devel/binutils/binutils-2.23.2_2013_04_09.recipe
@@ -48,6 +48,8 @@ BUILD_REQUIRES="
 BUILD_PREREQUIRES="
 	haiku${secondaryArchSuffix}_devel >= $haikuVersion
 	cmd:autoconf
+	cmd:awk
+	cmd:find
 	cmd:flex
 	cmd:gcc$secondaryArchSuffix
 	cmd:ld$secondaryArchSuffix
@@ -56,6 +58,7 @@ BUILD_PREREQUIRES="
 	cmd:sed
 	cmd:strip
 	cmd:tar
+	cmd:xargs
 	"
 
 SOURCE_DIR="binutils-$portVersion/binutils"
diff --git a/sys-devel/binutils/binutils-2.24_2014_03_19.recipe b/sys-devel/binutils/binutils-2.24_2014_03_19.recipe
new file mode 100644
index 000000000..46a3b7360
--- /dev/null
+++ b/sys-devel/binutils/binutils-2.24_2014_03_19.recipe
@@ -0,0 +1,178 @@
+SUMMARY="Assembler, linker and binary tools for target ${targetMachineTriple}"
+HOMEPAGE="http://www.gnu.org/software/binutils"
+
+srcGitRev="c20a732df8f8b6d0f32c872817f3a0498a5c4761"
+SRC_URI="https://github.com/haiku/buildtools/archive/$srcGitRev.tar.gz"
+CHECKSUM_SHA256="6d3b677cd8ef777bf6fb3186a15b5122e46345595a996370325c758b3d8a4ab6"
+SRC_FILENAME="binutils-$portVersion.tar.gz"
+REVISION="5"
+LICENSE="
+	GNU GPL v2
+	GNU LGPL v2
+	"
+COPYRIGHT="1988-2013 Free Software Foundation, Inc."
+
+
+ARCHITECTURES="x86 x86_64 arm"
+if [ $effectiveTargetArchitecture != x86_gcc2 ]; then
+	# x86_gcc2 is fine as primary target architecture as long as we're building
+	# for a different secondary architecture.
+	ARCHITECTURES="$ARCHITECTURES x86_gcc2"
+fi
+SECONDARY_ARCHITECTURES="x86"
+
+PROVIDES="
+	binutils$secondaryArchSuffix = $portVersion compat >= 2.23
+	cmd:addr2line$secondaryArchSuffix = $portVersion compat >= 2.23
+	cmd:ar$secondaryArchSuffix = $portVersion compat >= 2.23
+	cmd:as$secondaryArchSuffix = $portVersion compat >= 2.23
+	cmd:c++filt$secondaryArchSuffix = $portVersion compat >= 2.23
+	cmd:elfedit$secondaryArchSuffix = $portVersion compat >= 2.23
+	cmd:gprof$secondaryArchSuffix = $portVersion compat >= 2.23
+	cmd:ld$secondaryArchSuffix = $portVersion compat >= 2.23
+	cmd:ld.bfd$secondaryArchSuffix = $portVersion compat >= 2.23
+	cmd:nm$secondaryArchSuffix = $portVersion compat >= 2.23
+	cmd:objcopy$secondaryArchSuffix = $portVersion compat >= 2.23
+	cmd:objdump$secondaryArchSuffix = $portVersion compat >= 2.23
+	cmd:ranlib$secondaryArchSuffix = $portVersion compat >= 2.23
+	cmd:readelf$secondaryArchSuffix = $portVersion compat >= 2.23
+	cmd:size$secondaryArchSuffix = $portVersion compat >= 2.23
+	cmd:strings$secondaryArchSuffix = $portVersion compat >= 2.23
+	cmd:strip$secondaryArchSuffix = $portVersion compat >= 2.23
+	lib:libbfd_2.24$secondaryArchSuffix = $portVersion compat >= 2.23
+	lib:libopcodes_2.24$secondaryArchSuffix = $portVersion compat >= 2.23
+	"
+
+REQUIRES="
+	haiku$secondaryArchSuffix >= $haikuVersion
+	lib:libfl$secondaryArchSuffix
+	"
+BUILD_REQUIRES="
+	cmd:find
+	cmd:xargs
+	"
+BUILD_PREREQUIRES="
+	haiku${secondaryArchSuffix}_devel >= $haikuVersion
+	cmd:autoconf
+	cmd:awk
+	cmd:find
+	cmd:flex
+	cmd:gcc$secondaryArchSuffix
+	cmd:ld$secondaryArchSuffix
+	cmd:make
+	cmd:makeinfo
+	cmd:sed
+	cmd:strip
+	cmd:tar
+	cmd:xargs
+	"
+
+SOURCE_DIR="buildtools-$srcGitRev/binutils"
+BUILD_PACKAGE_ACTIVATION_PHASE=INSTALL
+
+sourceDir=$(pwd)
+relativeInstallDir="develop/tools$secondaryArchSubDir"
+installDir="$prefix/$relativeInstallDir"
+objectsDir=$(pwd)/../${portVersionedName}-obj
+
+BUILD()
+{
+	rm -rf $objectsDir
+
+	# Touch all *.info files, as newer texinfos don't like their format
+	(cd $sourceDir; find . -name \*.info | xargs touch)
+
+	mkdir -p $objectsDir
+	cd $objectsDir
+
+	CFLAGS=-O2 CXXFLAGS=-O2 runConfigure "$sourceDir/configure" \
+		--exec-prefix=$installDir \
+		--includedir=$includeDir/binutils \
+		--docdir=$docDir \
+		--disable-nls --enable-shared=yes \
+		--with-sysroot=/
+		# Note: The sysroot option is normally superfluous. We have to specify
+		# it, however, since these binutils may be used by the bootstrap-gcc,
+		# which passes --sysroot=<path> to ld.
+
+	make $jobArgs
+}
+
+INSTALL()
+{
+	cd $objectsDir
+
+	make install
+	make install-html
+
+	# Remove the development libraries and headers. Nobody uses those anyway.
+	rm $libDir/*.a $libDir/*.la $libDir/libbfd.so $libDir/libopcodes.so
+	rm -r $developDir/headers
+
+	### HTML documentation ####################################
+
+	echo "Organizing HTML documentation..."
+	cd $docDir
+
+	# beautify HTML docs and remove stuff we don't need
+	mv as.html as
+	ln -sf as/index.html as.html
+	mv bfd.html bfd
+	ln -sf bfd/index.html bfd.html
+	mv binutils.html binutils
+	ln -sf binutils/index.html binutils.html
+	mv gprof.html gprof
+	ln -sf gprof/index.html gprof.html
+	mv ld.html ld
+	ln -sf ld/index.html ld.html
+	rm libiberty.html standards.html
+
+	# no info documentation
+	rm -r $infoDir
+
+	### Strip #################################################
+
+	echo "Strip debug info"
+
+	strip --strip-debug $binDir/*
+
+	### Symlinks ##############################################
+
+	echo "Creating required symlinks"
+
+	# There are copies of a subset of the commands below installDir. We
+	# overwrite those with symlinks to the ones in binDir.
+	for file in $installDir/$effectiveTargetMachineTriple/bin/*; do
+		symlinkRelative -sfn $binDir/$(basename $file) $file
+	done
+
+	### Cleanup #################################################
+
+	echo "Cleanup"
+
+	# delete man pages for commands that we aren't including
+	cd $manDir
+	for cmd in dlltool nlmconv windmc windres; do
+		rm -f man1/$cmd.1
+	done
+}
+
+DESCRIPTION="
+The GNU Binutils are a collection of binary tools. The main ones are:
+- ld - the GNU linker.
+- as - the GNU assembler.
+But they also include:
+- addr2line - Converts addresses into filenames and line numbers.
+- ar - A utility for creating, modifying and extracting from archives.
+- c++filt - Filter to demangle encoded C++ symbols.
+- nm - Lists symbols from object files.
+- objcopy - Copys and translates object files.
+- objdump - Displays information from object files.
+- ranlib - Generates an index to the contents of an archive.
+- readelf - Displays information from any ELF format object file.
+- size - Lists the section sizes of an object or archive file.
+- strings - Lists printable strings from files.
+- strip - Discards symbols.
+The tools of this package can be used for cross-builds to \
+$effectiveTargetMachineTriple.
+"
diff --git a/sys-devel/bison/bison-2.4.3.recipe b/sys-devel/bison/bison-2.4.3.recipe
index c74232b5e..cade05d19 100644
--- a/sys-devel/bison/bison-2.4.3.recipe
+++ b/sys-devel/bison/bison-2.4.3.recipe
@@ -14,7 +14,7 @@ HOMEPAGE="http://www.gnu.org/software/bison/bison.html"
 COPYRIGHT="1992-2010 Free Software Foundation, Inc."
 LICENSE="GNU GPL v3"
 SRC_URI="http://ftp.gnu.org/gnu/bison/bison-2.4.3.tar.gz"
-CHECKSUM_MD5="ea45c778b36bdc7a720096819e292a73"
+CHECKSUM_SHA256="6b17be5e63ff6667c83f6ef0423befe0ba23d4bc554c4c33b02ce5bb65179b16"
 REVISION="6"
 ARCHITECTURES="x86_gcc2 x86 x86_64"
 
diff --git a/sys-devel/bison/bison-2.5.recipe b/sys-devel/bison/bison-2.5.recipe
index 32524beed..34edb12d4 100644
--- a/sys-devel/bison/bison-2.5.recipe
+++ b/sys-devel/bison/bison-2.5.recipe
@@ -14,22 +14,28 @@ HOMEPAGE="http://www.gnu.org/software/bison/bison.html"
 COPYRIGHT="1992-2011 Free Software Foundation, Inc."
 LICENSE="GNU GPL v3"
 SRC_URI="http://ftp.gnu.org/gnu/bison/bison-2.5.tar.gz"
-CHECKSUM_MD5="687e1dcd29452789d34eaeea4c25abe4"
+CHECKSUM_SHA256="722def46e4a19a5b7a579ef30db1965f86c37c1a20a5f0113743a2e4399f7c99"
 REVISION="1"
 
-ARCHITECTURES="?x86"
+ARCHITECTURES="?x86 x86_64"
+if [ $effectiveTargetArchitecture != x86_gcc2 ]; then
+	# x86_gcc2 is fine as primary target architecture as long as we're building
+	# for a different secondary architecture.
+	ARCHITECTURES="$ARCHITECTURES x86_gcc2"
+fi
+SECONDARY_ARCHITECTURES="x86"
 
 PATCHES="bison-${portVersion}.patch"
 
 PROVIDES="
-	bison = $portVersion compat >= 2.5
-	cmd:bison = $portVersion compat >= 2.5
-	cmd:yacc
-	devel:liby = $portVersion compat >= 2.5
+	bison$secondaryArchSuffix = $portVersion compat >= 2.5
+	cmd:bison$secondaryArchSuffix = $portVersion compat >= 2.5
+	cmd:yacc$secondaryArchSuffix
+	devel:liby$secondaryArchSuffix = $portVersion compat >= 2.5
 	"
 
 REQUIRES="
-	haiku >= $haikuVersion
+	haiku$secondaryArchSuffix >= $haikuVersion
 	cmd:m4
 	"
 
@@ -37,9 +43,10 @@ BUILD_REQUIRES="
 	"
 
 BUILD_PREREQUIRES="
-	haiku_devel >= $haikuVersion
-	cmd:gcc
-	cmd:ld
+	haiku${secondaryArchSuffix}_devel >= $haikuVersion
+	cmd:gcc$secondaryArchSuffix
+	cmd:ld$secondaryArchSuffix
+	cmd:awk
 	cmd:m4
 	cmd:make
 	cmd:sed
diff --git a/sys-devel/clang/clang-3.2.recipe b/sys-devel/clang/clang-3.2.recipe
index 33324b949..0bd0233b5 100644
--- a/sys-devel/clang/clang-3.2.recipe
+++ b/sys-devel/clang/clang-3.2.recipe
@@ -11,9 +11,9 @@ LICENSE="UIUC"
 COPYRIGHT="2003-2012 University of Illinois at Urbana-Champaign"
 
 SRC_URI="http://llvm.org/releases/${portVersion}/llvm-${portVersion}.src.tar.gz"
-CHECKSUM_MD5="71610289bbc819e3e15fdd562809a2d7"
+CHECKSUM_SHA256="125090c4d26740f1d5e9838477c931ed7d9ad70d599ba265f46f3a42cb066343"
 SRC_URI_2="http://llvm.org/releases/${portVersion}/clang-${portVersion}.src.tar.gz"
-CHECKSUM_MD5_2="3896ef4334df08563b05d0848ba80582"
+CHECKSUM_SHA256_2="2aaaf03f7c0f6b16fe97ecc81247dc2bf2d4bec7620a77cc74670b7e07ff5658"
 REVISION="1"
 
 ARCHITECTURES="?x86 ?x86_64"
@@ -62,9 +62,6 @@ BUILD()
 	#cp -r /boot/system/data/libtool/config/. autoconf/
 	#cp -r /boot/system/data/libtool/config/. projects/sample/autoconf/
 	
-	# Fix improper env paths
-	find . -type f -exec sed -i 's/\/usr\/bin\/env/\/bin\/env/g' "{}" \;
-	
 	# Haiku C++ requires rtti in a lot of central system components
 	# such as Mesa
 	export REQUIRES_RTTI=1
diff --git a/sys-devel/clang/clang-3.4.recipe b/sys-devel/clang/clang-3.4.recipe
index 79477fe79..24fc56b58 100644
--- a/sys-devel/clang/clang-3.4.recipe
+++ b/sys-devel/clang/clang-3.4.recipe
@@ -11,9 +11,11 @@ LICENSE="UIUC"
 COPYRIGHT="2003-2012 University of Illinois at Urbana-Champaign"
 
 SRC_URI="http://llvm.org/releases/${portVersion}/llvm-${portVersion}.src.tar.gz"
-CHECKSUM_MD5="46ed668a1ce38985120dbf6344cf6116"
+CHECKSUM_SHA256="25a5612d692c48481b9b397e2b55f4870e447966d66c96d655241702d44a2628"
+
 SRC_URI_2="http://llvm.org/releases/${portVersion}/clang-${portVersion}.src.tar.gz"
-CHECKSUM_MD5_2="b378f1e2c424e03289effc75268d3d2c"
+CHECKSUM_SHA256_2="22a9780db3b85a7f2eb9ea1f7f6e00da0249e3d12851e8dea0f62f1783242b1b"
+
 REVISION="2"
 
 ARCHITECTURES="x86 x86_64"
@@ -65,9 +67,6 @@ BUILD()
 	#cp -r /boot/system/data/libtool/config/. autoconf/
 	#cp -r /boot/system/data/libtool/config/. projects/sample/autoconf/
 	
-	# Fix improper env paths
-	find . -type f -exec sed -i 's/\/usr\/bin\/env/\/bin\/env/g' "{}" \;
-	
 	# Haiku C++ requires rtti in a lot of central system components
 	# such as Mesa
 	export REQUIRES_RTTI=1
diff --git a/sys-devel/distcc/distcc-3.1.recipe b/sys-devel/distcc/distcc-3.1.recipe
index aaebaeba8..a03bdce31 100644
--- a/sys-devel/distcc/distcc-3.1.recipe
+++ b/sys-devel/distcc/distcc-3.1.recipe
@@ -4,7 +4,7 @@ COPYRIGHT="Copyright (C) 2002, 2003, 2004 by Martin Pool <mbp@samba.org>
     Portions Copyright 2005 Google Inc."
 LICENSE="GNU GPL v2"
 SRC_URI="http://distcc.googlecode.com/files/distcc-3.1.tar.bz2"
-CHECKSUM_MD5="a1a9d3853df7133669fffec2a9aab9f3"
+CHECKSUM_SHA256="f55dbafd76bed3ce57e1bbcdab1329227808890d90f4c724fcd2d53f934ddd89"
 REVISION="2"
 ARCHITECTURES="?x86_gcc2 ?x86"
 
diff --git a/sys-devel/flex/flex-2.5.35.recipe b/sys-devel/flex/flex-2.5.35.recipe
index 9902934d0..87048cbc6 100644
--- a/sys-devel/flex/flex-2.5.35.recipe
+++ b/sys-devel/flex/flex-2.5.35.recipe
@@ -7,7 +7,7 @@ HOMEPAGE="http://flex.sourceforge.net/"
 COPYRIGHT="2001-2007 The Flex Project; 1990, 1997 The Regents of the University of California"
 LICENSE="Flex"
 SRC_URI="http://sourceforge.net/projects/flex/files/flex/flex-2.5.35/flex-2.5.35.tar.bz2/download"
-CHECKSUM_MD5="10714e50cea54dc7a227e3eddcd44d57"
+CHECKSUM_SHA256="0becbd4b2b36b99c67f8c22ab98f7f80c9860aec70f0350a0018f29a88704e7b"
 REVISION="6"
 ARCHITECTURES="x86_gcc2 x86 x86_64"
 
diff --git a/sys-devel/flex/flex-2.5.39.recipe b/sys-devel/flex/flex-2.5.39.recipe
new file mode 100644
index 000000000..8c9734004
--- /dev/null
+++ b/sys-devel/flex/flex-2.5.39.recipe
@@ -0,0 +1,62 @@
+SUMMARY="A tool for generating scanners."
+DESCRIPTION="
+Flex is a fast lexical analyser generator. It is a tool for generating \
+programs that perform pattern-matching on text.
+"
+HOMEPAGE="http://flex.sourceforge.net/"
+COPYRIGHT="2001-2007 The Flex Project; 1990, 1997 The Regents of the University of California"
+LICENSE="Flex"
+SRC_URI="http://sourceforge.net/projects/flex/files/flex-$portVersion.tar.bz2"
+CHECKSUM_SHA256="add2b55f3bc38cb512b48fad7d72f43b11ef244487ff25fc00aabec1e32b617f"
+REVISION="1"
+ARCHITECTURES="x86_gcc2 x86 x86_64 arm"
+
+PATCHES="flex-2.5.39.patchset"
+
+PROVIDES="
+	flex = $portVersion compat >= 2.5
+	cmd:flex = $portVersion compat >= 2.5
+	cmd:flex++ = $portVersion compat >= 2.5
+	lib:libfl = 2.0.0 compat >= 2
+	lib:libfl_pic = 2.0.0 compat >= 2
+	devel:libfl = 2.0.0 compat >= 2
+	devel:libfl_pic = 2.0.0 compat >= 2
+	"
+REQUIRES="
+	haiku >= $haikuVersion
+	cmd:m4
+	"
+BUILD_REQUIRES="
+	"
+BUILD_PREREQUIRES="
+	haiku_devel >= $haikuVersion
+	cmd:aclocal
+	cmd:autoconf
+	cmd:automake
+	cmd:gcc
+	cmd:ld
+	cmd:libtoolize
+	cmd:make
+	cmd:makeinfo
+	"
+
+
+BUILD()
+{
+	rm aclocal.m4
+	libtoolize --force --copy --install
+	aclocal -I m4
+	autoconf
+	automake --add-missing --force-missing
+	runConfigure ./configure \
+		--disable-rpath --with-gnu-ld
+	make $jobArgs
+}
+
+INSTALL()
+{
+	make install
+
+	# prepare develop/lib
+	prepareInstalledDevelLibs libfl libfl_pic
+}
diff --git a/sys-devel/flex/patches/flex-2.5.39.patchset b/sys-devel/flex/patches/flex-2.5.39.patchset
new file mode 100644
index 000000000..12a54933e
--- /dev/null
+++ b/sys-devel/flex/patches/flex-2.5.39.patchset
@@ -0,0 +1,35 @@
+From 40175da3a270397dcf9f684c360f9161c637039f Mon Sep 17 00:00:00 2001
+From: Jerome Duval <jerome.duval@gmail.com>
+Date: Mon, 14 Apr 2014 17:00:54 +0000
+Subject: initial haiku patch
+
+
+diff --git a/configure.ac b/configure.ac
+index 871082f..a3913b7 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -48,7 +48,7 @@ LT_INIT
+ AC_PROG_AWK
+ AC_PROG_INSTALL
+ 
+-AC_PATH_PROG(BISON, bison,bison)
++AC_CHECK_PROG(BISON, bison,bison)
+ AC_PATH_PROG(HELP2MAN, help2man, help2man)
+ 
+ # Check for a m4 that supports -P
+diff --git a/tests/test-pthread/Makefile.am b/tests/test-pthread/Makefile.am
+index fe5d545..e8023e8 100644
+--- a/tests/test-pthread/Makefile.am
++++ b/tests/test-pthread/Makefile.am
+@@ -27,7 +27,7 @@ CLEANFILES = scanner.c scanner.h parser.c parser.h $(testname)$(EXEEXT) OUTPUT $
+ OBJS = scanner.o # parser.o
+ 
+ AM_CPPFLAGS = -I$(srcdir) -I$(top_srcdir) -I$(top_builddir)
+-LIBS = -lpthread
++#LIBS = -lpthread
+ #LFLAGS = --header="scanner.h"
+ #YFLAGS = --defines --output=parser.c
+ 
+-- 
+1.8.3.4
+
diff --git a/sys-devel/gcc/gcc-4.8.2_2014_01_28.recipe b/sys-devel/gcc/gcc-4.8.2_2014_03_20.recipe
similarity index 90%
rename from sys-devel/gcc/gcc-4.8.2_2014_01_28.recipe
rename to sys-devel/gcc/gcc-4.8.2_2014_03_20.recipe
index be8a261dc..4b598dc46 100644
--- a/sys-devel/gcc/gcc-4.8.2_2014_01_28.recipe
+++ b/sys-devel/gcc/gcc-4.8.2_2014_03_20.recipe
@@ -3,17 +3,20 @@ DESCRIPTION="
 Standard compiler for x86 platform.
 "
 HOMEPAGE="http://gcc.gnu.org"
+
+srcGitRev="c20a732df8f8b6d0f32c872817f3a0498a5c4761"
+SRC_URI="https://github.com/haiku/buildtools/archive/$srcGitRev.tar.gz"
+CHECKSUM_SHA256="6d3b677cd8ef777bf6fb3186a15b5122e46345595a996370325c758b3d8a4ab6"
+SRC_FILENAME="$portVersionedName.tar.gz"
+REVISION="1"
 LICENSE="
 	GNU GPL v2
 	GNU LGPL v2
 	"
 COPYRIGHT="1988-2013 Free Software Foundation, Inc."
-SRC_URI="
-	git+file://$portBaseDir/../binutils/download/buildtools.git#66becd8fe7e99054b190c181b063933310718179
-	git+git://github.com/haiku/buildtools.git#66becd8fe7e99054b190c181b063933310718179
-	"
-REVISION="2"
-ARCHITECTURES="x86 x86_64"
+
+
+ARCHITECTURES="x86 x86_64 arm"
 if [ $effectiveTargetArchitecture != x86_gcc2 ]; then
 	# x86_gcc2 is fine as primary target architecture as long as we're building
 	# for a different secondary architecture.
@@ -30,6 +33,7 @@ PROVIDES="
 	cmd:gcc$secondaryArchSuffix = $portVersion compat >= 4
 	cmd:gcc_4.8.2$secondaryArchSuffix = $portVersion compat >= 4
 	cmd:gcov$secondaryArchSuffix = $portVersion compat >= 4
+	lib:libstdc++$secondaryArchSuffix = $portVersion compat >= 4
 	"
 
 REQUIRES="
@@ -41,6 +45,8 @@ BUILD_REQUIRES="
 BUILD_PREREQUIRES="
 	haiku${secondaryArchSuffix}_devel >= $haikuVersion
 	cmd:autoconf
+	cmd:awk
+	cmd:find
 	cmd:flex
 	cmd:gcc$secondaryArchSuffix
 	cmd:ld$secondaryArchSuffix
@@ -49,9 +55,10 @@ BUILD_PREREQUIRES="
 	cmd:sed
 	cmd:strip
 	cmd:tar
+	cmd:xargs
 	"
 
-SOURCE_DIR="gcc-$portVersion/gcc"
+SOURCE_DIR="buildtools-$srcGitRev/gcc"
 
 sourceDir=$(pwd)
 relativeInstallDir="develop/tools$secondaryArchSubDir"
diff --git a/sys-devel/gettext/gettext-0.18.1.1.recipe b/sys-devel/gettext/gettext-0.18.1.1.recipe
index 666aaf74e..f1cddcf98 100644
--- a/sys-devel/gettext/gettext-0.18.1.1.recipe
+++ b/sys-devel/gettext/gettext-0.18.1.1.recipe
@@ -17,9 +17,9 @@ HOMEPAGE="http://www.gnu.org/software/gettext/"
 LICENSE="GNU GPL v3"
 COPYRIGHT="1998, 2010 Free Software Foundation, Inc."
 SRC_URI="http://ftp.gnu.org/pub/gnu/gettext/gettext-0.18.1.1.tar.gz"
-CHECKSUM_MD5="3dd55b952826d2b32f51308f2f91aa89"
+CHECKSUM_SHA256="93ac71a7afa5b70c1b1032516663658c51e653087f42a3fc8044752c026443e9"
 REVISION="5"
-ARCHITECTURES="x86_gcc2 x86 x86_64"
+ARCHITECTURES="x86_gcc2 x86 x86_64 arm"
 SECONDARY_ARCHITECTURES="x86_gcc2 x86"
 
 PATCHES="gettext-0.18.1.1.patch"
diff --git a/sys-devel/libtool/libtool-2.4.2.recipe b/sys-devel/libtool/libtool-2.4.2.recipe
index 3796cd4ad..bf9d7ecc3 100644
--- a/sys-devel/libtool/libtool-2.4.2.recipe
+++ b/sys-devel/libtool/libtool-2.4.2.recipe
@@ -7,9 +7,9 @@ HOMEPAGE="http://www.gnu.org/software/libtool"
 COPYRIGHT="2004-2010 Free Software Foundation, Inc."
 LICENSE="GNU GPL v2"
 SRC_URI="ftp://ftp.gnu.org/gnu/libtool/libtool-2.4.2.tar.gz"
-CHECKSUM_MD5="d2f3b7d4627e69e13514a40e72a24d50"
+CHECKSUM_SHA256="b38de44862a987293cd3d8dfae1c409d514b6c4e794ebc93648febf9afc38918"
 REVISION="1"
-ARCHITECTURES="x86_gcc2 x86 x86_64"
+ARCHITECTURES="x86_gcc2 x86 x86_64 arm"
 
 PATCHES="
 	2.4.2/adjust_config_for_packaging.patch
@@ -29,6 +29,8 @@ REQUIRES="
 	cmd:automake
 	cmd:sed
 	cmd:tar
+	cmd:find
+	cmd:xargs
 	"
 BUILD_REQUIRES="
 	"
@@ -37,12 +39,14 @@ BUILD_PREREQUIRES="
 	cmd:aclocal
 	cmd:autoconf >= 2.62
 	cmd:autoheader >= 2.62
+	cmd:find
 	cmd:gcc
 	cmd:ld
 	cmd:make
 	cmd:nm
 	cmd:ranlib
 	cmd:sed
+	cmd:xargs
 	"
 
 
diff --git a/sys-devel/libtool/libtool-2.4.recipe b/sys-devel/libtool/libtool-2.4.recipe
index e9f5a42c3..4d809f5c4 100644
--- a/sys-devel/libtool/libtool-2.4.recipe
+++ b/sys-devel/libtool/libtool-2.4.recipe
@@ -7,7 +7,7 @@ HOMEPAGE="http://www.gnu.org/software/libtool"
 COPYRIGHT="2004-2010 Free Software Foundation, Inc."
 LICENSE="GNU GPL v2"
 SRC_URI="ftp://ftp.gnu.org/gnu/libtool/libtool-2.4.tar.gz"
-CHECKSUM_MD5="b32b04148ecdd7344abc6fe8bd1bb021"
+CHECKSUM_SHA256="13df57ab63a94e196c5d6e95d64e53262834fe780d5e82c28f177f9f71ddf62e"
 REVISION="8"
 ARCHITECTURES="x86_gcc2 x86 x86_64"
 
diff --git a/sys-devel/llvm/llvm-3.0.recipe b/sys-devel/llvm/llvm-3.0.recipe
index 82bd1fc02..e4c113ae4 100644
--- a/sys-devel/llvm/llvm-3.0.recipe
+++ b/sys-devel/llvm/llvm-3.0.recipe
@@ -3,7 +3,7 @@ HOMEPAGE="http://www.llvm.org/"
 COPYRIGHT="2003-2011 University of Illinois at Urbana-Champaign"
 LICENSE="UIUC"
 SRC_URI="http://llvm.org/releases/3.0/llvm-3.0.tar.gz"
-CHECKSUM_MD5="a8e5f5f1c1adebae7b4a654c376a6005"
+CHECKSUM_SHA256="519eb11d3499ce99c6ffdb8718651fc91425ed7690eac91c8d6853474f7c0477"
 REVISION="1"
 #ARCHITECTURES="x86"
 #if [ $effectiveTargetArchitecture != x86_gcc2 ]; then
diff --git a/sys-devel/llvm/llvm-3.2.recipe b/sys-devel/llvm/llvm-3.2.recipe
index 88de60727..7e2004dad 100644
--- a/sys-devel/llvm/llvm-3.2.recipe
+++ b/sys-devel/llvm/llvm-3.2.recipe
@@ -4,8 +4,8 @@ HOMEPAGE="http://www.llvm.org/"
 LICENSE="UIUC"
 COPYRIGHT="2003-2012 University of Illinois at Urbana-Champaign"
 SRC_URI="http://llvm.org/releases/${portVersion}/llvm-${portVersion}.src.tar.gz"
+CHECKSUM_SHA256="125090c4d26740f1d5e9838477c931ed7d9ad70d599ba265f46f3a42cb066343"
 REVISION="2"
-CHECKSUM_MD5="71610289bbc819e3e15fdd562809a2d7"
 ARCHITECTURES="x86 x86_64"
 if [ $effectiveTargetArchitecture != x86_gcc2 ]; then
 	ARCHITECTURES="$ARCHITECTURES x86_gcc2"
@@ -58,6 +58,7 @@ BUILD_PREREQUIRES="
 	cmd:aclocal
 	cmd:autoconf
 	cmd:automake
+	cmd:find
 	cmd:gcc$secondaryArchSuffix
 	cmd:ld$secondaryArchSuffix
 	cmd:libtoolize
diff --git a/sys-devel/llvm/llvm-3.3.recipe b/sys-devel/llvm/llvm-3.3.recipe
index e7aa7515a..3c3146f10 100644
--- a/sys-devel/llvm/llvm-3.3.recipe
+++ b/sys-devel/llvm/llvm-3.3.recipe
@@ -7,8 +7,8 @@ HOMEPAGE="http://www.llvm.org/"
 LICENSE="UIUC"
 COPYRIGHT="2003-2012 University of Illinois at Urbana-Champaign"
 SRC_URI="http://llvm.org/releases/${portVersion}/llvm-${portVersion}.src.tar.gz"
+CHECKSUM_SHA256="68766b1e70d05a25e2f502e997a3cb3937187a3296595cf6e0977d5cd6727578"
 REVISION="1"
-CHECKSUM_MD5="40564e1dc390f9844f1711c08b08e391"
 ARCHITECTURES="!x86 !x86_64"
 if [ $effectiveTargetArchitecture != x86_gcc2 ]; then
 	ARCHITECTURES="$ARCHITECTURES !x86_gcc2"
@@ -31,6 +31,7 @@ BUILD_PREREQUIRES="
 	cmd:aclocal
 	cmd:autoconf
 	cmd:automake
+	cmd:find
 	cmd:gcc$secondaryArchSuffix
 	cmd:ld$secondaryArchSuffix
 	cmd:libtoolize
diff --git a/sys-devel/llvm/llvm-3.4.1.recipe b/sys-devel/llvm/llvm-3.4.1.recipe
new file mode 100644
index 000000000..fedd4c33b
--- /dev/null
+++ b/sys-devel/llvm/llvm-3.4.1.recipe
@@ -0,0 +1,94 @@
+SUMMARY="Modular and reuseable compiler and toolchain technologies." 
+DESCRIPTION="
+LLVM is a collection of modular and reuseable compiler and and toolchain \
+technologies.
+"
+HOMEPAGE="http://www.llvm.org/"
+LICENSE="UIUC"
+COPYRIGHT="2003-2013 University of Illinois at Urbana-Champaign"
+SRC_URI="http://llvm.org/releases/${portVersion}/llvm-${portVersion}.src.tar.gz"
+CHECKSUM_SHA256="7d28bb6eca243a2bb6d65a05743ab915b57958a7770277364e93534b63eef93a"
+REVISION="1"
+ARCHITECTURES="x86 x86_64"
+if [ $effectiveTargetArchitecture != x86_gcc2 ]; then
+	ARCHITECTURES="$ARCHITECTURES x86_gcc2"
+fi
+SECONDARY_ARCHITECTURES="x86"
+
+PROVIDES="
+	llvm$secondaryArchSuffix = $portVersion
+	cmd:bugpoint
+	cmd:llc
+	cmd:lli
+	cmd:lli_child_target
+	cmd:llvm_ar
+	cmd:llvm_as
+	cmd:llvm_bcanalyzer
+	cmd:llvm_config
+	cmd:llvm_cov
+	cmd:llvm_diff
+	cmd:llvm_dis
+	cmd:llvm_dwarfdump
+	cmd:llvm_extract
+	cmd:llvm_link
+	cmd:llvm_mc
+	cmd:llvm_mcmarkup
+	cmd:llvm_nm
+	cmd:llvm_objdump
+	cmd:llvm_ranlib
+	cmd:llvm_readobj
+	cmd:llvm_rtdyld
+	cmd:llvm_size
+	cmd:llvm_stress
+	cmd:llvm_symbolizer
+	cmd:llvm_tblgen
+	cmd:macho_dump
+	cmd:opt
+	"
+
+REQUIRES="
+	haiku$secondaryArchSuffix >= $haikuVersion
+	lib:libstdc++$secondaryArchSuffix
+	"
+
+BUILD_REQUIRES="
+	"
+
+BUILD_PREREQUIRES="
+	haiku${secondaryArchSuffix}_devel >= $haikuVersion
+	cmd:aclocal
+	cmd:autoconf
+	cmd:automake
+	cmd:find
+	cmd:gcc$secondaryArchSuffix
+	cmd:ld$secondaryArchSuffix
+	cmd:libtoolize
+	cmd:make
+	cmd:python
+	cmd:sed
+	cmd:find
+	cmd:grep
+	"
+
+PATCHES="llvm-3.4.patchset"
+
+SOURCE_DIR="$portVersionedName.src"
+
+BUILD()
+{
+	# Haiku C++ requires rtti in a lot of central system components
+	# such as Mesa
+	export REQUIRES_RTTI=1
+	runConfigure ./configure --enable-optimized 
+	make $jobArgs
+}
+
+INSTALL()
+{
+	make install
+}
+
+TEST()
+{
+	make check
+}
diff --git a/sys-devel/llvm/llvm-3.4.recipe b/sys-devel/llvm/llvm-3.4.recipe
index 10e107e1e..e2eb42455 100644
--- a/sys-devel/llvm/llvm-3.4.recipe
+++ b/sys-devel/llvm/llvm-3.4.recipe
@@ -7,8 +7,8 @@ HOMEPAGE="http://www.llvm.org/"
 LICENSE="UIUC"
 COPYRIGHT="2003-2012 University of Illinois at Urbana-Champaign"
 SRC_URI="http://llvm.org/releases/${portVersion}/llvm-${portVersion}.src.tar.gz"
+CHECKSUM_SHA256="25a5612d692c48481b9b397e2b55f4870e447966d66c96d655241702d44a2628"
 REVISION="1"
-CHECKSUM_MD5="46ed668a1ce38985120dbf6344cf6116"
 ARCHITECTURES="x86 x86_64"
 if [ $effectiveTargetArchitecture != x86_gcc2 ]; then
 	ARCHITECTURES="$ARCHITECTURES x86_gcc2"
@@ -48,6 +48,7 @@ PROVIDES="
 
 REQUIRES="
 	haiku$secondaryArchSuffix >= $haikuVersion
+	lib:libstdc++$secondaryArchSuffix
 	"
 
 BUILD_REQUIRES="
@@ -58,6 +59,7 @@ BUILD_PREREQUIRES="
 	cmd:aclocal
 	cmd:autoconf
 	cmd:automake
+	cmd:find
 	cmd:gcc$secondaryArchSuffix
 	cmd:ld$secondaryArchSuffix
 	cmd:libtoolize
@@ -86,3 +88,8 @@ INSTALL()
 {
 	make install
 }
+
+TEST()
+{
+	make check
+}
diff --git a/sys-devel/m4/m4-1.4.16.recipe b/sys-devel/m4/m4-1.4.16.recipe
index a4b2b7fc9..d30f48c86 100644
--- a/sys-devel/m4/m4-1.4.16.recipe
+++ b/sys-devel/m4/m4-1.4.16.recipe
@@ -17,9 +17,9 @@ HOMEPAGE="http://www.gnu.org/software/m4/"
 COPYRIGHT="2000, 2005-2011 Free Software Foundation, Inc."
 LICENSE="GNU GPL v3"
 SRC_URI="http://ftp.gnu.org/gnu/m4/m4-1.4.16.tar.gz"
-CHECKSUM_MD5="a5dfb4f2b7370e9d34293d23fd09b280"
+CHECKSUM_SHA256="e9176a35bb13a1b08482359aa554ee8072794f58f00e4827bf0e06b570c827da"
 REVISION="5"
-ARCHITECTURES="x86_gcc2 x86 x86_64"
+ARCHITECTURES="x86_gcc2 x86 x86_64 arm"
 
 PROVIDES="
 	m4 = $portVersion compat >= 1.4
diff --git a/sys-devel/make/make-3.82.recipe b/sys-devel/make/make-3.82.recipe
index b3a06bd9f..0d0cd17d2 100644
--- a/sys-devel/make/make-3.82.recipe
+++ b/sys-devel/make/make-3.82.recipe
@@ -11,9 +11,9 @@ HOMEPAGE="http://www.gnu.org/software/make/"
 LICENSE="GNU GPL v3"
 COPYRIGHT="1988-2010 Free Software Foundation, Inc."
 SRC_URI="http://ftp.gnu.org/pub/gnu/make/make-3.82.tar.bz2"
-CHECKSUM_MD5="1a11100f3c63fcf5753818e59d63088f"
+CHECKSUM_SHA256="e2c1a73f179c40c71e2fe8abf8a8a0688b8499538512984da4a76958d0402966"
 REVISION="5"
-ARCHITECTURES="x86_gcc2 x86 x86_64"
+ARCHITECTURES="x86_gcc2 x86 x86_64 arm"
 
 PATCHES="make-3.82.patch"
 
diff --git a/sys-devel/patch/patch-2.7.1.recipe b/sys-devel/patch/patch-2.7.1.recipe
index 49155a3ae..fc806e52f 100644
--- a/sys-devel/patch/patch-2.7.1.recipe
+++ b/sys-devel/patch/patch-2.7.1.recipe
@@ -8,7 +8,7 @@ LICENSE="GNU GPL v3"
 COPYRIGHT="2012 Free Software Foundation, Inc."
 HOMEPAGE="http://www.gnu.org/software/patch/"
 SRC_URI="http://ftp.gnu.org/pub/gnu/patch/patch-2.7.1.tar.bz2"
-CHECKSUM_MD5="0881a7c6477862fc395f373ada0ec6b6"
+CHECKSUM_SHA256="aae676de9e95051f425af4507fcc9a019941a2a1f78405e7dbd40bccf786aa11"
 ARCHITECTURES="x86 x86_gcc2"
 REVISION="2"
 
diff --git a/sys-libs/glu/glu-9.0.0.recipe b/sys-libs/glu/glu-9.0.0.recipe
index c60a8cb72..6465ef5cb 100644
--- a/sys-libs/glu/glu-9.0.0.recipe
+++ b/sys-libs/glu/glu-9.0.0.recipe
@@ -6,7 +6,7 @@ HOMEPAGE="http://freedesktop.org"
 COPYRIGHT="Copyright (C) 1999-2012 Brian Paul and others.  All Rights Reserved."
 LICENSE="MIT"
 SRC_URI="ftp://freedesktop.org/pub/mesa/glu/glu-9.0.0.tar.gz"
-CHECKSUM_MD5="bbc57d4fe3bd3fb095bdbef6fcb977c4"
+CHECKSUM_SHA256="4387476a1933f36fec1531178ea204057bbeb04cc2d8396c9ea32720a1f7e264"
 REVISION="3"
 ARCHITECTURES="x86_gcc2 x86 x86_64"
 SECONDARY_ARCHITECTURES="x86_gcc2 x86"
@@ -26,6 +26,7 @@ BUILD_REQUIRES="
 BUILD_PREREQUIRES="
 	cmd:gcc$secondaryArchSuffix
 	cmd:ld$secondaryArchSuffix
+	cmd:awk
 	cmd:make
 	cmd:sed
 	"
diff --git a/sys-libs/libexecinfo/libexecinfo-1.1.recipe b/sys-libs/libexecinfo/libexecinfo-1.1.recipe
new file mode 100644
index 000000000..fbb1239d3
--- /dev/null
+++ b/sys-libs/libexecinfo/libexecinfo-1.1.recipe
@@ -0,0 +1,74 @@
+SUMMARY="Library for inspecting program's backtrace"
+DESCRIPTION="
+This is a quick-n-dirty BSD licensed clone of backtrace facility found
+in the GNU libc, mainly intended for porting linuxish code to BSD
+platforms, however it can be used at any platform which has a gcc
+compiler.
+"
+HOMEPAGE="http://www.freshports.org/devel/libexecinfo"
+COPYRIGHT="2003-2014 Maxim Sobolev"
+LICENSE="BSD (2-clause)"
+SRC_URI="http://ftp.freebsd.org/pub/FreeBSD/ports/local-distfiles/itetcu/libexecinfo-1.1.tar.bz2"
+CHECKSUM_SHA256="c9a21913e7fdac8ef6b33250b167aa1fc0a7b8a175145e26913a4c19d8a59b1f"
+REVISION="1"
+ARCHITECTURES="x86_gcc2 x86 ?x86_64"
+SECONDARY_ARCHITECTURES="x86 x86_gcc2"
+
+PROVIDES="
+	libexecinfo$secondaryArchSuffix = $portVersion compat >= 1
+	lib:libexecinfo$secondaryArchSuffix = $portVersion compat >= 1
+	"
+REQUIRES="
+	haiku$secondaryArchSuffix >= $haikuVersion
+	"
+BUILD_REQUIRES="
+	"
+BUILD_PREREQUIRES="
+	haiku${secondaryArchSuffix}_devel >= $haikuVersion
+	cmd:gcc$secondaryArchSuffix
+	cmd:ld$secondaryArchSuffix
+	cmd:make
+	"
+
+PATCHES="libexecinfo-$portVersion.patchset"
+
+BUILD()
+{
+	gcc -c -o execinfo.o execinfo.c
+	gcc -c -o stacktraverse.o stacktraverse.c
+	ar rcs libexecinfo.a execinfo.o stacktraverse.o
+	gcc -shared -Wl,-soname,libexecinfo.so.1.1 -o libexecinfo.so execinfo.o stacktraverse.o
+}
+
+INSTALL()
+{
+	mkdir -p $libDir
+	mkdir -p $includeDir
+
+	cp libexecinfo.a $libDir
+	cp libexecinfo.so $libDir/libexecinfo.so.1.1
+	ln -s $libDir/libexecinfo.so-1.1 $libDir/libexecinfo.so
+	cp execinfo.h $includeDir
+
+	prepareInstalledDevelLibs libexecinfo
+
+	# devel package
+	packageEntries devel \
+		$developDir
+}
+
+TEST()
+{
+	gcc test.c -o test libexecinfo.a
+	./test
+}
+
+# ----- devel package -------------------------------------------------------
+
+PROVIDES_devel="
+	libexecinfo${secondaryArchSuffix}_devel = $portVersion compat >= 1
+	devel:libexecinfo${secondaryArchSuffix} = $portVersion compat >= 1
+	"
+REQUIRES_devel="
+	libexecinfo${secondaryArchSuffix} == $portVersion base
+	"
diff --git a/sys-libs/libexecinfo/patches/libexecinfo-1.1.patchset b/sys-libs/libexecinfo/patches/libexecinfo-1.1.patchset
new file mode 100644
index 000000000..1cc8f4076
--- /dev/null
+++ b/sys-libs/libexecinfo/patches/libexecinfo-1.1.patchset
@@ -0,0 +1,75 @@
+From 9618f81449961ea9f5c6d85e45aab86a6b4a16c7 Mon Sep 17 00:00:00 2001
+From: Adrien Destugues <pulkomandy@pulkomandy.tk>
+Date: Thu, 17 Apr 2014 11:06:49 +0200
+Subject: Import FreeBSD patches.
+
+
+diff --git a/execinfo.c b/execinfo.c
+index 906fb14..9448b60 100644
+--- a/execinfo.c
++++ b/execinfo.c
+@@ -69,7 +69,8 @@ backtrace(void **buffer, int size)
+ char **
+ backtrace_symbols(void *const *buffer, int size)
+ {
+-    int i, clen, alen, offset;
++    size_t clen, alen;
++    int i, offset;
+     char **rval;
+     char *cp;
+     Dl_info info;
+@@ -78,7 +79,6 @@ backtrace_symbols(void *const *buffer, int size)
+     rval = malloc(clen);
+     if (rval == NULL)
+         return NULL;
+-    (char **)cp = &(rval[size]);
+     for (i = 0; i < size; i++) {
+         if (dladdr(buffer[i], &info) != 0) {
+             if (info.dli_sname == NULL)
+@@ -92,14 +92,14 @@ backtrace_symbols(void *const *buffer, int size)
+                    2 +                      /* " <" */
+                    strlen(info.dli_sname) + /* "function" */
+                    1 +                      /* "+" */
+-                   D10(offset) +            /* "offset */
++                   10 +                     /* "offset */
+                    5 +                      /* "> at " */
+                    strlen(info.dli_fname) + /* "filename" */
+                    1;                       /* "\0" */
+             rval = realloc_safe(rval, clen + alen);
+             if (rval == NULL)
+                 return NULL;
+-            snprintf(cp, alen, "%p <%s+%d> at %s",
++            snprintf((char *) rval + clen, alen, "%p <%s+%d> at %s",
+               buffer[i], info.dli_sname, offset, info.dli_fname);
+         } else {
+             alen = 2 +                      /* "0x" */
+@@ -108,12 +108,15 @@ backtrace_symbols(void *const *buffer, int size)
+             rval = realloc_safe(rval, clen + alen);
+             if (rval == NULL)
+                 return NULL;
+-            snprintf(cp, alen, "%p", buffer[i]);
++            snprintf((char *) rval + clen, alen, "%p", buffer[i]);
+         }
+-        rval[i] = cp;
+-        cp += alen;
++        rval[i] = (char *) clen;
++        clen += alen;
+     }
+ 
++    for (i = 0; i < size; i++)
++        rval[i] += (long) rval;
++
+     return rval;
+ }
+ 
+@@ -155,6 +158,6 @@ backtrace_symbols_fd(void *const *buffer, int size, int fd)
+                 return;
+             snprintf(buf, len, "%p\n", buffer[i]);
+         }
+-        write(fd, buf, len - 1);
++        write(fd, buf, strlen(buf));
+     }
+ }
+-- 
+1.8.3.4
+
diff --git a/sys-libs/mesa/mesa-10.0.1.recipe b/sys-libs/mesa/mesa-10.0.1.recipe
index 3ad0ec9e8..fccdf54e8 100644
--- a/sys-libs/mesa/mesa-10.0.1.recipe
+++ b/sys-libs/mesa/mesa-10.0.1.recipe
@@ -9,7 +9,7 @@ HOMEPAGE="http://www.mesa3d.org/"
 COPYRIGHT="1999-2013 Brian Paul All Rights Reserved."
 LICENSE="MIT"
 SRC_URI="ftp://ftp.freedesktop.org/pub/mesa/10.0.1/MesaLib-10.0.1.tar.bz2"
-CHECKSUM_MD5="0a72ca5b36046a658bf6038326ff32ed"
+CHECKSUM_SHA256="3cdf868f9599ca310c17fcf5b4ce9aec9903d8bf8561fde2577f3d422f823270"
 REVISION="5"
 ARCHITECTURES="x86 x86_64"
 if [ $effectiveTargetArchitecture != x86_gcc2 ]; then
diff --git a/sys-libs/mesa/mesa-10.0.2.recipe b/sys-libs/mesa/mesa-10.0.2.recipe
index 4d219770d..8ab5a0d06 100644
--- a/sys-libs/mesa/mesa-10.0.2.recipe
+++ b/sys-libs/mesa/mesa-10.0.2.recipe
@@ -9,7 +9,7 @@ HOMEPAGE="http://www.mesa3d.org/"
 COPYRIGHT="1999-2013 Brian Paul All Rights Reserved."
 LICENSE="MIT"
 SRC_URI="ftp://ftp.freedesktop.org/pub/mesa/10.0.2/MesaLib-10.0.2.tar.bz2"
-CHECKSUM_MD5="8544c0ab3e438a08b5103421ea15b6d2"
+CHECKSUM_SHA256="4502a8e2dfa53e15d8fff89c153e6b14824fe82e49bd101e7edc02fa8cf76a7e"
 REVISION="3"
 ARCHITECTURES="x86 x86_64"
 if [ $effectiveTargetArchitecture != x86_gcc2 ]; then
diff --git a/sys-libs/mesa/mesa-10.1.0.recipe b/sys-libs/mesa/mesa-10.1.0.recipe
new file mode 100644
index 000000000..18327f821
--- /dev/null
+++ b/sys-libs/mesa/mesa-10.1.0.recipe
@@ -0,0 +1,155 @@
+SUMMARY="Multi-platform GL implementation"
+DESCRIPTION="
+Mesa is an open-source implementation of the OpenGL specification. The OpenGL \
+specification documents a system for rendering interactive 3D graphics.
+Mesa fills the role of the Haiku OpenGL kit providing 3D rendering to Haiku \
+applications.
+"
+HOMEPAGE="http://www.mesa3d.org/"
+COPYRIGHT="1999-2013 Brian Paul All Rights Reserved."
+LICENSE="MIT"
+SRC_URI="ftp://ftp.freedesktop.org/pub/mesa/10.1/MesaLib-10.1.0.tar.bz2"
+CHECKSUM_SHA256="5941c3d4772a9f447f51569dfca48e01af98080bc996991d00a13f900dab2230"
+REVISION="1"
+ARCHITECTURES="x86 x86_64"
+if [ $effectiveTargetArchitecture != x86_gcc2 ]; then
+	# x86_gcc2 is fine as primary target architecture as long as we're building
+	# for a different secondary architecture.
+	ARCHITECTURES="$ARCHITECTURES x86_gcc2"
+fi
+SECONDARY_ARCHITECTURES="x86"
+
+PROVIDES="
+	mesa$secondaryArchSuffix = $portVersion compat >= 10.0
+	lib:libGL$secondaryArchSuffix
+	"
+REQUIRES="
+	haiku$secondaryArchSuffix >= $haikuVersion
+	"
+BUILD_REQUIRES="
+	haiku${secondaryArchSuffix}_devel >= $haikuVersion
+	"
+BUILD_PREREQUIRES="
+	libxml2_python
+	llvm${secondaryArchSuffix}
+	cmd:bison
+	cmd:find
+	cmd:flex
+	cmd:gcc$secondaryArchSuffix
+	cmd:ld$secondaryArchSuffix
+	cmd:scons
+	cmd:sed
+	"
+
+SOURCE_DIR="Mesa-$portVersion"
+
+PATCHES="mesa-10.1.0.patchset"
+
+BUILD()
+{
+	if [ -n "$secondaryArchSuffix" ]; then
+		export HAIKU_SECONDARY_ARCH="$effectiveTargetArchitecture"
+	fi
+	scons $jobArgs build=release
+	#scons $jobArgs build=debug
+}
+
+INSTALL()
+{
+	mesaBuildDir=build/haiku-$effectiveTargetArchitecture
+
+	# libGL.so makes up the core of our OpenGL kit
+	mkdir -p $libDir
+	cp $(find $mesaBuildDir -name 'libGL.so') $libDir
+	mkdir -p $developLibDir
+	symlinkRelative -s $libDir/libGL.so $developLibDir
+
+	# Our rendering add-ons
+	mkdir -p $addOnsDir/opengl
+	cp $(find $mesaBuildDir -name 'libswrast.so') \
+		"$addOnsDir/opengl/Software Rasterizer"
+	cp $(find $mesaBuildDir -name 'libswpipe.so') \
+		"$addOnsDir/opengl/Software Pipe"
+
+	# Set some nice version info
+	setversion "$libDir/libGL.so" -app 10 1 0 -long "Haiku OpenGL kit"
+	setversion "$addOnsDir/opengl/Software Rasterizer" -app 10 1 0 -long "Mesa software rasterization renderer"
+	setversion "$addOnsDir/opengl/Software Pipe" -app 10 1 0 -long "Gallium LLVM software pipe renderer"
+
+	# OpenGL Kit
+	mkdir -p $includeDir/os/opengl
+	cp ./include/HaikuGL/OpenGLKit.h $includeDir/os/
+	cp ./include/HaikuGL/GLView.h $includeDir/os/opengl/
+	cp ./include/HaikuGL/GLRenderer.h $includeDir/os/opengl/
+
+	# Standard GL headers
+	mkdir -p $includeDir/GL
+	cp ./include/GL/gl.h $includeDir/GL/
+	cp ./include/GL/gl_mangle.h $includeDir/GL/
+	cp ./include/GL/glext.h $includeDir/GL/
+
+	# Create GL symlink in opengl kit
+	symlinkRelative -s $includeDir/GL $includeDir/os/opengl/GL
+
+	# devel package
+	packageEntries devel \
+		$developDir
+
+	# swpipe renderer package
+	packageEntries swpipe \
+		"$addOnsDir/opengl/Software Pipe"
+
+	# swrast renderer package
+	packageEntries swrast \
+		"$addOnsDir/opengl/Software Rasterizer"
+}
+
+# ----- devel package -------------------------------------------------------
+
+PROVIDES_devel="
+	mesa${secondaryArchSuffix}_devel = $portVersion
+	devel:libGL$secondaryArchSuffix = $portVersion
+	"
+
+REQUIRES_devel="
+	mesa$secondaryArchSuffix == $portVersion base
+	"
+
+# ===== Mesa OpenGL Add-ons ==================================================
+# ----- swrast package -------------------------------------------------------
+
+SUMMARY_swrast="Mesa software rasterization renderer"
+DESCRIPTION_swrast="This 3D BGLRenderer add-on provides Mesa software
+	rasterization on Haiku systems. Software rasterization performs all
+	3D rendering on the systems CPU and doesn't require any specialized
+	hardware. Software rasterization is generally considered a fallback
+	3D rendering method as performance is limited.
+	"
+PROVIDES_swrast="
+	mesa${secondaryArchSuffix}_swrast = $portVersion
+	"
+REQUIRED_swrast="
+	mesa$secondaryArchSuffix == $portVersion base
+	"
+
+# ===== Gallium OpenGL Add-ons ===============================================
+# ----- swpipe package -------------------------------------------------------
+
+SUMMARY_swpipe="Mesa LLVM enhanced Gallium software pipe renderer"
+DESCRIPTION_swpipe="This 3D BGLRenderer add-on provides Gallium LLVM
+	enhanced software rendering. Software pipe rendering performs all
+	3D rendering on the systems CPU and doesn't require any specialized
+	hardware. The usage of LLVM over traditional rasterization gives this
+	renderer a boost in performance.
+	
+	Gallium software pipe rendering is in an extremely early state as of
+	this version of Mesa, and may not function as expected.
+	"
+PROVIDES_swpipe="
+	mesa${secondaryArchSuffix}_swpipe = $portVersion
+	"
+
+REQUIRED_swpipe="
+	mesa$secondaryArchSuffix == $portVersion base
+	"
+
diff --git a/sys-libs/mesa/mesa-10.1.1.recipe b/sys-libs/mesa/mesa-10.1.1.recipe
new file mode 100644
index 000000000..1fa9b6732
--- /dev/null
+++ b/sys-libs/mesa/mesa-10.1.1.recipe
@@ -0,0 +1,153 @@
+SUMMARY="Multi-platform GL implementation"
+DESCRIPTION="
+Mesa is an open-source implementation of the OpenGL specification. The OpenGL \
+specification documents a system for rendering interactive 3D graphics.
+Mesa fills the role of the Haiku OpenGL kit providing 3D rendering to Haiku \
+applications.
+"
+HOMEPAGE="http://www.mesa3d.org/"
+COPYRIGHT="1999-2013 Brian Paul All Rights Reserved."
+LICENSE="MIT"
+SRC_URI="ftp://ftp.freedesktop.org/pub/mesa/10.1.1/MesaLib-10.1.1.tar.bz2"
+CHECKSUM_SHA256="f3ae730ed81fffcb1ec59076813f9955157da7a1dd9ba23a6b1b8ff8cf6798b0"
+REVISION="1"
+ARCHITECTURES="x86 x86_64"
+if [ $effectiveTargetArchitecture != x86_gcc2 ]; then
+	# x86_gcc2 is fine as primary target architecture as long as we're building
+	# for a different secondary architecture.
+	ARCHITECTURES="$ARCHITECTURES x86_gcc2"
+fi
+SECONDARY_ARCHITECTURES="x86"
+
+PROVIDES="
+	mesa$secondaryArchSuffix = $portVersion compat >= 10.0
+	lib:libGL$secondaryArchSuffix
+	"
+REQUIRES="
+	haiku$secondaryArchSuffix >= $haikuVersion
+	"
+BUILD_REQUIRES="
+	haiku${secondaryArchSuffix}_devel >= $haikuVersion
+	"
+BUILD_PREREQUIRES="
+	libxml2_python
+	llvm${secondaryArchSuffix}
+	cmd:bison
+	cmd:find
+	cmd:flex
+	cmd:gcc$secondaryArchSuffix
+	cmd:ld$secondaryArchSuffix
+	cmd:scons
+	cmd:sed
+	"
+
+SOURCE_DIR="Mesa-$portVersion"
+
+BUILD()
+{
+	if [ -n "$secondaryArchSuffix" ]; then
+		export HAIKU_SECONDARY_ARCH="$effectiveTargetArchitecture"
+	fi
+	scons $jobArgs build=release
+	#scons $jobArgs build=debug
+}
+
+INSTALL()
+{
+	mesaBuildDir=build/haiku-$effectiveTargetArchitecture
+
+	# libGL.so makes up the core of our OpenGL kit
+	mkdir -p $libDir
+	cp $(find $mesaBuildDir -name 'libGL.so') $libDir
+	mkdir -p $developLibDir
+	symlinkRelative -s $libDir/libGL.so $developLibDir
+
+	# Our rendering add-ons
+	mkdir -p $addOnsDir/opengl
+	cp $(find $mesaBuildDir -name 'libswrast.so') \
+		"$addOnsDir/opengl/Software Rasterizer"
+	cp $(find $mesaBuildDir -name 'libswpipe.so') \
+		"$addOnsDir/opengl/Software Pipe"
+
+	# Set some nice version info
+	setversion "$libDir/libGL.so" -app 10 1 1 -long "Haiku OpenGL kit"
+	setversion "$addOnsDir/opengl/Software Rasterizer" -app 10 1 1 -long "Mesa software rasterization renderer"
+	setversion "$addOnsDir/opengl/Software Pipe" -app 10 1 1 -long "Gallium LLVM software pipe renderer"
+
+	# OpenGL Kit
+	mkdir -p $includeDir/os/opengl
+	cp ./include/HaikuGL/OpenGLKit.h $includeDir/os/
+	cp ./include/HaikuGL/GLView.h $includeDir/os/opengl/
+	cp ./include/HaikuGL/GLRenderer.h $includeDir/os/opengl/
+
+	# Standard GL headers
+	mkdir -p $includeDir/GL
+	cp ./include/GL/gl.h $includeDir/GL/
+	cp ./include/GL/gl_mangle.h $includeDir/GL/
+	cp ./include/GL/glext.h $includeDir/GL/
+
+	# Create GL symlink in opengl kit
+	symlinkRelative -s $includeDir/GL $includeDir/os/opengl/GL
+
+	# devel package
+	packageEntries devel \
+		$developDir
+
+	# swpipe renderer package
+	packageEntries swpipe \
+		"$addOnsDir/opengl/Software Pipe"
+
+	# swrast renderer package
+	packageEntries swrast \
+		"$addOnsDir/opengl/Software Rasterizer"
+}
+
+# ----- devel package -------------------------------------------------------
+
+PROVIDES_devel="
+	mesa${secondaryArchSuffix}_devel = $portVersion
+	devel:libGL$secondaryArchSuffix = $portVersion
+	"
+
+REQUIRES_devel="
+	mesa$secondaryArchSuffix == $portVersion base
+	"
+
+# ===== Mesa OpenGL Add-ons ==================================================
+# ----- swrast package -------------------------------------------------------
+
+SUMMARY_swrast="Mesa software rasterization renderer"
+DESCRIPTION_swrast="This 3D BGLRenderer add-on provides Mesa software
+	rasterization on Haiku systems. Software rasterization performs all
+	3D rendering on the systems CPU and doesn't require any specialized
+	hardware. Software rasterization is generally considered a fallback
+	3D rendering method as performance is limited.
+	"
+PROVIDES_swrast="
+	mesa${secondaryArchSuffix}_swrast = $portVersion
+	"
+REQUIRED_swrast="
+	mesa$secondaryArchSuffix == $portVersion base
+	"
+
+# ===== Gallium OpenGL Add-ons ===============================================
+# ----- swpipe package -------------------------------------------------------
+
+SUMMARY_swpipe="Mesa LLVM enhanced Gallium software pipe renderer"
+DESCRIPTION_swpipe="This 3D BGLRenderer add-on provides Gallium LLVM
+	enhanced software rendering. Software pipe rendering performs all
+	3D rendering on the systems CPU and doesn't require any specialized
+	hardware. The usage of LLVM over traditional rasterization gives this
+	renderer a boost in performance.
+	
+	Gallium software pipe rendering is in an extremely early state as of
+	this version of Mesa, and may not function as expected.
+	"
+PROVIDES_swpipe="
+	mesa${secondaryArchSuffix}_swpipe = $portVersion
+	"
+
+REQUIRED_swpipe="
+	mesa$secondaryArchSuffix == $portVersion base
+	"
+
diff --git a/sys-libs/mesa/mesa-7.8.2.recipe b/sys-libs/mesa/mesa-7.8.2.recipe
index 261fc2d2c..ee08a76b3 100644
--- a/sys-libs/mesa/mesa-7.8.2.recipe
+++ b/sys-libs/mesa/mesa-7.8.2.recipe
@@ -19,7 +19,7 @@ HOMEPAGE="http://www.mesa3d.org/"
 COPYRIGHT="1999-2012 Brian Paul All Rights Reserved."
 LICENSE="MIT"
 SRC_URI="ftp://freedesktop.org/pub/mesa/older-versions/7.x/7.8.2/MesaLib-7.8.2.tar.bz2"
-CHECKSUM_MD5="6be2d343a0089bfd395ce02aaf8adb57"
+CHECKSUM_SHA256="505bf418dceba05837f4ea1b1972b9620c35f8cb94bc4d1e6d573c15f562576d"
 REVISION="3"
 ARCHITECTURES="x86_gcc2"
 if [ $effectiveTargetArchitecture = x86_gcc2 -a $targetArchitecture = x86 ]
diff --git a/sys-libs/mesa/mesa-7.9.2.recipe b/sys-libs/mesa/mesa-7.9.2.recipe
index 2dd3776a5..e627564c7 100644
--- a/sys-libs/mesa/mesa-7.9.2.recipe
+++ b/sys-libs/mesa/mesa-7.9.2.recipe
@@ -10,6 +10,7 @@ COPYRIGHT="1999-2013 Brian Paul All Rights Reserved."
 LICENSE="MIT"
 # remember to update SOURCE_DIR as well for the -X revision
 SRC_URI="https://github.com/kallisti5/mesa/archive/7.9.2-5.tar.gz"
+SRC_FILENAME="mesa-7.9.2-5.tar.gz"
 CHECKSUM_MD5="7e9aafbfffa04e14a57d450836d86bf1"
 REVISION="6"
 ARCHITECTURES="x86_gcc2"
diff --git a/sys-libs/mesa/mesa-9.1.1.recipe b/sys-libs/mesa/mesa-9.1.1.recipe
index 735873ce8..0b1cf8d1e 100644
--- a/sys-libs/mesa/mesa-9.1.1.recipe
+++ b/sys-libs/mesa/mesa-9.1.1.recipe
@@ -19,7 +19,7 @@ HOMEPAGE="http://www.mesa3d.org/"
 COPYRIGHT="1999-2012 Brian Paul All Rights Reserved."
 LICENSE="MIT"
 SRC_URI="ftp://freedesktop.org/pub/mesa/9.1.1/MesaLib-9.1.1.tar.bz2"
-CHECKSUM_MD5="6ea2bdc3b7ecfb4257b39814b4182580"
+CHECKSUM_SHA256="3ae5741918a26ce6457b4427663b9e0ed31a3cae1b10b9009e55769a52e9adeb"
 REVISION="1"
 ARCHITECTURES="x86 x86_64"
 if [ $effectiveTargetArchitecture != x86_gcc2 ]; then
diff --git a/sys-libs/mesa/patches/mesa-10.1.0.patchset b/sys-libs/mesa/patches/mesa-10.1.0.patchset
new file mode 100644
index 000000000..1e55016a4
--- /dev/null
+++ b/sys-libs/mesa/patches/mesa-10.1.0.patchset
@@ -0,0 +1,65 @@
+From 14ba24e39946117b05fd97a077bad7eeda8790f5 Mon Sep 17 00:00:00 2001
+From: Alexander von Gluck IV <kallisti5@unixzen.com>
+Date: Wed, 19 Mar 2014 00:58:01 +0000
+Subject: [PATCH] haiku: Fix build through scons corrections and viewport fixes
+
+* Add HAVE_PTHREAD, we do have pthread support wrappers now
+  for non-native Haiku APIs.
+* Viewport changed behavior recently breaking the build.
+  We fix this by looking at the gl_context ViewportArray
+  (Thanks Brian for the idea)
+---
+ scons/gallium.py                                      |  5 +++++
+ src/gallium/targets/haiku-softpipe/GalliumContext.cpp | 12 +++++++++---
+ 2 files changed, 14 insertions(+), 3 deletions(-)
+
+diff --git a/scons/gallium.py b/scons/gallium.py
+index 70ee89b..9796c78 100755
+--- a/scons/gallium.py
++++ b/scons/gallium.py
+@@ -269,6 +269,11 @@ def generate(env):
+             cppdefines += ['HAVE_ALIAS']
+         else:
+             cppdefines += ['GLX_ALIAS_UNSUPPORTED']
++    if env['platform'] == 'haiku':
++        cppdefines += [
++            'HAVE_PTHREAD',
++            'HAVE_POSIX_MEMALIGN'
++        ]
+     if platform == 'windows':
+         cppdefines += [
+             'WIN32',
+diff --git a/src/gallium/targets/haiku-softpipe/GalliumContext.cpp b/src/gallium/targets/haiku-softpipe/GalliumContext.cpp
+index 1078cb7..52cd764 100644
+--- a/src/gallium/targets/haiku-softpipe/GalliumContext.cpp
++++ b/src/gallium/targets/haiku-softpipe/GalliumContext.cpp
+@@ -44,9 +44,15 @@ extern "C" {
+ 
+ 
+ static void
+-hgl_viewport(struct gl_context* glContext, GLint x, GLint y,
+-	GLsizei width, GLsizei height)
++hgl_viewport(struct gl_context* glContext)
+ {
++	// TODO: We should try to eliminate this function
++
++	GLint x = glContext->ViewportArray[0].X;
++	GLint y = glContext->ViewportArray[0].Y;
++	GLint width = glContext->ViewportArray[0].Width;
++	GLint height = glContext->ViewportArray[0].Height;
++
+ 	TRACE("%s(glContext: %p, x: %d, y: %d, w: %d, h: %d\n", __func__,
+ 		glContext, x, y, width, height);
+ 
+@@ -525,7 +531,7 @@ GalliumContext::ResizeViewport(int32 width, int32 height)
+ 	for (context_id i = 0; i < CONTEXT_MAX; i++) {
+ 		if (fContext[i] && fContext[i]->st) {
+ 			struct st_context *stContext = (struct st_context*)fContext[i]->st;
+-			_mesa_set_viewport(stContext->ctx, 0, 0, width, height);
++			_mesa_set_viewport(stContext->ctx, 0, 0, 0, width, height);
+         		st_manager_validate_framebuffers(stContext);
+ 		}
+ 	}
+-- 
+1.8.3.4
+
diff --git a/sys-libs/ncurses/ncurses-5.9.recipe b/sys-libs/ncurses/ncurses-5.9.recipe
index 225fb3883..faaeb02e4 100644
--- a/sys-libs/ncurses/ncurses-5.9.recipe
+++ b/sys-libs/ncurses/ncurses-5.9.recipe
@@ -1,11 +1,11 @@
 SUMMARY="New curses library"
 HOMEPAGE="http://www.gnu.org/software/ncurses/ncurses.html"
 SRC_URI="http://ftp.gnu.org/pub/gnu/ncurses/ncurses-5.9.tar.gz"
-CHECKSUM_MD5="8cb9c412e5f2d96bc6f459aa8c6282a1"
+CHECKSUM_SHA256="9046298fb440324c9d4135ecea7879ffed8546dd1b58e59430ea07a4633f563b"
 LICENSE="MIT"
 COPYRIGHT="1998-2011 Free Software Foundation, Inc."
 REVISION="10"
-ARCHITECTURES="x86_gcc2 x86 x86_64"
+ARCHITECTURES="x86_gcc2 x86 x86_64 arm"
 SECONDARY_ARCHITECTURES="x86_gcc2 x86"
 
 PATCHES="ncurses-5.9.patchset"
diff --git a/sys-libs/readline/patches/readline-6.3.patch b/sys-libs/readline/patches/readline-6.3.patch
new file mode 100644
index 000000000..b384cd956
--- /dev/null
+++ b/sys-libs/readline/patches/readline-6.3.patch
@@ -0,0 +1,24 @@
+diff -ur orig/readline-6.3/support/shlib-install readline-6.3/support/shlib-install
+--- orig/readline-6.3/support/shlib-install	2009-10-28 14:30:18.057409536 +0100
++++ readline-6.3/support/shlib-install	2013-05-03 01:12:28.695468032 +0200
+@@ -117,7 +117,7 @@
+ # Create symlinks to the installed library.  This section is incomplete.
+ #
+ case "$host_os-$host_vendor" in
+-*linux*|freebsd*-gentoo)
++*linux*|freebsd*-gentoo|haiku*)
+ 	# libname.so.M -> libname.so.M.N
+ 	${echo} ${RM} ${INSTALLDIR}/$LINK2
+ 	if [ -z "$uninstall" ]; then
+diff -ur orig/readline-6.3/support/shobj-conf readline-6.3/support/shobj-conf
+--- orig/readline-6.3/support/shobj-conf	2009-10-28 14:20:21.057147392 +0100
++++ readline-6.3/support/shobj-conf	2013-05-03 01:12:38.631242752 +0200
+@@ -109,7 +109,7 @@
+ 	;;
+ 
+ # All versions of Linux (including Gentoo/FreeBSD) or the semi-mythical GNU Hurd.
+-linux*-*|gnu*-*|k*bsd*-gnu-*|freebsd*-gentoo)
++linux*-*|gnu*-*|k*bsd*-gnu-*|freebsd*-gentoo|haiku*)
+ 	SHOBJ_CFLAGS=-fPIC
+ 	SHOBJ_LD='${CC}'
+ 	SHOBJ_LDFLAGS='-shared -Wl,-soname,$@'
diff --git a/sys-libs/readline/readline-6.2.recipe b/sys-libs/readline/readline-6.2.recipe
index ba1709192..5201d1697 100644
--- a/sys-libs/readline/readline-6.2.recipe
+++ b/sys-libs/readline/readline-6.2.recipe
@@ -14,8 +14,8 @@ HOMEPAGE="http://cnswww.cns.cwru.edu/php/chet/readline/rltop.html"
 COPYRIGHT="1989-2011 Free Software Foundation, Inc."
 LICENSE="GNU GPL v3"
 SRC_URI="ftp://ftp.gnu.org/gnu/readline/readline-6.2.tar.gz"
-CHECKSUM_MD5="67948acb2ca081f23359d0256e9a271c"
-REVISION="4"
+CHECKSUM_SHA256="79a696070a058c233c72dd6ac697021cc64abd5ed51e59db867d66d196a89381"
+REVISION="5"
 ARCHITECTURES="x86_gcc2 x86 x86_64"
 SECONDARY_ARCHITECTURES="x86_gcc2 x86"
 
@@ -51,7 +51,7 @@ BUILD()
 	autoconf
 	runConfigure ./configure \
 		--with-curses
-	make $jobArgs
+	make $jobArgs SHLIB_LIBS=-lncurses
 }
 
 INSTALL()
diff --git a/sys-libs/readline/readline-6.3.recipe b/sys-libs/readline/readline-6.3.recipe
new file mode 100644
index 000000000..1d75f1f1a
--- /dev/null
+++ b/sys-libs/readline/readline-6.3.recipe
@@ -0,0 +1,80 @@
+SUMMARY="The GNU Readline library"
+DESCRIPTION="
+The GNU Readline library provides a set of functions for use by applications \
+that allow users to edit command lines as they are typed in. Both Emacs and vi \
+editing modes are available. The Readline library includes additional \
+functions to maintain a list of previously-entered command lines, to recall \
+and perhaps reedit those lines, and perform csh-like history expansion on \
+previous commands.
+The history facilites are also placed into a separate library, the History \
+library, as part of the build process. The History library may be used without \
+Readline in applications which desire its capabilities.
+"
+HOMEPAGE="http://cnswww.cns.cwru.edu/php/chet/readline/rltop.html"
+COPYRIGHT="1989-2011 Free Software Foundation, Inc."
+LICENSE="GNU GPL v3"
+SRC_URI="ftp://ftp.gnu.org/gnu/readline/readline-6.3.tar.gz"
+CHECKSUM_SHA256="56ba6071b9462f980c5a72ab0023893b65ba6debb4eeb475d7a563dc65cafd43"
+REVISION="2"
+ARCHITECTURES="x86_gcc2 ?x86 x86_64"
+SECONDARY_ARCHITECTURES="?x86_gcc2 x86"
+
+PATCHES="readline-6.3.patch"
+
+PROVIDES="
+	readline$secondaryArchSuffix = $portVersion compat >= 6
+	lib:libhistory$secondaryArchSuffix = $portVersion compat >= 6
+	lib:libreadline$secondaryArchSuffix = $portVersion compat >= 6
+	"
+REQUIRES="
+	haiku$secondaryArchSuffix >= $haikuVersion
+	lib:libncurses$secondaryArchSuffix
+	"
+BUILD_REQUIRES="
+	haiku${secondaryArchSuffix}_devel >= $haikuVersion
+	devel:libncurses$secondaryArchSuffix
+	"
+BUILD_PREREQUIRES="
+	cmd:aclocal
+	cmd:autoconf
+	cmd:gcc$secondaryArchSuffix
+	cmd:ld$secondaryArchSuffix
+	cmd:libtoolize
+	cmd:make
+	"
+
+
+BUILD()
+{
+	libtoolize --force --copy --install
+	aclocal
+	autoconf
+	runConfigure ./configure \
+		--with-curses
+	make $jobArgs SHLIB_LIBS=-lncurses
+}
+
+INSTALL()
+{
+	make install
+
+	prepareInstalledDevelLibs libhistory libreadline
+	rmdir $binDir
+
+	# devel package
+	packageEntries devel \
+		$dataDir \
+		$developDir \
+		$documentationDir
+}
+
+# ----- devel package -------------------------------------------------------
+
+PROVIDES_devel="
+	readline${secondaryArchSuffix}_devel = $portVersion
+	devel:libhistory$secondaryArchSuffix = $portVersion compat >= 6
+	devel:libreadline$secondaryArchSuffix = $portVersion compat >= 6
+	"
+REQUIRES_devel="
+	readline$secondaryArchSuffix == $portVersion base
+	"
diff --git a/sys-libs/slang/slang-2.2.4.recipe b/sys-libs/slang/slang-2.2.4.recipe
index 36a27eb43..c6bbe27c2 100644
--- a/sys-libs/slang/slang-2.2.4.recipe
+++ b/sys-libs/slang/slang-2.2.4.recipe
@@ -11,7 +11,7 @@ part of the S-Lang distribution.
 "
 HOMEPAGE="http://www.jedsoft.org/slang/"
 SRC_URI="ftp://space.mit.edu/pub/davis/slang/v2.2/slang-2.2.4.tar.bz2"
-CHECKSUM_MD5="7fcfd447e378f07dd0c0bae671fe6487"
+CHECKSUM_SHA256="9a8257a9a2a55099af858b13338dc8f3a06dd2069f46f0df2c9c3bb84a01d5db"
 LICENSE="GNU GPL v2"
 COPYRIGHT="2004-2013 John E. Davis"
 REVISION="1"
diff --git a/sys-libs/zlib/zlib-1.2.8.recipe b/sys-libs/zlib/zlib-1.2.8.recipe
index 82219fe71..ce893c72e 100644
--- a/sys-libs/zlib/zlib-1.2.8.recipe
+++ b/sys-libs/zlib/zlib-1.2.8.recipe
@@ -13,9 +13,9 @@ HOMEPAGE="http://www.zlib.net/"
 COPYRIGHT="1995-2005 Jean-loup Gailly and Mark Adler"
 LICENSE="Zlib"
 SRC_URI="http://zlib.net/zlib-1.2.8.tar.gz"
-CHECKSUM_MD5="44d667c142d7cda120332623eab69f40"
+CHECKSUM_SHA256="36658cb768a54c1d4dec43c3116c27ed893e88b02ecfcb44f2166f9c0b7f2a0d"
 REVISION="4"
-ARCHITECTURES="x86_gcc2 x86 x86_64"
+ARCHITECTURES="x86_gcc2 x86 x86_64 arm"
 SECONDARY_ARCHITECTURES="x86_gcc2 x86"
 
 PROVIDES="
diff --git a/sys-process/dcron/dcron-4.5.recipe b/sys-process/dcron/dcron-4.5.recipe
new file mode 100644
index 000000000..ddb83a586
--- /dev/null
+++ b/sys-process/dcron/dcron-4.5.recipe
@@ -0,0 +1,63 @@
+SUMMARY="dillon's lightweight cron daemon"
+DESCRIPTION="
+This is a continuation of Matt Dillon's beautifully minimalist dcron. At first
+I had written a fork (yacron), but Matt has handed over maintainership of the
+main dcron branch, so all of yacron was merged into dcron 4.0.
+
+The biggest changes in v4.0 are syslogging and a variety of anacron-like
+features. If you use this version of dcron, you shouldn't have any further need
+for anacron.
+
+More specifically, dcron can now:
+* log to syslog or a file
+* email job output to a remote addresses, instead of the local user who owns \
+	the job (so it works with lightweight mail handlers like msmtp, which \
+	don't route mail to local users).
+* replace sendmail with any other script to which all job output should be piped
+* various crontab syntax extensions, including @daily and @reboot and more \
+	finer-grained frequency specifiers. See manpages for details.
+"
+HOMEPAGE="http://www.jimpryor.net/linux/dcron.html" 
+SRC_URI="http://www.jimpryor.net/linux/releases/dcron-$portVersion.tar.gz"
+CHECKSUM_SHA256="9e50edb6f5bd8153b16bad05087d985e5153ce45cc01ae77e7f842213fb4a824"
+REVISION="1"
+ARCHITECTURES="x86_gcc2"
+
+PROVIDES="
+	dcron = $portVersion
+	cmd:crond
+	cmd:crontab
+	"
+
+REQUIRES="
+	haiku >= $haikuVersion
+"
+
+BUILD_REQUIRES="
+	haiku_devel >= $haikuVersion
+	"
+
+BUILD_PREREQUIRES="
+	cmd:gcc
+	cmd:as
+	cmd:make
+"
+
+PATCHES="dcron-$portVersion.patchset"
+
+BUILD()
+{
+	make PREFIX=$prefix SBINDIR=$binDir BINDIR=$binDir MANDIR=$manDir \
+		CRONTAB_GROUP=root CRONTABS=$prefix/var/spool/cron/crontabs \
+		CRONSTAMPS=$prefix/var/spool/cron/cronstamps
+}
+
+INSTALL()
+{
+	make install
+}
+LICENSE="GNU GPL v2"
+COPYRIGHT="
+	1994 Matthew Dillon
+	2009-2011 James Pryor
+"
diff --git a/sys-process/dcron/patches/dcron-4.5.patchset b/sys-process/dcron/patches/dcron-4.5.patchset
new file mode 100644
index 000000000..8c8643429
--- /dev/null
+++ b/sys-process/dcron/patches/dcron-4.5.patchset
@@ -0,0 +1,53 @@
+From 1b37f8b350c0ab8c7da9be5663da2bb68fc687cb Mon Sep 17 00:00:00 2001
+From: Adrien Destugues <pulkomandy@pulkomandy.tk>
+Date: Wed, 5 Mar 2014 10:59:27 +0100
+Subject: Haiku compatibility hacks.
+
+
+diff --git a/Makefile b/Makefile
+index c7cc359..ff0313e 100644
+--- a/Makefile
++++ b/Makefile
+@@ -20,19 +20,19 @@ MANDIR = $(PREFIX)/share/man
+ 
+ 
+ SHELL = /bin/sh
+-INSTALL = install -o root
++INSTALL = install
+ INSTALL_PROGRAM = $(INSTALL) -D
+ INSTALL_DATA = $(INSTALL) -D -m0644 -g root
+ INSTALL_DIR = $(INSTALL) -d -m0755 -g root
+ CFLAGS ?= -O2
+-CFLAGS += -Wall -Wstrict-prototypes -Wno-missing-field-initializers
++CFLAGS += -Wall -Wstrict-prototypes
+ SRCS = main.c subs.c database.c job.c concat.c chuser.c
+ OBJS = main.o subs.o database.o job.o concat.o chuser.o
+ TABSRCS = crontab.c chuser.c
+ TABOBJS = crontab.o chuser.o
+ PROTOS = protos.h
+ LIBS =
+-LDFLAGS =
++LDFLAGS = -lbsd
+ DEFS =  -DVERSION='"$(VERSION)"' \
+ 		-DSCRONTABS='"$(SCRONTABS)"' -DCRONTABS='"$(CRONTABS)"' \
+ 		-DCRONSTAMPS='"$(CRONSTAMPS)"' -DLOG_IDENT='"$(LOG_IDENT)"' \
+diff --git a/main.c b/main.c
+index 595f07a..cde23c8 100644
+--- a/main.c
++++ b/main.c
+@@ -234,10 +234,12 @@ main(int ac, char **av)
+ 
+ 		if (setsid() < 0)
+ 			perror("setsid");
++#ifndef __HAIKU__
+ 		if ((fd = open("/dev/tty", O_RDWR)) >= 0) {
+ 			ioctl(fd, TIOCNOTTY, 0);
+ 			close(fd);
+ 		}
++#endif
+ 
+ 		/* setup logging for backgrounded daemons */
+ 
+-- 
+1.8.3.4
+
diff --git a/www-client/links/links-2.3pre2.recipe b/www-client/links/links-2.3pre2.recipe
index 39049a8ef..d73d9ff21 100644
--- a/www-client/links/links-2.3pre2.recipe
+++ b/www-client/links/links-2.3pre2.recipe
@@ -4,8 +4,8 @@ links web browser.
 "
 HOMEPAGE="http://links.twibright.com/" 
 SRC_URI="http://links.twibright.com/download/links-2.3pre2.tar.gz"
+CHECKSUM_SHA256="a9c6b8d9e783dc0caaa32f5acf1e3163a5d41b2ba395c93af8587b325b51bac0"
 REVISION="1"
-CHECKSUM_MD5="bb2a4e058c88b8ec0c9f6c0e1640555c"
 LICENSE="GNU GPL v2"
 COPYRIGHT="1999 - 2011 Mikulas Patocka
 	2000 - 2011 Petr Kulhavy, Karel Kulhavy, Martin Pergel"
diff --git a/www-client/links/links-2.8.recipe b/www-client/links/links-2.8.recipe
index 67072ea2b..cce2a6aae 100644
--- a/www-client/links/links-2.8.recipe
+++ b/www-client/links/links-2.8.recipe
@@ -4,8 +4,8 @@ links web browser.
 "
 HOMEPAGE="http://links.twibright.com/" 
 SRC_URI="http://links.twibright.com/download/links-2.8.tar.gz"
+CHECKSUM_SHA256="5070a759af7f107ca4f9572833b8f086cd9f7c21ef5e1fce8482a2883a743c7a"
 REVISION="1"
-CHECKSUM_MD5="34c67f980105643fc6cd63a14acc626f"
 LICENSE="GNU GPL v2"
 COPYRIGHT="1999 - 2011 Mikulas Patocka
 	2000 - 2011 Petr Kulhavy, Karel Kulhavy, Martin Pergel"
diff --git a/www-client/w3m/w3m-0.5.3.recipe b/www-client/w3m/w3m-0.5.3.recipe
index 7d7c996e8..a403eeda1 100644
--- a/www-client/w3m/w3m-0.5.3.recipe
+++ b/www-client/w3m/w3m-0.5.3.recipe
@@ -7,9 +7,9 @@ which typesets HTML into plain text.
 "
 HOMEPAGE="http://w3m.sourceforge.net/" 
 SRC_URI="http://sourceforge.net/projects/w3m/files/w3m/w3m-0.5.3/w3m-0.5.3.tar.gz"
+CHECKSUM_SHA256="e994d263f2fd2c22febfbe45103526e00145a7674a0fda79c822b97c2770a9e3"
 REVISION="2"
 ARCHITECTURES="x86 x86_gcc2"
-CHECKSUM_MD5="1b845a983a50b8dec0169ac48479eacc"
 LICENSE="W3M"
 COPYRIGHT="1994-2011 Akinori ITO
 		2002-2011 Hironori SAKAMOTO
diff --git a/www-servers/haproxy/haproxy-1.4.22.recipe b/www-servers/haproxy/haproxy-1.4.22.recipe
index b7df92931..c498e4038 100644
--- a/www-servers/haproxy/haproxy-1.4.22.recipe
+++ b/www-servers/haproxy/haproxy-1.4.22.recipe
@@ -7,7 +7,7 @@ persistence or Layer7 processing.
 "
 HOMEPAGE="http://haproxy.1wt.eu/"
 SRC_URI="http://haproxy.1wt.eu/download/1.4/src/haproxy-1.4.22.tar.gz"
-CHECKSUM_MD5="a0b007c76f6a78524f3b3dd5e704979c"
+CHECKSUM_SHA256="ba221b3eaa4d71233230b156c3000f5c2bd4dace94d9266235517fe42f917fc6"
 REVISION="1"
 
 LICENSE="GNU GPL v2"
diff --git a/x11-libs/agg/agg-2.5.recipe b/x11-libs/agg/agg-2.5.recipe
index 11cf2fc4b..980c729a8 100644
--- a/x11-libs/agg/agg-2.5.recipe
+++ b/x11-libs/agg/agg-2.5.recipe
@@ -3,67 +3,103 @@ DESCRIPTION="
 Anti-Grain Geometry (AGG) is an Open Source, free of charge graphic library, \
 written in industrially standard C++.
 "
-HOMEPAGE="http://antigrain.com"
-SRC_URI="http://www.antigrain.com/agg-2.5.tar.gz"
-REVISION="1"
-CHECKSUM_MD5="0229a488bc47be10a2fee6cf0b2febd6"
+HOMEPAGE="http://en.wikipedia.org/wiki/Anti-Grain_Geometry"
+SRC_URI="http://gnashdev.org/tools/ltib/agg-2.5.tar.gz"
+CHECKSUM_SHA256="ab1edc54cc32ba51a62ff120d501eecd55fceeedf869b9354e7e13812289911f"
+REVISION="2"
 LICENSE="GNU GPL v2"
 COPYRIGHT="2002-2006 Maxim Shemanarev"
 
-ARCHITECTURES="?x86_gcc2 ?x86"
-SECONDARY_ARCHITECTURES="?x86_gcc2 ?x86"
+ARCHITECTURES="!x86_gcc2 !x86"
+SECONDARY_ARCHITECTURES="!x86_gcc2 !x86"
 
 PROVIDES="
-	lib:libagg$secondaryArchSuffix = $portVersion
+	agg$secondaryArchSuffix = $portVersion
+	lib:libagg$secondaryArchSuffix = 2.0.4 compat >= 2
+	lib:libaggfontfreetype$secondaryArchSuffix = 2.0.4 compat >= 2
+	lib:libagggpc$secondaryArchSuffix = 2.0.4 compat >= 2
+	lib:libaggplatformHaiku$secondaryArchSuffix = 2.0.4 compat >= 2
 "
 REQUIRES="
 	haiku$secondaryArchSuffix >= $haikuVersion
-	lib:libsdl$secondaryArchSuffix
+	lib:libz$secondaryArchSuffix
+	lib:libbz2$secondaryArchSuffix
+	lib:libpng$secondaryArchSuffix
+	lib:libfreetype$secondaryArchSuffix
 "
 BUILD_REQUIRES="
 	haiku${secondaryArchSuffix}_devel >= $haikuVersion
-	devel:libsdl$secondaryArchSuffix
+	devel:libsdl_1.2$secondaryArchSuffix
+	devel:libz$secondaryArchSuffix
+	devel:libbz2$secondaryArchSuffix
+	devel:libpng$secondaryArchSuffix
+	devel:libfreetype$secondaryArchSuffix
 "
 BUILD_PREREQUIRES="
 	cmd:gcc$secondaryArchSuffix
 	cmd:make
 	cmd:autoconf
+	cmd:autoheader
 	cmd:automake
 	cmd:ld$secondaryArchSuffix
 	cmd:libtoolize
+	cmd:sed
+	cmd:pkg_config$secondaryArchSuffix
 "
-
-SOURCE_DIR="agg-2.5"
+PATCHES="agg-2.5.patchset"
 
 BUILD()
 {
-	#libtoolize --force --copy --install
-	#aclocal
-	#autoheader
-	#autoconf
-	#automake --foreign --add-missing --ignore-deps
-	#./configure --prefix=$prefix
-	#make
-	cd src
-	g++ -o libagg.so -shared -fPIC *.cpp ctrl/*.cpp -I../include -lbe -ltranslation
+	if [ -d src/platform/BeOS ]; then
+		mv src/platform/BeOS src/platform/Haiku
+	fi
+	aclocal
+	autoheader
+	autoconf
+	libtoolize --force
+	automake --foreign --add-missing --ignore-deps
+	runConfigure ./configure \
+		--enable-ctrl \
+		--enable-gpc \
+		--enable-platform \
+		--enable-examples
+	make $jobArgs
 }
 
 INSTALL()
 {
-	mkdir -p $libDir
-	mkdir -p $includeDir/agg
-	mkdir -p $developLibDir
+	make install
 	
-	cp src/libagg.so $libDir
-	cp src/libagg.so $developLibDir
-	cp -r include/* $includeDir/agg/
-	packageEntries devel \
-		$developDir
+	prepareInstalledDevelLibs libagg libagggpc libaggfontfreetype \
+		libaggplatformHaiku libaggplatformsdl
+	fixPkgconfig
+	# fix include path in pkgconfig
+	sed -i -e 's#^includedir=\(.*\)#includedir=\1/agg2#g' \
+		$developLibDir/pkgconfig/libagg.pc
+
+	packageEntries devel $developDir $dataRootDir/aclocal
+	packageEntries sdl $libDir/libaggplatformsdl*
 }
+
 PROVIDES_devel="
-	devel:libagg$secondaryArchSuffix = $portVersion
+	agg${secondaryArchSuffix}_devel = $portVersion
+	devel:libagg$secondaryArchSuffix = 2.0.4 compat >= 2
+	devel:libaggfontfreetype$secondaryArchSuffix = 2.0.4 compat >= 2
+	devel:libagggpc$secondaryArchSuffix = 2.0.4 compat >= 2
+	devel:libaggplatformHaiku$secondaryArchSuffix = 2.0.4 compat >= 2
+	devel:libaggplatformsdl$secondaryArchSuffix = 2.0.4 compat >= 2
 "
 REQUIRES_devel="
-	lib:libagg$secondaryArchSuffix == $portVersion base
+	agg$secondaryArchSuffix == $portVersion base
 "
 
+PROVIDES_sdl="
+	agg${secondaryArchSuffix}_sdl = $portVersion
+	lib:libaggplatformsdl$secondaryArchSuffix = 2.0.4 compat >= 2
+"
+REQUIRES_sdl="
+	agg$secondaryArchSuffix == $portVersion base
+	haiku$secondaryArchSuffix >= $haikuVersion
+	lib:libsdl_1.2$secondaryArchSuffix
+	lib:libGL$secondaryArchSuffix
+"
diff --git a/x11-libs/agg/patches/agg-2.5.patch b/x11-libs/agg/patches/agg-2.5.patch
deleted file mode 100644
index d70c11bb4..000000000
--- a/x11-libs/agg/patches/agg-2.5.patch
+++ /dev/null
@@ -1,9 +0,0 @@
-diff -urN agg-2.5/Makefile.am agg-2.5-haiku/Makefile.am
---- agg-2.5/Makefile.am	2006-10-09 04:06:36.031719424 +0000
-+++ agg-2.5-haiku/Makefile.am	2011-01-05 16:03:11.000000000 +0000
-@@ -1,4 +1,4 @@
--SUBDIRS = gpc src font_freetype font_win32_tt include examples
-+SUBDIRS = gpc src font_freetype font_win32_tt include
- 
- pkgconfigdir = $(libdir)/pkgconfig
- pkgconfig_DATA = libagg.pc
diff --git a/x11-libs/agg/patches/agg-2.5.patchset b/x11-libs/agg/patches/agg-2.5.patchset
new file mode 100644
index 000000000..23cf3ceda
--- /dev/null
+++ b/x11-libs/agg/patches/agg-2.5.patchset
@@ -0,0 +1,239 @@
+From 7a5199ab842d8aa425590ffc5419ad3015abbc10 Mon Sep 17 00:00:00 2001
+From: Kacper Kasper <kacperkasper@gmail.com>
+Date: Thu, 24 Apr 2014 20:00:29 +0000
+Subject: Haiku support
+
+
+diff --git a/configure.in b/configure.in
+index fceca82..d06dc7f 100644
+--- a/configure.in
++++ b/configure.in
+@@ -8,7 +8,7 @@ dnl Checks for programs.
+ AC_PROG_CC
+ AC_PROG_CXX
+ AC_ISC_POSIX
+-AM_C_PROTOTYPES
++
+ if test "x$U" != "x"; then
+   AC_MSG_ERROR(Compiler not ANSI compliant)
+ fi
+@@ -58,9 +58,18 @@ dnl ####  Check if we are compiling for win32 #####
+     AC_SUBST(WINDOWS_LIBS)
+     PREFERED_PLATFORM=win32
+   ;;
++  *haiku*)
++    haiku_host=yes
++    HAIKU_LIBS="-lbe -ltranslation"
++    HAIKU_CFLAGS=
++    AC_SUBST(HAIKU_CFLAGS)
++    AC_SUBST(HAIKU_LIBS)
++    PREFERED_PLATFORM=Haiku
++  ;;
+ esac
+ AM_CONDITIONAL(ENABLE_WIN32,[test x$win32_host = xyes -a x$enable_platform != xno ])
+ AM_CONDITIONAL(ENABLE_OSX,[test x$osx_host = xyes -a x$enable_platform != xno ])
++AM_CONDITIONAL(ENABLE_HAIKU,[test x$haiku_host = xyes -a x$enable_platform != xno ])
+ dnl then enable font_win32tt
+ AC_ARG_ENABLE(win32tt,
+     AC_HELP_STRING([--enable-win32tt],[Win32 TrueType font support library]),
+@@ -154,7 +163,7 @@ AC_OUTPUT(
+    src/platform/sdl/Makefile
+    src/platform/mac/Makefile
+    src/platform/win32/Makefile
+-   src/platform/BeOS/Makefile
++   src/platform/Haiku/Makefile
+    src/platform/AmigaOS/Makefile
+    include/Makefile
+    include/ctrl/Makefile
+diff --git a/src/platform/BeOS/Makefile.am b/src/platform/BeOS/Makefile.am
+index 474153c..2095717 100644
+--- a/src/platform/BeOS/Makefile.am
++++ b/src/platform/BeOS/Makefile.am
+@@ -1 +1,10 @@
+-EXTRA_DIST=agg_platform_support.cpp
++if ENABLE_HAIKU
++
++lib_LTLIBRARIES = libaggplatformHaiku.la
++
++libaggplatformHaiku_la_LDFLAGS = -version-info @AGG_LIB_VERSION@
++libaggplatformHaiku_la_SOURCES = agg_platform_support.cpp
++libaggplatformHaiku_la_CXXFLAGS = -I$(top_srcdir)/include @HAIKU_CFLAGS@
++libaggplatformHaiku_la_LIBADD = @HAIKU_LIBS@
++endif
++
+diff --git a/src/platform/Makefile.am b/src/platform/Makefile.am
+index ebe5e7e..c6622bc 100644
+--- a/src/platform/Makefile.am
++++ b/src/platform/Makefile.am
+@@ -1 +1 @@
+-SUBDIRS = X11 sdl win32 AmigaOS BeOS mac
++SUBDIRS = X11 sdl win32 AmigaOS Haiku mac
+-- 
+1.8.3.4
+
+
+From 6aadf8ccb0db0ba33c33220ed9c70d078163ee02 Mon Sep 17 00:00:00 2001
+From: Kacper Kasper <kacperkasper@gmail.com>
+Date: Fri, 25 Apr 2014 12:52:34 +0000
+Subject: fix unsigned integer overflows
+
+
+diff --git a/include/agg_array.h b/include/agg_array.h
+index 5c6d390..c25947a 100644
+--- a/include/agg_array.h
++++ b/include/agg_array.h
+@@ -366,9 +366,10 @@ namespace agg
+ 
+         void add_array(const T* ptr, unsigned num_elem)
+         {
+-            while(num_elem--)
++            while(num_elem > 0)
+             {
+                 add(*ptr++);
++                --num_elem;
+             }
+         }
+ 
+@@ -526,10 +527,11 @@ namespace agg
+         if(m_num_blocks)
+         {
+             T** blk = m_blocks + m_num_blocks - 1;
+-            while(m_num_blocks--)
++            while(m_num_blocks > 0)
+             {
+                 pod_allocator<T>::deallocate(*blk, block_size);
+                 --blk;
++                --m_num_blocks;
+             }
+         }
+         pod_allocator<T*>::deallocate(m_blocks, m_max_blocks);
+@@ -802,10 +804,11 @@ namespace agg
+             if(m_num_blocks)
+             {
+                 block_type* blk = m_blocks + m_num_blocks - 1;
+-                while(m_num_blocks--)
++                while(m_num_blocks > 0)
+                 {
+                     pod_allocator<int8u>::deallocate(blk->data, blk->size);
+                     --blk;
++                    --m_num_blocks;
+                 }
+                 pod_allocator<block_type>::deallocate(m_blocks, m_max_blocks);
+             }
+diff --git a/include/agg_pixfmt_rgba.h b/include/agg_pixfmt_rgba.h
+index 79d10dc..73937d0 100644
+--- a/include/agg_pixfmt_rgba.h
++++ b/include/agg_pixfmt_rgba.h
+@@ -703,9 +703,9 @@ namespace agg
+             }
+             if(sa)
+             {
+-                calc_type dr = p[Order::R] - sr;
+-                calc_type dg = p[Order::G] - sg;
+-                calc_type db = p[Order::B] - sb;
++                calc_type dr = (sr > p[Order::R]) ? 0 : p[Order::R] - sr;
++                calc_type dg = (sg > p[Order::G]) ? 0 : p[Order::G] - sg;
++                calc_type db = (sb > p[Order::B]) ? 0 : p[Order::B] - sb;
+                 p[Order::R] = (dr > base_mask) ? 0 : dr;
+                 p[Order::G] = (dg > base_mask) ? 0 : dg;
+                 p[Order::B] = (db > base_mask) ? 0 : db;
+diff --git a/include/agg_rasterizer_cells_aa.h b/include/agg_rasterizer_cells_aa.h
+index d3bb138..6aa3852 100644
+--- a/include/agg_rasterizer_cells_aa.h
++++ b/include/agg_rasterizer_cells_aa.h
+@@ -140,10 +140,11 @@ namespace agg
+         if(m_num_blocks)
+         {
+             cell_type** ptr = m_cells + m_num_blocks - 1;
+-            while(m_num_blocks--)
++            while(m_num_blocks > 0)
+             {
+                 pod_allocator<cell_type>::deallocate(*ptr, cell_block_size);
+                 ptr--;
++                --m_num_blocks;
+             }
+             pod_allocator<cell_type*>::deallocate(m_cells, m_max_blocks);
+         }
+@@ -666,23 +667,26 @@ namespace agg
+         cell_type*  cell_ptr;
+         unsigned nb = m_num_cells >> cell_block_shift;
+         unsigned i;
+-        while(nb--)
++        while(nb > 0)
+         {
+             cell_ptr = *block_ptr++;
+             i = cell_block_size;
+-            while(i--) 
++            while(i > 0) 
+             {
+                 m_sorted_y[cell_ptr->y - m_min_y].start++;
+                 ++cell_ptr;
++                --i;
+             }
++            --nb;
+         }
+ 
+         cell_ptr = *block_ptr++;
+         i = m_num_cells & cell_block_mask;
+-        while(i--) 
++        while(i > 0) 
+         {
+             m_sorted_y[cell_ptr->y - m_min_y].start++;
+             ++cell_ptr;
++            --i;
+         }
+ 
+         // Convert the Y-histogram into the array of starting indexes
+@@ -697,27 +701,30 @@ namespace agg
+         // Fill the cell pointer array sorted by Y
+         block_ptr = m_cells;
+         nb = m_num_cells >> cell_block_shift;
+-        while(nb--)
++        while(nb > 0)
+         {
+             cell_ptr = *block_ptr++;
+             i = cell_block_size;
+-            while(i--) 
++            while(i > 0) 
+             {
+                 sorted_y& curr_y = m_sorted_y[cell_ptr->y - m_min_y];
+                 m_sorted_cells[curr_y.start + curr_y.num] = cell_ptr;
+                 ++curr_y.num;
+                 ++cell_ptr;
++                --i;
+             }
++            --nb;
+         }
+         
+         cell_ptr = *block_ptr++;
+         i = m_num_cells & cell_block_mask;
+-        while(i--) 
++        while(i > 0) 
+         {
+             sorted_y& curr_y = m_sorted_y[cell_ptr->y - m_min_y];
+             m_sorted_cells[curr_y.start + curr_y.num] = cell_ptr;
+             ++curr_y.num;
+             ++cell_ptr;
++            --i;
+         }
+ 
+         // Finally arrange the X-arrays
+diff --git a/include/agg_rendering_buffer.h b/include/agg_rendering_buffer.h
+index 3a39caa..1fddb4e 100644
+--- a/include/agg_rendering_buffer.h
++++ b/include/agg_rendering_buffer.h
+@@ -191,10 +191,11 @@ namespace agg
+ 
+             T** rows = &m_rows[0];
+ 
+-            while(height--)
++            while(height > 0)
+             {
+                 *rows++ = row_ptr;
+                 row_ptr += stride;
++                --height;
+             }
+         }
+ 
+-- 
+1.8.3.4
diff --git a/x11-libs/cd/cd-5.6.recipe b/x11-libs/cd/cd-5.6.recipe
index f18cac235..e827eb129 100644
--- a/x11-libs/cd/cd-5.6.recipe
+++ b/x11-libs/cd/cd-5.6.recipe
@@ -1,8 +1,8 @@
 SUMMARY="CD (Canvas Draw) is a platform-independent graphics library."
 HOMEPAGE="http://www.tecgraf.puc-rio.br/cd/"
 SRC_URI="http://heanet.dl.sourceforge.net/project/canvasdraw/5.6.1/Docs%20and%20Sources/cd-5.6.1_Sources.zip"
+CHECKSUM_SHA256="5ad7618eed720ce993280549175b86ccaeb8b0a08a7262c5cd8b02903ec40c11"
 	# They have a tar.gz but the permissions are broken inside it (will create unreadable files)
-CHECKSUM_MD5="0953b2d9a094a14608f73561038ad84d"
 REVISION="1"
 ARCHITECTURES="x86_gcc2"
 SECONDARY_ARCHITECTURES="x86"
diff --git a/x11-libs/iup/iup-3.8.recipe b/x11-libs/iup/iup-3.8.recipe
index b4aa87176..454bccf42 100644
--- a/x11-libs/iup/iup-3.8.recipe
+++ b/x11-libs/iup/iup-3.8.recipe
@@ -1,7 +1,7 @@
 SUMMARY="IUP is a multi-platform toolkit for building graphical user interfaces."
 HOMEPAGE="http://www.tecgraf.puc-rio.br/iup/"
 SRC_URI="http://downloads.sourceforge.net/project/iup/3.8/Docs%20and%20Sources/iup-3.8_Sources.zip" # The tar.gz has permission problems.
-CHECKSUM_MD5="b14469c2dd46af3e1bb1ecc8dc216061"
+CHECKSUM_SHA256="8030c4f35c3a3f096e6552cecb600d8ee95c9c379c76368d99fa6ffc6ebc8b5c"
 REVISION="1"
 ARCHITECTURES="x86_gcc2"
 SECONDARY_ARCHITECTURES="x86"
diff --git a/x11-libs/libxau/libxau-1.0.5.recipe b/x11-libs/libxau/libxau-1.0.5.recipe
index 43b6efac6..401df5e10 100644
--- a/x11-libs/libxau/libxau-1.0.5.recipe
+++ b/x11-libs/libxau/libxau-1.0.5.recipe
@@ -4,7 +4,7 @@ libxau.
 "
 HOMEPAGE="http://xorg.freedesktop.org/releases/individual/lib/" 
 SRC_URI="http://xorg.freedesktop.org/releases/individual/lib/libXau-1.0.5.tar.gz"
-CHECKSUM_MD5="1a421d9376f43596fe068ce209a70b84"
+CHECKSUM_SHA256="2ad4324cf204331d6773bba441baed58e46168e7913de2079f10b272eae5c4db"
 REVISION="1"
 COPYRIGHT="1988, 1993, 1994, 1998  The Open Group"
 LICENSE="MIT (no promotion)"
diff --git a/x11-libs/libxcb/libxcb-1.6.recipe b/x11-libs/libxcb/libxcb-1.6.recipe
index fbcbf454d..55e654b36 100644
--- a/x11-libs/libxcb/libxcb-1.6.recipe
+++ b/x11-libs/libxcb/libxcb-1.6.recipe
@@ -4,7 +4,7 @@ libxcb.
 "
 HOMEPAGE="http://xcb.freedesktop.org/" 
 SRC_URI="http://xcb.freedesktop.org/dist/libxcb-1.6.tar.gz"
-CHECKSUM_MD5="f824cc4cb4b43f5bbc84c0e17fbd80d0"
+CHECKSUM_SHA256="df93b7d5afb0f970c73294636dc8cbc08f59bd39239cac4e6e0a46792ae7b759"
 REVISION="1"
 COPYRIGHT="2001-2006 Bart Massey, Jamey Sharp, and Josh Triplett.
 All Rights Reserved."
diff --git a/x11-libs/pixman/pixman-0.20.0.recipe b/x11-libs/pixman/pixman-0.20.0.recipe
index 0373ac2c7..b0051e825 100644
--- a/x11-libs/pixman/pixman-0.20.0.recipe
+++ b/x11-libs/pixman/pixman-0.20.0.recipe
@@ -4,7 +4,7 @@ Pixman - The pixel-manipulation library for X and cairo.
 "
 HOMEPAGE="http://cgit.freedesktop.org/pixman/" 
 SRC_URI="http://cairographics.org/releases/pixman-0.20.0.tar.gz"
-CHECKSUM_MD5="c1a31d5cedfa97c5af7148a2d1fd4356"
+CHECKSUM_SHA256="9c02c22c6cc3f28f3633d02ef6f0cac130518f621edb011ebbbf08cd1a81251a"
 LICENSE="MIT"
 COPYRIGHT="1987-1998  The Open Group
 	1987-1989 Digital Equipment Corporation
@@ -15,7 +15,12 @@ COPYRIGHT="1987-1998  The Open Group
 
 REVISION="1"
 
-ARCHITECTURES="x86"
+ARCHITECTURES="x86 x86_64"
+if [ $effectiveTargetArchitecture != x86_gcc2 ]; then
+	# x86_gcc2 is fine as primary target architecture as long as we're building
+	# for a different secondary architecture.
+	ARCHITECTURES="$ARCHITECTURES x86_gcc2"
+fi
 SECONDARY_ARCHITECTURES="x86"
 
 PROVIDES="
diff --git a/x11-libs/xtrans/xtrans-1.2.5.recipe b/x11-libs/xtrans/xtrans-1.2.5.recipe
index 3edf0485c..c2f5e6efa 100644
--- a/x11-libs/xtrans/xtrans-1.2.5.recipe
+++ b/x11-libs/xtrans/xtrans-1.2.5.recipe
@@ -4,7 +4,7 @@ xtrans.
 "
 HOMEPAGE="http://xorg.freedesktop.org/releases/individual/lib/" 
 SRC_URI="http://xorg.freedesktop.org/releases/individual/lib/xtrans-1.2.5.tar.gz"
-CHECKSUM_MD5="b2f47d49faf1f24e8294b624b21b9b93"
+CHECKSUM_SHA256="97d76ab76c755fabf2ef1896aaa76c0e38fc58d92799f9b2dd885a535cdd1e2b"
 REVISION="1"
 COPYRIGHT="1993, 1994, 1998  The Open Group
 	1993, 1994 NCR Corporation - Dayton, Ohio, USA
diff --git a/x11-proto/inputproto/inputproto-2.0.recipe b/x11-proto/inputproto/inputproto-2.0.recipe
index 6ff6409be..41aa9bf03 100644
--- a/x11-proto/inputproto/inputproto-2.0.recipe
+++ b/x11-proto/inputproto/inputproto-2.0.recipe
@@ -4,7 +4,7 @@ inputproto.
 "
 HOMEPAGE="http://xorg.freedesktop.org/releases/individual/proto/" 
 SRC_URI="http://xorg.freedesktop.org/releases/individual/proto/inputproto-2.0.tar.gz"
-CHECKSUM_MD5="13d91739cf70a781f1db24d8d3677574"
+CHECKSUM_SHA256="cd89a1e95745875e66947ba28587c720c91aec63836ac6548ca12fd525c0a2ee"
 REVISION="1"
 COPYRIGHT="1989, 1998  The Open Group
 	1989 by Hewlett-Packard Company, Palo Alto, California.
diff --git a/x11-proto/kbproto/kbproto-1.0.4.recipe b/x11-proto/kbproto/kbproto-1.0.4.recipe
index 4a420b2a7..4bae0ebbc 100644
--- a/x11-proto/kbproto/kbproto-1.0.4.recipe
+++ b/x11-proto/kbproto/kbproto-1.0.4.recipe
@@ -4,7 +4,7 @@ kbproto.
 "
 HOMEPAGE="http://xorg.freedesktop.org/releases/individual/proto/" 
 SRC_URI="http://xorg.freedesktop.org/releases/individual/proto/kbproto-1.0.4.tar.gz"
-CHECKSUM_MD5="4deef518a03bc94a7a25902bb7c98dd6"
+CHECKSUM_SHA256="d7fcd4fa4332109b05f0d5e238e4aa0ef2ca1a51b45ab9fcf8affd7ee021cfe7"
 REVISION="1"
 COPYRIGHT="1993 by Silicon Graphics Computer Systems, Inc."
 LICENSE="MIT"
diff --git a/x11-proto/xcb_proto/xcb_proto-1.6.recipe b/x11-proto/xcb_proto/xcb_proto-1.6.recipe
index b6f661beb..eb46c5ccf 100644
--- a/x11-proto/xcb_proto/xcb_proto-1.6.recipe
+++ b/x11-proto/xcb_proto/xcb_proto-1.6.recipe
@@ -4,7 +4,7 @@ xcb-proto.
 "
 HOMEPAGE="http://xcb.freedesktop.org/" 
 SRC_URI="http://xcb.freedesktop.org/dist/xcb-proto-1.6.tar.gz"
-CHECKSUM_MD5="8d29695e8faf5fcdce568c66eaeaa5ee"
+CHECKSUM_SHA256="2c64602868f69409d9e14f43a17eb2faf7c1c48654e0eff6b6978034f304724d"
 REVISION="1"
 COPYRIGHT="2001-2006 Bart Massey, Jamey Sharp, and Josh Triplett."
 LICENSE="MIT (no promotion)"
diff --git a/x11-proto/xextproto/xextproto-7.1.1.recipe b/x11-proto/xextproto/xextproto-7.1.1.recipe
index ee28282d2..da6336db8 100644
--- a/x11-proto/xextproto/xextproto-7.1.1.recipe
+++ b/x11-proto/xextproto/xextproto-7.1.1.recipe
@@ -4,7 +4,7 @@ xextproto.
 "
 HOMEPAGE="http://xorg.freedesktop.org/releases/individual/proto/" 
 SRC_URI="http://xorg.freedesktop.org/releases/individual/proto/xextproto-7.1.1.tar.gz"
-CHECKSUM_MD5="6c55283718dbeb826bcf899b9e89faba"
+CHECKSUM_SHA256="5ade284271eed437b05829be336b2b0ddaabad48335be220c0d9d5101fd8baec"
 REVISION="1"
 COPYRIGHT="1989, 1998  The Open Group
 	1997 by Silicon Graphics Computer Systems, Inc.