Merged haikuports/haikuports into master

2026-04-22 11:40:06 +02:00 · 2014-05-17 17:33:04 +02:00
parent b14f01a287 238f18b9cd
commit 41cefc29eb
588 changed files with 18640 additions and 3772 deletions
--- a/2
+++ b/2
@@ -0,0 +1,2 @@
+# contains the format versions used by this ports tree
+RecipeFormatVersion=1
--- 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
--- 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"

--- 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="
--- 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"

--- 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
--- 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"

--- 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="
--- 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"

--- 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
--- a/app-arch/lz4/lz4-r117.recipe
+++ 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
+	"
--- a/app-arch/lz4/patches/lz4-r117.patchset
+++ 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
+
--- 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"
--- 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"
--- 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"

--- 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
+
--- 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
--- a/app-arch/tar/patches/tar-1.27.1.patchset
+++ 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
+
--- 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"

--- a/app-arch/tar/tar-1.27.1.recipe
+++ 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
+}
--- a/app-arch/unrar/patches/unrar-5.0.14.patchset
+++ 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
+
--- a/app-arch/unrar/patches/unrar-5.1.5.patchset
+++ 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
+
--- 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
--- a/app-arch/unrar/unrar-5.0.14.recipe
+++ 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"
--- a/app-arch/unrar/unrar-5.1.5.recipe
+++ 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"
--- 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
--- 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
--- 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
--- a/app-arch/xz_utils/xz_utils-5.0.5.recipe
+++ 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.
+"
--- a/app-arch/zip/patches/zip-3.0.patch
+++ b/app-arch/zip/patches/zip-3.0.patch
@@ -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
- 
--- a/app-arch/zip/patches/zip-3.0.patchset
+++ 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
+
--- 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=""
--- 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="
--- 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="
--- 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"

--- 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="
--- 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"

--- 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"

--- 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"

--- 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="
--- 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."
--- a/app-crypt/gnupg/gnupg-1.4.16.recipe
+++ 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
+}
--- 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
--- 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"

--- 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"
--- 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"
--- 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="
--- 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
 }
--- a/app-emulation/joyce/joyce-2.2.6.recipe
+++ 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
+}
+
--- a/app-emulation/joyce/patches/joyce-2.2.6.patchset
+++ 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
+
--- 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"
--- a/app-emulation/linaro_qemu/linaro_qemu-2014.01.recipe
+++ 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
+}
--- a/app-emulation/linaro_qemu/patches/qemu-2.0.0.patchset
+++ 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
+
--- a/app-emulation/qemu/patches/qemu-1.7.0.patchset
+++ 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
+
--- a/app-emulation/qemu/patches/qemu-2.0.0.patchset
+++ 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
+
--- 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
 	"
--- a/app-emulation/qemu/qemu-2.0.0.recipe
+++ 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
+}
--- 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"
--- 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"
--- 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"
--- 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"
--- a/app-shells/bash/bash-4.3.recipe
+++ 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
+}
--- a/app-shells/dash/dash-0.5.7.recipe
+++ 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
+}
--- a/app-shells/dash/patches/dash-0.5.7.patchset
+++ 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
+
--- 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"
--- 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"

--- 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"
--- 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"

--- 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
--- 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
--- 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"
--- 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"

--- a/app-text/help2man/help2man-1.44.1.recipe
+++ 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
+}
--- 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"

--- 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
+	"
--- a/app-text/htmltidy/patches/htmltidy-20092812.patch
+++ b/app-text/htmltidy/patches/htmltidy-20092812.patch
@@ -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
--- a/app-text/htmltidy/patches/htmltidy-20092812.patchset
+++ 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
+
--- 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
+	"
--- 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"
--- a/app-text/libwpd/libwpd-0.9.6.recipe
+++ b/app-text/libwpd/libwpd-0.9.6.recipe
@@ -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"
--- a/app-text/libwpd/libwpd-0.9.9.recipe
+++ 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
+	"
--- a/app-text/libwpg/libwpg-0.2.1.recipe
+++ b/app-text/libwpg/libwpg-0.2.1.recipe
@@ -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"
--- a/app-text/libwpg/libwpg-0.2.2.recipe
+++ 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
+	"
--- 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"
--- 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"
--- 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"

--- a/app-text/tree/patches/tree-1.6.0.patch
+++ b/app-text/tree/patches/tree-1.6.0.patch
@@ -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
--- a/app-text/tree/patches/tree-1.7.0.patchset
+++ 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
+
--- a/app-text/tree/tree-1.6.0.recipe
+++ b/app-text/tree/tree-1.6.0.recipe
@@ -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"
--- a/app-text/tree/tree-1.7.0.recipe
+++ 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
+}
--- a/app-vim/cream/cream-0.43.recipe
+++ 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"
--- 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"
--- 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"
--- a/dev-db/db/db-6.0.30.recipe
+++ 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
+    "
--- a/dev-db/db/patches/db-6.0.30.patch
+++ 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;
--- a/dev-db/postgresql_server/licenses/PostgreSQL
+++ 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.
--- a/dev-db/postgresql_server/patches/postgresql_server-9.3.4.patchset
+++ 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
+
--- a/dev-db/postgresql_server/postgresql_server-9.3.4.recipe
+++ 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
+}
--- 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"
--- 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"

--- a/Show More
+++ b/Show More