From 388a71e266bc30d727272909b443b7bad1bb3f2e Mon Sep 17 00:00:00 2001
From: Jim <black.belt.jimmy@gmail.com>
Date: Sun, 23 Mar 2014 10:37:50 -0700
Subject: [PATCH 01/43] moved yab to dev-lang added haiku-apps/yab_ide

---
 .../yab/yab-1.7.02.recipe                     | 55 +++++++-----
 haiku-apps/yab/yab-1.6.recipe                 | 32 -------
 haiku-apps/yab_ide/yab_ide-2.2.1.recipe       | 83 +++++++++++++++++++
 3 files changed, 119 insertions(+), 51 deletions(-)
 rename haiku-apps/yab/yab-1.7.recipe => dev-lang/yab/yab-1.7.02.recipe (55%)
 delete mode 100644 haiku-apps/yab/yab-1.6.recipe
 create mode 100644 haiku-apps/yab_ide/yab_ide-2.2.1.recipe

diff --git a/haiku-apps/yab/yab-1.7.recipe b/dev-lang/yab/yab-1.7.02.recipe
similarity index 55%
rename from haiku-apps/yab/yab-1.7.recipe
rename to dev-lang/yab/yab-1.7.02.recipe
index 580637ebe..b4f20f63c 100644
--- a/haiku-apps/yab/yab-1.7.recipe
+++ b/dev-lang/yab/yab-1.7.02.recipe
@@ -1,19 +1,20 @@
 SUMMARY="yab is an extended version of yabsic, a BASIC programming language"
 DESCRIPTION="
 yab is an extended version of yabasic, a BASIC programming language, with \
-special commands designed for BeOS, Haiku and Zeta.
+special commands designed for Haiku.
 "
 HOMEPAGE="http://sourceforge.net/projects/yab-interpreter"
-SRC_URI="git+https://github.com/HaikuArchives/Yab.git"
+SRC_URI="git+https://github.com/bbjimmy/Yab.git"
 REVISION="2"
-#CHECKSUM_MD5="2b465895d9eb2e8383f035dd67b88a20"
-LICENSE="Artistic
-	GNU GPL v2"
-COPYRIGHT="1995-2006 Marc-Oliver Ihm (yabasic)
-	2006-2009 Jan Bungeroth (yab improvements)"
 
-ARCHITECTURES="!x86_gcc2 !x86 !x86_64"
-SECONDARY_ARCHITECTURE="!x86_gcc2 !x86"
+LICENSE="Artistic"
+
+COPYRIGHT="1995-2006 Marc-Oliver Ihm (yabasic)
+	2006-2009 Jan Bungeroth (yab improvements)
+	2013 Jim Saxton ( yab improvements)"
+
+ARCHITECTURES="x86_gcc2 x86 !x86_64"
+SECONDARY_ARCHITECTURE="!x86_64"
 
 #SOURCE_DIR="yab-$portVersion"
 
@@ -24,7 +25,7 @@ PROVIDES="
 
 REQUIRES="
 	haiku$secondaryArchSuffix >= $haikuVersion
-	lib:ncurses$secondaryArchSuffix
+	ncurses >= 5.9
 	"
 
 BUILD_REQUIRES="
@@ -43,17 +44,33 @@ BUILD_PREREQUIRES="
 	"
 
 BUILD()
