Merged haikuports/haikuports into master

2026-04-22 19:50:05 +02:00 · 2014-06-08 19:57:41 +02:00
parent f3a201edef 5f46fbe722
commit bbea6834de
34 changed files with 2178 additions and 162 deletions
--- a/app-benchmarks/libmicro/libmicro-0.4.2.hg.recipe
+++ b/app-benchmarks/libmicro/libmicro-0.4.2.hg.recipe
@@ -14,7 +14,7 @@ COPYRIGHT="2013 Oracle"
 HOMEPAGE="https://java.net/projects/libmicro"
 SRC_URI="hg+https://hg.java.net/hg/libmicro~hg-repo#7dd95b416c3c"
 REVISION="1"
-ARCHITECTURES="!x86 !x86_gcc2"
+ARCHITECTURES="!x86 x86_gcc2"

 PROVIDES="
 	libmicro = $portVersion
@@ -29,11 +29,12 @@ BUILD_REQUIRES="
 	"

 BUILD_PREREQUIRES="
-	cmd:make
+	cmd:awk
 	cmd:gcc
+	cmd:make
 	"

-PATCHES="libmicro-0.4.2.patchset"
+PATCHES="libmicro-0.4.2.hg.patchset"

 BUILD()
 {
@@ -42,5 +43,11 @@ BUILD()

 INSTALL()
 {
-	make install
+	echo "This package does not install. Use haikuporter --test."
+	false
+}
+
+TEST()
+{
+	./bench > output_$haikuVersion
 }
--- a/app-benchmarks/libmicro/patches/libmicro-0.4.2.hg.patchset
+++ b/app-benchmarks/libmicro/patches/libmicro-0.4.2.hg.patchset
@@ -1,4 +1,4 @@
-From 4beb46cb703e13ca5b6a055efec5f18c961b11fe Mon Sep 17 00:00:00 2001
+From 8cef3c3f453df05b7e32f670afb786926583512e Mon Sep 17 00:00:00 2001
 From: Chris Roberts <cpr420@gmail.com>
 Date: Sun, 26 Jan 2014 11:57:02 -0700
 Subject: applying patch libmicro-0.4.1.patch
@@ -137,3 +137,64 @@ index 27d95d1..a6634a1 100644
 -- 
 1.8.3.4

+
+From 459c52bd6b2394e867ec1657a2b6d83eed4f048d Mon Sep 17 00:00:00 2001
+From: Adrien Destugues <pulkomandy@pulkomandy.tk>
+Date: Thu, 5 Jun 2014 12:50:10 +0200
+Subject: Undo broken changes from libmicro 1.4.1 patchset.
+
+* Comments inside a multiline in makefiles comment the whole thing. So
+all benchmarks after getcontext were not compiled.
+* Instead, use the ELIDED system that allows easy exclusion of
+benchmarks in a platform specific way.
+* Remove -l option from OPTS in the bench script, because the tests
+don't know about it.
+
+This gets the testsuite running, but the 3rd test deadlocks.
+
+diff --git a/Makefile.Haiku b/Makefile.Haiku
+index 5181d91..f034ce5 100644
+--- a/Makefile.Haiku
+++ b/Makefile.Haiku
+@@ -36,8 +36,11 @@ CPPFLAGS=		-DUSE_SEMOP -D_REENTRANT
+ MATHLIB=
+ 
+ ELIDED_BENCHMARKS=	\
+	atomic			\
+ 	cachetocache	\
+-	atomic
+	getcontext		\
+	mmap			\
+	setcontext
+ 
+ 
+ include ../Makefile.com
+diff --git a/Makefile.benchmarks b/Makefile.benchmarks
+index d1b1ff8..ed1923a 100644
+--- a/Makefile.benchmarks
+++ b/Makefile.benchmarks
+@@ -50,7 +50,7 @@ ALL=				\
+ 		fcntl_ndelay	\
+ 		file_lock	\
+ 		fork		\
+-#		getcontext	\
+		getcontext	\
+ 		getenv		\
+ 		gettimeofday	\
+ 		getpeername	\
+diff --git a/bench.sh b/bench.sh
+index 24ca1d9..709cfe3 100644
+--- a/bench.sh
+++ b/bench.sh
+@@ -56,7 +56,7 @@ VDIR1=$VARROOT/0/1/2/3/4/5/6/7/8/9
+ VDIR2=$VARROOT/1/2/3/4/5/6/7/8/9/0
+ 
+ 
+-OPTS="-l -E -C 200 -L -S -W"
+OPTS="-E -C 200 -L -S -W"
+ 
+ dd if=/dev/zero of=$TFILE bs=1024k count=10 2>/dev/null
+ dd if=/dev/zero of=$VFILE bs=1024k count=10 2>/dev/null
+-- 
+1.8.3.4
+
--- a/app-benchmarks/ltp/ltp-20140422.recipe
+++ b/app-benchmarks/ltp/ltp-20140422.recipe
@@ -0,0 +1,54 @@
+SUMMARY="Testing Linux, one syscall at a time."
+DESCRIPTION="
+The Linux Test Project is a joint project started by SGI, developed and
+maintained by IBM, Cisco, Fujitsu, SUSE, Red Hat and others, that has a goal to
+deliver test suites to the open source community that validate the reliability,
+robustness, and stability of Linux. The LTP testsuite contains a collection of
+tools for testing the Linux kernel and related features.
+" 
+HOMEPAGE="http://linux-test-project.github.io/" 
+SRC_URI="https://github.com/linux-test-project/ltp/archive/20140422.tar.gz"
+CHECKSUM_SHA256="0356ba208813efb3d9be6a530a9b56688281b6ac9d80ba901920ec07cf250f2e"
+REVISION="1"
+
+ARCHITECTURES="!x86_gcc2"
+SECONDARY_ARCHITECTURES="x86"
+
+PROVIDES="
+	ltp = $portVersion
+	"
+
+BUILD_REQUIRES="
+	haiku${secondaryArchSuffix}_devel >= $haikuVersion
+	"
+
+BUILD_PREREQUIRES="
+	cmd:automake
+	cmd:autoconf
+	cmd:find
+	cmd:cc$secondaryArchSuffix
+	cmd:ld$secondaryArchSuffix
+	cmd:make
+	"
+
+BUILD()
+{
+	make autotools
+	runConfigure ./configure
+	make all $jobArgs CFLAGS="-DB_USE_POSITIVE_POSIX_ERRORS" CXXFLAGS="-DB_USE_POSITIVE_POSIX_ERRORS" LDFLAGS="-lposix_error_mapper"
+}
+
+INSTALL()
+{
+	make install
+}
+
+TEST()
+{
+	$prefix/ltp/runltp
+}
+
+LICENSE="GNU GPL v2"
+COPYRIGHT="2002-2004 Intel Corporation. All rights reserved.
+	2004, QUALCOMM Inc. All rights reserved.
+	2004-2005 Bull S.A..  All rights reserved."
--- a/app-shells/dash/dash-0.5.7.recipe
+++ b/app-shells/dash/dash-0.5.7.recipe
@@ -7,13 +7,11 @@ it is significantly faster than bash (the GNU Bourne-Again Shell) for most tasks
 HOMEPAGE="http://gondor.apana.org/~herbert/dash/"
 SRC_URI="http://gondor.apana.org/~herbert/dash/files/dash-0.5.7.tar.gz"
 CHECKSUM_SHA256="ae89fa9f1145b7748cf0740e1df04cd52fdf8a285da4911dd0f04983efba4e39"
-REVISION="1"
+REVISION="2"
 LICENSE="GNU GPL v3"
 COPYRIGHT="Copyright (c) 1989-1994 The Regents of the University of California. 1997 Christos Zoulas. 1997-2005 Herbert Xu."

-ARCHITECTURES="?x86_gcc2 ?x86 !x86_64"
-
-PATCHES="dash-0.5.7.patchset"
+ARCHITECTURES="x86_gcc2 x86 x86_64"

 PROVIDES="
 	dash = $portVersion
--- a/app-shells/dash/patches/dash-0.5.7.patchset
+++ b/app-shells/dash/patches/dash-0.5.7.patchset
@@ -1,21 +0,0 @@
-From bf0f50131da4ab31343b239a7e4360ffeb82779a Mon Sep 17 00:00:00 2001
-From: Jerome Duval <jerome.duval@gmail.com>
-Date: Sat, 19 Apr 2014 20:07:51 +0000
-Subject: string.h needs __USE_GNU
-
-
-diff --git a/src/mystring.h b/src/mystring.h
-index 083ea98..0381f6c 100644
--- a/src/mystring.h
-+++ b/src/mystring.h
-@@ -35,6 +35,7 @@
-  */
- 
- #include <inttypes.h>
-+#define __USE_GNU
- #include <string.h>
- 
- extern const char snlfmt[];
-- 
-1.8.3.4
-
--- a/dev-lang/spidermonkey/licenses/NPL
+++ b/dev-lang/spidermonkey/licenses/NPL
@@ -0,0 +1,611 @@
+AMENDMENTS
+The Netscape Public License Version 1.1 ("NPL") consists of the Mozilla Public License Version 1.1 with the following Amendments, including Exhibit A-Netscape Public License.  Files identified with "Exhibit A-Netscape Public License" are governed by the Netscape Public License Version 1.1.
+
+Additional Terms applicable to the Netscape Public License.
+
+I. Effect. 
+These additional terms described in this Netscape Public License -- Amendments shall apply to the Mozilla Communicator client code and to all Covered Code under this License.
+II. ''Netscape's Branded Code'' means Covered Code that Netscape distributes and/or permits others to distribute under one or more trademark(s) which are controlled by Netscape but which are not licensed for use under this License.
+
+III. Netscape and logo. 
+This License does not grant any rights to use the trademarks "Netscape'', the "Netscape N and horizon'' logo or the "Netscape lighthouse" logo, "Netcenter", "Gecko", "Java" or "JavaScript", "Smart Browsing" even if such marks are included in the Original Code or Modifications.
+
+IV. Inability to Comply Due to Contractual Obligation. 
+Prior to licensing the Original Code under this License, Netscape has licensed third party code for use in Netscape's Branded Code. To the extent that Netscape is limited contractually from making such third party code available under this License, Netscape may choose to reintegrate such code into Covered Code without being required to distribute such code in Source Code form, even if such code would otherwise be considered ''Modifications'' under this License.
+
+V. Use of Modifications and Covered Code by Initial Developer.
+
+V.1. In General. 
+The obligations of Section 3 apply to Netscape, except to the extent specified in this Amendment, Section V.2 and V.3.
+V.2. Other Products. 
+Netscape may include Covered Code in products other than the Netscape's Branded Code which are released by Netscape during the two (2) years following the release date of the Original Code, without such additional products becoming subject to the terms of this License, and may license such additional products on different terms from those contained in this License.
+
+V.3. Alternative Licensing. 
+Netscape may license the Source Code of Netscape's Branded Code, including Modifications incorporated therein, without such Netscape Branded Code becoming subject to the terms of this License, and may license such Netscape Branded Code on different terms from those contained in this License. 
+
+
+VI. Litigation. 
+Notwithstanding the limitations of Section 11 above, the provisions regarding litigation in Section 11(a), (b) and (c) of the License shall apply to all disputes relating to this License.
+
+EXHIBIT A-Netscape Public License.
+
+  
+''The contents of this file are subject to the Netscape Public License Version 1.1 (the "License"); you may not use this file except in compliance with the License. You may obtain a copy of the License at http://www.mozilla.org/NPL/
+Software distributed under the License is distributed on an "AS IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License for the specific language governing rights and limitations under the License.
+
+The Original Code is Mozilla Communicator client code, released March 31, 1998.
+
+The Initial Developer of the Original Code is Netscape Communications Corporation. Portions created by Netscape are Copyright (C) 1998-1999 Netscape Communications Corporation. All Rights Reserved.
+
+Contributor(s): ______________________________________.
+
+  
+Alternatively, the contents of this file may be used under the terms of the _____ license (the  <20>[___] License<73>), in which case the provisions of [______] License are applicable  instead of those above.  If you wish to allow use of your version of this file only under the terms of the [____] License and not to allow others to use your version of this file under the NPL, indicate your decision by deleting  the provisions above and replace  them with the notice and other provisions required by the [___] License.  If you do not delete the provisions above, a recipient may use your version of this file under either the NPL or the [___] License."
+
+                          MOZILLA PUBLIC LICENSE
+                                Version 1.1
+
+                              ---------------
+
+1. Definitions.
+
+     1.0.1. "Commercial Use" means distribution or otherwise making the
+     Covered Code available to a third party.
+
+     1.1. "Contributor" means each entity that creates or contributes to
+     the creation of Modifications.
+
+     1.2. "Contributor Version" means the combination of the Original
+     Code, prior Modifications used by a Contributor, and the Modifications
+     made by that particular Contributor.
+
+     1.3. "Covered Code" means the Original Code or Modifications or the
+     combination of the Original Code and Modifications, in each case
+     including portions thereof.
+
+     1.4. "Electronic Distribution Mechanism" means a mechanism generally
+     accepted in the software development community for the electronic
+     transfer of data.
+
+     1.5. "Executable" means Covered Code in any form other than Source
+     Code.
+
+     1.6. "Initial Developer" means the individual or entity identified
+     as the Initial Developer in the Source Code notice required by Exhibit
+     A.
+
+     1.7. "Larger Work" means a work which combines Covered Code or
+     portions thereof with code not governed by the terms of this License.
+
+     1.8. "License" means this document.
+
+     1.8.1. "Licensable" means having the right to grant, to the maximum
+     extent possible, whether at the time of the initial grant or
+     subsequently acquired, any and all of the rights conveyed herein.
+
+     1.9. "Modifications" means any addition to or deletion from the
+     substance or structure of either the Original Code or any previous
+     Modifications. When Covered Code is released as a series of files, a
+     Modification is:
+          A. Any addition to or deletion from the contents of a file
+          containing Original Code or previous Modifications.
+
+          B. Any new file that contains any part of the Original Code or
+          previous Modifications.
+
+     1.10. "Original Code" means Source Code of computer software code
+     which is described in the Source Code notice required by Exhibit A as
+     Original Code, and which, at the time of its release under this
+     License is not already Covered Code governed by this License.
+
+     1.10.1. "Patent Claims" means any patent claim(s), now owned or
+     hereafter acquired, including without limitation,  method, process,
+     and apparatus claims, in any patent Licensable by grantor.
+
+     1.11. "Source Code" means the preferred form of the Covered Code for
+     making modifications to it, including all modules it contains, plus
+     any associated interface definition files, scripts used to control
+     compilation and installation of an Executable, or source code
+     differential comparisons against either the Original Code or another
+     well known, available Covered Code of the Contributor's choice. The
+     Source Code can be in a compressed or archival form, provided the
+     appropriate decompression or de-archiving software is widely available
+     for no charge.
+
+     1.12. "You" (or "Your")  means an individual or a legal entity
+     exercising rights under, and complying with all of the terms of, this
+     License or a future version of this License issued under Section 6.1.
+     For legal entities, "You" includes any entity which controls, is
+     controlled by, or is under common control with You. For purposes of
+     this definition, "control" means (a) the power, direct or indirect,
+     to cause the direction or management of such entity, whether by
+     contract or otherwise, or (b) ownership of more than fifty percent
+     (50%) of the outstanding shares or beneficial ownership of such
+     entity.
+
+2. Source Code License.
+
+     2.1. The Initial Developer Grant.
+     The Initial Developer hereby grants You a world-wide, royalty-free,
+     non-exclusive license, subject to third party intellectual property
+     claims:
+          (a)  under intellectual property rights (other than patent or
+          trademark) Licensable by Initial Developer to use, reproduce,
+          modify, display, perform, sublicense and distribute the Original
+          Code (or portions thereof) with or without Modifications, and/or
+          as part of a Larger Work; and
+
+          (b) under Patents Claims infringed by the making, using or
+          selling of Original Code, to make, have made, use, practice,
+          sell, and offer for sale, and/or otherwise dispose of the
+          Original Code (or portions thereof).
+
+          (c) the licenses granted in this Section 2.1(a) and (b) are
+          effective on the date Initial Developer first distributes
+          Original Code under the terms of this License.
+
+          (d) Notwithstanding Section 2.1(b) above, no patent license is
+          granted: 1) for code that You delete from the Original Code; 2)
+          separate from the Original Code;  or 3) for infringements caused
+          by: i) the modification of the Original Code or ii) the
+          combination of the Original Code with other software or devices.
+
+     2.2. Contributor Grant.
+     Subject to third party intellectual property claims, each Contributor
+     hereby grants You a world-wide, royalty-free, non-exclusive license
+
+          (a)  under intellectual property rights (other than patent or
+          trademark) Licensable by Contributor, to use, reproduce, modify,
+          display, perform, sublicense and distribute the Modifications
+          created by such Contributor (or portions thereof) either on an
+          unmodified basis, with other Modifications, as Covered Code
+          and/or as part of a Larger Work; and
+
+          (b) under Patent Claims infringed by the making, using, or
+          selling of  Modifications made by that Contributor either alone
+          and/or in combination with its Contributor Version (or portions
+          of such combination), to make, use, sell, offer for sale, have
+          made, and/or otherwise dispose of: 1) Modifications made by that
+          Contributor (or portions thereof); and 2) the combination of
+          Modifications made by that Contributor with its Contributor
+          Version (or portions of such combination).
+
+          (c) the licenses granted in Sections 2.2(a) and 2.2(b) are
+          effective on the date Contributor first makes Commercial Use of
+          the Covered Code.
+
+          (d)    Notwithstanding Section 2.2(b) above, no patent license is
+          granted: 1) for any code that Contributor has deleted from the
+          Contributor Version; 2)  separate from the Contributor Version;
+          3)  for infringements caused by: i) third party modifications of
+          Contributor Version or ii)  the combination of Modifications made
+          by that Contributor with other software  (except as part of the
+          Contributor Version) or other devices; or 4) under Patent Claims
+          infringed by Covered Code in the absence of Modifications made by
+          that Contributor.
+
+3. Distribution Obligations.
+
+     3.1. Application of License.
+     The Modifications which You create or to which You contribute are
+     governed by the terms of this License, including without limitation
+     Section 2.2. The Source Code version of Covered Code may be
+     distributed only under the terms of this License or a future version
+     of this License released under Section 6.1, and You must include a
+     copy of this License with every copy of the Source Code You
+     distribute. You may not offer or impose any terms on any Source Code
+     version that alters or restricts the applicable version of this
+     License or the recipients' rights hereunder. However, You may include
+     an additional document offering the additional rights described in
+     Section 3.5.
+
+     3.2. Availability of Source Code.
+     Any Modification which You create or to which You contribute must be
+     made available in Source Code form under the terms of this License
+     either on the same media as an Executable version or via an accepted
+     Electronic Distribution Mechanism to anyone to whom you made an
+     Executable version available; and if made available via Electronic
+     Distribution Mechanism, must remain available for at least twelve (12)
+     months after the date it initially became available, or at least six
+     (6) months after a subsequent version of that particular Modification
+     has been made available to such recipients. You are responsible for
+     ensuring that the Source Code version remains available even if the
+     Electronic Distribution Mechanism is maintained by a third party.
+
+     3.3. Description of Modifications.
+     You must cause all Covered Code to which You contribute to contain a
+     file documenting the changes You made to create that Covered Code and
+     the date of any change. You must include a prominent statement that
+     the Modification is derived, directly or indirectly, from Original
+     Code provided by the Initial Developer and including the name of the
+     Initial Developer in (a) the Source Code, and (b) in any notice in an
+     Executable version or related documentation in which You describe the
+     origin or ownership of the Covered Code.
+
+     3.4. Intellectual Property Matters
+          (a) Third Party Claims.
+          If Contributor has knowledge that a license under a third party's
+          intellectual property rights is required to exercise the rights
+          granted by such Contributor under Sections 2.1 or 2.2,
+          Contributor must include a text file with the Source Code
+          distribution titled "LEGAL" which describes the claim and the
+          party making the claim in sufficient detail that a recipient will
+          know whom to contact. If Contributor obtains such knowledge after
+          the Modification is made available as described in Section 3.2,
+          Contributor shall promptly modify the LEGAL file in all copies
+          Contributor makes available thereafter and shall take other steps
+          (such as notifying appropriate mailing lists or newsgroups)
+          reasonably calculated to inform those who received the Covered
+          Code that new knowledge has been obtained.
+
+          (b) Contributor APIs.
+          If Contributor's Modifications include an application programming
+          interface and Contributor has knowledge of patent licenses which
+          are reasonably necessary to implement that API, Contributor must
+          also include this information in the LEGAL file.
+
+               (c)    Representations.
+          Contributor represents that, except as disclosed pursuant to
+          Section 3.4(a) above, Contributor believes that Contributor's
+          Modifications are Contributor's original creation(s) and/or
+          Contributor has sufficient rights to grant the rights conveyed by
+          this License.
+
+     3.5. Required Notices.
+     You must duplicate the notice in Exhibit A in each file of the Source
+     Code.  If it is not possible to put such notice in a particular Source
+     Code file due to its structure, then You must include such notice in a
+     location (such as a relevant directory) where a user would be likely
+     to look for such a notice.  If You created one or more Modification(s)
+     You may add your name as a Contributor to the notice described in
+     Exhibit A.  You must also duplicate this License in any documentation
+     for the Source Code where You describe recipients' rights or ownership
+     rights relating to Covered Code.  You may choose to offer, and to
+     charge a fee for, warranty, support, indemnity or liability
+     obligations to one or more recipients of Covered Code. However, You
+     may do so only on Your own behalf, and not on behalf of the Initial
+     Developer or any Contributor. You must make it absolutely clear than
+     any such warranty, support, indemnity or liability obligation is
+     offered by You alone, and You hereby agree to indemnify the Initial
+     Developer and every Contributor for any liability incurred by the
+     Initial Developer or such Contributor as a result of warranty,
+     support, indemnity or liability terms You offer.
+
+     3.6. Distribution of Executable Versions.
+     You may distribute Covered Code in Executable form only if the
+     requirements of Section 3.1-3.5 have been met for that Covered Code,
+     and if You include a notice stating that the Source Code version of
+     the Covered Code is available under the terms of this License,
+     including a description of how and where You have fulfilled the
+     obligations of Section 3.2. The notice must be conspicuously included
+     in any notice in an Executable version, related documentation or
+     collateral in which You describe recipients' rights relating to the
+     Covered Code. You may distribute the Executable version of Covered
+     Code or ownership rights under a license of Your choice, which may
+     contain terms different from this License, provided that You are in
+     compliance with the terms of this License and that the license for the
+     Executable version does not attempt to limit or alter the recipient's
+     rights in the Source Code version from the rights set forth in this
+     License. If You distribute the Executable version under a different
+     license You must make it absolutely clear that any terms which differ
+     from this License are offered by You alone, not by the Initial
+     Developer or any Contributor. You hereby agree to indemnify the
+     Initial Developer and every Contributor for any liability incurred by
+     the Initial Developer or such Contributor as a result of any such
+     terms You offer.
+
+     3.7. Larger Works.
+     You may create a Larger Work by combining Covered Code with other code
+     not governed by the terms of this License and distribute the Larger
+     Work as a single product. In such a case, You must make sure the
+     requirements of this License are fulfilled for the Covered Code.
+
+4. Inability to Comply Due to Statute or Regulation.
+
+     If it is impossible for You to comply with any of the terms of this
+     License with respect to some or all of the Covered Code due to
+     statute, judicial order, or regulation then You must: (a) comply with
+     the terms of this License to the maximum extent possible; and (b)
+     describe the limitations and the code they affect. Such description
+     must be included in the LEGAL file described in Section 3.4 and must
+     be included with all distributions of the Source Code. Except to the
+     extent prohibited by statute or regulation, such description must be
+     sufficiently detailed for a recipient of ordinary skill to be able to
+     understand it.
+
+5. Application of this License.
+
+     This License applies to code to which the Initial Developer has
+     attached the notice in Exhibit A and to related Covered Code.
+
+6. Versions of the License.
+
+     6.1. New Versions.
+     Netscape Communications Corporation ("Netscape") may publish revised
+     and/or new versions of the License from time to time. Each version
+     will be given a distinguishing version number.
+
+     6.2. Effect of New Versions.
+     Once Covered Code has been published under a particular version of the
+     License, You may always continue to use it under the terms of that
+     version. You may also choose to use such Covered Code under the terms
+     of any subsequent version of the License published by Netscape. No one
+     other than Netscape has the right to modify the terms applicable to
+     Covered Code created under this License.
+
+     6.3. Derivative Works.
+     If You create or use a modified version of this License (which you may
+     only do in order to apply it to code which is not already Covered Code
+     governed by this License), You must (a) rename Your license so that
+     the phrases "Mozilla", "MOZILLAPL", "MOZPL", "Netscape",
+     "MPL", "NPL" or any confusingly similar phrase do not appear in your
+     license (except to note that your license differs from this License)
+     and (b) otherwise make it clear that Your version of the license
+     contains terms which differ from the Mozilla Public License and
+     Netscape Public License. (Filling in the name of the Initial
+     Developer, Original Code or Contributor in the notice described in
+     Exhibit A shall not of themselves be deemed to be modifications of
+     this License.)
+
+7. DISCLAIMER OF WARRANTY.
+
+     COVERED CODE IS PROVIDED UNDER THIS LICENSE ON AN "AS IS" BASIS,
+     WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING,
+     WITHOUT LIMITATION, WARRANTIES THAT THE COVERED CODE IS FREE OF
+     DEFECTS, MERCHANTABLE, FIT FOR A PARTICULAR PURPOSE OR NON-INFRINGING.
+     THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE COVERED CODE
+     IS WITH YOU. SHOULD ANY COVERED CODE PROVE DEFECTIVE IN ANY RESPECT,
+     YOU (NOT THE INITIAL DEVELOPER OR ANY OTHER CONTRIBUTOR) ASSUME THE
+     COST OF ANY NECESSARY SERVICING, REPAIR OR CORRECTION. THIS DISCLAIMER
+     OF WARRANTY CONSTITUTES AN ESSENTIAL PART OF THIS LICENSE. NO USE OF
+     ANY COVERED CODE IS AUTHORIZED HEREUNDER EXCEPT UNDER THIS DISCLAIMER.
+
+8. TERMINATION.
+
+     8.1.  This License and the rights granted hereunder will terminate
+     automatically if You fail to comply with terms herein and fail to cure
+     such breach within 30 days of becoming aware of the breach. All
+     sublicenses to the Covered Code which are properly granted shall
+     survive any termination of this License. Provisions which, by their
+     nature, must remain in effect beyond the termination of this License
+     shall survive.
+
+     8.2.  If You initiate litigation by asserting a patent infringement
+     claim (excluding declatory judgment actions) against Initial Developer
+     or a Contributor (the Initial Developer or Contributor against whom
+     You file such action is referred to as "Participant")  alleging that:
+
+     (a)  such Participant's Contributor Version directly or indirectly
+     infringes any patent, then any and all rights granted by such
+     Participant to You under Sections 2.1 and/or 2.2 of this License
+     shall, upon 60 days notice from Participant terminate prospectively,
+     unless if within 60 days after receipt of notice You either: (i)
+     agree in writing to pay Participant a mutually agreeable reasonable
+     royalty for Your past and future use of Modifications made by such
+     Participant, or (ii) withdraw Your litigation claim with respect to
+     the Contributor Version against such Participant.  If within 60 days
+     of notice, a reasonable royalty and payment arrangement are not
+     mutually agreed upon in writing by the parties or the litigation claim
+     is not withdrawn, the rights granted by Participant to You under
+     Sections 2.1 and/or 2.2 automatically terminate at the expiration of
+     the 60 day notice period specified above.
+
+     (b)  any software, hardware, or device, other than such Participant's
+     Contributor Version, directly or indirectly infringes any patent, then
+     any rights granted to You by such Participant under Sections 2.1(b)
+     and 2.2(b) are revoked effective as of the date You first made, used,
+     sold, distributed, or had made, Modifications made by that
+     Participant.
+
+     8.3.  If You assert a patent infringement claim against Participant
+     alleging that such Participant's Contributor Version directly or
+     indirectly infringes any patent where such claim is resolved (such as
+     by license or settlement) prior to the initiation of patent
+     infringement litigation, then the reasonable value of the licenses
+     granted by such Participant under Sections 2.1 or 2.2 shall be taken
+     into account in determining the amount or value of any payment or
+     license.
+
+     8.4.  In the event of termination under Sections 8.1 or 8.2 above,
+     all end user license agreements (excluding distributors and resellers)
+     which have been validly granted by You or any distributor hereunder
+     prior to termination shall survive termination.
+
+9. LIMITATION OF LIABILITY.
+
+     UNDER NO CIRCUMSTANCES AND UNDER NO LEGAL THEORY, WHETHER TORT
+     (INCLUDING NEGLIGENCE), CONTRACT, OR OTHERWISE, SHALL YOU, THE INITIAL
+     DEVELOPER, ANY OTHER CONTRIBUTOR, OR ANY DISTRIBUTOR OF COVERED CODE,
+     OR ANY SUPPLIER OF ANY OF SUCH PARTIES, BE LIABLE TO ANY PERSON FOR
+     ANY INDIRECT, SPECIAL, INCIDENTAL, OR CONSEQUENTIAL DAMAGES OF ANY
+     CHARACTER INCLUDING, WITHOUT LIMITATION, DAMAGES FOR LOSS OF GOODWILL,
+     WORK STOPPAGE, COMPUTER FAILURE OR MALFUNCTION, OR ANY AND ALL OTHER
+     COMMERCIAL DAMAGES OR LOSSES, EVEN IF SUCH PARTY SHALL HAVE BEEN
+     INFORMED OF THE POSSIBILITY OF SUCH DAMAGES. THIS LIMITATION OF
+     LIABILITY SHALL NOT APPLY TO LIABILITY FOR DEATH OR PERSONAL INJURY
+     RESULTING FROM SUCH PARTY'S NEGLIGENCE TO THE EXTENT APPLICABLE LAW
+     PROHIBITS SUCH LIMITATION. SOME JURISDICTIONS DO NOT ALLOW THE
+     EXCLUSION OR LIMITATION OF INCIDENTAL OR CONSEQUENTIAL DAMAGES, SO
+     THIS EXCLUSION AND LIMITATION MAY NOT APPLY TO YOU.
+
+10. U.S. GOVERNMENT END USERS.
+
+     The Covered Code is a "commercial item," as that term is defined in
+     48 C.F.R. 2.101 (Oct. 1995), consisting of "commercial computer
+     software" and "commercial computer software documentation," as such
+     terms are used in 48 C.F.R. 12.212 (Sept. 1995). Consistent with 48
+     C.F.R. 12.212 and 48 C.F.R. 227.7202-1 through 227.7202-4 (June 1995),
+     all U.S. Government End Users acquire Covered Code with only those
+     rights set forth herein.
+
+11. MISCELLANEOUS.
+
+     This License represents the complete agreement concerning subject
+     matter hereof. If any provision of this License is held to be
+     unenforceable, such provision shall be reformed only to the extent
+     necessary to make it enforceable. This License shall be governed by
+     California law provisions (except to the extent applicable law, if
+     any, provides otherwise), excluding its conflict-of-law provisions.
+     With respect to disputes in which at least one party is a citizen of,
+     or an entity chartered or registered to do business in the United
+     States of America, any litigation relating to this License shall be
+     subject to the jurisdiction of the Federal Courts of the Northern
+     District of California, with venue lying in Santa Clara County,
+     California, with the losing party responsible for costs, including
+     without limitation, court costs and reasonable attorneys' fees and
+     expenses. The application of the United Nations Convention on
+     Contracts for the International Sale of Goods is expressly excluded.
+     Any law or regulation which provides that the language of a contract
+     shall be construed against the drafter shall not apply to this
+     License.
+
+12. RESPONSIBILITY FOR CLAIMS.
+
+     As between Initial Developer and the Contributors, each party is
+     responsible for claims and damages arising, directly or indirectly,
+     out of its utilization of rights under this License and You agree to
+     work with Initial Developer and Contributors to distribute such
+     responsibility on an equitable basis. Nothing herein is intended or
+     shall be deemed to constitute any admission of liability.
+
+13. MULTIPLE-LICENSED CODE.
+
+     Initial Developer may designate portions of the Covered Code as
+     "Multiple-Licensed".  "Multiple-Licensed" means that the Initial
+     Developer permits you to utilize portions of the Covered Code under
+     Your choice of the NPL or the alternative licenses, if any, specified
+     by the Initial Developer in the file described in Exhibit A.
+
+EXHIBIT A -Mozilla Public License.
+
+     ``The contents of this file are subject to the Mozilla Public License
+     Version 1.1 (the "License"); you may not use this file except in
+     compliance with the License. You may obtain a copy of the License at
+     http://www.mozilla.org/MPL/
+
+     Software distributed under the License is distributed on an "AS IS"
+     basis, WITHOUT WARRANTY OF ANY KIND, either express or implied. See the
+     License for the specific language governing rights and limitations
+     under the License.
+
+     The Original Code is ______________________________________.
+
+     The Initial Developer of the Original Code is ________________________.
+     Portions created by ______________________ are Copyright (C) ______
+     _______________________. All Rights Reserved.
+
+     Contributor(s): ______________________________________.
+
+     Alternatively, the contents of this file may be used under the terms
+     of the _____ license (the  "[___] License"), in which case the
+     provisions of [______] License are applicable instead of those
+     above.  If you wish to allow use of your version of this file only
+     under the terms of the [____] License and not to allow others to use
+     your version of this file under the MPL, indicate your decision by
+     deleting  the provisions above and replace  them with the notice and
+     other provisions required by the [___] License.  If you do not delete
+     the provisions above, a recipient may use your version of this file
+     under either the MPL or the [___] License."
+
+     [NOTE: The text of this Exhibit A may differ slightly from the text of
+     the notices in the Source Code files of the Original Code. You should
+     use the text of this Exhibit A rather than the text found in the
+     Original Code Source Code for Your Modifications.]
+
+     ----------------------------------------------------------------------
+
+     AMENDMENTS
+
+     The Netscape Public License Version 1.1 ("NPL") consists of the
+     Mozilla Public License Version 1.1 with the following Amendments,
+     including Exhibit A-Netscape Public License.  Files identified with
+     "Exhibit A-Netscape Public License" are governed by the Netscape
+     Public License Version 1.1.
+
+     Additional Terms applicable to the Netscape Public License.
+          I. Effect.
+          These additional terms described in this Netscape Public
+          License -- Amendments shall apply to the Mozilla Communicator
+          client code and to all Covered Code under this License.
+
+          II. "Netscape's Branded Code" means Covered Code that Netscape
+          distributes and/or permits others to distribute under one or more
+          trademark(s) which are controlled by Netscape but which are not
+          licensed for use under this License.
+
+          III. Netscape and logo.
+          This License does not grant any rights to use the trademarks
+          "Netscape", the "Netscape N and horizon" logo or the "Netscape
+          lighthouse" logo, "Netcenter", "Gecko", "Java" or "JavaScript",
+          "Smart Browsing" even if such marks are included in the Original
+          Code or Modifications.
+
+          IV. Inability to Comply Due to Contractual Obligation.
+          Prior to licensing the Original Code under this License, Netscape
+          has licensed third party code for use in Netscape's Branded Code.
+          To the extent that Netscape is limited contractually from making
+          such third party code available under this License, Netscape may
+          choose to reintegrate such code into Covered Code without being
+          required to distribute such code in Source Code form, even if
+          such code would otherwise be considered "Modifications" under
+          this License.
+
+          V. Use of Modifications and Covered Code by Initial Developer.
+               V.1. In General.
+               The obligations of Section 3 apply to Netscape, except to
+               the extent specified in this Amendment, Section V.2 and V.3.
+
+               V.2. Other Products.
+               Netscape may include Covered Code in products other than the
+               Netscape's Branded Code which are released by Netscape
+               during the two (2) years following the release date of the
+               Original Code, without such additional products becoming
+               subject to the terms of this License, and may license such
+               additional products on different terms from those contained
+               in this License.
+
+               V.3. Alternative Licensing.
+               Netscape may license the Source Code of Netscape's Branded
+               Code, including Modifications incorporated therein, without
+               such Netscape Branded Code becoming subject to the terms of
+               this License, and may license such Netscape Branded Code on
+               different terms from those contained in this License.
+
+          VI. Litigation.
+          Notwithstanding the limitations of Section 11 above, the
+          provisions regarding litigation in Section 11(a), (b) and (c) of
+          the License shall apply to all disputes relating to this License.
+
+     EXHIBIT A-Netscape Public License.
+
+          "The contents of this file are subject to the Netscape Public
+          License Version 1.1 (the "License"); you may not use this file
+          except in compliance with the License. You may obtain a copy of
+          the License at http://www.mozilla.org/NPL/
+
+          Software distributed under the License is distributed on an "AS
+          IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or
+          implied. See the License for the specific language governing
+          rights and limitations under the License.
+
+          The Original Code is Mozilla Communicator client code, released
+          March 31, 1998.
+
+          The Initial Developer of the Original Code is Netscape
+          Communications Corporation. Portions created by Netscape are
+          Copyright (C) 1998-1999 Netscape Communications Corporation. All
+          Rights Reserved.
+
+          Contributor(s): ______________________________________.
+
+          Alternatively, the contents of this file may be used under the
+          terms of the _____ license (the "[___] License"), in which case
+          the provisions of [______] License are applicable  instead of
+          those above.  If you wish to allow use of your version of this
+          file only under the terms of the [____] License and not to allow
+          others to use your version of this file under the NPL, indicate
+          your decision by deleting  the provisions above and replace  them
+          with the notice and other provisions required by the [___]
+          License.  If you do not delete the provisions above, a recipient
+          may use your version of this file under either the NPL or the
+          [___] License."
--- a/dev-lang/spidermonkey/patches/spidermonkey-1.8.5.patchset
+++ b/dev-lang/spidermonkey/patches/spidermonkey-1.8.5.patchset
@@ -0,0 +1,68 @@
+From 6810ba3a550c5559ccbdbdda846ea7cbfa04bcca Mon Sep 17 00:00:00 2001
+From: Jerome Duval <jerome.duval@gmail.com>
+Date: Fri, 6 Jun 2014 08:40:44 +0000
+Subject: Haiku patch
+
+
+diff --git a/js/src/Makefile.in b/js/src/Makefile.in
+index a85e055..a994d00 100644
+--- a/js/src/Makefile.in
+++ b/js/src/Makefile.in
+@@ -659,7 +659,7 @@ LIBS +=  C:/Program\ Files/Intel/VTune/Analyzer/Lib/VtuneApi.lib
+ endif
+ 
+ # BeOS and HP-UX do not require the extra linking of "-lm"
+-ifeq (,$(filter BeOS HP-UX WINNT WINCE OpenVMS OS2,$(OS_ARCH)))
+ifeq (,$(filter BeOS HP-UX WINNT WINCE OpenVMS OS2 Haiku,$(OS_ARCH)))
+ EXTRA_LIBS	+= -lm
+ endif
+ 
+diff --git a/js/src/jsnativestack.cpp b/js/src/jsnativestack.cpp
+index 0366d25..590e5d0 100644
+--- a/js/src/jsnativestack.cpp
+++ b/js/src/jsnativestack.cpp
+@@ -184,6 +184,18 @@ GetNativeStackBaseImpl()
+     return static_cast<char*>(st.ss_sp) + st.ss_size;
+ }
+ 
+#elif defined(__HAIKU__)
+
+#include <OS.h>
+
+void *
+GetNativeStackBaseImpl()
+{
+	thread_info info;
+	get_thread_info(find_thread(NULL), &info);
+    return info.stack_base;
+}
+
+ #else /* XP_UNIX */
+ 
+ void *
+-- 
+1.8.3.4
+
+
+From 97379beb600f8eca868e0c9e605085e1264097a2 Mon Sep 17 00:00:00 2001
+From: Jerome Duval <jerome.duval@gmail.com>
+Date: Fri, 6 Jun 2014 11:48:10 +0000
+Subject: nsinstall patch
+
+
+diff --git a/js/src/config/nsinstall.c b/js/src/config/nsinstall.c
+index 355a092..008b0f1 100644
+--- a/js/src/config/nsinstall.c
+++ b/js/src/config/nsinstall.c
+@@ -114,7 +114,7 @@ mkdirs(char *path, mode_t mode)
+     for (cp = strrchr(path, '/'); cp && cp != path && *(cp - 1) == '/'; cp--);
+     if (cp && cp != path) {
+ 	*cp = '\0';
+-	if ((lstat(path, &sb) < 0 || !S_ISDIR(sb.st_mode)) &&
+	if ((stat(path, &sb) < 0 || !S_ISDIR(sb.st_mode)) &&
+ 	    mkdirs(path, mode) < 0) {
+ 	    return -1;
+ 	}
+-- 
+1.8.3.4
+
--- a/dev-lang/spidermonkey/spidermonkey-1.8.5.recipe
+++ b/dev-lang/spidermonkey/spidermonkey-1.8.5.recipe
@@ -0,0 +1,72 @@
+SUMMARY="A Javascript engine written in C/C++."
+DESCRIPTION="
+Spidermonkey is a Javascript engine written in C/C++ used in various products \
+from Mozilla.
+" 
+HOMEPAGE="http://www.mozilla.org/js/spidermonkey" 
+SRC_URI="https://ftp.mozilla.org/pub/mozilla.org/js/js185-1.0.0.tar.gz"
+CHECKSUM_SHA256="5d12f7e1f5b4a99436685d97b9b7b75f094d33580227aa998c406bbae6f2a687"
+LICENSE="NPL v1.1"
+COPYRIGHT="1998-1999 Netscape Communications Corporation."
+REVISION="1"
+ARCHITECTURES="?x86_gcc2 x86 ?x86_64"
+
+PATCHES="spidermonkey-${portVersion}.patchset"
+
+PROVIDES="
+	spidermonkey$secondaryArchSuffix = $portVersion compat >= 1.8
+	lib:libmozjs185$secondaryArchSuffix = 1.0.0 compat >= 1
+	"
+	
+REQUIRES="
+	haiku$secondaryArchSuffix >= $haikuVersion
+	"
+BUILD_REQUIRES=""
+
+BUILD_PREREQUIRES="
+	haiku_devel$secondaryArchSuffix >= $haikuVersion
+	cmd:gcc$secondaryArchSuffix
+	cmd:ld$secondaryArchSuffix
+	cmd:make
+	cmd:perl
+	cmd:awk
+	cmd:python
+	cmd:xargs
+	cmd:pkg_config$secondaryArchSuffix
+	cmd:sed
+	"
+
+SOURCE_DIR="js-$portVersion/"
+
+BUILD()
+{
+	cd js/src
+	runConfigure --omit-dirs "libDir docDir dataRootDir" ./configure \
+		--disable-tracejit
+	make $jobArgs
+}
+
+INSTALL()
+{
+	cd js/src
+	make install
+	
+	mv $libDir/libmozjs185-1.0.a $libDir/libmozjs185.a
+	
+	prepareInstalledDevelLibs libmozjs185
+	fixPkgconfig
+	
+	# devel package
+	packageEntries devel \
+		$developDir
+
+}
+
+PROVIDES_devel="
+	spidermonkey${secondaryArchSuffix}_devel = $portVersion
+	devel:libmozjs185$secondaryArchSuffix = 1.0.0 compat >= 1
+	"
+
+REQUIRES_devel="
+	spidermonkey$secondaryArchSuffix == $portVersion base
+	"
--- a/dev-libs/openssl/openssl-1.0.0m.recipe
+++ b/dev-libs/openssl/openssl-1.0.0m.recipe
@@ -0,0 +1,121 @@
+SUMMARY="Full-strength general purpose cryptography library (with SSL/TLS)"
+DESCRIPTION="
+The OpenSSL Project is a collaborative effort to develop a robust, \
+commercial-grade, full-featured, and Open Source toolkit implementing the \
+Secure Sockets Layer (SSL v2/v3) and Transport Layer Security (TLS v1) \
+protocols as well as a full-strength general purpose cryptography library. The \
+project is managed by a worldwide community of volunteers that use the \
+Internet to communicate, plan, and develop the OpenSSL toolkit and its related \
+documentation.
+OpenSSL is based on the excellent SSLeay library developed by Eric A. Young \
+and Tim J. Hudson. The OpenSSL toolkit is licensed under an Apache-style \
+licence, which basically means that you are free to get and use it for \
+commercial and non-commercial purposes subject to some simple license \
+conditions.
+"
+HOMEPAGE="http://www.openssl.org/"
+SRC_URI="http://www.openssl.org/source/openssl-$portVersion.tar.gz"
+CHECKSUM_SHA256="224dbbfaee3ad7337665e24eab516c67446d5081379a40b2f623cf7801e672de"
+LICENSE="OpenSSL"
+COPYRIGHT="
+	1995-1998 Eric Young
+	1998-2012 The OpenSSL Project.
+	"
+REVISION="1"
+ARCHITECTURES="x86_gcc2 x86 x86_64 arm"
+SECONDARY_ARCHITECTURES="x86_gcc2 x86"
+
+PATCHES="openssl-$portVersion.patchset"
+
+PROVIDES="
+	openssl$secondaryArchSuffix = $portVersion compat >= 1.0.0
+	lib:libcrypto$secondaryArchSuffix = $portVersion compat >= 1.0.0
+	lib:libssl$secondaryArchSuffix = $portVersion compat >= 1.0.0
+	"
+if [ -z "$secondaryArchSuffix" ]; then
+	PROVIDES="$PROVIDES
+		cmd:c_rehash = $portVersion compat >= 1
+		cmd:openssl = $portVersion compat >= 1
+		"
+fi
+
+REQUIRES="
+	haiku$secondaryArchSuffix >= $haikuVersion
+	lib:libz$secondaryArchSuffix >= 1.2.3
+	"
+if [ -n "$secondaryArchSuffix" ]; then
+	REQUIRES="$REQUIRES
+		openssl == $portVersion base
+		"
+fi
+
+BUILD_REQUIRES="
+	devel:libz$secondaryArchSuffix >= 1.2.3
+	"
+BUILD_PREREQUIRES="
+	haiku${secondaryArchSuffix}_devel >= $haikuVersion
+	cmd:gcc${secondaryArchSuffix}
+	cmd:ld${secondaryArchSuffix}
+	cmd:make
+	cmd:perl >= 5
+	cmd:sed
+	"
+
+PATCH()
+{
+	# fix hard-coded perl path
+	sed -i 's,/usr/bin/perl,/bin/env perl,g' apps/tsget
+}
+
+BUILD()
+{
+	PERL="/bin/env perl" \
+	./config --prefix=$prefix --libdir=$relativeLibDir \
+		--openssldir=$dataRootDir/ssl \
+		zlib shared
+	make
+		# multi-job builds don't work correctly
+}
+
+INSTALL()
+{
+	make MANDIR=$manDir install
+
+	# move include dir to correct location
+	mkdir -p $(dirname $includeDir)
+	mv $prefix/include $includeDir
+
+	# prepare develop/lib
+	prepareInstalledDevelLibs libcrypto libssl
+	fixPkgconfig
+
+	# devel package
+	packageEntries devel \
+		$developDir \
+		$manDir/man3
+
+	# Remove stuff we don't need in the secondary architecture base package,
+	# since we make it depend on the primary package.
+	if [ -n "$secondaryArchSuffix" ]; then
+		rm -rf $prefix/bin
+		rm -rf $dataRootDir/ssl
+		rm -rf $documentationDir
+	fi
+}
+
+TEST()
+{
+	cd openssl-1.0.0j
+	make test
+}
+
+# ----- devel package -------------------------------------------------------
+
+PROVIDES_devel="
+	openssl${secondaryArchSuffix}_devel = $portVersion
+	devel:libcrypto${secondaryArchSuffix} = $portVersion compat >= 1.0.0
+	devel:libssl${secondaryArchSuffix} = $portVersion compat >= 1.0.0
+	"
+REQUIRES_devel="
+	openssl${secondaryArchSuffix} == $portVersion base
+	"
--- a/dev-libs/openssl/patches/openssl-1.0.0m.patchset
+++ b/dev-libs/openssl/patches/openssl-1.0.0m.patchset
@@ -0,0 +1,72 @@
+From df00735cecc9c5ec0cdb9a9706e52b15f14057ec Mon Sep 17 00:00:00 2001
+From: Jerome Duval <jerome.duval@gmail.com>
+Date: Thu, 5 Jun 2014 15:47:46 +0000
+Subject: import patch from 1.0.0l
+
+
+diff --git a/Configure b/Configure
+index cd849e3..0ff7727 100755
+--- a/Configure
+++ b/Configure
+@@ -583,6 +583,10 @@ my %table=(
+ "uClinux-dist","$ENV{'CC'}:\$(CFLAGS)::-D_REENTRANT::\$(LDFLAGS) \$(LDLIBS):BN_LLONG:::::::::::::::$ENV{'LIBSSL_dlfcn'}:linux-shared:-fPIC:-shared:.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR):$ENV{'RANLIB'}::",
+ "uClinux-dist64","$ENV{'CC'}:\$(CFLAGS)::-D_REENTRANT::\$(LDFLAGS) \$(LDLIBS):SIXTY_FOUR_BIT_LONG:::::::::::::::$ENV{'LIBSSL_dlfcn'}:linux-shared:-fPIC:-shared:.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR):$ENV{'RANLIB'}::",
+ 
+##### Haiku
+"haiku-x86",	"gcc:-DL_ENDIAN -O2 -fomit-frame-pointer -Wall::-D_REENTRANT::-lnetwork:BN_LLONG ${x86_gcc_des} ${x86_gcc_opts}:${x86_elf_asm}:dlfcn:haiku-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
+"haiku-x86_64",	"gcc:-m64 -DL_ENDIAN -O2 -Wall -DMD32_REG_T=int::-D_REENTRANT::-lnetwork:SIXTY_FOUR_BIT_LONG RC4_CHUNK DES_INT DES_UNROLL:${x86_64_asm}:elf:dlfcn:haiku-shared:-fPIC:-m64:.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR):::64",
+
+ );
+ 
+ my @MK1MF_Builds=qw(VC-WIN64I VC-WIN64A
+diff --git a/Makefile.shared b/Makefile.shared
+index e753f44..cce510f 100644
+--- a/Makefile.shared
+++ b/Makefile.shared
+@@ -594,10 +594,10 @@ symlink.hpux:
+ symlink.cygwin symlink.alpha-osf1 symlink.tru64 symlink.tru64-rpath symlink.beos:
+ 
+ # Compatibility targets
+-link_o.bsd-gcc-shared link_o.linux-shared link_o.gnu-shared: link_o.gnu
+-link_a.bsd-gcc-shared link_a.linux-shared link_a.gnu-shared: link_a.gnu
+-link_app.bsd-gcc-shared link_app.linux-shared link_app.gnu-shared: link_app.gnu
+-symlink.bsd-gcc-shared symlink.bsd-shared symlink.linux-shared symlink.gnu-shared: symlink.gnu
+link_o.bsd-gcc-shared link_o.linux-shared link_o.gnu-shared link_o.haiku-shared: link_o.gnu
+link_a.bsd-gcc-shared link_a.linux-shared link_a.gnu-shared link_a.haiku-shared: link_a.gnu
+link_app.bsd-gcc-shared link_app.linux-shared link_app.gnu-shared link_app.haiku-shared: link_app.gnu
+symlink.bsd-gcc-shared symlink.bsd-shared symlink.linux-shared symlink.gnu-shared symlink.haiku-shared: symlink.gnu
+ link_o.bsd-shared: link_o.bsd
+ link_a.bsd-shared: link_a.bsd
+ link_app.bsd-shared: link_app.bsd
+diff --git a/config b/config
+index 30e9a37..c2894cc 100755
+--- a/config
+++ b/config
+@@ -134,6 +134,14 @@ case "${SYSTEM}:${RELEASE}:${VERSION}:${MACHINE}" in
+ 	echo "${MACHINE}-dg-dgux"; exit 0
+ 	;;
+ 
+    Haiku:*:BePC)
+	echo "i586-pc-haiku"; exit 0
+	;;
+
+    Haiku:*:*)
+	echo "${MACHINE}-unknown-haiku"; exit 0
+	;;
+
+     HI-UX:*)
+ 	echo "${MACHINE}-hi-hiux"; exit 0
+ 	;;
+@@ -799,6 +807,9 @@ case "$GUESSOS" in
+ 	    options="$options no-asm"
+ 	fi
+ 	;;
+     i586-*-haiku) OUT="haiku-x86" ;;
+     x86_64-*-haiku) OUT="haiku-x86_64" ;;
+
+   # these are all covered by the catchall below
+   # *-dgux) OUT="dgux" ;;
+   mips-sony-newsos4) OUT="newsos4-gcc" ;;
+-- 
+1.8.3.4
+
--- a/dev-util/byacc/byacc-20140422.recipe
+++ b/dev-util/byacc/byacc-20140422.recipe
@@ -0,0 +1,45 @@
+SUMMARY="Berkeley implementation of Yacc"
+DESCRIPTION="
+Berkeley Yacc (byacc) is generally conceded to be the best yacc variant \
+available. In contrast to bison, it is written to avoid dependencies upon a \
+particular compiler.
+"
+REVISION="1"
+LICENSE="Public Domain"
+COPYRIGHT="2002-2013,2014 by Thomas E. Dickey"
+HOMEPAGE="http://invisible-island.net/byacc/byacc.html"
+ARCHITECTURES="x86_gcc2"
+
+SRC_URI="ftp://invisible-island.net/byacc/byacc.tar.gz"
+CHECKSUM_SHA256="2f104c7e200dd86844d5f3521e12cb55fc48a9c3da3480a65fde2ca8c053bdcc"
+
+PROVIDES="
+	byacc = $portVersion
+	cmd:yacc = $portVersion
+"
+
+REQUIRES="
+	haiku >= $haikuVersion
+"
+
+BUILD_REQUIRES="
+	haiku_devel >= $haikuVersion
+"
+
+BUILD_PREREQUIRES="
+	cmd:awk
+	cmd:gcc
+	cmd:ld
+	cmd:make
+"
+
+BUILD()
+{
+	runConfigure --omit-dirs docDir ./configure
+	make
+}
+
+INSTALL()
+{
+	make install
+}
--- a/dev-util/posixtestsuite/posixtestsuite-1.5.2.recipe
+++ b/dev-util/posixtestsuite/posixtestsuite-1.5.2.recipe
@@ -1,28 +1,45 @@
+SUMMARY="An open source test suite for POSIX compliance"
 DESCRIPTION="
 The Open POSIX Test Suite is a test suite for POSIX 2001 APIs, not tied to \
 specific implementations.
 " 
 HOMEPAGE="http://posixtest.sourceforge.net/" 
