Merged haikuports/haikuports into master

2026-04-30 03:58:51 +02:00 · 2014-05-24 10:13:42 +02:00
parent 547211272a 2f0b3637be
commit 9816e911f8
30 changed files with 5516 additions and 79 deletions
--- a/app-text/docbook_xsl_stylesheets/docbook_xsl_stylesheets-1.78.1.recipe
+++ b/app-text/docbook_xsl_stylesheets/docbook_xsl_stylesheets-1.78.1.recipe
@@ -0,0 +1,46 @@
+SUMMARY="XSL stylesheets for DocBook XML document instances."
+DESCRIPTION="
+DocBook is an XML vocabulary that lets you create documents in a presentation-neutral form that captures the logical structure of your content. Using free tools along with the DocBook XSL stylesheets, you can publish your content as HTML pages and PDF files, and in many other formats.
+"
+
+HOMEPAGE="http://docbook.sourceforge.net"
+SRC_URI="http://sourceforge.net/projects/docbook/files/docbook-xsl/1.78.1/docbook-xsl-1.78.1.tar.bz2"
+CHECKSUM_SHA256="c98f7296ab5c8ccd2e0bc07634976a37f50847df2d8a59bdb1e157664700b467"
+
+REVISION="1"
+ARCHITECTURES="any"
+
+LICENSE="BSD (3-clause)"
+COPYRIGHT="
+	1999-2007 Norman Walsh
+	2003 Jiří Kosek
+	2004-2007 Steve Ball
+	2005-2008 The DocBook Project
+	2011-2012 O'Reilly Media
+"
+
+PROVIDES="
+	docbook_xsl_stylesheets = $portVersion
+	"
+
+BUILD_PREREQUIRES="
+	cmd:find
+	"
+
+SOURCE_DIR="docbook-xsl-$portVersion"
+BUILD()
+{
+	true
+}
+
+INSTALL()
+{
+	mkdir -p $dataDir/xml/docbook/xsl-stylesheets-1.78.1
+
+	cp -v -R VERSION common eclipse epub extensions fo highlighting html \
+		htmlhelp images javahelp lib manpages params profiling \
+		roundtrip slides template tests tools webhelp website \
+		xhtml xhtml-1_1 $dataDir/xml/docbook/xsl-stylesheets-1.78.1
+
+	ln -s VERSION $dataDir/xml/docbook/xsl-stylesheets-1.78.1/VERSION.xsl
+}
--- a/app-text/help2man/help2man-1.44.1.recipe
+++ b/app-text/help2man/help2man-1.44.1.recipe
@@ -19,8 +19,8 @@ REVISION="1"
 LICENSE="GNU GPL v3"
 COPYRIGHT="1997-2013 Free Software Foundation"

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

 PROVIDES="
 	help2man = $portVersion
--- a/dev-libs/chmlib/chmlib-0.40.recipe
+++ b/dev-libs/chmlib/chmlib-0.40.recipe
@@ -1,32 +1,76 @@
+SUMMARY="A library for dealing with Microsoft ITSS/CHM format files."
 DESCRIPTION="
-CHMLIB is a library for dealing with Microsoft ITSS/CHM format files.
-" 
-HOMEPAGE="http://www.jedrea.com/chmlib/" 
-SRC_URI="http://www.jedrea.com/chmlib/chmlib-0.40.zip"
-CHECKSUM_MD5="a20d86103b8ab369e5b93506d5ffa802"
+chmlib is a small library designed for accessing MS ITSS files.  The ITSS file \
+format is used for Microsoft Html Help files (.chm), which have been the \
+predominant medium for software documentation from Microsoft during the past \
+several years, having superceded the previously used .hlp file format.
+Note that this is NOT the same as the OLE structured storage file format used \
+by MS Excel, Word, and so on.  Instead, it is a different file format which \
+fulfills a similar purpose.  Both file formats may be accessed via instances \
+of the IStorage COM interface, which is essentially an \"acts like a \
+filesystem\" interface.
+"
+HOMEPAGE="http://www.jedrea.com/chmlib/"
+COPYRIGHT="
+	2003 Jed Wing
+	"
+LICENSE="GNU LGPL v2.1"
+SRC_URI="http://www.jedrea.com/chmlib/chmlib-0.40.tar.gz"
+CHECKSUM_SHA256="512148ed1ca86dea051ebcf62e6debbb00edfdd9720cde28f6ed98071d3a9617"
 REVISION="1"
-STATUS_HAIKU="stable"
-DEPEND=""
+ARCHITECTURES="x86_gcc2 x86 x86_64"
+SECONDARY_ARCHITECTURES="x86_gcc2 x86"
+
+PROVIDES="
+	chmlib$secondaryArchSuffix = $portVersion compat >= 0
+	lib:libchm$secondaryArchSuffix = 0.0.0 compat >= 0
+	"
+REQUIRES="
+	haiku$secondaryArchSuffix >= $haikuVersion
+	"
+BUILD_REQUIRES="
+	haiku${secondaryArchSuffix}_devel >= $haikuVersion
+	"
+BUILD_PREREQUIRES="
+	cmd:aclocal
+	cmd:autoconf
+	cmd:gcc$secondaryArchSuffix
+	cmd:ld$secondaryArchSuffix
+	cmd:libtoolize
+	cmd:make
+	cmd:sed
+	cmd:grep
+	cmd:gawk
+	"
+
 BUILD()
 {
-	cd chmlib-0.40
-	rm aclocal.m4
-	rm acinclude.m4
-	libtoolize --force --copy --install
+	libtoolize -fci
 	aclocal
 	sed -i 's/lpthread//g' configure.in Makefile.in src/Makefile.in
 	autoconf
 	automake
-	chmod 777 configure
-	./configure	--prefix=`finddir B_COMMON_DIRECTORY`
-	make
+	runConfigure ./configure
+	make $jobArgs
 }

 INSTALL()
 {
-	cd chmlib-0.40
 	make install
+
+	prepareInstalledDevelLibs libchm
+
+	# devel package
+	packageEntries devel \
+		$developDir
 }

-LICENSE="GNU LGPL v2.1"
-COPYRIGHT="2003 Jed Wing"
+# ----- devel package -------------------------------------------------------
+
+PROVIDES_devel="
+	chmlib${secondaryArchSuffix}_devel = $portVersion
+	devel:libchm${secondaryArchSuffix} = 0.0.0 compat >= 0
+	"
+REQUIRES_devel="
+	chmlib${secondaryArchSuffix} == $portVersion base
+	"
--- a/dev-libs/libgcrypt/libgcrypt-1.5.3.recipe
+++ b/dev-libs/libgcrypt/libgcrypt-1.5.3.recipe
@@ -1,18 +1,19 @@
-DESCRIPTION="libgcrypt"
-SUMMARY="
-Libgcrypt is GNU's basic cryptographic library.
+SUMMARY="GNU's basic cryptographic library."
+DESCRIPTION="
+Libgcrypt is a general purpose crypto library based on the code \
+used in GnuPG.
 "
 LICENSE="GNU LGPL v3"
 COPYRIGHT="2000-2013 Free Software Foundation, Inc."
 HOMEPAGE="http://directory.fsf.org/project/libgcrypt/" 
 SRC_URI="ftp://ftp.gnupg.org/gcrypt/libgcrypt/libgcrypt-1.5.3.tar.bz2"
 CHECKSUM_SHA256="bcf5334e7da352c45de6aec5d2084ce9a1d30029ff4a4a5da13f1848874759d1"
-REVISION="1"
+REVISION="2"
 ARCHITECTURES="x86"

 PROVIDES="
 	libgcrypt = $portVersion compat >= 1.5
-	lib:libgcrypt = $portVersion compat >= 1.5
+	lib:libgcrypt = 11.8.2 compat >= 11
 	"

 REQUIRES="
@@ -31,20 +32,6 @@ BUILD_PREREQUIRES="
 	cmd:gcc
 	"

-PROVIDES_devel="
-	libgcrypt_devel = $portVersion compat >= 1.5
-	devel:libgcrypt = $portVersion compat >= 1.5
-	cmd:dumpsexp = $portVersion compat >= 1.5
-	cmd:libgcrypt_config = $portVersion compat >= 1.5
-	cmd:hmac256 = $portVersion compat >= 1.5
-	"
-
-REQUIRES_devel="
-	libgcrypt == $portVersion
-	haiku >= $haikuVersion
-	libgpg_error_devel
-	"
-
 PATCHES="libgcrypt-1.5.3.patch"

 BUILD()
@@ -63,3 +50,16 @@ INSTALL()
 	packageEntries devel \
 		$developDir $binDir
 }
+
+PROVIDES_devel="
+	libgcrypt_devel = $portVersion compat >= 1.5
+	devel:libgcrypt = 11.8.2 compat >= 11
+	cmd:dumpsexp = $portVersion compat >= 1.5
+	cmd:libgcrypt_config = $portVersion compat >= 1.5
+	cmd:hmac256 = $portVersion compat >= 1.5
+	"
+
+REQUIRES_devel="
+	libgcrypt == $portVersion base
+	libgpg_error_devel
+	"
--- a/dev-libs/libgpg_error/libgpg_error-1.12.recipe
+++ b/dev-libs/libgpg_error/libgpg_error-1.12.recipe
@@ -9,13 +9,13 @@ COPYRIGHT="2003-2013 g10 Code GmbH"
 HOMEPAGE="http://www.gnupg.org/related_software/libraries.en.html#lib-libgpg-error"
 SRC_URI="ftp://ftp.gnupg.org/gcrypt/libgpg-error/libgpg-error-1.12.tar.bz2"
 CHECKSUM_SHA256="cafc9ed6a87c53a35175d5a1220a96ca386696eef2fa059cc0306211f246e55f"
-REVISION="1"
+REVISION="2"
 ARCHITECTURES="x86"

 PROVIDES="
-	libgpg_error = $portVersion compat >= 1.12
-	lib:libgpg_error = $portVersion compat >= 1.12
-	cmd:gpg_error = $portVersion compat >= 1.12
+	libgpg_error = $portVersion compat >= 1
+	lib:libgpg_error = 0.10.0 compat >= 0
+	cmd:gpg_error = $portVersion compat >= 1
 	"

 REQUIRES="
@@ -27,23 +27,14 @@ BUILD_REQUIRES="
 	"

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

-PROVIDES_devel="
-	libgpg_error_devel = $portVersion compat >= 1.12
-	cmd:gpg_error_config = $portVersion compat >= 1.12
-	devel:libgpg_error = $portVersion compat >= 1.12
-	"
+SOURCE_DIR="libgpg-error-$portVersion"

-REQUIRES_devel="
-	libgpg_error == $portVersion
-	"
-
-SOURCE_DIR="libgpg-error-1.12"
-
-PATCHES="libgpg_error-1.12.patch"
+PATCHES="libgpg_error-$portVersion.patch"

 BUILD()
 {
@@ -60,3 +51,13 @@ INSTALL()
 	packageEntries devel \
 		$developDir $binDir/gpg-error-config
 }
+
+PROVIDES_devel="
+	libgpg_error_devel = $portVersion compat >= 1
+	cmd:gpg_error_config = $portVersion compat >= 1
+	devel:libgpg_error = 0.10.0 compat >= 0
+	"
+
+REQUIRES_devel="
+	libgpg_error == $portVersion
+	"
--- a/dev-libs/libusb/libusb-1.0.17.recipe
+++ b/dev-libs/libusb/libusb-1.0.17.recipe
@@ -28,7 +28,7 @@ COPYRIGHT="
 "
 HOMEPAGE="http://libusbx.org/"
 SRC_URI="git+git://github.com/pulkomandy/libusbx#c6f866b9914f266ab198a3313eba45e55c094024"
-REVISION="1"
+REVISION="2"
 ARCHITECTURES="x86 x86_64"
 if [ $effectiveTargetArchitecture != x86_gcc2 ]; then
 	# x86_gcc2 is fine as primary target architecture as long as we're building
@@ -37,6 +37,8 @@ if [ $effectiveTargetArchitecture != x86_gcc2 ]; then
 fi
 SECONDARY_ARCHITECTURES="x86"

+PATCHES="$portVersionedName.patchset"
+
 PROVIDES="
 	libusb$secondaryArchSuffix = $portVersion
 	lib:libusb_1.0$secondaryArchSuffix = $portVersion