-{
-	cd src
+{	
+	mkdir tmp
+	cp -r src/* tmp
+	cd tmp
 	make $jobArgs BUILDHOME=`finddir B_SYSTEM_DEVELOP_DIRECTORY`
+	unzip -o App_YAB.zip
+	copyattr App_YAB yab
 }
 
 INSTALL()
-{
-	$YABDIR=$appsDir/yab
-	mkdir -p ${YABDIR}
-	cp -a ${YABDIR}apps/yab
-	cp -a Documentation ${YABDIR}
-	cp -a Programs ${YABDIR}
-	cp -a yab-IDE ${YABDIR}
+{	
+	
+	
+	
+	mkdir -p $binDir
+	
+	cp tmp/yab  $binDir/
+	
+	mkdir -p $documentationDir
+	
+	cp -r Documentation/ $documentationDir/yab-1.7.02
+	
+	mkdir -p $appsDir/yab-IDE
+
+	cp -r src $appsDir/yab-IDE/src
+	cp -r Documentation $appsDir/yab-IDE/Documentation
+	rmdir --ignore tmp
+
+	
 }
diff --git a/haiku-apps/yab/yab-1.6.recipe b/haiku-apps/yab/yab-1.6.recipe
deleted file mode 100644
index 3fcda61c9..000000000
--- a/haiku-apps/yab/yab-1.6.recipe
+++ /dev/null
@@ -1,32 +0,0 @@
-SUMMARY="yab is an extended version of yabsic, a BASIC programming language"
-DESCRIPTION="
-yab is an extended version of yabasic, a BASIC programming language, with \
-special commands designed for BeOS, Haiku and Zeta.
-"
-HOMEPAGE="http://sourceforge.net/projects/yab-interpreter" 
-SRC_URI="http://ports-space.haiku-files.org/haiku-apps/source/yab-1.6.zip"
-REVISION="1"
-STATUS_HAIKU="stable"
-DEPEND=""
-CHECKSUM_MD5="071e8653265a60fea96cceab46f67e5b"
-BUILD()
-{
-	cd yab-1.6/src
-	make clean
-	make
-}
-
-INSTALL()
-{
-	cd yab-1.6
-	mkdir -p ${DESTDIR}/boot/apps/yab
-	cp -a src/yab ${DESTDIR}/boot/apps/yab
-	cp -a Documentation ${DESTDIR}/boot/apps/yab
-	cp -a Programs ${DESTDIR}/boot/apps/yab
-	cp -a yab-IDE ${DESTDIR}/boot/apps/yab
-}
-
-LICENSE="Artistic
-	GNU GPL v2"
-COPYRIGHT="1995-2006 Marc-Oliver Ihm (yabasic)
-	2006-2009 Jan Bungeroth (yab improvements)"
diff --git a/haiku-apps/yab_ide/yab_ide-2.2.1.recipe b/haiku-apps/yab_ide/yab_ide-2.2.1.recipe
new file mode 100644
index 000000000..97562bc46
--- /dev/null
+++ b/haiku-apps/yab_ide/yab_ide-2.2.1.recipe
@@ -0,0 +1,83 @@
+SUMMARY="Yab ide is an integrated development environment for yab. "
+DESCRIPTION="
+Yab allows fast prototyping with simple and clean code. yab contains a large number of BeAPI specific commands for GUI creation and much, much more.
+"
+HOMEPAGE="http://sourceforge.net/projects/yab-interpreter"
+SRC_URI="git+https://github.com/bbjimmy/Yab.git"
+REVISION="2"
+
+LICENSE="Artistic"
+COPYRIGHT="1995-2006 Marc-Oliver Ihm (yabasic)
+	2006-2009 Jan Bungeroth (yab improvements)
+	2013 Jim Saxton ( yab improvements)"
+
+ARCHITECTURES="x86_gcc2 x86 !x86_64"
+SECONDARY_ARCHITECTURE="!x86_64"
+
+#SOURCE_DIR="yab_ide-$portVersion"
+
+PROVIDES="
+	yab_ide$secondaryArchSuffix = $portVersion
+		"
+
+REQUIRES="
+	haiku$secondaryArchSuffix >= $haikuVersion
+	ncurses >= 5.9
+	yab >= 1.7.02
+	devel:libncurses$secondaryArchSuffix
+	devel:libz$secondaryArchSuffix	
+	"
+
+BUILD_REQUIRES="
+	haiku${secondaryArchSuffix}_devel >= $haikuVersion
+	devel:libncurses$secondaryArchSuffix
+	devel:libz$secondaryArchSuffix	
+"
+
+BUILD_PREREQUIRES="
+	cmd:bison
+	cmd:flex
+	cmd:gcc$secondaryArchSuffix
+	cmd:make
+	cmd:mkdepend
+	cmd:perl
+	makefile_engine
+	"
+
+BUILD()
+{
+	cd src
+	make $jobArgs BUILDHOME=`finddir B_SYSTEM_DEVELOP_DIRECTORY`
+	unzip -o App_YAB.zip
+	copyattr App_YAB yab
+}
+
+INSTALL()
+{	
+	
+	
+	
+	mkdir -p $binDir
+	
+	
+
+	mkdir -p tmp
+	mkdir -p tmp/buildfactory
+	cp -r src/* tmp/buildfactory 
+	cp -r yab-IDE/BuildFactory/* tmp/buildfactory/
+	unzip -o tmp/buildfactory/parts/yabstuff.zip -d tmp/buildfactory/parts
+	cp yab-IDE/src/yab-IDE.yab  tmp/buildfactory/	
+	cd tmp/buildfactory
+	BuildFactory.yab yab-IDE yab-IDE.yab application/x-vnd.yab-IDE	
+	cd ..
+	cd ..
+ 	
+	
+	mkdir -p $appsDir
+	cp -r yab-IDE/ $appsDir/
+	cp  tmp/buildfactory/yab-IDE $appsDir/yab-IDE/
+	cp yab-IDE/src/yab-IDE.yab $appsDir/yab-IDE/src/
+	
+
+	
+}

From 9347601d1f5f3f81216b18ad16fa1afd979518c9 Mon Sep 17 00:00:00 2001
From: Jim <black.belt.jimmy@gmail.com>
Date: Tue, 25 Mar 2014 08:08:14 -0700
Subject: [PATCH 02/43] updated requirwes and added a hash to the url.

---
 dev-lang/yab/yab-1.7.02.recipe | 23 ++++++++++++-----------
 1 file changed, 12 insertions(+), 11 deletions(-)

diff --git a/dev-lang/yab/yab-1.7.02.recipe b/dev-lang/yab/yab-1.7.02.recipe
index b4f20f63c..bf0e698f2 100644
--- a/dev-lang/yab/yab-1.7.02.recipe
+++ b/dev-lang/yab/yab-1.7.02.recipe
@@ -4,7 +4,9 @@ yab is an extended version of yabasic, a BASIC programming language, with \
 special commands designed for Haiku.
 "
 HOMEPAGE="http://sourceforge.net/projects/yab-interpreter"
-SRC_URI="git+https://github.com/bbjimmy/Yab.git"
+SRC_URI="git+https://github.com/bbjimmy/Yab.git#f4dcf31ed252a098337994aa7f03ec63bf44d544"
+
+
 REVISION="2"
 
 LICENSE="Artistic"
@@ -13,19 +15,18 @@ COPYRIGHT="1995-2006 Marc-Oliver Ihm (yabasic)
 	2006-2009 Jan Bungeroth (yab improvements)
 	2013 Jim Saxton ( yab improvements)"
 
-ARCHITECTURES="x86_gcc2 x86 !x86_64"
-SECONDARY_ARCHITECTURE="!x86_64"
-
+ARCHITECTURES="x86_gcc2 x86 ?x86_64"
 #SOURCE_DIR="yab-$portVersion"
 
 PROVIDES="
-	yab$secondaryArchSuffix = $portVersion
-	cmd:yab$secondaryArchSuffix
+	yab = $portVersion compat >=1.7.02 
+	cmd:yab= $portVersion compat >=1.7.02 
+	
 	"
 
 REQUIRES="
 	haiku$secondaryArchSuffix >= $haikuVersion
-	ncurses >= 5.9
+	lib:libncurses$secondaryArchSuffix
 	"
 
 BUILD_REQUIRES="
@@ -45,19 +46,19 @@ BUILD_PREREQUIRES="
 
 BUILD()
 {	
-	mkdir tmp
+	mkdir -p tmp
 	cp -r src/* tmp
 	cd tmp
 	make $jobArgs BUILDHOME=`finddir B_SYSTEM_DEVELOP_DIRECTORY`
 	unzip -o App_YAB.zip
 	copyattr App_YAB yab
+	
 }
 
 INSTALL()
 {	
 	
-	
-	
+		
 	mkdir -p $binDir
 	
 	cp tmp/yab  $binDir/
@@ -70,7 +71,7 @@ INSTALL()
 
 	cp -r src $appsDir/yab-IDE/src
 	cp -r Documentation $appsDir/yab-IDE/Documentation
-	rmdir --ignore tmp
+	
 
 	
 }

From 5092bc1544bf55a1d639a48fa099623a795a0c26 Mon Sep 17 00:00:00 2001
From: Jim <black.belt.jimmy@gmail.com>
Date: Tue, 25 Mar 2014 11:19:42 -0700
Subject: [PATCH 03/43] updated requires, added hash

---
 haiku-apps/yab_ide/yab_ide-2.2.1.recipe | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/haiku-apps/yab_ide/yab_ide-2.2.1.recipe b/haiku-apps/yab_ide/yab_ide-2.2.1.recipe
index 97562bc46..055257e4e 100644
--- a/haiku-apps/yab_ide/yab_ide-2.2.1.recipe
+++ b/haiku-apps/yab_ide/yab_ide-2.2.1.recipe
@@ -3,7 +3,7 @@ DESCRIPTION="
 Yab allows fast prototyping with simple and clean code. yab contains a large number of BeAPI specific commands for GUI creation and much, much more.
 "
 HOMEPAGE="http://sourceforge.net/projects/yab-interpreter"
-SRC_URI="git+https://github.com/bbjimmy/Yab.git"
+SRC_URI="git+https://github.com/bbjimmy/Yab.git#f4dcf31ed252a098337994aa7f03ec63bf44d544"
 REVISION="2"
 
 LICENSE="Artistic"
@@ -11,8 +11,8 @@ COPYRIGHT="1995-2006 Marc-Oliver Ihm (yabasic)
 	2006-2009 Jan Bungeroth (yab improvements)
 	2013 Jim Saxton ( yab improvements)"
 
-ARCHITECTURES="x86_gcc2 x86 !x86_64"
-SECONDARY_ARCHITECTURE="!x86_64"
+ARCHITECTURES="x86_gcc2 x86 ?x86_64"
+
 
 #SOURCE_DIR="yab_ide-$portVersion"
 
@@ -22,8 +22,8 @@ PROVIDES="
 
 REQUIRES="
 	haiku$secondaryArchSuffix >= $haikuVersion
-	ncurses >= 5.9
-	yab >= 1.7.02
+	lib:libncurses$secondaryArchSuffix
+	yab$secondaryArchSuffix >=1.7.02 
 	devel:libncurses$secondaryArchSuffix
 	devel:libz$secondaryArchSuffix	
 	"

From a43ff1ba5160bde19ede9333cc8862da9f6259dc Mon Sep 17 00:00:00 2001
From: Jonathan Schleifer <js@webkeks.org>
Date: Tue, 25 Mar 2014 23:08:12 +0100
Subject: [PATCH 04/43] automake: Add missing cmd:find

---
 sys-devel/automake/automake-1.13.1.recipe | 1 +
 1 file changed, 1 insertion(+)

diff --git a/sys-devel/automake/automake-1.13.1.recipe b/sys-devel/automake/automake-1.13.1.recipe
index a75b3e60a..afc32e5c1 100644
--- a/sys-devel/automake/automake-1.13.1.recipe
+++ b/sys-devel/automake/automake-1.13.1.recipe
@@ -37,6 +37,7 @@ BUILD_REQUIRES="
 BUILD_PREREQUIRES="
 	haiku_devel >= $haikuVersion
 	cmd:autoconf >= 2.60
+	cmd:find
 	cmd:gcc
 	cmd:ld
 	cmd:make

From 7cea0f03218bddd2875a9f0f38f7511d2790da27 Mon Sep 17 00:00:00 2001
From: Jonathan Schleifer <js@webkeks.org>
Date: Tue, 25 Mar 2014 23:27:18 +0100
Subject: [PATCH 05/43] openssl: Add checksums

---
 dev-libs/openssl/openssl-1.0.1e.recipe | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/dev-libs/openssl/openssl-1.0.1e.recipe b/dev-libs/openssl/openssl-1.0.1e.recipe
index 4bc31bc28..807138462 100644
--- a/dev-libs/openssl/openssl-1.0.1e.recipe
+++ b/dev-libs/openssl/openssl-1.0.1e.recipe
@@ -15,7 +15,10 @@ conditions.
 "
 HOMEPAGE="http://www.openssl.org/"
 SRC_URI="http://www.openssl.org/source/openssl-1.0.1e.tar.gz"
+CHECKSUM_SIZE="4459777"
 CHECKSUM_MD5="66bf6f10f060d561929de96f9dfe5b8c"
+CHECKSUM_RMD160="380827c16f18bed4f2eb3d54a387c7c089b2b299"
+CHECKSUM_SHA512="c76857e439431b2ef6f2aa123997e53f82b9c3c964d4d765d7cc6c0c20b37a21adf578f9b759b2b65ae3925454c432a01b7de0cd320ece7181dc292e00d3244e"
 LICENSE="OpenSSL"
 COPYRIGHT="
 	1995-1998 Eric Young

From b74c55e3a9c0851ad00a2cb00587e8a695c710dc Mon Sep 17 00:00:00 2001
From: Jonathan Schleifer <js@webkeks.org>
Date: Tue, 25 Mar 2014 23:32:59 +0100
Subject: [PATCH 06/43] curl-7.35.0: Enable x86_64, add checksums

---
 net-misc/curl/curl-7.35.0.recipe | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/net-misc/curl/curl-7.35.0.recipe b/net-misc/curl/curl-7.35.0.recipe
index cd8e51ab9..d9fd2dcbc 100644
--- a/net-misc/curl/curl-7.35.0.recipe
+++ b/net-misc/curl/curl-7.35.0.recipe
@@ -3,9 +3,12 @@ HOMEPAGE="http://curl.haxx.se"
 COPYRIGHT="1996-2014, Daniel Stenberg, <daniel@haxx.se>. All rights reserved."
 LICENSE="Curl"
 SRC_URI="http://curl.haxx.se/download/curl-7.35.0.tar.bz2"
+CHECKSUM_SIZE="2781470"
 CHECKSUM_MD5="c18fbdd031adb0529ae09fce399f2d10"
+CHECKSUM_RMD160="12844fdfa59538b4daa7d68a57e9d7d680473bf3"
+CHECKSUM_SHA512="aa669d9f62adbdcbfb89bd00893648ddf60bf5bc2d79c65e2a202c651ff57757f6b1de9fe94fd416923b89ffa7e9ffc65b6301b1c6dd2382df6dd5dccc55a23b"
 REVISION="1"
-ARCHITECTURES="x86_gcc2 x86"
+ARCHITECTURES="x86_gcc2 x86 x86_64"
 SECONDARY_ARCHITECTURES="x86_gcc2 x86"
 
 PATCHES=""

From ba5d53e69b01274051ee56708df2154d7abb72b6 Mon Sep 17 00:00:00 2001
From: Jonathan Schleifer <js@webkeks.org>
Date: Tue, 25 Mar 2014 23:35:40 +0100
Subject: [PATCH 07/43] python: Remove useless find+set, add checksums

---
 dev-lang/python/python-2.6.9.recipe | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/dev-lang/python/python-2.6.9.recipe b/dev-lang/python/python-2.6.9.recipe
index ad02a3ba3..ccc975373 100644
--- a/dev-lang/python/python-2.6.9.recipe
+++ b/dev-lang/python/python-2.6.9.recipe
@@ -12,7 +12,10 @@ HOMEPAGE="http://www.python.org"
 LICENSE="Python"
 COPYRIGHT="1990-2012, Python Software Foundation"
 SRC_URI="https://www.python.org/ftp/python/2.6.9/Python-2.6.9.tar.xz"
+CHECKSUM_SIZE="9333664"
 CHECKSUM_MD5="933a811f11e3db3d73ae492f6c3a7a76"
+CHECKSUM_RMD160="42edf7c9f2f64b77ab173de30ea453257c2c06b3"
+CHECKSUM_SHA512="bcd9286b6af3bfa2017f0b32c6c0f9b934224ece496d2d897ab3a61a936d306a5f61a580c060ce501034a614da374d17831a9c9be9f947b01d977b56437c023b"
 REVISION="1"
 ARCHITECTURES="x86_gcc2 x86 x86_64"
 
@@ -70,7 +73,6 @@ GLOBAL_WRITABLE_FILES="
 PATCH()
 {
 	echo "AC_CONFIG_MACRO_DIR([m4])" >> configure.in
-	find . -name '*.py' -exec sed -i -e 's|/usr/bin/env|/bin/env|g' {} \;
 }
 
 BUILD()

From 072b7adf4084a0131a6e5c62c784b060cf9a9522 Mon Sep 17 00:00:00 2001
From: Jonathan Schleifer <js@webkeks.org>
Date: Tue, 25 Mar 2014 23:46:44 +0100
Subject: [PATCH 08/43] openssl: Enable for x86_64, fix compat version

---
 dev-libs/openssl/openssl-1.0.1e.recipe | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/dev-libs/openssl/openssl-1.0.1e.recipe b/dev-libs/openssl/openssl-1.0.1e.recipe
index 807138462..478da8af6 100644
--- a/dev-libs/openssl/openssl-1.0.1e.recipe
+++ b/dev-libs/openssl/openssl-1.0.1e.recipe
@@ -24,16 +24,16 @@ COPYRIGHT="
 	1995-1998 Eric Young
 	1998-2013 The OpenSSL Project.
 	"
-REVISION="5"
-ARCHITECTURES="?x86_gcc2 ?x86 ?x86_64"
+REVISION="6"
+ARCHITECTURES="?x86_gcc2 ?x86 x86_64"
 SECONDARY_ARCHITECTURES="?x86_gcc2 ?x86"
 
 PATCHES="openssl-1.0.1e.patchset"
 
 PROVIDES="
-	openssl$secondaryArchSuffix = $portVersion compat >= 1.0.1
-	lib:libcrypto$secondaryArchSuffix = $portVersion compat >= 1.0.1
-	lib:libssl$secondaryArchSuffix = $portVersion compat >= 1.0.1
+	openssl$secondaryArchSuffix = $portVersion compat >= 1.0.0
+	lib:libcrypto$secondaryArchSuffix = $portVersion compat >= 1.0.0
+	lib:libssl$secondaryArchSuffix = $portVersion compat >= 1.0.0
 	"
 if [ -z "$secondaryArchSuffix" ]; then
 	PROVIDES="$PROVIDES

From c49fb22968040964ffa605d1ff8b5455c1a76e57 Mon Sep 17 00:00:00 2001
From: Jonathan Schleifer <js@webkeks.org>
Date: Wed, 26 Mar 2014 01:11:07 +0100
Subject: [PATCH 09/43] Mark openssl-1.0.1e broken on x86_64

It segfaults app_server on boot.
---
 dev-libs/openssl/openssl-1.0.1e.recipe | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/dev-libs/openssl/openssl-1.0.1e.recipe b/dev-libs/openssl/openssl-1.0.1e.recipe
index 478da8af6..170b1426a 100644
--- a/dev-libs/openssl/openssl-1.0.1e.recipe
+++ b/dev-libs/openssl/openssl-1.0.1e.recipe
@@ -25,7 +25,7 @@ COPYRIGHT="
 	1998-2013 The OpenSSL Project.
 	"
 REVISION="6"
-ARCHITECTURES="?x86_gcc2 ?x86 x86_64"
+ARCHITECTURES="?x86_gcc2 ?x86 !x86_64"
 SECONDARY_ARCHITECTURES="?x86_gcc2 ?x86"
 
 PATCHES="openssl-1.0.1e.patchset"

From 8320fd71f5039039be5181e14b063eae50167499 Mon Sep 17 00:00:00 2001
From: Jonathan Schleifer <js@webkeks.org>
Date: Wed, 26 Mar 2014 01:40:49 +0100
Subject: [PATCH 10/43] openssl: Add checksums

---
 dev-libs/openssl/openssl-1.0.0j.recipe | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/dev-libs/openssl/openssl-1.0.0j.recipe b/dev-libs/openssl/openssl-1.0.0j.recipe
index e10863f65..6e432a06e 100644
--- a/dev-libs/openssl/openssl-1.0.0j.recipe
+++ b/dev-libs/openssl/openssl-1.0.0j.recipe
@@ -15,7 +15,10 @@ conditions.
 "
 HOMEPAGE="http://www.openssl.org/"
 SRC_URI="http://www.openssl.org/source/openssl-1.0.0j.tar.gz"
+CHECKSUM_SIZE="4047852"
 CHECKSUM_MD5="cbe4ac0d8f598680f68a951e04b0996b"
+CHECKSUM_RMD160="aa5ade81df27afdee83732636babb4a26e59aaf7"
+CHECKSUM_SHA512="9796c75b4d5de57928708f5f0a8ca01aff5b4974b60006454657ed54c34998bc54d747af03860d319db7e7a57b0cd3c267758ffaac31be2be045c977d5fc33d4"
 LICENSE="OpenSSL"
 COPYRIGHT="
 	1995-1998 Eric Young

From 83df6ddb8f8e68fd5fbe0190c72c5be2e043ecf6 Mon Sep 17 00:00:00 2001
From: Jonathan Schleifer <js@webkeks.org>
Date: Wed, 26 Mar 2014 02:01:35 +0100
Subject: [PATCH 11/43] git: Add missing cmd:find

---
 dev-vcs/git/git-1.8.3.4.recipe | 1 +
 1 file changed, 1 insertion(+)

diff --git a/dev-vcs/git/git-1.8.3.4.recipe b/dev-vcs/git/git-1.8.3.4.recipe
index 1c0aedfbd..bd2e4f207 100644
--- a/dev-vcs/git/git-1.8.3.4.recipe
+++ b/dev-vcs/git/git-1.8.3.4.recipe
@@ -127,6 +127,7 @@ BUILD_REQUIRES="
 BUILD_PREREQUIRES="
 	haiku_devel >= $haikuVersion
 	cmd:autoconf
+	cmd:find
 	cmd:gcc
 	cmd:gettext
 	cmd:ld

From 0f38eeacffd597e0c067db2f9b805fba4a15fce7 Mon Sep 17 00:00:00 2001
From: Jonathan Schleifer <js@webkeks.org>
Date: Wed, 26 Mar 2014 04:12:32 +0100
Subject: [PATCH 12/43] Initial gdb port

Compiles, but gdb complains that it does not know how to start or how to
attach. Therefore marked as broken, but wanted to commit what I already
have.
---
 dev-util/gdb/gdb-7.7.recipe           |  73 +++++++++
 dev-util/gdb/patches/gdb-7.7.patchset | 222 ++++++++++++++++++++++++++
 2 files changed, 295 insertions(+)
 create mode 100644 dev-util/gdb/gdb-7.7.recipe
 create mode 100644 dev-util/gdb/patches/gdb-7.7.patchset

diff --git a/dev-util/gdb/gdb-7.7.recipe b/dev-util/gdb/gdb-7.7.recipe
new file mode 100644
index 000000000..323f74337
--- /dev/null
+++ b/dev-util/gdb/gdb-7.7.recipe
@@ -0,0 +1,73 @@
+SUMMARY="The GNU debugger"
+DESCRIPTION="
+GDB, the GNU Project debugger, allows you to see what is going on \`inside' another program while it executes -- or what another program was doing at the moment it crashed.
+
+GDB can do four main kinds of things (plus other things in support of these) to help you catch bugs in the act:
+
+ * Start your program, specifying anything that might affect its behavior.
+ * Make your program stop on specified conditions.
+ * Examine what has happened, when your program has stopped.
+ * Change things in your program, so you can experiment with correcting the effects of one bug and go on to learn about another.
+
+The program being debugged can be written in Ada, C, C++, Objective-C, Pascal (and many other languages). Those programs might be executing on the same machine as GDB (native) or on another machine (remote). GDB can run on most popular UNIX and Microsoft Windows variants.
+"
+
+HOMEPAGE="http://sourceware.org/gdb/"
+LICENSE="GNU GPL v3"
+COPYRIGHT="Free Software Foundation"
+
+SRC_URI="http://ftp.gnu.org/gnu/gdb/gdb-7.7.tar.bz2"
+CHECKSUM_SIZE="24846320"
+CHECKSUM_RMD160="c317ff8d2b93700802bd8ddeeb6ec53201078dfe"
+CHECKSUM_SHA512="42c8d312c0ca1042d1df7e115c541abc7453c20813b3f4f1fe52c62bc04b85d9116539d245e6404fa556260ba13f78f9a2ac35424eb7fd8ef9954cdbfc9581e0"
+REVISION="1"
+
+PATCHES="gdb-7.7.patchset"
+
+ARCHITECTURES="!x86_64"
+
+PROVIDES="
+	gdb = $portVersion
+	cmd:gdb = $portVersion
+	"
+
+REQUIRES="
+	haiku >= $haikuVersion
+	lib:libiconv
+	lib:libintl
+	lib:libncurses
+	"
+
+BUILD_REQUIRES="
+	gettext
+	libiconv_devel
+	ncurses_devel
+	"
+
+BUILD_PREREQUIRES="
+	haiku_devel >= $haikuVersion
+	cmd:aclocal
+	cmd:autoconf
+	cmd:automake
+	cmd:autoreconf
+	cmd:awk
+	cmd:gcc
+	cmd:ld
+	cmd:make
+	"
+
+BUILD()
+{
+	cd gdb && autoreconf; cd ..
+	runConfigure ./configure
+	make $jobArgs
+}
+
+INSTALL()
+{
+	make install
+	mkdir -p /packaging/gdb/develop/lib
+	for i in libbfd.a libbfd.la libopcodes.a libopcodes.la; do
+		mv /packaging/gdb/lib/$i /packaging/gdb/develop/lib/$i
+	done
+}
diff --git a/dev-util/gdb/patches/gdb-7.7.patchset b/dev-util/gdb/patches/gdb-7.7.patchset
new file mode 100644
index 000000000..5f67a67d9
--- /dev/null
+++ b/dev-util/gdb/patches/gdb-7.7.patchset
@@ -0,0 +1,222 @@
+From d1451ae108bc3bef182ca16e5b1a625483346cfe Mon Sep 17 00:00:00 2001
+From: Jonathan Schleifer <js@webkeks.org>
+Date: Wed, 26 Mar 2014 02:26:37 +0100
+Subject: [PATCH 1/5] Add Haiku to config.bfd
+
+Merged the config.bfd from gdb-7.7 with the config.bfd from our
+buildtools.
+---
+ bfd/config.bfd | 24 ++++++++++++++++++++++--
+ 1 file changed, 22 insertions(+), 2 deletions(-)
+
+diff --git a/bfd/config.bfd b/bfd/config.bfd
+index 4edcc6a..91a72db 100644
+--- a/bfd/config.bfd
++++ b/bfd/config.bfd
+@@ -334,7 +334,7 @@ case "${targ}" in
+     ;;
+   arm-*-elf | arm-*-freebsd* | arm*-*-linux-* | arm*-*-conix* | \
+   arm*-*-uclinux* | arm-*-kfreebsd*-gnu | \
+-  arm*-*-eabi* )
++  arm*-*-eabi* | arm*-*-haiku*)
+     targ_defvec=bfd_elf32_littlearm_vec
+     targ_selvecs=bfd_elf32_bigarm_vec
+     ;;
+@@ -668,6 +668,11 @@ case "${targ}" in
+     targ_selvecs="bfd_elf32_i386_vec bfd_elf32_x86_64_vec i386linux_vec i386pei_vec x86_64pei_vec bfd_elf64_l1om_vec bfd_elf64_k1om_vec"
+     want64=true
+     ;;
++  x86_64-*-haiku*)
++    targ_defvec=bfd_elf64_x86_64_vec
++    targ_selvecs="bfd_elf32_i386_vec"
++    want64=true
++    ;;
+   x86_64-*-nacl*)
+     targ_defvec=bfd_elf32_x86_64_nacl_vec
+     targ_selvecs="bfd_elf32_i386_nacl_vec bfd_elf64_x86_64_nacl_vec bfd_elf32_bigarm_nacl_vec bfd_elf32_littlearm_nacl_vec"
+@@ -716,6 +721,9 @@ case "${targ}" in
+     targ_defvec=bfd_elf32_i386_vec
+     targ_selvecs="i386pe_vec i386pei_vec"
+     ;;
++  i[3-7]86-*-haiku*)
++    targ_defvec=bfd_elf32_i386_vec
++    ;;
+   i[3-7]86-*-interix*)
+     targ_defvec=i386pei_vec
+     targ_selvecs="i386pe_vec"
+@@ -907,7 +915,10 @@ case "${targ}" in
+     targ_selvecs=ieee_vec
+     targ_underscore=yes
+     ;;
+-
++  m68*-*-haiku*)
++    targ_defvec=bfd_elf32_m68k_vec
++    targ_selvecs="m68kcoff_vec ieee_vec"
++    ;;
+   m88*-harris-cxux* | m88*-*-dgux* | m88*-*-sysv4*)
+     targ_defvec=bfd_elf32_m88k_vec
+     targ_selvecs=m88kbcs_vec
+@@ -963,6 +974,10 @@ case "${targ}" in
+     targ_defvec=bfd_elf32_tradlittlemips_vec
+     targ_selvecs="bfd_elf32_tradbigmips_vec bfd_elf64_tradbigmips_vec bfd_elf64_tradlittlemips_vec ecoff_little_vec ecoff_big_vec"
+     ;;
++  mips*el-*-haiku*)
++    targ_defvec=bfd_elf32_littlemips_vec
++    targ_selvecs="bfd_elf32_bigmips_vec bfd_elf64_bigmips_vec bfd_elf64_littlemips_vec ecoff_little_vec ecoff_big_vec"
++    ;;
+   mips*-*-netbsd*)
+     targ_defvec=bfd_elf32_tradbigmips_vec
+     targ_selvecs="bfd_elf32_tradlittlemips_vec bfd_elf64_tradbigmips_vec bfd_elf64_tradlittlemips_vec ecoff_big_vec ecoff_little_vec"
+@@ -1276,6 +1291,11 @@ case "${targ}" in
+     targ_selvecs="mach_o_be_vec mach_o_le_vec mach_o_fat_vec pef_vec pef_xlib_vec sym_vec"
+     targ_archs="$targ_archs bfd_i386_arch"
+     ;;
++  powerpc-*-haiku*)
++    targ_defvec=bfd_elf32_powerpc_vec
++    targ_selvecs="rs6000coff_vec bfd_elf32_powerpcle_vec pef_vec pef_xlib_vec pmac_xcoff_vec ppcboot_vec"
++    targ_cflags=-D__HAIKU_TARGET__
++    ;;
+   powerpc-*-macos*)
+     targ_defvec=pmac_xcoff_vec
+     ;;
+-- 
+Jonathan
+
+
+From 95c56e69655292af02df81204a6957af8589f91e Mon Sep 17 00:00:00 2001
+From: Jonathan Schleifer <js@webkeks.org>
+Date: Wed, 26 Mar 2014 02:36:02 +0100
+Subject: [PATCH 2/5] Add Haiku to gdb/configure.tgt
+
+---
+ gdb/configure.tgt | 4 ++++
+ 1 file changed, 4 insertions(+)
+
+diff --git a/gdb/configure.tgt b/gdb/configure.tgt
+index 47e98d9..e7843f6 100644
+--- a/gdb/configure.tgt
++++ b/gdb/configure.tgt
+@@ -687,6 +687,10 @@ x86_64-*-openbsd*)
+ 			i387-tdep.o i386bsd-tdep.o i386obsd-tdep.o \
+ 			bsd-uthread.o solib-svr4.o"
+ 	;;
++x86_64-*-haiku*)
++	# Target: Haiku/x86_64
++	gdb_target_obs="amd64-tdep.o i386-tdep.o i387-tdep.o solib-svr4.o"
++	;;
+ xtensa*-*-linux*)	gdb_target=linux
+ 	# Target: GNU/Linux Xtensa
+ 	gdb_target_obs="xtensa-tdep.o xtensa-config.o xtensa-linux-tdep.o \
+-- 
+Jonathan
+
+
+From 809b3250039450b348f16aee7430d4c98b8ca2ec Mon Sep 17 00:00:00 2001
+From: Jonathan Schleifer <js@webkeks.org>
+Date: Wed, 26 Mar 2014 02:54:53 +0100
+Subject: [PATCH 3/5] Add gdb/config/i386/haiku64.mh
+
+---
+ gdb/config/i386/haiku64.mh | 2 ++
+ gdb/configure.host         | 1 +
+ 2 files changed, 3 insertions(+)
+ create mode 100644 gdb/config/i386/haiku64.mh
+
+diff --git a/gdb/config/i386/haiku64.mh b/gdb/config/i386/haiku64.mh
+new file mode 100644
+index 0000000..aa99883
+--- /dev/null
++++ b/gdb/config/i386/haiku64.mh
+@@ -0,0 +1,2 @@
++# Host: Haiku/x86_64
++NATDEPFILES= fork-child.o amd64-nat.o
+diff --git a/gdb/configure.host b/gdb/configure.host
+index 634213f..e91e8bd 100644
+--- a/gdb/configure.host
++++ b/gdb/configure.host
+@@ -183,6 +183,7 @@ x86_64-*-freebsd* | x86_64-*-kfreebsd*-gnu)
+ x86_64-*-netbsd* | x86_64-*-knetbsd*-gnu)
+ 			gdb_host=nbsd64 ;;
+ x86_64-*-openbsd*)	gdb_host=obsd64 ;;
++x86_64-*-haiku*)	gdb_host=haiku64 ;;
+ x86_64-*-mingw*)        gdb_host=mingw64
+ 			gdb_host_obs=mingw-hdep.o
+ 			;;
+-- 
+Jonathan
+
+
+From 4ed8b2a84a58416de1baf6d2222b377e1462a3d5 Mon Sep 17 00:00:00 2001
+From: Jonathan Schleifer <js@webkeks.org>
+Date: Wed, 26 Mar 2014 03:11:41 +0100
+Subject: [PATCH 4/5] Look for socketpair and gethostbyname in -lnetwork
+
+---
+ gdb/configure.ac | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/gdb/configure.ac b/gdb/configure.ac
+index 55f37d2..6fd12a7 100644
+--- a/gdb/configure.ac
++++ b/gdb/configure.ac
+@@ -510,10 +510,10 @@ AC_CHECK_FUNC(wctype, [],
+   [AC_CHECK_LIB(w, wctype)])
+ 
+ # Some systems (e.g. Solaris) have `gethostbyname' in libnsl.
+-AC_SEARCH_LIBS(gethostbyname, nsl)
++AC_SEARCH_LIBS(gethostbyname, [nsl network])
+ 
+ # Some systems (e.g. Solaris) have `socketpair' in libsocket.
+-AC_SEARCH_LIBS(socketpair, socket)
++AC_SEARCH_LIBS(socketpair, [socket network])
+ 
+ # Link in zlib if we can.  This allows us to read compressed debug sections.
+ AM_ZLIB
+-- 
+Jonathan
+
+
+From ede4bf96bdfa2e6f4f36d7e0056adc5cdec70058 Mon Sep 17 00:00:00 2001
+From: Jonathan Schleifer <js@webkeks.org>
+Date: Wed, 26 Mar 2014 03:17:18 +0100
+Subject: [PATCH 5/5] Remove autoconf version check
+
+---
+ config/override.m4 | 21 ---------------------
+ 1 file changed, 21 deletions(-)
+
+diff --git a/config/override.m4 b/config/override.m4
+index 52bd1c3..3af7e21 100644
+--- a/config/override.m4
++++ b/config/override.m4
+@@ -27,27 +27,6 @@ AC_DEFUN([AC_PREREQ], [frob])
+ m4_copy_force([_AC_PREREQ], [AC_PREREQ])
+ 
+ 
+-dnl Ensure exactly this Autoconf version is used
+-m4_ifndef([_GCC_AUTOCONF_VERSION],
+-  [m4_define([_GCC_AUTOCONF_VERSION], [2.64])])
+-
+-dnl Test for the exact version when AC_INIT is expanded.
+-dnl This allows to update the tree in steps (for testing)
+-dnl by putting
+-dnl   m4_define([_GCC_AUTOCONF_VERSION], [X.Y])
+-dnl in configure.ac before AC_INIT,
+-dnl without rewriting this file.
+-dnl Or for updating the whole tree at once with the definition above.
+-AC_DEFUN([_GCC_AUTOCONF_VERSION_CHECK],
+-[m4_if(m4_defn([_GCC_AUTOCONF_VERSION]),
+-  m4_defn([m4_PACKAGE_VERSION]), [],
+-  [m4_fatal([Please use exactly Autoconf ]_GCC_AUTOCONF_VERSION[ instead of ]m4_defn([m4_PACKAGE_VERSION])[.])])
+-])
+-m4_define([AC_INIT], m4_defn([AC_INIT])[
+-_GCC_AUTOCONF_VERSION_CHECK
+-])
+-
+-
+ dnl Ensure we do not use a buggy M4.
+ m4_if(m4_index([..wi.d.], [.d.]), [-1],
+   [m4_fatal(m4_do([m4 with buggy strstr detected.  Please install
+-- 
+Jonathan
+

From 1194f7683a8305bc5e10a1f0e56e7035772a2efe Mon Sep 17 00:00:00 2001
From: Adrien Destugues <pulkomandy@pulkomandy.tk>
Date: Wed, 26 Mar 2014 15:05:29 +0100
Subject: [PATCH 13/43] Protrekkr: add missing $secondaryArchSuffix

* This made the package impossible to install.
---
 media-sound/protrekkr/protrekkr-2.5.4.recipe | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/media-sound/protrekkr/protrekkr-2.5.4.recipe b/media-sound/protrekkr/protrekkr-2.5.4.recipe
index 202a4a10b..134b90153 100644
--- a/media-sound/protrekkr/protrekkr-2.5.4.recipe
+++ b/media-sound/protrekkr/protrekkr-2.5.4.recipe
@@ -12,7 +12,7 @@ Based on Juan Antonio Arguelles Rius's NoiseTrekker.
 	"
 LICENSE="BSD (3-clause)"
 SRC_URI="svn+http://protrekkr.googlecode.com/svn/trunk/#670"
-REVISION="1"
+REVISION="2"
 ARCHITECTURES="x86"
 if [ $effectiveTargetArchitecture != x86_gcc2 ]; then
 	# x86_gcc2 is fine as primary target architecture as long as we're building
@@ -22,7 +22,7 @@ fi
 SECONDARY_ARCHITECTURES="x86"
 
 PROVIDES="
-	protrekkr = $portVersion
+	protrekkr${secondaryArchSuffix} = $portVersion
 	app:Protrekkr = $portVersion
 	"
 

From 682e655a9264573d81912fbc5a1ec8908c57f53f Mon Sep 17 00:00:00 2001
From: Jim <black.belt.jimmy@gmail.com>
Date: Wed, 26 Mar 2014 12:19:46 -0700
Subject: [PATCH 14/43] add DigiClock screensaver

---
 haiku-apps/digiclock/digiclock-1.0.recipe | 55 +++++++++++++++++++++++
 1 file changed, 55 insertions(+)
 create mode 100644 haiku-apps/digiclock/digiclock-1.0.recipe

diff --git a/haiku-apps/digiclock/digiclock-1.0.recipe b/haiku-apps/digiclock/digiclock-1.0.recipe
new file mode 100644
index 000000000..afc6badbb
--- /dev/null
+++ b/haiku-apps/digiclock/digiclock-1.0.recipe
@@ -0,0 +1,55 @@
+SUMMARY="DigiClock Screensaver"
+DESCRIPTION="Based on BinaryClock by David Enderson Uses filled rectangles and random colors."
+
+HOMEPAGE="https://github.com/bbjimmy/DigiClock"
+SRC_URI="git+https://github.com/bbjimmy/DigiClock.git#7c49eb1ec29b1eb1046f9d7911646e2d5f5e6def"
+
+LICENSE="GNU GPL v2"
+COPYRIGHT="2012 Jim Saxton, Fat Elk Softrware"
+
+ARCHITECTURES="x86_gcc2 x86 ?x86_64"
+
+#SOURCE_DIR="DigiClock-$portVersion"
+
+PROVIDES="
+
+DigiClock = 1.0"
+
+REVISION="1"
+
+REQUIRES="
+	haiku$secondaryArchSuffix >= $haikuVersion"
+
+BUILD_REQUIRES="
+	haiku${secondaryArchSuffix}_devel >= $haikuVersion
+	cmd:gcc$secondaryArchSuffix
+	cmd:make
+	makefile_engine"
+
+BUILD_PREREQUIRES="
+	cmd:gcc$secondaryArchSuffix
+	cmd:make
+	makefile_engine"
+
+BUILD()
+
+{
+	cd source
+	make $jobArgs BUILDHOME=`finddir B_SYSTEM_DEVELOP_DIRECTORY`
+}
+
+INSTALL()
+{	
+	mkdir -p $addOnsDir/Screen\ Savers
+	cd source/objects*
+	cp DigiClock $addOnsDir/Screen\ Savers/DigiClock
+	mkdir -p $dataDir/FatElk
+	cd ..
+	unzip -o fatelk
+	cp "FAT ELK" $dataDir/FatElk/
+	cp "Fat Elk" $dataDir/FatElk/
+}
+
+
+
+

From 0b25cbc95614ebbcad0ed23a6ba4ed827c53f106 Mon Sep 17 00:00:00 2001
From: Jonathan Schleifer <js@webkeks.org>
Date: Thu, 27 Mar 2014 01:23:33 +0100
Subject: [PATCH 15/43] readline: Enable x86_64, add checksums

---
 sys-libs/readline/readline-6.3.recipe | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/sys-libs/readline/readline-6.3.recipe b/sys-libs/readline/readline-6.3.recipe
index fcece8072..5d3f04ead 100644
--- a/sys-libs/readline/readline-6.3.recipe
+++ b/sys-libs/readline/readline-6.3.recipe
@@ -14,9 +14,12 @@ HOMEPAGE="http://cnswww.cns.cwru.edu/php/chet/readline/rltop.html"
 COPYRIGHT="1989-2011 Free Software Foundation, Inc."
 LICENSE="GNU GPL v3"
 SRC_URI="ftp://ftp.gnu.org/gnu/readline/readline-6.3.tar.gz"
+CHECKSUM_SIZE="2468560"
 CHECKSUM_MD5="33c8fb279e981274f485fd91da77e94a"
+CHECKSUM_RMD160="986262d811d9dbe1e38bc9d714853272967dca7e"
+CHECKSUM_SHA512="f70efaf46d570b85c7637172b0ee2eb9a4aa73ba38a62bb45075e665929d9701b96fba0aea6c767fd9a2a0d39dfe8e70ab06da08f8524aee76a7c502f370a401"
 REVISION="1"
-ARCHITECTURES="x86_gcc2 ?x86 ?x86_64"
+ARCHITECTURES="x86_gcc2 ?x86 x86_64"
 SECONDARY_ARCHITECTURES="?x86_gcc2 x86"
 
 PATCHES="readline-6.3.patch"

From 17c98fb70da6eab7cbbe5910ed20b942ea190d09 Mon Sep 17 00:00:00 2001
From: Jim <black.belt.jimmy@gmail.com>
Date: Thu, 27 Mar 2014 08:46:51 -0700
Subject: [PATCH 16/43] lowercased digiclock, changed the requires and provides
 sections

---
 haiku-apps/digiclock/digiclock-1.0.recipe | 8 +++-----
 1 file changed, 3 insertions(+), 5 deletions(-)

diff --git a/haiku-apps/digiclock/digiclock-1.0.recipe b/haiku-apps/digiclock/digiclock-1.0.recipe
index afc6badbb..01dd23c1b 100644
--- a/haiku-apps/digiclock/digiclock-1.0.recipe
+++ b/haiku-apps/digiclock/digiclock-1.0.recipe
@@ -9,11 +9,11 @@ COPYRIGHT="2012 Jim Saxton, Fat Elk Softrware"
 
 ARCHITECTURES="x86_gcc2 x86 ?x86_64"
 
-#SOURCE_DIR="DigiClock-$portVersion"
+#SOURCE_DIR="digiclock-$portVersion"
 
 PROVIDES="
 
-DigiClock = 1.0"
+app:digiclock = $portVersion"
 
 REVISION="1"
 
@@ -22,9 +22,7 @@ REQUIRES="
 
 BUILD_REQUIRES="
 	haiku${secondaryArchSuffix}_devel >= $haikuVersion
-	cmd:gcc$secondaryArchSuffix
-	cmd:make
-	makefile_engine"
+	"
 
 BUILD_PREREQUIRES="
 	cmd:gcc$secondaryArchSuffix

From b82526cbd4e3e895696ed982dcdcb03129f15730 Mon Sep 17 00:00:00 2001
From: Jonathan Schleifer <js@webkeks.org>
Date: Tue, 25 Mar 2014 20:16:47 +0100
Subject: [PATCH 17/43] clang: Remove useless find + sed patch

---
 sys-devel/clang/clang-3.2.recipe | 3 ---
 sys-devel/clang/clang-3.4.recipe | 3 ---
 2 files changed, 6 deletions(-)

diff --git a/sys-devel/clang/clang-3.2.recipe b/sys-devel/clang/clang-3.2.recipe
index 33324b949..c48107bf6 100644
--- a/sys-devel/clang/clang-3.2.recipe
+++ b/sys-devel/clang/clang-3.2.recipe
@@ -62,9 +62,6 @@ BUILD()
 	#cp -r /boot/system/data/libtool/config/. autoconf/
 	#cp -r /boot/system/data/libtool/config/. projects/sample/autoconf/
 	
-	# Fix improper env paths
-	find . -type f -exec sed -i 's/\/usr\/bin\/env/\/bin\/env/g' "{}" \;
-	
 	# Haiku C++ requires rtti in a lot of central system components
 	# such as Mesa
 	export REQUIRES_RTTI=1
diff --git a/sys-devel/clang/clang-3.4.recipe b/sys-devel/clang/clang-3.4.recipe
index 79477fe79..d2a8f29ce 100644
--- a/sys-devel/clang/clang-3.4.recipe
+++ b/sys-devel/clang/clang-3.4.recipe
@@ -65,9 +65,6 @@ BUILD()
 	#cp -r /boot/system/data/libtool/config/. autoconf/
 	#cp -r /boot/system/data/libtool/config/. projects/sample/autoconf/
 	
-	# Fix improper env paths
-	find . -type f -exec sed -i 's/\/usr\/bin\/env/\/bin\/env/g' "{}" \;
-	
 	# Haiku C++ requires rtti in a lot of central system components
 	# such as Mesa
 	export REQUIRES_RTTI=1

From a4cc09bf55d546b3c041780dd11bfd0ebf8ee33b Mon Sep 17 00:00:00 2001
From: Jonathan Schleifer <js@webkeks.org>
Date: Tue, 25 Mar 2014 20:21:03 +0100
Subject: [PATCH 18/43] cmake-3.0.0_rc1: Add checksums

---
 dev-util/cmake/cmake-3.0.0_rc1.recipe | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/dev-util/cmake/cmake-3.0.0_rc1.recipe b/dev-util/cmake/cmake-3.0.0_rc1.recipe
index c28d4d748..6571557d0 100644
--- a/dev-util/cmake/cmake-3.0.0_rc1.recipe
+++ b/dev-util/cmake/cmake-3.0.0_rc1.recipe
@@ -10,7 +10,10 @@ HOMEPAGE="http://www.cmake.org"
 LICENSE="CMake"
 COPYRIGHT="2002-2013 Kitware, Inc., Insight Consortium, All rights reserved."
 SRC_URI="http://www.cmake.org/files/v3.0/cmake-3.0.0-rc1.tar.gz"
+CHECKSUM_SIZE="5485992"
 CHECKSUM_MD5="3f6e729a52e15cc3b1d58e2d1195c421"
+CHECKSUM_RMD160="df1fd58f0e95552d4797a6c7e6cea92627b403db"
+CHECKSUM_SHA512="f81f2dc4f6ae4cbed3bd50053ca7e9eb68249c3a0d96984572e7a2298eb47c7a4238207b10849e2e0e8996ec9e9d7aa5107c48d3073c3821006325df2e28e0e7"
 REVISION="7"
 ARCHITECTURES="x86 x86_64"
 if [ $effectiveTargetArchitecture != x86_gcc2 ]; then

From d70750f22daf838fbad5e71cd057221580a46f3b Mon Sep 17 00:00:00 2001
From: Jonathan Schleifer <js@webkeks.org>
Date: Thu, 27 Mar 2014 22:00:09 +0100
Subject: [PATCH 19/43] man: Fix manpages not rendering properly

Also adds checksums.
---
 sys-apps/man/man-1.6g.recipe           |  5 ++++-
 sys-apps/man/patches/man-1.6g.patchset | 25 +++++++++++++++++++++++++
 2 files changed, 29 insertions(+), 1 deletion(-)

diff --git a/sys-apps/man/man-1.6g.recipe b/sys-apps/man/man-1.6g.recipe
index cf3de4c0e..4e8bc3766 100644
--- a/sys-apps/man/man-1.6g.recipe
+++ b/sys-apps/man/man-1.6g.recipe
@@ -4,10 +4,13 @@ Standard commands to read man pages.
 "
 HOMEPAGE="http://primates.ximian.com/~flucifredi/man/"
 SRC_URI="http://primates.ximian.com/~flucifredi/man/man-1.6g.tar.gz"
+CHECKSUM_SIZE="256906"
 CHECKSUM_MD5="ba154d5796928b841c9c69f0ae376660"
+CHECKSUM_RMD160="f1a845bcf454424f49a3281a86217af0328d88e2"
+CHECKSUM_SHA512="c786fa2201aed92293e5590dc3ad5d550cf14e5059fa274ef7719af86ee4c892e747576495b6dc0a09286e73e2f0f0caf860216e0c8032d9ef13e5d26853048b"
 LICENSE="GNU GPL v2"
 COPYRIGHT="1989-2012 Free Software Foundation, Inc."
-REVISION="3"
+REVISION="4"
 ARCHITECTURES="x86_gcc2 x86 x86_64"
 
 PATCHES="man-1.6g.patchset"
diff --git a/sys-apps/man/patches/man-1.6g.patchset b/sys-apps/man/patches/man-1.6g.patchset
index 6fefdfc58..f2d53565b 100644
--- a/sys-apps/man/patches/man-1.6g.patchset
+++ b/sys-apps/man/patches/man-1.6g.patchset
@@ -182,3 +182,28 @@ index 72f37a5..c838d25 100755
 -- 
 1.8.3.4
 
+From ccf2eb07650cdeb9dbcc91d5bb271ee95a8da4ac Mon Sep 17 00:00:00 2001
+From: Jonathan Schleifer <js@webkeks.org>
+Date: Thu, 27 Mar 2014 21:56:39 +0100
+Subject: [PATCH] Add -R to less options to fix formattings
+
+---
+ configure | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/configure b/configure
+index c838d25..2bf534e 100755
+--- a/configure
++++ b/configure
+@@ -26,7 +26,7 @@ LANGOPT="+lang {$LANGUAGES|all|none}"
+ # (Indeed, -r may cause the terminal to get into funny states.
+ # Very inconvenient. For viewing pages in strange locales, set LC_*.)
+ #
+-DEFAULTLESSOPT="-is"
++DEFAULTLESSOPT="-isR"
+ #
+ # Note that not creating any cat directories (/var/cache/man or so)
+ # and not making man suid or sgid is recommended.
+-- 
+Jonathan
+

From 01df4c47e6823a0ce1c4a1eb329df1be19b6ce79 Mon Sep 17 00:00:00 2001
From: Jonathan Schleifer <js@webkeks.org>
Date: Fri, 28 Mar 2014 18:06:48 +0100
Subject: [PATCH 20/43] libsdl: Fix x86_64, cleanup code, add checksums

---
 media-libs/libsdl/libsdl-1.2.15.recipe        |   5 +-
 .../libsdl/patches/libsdl-1.2.15.patchset     | 140 ++++++++++++++++++
 2 files changed, 144 insertions(+), 1 deletion(-)

diff --git a/media-libs/libsdl/libsdl-1.2.15.recipe b/media-libs/libsdl/libsdl-1.2.15.recipe
index 5c54fa62b..5e1a9a4a2 100644
--- a/media-libs/libsdl/libsdl-1.2.15.recipe
+++ b/media-libs/libsdl/libsdl-1.2.15.recipe
@@ -6,8 +6,11 @@ OpenGL.
 "
 HOMEPAGE="http://www.libsdl.org/" 
 SRC_URI="http://www.libsdl.org/release/SDL-1.2.15.tar.gz"
+CHECKSUM_SIZE="3920622"
 CHECKSUM_MD5="9d96df8417572a2afb781a7c4c811a85"
-REVISION="4"
+CHECKSUM_RMD160="d4802a090cb4a24eeb0c8ce5690802f596d394c3"
+CHECKSUM_SHA512="ac392d916e6953b0925a7cbb0f232affea33339ef69b47a0a7898492afb9784b93138986df53d6da6d3e2ad79af1e9482df565ecca30f89428be0ae6851b1adc"
+REVISION="5"
 LICENSE="GNU LGPL v2.1"
 COPYRIGHT="1997-2012 Sam Lantinga"
 
diff --git a/media-libs/libsdl/patches/libsdl-1.2.15.patchset b/media-libs/libsdl/patches/libsdl-1.2.15.patchset
index fa82bad92..8d2190833 100644
--- a/media-libs/libsdl/patches/libsdl-1.2.15.patchset
+++ b/media-libs/libsdl/patches/libsdl-1.2.15.patchset
@@ -247,3 +247,143 @@ index f2b19a2..2cb94ee 100644
 -- 
 1.8.3.4
 
+From a1a8ccda9449d9f0dc61708fcc35530fbbaf7644 Mon Sep 17 00:00:00 2001
+From: Jonathan Schleifer <js@webkeks.org>
+Date: Fri, 28 Mar 2014 18:04:12 +0100
+Subject: [PATCH] Fix compilation on x86_64
+
+Also cleans up and fixes warnings.
+---
+ src/video/SDL_sysvideo.h          |  8 ++++++++
+ src/video/SDL_video.c             |  2 +-
+ src/video/bwindow/SDL_sysvideo.cc | 22 +++++++++-------------
+ src/video/bwindow/SDL_sysyuv.cc   |  3 ++-
+ 4 files changed, 20 insertions(+), 15 deletions(-)
+
+diff --git a/src/video/SDL_sysvideo.h b/src/video/SDL_sysvideo.h
+index 436450e..b45a8a9 100644
+--- a/src/video/SDL_sysvideo.h
++++ b/src/video/SDL_sysvideo.h
+@@ -24,6 +24,10 @@
+ #ifndef _SDL_sysvideo_h
+ #define _SDL_sysvideo_h
+ 
++#if defined(__BEOS__) || defined(__HAIKU__)
++#include <os/kernel/image.h>
++#endif
++
+ #include "SDL_mouse.h"
+ #define SDL_PROTOTYPES_ONLY
+ #include "SDL_syswm.h"
+@@ -296,7 +300,11 @@ struct SDL_VideoDevice {
+ 		int swap_control;
+ 		int driver_loaded;
+ 		char driver_path[256];
++#if defined(__BEOS__) || defined(__HAIKU__)
++		image_id dll_handle;
++#else
+ 		void* dll_handle;
++#endif
+ 	} gl_config;
+ 
+ 	/* * * */
+diff --git a/src/video/SDL_video.c b/src/video/SDL_video.c
+index 46285c9..255cafb 100644
+--- a/src/video/SDL_video.c
++++ b/src/video/SDL_video.c
+@@ -222,7 +222,7 @@ int SDL_VideoInit (const char *driver_name, Uint32 flags)
+ 
+ 	/* Set some very sane GL defaults */
+ 	video->gl_config.driver_loaded = 0;
+-	video->gl_config.dll_handle = NULL;
++	video->gl_config.dll_handle = 0;
+ 	video->gl_config.red_size = 3;
+ 	video->gl_config.green_size = 3;
+ 	video->gl_config.blue_size = 2;
+diff --git a/src/video/bwindow/SDL_sysvideo.cc b/src/video/bwindow/SDL_sysvideo.cc
+index a26f18b..5d4077f 100644
+--- a/src/video/bwindow/SDL_sysvideo.cc
++++ b/src/video/bwindow/SDL_sysvideo.cc
+@@ -644,17 +644,13 @@ static void BE_NormalUpdate(_THIS, int numrects, SDL_Rect *rects)
+ int BE_GL_LoadLibrary(_THIS, const char *path)
+ {
+ 	if (path == NULL) {
+-		if (_this->gl_config.dll_handle == NULL) {
++		if (_this->gl_config.dll_handle == 0) {
+ 			image_info info;
+ 			int32 cookie = 0;
+ 			while (get_next_image_info(0,&cookie,&info) == B_OK) {
+ 				void *location = NULL;
+-#ifdef __HAIKU__
+ 				if (get_image_symbol(info.id,"glBegin",B_SYMBOL_TYPE_ANY,&location) == B_OK) { // This is how it actually works in Haiku
+-#else
+-				if (get_image_symbol((image_id)cookie,"glBegin",B_SYMBOL_TYPE_ANY,&location) == B_OK) { // I don't know if that *did* work in BeOS
+-#endif
+-					_this->gl_config.dll_handle = (void*)info.id;
++					_this->gl_config.dll_handle = info.id;
+ 					_this->gl_config.driver_loaded = 1;
+ 					SDL_strlcpy(_this->gl_config.driver_path, "libGL.so", SDL_arraysize(_this->gl_config.driver_path));
+ 				}
+@@ -666,7 +662,7 @@ int BE_GL_LoadLibrary(_THIS, const char *path)
+ 			to load BGLView, which should be reloaded from new lib.
+ 			So for now just "load" linked libGL.so :(
+ 		*/
+-		if (_this->gl_config.dll_handle == NULL) {
++		if (_this->gl_config.dll_handle == 0) {
+ 			return BE_GL_LoadLibrary(_this, NULL);
+ 		}
+ 
+@@ -688,10 +684,10 @@ int BE_GL_LoadLibrary(_THIS, const char *path)
+ 		}*/
+ 	}
+ 
+-	if (_this->gl_config.dll_handle != NULL) {
++	if (_this->gl_config.dll_handle != 0) {
+ 		return 0;
+ 	} else {
+-		_this->gl_config.dll_handle = NULL;
++		_this->gl_config.dll_handle = 0;
+ 		_this->gl_config.driver_loaded = 0;
+ 		*_this->gl_config.driver_path = '\0';
+ 		return -1;
+@@ -700,10 +696,10 @@ int BE_GL_LoadLibrary(_THIS, const char *path)
+ 
+ void* BE_GL_GetProcAddress(_THIS, const char *proc)
+ {
+-	if (_this->gl_config.dll_handle != NULL) {
++	if (_this->gl_config.dll_handle != 0) {
+ 		void *location = NULL;
+ 		status_t err;
+-		if ((err = get_image_symbol((image_id)_this->gl_config.dll_handle, proc, B_SYMBOL_TYPE_ANY, &location)) == B_OK) {
++		if ((err = get_image_symbol(_this->gl_config.dll_handle, proc, B_SYMBOL_TYPE_ANY, &location)) == B_OK) {
+ 			return location;
+ 		} else {
+ 			SDL_SetError("Couldn't find OpenGL symbol");
+@@ -835,8 +831,8 @@ void BE_VideoQuit(_THIS)
+ 	}
+ 
+ #if SDL_VIDEO_OPENGL
+-	if (_this->gl_config.dll_handle != NULL)
+-		unload_add_on((image_id)_this->gl_config.dll_handle);
++	if (_this->gl_config.dll_handle != 0)
++		unload_add_on(_this->gl_config.dll_handle);
+ #endif
+ 
+ 	SDL_QuitBeApp();
+diff --git a/src/video/bwindow/SDL_sysyuv.cc b/src/video/bwindow/SDL_sysyuv.cc
+index 7c71b00..f2fef10 100644
+--- a/src/video/bwindow/SDL_sysyuv.cc
++++ b/src/video/bwindow/SDL_sysyuv.cc
+@@ -66,7 +66,8 @@ BBitmap * BE_GetOverlayBitmap(BRect bounds, color_space cs) {
+ 		uint32 aligned_height = r.source.height_alignment + 1;
+ 		if (height % aligned_height > 0) {
+ 			fprintf(stderr,"GetOverlayBitmap failed height alignment\n");
+-			fprintf(stderr,"- height = %lu, aligned_height = %lu\n",height,aligned_height);
++			fprintf(stderr,"- height = %" B_PRIu32 ", "
++				"aligned_height = %" B_PRIu32 "\n", height, aligned_height);
+ 			delete bbitmap;
+ 			return 0;
+ 		}
+-- 
+Jonathan
+

From 670cb5e9ae81c0d1bf5e3205ea1a2258edf4c397 Mon Sep 17 00:00:00 2001
From: Adrien Destugues <pulkomandy@pulkomandy.tk>
Date: Fri, 28 Mar 2014 21:46:42 +0100
Subject: [PATCH 21/43] Tar: fix gcc2 build.

---
 app-arch/tar/patches/tar-1.27.1.patchset | 38 +++++++++++++++++++-----
 app-arch/tar/tar-1.27.1.recipe           |  4 +--
 2 files changed, 32 insertions(+), 10 deletions(-)

diff --git a/app-arch/tar/patches/tar-1.27.1.patchset b/app-arch/tar/patches/tar-1.27.1.patchset
index 12d248294..0af126885 100644
--- a/app-arch/tar/patches/tar-1.27.1.patchset
+++ b/app-arch/tar/patches/tar-1.27.1.patchset
@@ -1,13 +1,8 @@
-From 5601acb5afe236cc83a2577a5fb36ef478944bab Mon Sep 17 00:00:00 2001
+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: [PATCH] Patches from tar-1.26
+Subject: Patches from tar-1.26
 
----
- src/common.h  |  2 ++
- src/extract.c | 41 +++++++++++++++++++++++++++++++++++++++++
- src/tar.c     |  7 +++++++
- 3 files changed, 50 insertions(+)
 
 diff --git a/src/common.h b/src/common.h
 index 42fd539..633ca19 100644
@@ -121,5 +116,32 @@ index 4f5017d..2dd5200 100644
    owner_option = -1; owner_name_option = NULL;
    group_option = -1; group_name_option = NULL;
 -- 
-Jonathan
+1.8.3.4
+
+
+From 6f729d50ba6ca87c6cd33d87462884d90d4504c0 Mon Sep 17 00:00:00 2001
+From: Adrien Destugues <pulkomandy@pulkomandy.tk>
+Date: Fri, 28 Mar 2014 21:44:58 +0100
+Subject: gcc2 build fix.
+
+
+diff --git a/lib/wordsplit.h b/lib/wordsplit.h
+index b48e3cd..d286ffb 100644
+--- a/lib/wordsplit.h
++++ b/lib/wordsplit.h
+@@ -33,10 +33,8 @@ struct wordsplit
+   const char *ws_comment;
+   const char *ws_escape;
+   void (*ws_alloc_die) (struct wordsplit * wsp);
+-  void (*ws_error) (const char *, ...)
+-                   __attribute__ ((__format__ (__printf__, 1, 2)));
+-  void (*ws_debug) (const char *, ...)
+-                   __attribute__ ((__format__ (__printf__, 1, 2)));
++  void (*ws_error) (const char *, ...);
++  void (*ws_debug) (const char *, ...);
+ 
+   const char **ws_env;
+   const char *(*ws_getvar) (const char *, size_t, void *);
+-- 
+1.8.3.4
 
diff --git a/app-arch/tar/tar-1.27.1.recipe b/app-arch/tar/tar-1.27.1.recipe
index 3f42192c5..77263a76e 100644
--- a/app-arch/tar/tar-1.27.1.recipe
+++ b/app-arch/tar/tar-1.27.1.recipe
@@ -5,7 +5,7 @@ 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 \
+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).
@@ -19,7 +19,7 @@ CHECKSUM_MD5="490e074dd7e71f553df8357a7ef9bdcf"
 CHECKSUM_RMD160="a99ccfd874ac72c1e0feec2d86423c3e5bcd19fb"
 CHECKSUM_SHA512="f14a0a58e574db3aeec0914621aff2f0518b8d8acce81106b8219b36b3fed47349d6cb802c51a836a5e6889529337434d83b3c50cd7fc1801b9b3944eecc695b"
 REVISION="2"
-ARCHITECTURES="?x86_gcc2 ?x86 x86_64"
+ARCHITECTURES="x86_gcc2 ?x86 x86_64"
 
 PATCHES="tar-1.27.1.patchset"
 

From e889e9f58b241cda1282ec79e38dfa4fce185dc1 Mon Sep 17 00:00:00 2001
From: Jonathan Schleifer <js@webkeks.org>
Date: Fri, 28 Mar 2014 22:47:52 +0100
Subject: [PATCH 22/43] libogg: Add checksums

---
 media-libs/libogg/libogg-1.3.0.recipe | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/media-libs/libogg/libogg-1.3.0.recipe b/media-libs/libogg/libogg-1.3.0.recipe
index 2f2eb42e1..29e72e506 100644
--- a/media-libs/libogg/libogg-1.3.0.recipe
+++ b/media-libs/libogg/libogg-1.3.0.recipe
@@ -19,7 +19,10 @@ HOMEPAGE="http://www.xiph.org"
 LICENSE="BSD (3-clause)"
 COPYRIGHT="1994-2011 Xiph.Org Foundation"
 SRC_URI="http://downloads.xiph.org/releases/ogg/libogg-1.3.0.tar.gz"
+CHECKSUM_SIZE="425144"
 CHECKSUM_MD5="0a7eb40b86ac050db3a789ab65fe21c2"
+CHECKSUM_RMD160="143fa1639ee2175a6609f32287414d6b23deea6f"
+CHECKSUM_SHA512="4861d7f61a6e7be289676f642a20c547e883fc6a14609387b0e1662b9b1b7ead76aa697e0542bbc85fd61bce28d0b2182fd35926d858afee976f8f27f752bf8e"
 REVISION="2"
 ARCHITECTURES="x86_gcc2 x86 x86_64"
 SECONDARY_ARCHITECTURES="x86_gcc2 x86"

From 3d96d6b13e5f460cde1ef52541c2067da2896ea7 Mon Sep 17 00:00:00 2001
From: Jonathan Schleifer <js@webkeks.org>
Date: Fri, 28 Mar 2014 22:52:22 +0100
Subject: [PATCH 23/43] flac: Add checksums

---
 media-libs/flac/flac-1.3.0.recipe | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/media-libs/flac/flac-1.3.0.recipe b/media-libs/flac/flac-1.3.0.recipe
index 820fe16ce..adfc5d752 100644
--- a/media-libs/flac/flac-1.3.0.recipe
+++ b/media-libs/flac/flac-1.3.0.recipe
@@ -9,7 +9,10 @@ stereo) just like you would an MP3 file.
 "
 HOMEPAGE="http://flac.sourceforge.net/" 
 SRC_URI="http://downloads.xiph.org/releases/flac/flac-1.3.0.tar.xz"
+CHECKSUM_SIZE="1084256"
 CHECKSUM_MD5="13b5c214cee8373464d3d65dee362cdd"
+CHECKSUM_RMD160="6ced4a7ab2f1b0e583830b0ddc37a842703ee4c9"
+CHECKSUM_SHA512="9f62a83c2041ec6f02c0df65b796a920a0cd6ba6c2c034bb69535bca5df57ed69f96fe4bb41c0d5ccc229241d90efd2c7ec3785662b5a582a8e20e2e991e6477"
 REVISION="1"
 
 LICENSE="GNU LGPL v2.1

From cbfbe34534854196c085a479534ccd26e74f2cbc Mon Sep 17 00:00:00 2001
From: Jonathan Schleifer <js@webkeks.org>
Date: Fri, 28 Mar 2014 23:01:36 +0100
Subject: [PATCH 24/43] libmad: Add checksums

---
 media-libs/libmad/libmad-0.15.1b.recipe | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/media-libs/libmad/libmad-0.15.1b.recipe b/media-libs/libmad/libmad-0.15.1b.recipe
index 1bb2dc0aa..20c12c3b1 100644
--- a/media-libs/libmad/libmad-0.15.1b.recipe
+++ b/media-libs/libmad/libmad-0.15.1b.recipe
@@ -7,7 +7,10 @@ MP3) -- are fully implemented.
 "
 HOMEPAGE="http://mad.sourceforge.net/" 
 SRC_URI="ftp://ftp.mars.org/pub/mpeg/libmad-0.15.1b.tar.gz"
+CHECKSUM_SIZE="502379"
 CHECKSUM_MD5="1be543bc30c56fb6bea1d7bf6a64e66c"
+CHECKSUM_RMD160="0f3415ee10b188681e282ca69dec74c46ca73b0f"
+CHECKSUM_SHA512="2cad30347fb310dc605c46bacd9da117f447a5cabedd8fefdb24ab5de641429e5ec5ce8af7aefa6a75a3f545d3adfa255e3fa0a2d50971f76bc0c4fc0400cc45"
 LICENSE="GNU GPL v2"
 COPYRIGHT="2000-2004 Underbit Technologies, Inc."
 REVISION="1"

From d80ca829e9a827f0049f812d63051f19309ec443 Mon Sep 17 00:00:00 2001
From: Jonathan Schleifer <js@webkeks.org>
Date: Fri, 28 Mar 2014 23:05:09 +0100
Subject: [PATCH 25/43] libvorbis: Add checksums

---
 media-libs/libvorbis/libvorbis-1.3.2.recipe | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/media-libs/libvorbis/libvorbis-1.3.2.recipe b/media-libs/libvorbis/libvorbis-1.3.2.recipe
index 91e28d8bf..62a694e50 100644
--- a/media-libs/libvorbis/libvorbis-1.3.2.recipe
+++ b/media-libs/libvorbis/libvorbis-1.3.2.recipe
@@ -14,7 +14,10 @@ HOMEPAGE="http://www.xiph.org/vorbis/"
 LICENSE="BSD (3-clause)"
 COPYRIGHT="1994-2010 Xiph.Org Foundation"
 SRC_URI="http://downloads.xiph.org/releases/vorbis/libvorbis-1.3.2.tar.gz"
+CHECKSUM_SIZE="1483719"
 CHECKSUM_MD5="c870b9bd5858a0ecb5275c14486d9554"
+CHECKSUM_RMD160="90636428d1e83531b948e4823413504162004790"
+CHECKSUM_SHA512="f8f0ecaafca40bb577f78b4478c4f2217b9f7b470de5ef44affef95ea7b40877aa1693a6edffab3b9f737d1d6344267fdbb5f808bd0d636850d9b7f20d86c12f"
 REVISION="2"
 ARCHITECTURES="x86_gcc2 x86 x86_64"
 SECONDARY_ARCHITECTURES="x86_gcc2 x86"

From 809f4c221bf9d1a1772ebc63c7c9207aa8442022 Mon Sep 17 00:00:00 2001
From: Jonathan Schleifer <js@webkeks.org>
Date: Fri, 28 Mar 2014 23:11:40 +0100
Subject: [PATCH 26/43] libmikmod: Add checksums

---
 media-libs/libmikmod/libmikmod-3.3.3.recipe | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/media-libs/libmikmod/libmikmod-3.3.3.recipe b/media-libs/libmikmod/libmikmod-3.3.3.recipe
index 3840f27ed..97f96119c 100644
--- a/media-libs/libmikmod/libmikmod-3.3.3.recipe
+++ b/media-libs/libmikmod/libmikmod-3.3.3.recipe
@@ -4,7 +4,10 @@ libmikmod is a library supporting many formats, including mod, s3m, it, and xm.
 "
 HOMEPAGE="http://mikmod.sourceforge.net" 
 SRC_URI="http://sourceforge.net/projects/mikmod/files/libmikmod/3.3.3/libmikmod-3.3.3.tar.gz"
+CHECKSUM_SIZE="1255740"
 CHECKSUM_MD5="0e0f9bce8f8e598ca292b41e0ae385c8"
+CHECKSUM_RMD160="a114d28d1ce084b3c8262079002615c1ddb18138"
+CHECKSUM_SHA512="062739d54cb2bb9b6b92be2945288d2b94a2ab2225efda7b5f901d71e5c146fda74ed302c26237f18c8385ebcf90e90a0da599bd204208794c8b37aea2b5cba4"
 LICENSE="GNU LGPL v2.1"
 COPYRIGHT="1998-2004 Jean-Paul Mikkers, Jake Stine, Frank Loemker, Steve McIntyre, Peter Amstutz, and Miodrag Vallat."
 REVISION="2"

From 5464db00175892a85452550c2360c3174575a051 Mon Sep 17 00:00:00 2001
From: Jonathan Schleifer <js@webkeks.org>
Date: Fri, 28 Mar 2014 23:36:52 +0100
Subject: [PATCH 27/43] smpeg: Fix multiple issues

* Fix SECONDARY_ARCHITECTURES
* Enable x86_64
* Download ZIP file instead of checkout via SVN
 -> No SVN dependency anymore
* Add checksums
---
 media-libs/smpeg/smpeg-0.4.5.recipe | 11 ++++++++---
 1 file changed, 8 insertions(+), 3 deletions(-)

diff --git a/media-libs/smpeg/smpeg-0.4.5.recipe b/media-libs/smpeg/smpeg-0.4.5.recipe
index 3ad3c54f6..d7525866a 100644
--- a/media-libs/smpeg/smpeg-0.4.5.recipe
+++ b/media-libs/smpeg/smpeg-0.4.5.recipe
@@ -6,13 +6,16 @@ since only the MPEG-1 standard is unencumbered with software patents in the \
 United States.
 "
 HOMEPAGE="http://www.icculus.org/smpeg" 
-SRC_URI="svn://svn.icculus.org/smpeg/tags/release_0_4_5"
+SRC_URI="http://www.libsdl.org/projects/SDL_mixer/libs/old/smpeg-0.4.5.zip"
+CHECKSUM_SIZE="864203"
+CHECKSUM_RMD160="8f95eb421fe67943074e8d7b5d1509fff2ca843b"
+CHECKSUM_SHA512="9e9e3d614c2f7d3915ceece9847c840df07d9f9dddad58701c1d3e440628bcfcf87f54c94d727087975fa34be50262396df0710d6fe590dd682b15b93a9dfcf6"
 LICENSE="GNU LGPL v2"
 COPYRIGHT="1999-2004 Sam Lantinga, Joe Tennies."
 REVISION="2"
 
-ARCHITECTURES="x86 x86_gcc2"
-SECONDARY_ARCHITECTURES="x86_gcc2 x86 ?x86_64"
+ARCHITECTURES="x86 x86_gcc2 x86_64"
+SECONDARY_ARCHITECTURES="x86"
 
 PROVIDES="
 	smpeg$secondaryArchSuffix = 0.4.5 compat >= 0
@@ -56,8 +59,10 @@ BUILD()
 	aclocal --install -I acinclude
 	automake --foreign --add-missing
 	autoconf
+	chmod +x configure
 
 	runConfigure ./configure
+
 	make $jobArgs
 }
 

From 5630808b60cd9b07da6478a9f9e0caf91f452b2c Mon Sep 17 00:00:00 2001
From: Jonathan Schleifer <js@webkeks.org>
Date: Fri, 28 Mar 2014 23:48:05 +0100
Subject: [PATCH 28/43] sdl_net: Fix multiple issues

* Fix SECONDARY_ARCHITECTURES
* Enable x86_64
* Add checksums
---
 media-libs/sdl_net/sdl_net-1.2.8.recipe | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/media-libs/sdl_net/sdl_net-1.2.8.recipe b/media-libs/sdl_net/sdl_net-1.2.8.recipe
index 274a831ca..7bc5a55f3 100644
--- a/media-libs/sdl_net/sdl_net-1.2.8.recipe
+++ b/media-libs/sdl_net/sdl_net-1.2.8.recipe
@@ -4,12 +4,15 @@ This is a small simple cross-platform networking library for SDL.
 "
 HOMEPAGE="http://www.libsdl.org/projects/SDL_net" 
 SRC_URI="http://www.libsdl.org/projects/SDL_net/release/SDL_net-1.2.8.tar.gz"
+CHECKSUM_SIZE="360958"
 CHECKSUM_MD5="20e64e61d65662db66c379034f11f718"
+CHECKSUM_RMD160="44262f5d4c68c9b525fce04ebe83e03cd7e005a4"
+CHECKSUM_SHA512="2766ca55343127c619958ab3a3ae3052a27a676839f10a158f7dfc071b8db38c2f1fc853e8add32b9fef94ab07eaa986f46a68e264e8087b57c990af30ea9a0b"
 LICENSE="Zlib"
 COPYRIGHT="1997-2012 Sam Lantinga"
 REVISION="3"
-ARCHITECTURES="x86 x86_gcc2"
-SECONDARY_ARCHITECTURES="x86_gcc2 x86 x86_64"
+ARCHITECTURES="x86 x86_gcc2 x86_64"
+SECONDARY_ARCHITECTURES="x86"
 
 PROVIDES="
 	sdl_net$secondaryArchSuffix = $portVersion

From b8cd718c7ea5fe2b4b5a2928310bd9058e71df8b Mon Sep 17 00:00:00 2001
From: Jonathan Schleifer <js@webkeks.org>
Date: Sat, 29 Mar 2014 13:57:37 +0100
Subject: [PATCH 29/43] vim: Add cmd:vi

As we have no package providing vi, vim should provide it.
---
 app-editors/vim/vim-7.4.recipe | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/app-editors/vim/vim-7.4.recipe b/app-editors/vim/vim-7.4.recipe
index 4b5a8c300..4da705df8 100644
--- a/app-editors/vim/vim-7.4.recipe
+++ b/app-editors/vim/vim-7.4.recipe
@@ -14,7 +14,7 @@ HOMEPAGE="http://www.vim.org"
 SRC_URI="ftp://ftp.vim.org/pub/vim/unix/vim-7.4.tar.bz2"
 COPYRIGHT="Bram Moleenar et al."
 LICENSE="Vim"
-REVISION="1"
+REVISION="2"
 CHECKSUM_SIZE="9843297"
 CHECKSUM_MD5="607e135c559be642f210094ad023dc65"
 CHECKSUM_RMD160="f23f62dccdbf84cbf907a0cd38c7077a87e764ee"
@@ -31,6 +31,7 @@ PROVIDES="
 	cmd:rgvim = $portVersion
 	cmd:rview = $portVersion
 	cmd:rvim = $portVersion
+	cmd:vi = $portVersion
 	cmd:vim = $portVersion
 	cmd:vimdiff = $portVersion
 	cmd:vimtutor = $portVersion
@@ -77,4 +78,6 @@ INSTALL()
 
 	# Make arrow keys, backspace, delete, etc behave as expected.
 	echo "set nocompatible" > $dataDir/vim/vimrc
+
+	ln -s vim $binDir/vi
 }

From 8b23273f9e536eed9c3f85e5a01e427e41e2ae78 Mon Sep 17 00:00:00 2001
From: Adrien Destugues <pulkomandy@pulkomandy.tk>
Date: Sat, 29 Mar 2014 12:22:39 +0100
Subject: [PATCH 30/43] Cleanups

* Remove some old non-recipes
* Add missing cmd:awk to some packages
---
 app-arch/cpio/cpio-2.10.recipe            |  5 +----
 haiku-apps/clockwerk/clockwerk-78.recipe  | 26 -----------------------
 media-libs/libvpx/libvpx-1.0.0.recipe     |  1 +
 media-video/ffmpeg/ffmpeg-0.10.2.recipe   |  3 ++-
 sys-devel/autoconf/autoconf-2.67xz.recipe | 22 -------------------
 sys-libs/glu/glu-9.0.0.recipe             |  1 +
 6 files changed, 5 insertions(+), 53 deletions(-)
 delete mode 100644 haiku-apps/clockwerk/clockwerk-78.recipe
 delete mode 100644 sys-devel/autoconf/autoconf-2.67xz.recipe

diff --git a/app-arch/cpio/cpio-2.10.recipe b/app-arch/cpio/cpio-2.10.recipe
index a5c32ef12..58c3e08e3 100644
--- a/app-arch/cpio/cpio-2.10.recipe
+++ b/app-arch/cpio/cpio-2.10.recipe
@@ -35,10 +35,7 @@ BUILD_REQUIRES="
 	"
 
 BUILD_PREREQUIRES="
-#	cmd:aclocal
-#	cmd:autoconf
-#	cmd:gettext
-#	cmd:libtoolize
+	cmd:awk
 	cmd:make
 	cmd:gcc
 	cmd:ld
diff --git a/haiku-apps/clockwerk/clockwerk-78.recipe b/haiku-apps/clockwerk/clockwerk-78.recipe
deleted file mode 100644
index 8a47f0b94..000000000
--- a/haiku-apps/clockwerk/clockwerk-78.recipe
+++ /dev/null
@@ -1,26 +0,0 @@
-DESCRIPTION="
-Clockwerk is a multi-track audio/video compositing and animation software.
-"
-HOMEPAGE="http://dev.osdrawer.net/projects/clockwerk" 
-SRC_URI="svn+http://svn.osdrawer.net/clockwerk#78"
-REVISION="1"
-STATUS_HAIKU="stable"
-DEPEND=""
-#CHECKSUM_MD5=""
-BUILD()
-{
-	cd clockwerk-78
-	jam
-}
-
-INSTALL()
-{
-       cd clockwerk-78
-       mkdir -p ${DESTDIR}/`finddir B_APPS_DIRECTORY`/Clockwerk
-       cp generated/distro-haiku/* ${DESTDIR}/`finddir B_APPS_DIRECTORY`/Clockwerk
-}
-
-LICENSE="GNU GPL v2"
-COPYRIGHT="2002-2010 Stephan Aßmus
-	2005-2006 Axel Dörfler
-	2006-2009 Ingo Weinhold"
diff --git a/media-libs/libvpx/libvpx-1.0.0.recipe b/media-libs/libvpx/libvpx-1.0.0.recipe
index e0f70756b..be74dafaf 100644
--- a/media-libs/libvpx/libvpx-1.0.0.recipe
+++ b/media-libs/libvpx/libvpx-1.0.0.recipe
@@ -43,6 +43,7 @@ BUILD_PREREQUIRES="
 	haiku${secondaryArchSuffix}_devel >= $haikuVersion
 	cmd:gcc$secondaryArchSuffix
 	cmd:ld$secondaryArchSuffix
+	cmd:awk
 	cmd:make
 	cmd:perl
 	cmd:yasm
diff --git a/media-video/ffmpeg/ffmpeg-0.10.2.recipe b/media-video/ffmpeg/ffmpeg-0.10.2.recipe
index e3faca548..e5d43bf1d 100644
--- a/media-video/ffmpeg/ffmpeg-0.10.2.recipe
+++ b/media-video/ffmpeg/ffmpeg-0.10.2.recipe
@@ -18,7 +18,7 @@ REVISION="5"
 ARCHITECTURES="x86_gcc2 x86 x86_64"
 SECONDARY_ARCHITECTURES="x86_gcc2 x86"
 
-if [ $targetArchitecture == x86_gcc2 ]; then
+if [ $effectiveTargetArchitecture == x86_gcc2 ]; then
 	PATCHES="ffmpeg-0.10.2-gcc2.patch"
 fi
 
@@ -65,6 +65,7 @@ BUILD_PREREQUIRES="
 	haiku${secondaryArchSuffix}_devel >= $haikuVersion
 	cmd:gcc$secondaryArchSuffix
 	cmd:ld$secondaryArchSuffix
+	cmd:awk
 	cmd:make
 	cmd:perl
 	cmd:pkg_config
diff --git a/sys-devel/autoconf/autoconf-2.67xz.recipe b/sys-devel/autoconf/autoconf-2.67xz.recipe
deleted file mode 100644
index f83fde14b..000000000
--- a/sys-devel/autoconf/autoconf-2.67xz.recipe
+++ /dev/null
@@ -1,22 +0,0 @@
-DESCRIPTION="autoconf - Used to create autoconfiguration files" 
-HOMEPAGE="http://www.gnu.org/software/autoconf/" 
-SRC_URI="http://ftpmirror.gnu.org/autoconf/autoconf-2.67.tar.xz"
-CHECKSUM_MD5="1da24eebe4e6a774e4039242a4f06aad"
-REVISION="1"
-STATUS_HAIKU="stable"
-DEPEND=""
-BUILD()
-{
-	cd autoconf-2.67
-	./configure --prefix=`finddir B_COMMON_DIRECTORY`
-	make
-}
-
-INSTALL()
-{
-	cd autoconf-2.67
-	make install
-}
-LICENSE="GNU GPL v2
-	GNU GPL v3"
-COPYRIGHT="1992-2010 Free Software Foundation, Inc."
diff --git a/sys-libs/glu/glu-9.0.0.recipe b/sys-libs/glu/glu-9.0.0.recipe
index c60a8cb72..ba75ab120 100644
--- a/sys-libs/glu/glu-9.0.0.recipe
+++ b/sys-libs/glu/glu-9.0.0.recipe
@@ -26,6 +26,7 @@ BUILD_REQUIRES="
 BUILD_PREREQUIRES="
 	cmd:gcc$secondaryArchSuffix
 	cmd:ld$secondaryArchSuffix
+	cmd:awk
 	cmd:make
 	cmd:sed
 	"

From 1b4362ee055b1631c9dd60f0ec07967f8b16d80b Mon Sep 17 00:00:00 2001
From: Adrien Destugues <pulkomandy@pulkomandy.tk>
Date: Sun, 30 Mar 2014 12:31:43 +0200
Subject: [PATCH 31/43] htmltidy: turn bep into recipe.

---
 app-text/htmltidy/htmltidy-20092812.recipe    | 51 ++++++++++++--
 .../htmltidy/patches/htmltidy-20092812.patch  | 69 -------------------
 2 files changed, 46 insertions(+), 74 deletions(-)
 delete mode 100644 app-text/htmltidy/patches/htmltidy-20092812.patch

diff --git a/app-text/htmltidy/htmltidy-20092812.recipe b/app-text/htmltidy/htmltidy-20092812.recipe
index 8a584fc01..4f46dd7eb 100644
--- a/app-text/htmltidy/htmltidy-20092812.recipe
+++ b/app-text/htmltidy/htmltidy-20092812.recipe
@@ -1,18 +1,59 @@
+SUMMARY="Tidy the layout and correct errors in HTML and XML documents." 
 DESCRIPTION="htmltidy - Tidy the layout and correct errors in HTML and XML documents." 
 HOMEPAGE="http://tidy.sourceforge.net/" 
 SRC_URI="cvs://:pserver:anonymous@tidy.cvs.sourceforge.net:/cvsroot/tidy/tidy#12/28/2009"
 REVISION="1"
-STATUS_HAIKU="stable"
-DEPEND=""
 LICENSE="MIT"
 COPYRIGHT="1998-2008 World Wide Web Consortium"
+ARCHITECTURES="x86_gcc2"
+
+PROVIDES="
+	htmltydy = $portVersion
+	cmd:tab2space
+	cmd:tidy
+	lib:libtidy_0.99
+	lib:libtidy
+	"
+
+REQUIRES="
+	haiku$secondaryArchSuffix >= $haikuVersion
+	"
+
+BUILD_REQUIRES="
+	haiku${secondaryArchSuffix}_devel >= $haikuVersion
+	"
+
+BUILD_PREREQUIRES="
+	cmd:gcc$secondaryArchsuffix
+	cmd:as$secondaryArchSuffix
+	cmd:make
+	cmd:libtoolize
+	cmd:autoconf
+	"
+
+PATCHES="$portName-$portVersion.patchset"
 BUILD()
 {
-	cd htmltidy-20092812/build/gmake
+	/bin/sh build/gnuauto/setup.sh
+	runConfigure ./configure
 	make
 }
 INSTALL()
 {
-	cd htmltidy-20092812/build/gmake
-	make installexes installhdrs installib
+	make install
+	prepareInstalledDevelLibs libtidy
+	packageEntries devel $developDir
 }
+TEST()
+{
+	cd test
+	sh testall.sh
+}
+
+PROVIDES_devel="
+	devel:libtidy
+	"
+
+REQUIRES_devel="
+	htmltidy == $portVersion base
+	"
diff --git a/app-text/htmltidy/patches/htmltidy-20092812.patch b/app-text/htmltidy/patches/htmltidy-20092812.patch
deleted file mode 100644
index 66e4c78a6..000000000
--- a/app-text/htmltidy/patches/htmltidy-20092812.patch
+++ /dev/null
@@ -1,69 +0,0 @@
-diff -up htmltidy-20092812/build/gmake/Makefile.orig htmltidy-20092812/build/gmake/Makefile
---- htmltidy-20092812/build/gmake/Makefile.orig	2008-03-22 15:13:38.035389440 -0600
-+++ htmltidy-20092812/build/gmake/Makefile	2010-05-18 13:58:13.713293824 -0600
-@@ -58,8 +58,13 @@ SHELL=/bin/sh
- PROJECT=tidy
- 
- # Installation variables.  Spaces OK, only dir create and file copy operations.
-+ifeq ($(shell uname), Haiku)
-+runinst_prefix=${DESTDIR}/boot/common
-+devinst_prefix=${DESTDIR}/boot/common
-+else
- runinst_prefix=/usr/local
- devinst_prefix=/usr/local
-+endif
- 
- bininst = ${runinst_prefix}/bin
- libinst = ${devinst_prefix}/lib
-@@ -93,7 +98,10 @@ DOCDIR = ${TOPDIR}/htmldoc
- CC= gcc
- CFLAGS= -g -pedantic -Wall -I $(INCDIR)
- # flags only supported with gcc 3.x
-+GCC_MAJOR= $(shell $(CC) -v 2>&1 | grep " version " | cut -d' ' -f3  | cut -d'.' -f1)
-+ifneq ($(GCC_MAJOR), 2)
- CFLAGS += -Wunused-parameter
-+endif
- 
- OTHERCFLAGS=
- OTHERCFLAGS+= -D_DEBUG=1
-diff -up htmltidy-20092812/include/platform.h.orig htmltidy-20092812/include/platform.h
---- htmltidy-20092812/include/platform.h.orig	2008-03-17 06:57:01.048758784 -0600
-+++ htmltidy-20092812/include/platform.h	2010-05-18 13:54:14.034865152 -0600
-@@ -296,6 +296,15 @@ extern "C" {
- #endif
- #endif
- 
-+/* Convenience defines for Haiku platforms */
-+
-+#if defined(__HAIKU__)
-+#define HAIKU_OS
-+#ifndef PLATFORM_NAME
-+#define PLATFORM_NAME "Haiku"
-+#endif
-+#endif
-+
- /* Convenience defines for Cygwin platforms */
- 
- #if defined(__CYGWIN__)
-@@ -417,7 +426,7 @@ extern "C" {
- #if PRESERVE_FILE_TIMES
- 
- #ifndef HAS_FUTIME
--#if defined(CYGWIN_OS) || defined(BE_OS) || defined(OS2_OS) || defined(HPUX_OS) || defined(SOLARIS_OS) || defined(LINUX_OS) || defined(BSD_BASED_OS) || defined(MAC_OS) || defined(__MSL__) || defined(IRIX_OS) || defined(AIX_OS) || defined(__BORLANDC__)
-+#if defined(CYGWIN_OS) || defined(BE_OS) || defined(HAIKU_OS) || defined(OS2_OS) || defined(HPUX_OS) || defined(SOLARIS_OS) || defined(LINUX_OS) || defined(BSD_BASED_OS) || defined(MAC_OS) || defined(__MSL__) || defined(IRIX_OS) || defined(AIX_OS) || defined(__BORLANDC__)
- #define HAS_FUTIME 0
- #else
- #define HAS_FUTIME 1
-@@ -513,10 +522,10 @@ extern "C" {
- 
- /* hack for gnu sys/types.h file which defines uint and ulong */
- 
--#if defined(BE_OS) || defined(SOLARIS_OS) || defined(BSD_BASED_OS) || defined(OSF_OS) || defined(IRIX_OS) || defined(AIX_OS)
-+#if defined(BE_OS) || defined(HAIKU_OS) || defined(SOLARIS_OS) || defined(BSD_BASED_OS) || defined(OSF_OS) || defined(IRIX_OS) || defined(AIX_OS)
- #include <sys/types.h>
- #endif
--#if !defined(HPUX_OS) && !defined(CYGWIN_OS) && !defined(MAC_OS_X) && !defined(BE_OS) && !defined(SOLARIS_OS) && !defined(BSD_BASED_OS) && !defined(OSF_OS) && !defined(IRIX_OS) && !defined(AIX_OS) && !defined(LINUX_OS)
-+#if !defined(HPUX_OS) && !defined(CYGWIN_OS) && !defined(MAC_OS_X) && !defined(BE_OS) && !defined(HAIKU_OS) && !defined(SOLARIS_OS) && !defined(BSD_BASED_OS) && !defined(OSF_OS) && !defined(IRIX_OS) && !defined(AIX_OS) && !defined(LINUX_OS)
- # undef uint
- typedef unsigned int uint;
- #endif

From 5e7594c66520fec37eb036be4d05b086dd628047 Mon Sep 17 00:00:00 2001
From: Adrien Destugues <pulkomandy@pulkomandy.tk>
Date: Sun, 30 Mar 2014 12:34:11 +0200
Subject: [PATCH 32/43] OpenJDK: try to make it work on hybrid installs

* Fails because of _get_system_info changes?
---
 .../openjdk/openjdk-1.7_2013_11_08.recipe     | 28 +++++++++++--------
 1 file changed, 17 insertions(+), 11 deletions(-)

diff --git a/dev-lang/openjdk/openjdk-1.7_2013_11_08.recipe b/dev-lang/openjdk/openjdk-1.7_2013_11_08.recipe
index 20d49c3ff..37b0ea8fd 100644
--- a/dev-lang/openjdk/openjdk-1.7_2013_11_08.recipe
+++ b/dev-lang/openjdk/openjdk-1.7_2013_11_08.recipe
@@ -43,7 +43,13 @@ SRC_URI_12="http://ports-space.haiku-files.org/source/openjdk/jdk7-jaxws2_2_4-b0
 CHECKSUM_MD5_12="2f5b829ade70f67fe272d0b322e3e702"
 
 REVISION="2"
-ARCHITECTURES="x86 !x86_gcc2"
+ARCHITECTURES="x86"
+if [ $effectiveTargetArchitecture != x86_gcc2 ]; then
+	# x86_gcc2 is fine as primary target architecture as long as we're building
+	# for a different secondary architecture.
+	ARCHITECTURES="$ARCHITECTURES !x86_gcc2"
+fi
+SECONDARY_ARCHITECTURES="x86"
 
 DISABLE_SOURCE_PACKAGE=yes
 	# at least as long as Ant and a complete SDK image are part of the sources
@@ -90,24 +96,24 @@ PROVIDES="
 	"
 
 REQUIRES="
-	haiku >= $haikuVersion
-	lib:libfreetype
-	lib:libiconv
-	lib:libz
+	haiku$secondaryArchSuffx >= $haikuVersion
+	lib:libfreetype$secondaryArchSuffix
+	lib:libiconv$secondaryArchSuffix
+	lib:libz$secondaryArchSuffix
 	"
 
 BUILD_REQUIRES="
-	haiku_devel >= $haikuVersion
-	devel:libfreetype
-	devel:libiconv
-	devel:libz
+	haiku${secondaryArchSuffix}_devel >= $haikuVersion
+	devel:libfreetype$secondaryArchSuffix
+	devel:libiconv$secondaryArchSuffix
+	devel:libz$secondaryArchSuffix
 	"
 
 BUILD_PREREQUIRES="
 	cmd:cpio >= 2.10
 	cmd:make
-	cmd:gcc
-	cmd:ld
+	cmd:gcc$secondaryArchSuffix
+	cmd:ld$secondaryArchSuffix
 	cmd:sed
 	cmd:tar
 	cmd:zip

From c484238c12f61f61f78b9c1122eebf2414d84e5e Mon Sep 17 00:00:00 2001
From: Adrien Destugues <pulkomandy@pulkomandy.tk>
Date: Sun, 30 Mar 2014 12:52:37 +0200
Subject: [PATCH 33/43] setuptools: turn bep into recipe and add latest version

* The SSL certificate for pipy seems broken, so wget won't download.
---
 dev-python/setuptools/setuptools-0.6.recipe   | 28 -----------------
 .../setuptools/setuptools-0.6c11.recipe       | 31 +++++++++++++++++++
 dev-python/setuptools/setuptools-3.3.recipe   | 31 +++++++++++++++++++
 3 files changed, 62 insertions(+), 28 deletions(-)
 delete mode 100644 dev-python/setuptools/setuptools-0.6.recipe
 create mode 100644 dev-python/setuptools/setuptools-0.6c11.recipe
 create mode 100644 dev-python/setuptools/setuptools-3.3.recipe

diff --git a/dev-python/setuptools/setuptools-0.6.recipe b/dev-python/setuptools/setuptools-0.6.recipe
deleted file mode 100644
index 36e7f49f0..000000000
--- a/dev-python/setuptools/setuptools-0.6.recipe
+++ /dev/null
@@ -1,28 +0,0 @@
-DESCRIPTION="
-Download, build, install, upgrade, and uninstall Python packages -- easily!
-"
-HOMEPAGE="http://pypi.python.org/pypi/setuptools"
-SRC_URI="http://pypi.python.org/packages/source/s/setuptools/setuptools-0.6c11.tar.gz"
-REVISION="1"
-STATUS_HAIKU="stable"
-DEPEND=""
-CHECKSUM_MD5="7df2a529a074f613b509fb44feefe74e"
-
-BUILD()
-{
-	cd setuptools-0.6c11
-	python setup.py build
-}
-
-INSTALL()
-{
-	cd setuptools-0.6c11
-	if [ -n "${DESTDIR}" ];then
-		python setup.py install --root=${DESTDIR}
-	else
-		python setup.py install
-	fi
-}
-
-LICENSE="Python"
-COPYRIGHT="2009, Phillip J. Eby"
diff --git a/dev-python/setuptools/setuptools-0.6c11.recipe b/dev-python/setuptools/setuptools-0.6c11.recipe
new file mode 100644
index 000000000..e3e2552d5
--- /dev/null
+++ b/dev-python/setuptools/setuptools-0.6c11.recipe
@@ -0,0 +1,31 @@
+SUMMARY="Download, build, (un)install, upgrade, Python packages"
+DESCRIPTION="
+Download, build, install, upgrade, and uninstall Python packages -- easily!
+"
+HOMEPAGE="http://pypi.python.org/pypi/setuptools"
+SRC_URI="https://pypi.python.org/packages/source/s/setuptools/setuptools-$portVersion.tar.gz"
+REVISION="1"
+CHECKSUM_MD5="87680a0eb0bb6f720d5e2d89ba67debc"
+
+ARCHITECTURES="!x86_gcc2"
+
+PROVIDES="
+	$portName = $portVersion
+	"
+
+BUILD_PREREQUIRES="
+	cmd:python
+	"
+
+BUILD()
+{
+	python setup.py build
+}
+
+INSTALL()
+{
+	python setup.py install --root=$portDir
+}
+
+LICENSE="Python"
+COPYRIGHT="2009-2014, Phillip J. Eby"
diff --git a/dev-python/setuptools/setuptools-3.3.recipe b/dev-python/setuptools/setuptools-3.3.recipe
new file mode 100644
index 000000000..e3e2552d5
--- /dev/null
+++ b/dev-python/setuptools/setuptools-3.3.recipe
@@ -0,0 +1,31 @@
+SUMMARY="Download, build, (un)install, upgrade, Python packages"
+DESCRIPTION="
+Download, build, install, upgrade, and uninstall Python packages -- easily!
+"
+HOMEPAGE="http://pypi.python.org/pypi/setuptools"
+SRC_URI="https://pypi.python.org/packages/source/s/setuptools/setuptools-$portVersion.tar.gz"
+REVISION="1"
+CHECKSUM_MD5="87680a0eb0bb6f720d5e2d89ba67debc"
+
+ARCHITECTURES="!x86_gcc2"
+
+PROVIDES="
+	$portName = $portVersion
+	"
+
+BUILD_PREREQUIRES="
+	cmd:python
+	"
+
+BUILD()
+{
+	python setup.py build
+}
+
+INSTALL()
+{
+	python setup.py install --root=$portDir
+}
+
+LICENSE="Python"
+COPYRIGHT="2009-2014, Phillip J. Eby"

From fc970ad4fc348a53c61c1ecc1efb5e9b570dc8cb Mon Sep 17 00:00:00 2001
From: Adrien Destugues <pulkomandy@pulkomandy.tk>
Date: Sun, 30 Mar 2014 12:53:33 +0200
Subject: [PATCH 34/43] Simpleparse: turn bep into recipe.

* Needs setuptools, so won't work for now...
---
 .../simpleparse/simpleparse-2.1.1a2.recipe    | 26 +++++++++++++++----
 1 file changed, 21 insertions(+), 5 deletions(-)

diff --git a/dev-python/simpleparse/simpleparse-2.1.1a2.recipe b/dev-python/simpleparse/simpleparse-2.1.1a2.recipe
index 673b4ba77..285aafad2 100644
--- a/dev-python/simpleparse/simpleparse-2.1.1a2.recipe
+++ b/dev-python/simpleparse/simpleparse-2.1.1a2.recipe
@@ -1,20 +1,36 @@
-DESCRIPTION="A Parser Generator for Python (w/mxTextTools derivative)"
+SUMMARY="A Parser Generator for Python (w/mxTextTools derivative)"
+DESCRIPTION="
+SimpleParse is a BSD-licensed Python package providing a simple and fast parser 
+generator using a modified version of the mxTextTools text-tagging engine.
+SimpleParse allows you to generate parsers directly from your EBNF grammar.
+Unlike most parser generators, SimpleParse generates single-pass parsers (there
+is no distinct tokenization stage), an approach taken from the predecessor
+project (mcf.pars) which attempted to create \"autonomously parsing regex
+objects\". The resulting parsers are not as generalized as those created by, for
+instance, the Earley algorithm, but they do tend to be useful for the parsing of
+computer file formats and the like (as distinct from natural language and
+similar \"hard\" parsing problems)."
 HOMEPAGE="http://simpleparse.sourceforge.net/"
 SRC_URI="http://downloads.sourceforge.net/project/simpleparse/simpleparse/2.1.1a2/SimpleParse-2.1.1a2.tar.gz"
 REVISION="1"
-STATUS_HAIKU="stable"
-DEPEND=""
+ARCHITECTURES="!x86_gcc2"
 CHECKSUM_MD5="9c4e13b4f9b087442f76e7382ba97e3b"
+PROVIDES="
+	simpleparse = $portVersion
+	"
 
+BUILD_PREREQUIRES="
+	cmd:python
+	"
+
+SOURCE_DIR="SimpleParse-$portVersion"
 BUILD()
 {
-	cd SimpleParse-2.1.1a2
 	python setup.py build
 }
 
 INSTALL()
 {
-	cd SimpleParse-2.1.1a2
 	python setup.py install --root=${DESTDIR}
 
 }

From ccb8d2f684e8809c60a055911ea80916eadf7994 Mon Sep 17 00:00:00 2001
From: Adrien Destugues <pulkomandy@pulkomandy.tk>
Date: Sun, 30 Mar 2014 13:08:33 +0200
Subject: [PATCH 35/43] jgmod: turn bep into recipe.

---
 media-libs/jgmod/jgmod-0.99.recipe | 59 +++++++++++++++++++++---------
 1 file changed, 42 insertions(+), 17 deletions(-)

diff --git a/media-libs/jgmod/jgmod-0.99.recipe b/media-libs/jgmod/jgmod-0.99.recipe
index a5b1bcb32..d3ec47365 100644
--- a/media-libs/jgmod/jgmod-0.99.recipe
+++ b/media-libs/jgmod/jgmod-0.99.recipe
@@ -1,16 +1,39 @@
-DESCRIPTION="jgmod is a MOD music playing add-on library for Allegro" 
+SUMMARY="jgmod is a MOD music playing add-on library for Allegro" 
+DESCRIPTION="
+JGMOD is a mod library for MOD musics. It is built on top of Allegro lower
+level digital sound routines. Currently supports MOD, S3M, XM, Unreal
+S3M (in UMX extension), and JGM under DJGPP, Mingw32, MSVC, Linux and BEOS.
+"
+
 HOMEPAGE="http://guan.is-a-geek.com/jgmod/jgmod.html" 
 COPYRIGHT="1997-2002 Guan Foo Wah"
 LICENSE="JGMOD"
 SRC_URI="http://guan.is-a-geek.com/jgmod/jgmod.zip"
-REVISION="2"
-STATUS_HAIKU="stable"
-DEPEND="media-libs/allegro >= 4.4"
 CHECKSUM_MD5="0e6e540ffadced9283251a7f86c106fe"
+REVISION="2"
+ARCHITECTURES="x86_gcc2"
 
+PROVIDES="
+	jgmod = $portVersion
+	lib:libjgmod
+	"
+REQUIRES="
+	lib:liballeg >= 4.4
+	"
+
+BUILD_REQUIRES="
+	haiku_devel >= $haikuVersion
+	devel:liballeg
+	"
+BUILD_PREREQUIRES="
+	cmd:find
+	cmd:gcc
+	cmd:make
+	"
+
+SOURCE_DIR="jgmod"
 BUILD()
 {
-	cd jgmod
 	chmod 777 ./fixbe.sh
 	./fixbe.sh
 	cd src
@@ -19,16 +42,18 @@ BUILD()
 
 INSTALL()
 {
-	cd jgmod/src
-    if [ -n ${DESTDIR} ];then
-		mkdir -p ${DESTDIR}/boot/common/lib
-		mkdir -p ${DESTDIR}/boot/common/include
-		make install \
-		CPLIBDEST=${DESTDIR}/boot/common/lib \
-		CPINCDEST=${DESTDIR}/boot/common/include
-	else
-		make install \
-		CPLIBDEST=/boot/common/lib \
-		CPINCDEST=/boot/common/include
-	fi
+	cd src
+	mkdir -p $libDir $includeDir
+	make install CPLIBDEST=$libDir CPINCDEST=$includeDir
+
+	prepareInstalledDevelLib libjgmod
+	packageEntries devel $developDir
 }
+
+PROVIDES_devel="
+	devel:libjgmod
+	"
+
+REQUIRES_devel="
+	jgmod == $portVersion base
+	"

From 767eee9630308cd4d438daae6d320be56042807a Mon Sep 17 00:00:00 2001
From: Adrien Destugues <pulkomandy@pulkomandy.tk>
Date: Sun, 30 Mar 2014 13:21:54 +0200
Subject: [PATCH 36/43] libid3tag: turn bep into recipe.

---
 media-libs/libid3tag/libid3tag-0.15.1b.recipe | 48 +++++++++++++++----
 .../patches/libid3tag-0.15.1b.patchset        | 22 +++++++++
 2 files changed, 61 insertions(+), 9 deletions(-)
 create mode 100644 media-libs/libid3tag/patches/libid3tag-0.15.1b.patchset

diff --git a/media-libs/libid3tag/libid3tag-0.15.1b.recipe b/media-libs/libid3tag/libid3tag-0.15.1b.recipe
index 207c25f23..278ddad20 100644
--- a/media-libs/libid3tag/libid3tag-0.15.1b.recipe
+++ b/media-libs/libid3tag/libid3tag-0.15.1b.recipe
@@ -1,32 +1,62 @@
+SUMMARY="The MAD id3tag library" 
 DESCRIPTION="The MAD id3tag library" 
 HOMEPAGE="http://www.underbit.com/products/mad/" 
-SRC_URI="ftp://ftp.mars.org/pub/mpeg/libid3tag-0.15.1b.tar.gz"
+SRC_URI="ftp://ftp.mars.org/pub/mpeg/$portName-$portVersion.tar.gz"
 REVISION="1"
-STATUS_HAIKU="stable"
-DEPEND=""
+ARCHITECTURES="x86_gcc2"
 CHECKSUM_MD5="e5808ad997ba32c498803822078748c3"
+
+PROVIDES="
+	$portName = $portVersion
+	lib:libid3tag = 0.3.0 compat = 0
+"
+
+REQUIRES="
+	haiku >= $haikuVersion
+	lib:libz
+	"
+
+BUILD_REQUIRES="
+	haiku_devel >= $haikuVersion
+	devel:libz
+	"
+BUILD_PREREQUIRES="
+	cmd:libtoolize
+	cmd:autoconf
+	cmd:make
+	cmd:gcc
+	"
+
+PATCHES="$portName-$portVersion.patchset"
 BUILD()
 {
-	cd libid3tag-0.15.1b
 	libtoolize --force --copy --install
 	aclocal
 	autoconf
-	./configure --prefix=`finddir B_COMMON_DIRECTORY`
+	runConfigure ./configure
 	make
 }
 
 INSTALL()
 {
-	cd libid3tag-0.15.1b
 	make install
+	prepareInstalledDevelLib libid3tag
+	packageEntries devel $developDir
 }
 
 TEST()
 {
-	cd libid3tag-0.15.1b
-#	make test
-#	make check
+	make test
+	make check
 }
 
 LICENSE="GNU GPL v2"
 COPYRIGHT="2000-2004 Underbit Technologies, Inc."
+
+PROVIDES_devel="
+	devel:libid3tag
+"
+
+REQUIRES_devel="
+	$portName == $portVersion base
+"
diff --git a/media-libs/libid3tag/patches/libid3tag-0.15.1b.patchset b/media-libs/libid3tag/patches/libid3tag-0.15.1b.patchset
new file mode 100644
index 000000000..bc3650265
--- /dev/null
+++ b/media-libs/libid3tag/patches/libid3tag-0.15.1b.patchset
@@ -0,0 +1,22 @@
+From 2e29df8743bf7230cc122b0a6a255f625e8f46a7 Mon Sep 17 00:00:00 2001
+From: Adrien Destugues <pulkomandy@pulkomandy.tk>
+Date: Sun, 30 Mar 2014 13:20:55 +0200
+Subject: AM_CONFIG_HEADER > AC_CONFIG_HEADER
+
+
+diff --git a/configure.ac b/configure.ac
+index a0a0237..a754f06 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -28,7 +28,7 @@ AC_CONFIG_SRCDIR([id3tag.h])
+ 
+ AM_INIT_AUTOMAKE
+ 
+-AM_CONFIG_HEADER([config.h])
++AC_CONFIG_HEADER([config.h])
+ 
+ dnl System type.
+ 
+-- 
+1.8.3.4
+

From b3e25e481e6b21beb5ca2352db8ce21c9c30732e Mon Sep 17 00:00:00 2001
From: Jonathan Schleifer <js@webkeks.org>
Date: Fri, 28 Mar 2014 22:45:38 +0100
Subject: [PATCH 37/43] sdl_mixer: Add checksums

---
 media-libs/sdl_mixer/sdl_mixer-1.2.12.recipe | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/media-libs/sdl_mixer/sdl_mixer-1.2.12.recipe b/media-libs/sdl_mixer/sdl_mixer-1.2.12.recipe
index 79a16be82..691545f73 100644
--- a/media-libs/sdl_mixer/sdl_mixer-1.2.12.recipe
+++ b/media-libs/sdl_mixer/sdl_mixer-1.2.12.recipe
@@ -7,7 +7,10 @@ Ogg Vorbis, and SMPEG MP3 libraries.
 "
 HOMEPAGE="http://www.libsdl.org/projects/SDL_mixer/" 
 SRC_URI="http://www.libsdl.org/projects/SDL_mixer/release/SDL_mixer-1.2.12.tar.gz"
+CHECKSUM_SIZE="3707781"
 CHECKSUM_MD5="e03ff73d77a55e3572ad0217131dc4a1"
+CHECKSUM_RMD160="99089725824095398bfb34fd9ccb7c16674192d8"
+CHECKSUM_SHA512="230f6c5a73f4bea364f8aa3d75f76694305571dea45f357def742b2b50849b2d896af71e08689981207edc99a9836088bee2d0bd98d92c7f4ca52b12b3d8cf96"
 LICENSE="Zlib"
 COPYRIGHT="1997-2012 Sam Lantinga"
 REVISION="2"

From 41477098fa638d18e1471d211f2a526c9962c37a Mon Sep 17 00:00:00 2001
From: Jonathan Schleifer <js@webkeks.org>
Date: Fri, 28 Mar 2014 23:53:47 +0100
Subject: [PATCH 38/43] Fix provides of sdl_{net,mixer}_devel

---
 media-libs/sdl_mixer/sdl_mixer-1.2.12.recipe | 3 +--
 media-libs/sdl_net/sdl_net-1.2.8.recipe      | 4 ++--
 2 files changed, 3 insertions(+), 4 deletions(-)

diff --git a/media-libs/sdl_mixer/sdl_mixer-1.2.12.recipe b/media-libs/sdl_mixer/sdl_mixer-1.2.12.recipe
index 691545f73..676e7c947 100644
--- a/media-libs/sdl_mixer/sdl_mixer-1.2.12.recipe
+++ b/media-libs/sdl_mixer/sdl_mixer-1.2.12.recipe
@@ -13,7 +13,7 @@ CHECKSUM_RMD160="99089725824095398bfb34fd9ccb7c16674192d8"
 CHECKSUM_SHA512="230f6c5a73f4bea364f8aa3d75f76694305571dea45f357def742b2b50849b2d896af71e08689981207edc99a9836088bee2d0bd98d92c7f4ca52b12b3d8cf96"
 LICENSE="Zlib"
 COPYRIGHT="1997-2012 Sam Lantinga"
-REVISION="2"
+REVISION="3"
 
 ARCHITECTURES="x86_gcc2 x86 x86_64"
 SECONDARY_ARCHITECTURES="x86_gcc2 x86"
@@ -92,7 +92,6 @@ INSTALL()
 }
 
 PROVIDES_devel="
-	sdl_mixer${secondaryArchSuffix}_devel = $portVersion compat >= 1.2
 	devel:sdl_mixer$secondaryArchSuffix = 1.2.12 compat >= 1.2
 	devel:libSDL_mixer$secondaryArchSuffix = 1.2_0.12.0 compat >= 0
 	devel:libSDL_mixer_1.2$secondaryArchSuffix = 0.12.0 compat >= 0
diff --git a/media-libs/sdl_net/sdl_net-1.2.8.recipe b/media-libs/sdl_net/sdl_net-1.2.8.recipe
index 7bc5a55f3..828e6fe1c 100644
--- a/media-libs/sdl_net/sdl_net-1.2.8.recipe
+++ b/media-libs/sdl_net/sdl_net-1.2.8.recipe
@@ -10,7 +10,7 @@ CHECKSUM_RMD160="44262f5d4c68c9b525fce04ebe83e03cd7e005a4"
 CHECKSUM_SHA512="2766ca55343127c619958ab3a3ae3052a27a676839f10a158f7dfc071b8db38c2f1fc853e8add32b9fef94ab07eaa986f46a68e264e8087b57c990af30ea9a0b"
 LICENSE="Zlib"
 COPYRIGHT="1997-2012 Sam Lantinga"
-REVISION="3"
+REVISION="4"
 ARCHITECTURES="x86 x86_gcc2 x86_64"
 SECONDARY_ARCHITECTURES="x86"
 
@@ -68,7 +68,7 @@ INSTALL()
 }
 
 PROVIDES_devel="
-	sdl_net${secondaryArchSuffix} = $portVersion compat >= 1.2
+	devel:sdl_net${secondaryArchSuffix} = $portVersion compat >= 1.2
 	devel:libSDL_net$secondaryArchSuffix = 1.2_0.8.0 compat >= 0
 	devel:libSDL_net_1.2$secondaryArchSuffix = 0.8.0 compat >= 0
 	"

From 080ca59ef704bb8f9080df6d2133e62d2bb4e6dd Mon Sep 17 00:00:00 2001
From: Jonathan Schleifer <js@webkeks.org>
Date: Sat, 29 Mar 2014 03:02:47 +0100
Subject: [PATCH 39/43] ca_root_certificates: Add checksums

---
 .../ca_root_certificates-2012_12_29.recipe                     | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/haiku-data/ca_root_certificates/ca_root_certificates-2012_12_29.recipe b/haiku-data/ca_root_certificates/ca_root_certificates-2012_12_29.recipe
index 815ebd115..6695d82d4 100644
--- a/haiku-data/ca_root_certificates/ca_root_certificates-2012_12_29.recipe
+++ b/haiku-data/ca_root_certificates/ca_root_certificates-2012_12_29.recipe
@@ -8,7 +8,10 @@ LICENSE="
 	GNU LGPL v2.1
 	"
 SRC_URI="http://haiku-files.org/files/data/cacert_121229.pem#noarchive"
+CHECKSUM_SIZE="251338"
 CHECKSUM_MD5="47961e7ef15667c93cd99be01b51f00a"
+CHECKSUM_RMD160="08216e8e327aa6fff0c8854ddb9e03c1e8dc062a"
+CHECKSUM_SHA512="a5405a2052fa5ea8a0aa832ad0848295d1fb38476b61c669f524c92b65ad16d28a2c9eb6a0658c284c7cebf06df3b7fb11c9f0a9c069e3061926dbac2492a671"
 REVISION="1"
 ARCHITECTURES="any"
 DISABLE_SOURCE_PACKAGE=yes

From e3c38db88f2923b15fedfbc4bbb8b66bb8d170c3 Mon Sep 17 00:00:00 2001
From: Jonathan Schleifer <js@webkeks.org>
Date: Mon, 31 Mar 2014 02:43:48 +0200
Subject: [PATCH 40/43] zsh: Add checksums

---
 app-shells/zsh/zsh-5.0.2.recipe | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/app-shells/zsh/zsh-5.0.2.recipe b/app-shells/zsh/zsh-5.0.2.recipe
index 75dcabf22..b46e50c56 100644
--- a/app-shells/zsh/zsh-5.0.2.recipe
+++ b/app-shells/zsh/zsh-5.0.2.recipe
@@ -8,7 +8,10 @@ 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_SIZE="3025767"
 CHECKSUM_MD5="b8f2ad691acf58b3252225746480dcad"
+CHECKSUM_RMD160="eea2328a28e9f022ab9f49583622a9c3bd6114a7"
+CHECKSUM_SHA512="096e9fee085bbcb88035984c28cc9d186ae549f9ab09d699f380438b82fcf09b03ac2e9635ddb3cef9d0f287403c10fd29d21ec18f79e8bfab63760db738a07d"
 REVISION="1"
 ARCHITECTURES="x86_gcc2 x86 x86_64"
 PATCHES="zsh-5.0.2.patchset"

From 3fd1f25111934016eef21bada8ec39d6f113e8f2 Mon Sep 17 00:00:00 2001
From: Jonathan Schleifer <js@webkeks.org>
Date: Mon, 31 Mar 2014 02:44:01 +0200
Subject: [PATCH 41/43] libpcre: Add checksums

---
 dev-libs/libpcre/libpcre-8.33.recipe | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/dev-libs/libpcre/libpcre-8.33.recipe b/dev-libs/libpcre/libpcre-8.33.recipe
index 354ac78a7..1d9810354 100644
--- a/dev-libs/libpcre/libpcre-8.33.recipe
+++ b/dev-libs/libpcre/libpcre-8.33.recipe
@@ -14,7 +14,10 @@ COPYRIGHT="
 	2007-2011, Google Inc. All rights reserved.
 	"
 SRC_URI="ftp://ftp.csx.cam.ac.uk/pub/software/programming/pcre/pcre-8.33.tar.bz2"
+CECKSUM_SIZE="1440869"
 CHECKSUM_MD5="21514018448ac10062ece7a668fca949"
+CHECKSUM_RMD160="de60ac0aaad1f04bc272f39136d9048b1adc9299"
+CHECKSUM_SHA512="12ff53127c549a37241a32ad22b6d0dd50eb3c44546c56f4ddd5dd3e23b0c71060d5b9d12583f9ad98354ff01804269a4d51b166561787014b820e4c72e2e599"
 REVISION="2"
 ARCHITECTURES="x86_gcc2 x86 x86_64"
 SECONDARY_ARCHITECTURES="x86 x86_gcc2"

From 1e90f548ce814afe2c789ddcb0fed128aa6b6691 Mon Sep 17 00:00:00 2001
From: Jerome Duval <jerome.duval@gmail.com>
Date: Mon, 31 Mar 2014 17:37:38 +0000
Subject: [PATCH 42/43] curl: recipe for version 7.36.0

---
 net-misc/curl/curl-7.36.0.recipe | 118 +++++++++++++++++++++++++++++++
 1 file changed, 118 insertions(+)
 create mode 100644 net-misc/curl/curl-7.36.0.recipe

diff --git a/net-misc/curl/curl-7.36.0.recipe b/net-misc/curl/curl-7.36.0.recipe
new file mode 100644
index 000000000..4bf3e0cd7
--- /dev/null
+++ b/net-misc/curl/curl-7.36.0.recipe
@@ -0,0 +1,118 @@
+SUMMARY="A commandline-tool and library for downloading data from URLs"
+HOMEPAGE="http://curl.haxx.se"
+COPYRIGHT="1996-2014, Daniel Stenberg, <daniel@haxx.se>. All rights reserved."
+LICENSE="Curl"
+SRC_URI="http://curl.haxx.se/download/curl-7.36.0.tar.bz2"
+CHECKSUM_SIZE="2809266"
+CHECKSUM_RMD160="864f0fe3a15f016cf79bf47172a2ae6a54e0cce4"
+CHECKSUM_SHA512="ae471d382c9c8f321a987e7a5a302abe7cb2cae4204ea65234b02c73303abef7c995c50ce8219bd90d762fa63006d50293e4350e78aee2c2086b6f7aec09b01a"
+REVISION="1"
+ARCHITECTURES="x86_gcc2 x86 x86_64"
+SECONDARY_ARCHITECTURES="x86_gcc2 x86"
+
+PATCHES=""
+
+PROVIDES="
+	curl$secondaryArchSuffix = $portVersion
+	lib:libcurl$secondaryArchSuffix = 4.2.0 compat >= 4
+	"
+if [ -z "$secondaryArchSuffix" ]; then
+	PROVIDES="$PROVIDES
+		cmd:curl = $portVersion compat >= 7.16
+		"
+fi
+
+REQUIRES="
+	haiku$secondaryArchSuffix >= $haikuVersion
+	ca_root_certificates
+	lib:libssl$secondaryArchSuffix
+	lib:libz$secondaryArchSuffix
+	"
+BUILD_REQUIRES="
+	devel:libssl$secondaryArchSuffix
+	devel:libz$secondaryArchSuffix
+	"
+BUILD_PREREQUIRES="
+	haiku${secondaryArchSuffix}_devel >= $haikuVersion
+	cmd:autoconf
+	cmd:gcc$secondaryArchSuffix
+	cmd:ld$secondaryArchSuffix
+	cmd:libtoolize
+	cmd:make
+	cmd:nroff
+	"
+
+BUILD()
+{
+	certsInstallDir="$portPackageLinksDir/ca_root_certificates"
+	certsDir="$certsInstallDir/$relativeDataRootDir/ssl"
+
+	libtoolize --force --copy --install
+	autoconf
+	runConfigure ./configure \
+		--enable-ipv6 --enable-manual \
+		--with-ca-bundle="$certsDir/CARootCertificates.pem"
+	make $jobArgs
+}
+
+INSTALL()
+{
+	make install
+
+	# prepare develop/lib
+	prepareInstalledDevelLibs libcurl
+	fixPkgconfig
+
+	# fix curl-config
+	fixDevelopLibDirReferences $binDir/curl-config
+	sed -i -e "s,--libexecdir=$developLibDir,--libexecdir=$libExecDir,g" \
+		-e "s,--libdir=$developLibDir,--libdir=$libDir,g" $binDir/curl-config
+
+	# install html documentation for curl
+	mkdir -p "$docDir"
+	install -c -m 644 "docs/curl.html" "$docDir"
+
+	# install html development documentation for libcurl
+	mkdir -p "$developDocDir"
+	for h in docs/libcurl/*.html; do 
+		install -c -m 644 "$h" "$developDocDir"
+	done
+
+	# devel package
+	packageEntries devel \
+		$binDir/curl-config \
+		$developDir \
+		$manDir/man3
+
+	# Remove stuff we don't need in the secondary architecture base package.
+	if [ -n "$secondaryArchSuffix" ]; then
+		rm -rf $binDir
+		rm -rf $documentationDir
+	fi
+}
+
+TEST()
+{
+	make check
+}
+
+DESCRIPTION="
+Curl is a command line tool for transferring data with URL syntax, supporting \
+DICT, FILE, FTP, FTPS, Gopher, HTTP, HTTPS, IMAP, IMAPS, LDAP, LDAPS, POP3, \
+POP3S, RTMP, RTSP, SCP, SFTP, SMTP, SMTPS, Telnet and TFTP. curl supports SSL \
+certificates, HTTP POST, HTTP PUT, FTP uploading, HTTP form based upload, \
+proxies, cookies, user+password authentication (Basic, Digest, NTLM, \
+Negotiate, kerberos...), file transfer resume, proxy tunneling and a busload \
+of other useful tricks.
+"
+
+# ----- devel package -------------------------------------------------------
+
+PROVIDES_devel="
+	curl${secondaryArchSuffix}_devel = $portVersion
+	cmd:curl_config$secondaryArchSuffix = $portVersion compat >= 7.16
+	devel:libcurl$secondaryArchSuffix = 4.2.0 compat >= 4
+	"
+REQUIRES_devel="
+	curl$secondaryArchSuffix == $portVersion base
+	"

From d3dea6df81f9993e85b34cc8b3271c5a96b8e3b3 Mon Sep 17 00:00:00 2001
From: Jerome Duval <jerome.duval@gmail.com>
Date: Mon, 31 Mar 2014 18:07:48 +0000
Subject: [PATCH 43/43] Promote version upgrades for x86_gcc2.

---
 dev-db/db/db-6.0.30.recipe               | 4 ++--
 dev-db/sqlite/sqlite-3.8.4.1.recipe      | 4 ++--
 dev-lang/nasm/nasm-2.11.02.recipe        | 2 +-
 dev-vcs/mercurial/mercurial-2.9.1.recipe | 2 +-
 sci-libs/fftw/fftw-3.3.3.recipe          | 4 ++--
 5 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/dev-db/db/db-6.0.30.recipe b/dev-db/db/db-6.0.30.recipe
index 213146538..81e0f5598 100644
--- a/dev-db/db/db-6.0.30.recipe
+++ b/dev-db/db/db-6.0.30.recipe
@@ -9,8 +9,8 @@ CHECKSUM_SIZE="36584356"
 CHECKSUM_MD5="ad28eb86ad3203b5422844db179c585b"
 CHECKSUM_SHA512="ea249c59dba18cad391f523840028ba8ef962c32f2c7470942d52f9c07f18ba9fdf964dcd545cb7f2d6c66b91924a0ba1478af1d8f81f0dcbbf94c97ac515cf9"
 REVISION="1"
-ARCHITECTURES="?x86_gcc2 x86 x86_64"
-SECONDARY_ARCHITECTURES="?x86_gcc2 x86"
+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
diff --git a/dev-db/sqlite/sqlite-3.8.4.1.recipe b/dev-db/sqlite/sqlite-3.8.4.1.recipe
index 80dd3842c..330dd26c6 100644
--- a/dev-db/sqlite/sqlite-3.8.4.1.recipe
+++ b/dev-db/sqlite/sqlite-3.8.4.1.recipe
@@ -12,8 +12,8 @@ CHECKSUM_MD5="6b8cb7b9063a1d97f7b5dc517e8ee0c4"
 CHECKSUM_RMD160="e4cf636abcffb628b66428eaa9687632acf096a2"
 CHECKSUM_SHA512="222868477a73b2f15ee95dbe244a724fd42ad6d6f7401fda0161ac40d13babed36e42cbafd154102dcab202f10576c4460143c634e31701381d314b2390e186b"
 REVISION="1"
-ARCHITECTURES="?x86_gcc2 x86 x86_64"
-SECONDARY_ARCHITECTURES="?x86_gcc2 x86"
+ARCHITECTURES="x86_gcc2 x86 x86_64"
+SECONDARY_ARCHITECTURES="x86_gcc2 x86"
 LICENSE="SQLite"
 COPYRIGHT="Public Domain"
 
diff --git a/dev-lang/nasm/nasm-2.11.02.recipe b/dev-lang/nasm/nasm-2.11.02.recipe
index a095c4f99..2ee8d3bc9 100644
--- a/dev-lang/nasm/nasm-2.11.02.recipe
+++ b/dev-lang/nasm/nasm-2.11.02.recipe
@@ -11,7 +11,7 @@ CHECKSUM_SHA512="b207918f34871a8df7d5e945ea95f4dfe3830fe4c48e9f5ade1107065973429
 LICENSE="BSD (2-clause)"
 COPYRIGHT="1996 Simon Tatham and Julian Hall."
 REVISION="1"
-ARCHITECTURES="?x86_gcc2 x86 x86_64"
+ARCHITECTURES="x86_gcc2 x86 x86_64"
 
 PROVIDES="
 	nasm = $portVersion compat >= 1
diff --git a/dev-vcs/mercurial/mercurial-2.9.1.recipe b/dev-vcs/mercurial/mercurial-2.9.1.recipe
index 8de4dd9ac..e3a01184f 100644
--- a/dev-vcs/mercurial/mercurial-2.9.1.recipe
+++ b/dev-vcs/mercurial/mercurial-2.9.1.recipe
@@ -11,7 +11,7 @@ CHECKSUM_MD5="56b3732f0f558f3cc986c9323ca8d17f"
 CHECKSUM_RMD160="a39057a8d99bfe6f6a41da34005bac5c54112a2b"
 CHECKSUM_SHA512="a1734ff7228f02454fc3ae4a0ed95d11b44ac344702c55e5357b4d64c4e81a84fadfcecdc8f67bb1aa8ef1a5708181670626ac7a64dcc74f47b7842525091168"
 REVISION="1"
-ARCHITECTURES="?x86_gcc2 x86 x86_64"
+ARCHITECTURES="x86_gcc2 x86 x86_64"
 
 PATCHES="mercurial-2.8.1.patch"
 
diff --git a/sci-libs/fftw/fftw-3.3.3.recipe b/sci-libs/fftw/fftw-3.3.3.recipe
index 23f52eb4a..3fc3b62ec 100644
--- a/sci-libs/fftw/fftw-3.3.3.recipe
+++ b/sci-libs/fftw/fftw-3.3.3.recipe
@@ -25,8 +25,8 @@ COPYRIGHT="
 	2003, 2007-2011 Massachusetts Institute of Technology
 	"
 REVISION="1"
-ARCHITECTURES="x86 ?x86_gcc2 x86_64"
-SECONDARY_ARCHITECTURES="?x86_gcc2 x86"
+ARCHITECTURES="x86 x86_gcc2 x86_64"
+SECONDARY_ARCHITECTURES="x86_gcc2 x86"
 
 PROVIDES="
 	libfftw$secondaryArchSuffix = $portVersion compat >= 3