-SRC_URI="http://sourceforge.net/projects/posixtest/files/posixtest/posixtestsuite-1.5.2/posixtestsuite-1.5.2.tar.gz/download"
-CHECKSUM_MD5="9a8e6516585c886fddc257270061b59c"
+SRC_URI="http://sourceforge.net/projects/posixtest/files/posixtest/posixtestsuite-1.5.2/posixtestsuite-1.5.2.tar.gz"
+CHECKSUM_SHA256="15a2185672127cba851d35ec9d538ff6148defdbb75f99c7e9c50aeba0f94757"
 REVISION="1"
-STATUS_HAIKU="stable"
-DEPEND=""
+
+ARCHITECTURES="x86_gcc2"
+SECONDARY_ARCHITECTURES="x86"
+
+PROVIDES="
+	posixtestsuite = $portVersion
+	"
+
+BUILD_REQUIRES="
+	haiku${secondaryArchSuffix}_devel >= $haikuVersion
+	"
+
+BUILD_PREREQUIRES="
+	cmd:find
+	cmd:cc$secondaryArchSuffix
+	cmd:ld$secondaryArchSuffix
+	cmd:make
+	"
+
+SOURCE_DIR="posixtestsuite"
+
 BUILD()
 {
-	cd posixtestsuite
-	make
+	make $jobArgs
 }

 INSTALL()
 {
-	cd posixtestsuite
 	make install
 }

 TEST()
 {
-	cd posixtestsuite
 	execute.sh
 }