--- a/dev-libs/libusb/patches/libusb-1.0.17.patchset
+++ b/dev-libs/libusb/patches/libusb-1.0.17.patchset
@@ -0,0 +1,31 @@
+From 91edd51cfa1be577227e396f3460f7564964b46c Mon Sep 17 00:00:00 2001
+From: Jerome Duval <jerome.duval@gmail.com>
+Date: Wed, 21 May 2014 21:18:27 +0000
+Subject: build fix
+
+
+diff --git a/libusb/os/haiku_usbkit.cpp b/libusb/os/haiku_usbkit.cpp
+index f4955c0..eec2007 100644
+--- a/libusb/os/haiku_usbkit.cpp
+++ b/libusb/os/haiku_usbkit.cpp
+@@ -69,7 +69,7 @@ private:
+ 	usb_configuration_descriptor**		fConfigurationDescriptors;
+ 	uint32								fActiveConfiguration;
+ 	char*								fPath;
+-	volatile int32						fOpenCount;
+	int32								fOpenCount;
+ };
+ 
+ 
+@@ -609,7 +609,7 @@ UsbRoster::DeviceRemoved(BUSBDevice* device)
+ 
+ 
+ UsbRoster 		gUsbRoster;
+-volatile int32	gInitCount = 0;
+int32			gInitCount = 0;
+ 
+ static int
+ haiku_init(struct libusb_context* ctx)
+-- 
+1.8.3.4
+
--- a/dev-util/cmake/cmake-3.0.0_rc5.recipe
+++ b/dev-util/cmake/cmake-3.0.0_rc5.recipe
@@ -0,0 +1,73 @@
+SUMMARY="Cross platform Make"
+DESCRIPTION="
+CMake is a cross-platform, open-source build system. It is a family of tools \
+designed to build, test and package software. CMake is used to control the \
+software compilation process using simple platform and compiler independent \
+configuration files. CMake generates native makefiles and workspaces that can \
+be used in the compiler environment of your choice.
+"
+HOMEPAGE="http://www.cmake.org" 
+LICENSE="CMake"
+COPYRIGHT="2002-2013 Kitware, Inc., Insight Consortium, All rights reserved."
+SRC_URI="http://www.cmake.org/files/v3.0/cmake-3.0.0-rc5.tar.gz"
+CHECKSUM_SHA256="fa8e76e5ed44199f4ceef24abd65a4d7df2d857edf44094d4ae7a2401af78389"
+REVISION="1"
+ARCHITECTURES="x86 x86_64"
+if [ $effectiveTargetArchitecture != x86_gcc2 ]; then
+	# x86_gcc2 is fine as primary target architecture as long as we're building
+	# for a different secondary architecture.
+	ARCHITECTURES="$ARCHITECTURES x86_gcc2"
+fi
+SECONDARY_ARCHITECTURES="x86"
+
+PROVIDES="
+	cmake = $portVersion compat >= 3.0
+	cmd:cmake = $portVersion compat >= 3.0
+	cmd:ccmake = $portVersion compat >= 3.0
+	cmd:cpack = $portVersion compat >= 3.0
+	cmd:ctest = $portVersion compat >= 3.0
+	"
+REQUIRES="
+	haiku$secondaryArchSuffix >= $haikuVersion
+	lib:libstdc++$secondaryArchSuffix
+	lib:libncurses$secondaryArchSuffix
+	"
+BUILD_REQUIRES="
+	devel:libncurses$secondaryArchSuffix
+	"
+BUILD_PREREQUIRES="
+	haiku${secondaryArchSuffix}_devel >= $haikuVersion
+	haiku_devel >= $haikuVersion
+	cmd:gcc$secondaryArchSuffix
+	cmd:grep
+	cmd:ld$secondaryArchSuffix
+	cmd:libtool
+	cmd:make
+	cmd:sed
+	"
+PATCHES="cmake-3.0.0_rc1.patchset"
+SOURCE_DIR="cmake-3.0.0-rc5"
+BUILD()
+{
+	./configure --prefix=$prefix \
+		--datadir=/$relativeDataDir/cmake \
+		--docdir=/$relativeDocDir \
+		--mandir=/$relativeManDir
+	make $jobArgs
+}
+
+INSTALL()
+{
+	make install
+
+	# No way to tell this to configure...
+	mv $prefix/share/aclocal $dataDir
+	rmdir $prefix/share
+}
+
+TEST()
+{
+	cp bin/ctest Bootstrap.cmk/
+	make test VERBOSE=1
+}
+
--- a/haiku-libs/ale/ale-0.9.1.recipe
+++ b/haiku-libs/ale/ale-0.9.1.recipe
@@ -21,10 +21,11 @@ SOURCE_DIR="ALEditor-$srcGitRef"
 SRC_URI="https://github.com/czeidler/ALEditor/archive/$srcGitRef.tar.gz"
 COPYRIGHT="Copyright (C) 2009-2014 by UniAuckland Team"
 LICENSE="MIT"
-REVISION="1"
-ARCHITECTURES="x86 x86_gcc2"
+REVISION="2"
+ARCHITECTURES="x86 x86_gcc2 x86_64"

 PROVIDES="
+	ale = $portVersion
 	lib:libale = $portVersion
 	app:ALEditor = $portVersion
 	"
@@ -32,10 +33,9 @@ REQUIRES="
 	haiku >= $haikuVersion
 	"
 BUILD_REQUIRES="
-	haiku >= $haikuVersion
+	haiku_devel >= $haikuVersion
 	"
 BUILD_PREREQUIRES="
-	haiku_devel >= $haikuVersion
 	cmd:gcc
 	cmd:ld
 	cmd:cmake
--- a/media-libs/flac/flac-1.3.0.recipe
+++ b/media-libs/flac/flac-1.3.0.recipe
@@ -54,6 +54,7 @@ BUILD_PREREQUIRES="
 	cmd:make
 	cmd:gawk
 	cmd:perl
+	cmd:find
 	"

 BUILD()
--- a/media-libs/libaubio/libaubio-0.4.1.recipe
+++ b/media-libs/libaubio/libaubio-0.4.1.recipe
@@ -0,0 +1,89 @@
+SUMMARY="A library to label music and sounds"
+DESCRIPTION="
+aubio is a library to label music and sounds. It listens to audio signals and \
+attempts to detect events. For instance, when a drum is hit, at which frequency \
+is a note, or at what tempo is a rhythmic melody.
+
+Its features include segmenting a sound file before each of its attacks, \
+performing pitch detection, tapping the beat and producing midi streams from \
+live audio.
+"
+HOMEPAGE="http://aubio.org"
+COPYRIGHT="
+	2003-2013 Paul Brossier <piem@aubio.org>
+	"
+LICENSE="GNU GPL v3"
+SRC_URI="http://aubio.org/pub/aubio-$portVersion.tar.bz2"
+CHECKSUM_SHA256="25d7df0a9cd6366fda764a803424caddf5fb819fc75b42a7a03e1e6f8eb3c695"
+REVISION="1"
+ARCHITECTURES="?x86_gcc2 x86 x86_64"
+SECONDARY_ARCHITECTURES="?x86_gcc2 x86"
+
+SOURCE_DIR="aubio-$portVersion"
+
+PATCHES="libaubio-$portVersion.patchset"
+
+PROVIDES="
+	libaubio$secondaryArchSuffix = $portVersion compat >= 0
+	lib:libaubio$secondaryArchSuffix = 4.1.1 compat >= 4
+	"
+if [ -z "$secondaryArchSuffix" ]; then
+PROVIDES="$PROVIDES
+	cmd:aubiomfcc = $portVersion compat >= 0
+	cmd:aubionotes = $portVersion compat >= 0
+	cmd:aubioonset = $portVersion compat >= 0
+	cmd:aubiopitch = $portVersion compat >= 0
+	cmd:aubioquiet = $portVersion compat >= 0
+	cmd:aubiotrack = $portVersion compat >= 0
+	"
+fi
+	
+REQUIRES="
+	haiku$secondaryArchSuffix >= $haikuVersion
+#	lib:libsamplerate$secondaryArchSuffix
+	"
+BUILD_REQUIRES="
+	haiku${secondaryArchSuffix}_devel >= $haikuVersion
+#	devel:libsamplerate$secondaryArchSuffix
+	"
+BUILD_PREREQUIRES="
+	cmd:python
+	cmd:gcc$secondaryArchSuffix
+	cmd:ld$secondaryArchSuffix
+	cmd:pkg_config$secondaryArchSuffix
+	"
+
+BUILD()
+{
+	echo $includeDir
+	runConfigure --omit-buildspec ./waf configure \
+		--with-target-platform=$effectiveTargetMachineTriple
+	./waf build
+}
+
+INSTALL()
+{
+	./waf install
+
+	prepareInstalledDevelLibs libaubio
+	fixPkgconfig
+	
+	# devel package
+	packageEntries devel \
+		$developDir
+	
+	#remove bin commands when building for secondary arch
+	if [ -n "$secondaryArchSuffix" ];then
+		rm -rf $prefix/bin
+	fi
+}
+
+# ----- devel package -------------------------------------------------------
+
+PROVIDES_devel="
+	libaubio${secondaryArchSuffix}_devel = $portVersion compat >= 0
+	devel:libaubio$secondaryArchSuffix = 4.1.1 compat >= 4
+	"
+REQUIRES_devel="
+	libaubio$secondaryArchSuffix == $portVersion base
+	"
--- a/media-libs/libaubio/patches/libaubio-0.4.1.patchset
+++ b/media-libs/libaubio/patches/libaubio-0.4.1.patchset
@@ -0,0 +1,79 @@
+From 0dc450424ce8c66628b22790656fc4f3577f80e7 Mon Sep 17 00:00:00 2001
+From: Jerome Duval <jerome.duval@gmail.com>
+Date: Mon, 19 May 2014 19:39:09 +0000
+Subject: Haiku has no libm
+
+
+diff --git a/examples/wscript_build b/examples/wscript_build
+index db5fed6..3f573cc 100644
+--- a/examples/wscript_build
+++ b/examples/wscript_build
+@@ -17,7 +17,7 @@ bld(features = 'c',
+ for source_file in programs_source:
+     bld(features = 'c cprogram',
+             includes = '../src',
+-            lib = 'm',
+            lib = '',
+             use = ['aubio', 'utilsio'],
+             source = source_file,
+             target = str(source_file).split('.')[0]
+diff --git a/src/wscript_build b/src/wscript_build
+index 94b2062..2b9b60d 100644
+--- a/src/wscript_build
+++ b/src/wscript_build
+@@ -15,7 +15,7 @@ ctx(features = 'c',
+         source = source,
+         includes = ['.'],
+         uselib = uselib,
+-        lib = 'm',
+        lib = '',
+         target = 'lib_objects')
+ 
+ # build libaubio.so (cshlib) and/or libaubio.a (cstlib)
+@@ -29,7 +29,7 @@ else: #linux, darwin, android, mingw, ...
+ for target in build_features:
+     ctx(features = 'c ' + target,
+             use = ['lib_objects'],
+-            lib = 'm',
+            lib = '',
+             target = 'aubio',
+             install_path = '${PREFIX}/lib',
+             vnum = ctx.env['LIB_VERSION'])
+diff --git a/tests/wscript_build b/tests/wscript_build
+index 04bbf9a..8a8c625 100644
+--- a/tests/wscript_build
+++ b/tests/wscript_build
+@@ -6,7 +6,7 @@ for target_name in ctx.path.ant_glob('src/**/*.c'):
+     extra_source = []
+ 
+     bld(features = 'c cprogram test',
+-            lib = 'm',
+            lib = '',
+             uselib = uselib,
+             source = [target_name] + extra_source,
+             target = str(target_name).split('.')[0],
+-- 
+1.8.3.4
+
+
+From 3d07ca19c7c3ec7044417c062553d3ea02375d17 Mon Sep 17 00:00:00 2001
+From: Jerome Duval <jerome.duval@gmail.com>
+Date: Mon, 19 May 2014 23:15:04 +0000
+Subject: fix headers installation
+
+
+diff --git a/src/wscript_build b/src/wscript_build
+index 2b9b60d..194345d 100644
+--- a/src/wscript_build
+++ b/src/wscript_build
+@@ -35,6 +35,6 @@ for target in build_features:
+             vnum = ctx.env['LIB_VERSION'])
+ 
+ # install headers, except _priv.h ones
+-ctx.install_files('${PREFIX}/include/aubio/',
+ctx.install_files('${INCLUDEDIR}/aubio/',
+         ctx.path.ant_glob('**/*.h', excl = ['**_priv.h', 'config.h']),
+         relative_trick=True)
+-- 
+1.8.3.4
+
--- a/media-libs/liblo/liblo-0.28.recipe
+++ b/media-libs/liblo/liblo-0.28.recipe
@@ -0,0 +1,74 @@
+SUMMARY="Lightweight OSC (Open Sound Control) Implementation"
+DESCRIPTION="
+liblo is a lightweight library that provides an easy to use implementation of \
+the OSC protocol.
+"
+HOMEPAGE="http://plugin.org.uk/liblo"
+COPYRIGHT="
+	2008-2012 Stephen Sinclair 
+	2008 Kentaro Fukuchi
+	2005-2008 Nicholas Humfrey
+	2005 Martin Habets 
+	2005-2006 Steve Harris"
+LICENSE="GNU LGPL v2.1"
+SRC_URI="http://prdownloads.sourceforge.net/liblo/$portVersionedName.tar.gz"
+CHECKSUM_SHA256="da94a9b67b93625354dd89ff7fe31e5297fc9400b6eaf7378c82ee1caf7db909"
+REVISION="1"
+ARCHITECTURES="x86_gcc2 x86 x86_64"
+SECONDARY_ARCHITECTURES="x86_gcc2 x86"
+
+PATCHES="$portVersionedName.patchset"
+
+PROVIDES="
+	liblo$secondaryArchSuffix = $portVersion compat >= 0
+	cmd:oscdump
+	cmd:oscsend
+	lib:liblo$secondaryArchSuffix = 7.2.0 compat >= 7
+	"
+REQUIRES="
+	haiku$secondaryArchSuffix >= $haikuVersion
+	"
+BUILD_REQUIRES="
+	haiku${secondaryArchSuffix}_devel >= $haikuVersion
+	"
+BUILD_PREREQUIRES="
+	cmd:aclocal
+	cmd:autoconf
+	cmd:automake
+	cmd:gcc$secondaryArchSuffix
+	cmd:ld$secondaryArchSuffix
+	cmd:libtoolize
+	cmd:make
+	cmd:find
+	"
+
+BUILD()
+{
+	libtoolize --force --copy --install
+	aclocal
+	autoconf
+	runConfigure ./configure
+	make $jobArgs
+}
+
+INSTALL()
+{
+	make install
+
+	prepareInstalledDevelLibs liblo
+	fixPkgconfig
+
+	# devel package
+	packageEntries devel \
+		$developDir
+}
+
+# ----- devel package -------------------------------------------------------
+
+PROVIDES_devel="
+	liblo${secondaryArchSuffix}_devel = $portVersion compat >= 0
+	devel:liblo$secondaryArchSuffix = 7.2.0 compat >= 7
+	"
+REQUIRES_devel="
+	liblo$secondaryArchSuffix == $portVersion base
+	"
--- a/media-libs/liblo/patches/liblo-0.28.patchset
+++ b/media-libs/liblo/patches/liblo-0.28.patchset
@@ -0,0 +1,209 @@
+From 5e7d6dc8d32f0189a3385cb824030cb6c500e869 Mon Sep 17 00:00:00 2001
+From: Jerome Duval <jerome.duval@gmail.com>
+Date: Tue, 20 May 2014 16:30:21 +0000
+Subject: haiku patch
+
+
+diff --git a/configure.ac b/configure.ac
+index c487d18..80bf8da 100644
+--- a/configure.ac
+++ b/configure.ac
+@@ -139,7 +139,7 @@ else
+ fi
+ 
+ # Checks for libraries.
+-AC_SEARCH_LIBS([recvfrom], [socket])
+AC_SEARCH_LIBS([recvfrom], [socket network])
+ AC_CHECK_FUNC([log], [], [AC_CHECK_LIB([m],[log])])
+ AC_CHECK_FUNCS([getifaddrs])
+ 
+-- 
+1.8.3.4
+
+
+From dcc0e8c2cbd9453252c3dbed013683f3573ad384 Mon Sep 17 00:00:00 2001
+From: Jerome Duval <jerome.duval@gmail.com>
+Date: Tue, 20 May 2014 16:51:04 +0000
+Subject: check getifaddrs
+
+
+diff --git a/lo/lo_cpp.h b/lo/lo_cpp.h
+index 79db0b6..7675380 100644
+--- a/lo/lo_cpp.h
+++ b/lo/lo_cpp.h
+@@ -184,12 +184,19 @@ namespace lo {
+ 
+         std::string url() const
+           { return std::string(lo_address_get_url(address)?:""); }
+-
+#ifdef HAVE_GETIFADDRS
+         std::string iface() const
+           { return std::string(lo_address_get_iface(address)?:""); }
+ 
+         void set_iface(const string_type &iface, const string_type &ip)
+           { lo_address_set_iface(address, iface._s?:0, ip._s?:0); }
+#else
+		std::string iface() const
+          { return std::string(""); }
+
+        void set_iface(const string_type &iface, const string_type &ip)
+          { }
+#endif
+ 
+         int set_tcp_nodelay(int enable)
+           { return lo_address_set_tcp_nodelay(address, enable); }
+-- 
+1.8.3.4
+
+
+From 4e66b251cb3f6c37418e413476082efddfd0710b Mon Sep 17 00:00:00 2001
+From: Jerome Duval <jerome.duval@gmail.com>
+Date: Tue, 20 May 2014 22:09:52 +0000
+Subject: gcc2 build fix
+
+
+diff --git a/examples/example_tcp_echo_server.c b/examples/example_tcp_echo_server.c
+index 93af99b..b675e92 100644
+--- a/examples/example_tcp_echo_server.c
+++ b/examples/example_tcp_echo_server.c
+@@ -46,6 +46,9 @@ void ctrlc(int sig)
+ 
+ int main(int argc, char *argv[])
+ {
+    lo_server_thread st;
+    lo_server s;
+    lo_address a = 0;
+     const char *port = "7770";
+     int do_send = 0;
+ 
+@@ -55,13 +58,13 @@ int main(int argc, char *argv[])
+     }
+ 
+     /* start a new server on port 7770 */
+-    lo_server_thread st = lo_server_thread_new_with_proto(port, LO_TCP, error);
+    st = lo_server_thread_new_with_proto(port, LO_TCP, error);
+     if (!st) {
+         printf("Could not create server thread.\n");
+         exit(1);
+     }
+ 
+-    lo_server s = lo_server_thread_get_server(st);
+    s = lo_server_thread_get_server(st);
+ 
+     /* add method that will match the path /quit with no args */
+     lo_server_thread_add_method(st, "/quit", "", quit_handler, NULL);
+@@ -75,14 +78,14 @@ int main(int argc, char *argv[])
+ 
+     printf("Listening on TCP port %s\n", port);
+ 
+-    lo_address a = 0;
+     if (do_send) {
+        int r;
+         a = lo_address_new_with_proto(LO_TCP, "localhost", "7770");
+         if (!a) {
+             printf("Error creating destination address.\n");
+             exit(1);
+         }
+-        int r = lo_send_from(a, s, LO_TT_IMMEDIATE, "/test", "ifs",
+        r = lo_send_from(a, s, LO_TT_IMMEDIATE, "/test", "ifs",
+                              1, 2.0f, "3");
+         if (r < 0)
+             printf("Error sending initial message.\n");
+@@ -115,6 +118,7 @@ int echo_handler(const char *path, const char *types, lo_arg ** argv,
+                     int argc, void *data, void *user_data)
+ {
+     int i;
+    int r;
+     lo_message m = (lo_message)data;
+     lo_address a = lo_message_get_source(m);
+     lo_server s = (lo_server)user_data;
+@@ -142,7 +146,7 @@ int echo_handler(const char *path, const char *types, lo_arg ** argv,
+         return 0;
+     }
+ 
+-    int r = lo_send_message_from(a, s, path, m);
+    r = lo_send_message_from(a, s, path, m);
+     if (r < 0)
+         printf("Error sending back message, socket may have closed.\n");
+     else
+diff --git a/src/message.c b/src/message.c
+index 7980ccf..28a2bd5 100644
+--- a/src/message.c
+++ b/src/message.c
+@@ -259,6 +259,7 @@ int lo_message_add_varargs_internal(lo_message msg, const char *types,
+         }
+     }
+ #ifndef USE_ANSI_C
+{
+     void *i = va_arg(ap, void *);
+     if (((unsigned long)i & 0xFFFFFFFFUL)
+ 	!= ((unsigned long)LO_MARKER_A & 0xFFFFFFFFUL))
+@@ -281,6 +282,7 @@ int lo_message_add_varargs_internal(lo_message msg, const char *types,
+                 "mismatching types and data at\n%s:%d, exiting.\n", file,
+                 line);
+     }
+}
+ #endif
+     va_end(ap);
+ 
+diff --git a/src/server.c b/src/server.c
+index 3d01e88..0521bfc 100644
+--- a/src/server.c
+++ b/src/server.c
+@@ -1275,6 +1275,7 @@ int lo_server_wait(lo_server s, int timeout)
+     {
+         if (s->protocol == LO_TCP)
+         {
+            double diff;
+             int sock = accept(s->sockets[0].fd,
+                               (struct sockaddr *) &addr, &addr_len);
+ 
+@@ -1286,7 +1287,7 @@ int lo_server_wait(lo_server s, int timeout)
+ 
+             lo_timetag_now(&now);
+ 
+-            double diff = lo_timetag_diff(now, then);
+            diff = lo_timetag_diff(now, then);
+ 
+             sched_timeout = lo_server_next_event_delay(s) * 1000;
+             timeout -= (int)(diff*1000);
+diff --git a/src/test_bidirectional_tcp.c b/src/test_bidirectional_tcp.c
+index 0408df3..226595e 100644
+--- a/src/test_bidirectional_tcp.c
+++ b/src/test_bidirectional_tcp.c
+@@ -28,6 +28,7 @@ int generic_handler(const char *path, const char *types, lo_arg ** argv,
+ 
+ void *sendthread(void *arg)
+ {
+    lo_address a;
+     lo_server s = lo_server_new_with_proto("7772", LO_TCP, 0);
+     if (!s) { printf("no server2\n"); exit(1); }
+ 
+@@ -35,7 +36,7 @@ void *sendthread(void *arg)
+ 
+     lo_server_add_method(s, 0, 0, generic_handler, s);
+ 
+-    lo_address a = lo_address_new_with_proto(LO_TCP, "localhost", "7771");
+    a = lo_address_new_with_proto(LO_TCP, "localhost", "7771");
+ 
+     lo_send_from(a, s, LO_TT_IMMEDIATE, "/test", 0);
+ 
+@@ -55,6 +56,7 @@ void *sendthread(void *arg)
+ 
+ int main()
+ {
+    pthread_t thr;
+     /* start a new server on port 7770 */
+     lo_server s = lo_server_new_with_proto("7771", LO_TCP, 0);
+     if (!s) { printf("no server\n"); exit(1); }
+@@ -64,7 +66,6 @@ int main()
+ 
+     printf("%p.server fd: %d\n", s, lo_server_get_socket_fd(s));
+ 
+-    pthread_t thr;
+     pthread_create(&thr, 0, sendthread, s);
+ 
+     printf("%p.receiving1..\n", s);
+-- 
+1.8.3.4
+
--- a/media-libs/libmtp/libmtp-1.1.6.recipe
+++ b/media-libs/libmtp/libmtp-1.1.6.recipe
@@ -0,0 +1,82 @@
+SUMMARY="MTP initiator library"
+DESCRIPTION="
+libmtp implements an MTP initiator, which means it initiate \
+MTP sessions with devices. The devices responding are known \
+as MTP responders. libmtp runs on something with a USB host \
+controller interface, using libusb to access the host \
+controller.
+"
+HOMEPAGE="http://libmtp.sourceforge.net"
+COPYRIGHT="
+	Richard Low <richard@wentnet.com>
+	Linus Walleij <triad@df.lth.se>
+	Mariusz Woloszyn <emsi@ipartners.pl>
+	Marcus Meissner <marcus@jet.franken.de>
+	"
+LICENSE="GNU LGPL v2.1"
+SRC_URI="http://prdownloads.sourceforge.net/libmtp/$portVersionedName.tar.gz"
+CHECKSUM_SHA256="3a1c1c83af91de4052eb54feb795c141b4c04a252e0031954ebbf6175970cb0a"
+REVISION="1"
+ARCHITECTURES="x86_gcc2 x86 x86_64"
+SECONDARY_ARCHITECTURES="x86_gcc2 x86"
+
+PATCHES="$portVersionedName.patchset"
+
+PROVIDES="
+	libmtp$secondaryArchSuffix = $portVersion compat >= 1.0
+	lib:libmtp$secondaryArchSuffix = 9.1.0 compat >= 9
+	"
+# add cmd provides
+REQUIRES="
+	haiku$secondaryArchSuffix >= $haikuVersion
+	lib:libgcrypt$secondaryArchSuffix
+	lib:libiconv$secondaryArchSuffix
+	lib:libusb_1.0$secondaryArchSuffix
+	"
+BUILD_REQUIRES="
+	haiku${secondaryArchSuffix}_devel >= $haikuVersion
+	devel:libgcrypt$secondaryArchSuffix
+	devel:libiconv$secondaryArchSuffix
+	devel:libusb_1.0$secondaryArchSuffix
+	"
+BUILD_PREREQUIRES="
+	cmd:aclocal
+	cmd:autoconf
+	cmd:automake
+	cmd:gcc$secondaryArchSuffix
+	cmd:ld$secondaryArchSuffix
+	cmd:libtoolize
+	cmd:make
+	cmd:gettext
+	cmd:pkg_config
+	cmd:doxygen
+	cmd:find
+	"
+
+BUILD()
+{
+	runConfigure ./configure # --enable-doxygen
+	make $jobArgs
+}
+
+INSTALL()
+{
+	make install
+
+	prepareInstalledDevelLibs libmtp
+	fixPkgconfig
+
+	# devel package
+	packageEntries devel \
+		$developDir # $docDir
+}
+
+# ----- devel package -------------------------------------------------------
+
+PROVIDES_devel="
+	libmtp${secondaryArchSuffix}_devel = $portVersion compat >= 1.0
+	devel:libmtp$secondaryArchSuffix = 9.1.0 compat >= 9
+	"
+REQUIRES_devel="
+	libmtp$secondaryArchSuffix == $portVersion base
+	"
--- a/media-libs/libmtp/patches/libmtp-1.1.6.patchset
+++ b/media-libs/libmtp/patches/libmtp-1.1.6.patchset
@@ -0,0 +1,22 @@
+From 42d85dd2edd255726d4a48226d7dafa2dfe964f8 Mon Sep 17 00:00:00 2001
+From: Jerome Duval <jerome.duval@gmail.com>
+Date: Wed, 21 May 2014 21:24:57 +0000
+Subject: fix configure.ac
+
+
+diff --git a/configure.ac b/configure.ac
+index 87d7fcc..2063735 100644
+--- a/configure.ac
+++ b/configure.ac
+@@ -4,7 +4,7 @@ AC_INIT([libmtp], [1.1.6], [libmtp-discuss@lists.sourceforge.net])
+ AC_CONFIG_MACRO_DIR([m4])
+ AM_INIT_AUTOMAKE([foreign])
+ AC_CONFIG_SRCDIR([src/libmtp.c])
+-AM_CONFIG_HEADER(config.h)
+AC_CONFIG_HEADERS(config.h)
+ 
+ # Checks for programs.
+ AC_PROG_CC
+-- 
+1.8.3.4
+
--- a/media-libs/libsndfile/libsndfile-1.0.25.recipe
+++ b/media-libs/libsndfile/libsndfile-1.0.25.recipe
@@ -0,0 +1,87 @@
+SUMMARY="C library for reading and writing files containing sampled sound"
+DESCRIPTION="
+libsndfile is a library of C routines for reading and writing \
+files containing sampled audio data.
+"
+HOMEPAGE="http://www.mega-nerd.com/libsndfile"
+COPYRIGHT="
+	1999-2011 Erik de Castro Lopo
+"
+LICENSE="GNU LGPL v2.1"
+SRC_URI="http://www.mega-nerd.com/libsndfile/files/$portVersionedName.tar.gz"
+CHECKSUM_SHA256="59016dbd326abe7e2366ded5c344c853829bebfd1702ef26a07ef662d6aa4882"
+REVISION="1"
+ARCHITECTURES="!x86_gcc2 x86 x86_64"
+SECONDARY_ARCHITECTURES="!x86_gcc2 x86"
+
+PATCHES="$portVersionedName.patchset"
+
+PROVIDES="
+	libsndfile$secondaryArchSuffix = $portVersion compat >= 1
+	cmd:sndfile_cmp
+	cmd:sndfile_concat
+	cmd:sndfile_convert
+	cmd:sndfile_deinterleave
+	cmd:sndfile_info
+	cmd:sndfile_interleave
+	cmd:sndfile_metadata_get
+	cmd:sndfile_metadata_set
+	cmd:sndfile_play
+	cmd:sndfile_regtest
+	cmd:sndfile_salvage
+	lib:libsndfile$secondaryArchSuffix = $portVersion compat >= 1
+	"
+REQUIRES="
+	haiku$secondaryArchSuffix >= $haikuVersion
+	lib:libflac$secondaryArchSuffix
+	lib:libogg$secondaryArchSuffix
+	lib:libvorbis$secondaryArchSuffix
+	"
+BUILD_REQUIRES="
+	haiku${secondaryArchSuffix}_devel >= $haikuVersion
+	devel:libflac$secondaryArchSuffix
+	devel:libogg$secondaryArchSuffix
+	devel:libvorbis$secondaryArchSuffix
+	"
+BUILD_PREREQUIRES="
+	cmd:aclocal
+	cmd:autoconf
+	cmd:automake
+	cmd:gcc$secondaryArchSuffix
+	cmd:ld$secondaryArchSuffix
+	cmd:libtoolize
+	cmd:make
+	cmd:pkg_config
+	"
+
+BUILD()
+{
+	libtoolize --force --copy --install
+	aclocal -I M4
+	autoconf
+	automake
+	runConfigure ./configure
+	make $jobArgs
+}
+
+INSTALL()
+{
+	make install
+
+	prepareInstalledDevelLibs libsndfile
+	fixPkgconfig
+
+	# devel package
+	packageEntries devel \
+		$developDir
+}
+
+# ----- devel package -------------------------------------------------------
+
+PROVIDES_devel="
+	libsndfile${secondaryArchSuffix}_devel = $portVersion compat >= 1
+	devel:libsndfile$secondaryArchSuffix = $portVersion compat >= 1
+	"
+REQUIRES_devel="
+	libsndfile$secondaryArchSuffix == $portVersion base
+	"
--- a/media-libs/libsndfile/patches/libsndfile-1.0.25.patchset
+++ b/media-libs/libsndfile/patches/libsndfile-1.0.25.patchset
@@ -0,0 +1,21 @@
+From c94a905e75ff6769bd4289d56f687d6c2a8f6ba4 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
+
+
+diff --git a/src/sndfile.h.in b/src/sndfile.h.in
+index 8926fc6..ef9636b 100644
+--- a/src/sndfile.h.in
+++ b/src/sndfile.h.in
+@@ -29,6 +29,7 @@
+ /* This is the version 1.0.X header file. */
+ #define	SNDFILE_1
+ 
+#include <stdint.h>
+ #include <stdio.h>
+ #include <sys/types.h>
+ 
+-- 
+1.8.3.4
+
--- a/net-ftp/lftp/patches/lftp-4.4.16.patchset
+++ b/net-ftp/lftp/patches/lftp-4.4.16.patchset
@@ -0,0 +1,22 @@
+From 5ade774564ec60f247d60adbd39c2f94c6164fff Mon Sep 17 00:00:00 2001
+From: Jerome Duval <jerome.duval@gmail.com>
+Date: Sat, 17 May 2014 13:38:15 +0000
+Subject: gcc2 fix
+
+
+diff --git a/lib/gl_openssl.h b/lib/gl_openssl.h
+index 2414421..014769d 100644
+--- a/lib/gl_openssl.h
+++ b/lib/gl_openssl.h
+@@ -95,7 +95,7 @@ GL_CRYPTO_FN (_finish_ctx) (struct _gl_ctx *ctx, void *res)
+ 
+ GL_OPENSSL_INLINE void *
+ GL_CRYPTO_FN (_buffer) (const char *buf, size_t len, void *res)
+-{ return OPENSSL_FN () ((const unsigned char *) buf, len, (unsigned char *) res); }
+{ return OPENSSL_FN ( ) ((const unsigned char *) buf, len, (unsigned char *) res); }
+ 
+ GL_OPENSSL_INLINE void *
+ GL_CRYPTO_FN (_read_ctx) (const struct _gl_ctx *ctx, void *res)
+-- 
+1.8.3.4
+
--- a/net-misc/curl/curl-7.37.0.recipe
+++ b/net-misc/curl/curl-7.37.0.recipe
@@ -0,0 +1,116 @@
+SUMMARY="A commandline-tool and library for downloading data from URLs"
+HOMEPAGE="http://curl.haxx.se"
+COPYRIGHT="1996-2014, Daniel Stenberg, <daniel@haxx.se>. All rights reserved."
+LICENSE="Curl"
+SRC_URI="http://curl.haxx.se/download/$portVersionedName.tar.bz2"
+CHECKSUM_SHA256="24502492de3168b0556d8e1a06f14f7589e57b204917d602a572e14239b3e09e"
+REVISION="1"
+ARCHITECTURES="x86_gcc2 x86 x86_64 arm"
+SECONDARY_ARCHITECTURES="x86_gcc2 x86"
+
+PATCHES=""
+
+PROVIDES="
+	curl$secondaryArchSuffix = $portVersion
+	lib:libcurl$secondaryArchSuffix = 4.2.0 compat >= 4
+	"
+if [ -z "$secondaryArchSuffix" ]; then
+	PROVIDES="$PROVIDES
+		cmd:curl = $portVersion compat >= 7.16
+		"
+fi
+
+REQUIRES="
+	haiku$secondaryArchSuffix >= $haikuVersion
+	ca_root_certificates
+	lib:libssl$secondaryArchSuffix
+	lib:libz$secondaryArchSuffix
+	"
+BUILD_REQUIRES="
+	devel:libssl$secondaryArchSuffix
+	devel:libz$secondaryArchSuffix
+	"
+BUILD_PREREQUIRES="
+	haiku${secondaryArchSuffix}_devel >= $haikuVersion
+	cmd:autoconf
+	cmd:gcc$secondaryArchSuffix
+	cmd:ld$secondaryArchSuffix
+	cmd:libtoolize
+	cmd:make
+	cmd:nroff
+	"
+
+BUILD()
+{
+	certsInstallDir="$portPackageLinksDir/ca_root_certificates"
+	certsDir="$certsInstallDir/$relativeDataRootDir/ssl"
+
+	libtoolize --force --copy --install
+	autoconf
+	runConfigure ./configure \
+		--enable-ipv6 --enable-manual \
+		--with-ca-bundle="$certsDir/CARootCertificates.pem"
+	make $jobArgs
+}
+
+INSTALL()
+{
+	make install
+
+	# prepare develop/lib
+	prepareInstalledDevelLibs libcurl
+	fixPkgconfig
+
+	# fix curl-config
+	fixDevelopLibDirReferences $binDir/curl-config
+	sed -i -e "s,--libexecdir=$developLibDir,--libexecdir=$libExecDir,g" \
+		-e "s,--libdir=$developLibDir,--libdir=$libDir,g" $binDir/curl-config
+
+	# install html documentation for curl
+	mkdir -p "$docDir"
+	install -c -m 644 "docs/curl.html" "$docDir"
+
+	# install html development documentation for libcurl
+	mkdir -p "$developDocDir"
+	for h in docs/libcurl/*.html; do 
+		install -c -m 644 "$h" "$developDocDir"
+	done
+
+	# devel package
+	packageEntries devel \
+		$binDir/curl-config \
+		$developDir \
+		$manDir/man3
+
+	# Remove stuff we don't need in the secondary architecture base package.
+	if [ -n "$secondaryArchSuffix" ]; then
+		rm -rf $binDir
+		rm -rf $documentationDir
+	fi
+}
+
+TEST()
+{
+	make check
+}
+
+DESCRIPTION="
+Curl is a command line tool for transferring data with URL syntax, supporting \
+DICT, FILE, FTP, FTPS, Gopher, HTTP, HTTPS, IMAP, IMAPS, LDAP, LDAPS, POP3, \
+POP3S, RTMP, RTSP, SCP, SFTP, SMTP, SMTPS, Telnet and TFTP. curl supports SSL \
+certificates, HTTP POST, HTTP PUT, FTP uploading, HTTP form based upload, \
+proxies, cookies, user+password authentication (Basic, Digest, NTLM, \
+Negotiate, kerberos...), file transfer resume, proxy tunneling and a busload \
+of other useful tricks.
+"
+
+# ----- devel package -------------------------------------------------------
+
+PROVIDES_devel="
+	curl${secondaryArchSuffix}_devel = $portVersion
+	cmd:curl_config$secondaryArchSuffix = $portVersion compat >= 7.16
+	devel:libcurl$secondaryArchSuffix = 4.2.0 compat >= 4
+	"
+REQUIRES_devel="
+	curl$secondaryArchSuffix == $portVersion base
+	"
--- a/net-misc/wget/patches/wget-1.15.patchset
+++ b/net-misc/wget/patches/wget-1.15.patchset
@@ -0,0 +1,678 @@
+From d44e24178a9dd9864e7ac068249444a1d95b9af1 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
+
+
+diff --git a/configure.ac b/configure.ac
+index b24588f..b396ec2 100644
+--- a/configure.ac
+++ b/configure.ac
+@@ -161,6 +161,7 @@ AC_HEADER_STDBOOL
+ AC_CHECK_HEADERS(unistd.h sys/time.h)
+ AC_CHECK_HEADERS(termios.h sys/ioctl.h sys/select.h utime.h sys/utime.h)
+ AC_CHECK_HEADERS(stdint.h inttypes.h pwd.h wchar.h)
+AC_CHECK_HEADERS(arpa/inet.h)
+ 
+ AC_CHECK_DECLS(h_errno,,,[#include <netdb.h>])
+ 
+diff --git a/m4/wget.m4 b/m4/wget.m4
+index 777e973..5a8b75d 100644
+--- a/m4/wget.m4
+++ b/m4/wget.m4
+@@ -88,6 +88,7 @@ AC_DEFUN([WGET_POSIX_CLOCK], [
+ 
+ dnl Check whether we need to link with -lnsl and -lsocket, as is the
+ dnl case on e.g. Solaris.
+dnl Haiku needs libnetwork
+ 
+ AC_DEFUN([WGET_NSL_SOCKET], [
+   dnl On Solaris, -lnsl is needed to use gethostbyname.  But checking
+@@ -107,6 +108,8 @@ AC_DEFUN([WGET_NSL_SOCKET], [
+     AC_CHECK_LIB(nsl, $wget_check_in_nsl)
+   fi
+   AC_CHECK_LIB(socket, socket)
+  AC_CHECK_LIB(network, gethostbyname)
+  AC_CHECK_LIB(network, socket)
+ ])
+ 
+ 
+diff --git a/src/config.h.in b/src/config.h.in
+index 4b03033..a4543c4 100644
+--- a/src/config.h.in
+++ b/src/config.h.in
+@@ -672,6 +672,9 @@
+ /* Define to 1 if you have the <langinfo.h> header file. */
+ #undef HAVE_LANGINFO_H
+ 
+/* Define to 1 if you have the `bind' library (-lbind). */
+#undef HAVE_LIBBIND
+
+ /* Define to 1 if you have the `dl' library (-ldl). */
+ #undef HAVE_LIBDL
+ 
+@@ -684,6 +687,9 @@
+ /* Define to 1 if you have the <libintl.h> header file. */
+ #undef HAVE_LIBINTL_H
+ 
+/* Define to 1 if you have the `network' library (-lnetwork). */
+#undef HAVE_LIBNETWORK
+
+ /* Define to 1 if you have the `nsl' library (-lnsl). */
+ #undef HAVE_LIBNSL
+ 
+diff --git a/src/connect.c b/src/connect.c
+index bfb079b..916a90e 100644
+--- a/src/connect.c
+++ b/src/connect.c
+@@ -46,7 +46,7 @@ as that of the covered work.  */
+ #  include <netdb.h>
+ # endif /* def __VMS [else] */
+ # include <netinet/in.h>
+-# ifndef __BEOS__
+# ifdef HAVE_ARPA_INET_H
+ #  include <arpa/inet.h>
+ # endif
+ #endif /* not WINDOWS */
+diff --git a/src/host.h b/src/host.h
+index 3f27ea0..3cd3ed9 100644
+--- a/src/host.h
+++ b/src/host.h
+@@ -42,9 +42,9 @@ as that of the covered work.  */
+ # endif /* def __VMS [else] */
+ # include <sys/socket.h>
+ # include <netinet/in.h>
+-#ifndef __BEOS__
+-# include <arpa/inet.h>
+-#endif
+# ifdef HAVE_ARPA_INET_H
+#  include <arpa/inet.h>
+# endif
+ #endif
+ 
+ struct url;
+-- 
+1.8.3.4
+
+
+From d91114a406b6b16542a77b55ebe140314ce803c1 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
+
+
+diff --git a/src/ftp-basic.c b/src/ftp-basic.c
+index 7a512c6..7237cd1 100644
+--- a/src/ftp-basic.c
+++ b/src/ftp-basic.c
+@@ -969,8 +969,6 @@ ftp_list (int csock, const char *file, bool avoid_list_a, bool avoid_list,
+   bool ok = false;
+   size_t i = 0;
+ 
+-  *list_a_used = false;
+-
+   /* 2013-10-12 Andrea Urbani (matfanjol)
+      For more information about LIST and "LIST -a" please look at ftp.c,
+      function getftp, text "__LIST_A_EXPLANATION__".
+@@ -979,7 +977,9 @@ ftp_list (int csock, const char *file, bool avoid_list_a, bool avoid_list,
+      later "i" variable.  */
+   const char *list_commands[] = { "LIST -a",
+                                   "LIST" };
+  *list_a_used = false;
+ 
+  
+   if (avoid_list_a)
+     {
+       i = countof (list_commands)- 1;
+diff --git a/src/html-url.c b/src/html-url.c
+index 1bb44b4..5285983 100644
+--- a/src/html-url.c
+++ b/src/html-url.c
+@@ -789,6 +789,7 @@ get_urls_file (const char *file)
+       char *url_text;
+       struct urlpos *entry;
+       struct url *url;
+      char *new_url;
+ 
+       const char *line_beg = text;
+       const char *line_end = memchr (text, '\n', text_end - text);
+@@ -821,7 +822,7 @@ get_urls_file (const char *file)
+           url_text = merged;
+         }
+ 
+-      char *new_url = rewrite_shorthand_url (url_text);
+      new_url = rewrite_shorthand_url (url_text);
+       if (new_url)
+         {
+           xfree (url_text);
+diff --git a/src/http.c b/src/http.c
+index 5715df6..38ee4b1 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,
+                char separator)
+ {
+   const char *p = *source;
+  int param_type;
+ 
+   while (c_isspace (*p)) ++p;
+   if (!*p)
+@@ -1122,7 +1124,7 @@ extract_param (const char **source, param_token *name, param_token *value,
+     }
+   *source = p;
+ 
+-  int param_type = modify_param_name(name);
+  param_type = modify_param_name(name);
+   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,
+   int warc_payload_offset = 0;
+   FILE *warc_tmp = NULL;
+   int warcerr = 0;
+  int flags;
+ 
+   if (opt.warc_filename != NULL)
+     {
+@@ -1548,7 +1551,7 @@ read_response_body (struct http_stat *hs, int sock, FILE *fp, wgint contlen,
+     }
+ 
+   /* Read the response body.  */
+-  int flags = 0;
+  flags = 0;
+   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
+ gethttp (struct url *u, struct http_stat *hs, int *dt, struct url *proxy,
+          struct iri *iri, int count)
+ {
+  int warc_tmp_written;
+   struct request *req;
+ 
+   char *type;
+@@ -2125,10 +2129,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. */
+              int warc_tmp_written;
+               warc_payload_offset = ftello (warc_tmp);
+ 
+               /* Write a copy of the data to the WARC record. */
+-              int warc_tmp_written = fwrite (opt.body_data, 1, body_data_size, warc_tmp);
+              warc_tmp_written = fwrite (opt.body_data, 1, body_data_size, warc_tmp);
+               if (warc_tmp_written != body_data_size)
+                 write_error = -2;
+             }
+@@ -2309,6 +2314,7 @@ read_header:
+ 
+   if (statcode == HTTP_STATUS_UNAUTHORIZED)
+     {
+      uerr_t auth_err;
+       /* Authorization is required.  */
+ 
+       /* Normally we are not interested in the response body.
+@@ -2347,7 +2353,7 @@ read_header:
+         }
+ 
+       pconn.authorized = false;
+-      uerr_t auth_err = RETROK;
+      auth_err = RETROK;
+       if (!auth_finished && (user && passwd))
+         {
+           /* IIS sends multiple copies of WWW-Authenticate, one with
+diff --git a/src/main.c b/src/main.c
+index 19d7253..ea6986e 100644
+--- a/src/main.c
+++ b/src/main.c
+@@ -987,13 +987,20 @@ main (int argc, char **argv)
+   int i, ret, longindex;
+   int nurl;
+   bool append_to_log = false;
+  struct ptimer *timer;
+  double start_time;
+  int arglen;
+  int argstring_length;
+  int retconf;
+  bool use_userconfig = false;
+  char *p;
+ 
+   total_downloaded_bytes = 0;
+ 
+   program_name = argv[0];
+ 
+-  struct ptimer *timer = ptimer_new ();
+-  double start_time = ptimer_measure (timer);
+  timer = ptimer_new ();
+  start_time = ptimer_measure (timer);
+ 
+   i18n_initialize ();
+ 
+@@ -1015,10 +1022,10 @@ main (int argc, char **argv)
+ #endif
+ 
+   /* Construct the arguments string. */
+-  int argstring_length = 1;
+  argstring_length = 1;
+   for (i = 1; i < argc; i++)
+     argstring_length += strlen (argv[i]) + 2 + 1;
+-  char *p = program_argstring = malloc (argstring_length * sizeof (char));
+  p = program_argstring = malloc (argstring_length * sizeof (char));
+   if (p == NULL)
+     {
+       fprintf (stderr, _("Memory allocation problem\n"));
+@@ -1027,7 +1034,7 @@ main (int argc, char **argv)
+   for (i = 1; i < argc; i++)
+     {
+       *p++ = '"';
+-      int arglen = strlen (argv[i]);
+      arglen = strlen (argv[i]);
+       memcpy (p, argv[i], arglen);
+       p += arglen;
+       *p++ = '"';
+@@ -1043,8 +1050,6 @@ main (int argc, char **argv)
+   /* This separate getopt_long is needed to find the user config file
+      option ("--config") and parse it before the other user options. */
+   longindex = -1;
+-  int retconf;
+-  bool use_userconfig = false;
+ 
+   while ((retconf = getopt_long (argc, argv,
+                                 short_options, long_options, &longindex)) != -1)
+@@ -1672,10 +1677,12 @@ outputting to a regular file.\n"));
+       total_downloaded_bytes != 0)
+     {
+       double end_time = ptimer_measure (timer);
+      char *wall_time;
+      char *download_time;
+       ptimer_destroy (timer);
+ 
+-      char *wall_time = xstrdup (secs_to_human_time (end_time - start_time));
+-      char *download_time = xstrdup (secs_to_human_time (total_download_time));
+      wall_time = xstrdup (secs_to_human_time (end_time - start_time));
+      download_time = xstrdup (secs_to_human_time (total_download_time));
+       logprintf (LOG_NOTQUIET,
+ 		 _("FINISHED --%s--\nTotal wall clock time: %s\n"
+ 		   "Downloaded: %d files, %s in %s (%s)\n"),
+diff --git a/src/retr.c b/src/retr.c
+index 683c811..c0a815e 100644
+--- a/src/retr.c
+++ b/src/retr.c
+@@ -377,8 +377,9 @@ fd_read_body (int fd, FILE *out, wgint toread, wgint startpos,
+ 
+       if (ret > 0)
+         {
+          int write_res;
+           sum_read += ret;
+-          int write_res = write_data (out, out2, dlbuf, ret, &skip, &sum_written);
+          write_res = write_data (out, out2, dlbuf, ret, &skip, &sum_written);
+           if (write_res < 0)
+             {
+               ret = (write_res == -3) ? -3 : -2;
+diff --git a/src/utils.c b/src/utils.c
+index 4354668..d5fecc1 100644
+--- a/src/utils.c
+++ b/src/utils.c
+@@ -64,7 +64,9 @@ as that of the covered work.  */
+ #include <sys/stat.h>
+ 
+ /* For TIOCGWINSZ and friends: */
+#ifndef __HAIKU__
+ #include <sys/ioctl.h>
+#endif
+ #ifdef HAVE_TERMIOS_H
+ # include <termios.h>
+ #endif
+diff --git a/src/version.c b/src/version.c
+new file mode 100644
+index 0000000..5ee99d1
+--- /dev/null
+++ b/src/version.c
+@@ -0,0 +1,6 @@
+/* version.c */
+/* Autogenerated by Makefile - DO NOT EDIT */
+
+const char *version_string = "1.15";
+const char *compilation_string = "gcc -DHAVE_CONFIG_H -DSYSTEM_WGETRC=\"/packages/wget-1.15-1/.settings/wgetrc\" -DLOCALEDIR=\"/packages/wget-1.15-1/.self/data/locale\" -I. -I../lib -I../lib -O2 -Wall";
+const char *link_string = "gcc -O2 -Wall -lssl -lcrypto -lz -lnetwork -lnetwork -lsocket ftp-opie.o openssl.o http-ntlm.o ../lib/libgnu.a";
+diff --git a/src/warc.c b/src/warc.c
+index c3a5857..8dcc055 100644
+--- a/src/warc.c
+++ b/src/warc.c
+@@ -160,10 +160,11 @@ warc_write_buffer (const char *buffer, size_t size)
+ static bool
+ warc_write_string (const char *str)
+ {
+  size_t n;
+   if (!warc_write_ok)
+     return false;
+ 
+-  size_t n = strlen (str);
+  n = strlen (str);
+   if (n != warc_write_buffer (str, n))
+     warc_write_ok = false;
+ 
+@@ -251,6 +252,8 @@ static bool
+ warc_write_block_from_file (FILE *data_in)
+ {
+   /* Add the Content-Length header. */
+  char buffer[BUFSIZ];
+  size_t s;
+   char content_length[MAX_INT_TO_STRING_LEN(off_t)];
+   fseeko (data_in, 0L, SEEK_END);
+   number_to_string (content_length, ftello (data_in));
+@@ -263,8 +266,6 @@ warc_write_block_from_file (FILE *data_in)
+     warc_write_ok = false;
+ 
+   /* Copy the data in the file to the WARC record. */
+-  char buffer[BUFSIZ];
+-  size_t s;
+   while (warc_write_ok && (s = fread (buffer, 1, BUFSIZ, data_in)) > 0)
+     {
+       if (warc_write_buffer (buffer, s) < s)
+@@ -289,6 +290,12 @@ warc_write_end_record (void)
+   /* We start a new gzip stream for each record.  */
+   if (warc_write_ok && warc_current_gzfile)
+     {
+      size_t result;
+      char static_header[GZIP_STATIC_HEADER_SIZE];
+      off_t current_offset;
+      off_t uncompressed_size;
+      off_t compressed_size;
+      char extra_header[EXTRA_GZIP_HEADER_SIZE];
+       if (gzclose (warc_current_gzfile) != Z_OK)
+         {
+           warc_write_ok = false;
+@@ -314,17 +321,16 @@ warc_write_end_record (void)
+       */
+ 
+       /* Calculate the uncompressed and compressed sizes. */
+-      off_t current_offset = ftello (warc_current_file);
+-      off_t uncompressed_size = current_offset - warc_current_gzfile_offset;
+-      off_t compressed_size = warc_current_gzfile_uncompressed_size;
+      current_offset = ftello (warc_current_file);
+      uncompressed_size = current_offset - warc_current_gzfile_offset;
+      compressed_size = warc_current_gzfile_uncompressed_size;
+ 
+       /* Go back to the static GZIP header. */
+       fseeko (warc_current_file, warc_current_gzfile_offset
+               + EXTRA_GZIP_HEADER_SIZE, SEEK_SET);
+ 
+       /* Read the header. */
+-      char static_header[GZIP_STATIC_HEADER_SIZE];
+-      size_t result = fread (static_header, 1, GZIP_STATIC_HEADER_SIZE,
+      result = fread (static_header, 1, GZIP_STATIC_HEADER_SIZE,
+                              warc_current_file);
+       if (result != GZIP_STATIC_HEADER_SIZE)
+         {
+@@ -341,7 +347,6 @@ warc_write_end_record (void)
+       fwrite (static_header, 1, GZIP_STATIC_HEADER_SIZE, warc_current_file);
+ 
+       /* Prepare the extra GZIP header. */
+-      char extra_header[EXTRA_GZIP_HEADER_SIZE];
+       /* XLEN, the length of the extra header fields.  */
+       extra_header[0]  = ((EXTRA_GZIP_HEADER_SIZE - 2) & 255);
+       extra_header[1]  = ((EXTRA_GZIP_HEADER_SIZE - 2) >> 8) & 255;
+@@ -653,13 +658,15 @@ warc_write_warcinfo_record (char *filename)
+   /* Write warc-info record as the first record of the file. */
+   /* We add the record id of this info record to the other records in the
+      file. */
+  char timestamp[22];
+  char *filename_copy, *filename_basename;
+  FILE *warc_tmp;
+
+   warc_current_warcinfo_uuid_str = (char *) malloc (48);
+   warc_uuid_str (warc_current_warcinfo_uuid_str);
+ 
+-  char timestamp[22];
+   warc_timestamp (timestamp);
+ 
+-  char *filename_copy, *filename_basename;
+   filename_copy = strdup (filename);
+   filename_basename = strdup (basename (filename_copy));
+ 
+@@ -671,7 +678,7 @@ warc_write_warcinfo_record (char *filename)
+   warc_write_header ("WARC-Filename", filename_basename);
+ 
+   /* Create content.  */
+-  FILE *warc_tmp = warc_tempfile ();
+  warc_tmp = warc_tempfile ();
+   if (warc_tmp == NULL)
+     {
+       free (filename_copy);
+@@ -721,6 +728,10 @@ warc_write_warcinfo_record (char *filename)
+ static bool
+ warc_start_new_file (bool meta)
+ {
+  int base_filename_length;
+  char *new_filename;
+  const char *extension;
+
+   if (opt.warc_filename == NULL)
+     return false;
+ 
+@@ -732,9 +743,9 @@ warc_start_new_file (bool meta)
+ 
+   warc_current_file_number++;
+ 
+-  int base_filename_length = strlen (opt.warc_filename);
+  base_filename_length = strlen (opt.warc_filename);
+   /* filename format:  base + "-" + 5 digit serial number + ".warc.gz" */
+-  char *new_filename = malloc (base_filename_length + 1 + 5 + 8 + 1);
+  new_filename = malloc (base_filename_length + 1 + 5 + 8 + 1);
+   warc_current_filename = new_filename;
+ 
+ #ifdef __VMS
+@@ -744,9 +755,9 @@ warc_start_new_file (bool meta)
+ #endif /* def __VMS [else] */
+ 
+ #ifdef HAVE_LIBZ
+-  const char *extension = (opt.warc_compression_enabled ? WARC_GZ : "warc");
+  extension = (opt.warc_compression_enabled ? WARC_GZ : "warc");
+ #else
+-  const char *extension = "warc";
+  extension = "warc";
+ #endif
+ 
+   /* If max size is enabled, we add a serial number to the file names. */
+@@ -820,12 +831,13 @@ static bool
+ warc_parse_cdx_header (char *lineptr, int *field_num_original_url,
+                        int *field_num_checksum, int *field_num_record_id)
+ {
+  char *token;
+  char *save_ptr;
+
+   *field_num_original_url = -1;
+   *field_num_checksum = -1;
+   *field_num_record_id = -1;
+ 
+-  char *token;
+-  char *save_ptr;
+   token = strtok_r (lineptr, CDX_FIELDSEP, &save_ptr);
+ 
+   if (token != NULL && strcmp (token, "CDX") == 0)
+@@ -869,10 +881,12 @@ warc_process_cdx_line (char *lineptr, int field_num_original_url,
+ 
+   char *token;
+   char *save_ptr;
+  int field_num;
+
+   token = strtok_r (lineptr, CDX_FIELDSEP, &save_ptr);
+ 
+   /* Read this line to get the fields we need. */
+-  int field_num = 0;
+  field_num = 0;
+   while (token != NULL)
+     {
+       char **val;
+@@ -934,10 +948,7 @@ warc_process_cdx_line (char *lineptr, int field_num_original_url,
+ static bool
+ warc_load_cdx_dedup_file (void)
+ {
+-  FILE *f = fopen (opt.warc_cdx_dedup_filename, "r");
+-  if (f == NULL)
+-    return false;
+-
+  FILE *f;
+   int field_num_original_url = -1;
+   int field_num_checksum = -1;
+   int field_num_record_id = -1;
+@@ -946,6 +957,10 @@ warc_load_cdx_dedup_file (void)
+   size_t n = 0;
+   ssize_t line_length;
+ 
+  f = fopen (opt.warc_cdx_dedup_filename, "r");
+  if (f == NULL)
+    return false;
+
+   /* The first line should contain the CDX header.
+      Format:  " CDX x x x x x"
+      where x are field type indicators.  For our purposes, we only
+@@ -973,6 +988,7 @@ _("CDX file does not list record ids. (Missing column 'u'.)\n"));
+     }
+   else
+     {
+      int nrecords;
+       /* Initialize the table. */
+       warc_cdx_dedup_table = hash_table_new (1000, warc_hash_sha1_digest,
+                                              warc_cmp_sha1_digest);
+@@ -990,7 +1006,7 @@ _("CDX file does not list record ids. (Missing column 'u'.)\n"));
+       while (line_length != -1);
+ 
+       /* Print results. */
+-      int nrecords = hash_table_count (warc_cdx_dedup_table);
+      nrecords = hash_table_count (warc_cdx_dedup_table);
+       logprintf (LOG_VERBOSE, ngettext ("Loaded %d record from CDX.\n\n",
+                                         "Loaded %d records from CDX.\n\n",
+                                          nrecords),
+@@ -1010,10 +1026,11 @@ _("CDX file does not list record ids. (Missing column 'u'.)\n"));
+ static struct warc_cdx_record *
+ warc_find_duplicate_cdx_record (char *url, char *sha1_digest_payload)
+ {
+  struct warc_cdx_record *rec_existing;
+   if (warc_cdx_dedup_table == NULL)
+     return NULL;
+ 
+-  struct warc_cdx_record *rec_existing
+  rec_existing
+     = hash_table_get (warc_cdx_dedup_table, sha1_digest_payload);
+ 
+   if (rec_existing && strcmp (rec_existing->url, url) == 0)
+@@ -1085,11 +1102,13 @@ warc_init (void)
+ static void
+ warc_write_metadata (void)
+ {
+  char manifest_uuid [48];
+  FILE * warc_tmp_fp;
+
+   /* If there are multiple WARC files, the metadata should be written to a separate file. */
+   if (opt.warc_maxsize > 0)
+     warc_start_new_file (true);
+ 
+-  char manifest_uuid [48];
+   warc_uuid_str (manifest_uuid);
+ 
+   fflush (warc_manifest_fp);
+@@ -1099,7 +1118,7 @@ warc_write_metadata (void)
+                               warc_manifest_fp, -1);
+   /* warc_write_resource_record has closed warc_manifest_fp. */
+ 
+-  FILE * warc_tmp_fp = warc_tempfile ();
+  warc_tmp_fp = warc_tempfile ();
+   if (warc_tmp_fp == NULL)
+     {
+       logprintf (LOG_NOTQUIET, _("Could not open temporary WARC file.\n"));
+@@ -1153,6 +1172,7 @@ warc_close (void)
+ FILE *
+ warc_tempfile (void)
+ {
+  int fd;
+   char filename[100];
+   if (path_search (filename, 100, opt.warc_tempdir, "wget", true) == -1)
+     return NULL;
+@@ -1172,7 +1192,7 @@ warc_tempfile (void)
+     return fopen (tfn, "w+", "fop=tmd");    /* Create auto-delete temp file. */
+   }
+ #else /* def __VMS */
+-  int fd = mkostemp (filename, O_TEMPORARY);
+  fd = mkostemp (filename, O_TEMPORARY);
+   if (fd < 0)
+     return NULL;
+ 
+@@ -1234,8 +1254,11 @@ warc_write_cdx_record (const char *url, const char *timestamp_str,
+                        off_t offset, const char *warc_filename,
+                        const char *response_uuid)
+ {
+-  /* Transform the timestamp. */
+  char offset_string[MAX_INT_TO_STRING_LEN(off_t)];
+   char timestamp_str_cdx [15];
+  const char *checksum;
+
+  /* Transform the timestamp. */
+   memcpy (timestamp_str_cdx     , timestamp_str     , 4); /* "YYYY" "-" */
+   memcpy (timestamp_str_cdx +  4, timestamp_str +  5, 2); /* "mm"   "-" */
+   memcpy (timestamp_str_cdx +  6, timestamp_str +  8, 2); /* "dd"   "T" */
+@@ -1245,7 +1268,6 @@ warc_write_cdx_record (const char *url, const char *timestamp_str,
+   timestamp_str_cdx[14] = '\0';
+ 
+   /* Rewrite the checksum. */
+-  const char *checksum;
+   if (payload_digest != NULL)
+     checksum = payload_digest + 5; /* Skip the "sha1:" */
+   else
+@@ -1256,7 +1278,6 @@ warc_write_cdx_record (const char *url, const char *timestamp_str,
+   if (redirect_location == NULL || strlen(redirect_location) == 0)
+     redirect_location = "-";
+ 
+-  char offset_string[MAX_INT_TO_STRING_LEN(off_t)];
+   number_to_string (offset_string, offset);
+ 
+   /* Print the CDX line. */
+@@ -1288,10 +1309,11 @@ warc_write_revisit_record (char *url, char *timestamp_str,
+                            char *refers_to, ip_address *ip, FILE *body)
+ {
+   char revisit_uuid [48];
+-  warc_uuid_str (revisit_uuid);
+-
+   char *block_digest = NULL;
+   char sha1_res_block[SHA1_DIGEST_SIZE];
+
+  warc_uuid_str (revisit_uuid);
+
+   sha1_stream (body, sha1_res_block);
+   block_digest = warc_base32_sha1_digest (sha1_res_block);
+ 
+@@ -1342,6 +1364,9 @@ warc_write_response_record (char *url, char *timestamp_str,
+   char sha1_res_block[SHA1_DIGEST_SIZE];
+   char sha1_res_payload[SHA1_DIGEST_SIZE];
+ 
+  char response_uuid [48];
+  off_t offset;
+
+   if (opt.warc_digests_enabled)
+     {
+       /* Calculate the block and payload digests. */
+@@ -1385,11 +1410,10 @@ warc_write_response_record (char *url, char *timestamp_str,
+ 
+   /* Not a revisit, just store the record. */
+ 
+-  char response_uuid [48];
+   warc_uuid_str (response_uuid);
+ 
+   fseeko (warc_current_file, 0L, SEEK_END);
+-  off_t offset = ftello (warc_current_file);
+  offset = ftello (warc_current_file);
+ 
+   warc_write_start_record ();
+   warc_write_header ("WARC-Type", "response");
+-- 
+1.8.3.4
+
--- a/net-misc/wget/wget-1.15.recipe
+++ b/net-misc/wget/wget-1.15.recipe
@@ -0,0 +1,75 @@
+SUMMARY="A tool for downloading files from the internet"
+DESCRIPTION="
+wget is a tool that can download files from the internet through protocols \
+such as HTTP, HTTPS and FTP. wget is non-interactive, so it can be called from \
+scripts.
+"
+HOMEPAGE="http://www.gnu.org/software/wget" 
+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"
+ARCHITECTURES="x86_gcc2 x86 x86_64"
+SECONDARY_ARCHITECTURES="x86 x86_gcc2"
+
+PROVIDES="
+	wget$secondaryArchSuffix = $portVersion
+	cmd:wget$secondaryArchSuffix = $portVersion
+	"
+
+REQUIRES="
+	haiku$secondaryArchSuffix >= $haikuVersion
+	lib:libcrypto$secondaryArchSuffix
+	lib:libssl$secondaryArchSuffix
+	lib:libz$secondaryArchSuffix
+	"
+
+BUILD_REQUIRES="
+	haiku${secondaryArchSuffix}_devel >= $haikuVersion
+	devel:libcrypto$secondaryArchSuffix
+	devel:libssl$secondaryArchSuffix
+	devel:libz$secondaryArchSuffix >= 1.2.3
+	"
+BUILD_PREREQUIRES="
+	cmd:gcc$secondaryArchSuffix
+	cmd:aclocal
+	cmd:autoconf
+	cmd:libtoolize
+	cmd:make
+	cmd:makeinfo
+	cmd:pod2man
+	"
+
+USER_SETTINGS_FILES="
+	settings/wgetrc
+	"
+
+GLOBAL_WRITABLE_FILES="
+	settings/wgetrc keep-old
+"
+
+PATCHES="wget-1.15.patchset"
+
+BUILD()
+{
+	libtoolize --force --copy --install
+	aclocal -I m4
+	autoconf
+	runConfigure ./configure --with-ssl=openssl
+	make
+}
+
+INSTALL()
+{
+	make install
+	# Tells wget where to find certificates
+	echo "ca_certificate=/boot/system/data/ssl/CARootCertificates.pem" > $settingsDir/wgetrc
+}
+
+TEST()
+{
+	[ -d .git ] && mv .git .git-temp
+	make check || true
+	[ -d .git-temp ] && mv .git-temp .git
+}
--- a/sys-apps/coreutils/coreutils-8.22.recipe
+++ b/sys-apps/coreutils/coreutils-8.22.recipe
@@ -0,0 +1,265 @@
+SUMMARY="Standard GNU core utilities"
+DESCRIPTION="
+Most of these programs have significant advantages over their Unix \
+counterparts, such as greater speed, additional options, and fewer \
+arbitrary limits.
+
+The programs that can be built with this package are:
+
+  [ arch base64 basename cat chcon chgrp chmod chown chroot cksum comm cp \
+csplit cut date dd df dir dircolors dirname du echo env expand expr \
+factor false fmt fold groups head hostid hostname id install join kill \
+link ln logname ls md5sum mkdir mkfifo mknod mktemp mv nice nl nohup \
+nproc numfmt od paste pathchk pinky pr printenv printf ptx pwd readlink \
+realpath rm rmdir runcon seq sha1sum sha224sum sha256sum sha384sum sha512sum \
+shred shuf sleep sort split stat stdbuf stty sum sync tac tail tee test \
+timeout touch tr true truncate tsort tty uname unexpand uniq unlink \
+uptime users vdir wc who whoami yes
+"
+HOMEPAGE="http://www.gnu.org/software/coreutils"
+COPYRIGHT="1994-2013 Free Software Foundation, Inc."
+LICENSE="GNU GPL v3"
+SRC_URI="http://ftp.gnu.org/gnu/coreutils/coreutils-$portVersion.tar.xz"
+CHECKSUM_SHA256="5b3e94998152c017e6c75d56b9b994188eb71bf46d4038a642cb9141f6ff1212"
+REVISION="1"
+ARCHITECTURES="x86_gcc2 x86 x86_64 arm"
+
+PATCHES="
+	coreutils-$portVersion.patchset
+	coreutils-$portVersion.gcc2.patchset
+	"
+
+PROVIDES="
+	coreutils = $portVersion compat >= 8
+	cmd:[ = $portVersion compat >= 8
+	cmd:base64 = $portVersion compat >= 8
+	cmd:basename = $portVersion compat >= 8
+	cmd:cat = $portVersion compat >= 8
+	cmd:chcon = $portVersion compat >= 8
+	cmd:chgrp = $portVersion compat >= 8
+	cmd:chmod = $portVersion compat >= 8
+	cmd:chown = $portVersion compat >= 8
+	cmd:chroot = $portVersion compat >= 8
+	cmd:cksum = $portVersion compat >= 8
+	cmd:comm = $portVersion compat >= 8
+	cmd:cp = $portVersion compat >= 8
+	cmd:csplit = $portVersion compat >= 8
+	cmd:cut = $portVersion compat >= 8
+	cmd:date = $portVersion compat >= 8
+	cmd:dd = $portVersion compat >= 8
+	cmd:df = $portVersion compat >= 8
+	cmd:dir = $portVersion compat >= 8
+	cmd:dircolors = $portVersion compat >= 8
+	cmd:dirname = $portVersion compat >= 8
+	cmd:du = $portVersion compat >= 8
+	cmd:echo = $portVersion compat >= 8
+	cmd:env = $portVersion compat >= 8
+	cmd:expand = $portVersion compat >= 8
+	cmd:expr = $portVersion compat >= 8
+	cmd:factor = $portVersion compat >= 8
+	cmd:false = $portVersion compat >= 8
+	cmd:fmt = $portVersion compat >= 8
+	cmd:fold = $portVersion compat >= 8
+	cmd:groups = $portVersion compat >= 8
+	cmd:head = $portVersion compat >= 8
+	cmd:hostname = $portVersion compat >= 8
+	cmd:id = $portVersion compat >= 8
+	cmd:install = $portVersion compat >= 8
+	cmd:join = $portVersion compat >= 8
+	cmd:kill = $portVersion compat >= 8
+	cmd:link = $portVersion compat >= 8
+	cmd:ln = $portVersion compat >= 8
+	cmd:logname = $portVersion compat >= 8
+	cmd:ls = $portVersion compat >= 8
+	cmd:md5sum = $portVersion compat >= 8
+	cmd:mkdir = $portVersion compat >= 8
+	cmd:mkfifo = $portVersion compat >= 8
+	cmd:mknod = $portVersion compat >= 8
+	cmd:mktemp = $portVersion compat >= 8
+	cmd:mv = $portVersion compat >= 8
+	cmd:nl = $portVersion compat >= 8
+	cmd:nohup = $portVersion compat >= 8
+	cmd:nproc = $portVersion compat >= 8
+	cmd:numfmt = $portVersion compat >= 8
+	cmd:od = $portVersion compat >= 8
+	cmd:paste = $portVersion compat >= 8
+	cmd:pathchk = $portVersion compat >= 8
+	cmd:pr = $portVersion compat >= 8
+	cmd:printenv = $portVersion compat >= 8
+	cmd:printf = $portVersion compat >= 8
+	cmd:ptx = $portVersion compat >= 8
+	cmd:pwd = $portVersion compat >= 8
+	cmd:readlink = $portVersion compat >= 8
+	cmd:realpath = $portVersion compat >= 8
+	cmd:rm = $portVersion compat >= 8
+	cmd:rmdir = $portVersion compat >= 8
+	cmd:runcon = $portVersion compat >= 8
+	cmd:seq = $portVersion compat >= 8
+	cmd:sha1sum = $portVersion compat >= 8
+	cmd:sha224sum = $portVersion compat >= 8
+	cmd:sha256sum = $portVersion compat >= 8
+	cmd:sha384sum = $portVersion compat >= 8
+	cmd:sha512sum = $portVersion compat >= 8
+	cmd:shred = $portVersion compat >= 8
+	cmd:shuf = $portVersion compat >= 8
+	cmd:sleep = $portVersion compat >= 8
+	cmd:sort = $portVersion compat >= 8
+	cmd:split = $portVersion compat >= 8
+	cmd:stat = $portVersion compat >= 8
+	cmd:stdbuf = $portVersion compat >= 8
+	cmd:stty = $portVersion compat >= 8
+	cmd:sum = $portVersion compat >= 8
+	cmd:sync = $portVersion compat >= 8
+	cmd:tac = $portVersion compat >= 8
+	cmd:tail = $portVersion compat >= 8
+	cmd:tee = $portVersion compat >= 8
+	cmd:test = $portVersion compat >= 8
+	cmd:timeout = $portVersion compat >= 8
+	cmd:touch = $portVersion compat >= 8
+	cmd:tr = $portVersion compat >= 8
+	cmd:true = $portVersion compat >= 8
+	cmd:truncate = $portVersion compat >= 8
+	cmd:tsort = $portVersion compat >= 8
+	cmd:tty = $portVersion compat >= 8
+	cmd:uname = $portVersion compat >= 8
+	cmd:unexpand = $portVersion compat >= 8
+	cmd:uniq = $portVersion compat >= 8
+	cmd:unlink = $portVersion compat >= 8
+	cmd:vdir = $portVersion compat >= 8
+	cmd:wc = $portVersion compat >= 8
+	cmd:whoami = $portVersion compat >= 8
+	cmd:yes = $portVersion compat >= 8
+	"
+REQUIRES="
+	haiku >= $haikuVersion
+	"
+BUILD_PREREQUIRES="
+	haiku_devel >= $haikuVersion
+	cmd:gcc
+	cmd:ld
+	cmd:make
+	cmd:awk
+	cmd:sed
+	cmd:help2man
+	"
+
+defineDebugInfoPackage coreutils \
+	$binDir/[ \
+	$binDir/base64 \
+	$binDir/basename \
+	$binDir/cat \
+	$binDir/chcon \
+	$binDir/chgrp \
+	$binDir/chmod \
+	$binDir/chown \
+	$binDir/chroot \
+	$binDir/cksum \
+	$binDir/comm \
+	$binDir/cp \
+	$binDir/csplit \
+	$binDir/cut \
+	$binDir/date \
+	$binDir/dd \
+	$binDir/df \
+	$binDir/dir \
+	$binDir/dircolors \
+	$binDir/dirname \
+	$binDir/du \
+	$binDir/echo \
+	$binDir/env \
+	$binDir/expand \
+	$binDir/expr \
+	$binDir/factor \
+	$binDir/false \
+	$binDir/fmt \
+	$binDir/fold \
+	$binDir/groups \
+	$binDir/head \
+	$binDir/hostname \
+	$binDir/id \
+	$binDir/install \
+	$binDir/join \
+	$binDir/kill \
+	$binDir/link \
+	$binDir/ln \
+	$binDir/logname \
+	$binDir/ls \
+	$binDir/md5sum \
+	$binDir/mkdir \
+	$binDir/mkfifo \
+	$binDir/mknod \
+	$binDir/mktemp \
+	$binDir/mv \
+	$binDir/nl \
+	$binDir/nohup \
+	$binDir/nproc \
+	$binDir/numfmt \
+	$binDir/od \
+	$binDir/paste \
+	$binDir/pathchk \
+	$binDir/pr \
+	$binDir/printenv \
+	$binDir/printf \
+	$binDir/ptx \
+	$binDir/pwd \
+	$binDir/readlink \
+	$binDir/realpath \
+	$binDir/rm \
+	$binDir/rmdir \
+	$binDir/runcon \
+	$binDir/seq \
+	$binDir/sha1sum \
+	$binDir/sha224sum \
+	$binDir/sha256sum \
+	$binDir/sha384sum \
+	$binDir/sha512sum \
+	$binDir/shred \
+	$binDir/shuf \
+	$binDir/sleep \
+	$binDir/sort \
+	$binDir/split \
+	$binDir/stat \
+	$binDir/stdbuf \
+	$binDir/stty \
+	$binDir/sum \
+	$binDir/sync \
+	$binDir/tac \
+	$binDir/tail \
+	$binDir/tee \
+	$binDir/test \
+	$binDir/timeout \
+	$binDir/touch \
+	$binDir/tr \
+	$binDir/true \
+	$binDir/truncate \
+	$binDir/tsort \
+	$binDir/tty \
+	$binDir/uname \
+	$binDir/unexpand \
+	$binDir/uniq \
+	$binDir/unlink \
+	$binDir/vdir \
+	$binDir/wc \
+	$binDir/whoami \
+	$binDir/yes \
+	
+PATCH()
+{
+	sed -i -e 's|O_NOCACHE|DD_NOCACHE|g' src/dd.c
+}
+
+BUILD()
+{
+	FORCE_UNSAFE_CONFIGURE=1 runConfigure ./configure \
+		--without-included-regex \
+		--disable-rpath --with-gnu-ld \
+		--enable-no-install-program=uptime \
+		--enable-install-program=hostname
+	touch doc/*.info
+	make $jobArgs
+}
+
+INSTALL()
+{
+	make install
+}
--- a/sys-apps/coreutils/patches/coreutils-8.22.gcc2.patchset
+++ b/sys-apps/coreutils/patches/coreutils-8.22.gcc2.patchset
--- a/sys-apps/coreutils/patches/coreutils-8.22.patchset
+++ b/sys-apps/coreutils/patches/coreutils-8.22.patchset
@@ -0,0 +1,256 @@
+From b5e90c4656599710617ca6a24c750ef9f1c93b5f Mon Sep 17 00:00:00 2001
+From: Jerome Duval <jerome.duval@gmail.com>
+Date: Tue, 13 May 2014 16:20:12 +0000
+Subject: avoid warning on gcc 4.6+
+
+
+diff --git a/lib/fadvise.c b/lib/fadvise.c
+index 8d3af99..f9e0f27 100644
+--- a/lib/fadvise.c
+++ b/lib/fadvise.c
+@@ -14,6 +14,10 @@
+    You should have received a copy of the GNU General Public License
+    along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
+ 
+#if (__GNUC__ == 4 && 6 <= __GNUC_MINOR__) || 4 < __GNU_C__
+# pragma GCC diagnostic ignored "-Wsuggest-attribute=const"
+#endif
+
+ #include <config.h>
+ #include "fadvise.h"
+ 
+-- 
+1.8.3.4
+
+
+From 23a01facb7fd62c93e3df82a4302dca3aaee4944 Mon Sep 17 00:00:00 2001
+From: Jerome Duval <jerome.duval@gmail.com>
+Date: Tue, 13 May 2014 17:18:52 +0000
+Subject: define __USE_GNU for wempcpy
+
+
+diff --git a/lib/fnmatch.c b/lib/fnmatch.c
+index 6a09e1a..a26b0ca 100644
+--- a/lib/fnmatch.c
+++ b/lib/fnmatch.c
+@@ -21,6 +21,9 @@
+ #ifndef _GNU_SOURCE
+ # define _GNU_SOURCE    1
+ #endif
+#ifndef __USE_GNU
+# define __USE_GNU		1
+#endif
+ 
+ #if ! defined __builtin_expect && __GNUC__ < 3
+ # define __builtin_expect(expr, expected) (expr)
+-- 
+1.8.3.4
+
+
+From a277df80f2d5dba4b4519a97ea9042fb56c9feb5 Mon Sep 17 00:00:00 2001
+From: Jerome Duval <jerome.duval@gmail.com>
+Date: Tue, 13 May 2014 17:22:10 +0000
+Subject: force declaration of rpl_inet_ntop
+
+
+diff --git a/lib/arpa_inet.in.h b/lib/arpa_inet.in.h
+index ba89e97..3be3941 100644
+--- a/lib/arpa_inet.in.h
+++ b/lib/arpa_inet.in.h
+@@ -72,7 +72,7 @@
+ 
+    For more details, see the POSIX:2001 specification
+    <http://www.opengroup.org/susv3xsh/inet_ntop.html>.  */
+-# if @REPLACE_INET_NTOP@
+# if 1
+ #  if !(defined __cplusplus && defined GNULIB_NAMESPACE)
+ #   undef inet_ntop
+ #   define inet_ntop rpl_inet_ntop
+-- 
+1.8.3.4
+
+
+From e0b54fa2760209c59364a131cd7aced2f9958790 Mon Sep 17 00:00:00 2001
+From: Jerome Duval <jerome.duval@gmail.com>
+Date: Tue, 13 May 2014 17:32:36 +0000
+Subject: Haiku defines mknod in unistd.h
+
+
+diff --git a/lib/mknod.c b/lib/mknod.c
+index 71e9d34..1dc218c 100644
+--- a/lib/mknod.c
+++ b/lib/mknod.c
+@@ -18,6 +18,7 @@
+ 
+ #include <config.h>
+ 
+#include <unistd.h>
+ #include <sys/stat.h>
+ 
+ #include <errno.h>
+-- 
+1.8.3.4
+
+
+From 45cd156446cd8ac305462f48b2e871fdddc39b93 Mon Sep 17 00:00:00 2001
+From: Jerome Duval <jerome.duval@gmail.com>
+Date: Tue, 13 May 2014 17:35:25 +0000
+Subject: protect the label, not used on Haiku
+
+
+diff --git a/lib/mountlist.c b/lib/mountlist.c
+index b839cd1..c095a25 100644
+--- a/lib/mountlist.c
+++ b/lib/mountlist.c
+@@ -953,7 +953,7 @@ read_file_system_list (bool need_fs_type)
+   *mtail = NULL;
+   return mount_list;
+ 
+-
+#ifndef __HAIKU__
+  free_then_fail:
+   {
+     int saved_errno = errno;
+@@ -969,6 +969,7 @@ read_file_system_list (bool need_fs_type)
+     errno = saved_errno;
+     return NULL;
+   }
+#endif
+ }
+ 
+ /* Free a mount entry as returned from read_file_system_list ().  */
+-- 
+1.8.3.4
+
+
+From 0dcf7067f72fdb61b8ce4705dae4a6e82ac7542f Mon Sep 17 00:00:00 2001
+From: Jerome Duval <jerome.duval@gmail.com>
+Date: Tue, 13 May 2014 17:38:39 +0000
+Subject: protect a bool not used on Haiku
+
+
+diff --git a/lib/rename.c b/lib/rename.c
+index 3e463ea..8dff5d5 100644
+--- a/lib/rename.c
+++ b/lib/rename.c
+@@ -285,7 +285,9 @@ rpl_rename (char const *src, char const *dst)
+   char *dst_temp = (char *) dst;
+   bool src_slash;
+   bool dst_slash;
+#if RENAME_DEST_EXISTS_BUG
+   bool dst_exists;
+#endif
+   int ret_val = -1;
+   int rename_errno = ENOTDIR;
+   struct stat src_st;
+@@ -340,7 +342,9 @@ rpl_rename (char const *src, char const *dst)
+     {
+       if (errno != ENOENT || (!S_ISDIR (src_st.st_mode) && dst_slash))
+         return -1;
+#if RENAME_DEST_EXISTS_BUG
+       dst_exists = false;
+#endif
+     }
+   else
+     {
+@@ -353,7 +357,9 @@ rpl_rename (char const *src, char const *dst)
+       if (SAME_INODE (src_st, dst_st))
+         return 0;
+ # endif /* RENAME_HARD_LINK_BUG */
+#if RENAME_DEST_EXISTS_BUG
+       dst_exists = true;
+#endif
+     }
+ 
+ # if (RENAME_TRAILING_SLASH_SOURCE_BUG || RENAME_DEST_EXISTS_BUG        \
+-- 
+1.8.3.4
+
+
+From c75141b2cf4726e9f83a2d415c3b1585360552cc Mon Sep 17 00:00:00 2001
+From: Jerome Duval <jerome.duval@gmail.com>
+Date: Thu, 15 May 2014 15:40:32 +0000
+Subject: strchrnul needs __USE_GNU on Haiku
+
+
+diff --git a/lib/regex.h b/lib/regex.h
+index 854c6ed..86f16b8 100644
+--- a/lib/regex.h
+++ b/lib/regex.h
+@@ -31,8 +31,10 @@ extern "C" {
+ /* Define __USE_GNU to declare GNU extensions that violate the
+    POSIX name space rules.  */
+ #ifdef _GNU_SOURCE
+#ifndef __USE_GNU
+ # define __USE_GNU 1
+ #endif
+#endif
+ 
+ #ifdef _REGEX_LARGE_OFFSETS
+ 
+diff --git a/lib/string.in.h b/lib/string.in.h
+index d7a6c9c..729338d 100644
+--- a/lib/string.in.h
+++ b/lib/string.in.h
+@@ -23,6 +23,9 @@
+ @PRAGMA_COLUMNS@
+ 
+ /* The include_next requires a split double-inclusion guard.  */
+#ifndef __USE_GNU
+#define __USE_GNU
+#endif
+ #@INCLUDE_NEXT@ @NEXT_STRING_H@
+ 
+ #ifndef _@GUARD_PREFIX@_STRING_H
+-- 
+1.8.3.4
+
+
+From ab49c9e1edac815682126be26afd0b70d1e30f87 Mon Sep 17 00:00:00 2001
+From: Jerome Duval <jerome.duval@gmail.com>
+Date: Thu, 15 May 2014 20:13:58 +0000
+Subject: don't build hostid, uptime, nice, users, who, dd
+
+
+diff --git a/Makefile.in b/Makefile.in
+index dab25d0..3be1664 100644
+--- a/Makefile.in
+++ b/Makefile.in
+@@ -611,16 +611,15 @@ src_libver_a_LIBADD =
+ nodist_src_libver_a_OBJECTS = src/version.$(OBJEXT)
+ src_libver_a_OBJECTS = $(nodist_src_libver_a_OBJECTS)
+ am__EXEEXT_1 = src/arch$(EXEEXT) src/hostname$(EXEEXT)
+-am__EXEEXT_2 = src/chroot$(EXEEXT) src/df$(EXEEXT) src/hostid$(EXEEXT) \
+-	src/libstdbuf.so$(EXEEXT) src/nice$(EXEEXT) src/pinky$(EXEEXT) \
+-	src/stdbuf$(EXEEXT) src/stty$(EXEEXT) src/uptime$(EXEEXT) \
+-	src/users$(EXEEXT) src/who$(EXEEXT)
+am__EXEEXT_2 = src/chroot$(EXEEXT) src/df$(EXEEXT) \
+	src/libstdbuf.so$(EXEEXT) \
+	src/stdbuf$(EXEEXT) src/stty$(EXEEXT)
+ am__EXEEXT_3 = src/[$(EXEEXT) src/base64$(EXEEXT) \
+ 	src/basename$(EXEEXT) src/cat$(EXEEXT) src/chcon$(EXEEXT) \
+ 	src/chgrp$(EXEEXT) src/chmod$(EXEEXT) src/chown$(EXEEXT) \
+ 	src/cksum$(EXEEXT) src/comm$(EXEEXT) src/cp$(EXEEXT) \
+ 	src/csplit$(EXEEXT) src/cut$(EXEEXT) src/date$(EXEEXT) \
+-	src/dd$(EXEEXT) src/dir$(EXEEXT) src/dircolors$(EXEEXT) \
+	src/dir$(EXEEXT) src/dircolors$(EXEEXT) \
+ 	src/dirname$(EXEEXT) src/du$(EXEEXT) src/echo$(EXEEXT) \
+ 	src/env$(EXEEXT) src/expand$(EXEEXT) src/expr$(EXEEXT) \
+ 	src/factor$(EXEEXT) src/false$(EXEEXT) src/fmt$(EXEEXT) \
+@@ -3247,12 +3246,12 @@ WARN_ON_USE_H = lib/warn-on-use.h
+ # FIXME: once lib/ and gnulib-tests/ are also converted, hoist to Makefile.am
+ AM_CFLAGS = $(WERROR_CFLAGS)
+ no_install__progs = src/arch src/hostname
+-build_if_possible__progs = src/chroot src/df src/hostid \
+build_if_possible__progs = src/chroot src/df \
+ 	src/libstdbuf.so src/nice src/pinky src/stdbuf src/stty \
+ 	src/uptime src/users src/who
+ default__progs = src/[ src/base64 src/basename src/cat src/chcon \
+ 	src/chgrp src/chmod src/chown src/cksum src/comm src/cp \
+-	src/csplit src/cut src/date src/dd src/dir src/dircolors \
+	src/csplit src/cut src/date src/dir src/dircolors \
+ 	src/dirname src/du src/echo src/env src/expand src/expr \
+ 	src/factor src/false src/fmt src/fold src/ginstall src/groups \
+ 	src/head src/id src/join src/kill src/link src/ln src/logname \
+-- 
+1.8.3.4
--- a/sys-devel/bin86/bin86-0.16.21.recipe
+++ b/sys-devel/bin86/bin86-0.16.21.recipe
@@ -0,0 +1,56 @@
+SUMMARY="A simple assember and linker for 8086 - 80386 machine code."
+DESCRIPTION="
+as86 is an assembler for the 8086..80386 processors, it's syntax is closer \
+to the intel/microsoft form rather than the more normal generic form of \
+the unix system assembler.
+The linker understands only the object files produced by the as86 assembler, \
+it can link them into either an impure or a separate I&D executable.
+"
+HOMEPAGE="http://v3.sk/~lkundrak/dev86/" 
+COPYRIGHT="
+	 1994 Bruce Evans
+	 1999 Robert de Bath
+"
+LICENSE="GNU GPL v2"
+SRC_URI="http://v3.sk/~lkundrak/dev86/$portVersionedName.tar.gz"
+CHECKSUM_SHA256="021e37cde3a20632c4c9000993cb4aa9f58cb82b1d3c26b9aeb62d6566925738"
+REVISION="1"
+
+ARCHITECTURES="x86 x86_64 x86_gcc2"
+SECONDARY_ARCHITECTURES="x86"
+
+PATCHES="${portVersionedName}.patchset"
+
+PROVIDES="
+	bin86$secondaryArchSuffix = $portVersion compat >= 0
+	cmd:as86
+	cmd:ld86
+	cmd:nm86
+	cmd:objdump86
+	cmd:size86
+	"
+
+REQUIRES="
+	haiku$secondaryArchSuffix >= $haikuVersion
+	"
+
+BUILD_REQUIRES="
+	haiku${secondaryArchSuffix}_devel >= $haikuVersion
+	"
+
+BUILD_PREREQUIRES="
+	cmd:gcc$secondaryArchSuffix
+	cmd:ld$secondaryArchSuffix
+	cmd:make
+	"
+
+BUILD()
+{
+	make $jobArgs
+}
+
+INSTALL()
+{
+	mkdir -p $binDir $manDir
+	make BINDIR=$binDir MANDIR=$manDir install
+}
--- a/sys-devel/bin86/patches/bin86-0.16.21.patchset
+++ b/sys-devel/bin86/patches/bin86-0.16.21.patchset
@@ -0,0 +1,24 @@
+From 5dba21d7b8b1850e0a590d2a4f58b56ee983deb1 Mon Sep 17 00:00:00 2001
+From: Jerome Duval <jerome.duval@gmail.com>
+Date: Wed, 21 May 2014 18:01:48 +0000
+Subject: apply amd64 patch from Gentoo.
+
+
+diff --git a/ld/x86_aout.h b/ld/x86_aout.h
+index 542a70d..a38488d 100644
+--- a/ld/x86_aout.h
+++ b/ld/x86_aout.h
+@@ -19,7 +19,9 @@ typedef long Long;
+ typedef int32_t Long;
+ #define __OUT_OK 1
+ #else
+-typedef char Long[4];
+#define __OUT_OK 1
+#include <inttypes.h>
+typedef int32_t Long;
+ #endif
+ #endif
+ 
+-- 
+1.8.3.4
+
--- a/sys-devel/clang/clang-3.4.recipe
+++ b/sys-devel/clang/clang-3.4.recipe
@@ -29,13 +29,15 @@ PROVIDES="
 	cmd:clang = $portVersion
 	cmd:clang++ = $portVersion
 	cmd:c_index_test = $portVersion
-	lib:libLTO = $portVersion
-	lib:libclang = $portVersion
-	lib:libprofile_rt = $portVersion
+	lib:libLTO$secondaryArchSuffix = $portVersion
+	lib:libclang$secondaryArchSuffix = $portVersion
+	devel:libLTO$secondaryArchSuffix = $portVersion
+	devel:libclang$secondaryArchSuffix = $portVersion
 	"

 REQUIRES="
 	haiku$secondaryArchSuffix >= $haikuVersion
+	lib:libstdc++$secondaryArchSuffix
 	"

 BUILD_REQUIRES="
@@ -73,15 +75,21 @@ BUILD()

 	# TODO: clang's build system seems to ignore doc / man / shared dirs?
 	runConfigure ./configure --enable-optimized
-	make $jobArgs
+	make $jobArgs PROJ_datadir=$dataDir PROJ_docsdir=$docDir \
+		PROJ_mandir=$manDir PROJ_includedir=$includeDir PROJ_libdir=$libDir
 }

 INSTALL()
 {
 	mkdir -p $developDir
 	mkdir -p $docDir
+	mkdir -p $binDir

-	make install-clang
+	make install-clang PROJ_datadir=$dataDir PROJ_docsdir=$docDir \
+		PROJ_mandir=$manDir PROJ_includedir=$includeDir PROJ_libdir=$libDir
+
+	# Remove empty dir that shouldn't be created
+	rmdir $prefix/include
 	
 	# Install static analysis tools
 	mkdir -p $developDir/tools/clang$secondaryArchSuffix
@@ -92,6 +100,8 @@ INSTALL()
 	ln -s $developDir/tools/clang$secondaryArchSuffix/scan-view/scan-view $binDir/scan-view
 	ln -s $binDir/clang $developDir/tools/clang$secondaryArchSuffix/scan-build/clang
 	
+	prepareInstalledDevelLibs libclang libLTO
+
 	# analysis package
 	packageEntries analysis \
 		$binDir/scan-build \
@@ -110,8 +120,8 @@ TEST()
 SUMMARY_analysis="Static analysis tools using the clang compiler"
 PROVIDES_analysis="
 	clang${secondaryArchSuffix}_analysis = $portVersion
-	cmd:scan_build = $portVersion
-	cmd:scan_view = $portVersion
+	cmd:scan_build$secondaryArchSuffix = $portVersion
+	cmd:scan_view$secondaryArchSuffix = $portVersion
 	"

 REQUIRES_analysis="
--- a/sys-devel/clang/patches/clang-3.4.patchset
+++ b/sys-devel/clang/patches/clang-3.4.patchset
@@ -1,20 +1,17 @@
-From 33c9dfc71ce4a7cc0a0e5967b9110bcbc3d0a7d7 Mon Sep 17 00:00:00 2001
+From dbc97e44eaeb44908e8e71edd0f6f64f79cfef3e Mon Sep 17 00:00:00 2001
 From: Alexander von Gluck IV <kallisti5@unixzen.com>
 Date: Fri, 24 Jan 2014 02:22:17 +0000
-Subject: [PATCH] haiku: Fix header search paths
+Subject: haiku: Fix header search paths

 * /boot/develop no longer exists
 * /boot/common no longer exists
 * We still need to figure something out
  for secondary architecture builds.
---
- lib/Frontend/InitHeaderSearch.cpp | 70 +++++++++++++++++++++------------------
- 1 file changed, 38 insertions(+), 32 deletions(-)

-diff --git a/lib/Frontend/InitHeaderSearch.cpp b/lib/Frontend/InitHeaderSearch.cpp
+diff --git a/clang-3.4/lib/Frontend/InitHeaderSearch.cpp b/clang-3.4/lib/Frontend/InitHeaderSearch.cpp
 index d144cbb..e96e329 100644
--- a/lib/Frontend/InitHeaderSearch.cpp
-+++ b/lib/Frontend/InitHeaderSearch.cpp
+--- a/clang-3.4/lib/Frontend/InitHeaderSearch.cpp
+++ b/clang-3.4/lib/Frontend/InitHeaderSearch.cpp
@@ -272,38 +272,44 @@ void InitHeaderSearch::AddDefaultCIncludePaths(const llvm::Triple &triple,
     llvm_unreachable("Include management is handled in the driver.");
 
@@ -95,3 +92,26 @@ index d144cbb..e96e329 100644
 -- 
 1.8.3.4

+
+From 67f6c48d61c2350ec3063c373f5c8ad196c456df Mon Sep 17 00:00:00 2001
+From: Adrien Destugues <pulkomandy@pulkomandy.tk>
+Date: Sun, 18 May 2014 12:41:50 +0200
+Subject: libclang: add soname when building on Haiku.
+
+
+diff --git a/clang-3.4/tools/libclang/Makefile b/clang-3.4/tools/libclang/Makefile
+index 43ecbd1..837276d 100644
+--- a/clang-3.4/tools/libclang/Makefile
+++ b/clang-3.4/tools/libclang/Makefile
+@@ -29,7 +29,7 @@ USEDLIBS = clangIndex.a clangFrontend.a clangDriver.a \
+ include $(CLANG_LEVEL)/Makefile
+ 
+ # Add soname to the library.
+-ifeq ($(HOST_OS), $(filter $(HOST_OS), Linux FreeBSD GNU GNU/kFreeBSD))
+ifeq ($(HOST_OS), $(filter $(HOST_OS), Linux FreeBSD GNU GNU/kFreeBSD Haiku))
+         LLVMLibsOptions += -Wl,-soname,lib$(LIBRARYNAME)$(SHLIBEXT)
+ endif
+ 
+-- 
+1.8.3.4
+
--- a/sys-devel/clang/patches/llvm-3.4.patchset
+++ b/sys-devel/clang/patches/llvm-3.4.patchset
@@ -1,11 +1,8 @@
-From 744634aa845c403f5a39b8257bbacd36dc1dd351 Mon Sep 17 00:00:00 2001
+From 9cc674f2aa0f54b900d1e773a6ffd201c23e4c05 Mon Sep 17 00:00:00 2001
 From: Alexander von Gluck IV <kallisti5@unixzen.com>
 Date: Wed, 22 Jan 2014 05:04:31 +0000
-Subject: [PATCH] haiku: fix Host.h for endian.h
+Subject: haiku: fix Host.h for endian.h

---
- include/llvm/Support/Host.h | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)

 diff --git a/include/llvm/Support/Host.h b/include/llvm/Support/Host.h
 index 28c4cc7..ab985a4 100644
@@ -23,3 +20,28 @@ index 28c4cc7..ab985a4 100644
 -- 
 1.8.3.4

+
+From 577d261e8e74bc442fe75515e043f268db923ed3 Mon Sep 17 00:00:00 2001
+From: Adrien Destugues <pulkomandy@pulkomandy.tk>
+Date: Sun, 18 May 2014 12:41:16 +0200
+Subject: libLTO: add soname when building on Haiku.
+
+
+diff --git a/tools/lto/Makefile b/tools/lto/Makefile
+index cedbee1..5ce530d 100644
+--- a/tools/lto/Makefile
+++ b/tools/lto/Makefile
+@@ -22,6 +22,10 @@ ifdef LLVM_VERSION_INFO
+ CXX.Flags += -DLLVM_VERSION_INFO='"$(LLVM_VERSION_INFO)"'
+ endif
+ 
+ifeq ($(HOST_OS),Haiku)
+	LLVMLibsOptions := $(LLVMLibsOptions) -Wl,-soname=$(SharedPrefix)LTO$(SHLIBEXT)
+endif
+
+ ifeq ($(HOST_OS),Darwin)
+     # Special hack to allow libLTO to have an offset version number.
+     ifdef LLVM_LTO_VERSION_OFFSET
+-- 
+1.8.3.4
+