--- a/haiku-apps/dockbert/dockbert-1.0.2b1.recipe
+++ b/haiku-apps/dockbert/dockbert-1.0.2b1.recipe
@@ -9,9 +9,10 @@ SRC_URI="git+https://github.com/HaikuArchives/DockBert#057c54674d"
 COPYRIGHT="2005 yellowTAB GmbH"
 LICENSE="BSD (3-clause)"

-REVISION="2"
+REVISION="3"

 ARCHITECTURES="x86_gcc2 x86 ?x86_64"
+SECONDARY_ARCHITECTURES="x86_gcc2 x86"

 PROVIDES="
 	dockbert = $portVersion
@@ -23,12 +24,12 @@ REQUIRES="
 	"

 BUILD_REQUIRES="
-	haiku_devel >= $haikuVersion
+	haiku${secondaryArchSuffix}_devel >= $haikuVersion
 	"

 BUILD_PREREQUIRES="
 	makefile_engine
-	cmd:gcc
+	cmd:gcc$secondaryArchSuffix
 	cmd:make
 	cmd:mkdepend
 	"
--- a/haiku-apps/netpulse/netpulse-0.2.3.recipe
+++ b/haiku-apps/netpulse/netpulse-0.2.3.recipe
@@ -29,13 +29,13 @@ BUILD_PREREQUIRES="

 BUILD()
 {
-	make $jobArgs
+	make $jobArgs OBJ_DIR=objects
 }

 INSTALL()
 {
 	mkdir -p $appsDir
-	cp objects*/NetPulse $appsDir/NetPulse
+	cp objects/NetPulse $appsDir/NetPulse

 	# Add a symlink to the Desktop applets directory in Deskbar
 	desktopAppletsDir="$dataDir/deskbar/menu/Desktop applets"
--- a/haiku-apps/paladin/paladin-git.recipe
+++ b/haiku-apps/paladin/paladin-git.recipe
@@ -41,18 +41,20 @@ BUILD_REQUIRES="
 	"

 BUILD_PREREQUIRES="
-	cmd:make
-	cmd:gcc
-	cmd:ld
-	cmd:jam
 	cmd:bison
+	cmd:find
 	cmd:flex
+	cmd:gcc
+	cmd:jam
+	cmd:ld
+	cmd:make
 	"

 USER_SETTINGS_FILE="settings/Paladin_settings"

 SOURCE_DIR="Paladin"

+PATCHES="paladin-git.patchset"
 BUILD()
 {
 	./buildsuite.sh 1
--- a/haiku-apps/paladin/patches/paladin-git.patchset
+++ b/haiku-apps/paladin/patches/paladin-git.patchset
@@ -0,0 +1,48 @@
+From cab97efc07e4a49f61d9ff9ca7864c193ad22a9e Mon Sep 17 00:00:00 2001
+From: Adrien Destugues <pulkomandy@pulkomandy.tk>
+Date: Mon, 2 Jun 2014 17:04:50 +0200
+Subject: Fix build for atomic_add volatile changes.
+
+
+diff --git a/Paladin/FindWindow.h b/Paladin/FindWindow.h
+index f6aff2c..d1a8951 100644
+--- a/Paladin/FindWindow.h
+++ b/Paladin/FindWindow.h
+@@ -45,7 +45,7 @@ private:
+ 	
+ 	thread_id		fThreadID;
+ 	int8			fThreadMode;
+-	vint32			fThreadQuitFlag;
+	int32			fThreadQuitFlag;
+ 	
+ 	BObjectList<BString>	fFileList;
+ 	DPath					fWorkingDir;
+diff --git a/Paladin/Paladin.cpp b/Paladin/Paladin.cpp
+index a09e30b..ed3c774 100644
+--- a/Paladin/Paladin.cpp
+++ b/Paladin/Paladin.cpp
+@@ -38,7 +38,7 @@ static int sReturnCode = 0;
+ 
+ static int32 sWindowCount = 0;
+ static BLocker sWindowLocker;
+-volatile int32 gQuitOnZeroWindows = 1;
+int32 gQuitOnZeroWindows = 1;
+ 
+ void
+ RegisterWindow(void)
+diff --git a/Paladin/Paladin.h b/Paladin/Paladin.h
+index e3ee7a5..97bf312 100644
+--- a/Paladin/Paladin.h
+++ b/Paladin/Paladin.h
+@@ -45,7 +45,7 @@ void DeregisterWindow(void);
+ int32 CountRegisteredWindows(void);
+ BWindow *WindowForProject(Project *proj);
+ 
+-extern volatile int32 gQuitOnZeroWindows;
+extern int32 gQuitOnZeroWindows;
+ 
+ #define APP_SIGNATURE "application/x-vnd.dw-Paladin"
+ 
+-- 
+1.8.3.4
+
--- a/haiku-libs/haikuwebkit/haikuwebkit-1.3.2.recipe
+++ b/haiku-libs/haikuwebkit/haikuwebkit-1.3.2.recipe
@@ -0,0 +1,114 @@
+SUMMARY="Open source web browser engine"
+DESCRIPTION="
+WebKit is an open source web browser engine. WebKit is also the name of the \
+Mac OS X system framework version of the engine that's used by Safari, \
+Dashboard, Mail, and many other OS X applications. WebKit's HTML and \
+JavaScript code began as a branch of the KHTML and KJS libraries from KDE.
+"
+HOMEPAGE="http://www.webkit.org/"
+COPYRIGHT="1998-2014 Apple Inc., Google Inc., et al"
+LICENSE="
+	GNU LGPL v2
+	GNU LGPL v2.1
+	MIT
+	"
+SRC_URI="https://github.com/haiku/webkit/archive/$portVersion.tar.gz"
+CHECKSUM_SHA256="9f620ab0c2e65a543f7976421e1a9dbc059c8a3dc7b8766860732792cdddd6bf"
+SRC_FILENAME="haikuwebkit-$portVersion.tar.gz"
+REVISION="1"
+ARCHITECTURES="x86 x86_64"
+if [ $effectiveTargetArchitecture != x86_gcc2 ]; then
+	# x86_gcc2 is fine as primary target architecture as long as we're building
+	# for a different secondary architecture.
+	ARCHITECTURES="$ARCHITECTURES x86_gcc2"
+fi
+SECONDARY_ARCHITECTURES="x86"
+
+
+if [ $effectiveTargetArchitecture == x86_64 ]; then
+	PATCHES="haikuwebkit-1.2.5.patchset"
+fi
+
+PROVIDES="
+	haikuwebkit$secondaryArchSuffix = $portVersion
+	lib:libWebKit$secondaryArchSuffix = $portVersion
+	cmd:jsc
+	"
+REQUIRES="
+	haiku$secondaryArchSuffix >= $haikuVersion
+	lib:libicuuc$secondaryArchSuffix
+	lib:libjpeg$secondaryArchSuffix
+	lib:libpng$secondaryArchSuffix
+	lib:libsqlite3$secondaryArchSuffix
+	lib:libxml2$secondaryArchSuffix
+	lib:libxslt$secondaryArchSuffix
+	lib:libz$secondaryArchSuffix
+	lib:libavcodec$secondaryArchSuffix
+	lib:libexecinfo$secondaryArchSuffix
+	lib:libstdc++$secondaryArchSuffix
+	lib:libGL$secondaryArchSuffix
+	"
+
+BUILD_REQUIRES="
+	haiku${secondaryArchSuffix}_devel >= $haikuVersion
+	haiku_devel >= $haikuVersion
+	devel:libicuuc$secondaryArchSuffix
+	devel:libjpeg$secondaryArchSuffix
+	devel:libpng$secondaryArchSuffix
+	devel:libsqlite3$secondaryArchSuffix
+	devel:libxml2$secondaryArchSuffix
+	devel:libxslt$secondaryArchSuffix
+	devel:libz$secondaryArchSuffix
+	devel:libavcodec$secondaryArchSuffix
+	devel:libexecinfo$secondaryArchSuffix
+	devel:libGL$secondaryArchSuffix
+	"
+BUILD_PREREQUIRES="
+	cmd:pkg_config
+	cmd:flex
+	cmd:bison
+	cmd:gcc$secondaryArchSuffix
+	cmd:gperf
+	cmd:ld$secondaryArchSuffix
+	cmd:m4
+	cmd:make
+	cmd:perl
+	cmd:python
+	cmd:cmake
+	cmd:ruby
+	"
+
+SOURCE_DIR="webkit-$portVersion"
+
+BUILD()
+{
+	export PKG_CONFIG_LIBDIR="`finddir B_SYSTEM_DIRECTORY`/$relativeDevelopLibDir/pkgconfig"
+	Tools/Scripts/build-webkit --haiku --no-webkit2 \
+		--cmakeargs="-DCMAKE_INSTALL_PREFIX=$prefix -DSHOULD_INSTALL_JS_SHELL=ON"
+}
+
+INSTALL()
+{
+	cd WebKitBuild/Release
+	make install
+
+	rm $developLibDir/*
+	prepareInstalledDevelLibs libWebKit
+
+	# devel package
+	packageEntries devel \
+		$developDir
+}
+
+# ----- devel package -------------------------------------------------------
+
+PROVIDES_devel="
+	haikuwebkit${secondaryArchSuffix}_devel = $portVersion
+	devel:libjavascriptcore$secondaryArchSuffix = $portVersion
+	devel:libwebcore$secondaryArchSuffix = $portVersion
+	devel:libWebKit$secondaryArchSuffix = $portVersion
+	devel:libwtf$secondaryArchSuffix = $portVersion
+	"
+REQUIRES_devel="
+	haikuwebkit$secondaryArchSuffix == $portVersion base
+	"
--- a/media-libs/libharu/libharu-2.1.0.recipe
+++ b/media-libs/libharu/libharu-2.1.0.recipe
@@ -1,26 +0,0 @@
-DESCRIPTION="C/C++ library for PDF generation" 
-HOMEPAGE="http://www.libharu.org/" 
-SRC_URI="http://libharu.org/files/libharu-2.1.0.tar.gz"
-REVISION="1"
-STATUS_HAIKU="stable"
-DEPEND="app-arch/zlib >= 1.25
-	media-libs/libpng >= 1.2.44"
-CHECKSUM_MD5="0623b8fb08ae1b28af08b2cdbd66b662"
-BUILD()
-{
-	cd libharu-2.1.0
-	libtoolize --force --install --copy
-	aclocal
-	autoconf
-	./configure --prefix=`finddir B_COMMON_DIRECTORY`
-	make
-}
-
-INSTALL()
-{
-	cd libharu-2.1.0
-	make install
-}
-
-#LICENSE=""
-#COPYRIGHT=""
--- a/media-libs/libharu/libharu-2.3.0.recipe
+++ b/media-libs/libharu/libharu-2.3.0.recipe
@@ -0,0 +1,85 @@
+SUMMARY="C/C++ library for PDF generation"
+DESCRIPTION="
+Haru is a free, cross platform, open-sourced software library for generating \
+PDF. It supports the following features.
+   1. Generating PDF files with lines, text, images.
+   2. Outline, text annotation, link annotation.
+   3. Compressing document with deflate-decode.
+   4. Embedding PNG, Jpeg images.
+   5. Embedding Type1 font and TrueType font.
+   6. Creating encrypted PDF files.
+   7. Using various character set (ISO8859-1~16, MSCP1250~8, KOI8-R).
+   8. Supporting CJK fonts and encodings.
+"
+HOMEPAGE="http://www.libharu.org/"
+COPYRIGHT="
+	2000-2006 Takeshi Kanno
+	2007-2009 Antony Dovgal et al.
+	"
+LICENSE="Zlib"
+SRC_URI="https://github.com/libharu/libharu/archive/RELEASE_2_3_0.tar.gz"
+SRC_FILENAME="libharu-2.3.0.tar.gz"
+CHECKSUM_SHA256="8f9e68cc5d5f7d53d1bc61a1ed876add1faf4f91070dbc360d8b259f46d9a4d2"
+REVISION="1"
+ARCHITECTURES="x86_gcc2 x86 ?x86_64"
+SECONDARY_ARCHITECTURES="x86_gcc2 x86"
+
+PATCHES="libharu-$portVersion.patchset"
+
+PROVIDES="
+	libharu$secondaryArchSuffix = $portVersion compat >= 2
+	lib:libhpdf$secondaryArchSuffix = 2.3.0 compat >= 2
+	"
+REQUIRES="
+	haiku$secondaryArchSuffix >= $haikuVersion
+	lib:libpng$secondaryArchSuffix
+	lib:libz$secondaryArchSuffix
+	"
+BUILD_REQUIRES="
+	haiku${secondaryArchSuffix}_devel >= $haikuVersion
+	devel:libpng$secondaryArchSuffix
+	devel:libz$secondaryArchSuffix
+	"
+BUILD_PREREQUIRES="
+	cmd:cmake
+	cmd:gcc$secondaryArchSuffix
+	cmd:ld$secondaryArchSuffix
+	cmd:make
+	"
+
+SOURCE_DIR="libharu-RELEASE_2_3_0"
+
+BUILD()
+{
+	rm -rf build
+	mkdir build 
+	cd build
+	
+	cmake -DCMAKE_INSTALL_PREFIX=$prefix ..
+	make $jobArgs
+}
+
+INSTALL()
+{
+	cd build
+	make install
+	
+	mv $libDir/libhpdfs.a $libDir/libhpdf.a
+	mv $libDir/libhpdf.so $libDir/libhpdf.so.2.3
+	ln -s libhpdf.so.2.3 $libDir/libhpdf.so
+	prepareInstalledDevelLibs libhpdf
+
+	# devel package
+	packageEntries devel \
+		$developDir
+}
+
+# ----- devel package -------------------------------------------------------
+
+PROVIDES_devel="
+	libharu${secondaryArchSuffix}_devel = $portVersion compat >= 2
+	devel:libhpdf$secondaryArchSuffix = 2.3.0 compat >= 2
+	"
+REQUIRES_devel="
+	libharu$secondaryArchSuffix == $portVersion base
+	"
--- a/media-libs/libharu/patches/libharu-2.1.0.patch
+++ b/media-libs/libharu/patches/libharu-2.1.0.patch
@@ -1,49 +0,0 @@
-diff -urN libharu-2.1.0/configure.in libharu-2.1.0-haiku/configure.in
--- libharu-2.1.0/configure.in	2008-05-27 18:23:31.013107200 +0000
-+++ libharu-2.1.0-haiku/configure.in	2010-09-25 20:01:55.000000000 +0000
-@@ -21,10 +21,10 @@
- dnl Check for header files
- AC_CHECK_HEADERS(string.h strings.h unistd.h stdint.h)
- 
-AC_CHECK_LIB([m], [floor], [LIBS="$LIBS -lm"], [AC_MSG_ERROR([can't continue without libm])])
-+AC_CHECK_LIB([m], [floor], [LIBS="$LIBS -lm"], [LIBS="$LIBS"])
- 
- DEFAULT_INSTALL_PREFIX="/usr/local"
-STANDARD_PREFIXES="/usr /usr/local /opt /local"
-+STANDARD_PREFIXES="/usr /usr/local /opt /local /boot/common"
- 
- HPDF_MAJOR_VERSION=2
- HPDF_MINOR_VERSION=1
-diff -urN libharu-2.1.0/src/hpdf_u3d.c libharu-2.1.0-haiku/src/hpdf_u3d.c
--- libharu-2.1.0/src/hpdf_u3d.c	2008-05-27 18:23:31.051904512 +0000
-+++ libharu-2.1.0-haiku/src/hpdf_u3d.c	2010-09-25 20:13:02.000000000 +0000
-@@ -542,18 +542,19 @@
- 	return ret;
- }
- 
-#define normalize(x, y, z)		\
-{					\
-	HPDF_REAL modulo;			\
-	modulo = sqrtf(x*x + y*y + z*z);	\
-	if (modulo != 0.0)			\
-	{					\
-		x = x/modulo;			\
-		y = y/modulo;			\
-		z = z/modulo;			\
-	}					\
-+void normalize(x, y, z)		
-+{					
-+	HPDF_REAL modulo;			
-+	modulo = sqrtf(x*x + y*y + z*z);	
-+	if (modulo != 0.0)			
-+	{					
-+		x = x/modulo;			
-+		y = y/modulo;			
-+		z = z/modulo;			
-+	}					
- }
- 
-+
- /* building the transformation matrix*/
- /* #1,#2,#3 centre of orbit coordinates (coo)*/
- /* #4,#5,#6 centre of orbit to camera direction vector (c2c)*/
--- a/media-libs/libharu/patches/libharu-2.3.0.patchset
+++ b/media-libs/libharu/patches/libharu-2.3.0.patchset
@@ -0,0 +1,47 @@
+From 3ad4249e4222d11b2a919e8174a3de01c147f97c Mon Sep 17 00:00:00 2001
+From: Jerome Duval <jerome.duval@gmail.com>
+Date: Wed, 4 Jun 2014 17:26:56 +0000
+Subject: haiku patch
+
+
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index 354ca75..cc1fef7 100644
+--- a/CMakeLists.txt
+++ b/CMakeLists.txt
+@@ -207,13 +207,9 @@ set(
+ )
+ 
+ # install header files
+-install(FILES ${haru_HDRS} DESTINATION include)
+install(FILES ${haru_HDRS} DESTINATION "develop/headers")
+ 
+ # install various files
+-install(FILES README CHANGES INSTALL DESTINATION .)
+-if(NOT DEVPAK)
+-  install(DIRECTORY if DESTINATION .)
+-endif(NOT DEVPAK)
+ if(DEVPAK)
+   install(FILES ${CMAKE_BINARY_DIR}/libharu.DevPackage DESTINATION .)
+ endif(DEVPAK)
+diff --git a/cmake/modules/haru.cmake b/cmake/modules/haru.cmake
+index 95647b9..0495d6c 100644
+--- a/cmake/modules/haru.cmake
+++ b/cmake/modules/haru.cmake
+@@ -27,11 +27,11 @@ check_include_files(unistd.h LIBHPDF_HAVE_UNISTD_H)
+ # =======================================================================
+ # On windows systems the math library is not separated so do not specify
+ # it unless you are on a non-windows system.
+-if(NOT WIN32)
+if(NOT WIN32 AND NOT HAIKU)
+   find_library(MATH_LIB NAMES m PATHS /usr/local/lib /usr/lib)
+   if(NOT MATH_LIB)
+     message(FATAL_ERROR "Cannot find required math library")
+   endif(NOT MATH_LIB)
+-else(NOT WIN32)
+else(NOT WIN32 AND NOT HAIKU)
+   set(MATH_LIB)
+-endif(NOT WIN32)
+endif(NOT WIN32 AND NOT HAIKU)
+-- 
+1.8.3.4
+
--- a/media-libs/libsndfile/libsndfile-1.0.25.recipe
+++ b/media-libs/libsndfile/libsndfile-1.0.25.recipe
@@ -10,11 +10,11 @@ COPYRIGHT="
 LICENSE="GNU LGPL v2.1"
 SRC_URI="http://www.mega-nerd.com/libsndfile/files/$portVersionedName.tar.gz"
 CHECKSUM_SHA256="59016dbd326abe7e2366ded5c344c853829bebfd1702ef26a07ef662d6aa4882"
-REVISION="1"
+REVISION="2"
 ARCHITECTURES="!x86_gcc2 x86 x86_64"
 SECONDARY_ARCHITECTURES="!x86_gcc2 x86"

-PATCHES="$portVersionedName.patchset"
+PATCHES="libsndfile-$portVersion.patchset"

 PROVIDES="
 	libsndfile$secondaryArchSuffix = $portVersion compat >= 1
@@ -51,7 +51,7 @@ BUILD_PREREQUIRES="
 	cmd:ld$secondaryArchSuffix
 	cmd:libtoolize
 	cmd:make
-	cmd:pkg_config
+	cmd:pkg_config$secondaryArchSuffix
 	"

 BUILD()
--- a/media-libs/libsndfile/patches/libsndfile-1.0.25.patchset
+++ b/media-libs/libsndfile/patches/libsndfile-1.0.25.patchset
@@ -1,4 +1,4 @@
-From c94a905e75ff6769bd4289d56f687d6c2a8f6ba4 Mon Sep 17 00:00:00 2001
+From df98cdcd4887d72c46f78e7e63f7328189427476 Mon Sep 17 00:00:00 2001
 From: Jerome Duval <jerome.duval@gmail.com>
 Date: Tue, 20 May 2014 16:43:24 +0000
 Subject: haiku patch
@@ -19,3 +19,28 @@ index 8926fc6..ef9636b 100644
 -- 
 1.8.3.4

+
+From aa846ae9c25ea6a88138edda20eec82e96639a3e Mon Sep 17 00:00:00 2001
+From: Kacper Kasper <kacperkasper@gmail.com>
+Date: Sun, 8 Jun 2014 17:05:44 +0200
+Subject: Fix documentation path
+
+
+diff --git a/configure.ac b/configure.ac
+index 20ba55a..9604249 100644
+--- a/configure.ac
+++ b/configure.ac
+@@ -484,6 +484,10 @@ else
+ 	htmldocdir=$prefix/share/doc/libsndfile1-dev/html
+ 	fi
+ 
+if test $host_os = "haiku" ; then
+	htmldocdir=$prefix/documentation/packages/libsndfile
+fi
+
+ if test x$enable_bow_docs = "xyes" ; then
+ 	HTML_BGCOLOUR="white"
+ 	HTML_FGCOLOUR="black"
+-- 
+1.8.3.4
+
--- a/media-libs/tiff/tiff-3.9.6.recipe
+++ b/media-libs/tiff/tiff-3.9.6.recipe
@@ -16,7 +16,7 @@ REVISION="2"
 ARCHITECTURES="x86_gcc2 x86 x86_64"
 SECONDARY_ARCHITECTURES="x86_gcc2 x86"

-PATCHES="${portVersionedName}.patchset"
+PATCHES="tiff-${portVersion}.patchset"

 PROVIDES="
 	tiff$secondaryArchSuffix = $portVersion compat >= 3
--- a/media-libs/tiff/tiff-4.0.2.recipe
+++ b/media-libs/tiff/tiff-4.0.2.recipe
@@ -12,7 +12,7 @@ LICENSE="MIT"
 COPYRIGHT="1988-1997 Sam Leffler
 	1991-1997 Silicon Graphics, Inc."

-REVISION="3"
+REVISION="4"
 ARCHITECTURES="x86_gcc2 x86 ?x86_64"
 SECONDARY_ARCHITECTURES="x86_gcc2 x86"

@@ -26,6 +26,7 @@ REQUIRES="
 	lib:libGL$secondaryArchSuffix
 	lib:libjpeg$secondaryArchSuffix
 	lib:libz$secondaryArchSuffix
+	lib:libstdc++$secondaryArchSuffix
 	"
 BUILD_REQUIRES="
 	devel:libGL$secondaryArchSuffix
--- a/media-sound/twolame/twolame-0.3.13.recipe
+++ b/media-sound/twolame/twolame-0.3.13.recipe
@@ -1,26 +1,78 @@
-DESCRIPTION="TwoLAME MPEG Audio Layer 2 encoder" 
+SUMMARY="TwoLAME MPEG Audio Layer 2 encoder" 
+DESCRIPTION="
+	TwoLAME is an optimised MPEG Audio Layer 2 (MP2) encoder based on tooLAME \
+	by Mike Cheng, which in turn is based upon the ISO dist10 code and \
+	portions of LAME.
+"
 HOMEPAGE="http://www.twolame.org" 
 SRC_URI="http://downloads.sourceforge.net/twolame/twolame-0.3.13.tar.gz"
+LICENSE="GNU LGPL v2.1"
+COPYRIGHT="2004-2006 The TwoLAME Project"
+CHECKSUM_SHA256="98f332f48951f47f23f70fd0379463aff7d7fb26f07e1e24e42ddef22cc6112a"
 REVISION="1"
-STATUS_HAIKU="stable"
-DEPEND=""
-CHECKSUM_MD5="4113d8aa80194459b45b83d4dbde8ddb"
+ARCHITECTURES="x86_gcc2 x86 ?x86_64"
+SECONDARY_ARCHITECTURES="x86_gcc2 x86"
+
+PROVIDES="
+	twolame$secondaryArchSuffix = $portVersion compat >= 0
+	cmd:twolame
+	lib:libtwolame$secondaryArchSuffix = 0.0.0 compat >= 0
+"
+
+REQUIRES="
+	haiku$secondaryArchSuffix >= $haikuVersion
+	lib:libsndfile$secondaryArchSuffix
+	lib:libFLAC$secondaryArchSuffix
+	lib:libogg$secondaryArchSuffix
+	lib:libvorbis$secondaryArchSuffix
+"
+
+BUILD_REQUIRES="
+	devel:libsndfile$secondaryArchSuffix
+	devel:libFLAC$secondaryArchSuffix
+	devel:libogg$secondaryArchSuffix
+	devel:libvorbis$secondaryArchSuffix
+"
+
+BUILD_PREREQUIRES="
+	haiku${secondaryArchSuffix}_devel >= $haikuVersion
+	cmd:gcc$secondaryArchSuffix
+	cmd:ld$secondaryArchSuffix
+	cmd:pkg_config$secondaryArchSuffix
+	cmd:libtoolize
+	cmd:aclocal
+	cmd:autoconf
+	cmd:autoheader
+	cmd:automake
+	cmd:make
+"
+
 BUILD()
 {
-	cd twolame-0.3.13
-	COMMON_DOCS=`finddir B_COMMON_DOCUMENTATION_DIRECTORY`
-	./configure --prefix=`finddir B_COMMON_DIRECTORY` \
-		--datadir=`finddir B_COMMON_DATA_DIRECTORY` \
-		--docdir=$COMMON_DOCS/doc/twolame \
-		--mandir=$COMMON_DOCS/man
-	make
+	libtoolize --force --copy --install
+	aclocal
+	autoconf
+	autoheader
+	automake --add-missing
+	runConfigure ./configure
+	make $jobArgs
 }

 INSTALL()
 {
-	cd twolame-0.3.13
 	make install
+	
+	prepareInstalledDevelLib libtwolame
+	fixPkgconfig
+	
+	packageEntries devel $developDir
 }

-LICENSE="GNU LGPL v2.1"
-COPYRIGHT="2004-2006 The TwoLAME Project"
+PROVIDES_devel="
+	twolame${secondaryArchSuffix}_devel = $portVersion compat >= 0
+	devel:libtwolame$secondaryArchSuffix = $portVersion compat >= 0
+"
+
+REQUIRES_devel="
+	twolame$secondaryArchSuffix == $portVersion base
+"
--- a/net-analyzer/netperf/licenses/netperf
+++ b/net-analyzer/netperf/licenses/netperf
--- a/net-analyzer/netperf/netperf-2.6.0.recipe
+++ b/net-analyzer/netperf/netperf-2.6.0.recipe
@@ -0,0 +1,53 @@
+SUMMARY="Network performance benchmark including tests for TCP, UDP, and more."
+DESCRIPTION="
+Netperf is a benchmark that can be used to measure the performance of many \
+different types of networking. It provides tests for both unidirectional \
+throughput, and end-to-end latency. The environments currently measureable by \
+netperf include:
+ * TCP and UDP via BSD Sockets for both IPv4 and IPv6
+ * DLPI
+ * Unix Domain Sockets
+ * SCTP for both IPv4 and IPv6
+"
+HOMEPAGE="http://netperf.org"
+SRC_URI="ftp://ftp.netperf.org/${portName}/${portName}-${portVersion}.tar.bz2"
+CHECKSUM_SHA256="cd8dac710d4273d29f70e8dbd09353a6362ac58a11926e0822233c0cb230323a"
+LICENSE="netperf"
+COPYRIGHT="1993 Hewlett-Packard Company"
+REVISION="1"
+
+ARCHITECTURES="x86_gcc2"
+
+PROVIDES="
+	netperf = $portVersion
+	cmd:netperf
+	cmd:netserver
+	"
+REQUIRES="
+	haiku >= $haikuVersion
+	"
+BUILD_REQUIRES="
+	haiku_devel >= $haikuVersion
+	"
+BUILD_PREREQUIRES="
+	cmd:awk
+	cmd:gcc
+	cmd:make
+	"
+
+PATCHES="netperf-2.6.0.patchset"
+BUILD()
+{
+	runConfigure ./configure
+	make
+}
+
+INSTALL()
+{
+	make install
+}
+
+TEST()
+{
+	make check
+}
--- a/net-analyzer/netperf/patches/netperf-2.6.0.patchset
+++ b/net-analyzer/netperf/patches/netperf-2.6.0.patchset
@@ -0,0 +1,22 @@
+From 08c3cdbadfc2679183619f71d05bae03c43cb23f Mon Sep 17 00:00:00 2001
+From: Adrien Destugues <pulkomandy@pulkomandy.tk>
+Date: Wed, 4 Jun 2014 14:44:30 +0200
+Subject: Add missing include.
+
+
+diff --git a/src/netserver.c b/src/netserver.c
+index 379a106..55c202b 100644
+--- a/src/netserver.c
+++ b/src/netserver.c
+@@ -75,6 +75,8 @@ char	netserver_id[]="\
+ #include <sys/ioctl.h>
+ #endif
+ 
+#include <sys/select.h>
+
+ #if HAVE_SYS_SOCKET_H
+ #include <sys/socket.h>
+ #endif
+-- 
+1.8.3.4
+
--- a/net-misc/wget/patches/wget-1.15.patchset
+++ b/net-misc/wget/patches/wget-1.15.patchset
@@ -1,4 +1,4 @@
-From d44e24178a9dd9864e7ac068249444a1d95b9af1 Mon Sep 17 00:00:00 2001
+From 242dd3e8ecdcefbd023b47092cbc19ce806fdacb Mon Sep 17 00:00:00 2001
 From: Jerome Duval <jerome.duval@gmail.com>
 Date: Mon, 19 May 2014 15:38:37 +0000
 Subject: apply wget-1.14.patch
@@ -95,7 +95,7 @@ index 3f27ea0..3cd3ed9 100644
 1.8.3.4


-From d91114a406b6b16542a77b55ebe140314ce803c1 Mon Sep 17 00:00:00 2001
+From 6bc747571c02e44994578c13d5920a41f9a68a50 Mon Sep 17 00:00:00 2001
 From: Jerome Duval <jerome.duval@gmail.com>
 Date: Mon, 19 May 2014 15:47:24 +0000
 Subject: apply and augment wget-1.14-build-fixes.patch
@@ -146,18 +146,10 @@ index 1bb44b4..5285983 100644
         {
           xfree (url_text);
 diff --git a/src/http.c b/src/http.c
-index 5715df6..38ee4b1 100644
+index 5715df6..d6e875c 100644
 --- a/src/http.c
 +++ b/src/http.c
-@@ -29,6 +29,7 @@ Corresponding Source for a non-source form of such a combination
- shall include the source code for the parts of OpenSSL used as well
- as that of the covered work.  */
- 
-+#define __USE_GNU
- #include "wget.h"
- 
- #include <stdio.h>
-@@ -1067,6 +1068,7 @@ extract_param (const char **source, param_token *name, param_token *value,
+@@ -1067,6 +1067,7 @@ extract_param (const char **source, param_token *name, param_token *value,
                char separator)
 {
   const char *p = *source;
@@ -165,7 +157,7 @@ index 5715df6..38ee4b1 100644
 
   while (c_isspace (*p)) ++p;
   if (!*p)
-@@ -1122,7 +1124,7 @@ extract_param (const char **source, param_token *name, param_token *value,
+@@ -1122,7 +1123,7 @@ extract_param (const char **source, param_token *name, param_token *value,
     }
   *source = p;
 
@@ -174,7 +166,7 @@ index 5715df6..38ee4b1 100644
   if (NOT_RFC2231 != param_type)
     {
       modify_param_value(value, param_type);
-@@ -1512,6 +1514,7 @@ read_response_body (struct http_stat *hs, int sock, FILE *fp, wgint contlen,
+@@ -1512,6 +1513,7 @@ read_response_body (struct http_stat *hs, int sock, FILE *fp, wgint contlen,
   int warc_payload_offset = 0;
   FILE *warc_tmp = NULL;
   int warcerr = 0;
@@ -182,7 +174,7 @@ index 5715df6..38ee4b1 100644
 
   if (opt.warc_filename != NULL)
     {
-@@ -1548,7 +1551,7 @@ read_response_body (struct http_stat *hs, int sock, FILE *fp, wgint contlen,
+@@ -1548,7 +1550,7 @@ read_response_body (struct http_stat *hs, int sock, FILE *fp, wgint contlen,
     }
 
   /* Read the response body.  */
@@ -191,7 +183,7 @@ index 5715df6..38ee4b1 100644
   if (contlen != -1)
     /* If content-length is present, read that much; otherwise, read
        until EOF.  The HTTP spec doesn't require the server to
-@@ -1653,6 +1656,7 @@ static uerr_t
+@@ -1653,6 +1655,7 @@ static uerr_t
 gethttp (struct url *u, struct http_stat *hs, int *dt, struct url *proxy,
          struct iri *iri, int count)
 {
@@ -199,7 +191,7 @@ index 5715df6..38ee4b1 100644
   struct request *req;
 
   char *type;
-@@ -2125,10 +2129,11 @@ gethttp (struct url *u, struct http_stat *hs, int *dt, struct url *proxy,
+@@ -2125,10 +2128,11 @@ gethttp (struct url *u, struct http_stat *hs, int *dt, struct url *proxy,
           if (write_error >= 0 && warc_tmp != NULL)
             {
               /* Remember end of headers / start of payload. */
@@ -212,7 +204,7 @@ index 5715df6..38ee4b1 100644
               if (warc_tmp_written != body_data_size)
                 write_error = -2;
             }
-@@ -2309,6 +2314,7 @@ read_header:
+@@ -2309,6 +2313,7 @@ read_header:
 
   if (statcode == HTTP_STATUS_UNAUTHORIZED)
     {
@@ -220,7 +212,7 @@ index 5715df6..38ee4b1 100644
       /* Authorization is required.  */
 
       /* Normally we are not interested in the response body.
-@@ -2347,7 +2353,7 @@ read_header:
+@@ -2347,7 +2352,7 @@ read_header:
         }
 
       pconn.authorized = false;
--- a/net-misc/wget/wget-1.15.recipe
+++ b/net-misc/wget/wget-1.15.recipe
@@ -9,7 +9,7 @@ SRC_URI="http://ftp.gnu.org/gnu/wget/wget-1.15.tar.gz"
 CHECKSUM_SHA256="52126be8cf1bddd7536886e74c053ad7d0ed2aa89b4b630f76785bac21695fcd"
 LICENSE="GNU GPL v3"
 COPYRIGHT="1996-2013 Free Software Foundation"
-REVISION="1"
+REVISION="2"
 ARCHITECTURES="x86_gcc2 x86 x86_64"
 SECONDARY_ARCHITECTURES="x86 x86_gcc2"

--- a/sys-apps/grep/grep-2.20.recipe
+++ b/sys-apps/grep/grep-2.20.recipe
@@ -0,0 +1,68 @@
+SUMMARY="GNU regular expression matcher"
+DESCRIPTION="
+The grep command searches one or more input files for lines containing a match \
+to a specified pattern. By default, grep prints the matching lines.
+"
+HOMEPAGE="http://www.gnu.org/software/grep/"
+LICENSE="GNU GPL v3"
+COPYRIGHT="1992-2014 Free Software Foundation, Inc."
+SRC_URI="http://ftp.gnu.org/gnu/grep/grep-2.20.tar.xz"
+CHECKSUM_SHA256="f0af452bc0d09464b6d089b6d56a0a3c16672e9ed9118fbe37b0b6aeaf069a65"
+REVISION="1"
+ARCHITECTURES="x86_gcc2 x86 x86_64 arm"
+
+PATCHES="grep-2.20.patchset"
+
+PROVIDES="
+	grep = $portVersion compat >= 2
+	cmd:egrep = $portVersion compat >= 2
+	cmd:fgrep = $portVersion compat >= 2
+	cmd:grep = $portVersion compat >= 2
+	"
+REQUIRES="
+	haiku >= $haikuVersion
+	lib:libiconv
+	lib:libintl
+	"
+BUILD_REQUIRES="
+	devel:libiconv
+	devel:libintl
+	"
+BUILD_PREREQUIRES="
+	haiku_devel >= $haikuVersion
+	cmd:aclocal
+	cmd:autoconf
+	cmd:automake
+	cmd:gcc
+	cmd:gettext
+	cmd:ld
+	cmd:libtoolize
+	cmd:make
+	"
+
+defineDebugInfoPackage grep \
+	$binDir/grep
+
+
+BUILD()
+{
+	libtoolize --force --copy --install
+	aclocal -I m4
+	autoconf
+	runConfigure ./configure \
+		--disable-perl-regexp --disable-gcc-warnings
+	make $jobArgs
+}
+
+INSTALL()
+{
+	make install
+
+	rm $libDir/charset.alias
+	rmdir $libDir
+}
+
+TEST()
+{
+	make check
+}
--- a/sys-apps/grep/patches/grep-2.20.patchset
+++ b/sys-apps/grep/patches/grep-2.20.patchset
@@ -0,0 +1,420 @@
+From 38dd3e2a6c52f5b15da9502d582f290b036f0e85 Mon Sep 17 00:00:00 2001
+From: Jerome Duval <jerome.duval@gmail.com>
+Date: Wed, 4 Jun 2014 19:20:57 +0000
+Subject: gcc2 patch
+
+
+diff --git a/lib/fts.c b/lib/fts.c
+index 500e92c..e2180c7 100644
+--- a/lib/fts.c
+++ b/lib/fts.c
+@@ -1293,6 +1293,7 @@ fts_build (register FTS *sp, int type)
+         int dir_fd;
+         FTSENT *cur = sp->fts_cur;
+         bool continue_readdir = !!cur->fts_dirp;
+		size_t max_entries;
+ 
+         /* When cur->fts_dirp is non-NULL, that means we should
+            continue calling readdir on that existing DIR* pointer
+@@ -1354,7 +1355,7 @@ fts_build (register FTS *sp, int type)
+            function.  But when no such function is specified, we can read
+            entries in batches that are large enough to help us with inode-
+            sorting, yet not so large that we risk exhausting memory.  */
+-        size_t max_entries = (sp->fts_compar == NULL
+        max_entries = (sp->fts_compar == NULL
+                               ? FTS_MAX_READDIR_ENTRIES : SIZE_MAX);
+ 
+         /*
+diff --git a/src/dfasearch.c b/src/dfasearch.c
+index 77b4e3e..076f49c 100644
+--- a/src/dfasearch.c
+++ b/src/dfasearch.c
+@@ -95,13 +95,17 @@ kwsmusts (void)
+          of the matching string that it chooses. */
+       for (; dm; dm = dm->next)
+         {
+          char *must;
+          char *mp;
+          size_t old_len;
+          size_t new_len;
+           if (!dm->exact)
+             continue;
+           ++kwset_exact_matches;
+-          size_t old_len = strlen (dm->must);
+-          size_t new_len = old_len + dm->begline + dm->endline;
+-          char *must = xmalloc (new_len);
+-          char *mp = must;
+          old_len = strlen (dm->must);
+          new_len = old_len + dm->begline + dm->endline;
+          must = xmalloc (new_len);
+          mp = must;
+           *mp = eolbyte;
+           mp += dm->begline;
+           begline |= dm->begline;
+@@ -126,6 +130,7 @@ kwsmusts (void)
+ void
+ GEAcompile (char const *pattern, size_t size, reg_syntax_t syntax_bits)
+ {
+  char const *p;
+   size_t total = size;
+   char *motif;
+ 
+@@ -138,9 +143,10 @@ GEAcompile (char const *pattern, size_t size, reg_syntax_t syntax_bits)
+      "[\nallo\n]\n", where the patterns are "[", "allo" and "]", and
+      this should be a syntax error.  The same for backref, where the
+      backref should be local to each pattern.  */
+-  char const *p = pattern;
+  p = pattern;
+   do
+     {
+      char const *err;
+       size_t len;
+       char const *sep = memchr (p, '\n', total);
+       if (sep)
+@@ -158,7 +164,7 @@ GEAcompile (char const *pattern, size_t size, reg_syntax_t syntax_bits)
+       patterns = xnrealloc (patterns, pcount + 1, sizeof *patterns);
+       patterns[pcount] = patterns0;
+ 
+-      char const *err = re_compile_pattern (p, len,
+      err = re_compile_pattern (p, len,
+                                             &(patterns[pcount].regexbuf));
+       if (err)
+         error (EXIT_TROUBLE, 0, "%s", err);
+@@ -218,6 +224,7 @@ EGexecute (char const *buf, size_t size, size_t *match_size,
+   size_t i;
+   struct dfa *superset = dfasuperset (dfa);
+   bool dfafast = dfaisfast (dfa);
+  size_t off;
+ 
+   mb_start = buf;
+   buflim = buf + size;
+@@ -448,7 +455,7 @@ EGexecute (char const *buf, size_t size, size_t *match_size,
+  success:
+   len = end - beg;
+  success_in_len:;
+-  size_t off = beg - buf;
+  off = beg - buf;
+   *match_size = len;
+   return off;
+ }
+diff --git a/src/dosbuf.c b/src/dosbuf.c
+index 9ac2d13..92383d2 100644
+--- a/src/dosbuf.c
+++ b/src/dosbuf.c
+@@ -95,11 +95,11 @@ guess_type (char *buf, size_t buflen)
+ static int
+ undossify_input (char *buf, size_t buflen)
+ {
+  int chars_left = 0;
+
+   if (! O_BINARY)
+     return buflen;
+ 
+-  int chars_left = 0;
+-
+   if (totalcc == 0)
+     {
+       /* New file: forget everything we knew about character
+@@ -186,12 +186,12 @@ undossify_input (char *buf, size_t buflen)
+ static off_t
+ dossified_pos (off_t byteno)
+ {
+-  if (! O_BINARY)
+-    return byteno;
+-
+   off_t pos_lo;
+   off_t pos_hi;
+ 
+  if (! O_BINARY)
+    return byteno;
+
+   if (dos_file_type != DOS_TEXT || dos_report_unix_offset)
+     return byteno;
+ 
+diff --git a/src/grep.c b/src/grep.c
+index 7c0f8a8..7e3f8dd 100644
+--- a/src/grep.c
+++ b/src/grep.c
+@@ -460,6 +460,7 @@ file_is_binary (char const *buf, size_t bufsize, int fd, struct stat const *st)
+   /* If the file has holes, it must contain a null byte somewhere.  */
+   if (SEEK_HOLE != SEEK_END && usable_st_size (st))
+     {
+      off_t hole_start;
+       off_t cur = bufsize;
+       if (O_BINARY || fd == STDIN_FILENO)
+         {
+@@ -469,7 +470,7 @@ file_is_binary (char const *buf, size_t bufsize, int fd, struct stat const *st)
+         }
+ 
+       /* Look for a hole after the current location.  */
+-      off_t hole_start = lseek (fd, cur, SEEK_HOLE);
+      hole_start = lseek (fd, cur, SEEK_HOLE);
+       if (0 <= hole_start)
+         {
+           if (lseek (fd, cur, SEEK_SET) < 0)
+@@ -983,11 +984,13 @@ prtext (char const *beg, char const *lim)
+ {
+   static bool used;	/* Avoid printing SEP_STR_GROUP before any output.  */
+   char eol = eolbyte;
+  char const *p;
+  intmax_t n;
+ 
+   if (!out_quiet && pending > 0)
+     prpending (beg);
+ 
+-  char const *p = beg;
+  p = beg;
+ 
+   if (!out_quiet)
+     {
+@@ -1020,7 +1023,6 @@ prtext (char const *beg, char const *lim)
+         }
+     }
+ 
+-  intmax_t n;
+   if (out_invert)
+     {
+       /* One or more lines are output.  */
+@@ -1103,6 +1105,7 @@ grepbuf (char const *beg, char const *lim)
+ 
+   for (p = beg; p < lim; p = endp)
+     {
+      char const *b;
+       size_t match_size;
+       size_t match_offset = do_execute (p, lim - p, &match_size);
+       if (match_offset == (size_t) -1)
+@@ -1112,7 +1115,7 @@ grepbuf (char const *beg, char const *lim)
+           match_offset = lim - p;
+           match_size = 0;
+         }
+-      char const *b = p + match_offset;
+      b = p + match_offset;
+       endp = b + match_size;
+       /* Avoid matching the empty line at the end of the buffer. */
+       if (!out_invert && b == lim)
+@@ -1942,6 +1945,7 @@ main (int argc, char **argv)
+   int fread_errno;
+   intmax_t default_context;
+   FILE *fp;
+  struct stat tmp_stat;
+   exit_failure = EXIT_TROUBLE;
+   initialize_main (&argc, &argv);
+   set_program_name (argv[0]);
+@@ -2297,7 +2301,6 @@ main (int argc, char **argv)
+   if (show_help)
+     usage (EXIT_SUCCESS);
+ 
+-  struct stat tmp_stat;
+   if (fstat (STDOUT_FILENO, &tmp_stat) == 0 && S_ISREG (tmp_stat.st_mode))
+     out_stat = tmp_stat;
+ 
+diff --git a/src/kwsearch.c b/src/kwsearch.c
+index 6bd516a..c5e7e55 100644
+--- a/src/kwsearch.c
+++ b/src/kwsearch.c
+@@ -38,16 +38,18 @@ Fcompile (char const *pattern, size_t size)
+ {
+   size_t total = size;
+   mb_len_map_t *map = NULL;
+  char const *p;
+   char const *pat = (match_icase && MB_CUR_MAX > 1
+                      ? mbtoupper (pattern, &total, &map)
+                      : pattern);
+ 
+   kwsinit (&kwset);
+ 
+-  char const *p = pat;
+  p = pat;
+   do
+     {
+       size_t len;
+      char *buf = NULL;
+       char const *sep = memchr (p, '\n', total);
+       if (sep)
+         {
+@@ -61,7 +63,6 @@ Fcompile (char const *pattern, size_t size)
+           total = 0;
+         }
+ 
+-      char *buf = NULL;
+       if (match_lines)
+         {
+           buf = xmalloc (len + 2);
+@@ -110,6 +111,7 @@ Fexecute (char const *buf, size_t size, size_t *match_size,
+   char eol = eolbyte;
+   struct kwsmatch kwsmatch;
+   size_t ret_val;
+  size_t off;
+   mb_len_map_t *map = NULL;
+ 
+   if (MB_CUR_MAX > 1)
+@@ -179,7 +181,7 @@ Fexecute (char const *buf, size_t size, size_t *match_size,
+     --beg;
+   len = end - beg;
+  success_in_beg_and_len:;
+-  size_t off = beg - buf;
+  off = beg - buf;
+   mb_case_map_apply (map, &off, &len);
+ 
+   *match_size = len;
+diff --git a/src/kwset.c b/src/kwset.c
+index 6d21893..8df7cd4 100644
+--- a/src/kwset.c
+++ b/src/kwset.c
+@@ -162,6 +162,7 @@ kwsincr (kwset_t kwset, char const *text, size_t len)
+      installing new nodes when necessary. */
+   while (len--)
+     {
+	  int depth = 1;
+       unsigned char uc = *--text;
+       unsigned char label = trans ? trans[uc] : uc;
+ 
+@@ -173,8 +174,7 @@ kwsincr (kwset_t kwset, char const *text, size_t len)
+       enum { L, R } dirs[DEPTH_SIZE];
+       links[0] = (struct tree *) &trie->links;
+       dirs[0] = L;
+-      int depth = 1;
+-
+      
+       while (link && label != link->label)
+         {
+           links[depth] = link;
+@@ -392,10 +392,13 @@ treenext (struct tree const *tree, struct trie *next[])
+ void
+ kwsprep (kwset_t kwset)
+ {
+  struct trie *curr, *last;
+   char const *trans = kwset->trans;
+   int i;
+   unsigned char deltabuf[NCHAR];
+   unsigned char *delta = trans ? deltabuf : kwset->delta;
+  struct trie *nextbuf[NCHAR];
+  struct trie **next;
+ 
+   /* Initial values for the delta table; will be changed later.  The
+      delta entry for a given character is the smallest depth of any
+@@ -404,9 +407,10 @@ kwsprep (kwset_t kwset)
+ 
+   /* Traverse the nodes of the trie in level order, simultaneously
+      computing the delta table, failure function, and shift function.  */
+-  struct trie *curr, *last;
+   for (curr = last = kwset->trie; curr; curr = curr->next)
+     {
+      struct trie *fail;
+
+       /* Enqueue the immediate descendants in the level order queue.  */
+       enqueue (curr->links, &last);
+ 
+@@ -421,7 +425,6 @@ kwsprep (kwset_t kwset)
+ 
+       /* Update the shifts at each node in the current node's chain
+          of fails back to the root.  */
+-      struct trie *fail;
+       for (fail = curr->fail; fail; fail = fail->fail)
+         {
+           /* If the current node has some outgoing edge that the fail
+@@ -451,8 +454,7 @@ kwsprep (kwset_t kwset)
+ 
+   /* Create a vector, indexed by character code, of the outgoing links
+      from the root node.  */
+-  struct trie *nextbuf[NCHAR];
+-  struct trie **next = trans ? nextbuf : kwset->next;
+  next = trans ? nextbuf : kwset->next;
+   memset (next, 0, sizeof nextbuf);
+   treenext (kwset->trie->links, next);
+   if (trans)
+@@ -463,6 +465,8 @@ kwsprep (kwset_t kwset)
+      of the hairy commentz-walter algorithm. */
+   if (kwset->words == 1)
+     {
+      char gc1;
+      int gc1help = -1;
+       /* Looking for just one string.  Extract it from the trie. */
+       kwset->target = obstack_alloc (&kwset->obstack, kwset->mind);
+       for (i = kwset->mind - 1, curr = kwset->trie; i >= 0; --i)
+@@ -484,11 +488,10 @@ kwsprep (kwset_t kwset)
+             }
+         }
+ 
+-      char gc1 = tr (trans, kwset->target[kwset->mind - 1]);
+      gc1 = tr (trans, kwset->target[kwset->mind - 1]);
+ 
+       /* Set GC1HELP according to whether exactly one, exactly two, or
+          three-or-more characters match GC1.  */
+-      int gc1help = -1;
+       if (trans)
+         {
+           char const *equiv1 = memchr (trans, gc1, NCHAR);
+@@ -570,13 +573,16 @@ bm_delta2_search (char const **tpp, char const *ep, char const *sp, int len,
+ static char const *
+ memchr_kwset (char const *s, size_t n, kwset_t kwset)
+ {
+  int small_heuristic = 2;
+  int small;
+  size_t ntrans;
+  char const *slim;
+   if (kwset->gc1help < 0)
+     return memchr (s, kwset->gc1, n);
+-  int small_heuristic = 2;
+-  int small = (- (uintptr_t) s % sizeof (long)
+  small = (- (uintptr_t) s % sizeof (long)
+                + small_heuristic * sizeof (long));
+-  size_t ntrans = kwset->gc1help < NCHAR && small < n ? small : n;
+-  char const *slim = s + ntrans;
+  ntrans = kwset->gc1help < NCHAR && small < n ? small : n;
+  slim = s + ntrans;
+   for (; s < slim; s++)
+     if (kwset->trans[U(*s)] == kwset->gc1)
+       return s;
+@@ -593,6 +599,7 @@ bmexec_trans (kwset_t kwset, char const *text, size_t size)
+   int d;
+   int len = kwset->mind;
+   char const *trans = kwset->trans;
+  char gc1, gc2;
+ 
+   if (len == 0)
+     return 0;
+@@ -607,8 +614,8 @@ bmexec_trans (kwset_t kwset, char const *text, size_t size)
+   d1 = kwset->delta;
+   sp = kwset->target + len;
+   tp = text + len;
+-  char gc1 = kwset->gc1;
+-  char gc2 = kwset->gc2;
+  gc1 = kwset->gc1;
+  gc2 = kwset->gc2;
+ 
+   /* Significance of 12: 1 (initial offset) + 10 (skip loop) + 1 (md2). */
+   if (size > 12 * len)
+@@ -630,12 +637,12 @@ bmexec_trans (kwset_t kwset, char const *text, size_t size)
+                 d = d1[U(tp[-1])], tp += d;
+                 if (d != 0)
+                   {
+                    int advance_heuristic = 16 * sizeof (long);
+                     d = d1[U(tp[-1])], tp += d;
+                     d = d1[U(tp[-1])], tp += d;
+ 
+                     /* As a heuristic, prefer memchr to seeking by
+                        delta1 when the latter doesn't advance much.  */
+-                    int advance_heuristic = 16 * sizeof (long);
+                     if (advance_heuristic <= tp - tp0)
+                       goto big_advance;
+                     tp--;
+diff --git a/src/searchutils.c b/src/searchutils.c
+index 5eb9a12..2572c3f 100644
+--- a/src/searchutils.c
+++ b/src/searchutils.c
+@@ -270,9 +270,10 @@ mb_goback (char const **mb_start, char const *cur, char const *end)
+ wint_t
+ mb_prev_wc (char const *buf, char const *cur, char const *end)
+ {
+  char const *p;
+   if (cur == buf)
+     return WEOF;
+-  char const *p = buf;
+  p = buf;
+   cur--;
+   cur -= mb_goback (&p, cur, end);
+   return mb_next_wc (cur, end);
+-- 
+1.8.3.4
+
--- a/sys-devel/bmake/bmake-20140214.recipe
+++ b/sys-devel/bmake/bmake-20140214.recipe
@@ -0,0 +1,56 @@
+SUMMARY="Portable version of NetBSD make"
+DESCRIPTION="
+Bmake is derived from NetBSD's make(1), its goal is to be a portable version \
+of same, so new features are added via imports of NetBSD's make (I'm one of \
+the contributors to NetBSD). Thus bmake is kept in sync with NetBSD's make.
+
+This version of Make features several extensions that are not in GNU Make, and \
+does not has all of GNU Make extensions. Some projects explicitly require one \
+or the other.
+"
+HOMEPAGE="http://www.crufty.net/help/sjg/bmake.htm"
+LICENSE="BSD (3-clause)"
+COPYRIGHT="1990-2014 NetBSD and sjg@crufty.net"
+SRC_URI="http://www.crufty.net/ftp/pub/sjg/bmake-20140214.tar.gz"
+CHECKSUM_SHA256="2ec1771a800431c26361659ab0f96ec5c2536e85b46564eb69fa75a4b12886de"
+REVISION="1"
+ARCHITECTURES="x86_gcc2"
+
+PROVIDES="
+	bmake = $portVersion compat >= 3.82
+	cmd:bmake = $portVersion compat >= 3.82
+	"
+REQUIRES="
+	haiku >= $haikuVersion
+	"
+BUILD_REQUIRES="
+	"
+BUILD_PREREQUIRES="
+	haiku_devel >= $haikuVersion
+	cmd:awk
+	cmd:gcc
+	cmd:make
+	"
+
+SOURCE_DIR="bmake"
+
+BUILD()
+{
+	runConfigure ./configure --with-default-sys-path=$dataDir/mk
+	make MANDIR=$manDir
+}
+
+INSTALL()
+{
+	# The install process needs a root user, and there is no such thing in the
+	# chroot.
+	echo "root:x:0:" > /etc/group
+	useradd root || true # Don't fail if user already exists
+
+	make install MANDIR=$manDir
+
+	# Even when configured to look for files in dataDir, they are installed in
+	# share...
+	rm -rf $dataDir
+	mv $prefix/share $dataDir
+}