Merged haikuports/haikuports into master

2026-04-23 04:00:05 +02:00 · 2014-02-09 09:14:02 +01:00
parent 75ab1b9e52 fe471077a3
commit 8b75cbb533
33 changed files with 1614 additions and 130 deletions
--- a/app-benchmarks/libmicro/libmicro-0.4.2.hg.recipe
+++ b/app-benchmarks/libmicro/libmicro-0.4.2.hg.recipe
@@ -0,0 +1,46 @@
+SUMMARY="libmicro - portable microbenchmarks"
+DESCRIPTION="
+LibMicro is a portable set of microbenchmarks that many Solaris
+engineers used during Solaris 10 development to measure the
+performance of various system and library calls. LibMicro was
+developed by Bart Smaalders and Phil Harman as part of their If Linux
+is faster it's a Solaris bug performance campaign. LibMicro is Open
+Source and uses the CDDL license.The libMicro sources include an awk
+script that generates color coded html pages to easily compare
+various OS revs, processors and other differences in a quick manner
+"
+LICENSE="CDDL v1"
+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"
+
+PROVIDES="
+	libmicro = $portVersion
+	"
+
+REQUIRES="
+	haiku >= $haikuVersion
+	"
+
+BUILD_REQUIRES="
+	haiku_devel >= $haikuVersion
+	"
+
+BUILD_PREREQUIRES="
+	cmd:make
+	cmd:gcc
+	"
+
+PATCHES="libmicro-0.4.2.patchset"
+
+BUILD()
+{
+	make
+}
+
+INSTALL()
+{
+	make install
+}
--- a/app-benchmarks/libmicro/patches/libmicro-0.4.2.hg.patchset
+++ b/app-benchmarks/libmicro/patches/libmicro-0.4.2.hg.patchset
@@ -0,0 +1,139 @@
+From 4beb46cb703e13ca5b6a055efec5f18c961b11fe 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
+
+
+diff --git a/Makefile.Haiku b/Makefile.Haiku
+new file mode 100644
+index 0000000..5181d91
+--- /dev/null
+++ b/Makefile.Haiku
+@@ -0,0 +1,43 @@
+#
+# CDDL HEADER START
+#
+# The contents of this file are subject to the terms
+# of the Common Development and Distribution License
+# (the "License").  You may not use this file except
+# in compliance with the License.
+#
+# You can obtain a copy of the license at
+# src/OPENSOLARIS.LICENSE
+# or http://www.opensolaris.org/os/licensing.
+# See the License for the specific language governing
+# permissions and limitations under the License.
+#
+# When distributing Covered Code, include this CDDL
+# HEADER in each file and include the License file at
+# usr/src/OPENSOLARIS.LICENSE.  If applicable,
+# add the following below this CDDL HEADER, with the
+# fields enclosed by brackets "[]" replaced with your
+# own identifying information: Portions Copyright [yyyy]
+# [name of copyright owner]
+#
+# CDDL HEADER END
+#
+
+#
+# Copyright 2005 Sun Microsystems, Inc.  All rights reserved.
+# Use is subject to license terms.
+#
+
+
+CC=		gcc
+
+#CFLAGS=		-O -DUSE_SEMOP
+CPPFLAGS=		-DUSE_SEMOP -D_REENTRANT
+MATHLIB=
+
+ELIDED_BENCHMARKS=	\
+	cachetocache	\
+	atomic
+
+
+include ../Makefile.com
+diff --git a/Makefile.benchmarks b/Makefile.benchmarks
+index ed1923a..d1b1ff8 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/Makefile.com b/Makefile.com
+index 2ba7e76..5773900 100644
+--- a/Makefile.com
+++ b/Makefile.com
+@@ -54,10 +54,10 @@ lint:	libmicro.ln $(ALL:%=%.lint) $(EXTRA_CFILES:%.c=%.lint)
+ 
+ 
+ $(EXTRA_CFILES:%.c=%.lint):
+-	$(LINT) ../$(@:%.lint=%.c) -I. -mu -lc libmicro.ln -lm
+	$(LINT) ../$(@:%.lint=%.c) -I. -mu -lc libmicro.ln 
+ 
+ %.lint:	../%.c libmicro.ln
+-	$(LINT) -mu $(CPPFLAGS) $< libmicro.ln -lpthread -lsocket -lnsl -lm
+	$(LINT) -mu $(CPPFLAGS) $< libmicro.ln  -lnetwork
+ 
+ %.o:	../%.c
+ 	$(CC) -c $(CFLAGS) $(CPPFLAGS) $< -o $@
+@@ -107,13 +107,13 @@ tattle:		../tattle.c	libmicro.a
+ 	echo "char compiler_version[] = \""`$(COMPILER_VERSION_CMD)`"\";" > tattle.h
+ 	echo "char CC[] = \""$(CC)"\";" >> tattle.h
+ 	echo "char extra_compiler_flags[] = \""$(extra_CFLAGS)"\";" >> tattle.h
+-	$(CC) -o tattle $(CFLAGS) -I. ../tattle.c libmicro.a -lrt -lm
+	$(CC) -o tattle $(CFLAGS) -I. ../tattle.c libmicro.a
+ 
+ $(ELIDED_BENCHMARKS):	../elided.c
+ 	$(CC) -o $(@) ../elided.c
+ 
+ %: libmicro.a %.o 
+-	$(CC) -o $(@) $(@).o $($(@)_EXTRA_DEPS) $(CFLAGS) libmicro.a $($(@)_EXTRA_LIBS) $(EXTRA_LIBS) -lpthread -lm
+	$(CC) -o $(@) $(@).o $($(@)_EXTRA_DEPS) $(CFLAGS) libmicro.a $($(@)_EXTRA_LIBS) $(EXTRA_LIBS) -lnetwork
+ 
+ exec:	exec_bin
+ 
+diff --git a/bench.sh b/bench.sh
+index 4795c10..24ca1d9 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="-E -C 200 -L -S -W"
+OPTS="-l -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
+@@ -65,7 +65,7 @@ mkdir -p $VDIR1 $VDIR2
+ 
+ touch $IFILE
+ 
+-ARCH=`arch -k`
+ARCH=`uname -m`
+ 
+ # produce benchmark header for easier comparisons
+ 
+diff --git a/cascade_flock.c b/cascade_flock.c
+index 27d95d1..a6634a1 100644
+--- a/cascade_flock.c
+++ b/cascade_flock.c
+@@ -50,7 +50,7 @@
+ #include "libmicro.h"
+ 
+ #ifndef LOCK_EX
+-#include "/usr/ucbinclude/sys/file.h"
+#include "sys/file.h"
+ extern int flock(int fd, int operation);
+ #endif
+ 
+-- 
+1.8.3.4
+
--- a/dev-libs/boost/patches/boost-1.55.0.patchset
+++ b/dev-libs/boost/patches/boost-1.55.0.patchset
@@ -424,3 +424,46 @@ index 6ce2ea1..3b303eb 100644
 -- 
 1.8.3.4

+
+From d94967fa8fdea2842ec02fab90df0ec4efaac685 Mon Sep 17 00:00:00 2001
+From: Adrien Destugues <pulkomandy@pulkomandy.tk>
+Date: Thu, 9 Jan 2014 22:40:40 +0100
+Subject: filesystem: don't crash because of unsupported locale in libstdc++
+
+See https://svn.boost.org/trac/boost/ticket/4688
+We do the same as on Mac OS X and assume the filesystem uses utf-8.
+
+diff --git a/libs/filesystem/src/path.cpp b/libs/filesystem/src/path.cpp
+index c740dec..3285d39 100644
+--- a/libs/filesystem/src/path.cpp
+++ b/libs/filesystem/src/path.cpp
+@@ -35,7 +35,7 @@
+ #ifdef BOOST_WINDOWS_API
+ # include "windows_file_codecvt.hpp"
+ # include <windows.h>
+-#elif defined(macintosh) || defined(__APPLE__) || defined(__APPLE_CC__)
+#elif defined(macintosh) || defined(__APPLE__) || defined(__APPLE_CC__) || defined(__HAIKU__)
+ # include <boost/filesystem/detail/utf8_codecvt_facet.hpp>
+ #endif
+ 
+@@ -828,7 +828,7 @@ namespace
+     codecvt_facet_ptr(&std::use_facet<std::codecvt<wchar_t, char, std::mbstate_t> >
+       (path_locale));
+ 
+-#elif defined(macintosh) || defined(__APPLE__) || defined(__APPLE_CC__)
+#elif defined(macintosh) || defined(__APPLE__) || defined(__APPLE_CC__) || defined(__HAIKU__)
+ 
+   // "All BSD system functions expect their string parameters to be in UTF-8 encoding
+   // and nothing else." See
+@@ -903,7 +903,7 @@ namespace filesystem
+   const path::codecvt_type& path::codecvt()
+   {
+ #   if defined(BOOST_POSIX_API) && \
+-      !(defined(macintosh) || defined(__APPLE__) || defined(__APPLE_CC__))
+      !(defined(macintosh) || defined(__APPLE__) || defined(__APPLE_CC__) || defined(__HAIKU__))
+       // A local static initialized by calling path::imbue ensures that std::locale(""),
+       // which may throw, is called only if path_locale and condecvt_facet will actually
+       // be used. Thus misconfigured environmental variables will only cause an
+-- 
+1.8.3.4
+
--- a/dev-vcs/fossil/fossil-1.22.recipe
+++ b/dev-vcs/fossil/fossil-1.22.recipe
@@ -1,29 +0,0 @@
-DESCRIPTION="Simple, high-reliability, distributed software configuration management" 
-HOMEPAGE="http://www.fossil-scm.org/" 
-SRC_URI="http://www.fossil-scm.org/download/fossil-src-20120317175325.tar.gz"
-CHECKSUM_MD5="a7106450722e8477972d230fa535702f"
-REVISION="3"
-STATUS_HAIKU="stable"
-DEPEND=""
-
-BUILD()
-{
-	cd fossil-src-20120317175325
-	./configure --prefix=`finddir B_COMMON_DIRECTORY`
-	make
-}
-
-INSTALL()
-{
-	cd fossil-src-20120317175325
-	make install
-}
-
-TEST()
-{
-	cd fossil-src-20120317175325
-	make test
-}
-
-LICENSE="BSD (2-clause)"
-COPYRIGHT="2007 D. Richard Hipp"
--- a/dev-vcs/fossil/fossil-1.28.recipe
+++ b/dev-vcs/fossil/fossil-1.28.recipe
@@ -3,17 +3,17 @@ DESCRIPTION="
 Simple, high-reliability, distributed software configuration management
 "
 HOMEPAGE="http://www.fossil-scm.org/" 
-SRC_URI="http://www.fossil-scm.org/download/fossil-src-20130911114349.tar.gz"
-CHECKSUM_MD5="fa4ea3eb25d2a8cfb0edbd0c30c268b9"
+SRC_URI="http://www.fossil-scm.org/download/fossil-src-20140127173344.tar.gz"
+CHECKSUM_MD5="e123c15c9b82b8bed2f4d1c5f8e19f8c"
 REVISION="1"
 LICENSE="BSD (2-clause)"
 COPYRIGHT="2007 D. Richard Hipp"

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

 PROVIDES="
 	fossil = $portVersion
-	cms:fossil = $portVersion
+	cmd:fossil = $portVersion
 	"
 REQUIRES="
 	haiku >= $haikuVersion
@@ -31,7 +31,7 @@ BUILD_PREREQUIRES="
 	cmd:gcc
 	"

-SOURCE_DIR="fossil-src-20130911114349"
+SOURCE_DIR="fossil-src-20140127173344"

 BUILD()
 {
--- a/dev-vcs/fossil/patches/fossil-1.22.patch
+++ b/dev-vcs/fossil/patches/fossil-1.22.patch
@@ -1,20 +0,0 @@
--- fossil-src-20120317175325/src/main.c.org	2012-04-21 05:23:25.719847424 +0200
-+++ fossil-src-20120317175325/src/main.c	2012-04-21 05:24:46.773062656 +0200
-@@ -1625,7 +1625,7 @@
- }
- 
- #if !defined(_WIN32)
-#if !defined(__DARWIN__) && !defined(__APPLE__)
-+#if !defined(__DARWIN__) && !defined(__APPLE__) && !defined(__HAIKU__)
- /*
- ** Search for an executable on the PATH environment variable.
- ** Return true (1) if found and false (0) if not found.
-@@ -1721,7 +1721,7 @@
- #if !defined(_WIN32)
-   /* Unix implementation */
-   if( isUiCmd ){
-#if !defined(__DARWIN__) && !defined(__APPLE__)
-+#if !defined(__DARWIN__) && !defined(__APPLE__) && !defined(__HAIKU__)
-     zBrowser = db_get("web-browser", 0);
-     if( zBrowser==0 ){
-       static char *azBrowserProg[] = { "xdg-open", "gnome-open", "firefox" };
--- a/games-arcade/goonies/goonies-1.4.1528.recipe
+++ b/games-arcade/goonies/goonies-1.4.1528.recipe
@@ -0,0 +1,76 @@
+SUMMARY="Find treasure and escape back to save the Goon Docks from demolition."
+HOMEPAGE="http://www2.braingames.getput.com/goonies/"
+LICENSE="GNU GPL v2"
+COPYRIGHT="2006-2009 Brain Games"
+SRC_URI="http://braingames.jorito.net/goonies/downloads/goonies.src_1.4.1528.tgz"
+CHECKSUM_MD5="7c220958a0766fb716d2d0081c81e8bd"
+REVISION="1"
+ARCHITECTURES="x86"
+if [ $effectiveTargetArchitecture != x86_gcc2 ]; then
+	# x86_gcc2 is fine as primary target architecture as long as we're building
+	# for a different secondary architecture.
+	ARCHITECTURES="$ARCHITECTURES x86_gcc2"
+fi
+SECONDARY_ARCHITECTURES="x86"
+
+PROVIDES="
+	goonies = $portVersion
+	"
+
+REQUIRES="
+	haiku$secondaryArchSuffix >= $haikuVersion
+	lib:libsdl$secondaryArchSuffix
+	lib:libSDL_image$secondaryArchSuffix
+	lib:libSDL_mixer$secondaryArchSuffix
+#	lib:libSDL_sound$secondaryArchSuffix
+#	lib:libSDL_ttf$secondaryArchSuffix
+	lib:libGLU$secondaryArchSuffix
+	"
+BUILD_REQUIRES="
+	devel:libsdl$secondaryArchSuffix
+	devel:libSDL_image$secondaryArchSuffix
+	devel:libSDL_mixer$secondaryArchSuffix
+#	devel:libSDL_sound$secondaryArchSuffix
+#	devel:libSDL_ttf$secondaryArchSuffix
+	devel:libGLU$secondaryArchSuffix
+	"
+BUILD_PREREQUIRES="
+	haiku${secondaryArchSuffix}_devel >= $haikuVersion
+	haiku_devel >= $haikuVersion
+	cmd:gcc$secondaryArchSuffix
+	cmd:ld$secondaryArchSuffix
+	cmd:make
+	"
+
+PATCHES="goonies-$portVersion.patchset"
+BUILD()
+{
+	make $jobArgs
+}
+
+INSTALL()
+{
+	installDir=$appsDir/"Goonies"
+	mkdir -p "$installDir"
+	make install PREFIX="$installDir" GAMEDIR="$installDir"
+
+#	cd "$installDir"
+#	echo -e "#!/bin/sh\n`cat roadfighter`" > roadfighter
+
+	addAppDeskbarSymlink "$installDir/goonies" "Goonies"
+}
+
+DESCRIPTION="
+The action takes place in the sleepy seaside town of Cauldron Point - down in 
+an area known as the Goon Docks. The Goonies are a group of local kids - Mikey, 
+Brand, Mouth, Chunk and Data. One day they find an old treasure map in Mikey's 
+attic. Data figures that this must be the fabulous hidden treasure of the 
+notorious local pirate, One-Eyed Willy. The girls, Andy and Stef, join the 
+other Goonies and the adventure begins. But the secret underground tunnels they 
+are exploring are actually the hideout of the Fratelli Gang, and the Goonies 
+are soon trapped! The Goonies have a powerful ally on their side, however, in 
+the form of the huge and amiable Sloth.
+
+When you play this game, you are Sloth! Can you help the Goonies find the 
+treasure and escape back to save the Goon Docks from demolition?
+"
--- a/games-arcade/goonies/patches/goonies-1.4.1528.patchset
+++ b/games-arcade/goonies/patches/goonies-1.4.1528.patchset
@@ -0,0 +1,22 @@
+From 0945ad6ec688efbc88d8adfb3a546085819b8d30 Mon Sep 17 00:00:00 2001
+From: Adrien Destugues <pulkomandy@pulkomandy.tk>
+Date: Tue, 28 Jan 2014 22:43:44 +0100
+Subject: Use the right compiler.
+
+
+diff --git a/build/linux/Makefile b/build/linux/Makefile
+index df4bb3d..3ccca0c 100644
+--- a/build/linux/Makefile
+++ b/build/linux/Makefile
+@@ -56,7 +56,7 @@ OBJS = \
+ 	$(SRC)/Symbol.o			$(SRC)/TheGooniesApp.o \
+ 	$(SRC)/TheGoonies.o		$(SRC)/Vector.o
+ 
+-CC = gcc
+CC = g++
+ CFLAGS = -g3 -O3 -Wno-write-strings `sdl-config --cflags` -I/usr/X11R6/include
+ LDFLAGS = `sdl-config --libs` -L/usr/X11R6/lib/ -lSDL_image -lSDL_mixer -lGL -lGLU
+ RM = rm -f
+-- 
+1.8.3.4
+
--- a/games-arcade/rocksndiamonds/patches/rocksndiamonds-3.3.1.2.patchset
+++ b/games-arcade/rocksndiamonds/patches/rocksndiamonds-3.3.1.2.patchset
@@ -0,0 +1,86 @@
+From ba88fe1ad26fc936fcfece46929b4b1eebb091c1 Mon Sep 17 00:00:00 2001
+From: Adrien Destugues <pulkomandy@pulkomandy.tk>
+Date: Tue, 28 Jan 2014 20:36:56 +0100
+Subject: remove hardcoded -lm and add -lnetwork.
+
+
+diff --git a/src/Makefile b/src/Makefile
+index a67cd14..8493bb9 100644
+--- a/src/Makefile
+++ b/src/Makefile
+@@ -53,6 +53,11 @@ EXTRA_LDFLAGS = -lnsl -lsocket -R$(XLIB_PATH)
+ PLATFORM = unix
+ endif
+ 
+ifeq ($(PLATFORM),haiku)		# native compiling to Haiku
+EXTRA_LDFLAGS = -lnetwork
+PLATFORM = unix
+endif
+
+ ifeq ($(PLATFORM),macosx)		# native compiling to Mac OS X
+ EXTRA_LDFLAGS = -lstdc++
+ PLATFORM = unix
+@@ -163,7 +168,7 @@ OPTIONS = -O3 -Wall
+ endif
+ 
+ CFLAGS = $(OPTIONS) $(SYS_CFLAGS)  $(EXTRA_CFLAGS) $(CONFIG)
+-LDFLAGS =           $(SYS_LDFLAGS) $(EXTRA_LDFLAGS) -lm
+LDFLAGS =           $(SYS_LDFLAGS) $(EXTRA_LDFLAGS)
+ 
+ 
+ SRCS =	main.c		\
+-- 
+1.8.3.4
+
+
+From 142ac2bc985591b85860f6fea82b5161fc4446e9 Mon Sep 17 00:00:00 2001
+From: Adrien Destugues <pulkomandy@pulkomandy.tk>
+Date: Tue, 28 Jan 2014 21:10:09 +0100
+Subject: Store user files at the right place.
+
+
+diff --git a/src/main.c b/src/main.c
+index aaa3a5b..03723fb 100644
+--- a/src/main.c
+++ b/src/main.c
+@@ -13,6 +13,9 @@
+ 
+ #include "libgame/libgame.h"
+ 
+#include <FindDirectory.h>
+#include <sys/stat.h>
+
+ #include "main.h"
+ #include "init.h"
+ #include "game.h"
+@@ -5588,11 +5591,27 @@ int main(int argc, char *argv[])
+ {
+   char * window_title_string = getWindowTitleString();
+ 
+#ifdef __HAIKU__
+  char datadir[256];
+  find_directory(B_USER_SETTINGS_DIRECTORY, 0, true, datadir, sizeof(datadir));
+  strcat(datadir,"/rocksndiamonds");
+  find_directory(B_USER_DIRECTORY, 0, true, datadir, sizeof(datadir));
+  char* ptr = datadir;
+  while(*ptr != 0) ptr++;
+  ptr++;
+  mkdir(ptr, 0770);
+  InitProgramInfo(argv[0], ptr, ptr,
+		  PROGRAM_TITLE_STRING, window_title_string, ICON_TITLE_STRING,
+		  X11_ICON_FILENAME, X11_ICONMASK_FILENAME, SDL_ICON_FILENAME,
+		  MSDOS_POINTER_FILENAME,
+		  COOKIE_PREFIX, FILENAME_PREFIX, GAME_VERSION_ACTUAL);
+#else
+   InitProgramInfo(argv[0], USERDATA_DIRECTORY, USERDATA_DIRECTORY_UNIX,
+ 		  PROGRAM_TITLE_STRING, window_title_string, ICON_TITLE_STRING,
+ 		  X11_ICON_FILENAME, X11_ICONMASK_FILENAME, SDL_ICON_FILENAME,
+ 		  MSDOS_POINTER_FILENAME,
+ 		  COOKIE_PREFIX, FILENAME_PREFIX, GAME_VERSION_ACTUAL);
+#endif
+ 
+   InitExitMessageFunction(DisplayExitMessage);
+   InitExitFunction(CloseAllAndExit);
+-- 
+1.8.3.4
+
--- a/games-arcade/rocksndiamonds/rocksndiamonds-3.3.1.2.recipe
+++ b/games-arcade/rocksndiamonds/rocksndiamonds-3.3.1.2.recipe
@@ -0,0 +1,71 @@
+SUMMARY="Arcade style game in the style of Boulder Dash."
+HOMEPAGE="http://www.artsoft.org/rocksndiamonds/"
+LICENSE="GNU GPL v2"
+COPYRIGHT="2001-2013 Artsoft Entertainment"
+SRC_URI="http://www.artsoft.org/RELEASES/unix/rocksndiamonds/rocksndiamonds-3.3.1.2.tar.gz"
+CHECKSUM_MD5="9fb7d125a314f55c5148c0e47f9ebb42"
+REVISION="1"
+ARCHITECTURES="x86"
+if [ $effectiveTargetArchitecture != x86_gcc2 ]; then
+	# x86_gcc2 is fine as primary target architecture as long as we're building
+	# for a different secondary architecture.
+	ARCHITECTURES="$ARCHITECTURES x86_gcc2"
+fi
+SECONDARY_ARCHITECTURES="x86"
+
+PROVIDES="
+	rocksndiamonds = $portVersion
+	app:rocksndiamonds = $portVersion
+	"
+
+REQUIRES="
+	haiku$secondaryArchSuffix >= $haikuVersion
+	lib:libsdl$secondaryArchSuffix
+	lib:libsdl_image$secondaryArchSuffix
+	lib:libsdl_mixer$secondaryArchSuffix
+	lib:libsdl_net$secondaryArchSuffix
+#	lib:libz$secondaryArchSuffix
+	lib:libsmpeg$secondaryArchSuffix
+	"
+BUILD_REQUIRES="
+	devel:libsdl$secondaryArchSuffix
+	devel:libsdl_image$secondaryArchSuffix
+	devel:libsdl_mixer$secondaryArchSuffix
+	devel:libsdl_net$secondaryArchSuffix
+#	devel:libz$secondaryArchSuffix
+	devel:libsmpeg$secondaryArchSuffix
+	"
+BUILD_PREREQUIRES="
+	haiku${secondaryArchSuffix}_devel >= $haikuVersion
+	cmd:gcc$secondaryArchSuffix
+	cmd:ld$secondaryArchSuffix
+	cmd:make
+	"
+
+PATCHES="rocksndiamonds-$portVersion.patchset"
+BUILD()
+{
+	# Parallel build doesn't work.
+	PLATFORM=haiku make sdl
+}
+
+INSTALL()
+{
+	destdir=$appsDir/"Rocks'n'Diamonds"
+	mkdir -p $destdir
+	cp -r rocksndiamonds sounds graphics levels music $destdir 
+	addAppDeskbarSymlink $destdir/rocksndiamonds "Rocks'n'Diamonds"
+}
+
+# ----- DESCRIPTION -----------------------------------------------------------
+
+DESCRIPTION="
+- network multiplayer games (upto 4 players)
+- local multiplayer games (upto 4 players)
+- soft scrolling with 50 frames per second 
+- freely customizable keyboard and joystick support 
+- stereo sound effects and music 
+- music modules and fullscreen in SDL version 
+- contains levels to play Boulder Dash, Emerald Mine and Sokoban 
+- lots of additional levels available (over 10.000) 
+"
--- a/games-engines/love/love-0.9.0.recipe
+++ b/games-engines/love/love-0.9.0.recipe
@@ -0,0 +1,88 @@
+SUMMARY="LÖVE is an *awesome* framework you can use to make 2D games in Lua."
+DESCRIPTION="
+Hi there! LÖVE is an *awesome* framework you can use to make 2D games in Lua.
+It's free, open-source, and works on Windows, Mac OS X and Linux.
+"
+HOMEPAGE="http://love2d.org/"
+SRC_URI="https://bitbucket.org/rude/love/downloads/love-0.9.0-linux-src.tar.gz"
+CHECKSUM_MD5="6591752af4e33f521d616d9b048aa894"
+REVISION="1"
+LICENSE="Zlib"
+COPYRIGHT="2010-2014 Löve"
+
+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="
+	love$secondaryArchSuffix = $portVersion
+	cmd:love$secondaryArchSuffix = $portVersion
+	lib:liblove$secondaryArchSuffix = $portVersion
+"
+REQUIRES="
+	haiku$secondaryArchSuffix >= $haikuVersion
+	lib:libSDL2_2.0$secondaryArchSuffix
+	lib:libvorbis$secondaryArchSuffix
+	lib:libvorbisfile$secondaryArchSuffix
+	lib:libmodplug$secondaryArchSuffix >= 0.8.0
+	lib:libphysfs$secondaryArchSuffix
+	lib:libluajit_5.1$secondaryArchSuffix
+	lib:libopenal$secondaryArchSuffix
+	lib:libogg$secondaryArchSuffix
+	lib:libfreetype$secondaryArchSuffix
+	lib:libIL$secondaryArchSuffix
+	lib:libGL$secondaryArchSuffix
+	lib:libmpg123$secondaryArchSuffix
+	lib:libz$secondaryArchSuffix
+"
+BUILD_REQUIRES="
+	haiku${secondaryArchSuffix}_devel >= $haikuVersion
+	devel:libSDL2$secondaryArchSuffix
+	devel:libvorbis$secondaryArchSuffix
+	devel:libvorbisfile$secondaryArchSuffix
+	devel:libmodplug$secondaryArchSuffix >= 0.8.0
+	devel:libphysfs$secondaryArchSuffix
+	devel:libluajit_5.1$secondaryArchSuffix
+	devel:libopenal$secondaryArchSuffix
+	devel:libogg$secondaryArchSuffix
+	devel:libfreetype$secondaryArchSuffix
+	devel:libIL$secondaryArchSuffix
+	devel:libGL$secondaryArchSuffix
+	devel:libmpg123$secondaryArchSuffix
+	devel:libz$secondaryArchSuffix
+"
+BUILD_PREREQUIRES="
+	cmd:make
+	cmd:gcc$secondaryArchSuffix
+	cmd:ld$secondaryArchSuffix
+#	cmd:libtoolize
+	cmd:pkg_config$secondaryArchSuffix
+"
+
+PATCHES="love-0.9.0.patchset"
+BUILD()
+{
+	runConfigure ./configure
+	make $jobArgs
+}
+
+INSTALL()
+{
+	make install
+
+	prepareInstalledDevelLib liblove
+	packageEntries devel $developDir
+}
+
+PROVIDES_devel="
+	love${secondaryArchSuffix}_devel = $portVersion
+	devel:liblove$secondaryArchSuffix = $portVersion
+"
+
+REQUIRES_devel="
+	love$secondaryArchSuffix == $portVersion base
+"
--- a/games-engines/love/patches/love-0.9.0.patchset
+++ b/games-engines/love/patches/love-0.9.0.patchset
@@ -0,0 +1,55 @@
+From 42a0ac9d4b717dccdb1c6f3d9615b702255574d2 Mon Sep 17 00:00:00 2001
+From: Adrien Destugues <pulkomandy@pulkomandy.tk>
+Date: Tue, 28 Jan 2014 20:25:18 +0100
+Subject: Hack Glee to compile (we don't need GLX!)
+
+
+diff --git a/src/modules/graphics/opengl/GLee.c b/src/modules/graphics/opengl/GLee.c
+index 789e189..850a87d 100644
+--- a/src/modules/graphics/opengl/GLee.c
+++ b/src/modules/graphics/opengl/GLee.c
+@@ -22418,7 +22418,7 @@ const char *__GLeeGetExtStrPlat( void )
+ 
+ 	if (wglGetExtensionsStringARB)
+ 		return (const char *)wglGetExtensionsStringARB(wglGetCurrentDC());
+-#elif defined(__APPLE__) || defined(__APPLE_CC__)
+#elif defined(__APPLE__) || defined(__APPLE_CC__) || defined(__HAIKU__)
+ #else
+ 	Display *dpy=glXGetCurrentDisplay();
+ 	if(dpy)
+diff --git a/src/modules/graphics/opengl/GLee.h b/src/modules/graphics/opengl/GLee.h
+index 631cddc..42782ec 100644
+--- a/src/modules/graphics/opengl/GLee.h
+++ b/src/modules/graphics/opengl/GLee.h
+@@ -64,7 +64,9 @@
+ 	#define __glxext_h_ /* prevent glxext.h from being included */
+ 	#define GLX_GLXEXT_PROTOTYPES
+ 	#include <GL/gl.h>
+-	#include <GL/glx.h>
+	#ifndef __HAIKU__
+		#include <GL/glx.h>
+	#endif
+ #endif
+ 
+ #ifndef APIENTRY
+@@ -1152,7 +1154,7 @@ GLEE_EXTERN GLboolean _GLEE_SGIX_igloo_interface;
+ 		DECLARE_HANDLE(HVIDEOINPUTDEVICENV);
+ 	#endif
+ 	
+-#elif defined(__APPLE__) || defined(__APPLE_CC__)
+#elif defined(__APPLE__) || defined(__APPLE_CC__) || defined(__HAIKU__)
+ 
+ 	/* Mac OS X */
+ 
+@@ -23178,7 +23180,7 @@ GLEE_EXTERN GLboolean _GLEE_WGL_NV_video_output;
+   #define wglGetVideoInfoNV GLeeFuncPtr_wglGetVideoInfoNV
+ #endif
+ #endif 
+-#elif defined(__APPLE__) || defined(__APPLE_CC__)
+#elif defined(__APPLE__) || defined(__APPLE_CC__) || defined(__HAIKU__)
+ #else /* GLX */
+ 
+ /* Extension querying variables */
+-- 
+1.8.3.4
+
--- a/games-strategy/vcmi/patches/vcmi-0.94.patchset
+++ b/games-strategy/vcmi/patches/vcmi-0.94.patchset
@@ -1,4 +1,4 @@
-From b5923cc7d6a06a08421e439e4c5de353ae2bcd77 Mon Sep 17 00:00:00 2001
+From d1531a4d6125f9542d8729eb3712fd41cc88a565 Mon Sep 17 00:00:00 2001
 From: Adrien Destugues <pulkomandy@pulkomandy.tk>
 Date: Tue, 7 Jan 2014 23:02:10 +0100
 Subject: Link to libnetwork, since we use sockets.
@@ -23,14 +23,14 @@ index 2110879..d1fed38 100644
 1.8.3.4


-From 8f2e997081b524b6f97a124df1abed2ec18b23a7 Mon Sep 17 00:00:00 2001
+From 17615226b8b9b67a81330aade5609e7eb5a22024 Mon Sep 17 00:00:00 2001
 From: Adrien Destugues <pulkomandy@pulkomandy.tk>
 Date: Wed, 8 Jan 2014 21:14:51 +0100
 Subject: Support for renaming threads.


 diff --git a/lib/CThreadHelper.cpp b/lib/CThreadHelper.cpp
-index 3774c4b..b0aca56 100644
+index 6a4a89e..983ee5b 100644
 --- a/lib/CThreadHelper.cpp
 +++ b/lib/CThreadHelper.cpp
@@ -3,6 +3,8 @@
@@ -54,3 +54,62 @@ index 3774c4b..b0aca56 100644
 -- 
 1.8.3.4

+
+From ea422b71bc3fa1af3f84ab5cd2da02649e42a227 Mon Sep 17 00:00:00 2001
+From: Adrien Destugues <pulkomandy@pulkomandy.tk>
+Date: Mon, 27 Jan 2014 20:18:36 +0100
+Subject: Fix settings dir path.
+
+
+diff --git a/lib/VCMIDirs.cpp b/lib/VCMIDirs.cpp
+index be00323..9fed4f8 100644
+--- a/lib/VCMIDirs.cpp
+++ b/lib/VCMIDirs.cpp
+@@ -123,12 +123,22 @@ std::string VCMIDirs::libraryName(std::string basename) const
+ 
+ #else
+ 
+#if defined(__haiku__)
+std::string VCMIDirs::userDataPath() const
+{
+	BPath settingsDir;
+	if (find_directory(B_USER_SETTINGS_DIRECTORY, &path) == B_OK)
+		return std::string(path.Path()) + "vcmi";
+	return ".";
+}
+#else
+ std::string VCMIDirs::userDataPath() const
+ {
+ 	if (getenv("HOME") != nullptr )
+ 		return std::string(getenv("HOME")) + "/.vcmi";
+ 	return ".";
+ }
+#endif
+ 
+ std::string VCMIDirs::libraryPath() const
+ {
+diff --git a/vcmibuilder b/vcmibuilder
+index 472a00d..1f60b12 100755
+--- a/vcmibuilder
+++ b/vcmibuilder
+@@ -64,7 +64,7 @@ then
+ 	echo " --download       " "Automatically download requied packages using wget"
+ 	echo "                  " "Requires wget and Internet connection"
+ 	echo
+-	echo " --dest DIRECTORY " "Path where resulting data will be placed. Default is ~/.vcmi"
+	echo " --dest DIRECTORY " "Path where resulting data will be placed. Default is `finddir B_USER_SETTINGS_DIRECTORY`/vcmi"
+ 	echo
+ 	echo " --validate       " "Run basic validness checks"
+ 	exit 0
+@@ -163,7 +163,7 @@ fi
+ 
+ if [[ -z "$dest_dir" ]]
+ then
+-	dest_dir="$HOME/.vcmi"
+	dest_dir="`finddir B_USER_SETTINGS_DIRECTORY`/vcmi"
+ fi
+ 
+ temp_dir="$dest_dir"/buildertmp
+-- 
+1.8.3.4
+
--- a/games-strategy/vcmi/vcmi-0.94.recipe
+++ b/games-strategy/vcmi/vcmi-0.94.recipe
@@ -69,6 +69,8 @@ BUILD()
 {
 	mkdir -p build
 	cd build
+	export CFLAGS=-DUSE_FILE32API
+	export CXXFLAGS=$CFLAGS
 	cmake .. -DDATA_DIR=$relativeDataDir/vcmi -DCMAKE_INSTALL_PREFIX=$prefix \
 		-DLIB_DIR=$relativeLibDir
 	make $jobArgs
--- a/haiku-apps/keymapswitcher/keymapswitcher-1.2.7.11.recipe
+++ b/haiku-apps/keymapswitcher/keymapswitcher-1.2.7.11.recipe
@@ -29,6 +29,7 @@ BUILD_PREREQUIRES="
 	"


+PATCHES="keymapswitcher-$portVersion.patchset"
 PATCH()
 {
 	# Fix makefile not to use BUILDHOME as an install dir variable.
--- a/haiku-apps/keymapswitcher/patches/keymapswitcher-1.2.7.11.patchset
+++ b/haiku-apps/keymapswitcher/patches/keymapswitcher-1.2.7.11.patchset
@@ -0,0 +1,21 @@
+From 5b34e6a6930216d0855e58bebc168e6dc50f76cc Mon Sep 17 00:00:00 2001
+From: Adrien Destugues <pulkomandy@pulkomandy.tk>
+Date: Fri, 7 Feb 2014 15:24:16 +0100
+Subject: Fix gcc2 build.
+
+
+diff --git a/SettingsWindow.h b/SettingsWindow.h
+index 251fb38..de49f94 100644
+--- a/SettingsWindow.h
+++ b/SettingsWindow.h
+@@ -78,6 +78,7 @@ class SettingsWindow: public BWindow
+ 		virtual void SelectionChanged();
+ 		virtual void MouseDown(BPoint point);
+ 	};
+	friend class KeymapOutlineListView;
+ 
+ 	class MoveButton : public BPictureButton
+    	{
+-- 
+1.8.3.4
+
--- a/media-libs/devil/devil-1.7.8.recipe
+++ b/media-libs/devil/devil-1.7.8.recipe
@@ -1,28 +1,64 @@
-DESCRIPTION="DevIL image library" 
+SUMMARY="A full-featured cross-platform image library" 
 HOMEPAGE="http://openil.sourceforge.net/" 
 SRC_URI="http://sourceforge.net/projects/openil/files/DevIL/1.7.8/DevIL-1.7.8.tar.gz/download"
 REVISION="1"
 CHECKSUM_MD5="7918f215524589435e5ec2e8736d5e1d"
-STATUS_HAIKU="stable"
-DEPEND="media-libs/jasper >= 1.900.1
-	media-libs/lcms >= 1.18a
-	media-libs/libmng >= 1.0.10
-	openexr >= 1.5.0
-	dev-util/pkg-config >= 0.23
-	media-libs/tiff >= 3.8.2"
+ARCHITECTURES="x86_gcc2 x86"
+SECONDARY_ARCHITECTURES="x86"
+
+PROVIDES="
+	devil$secondaryArchSuffix = $portVersion
+	lib:libIL$secondaryArchSuffix
+	"
+
+REQUIRES="
+	haiku$secondaryArchSuffix >= $haikuVersion
+	"
+	
+BUILD_PREREQUIRES="
+	haiku${secondaryArchSuffix}_devel >= $haikuVersion
+	cmd:gcc$secondaryArchSuffix
+	cmd:ld$secondaryArchSuffix
+	cmd:make
+	"
+#DEPEND="media-libs/jasper >= 1.900.1
+#	media-libs/lcms >= 1.18a
+#	media-libs/libmng >= 1.0.10
+#	openexr >= 1.5.0
+#	dev-util/pkg-config >= 0.23
+#	media-libs/tiff >= 3.8.2"
 BUILD()
 {
-	cd devil-1.7.8
-	libtoolize --force --copy --install
-	autoreconf -i
-	./configure --prefix=`finddir B_COMMON_DIRECTORY`
-	make
+	runConfigure ./configure
+	make $jobArgs
 }

 INSTALL()
 {
-	cd  devil-1.7.8
 	make install
+
+	prepareInstalledDevelLib libIL
+	fixPkgconfig
+	packageEntries devel $developDir
 }
+
+PROVIDES_devel="
+	devil${secondaryArchSuffix}_devel = $portVersion
+	devel:libIL$secondaryArchSuffix
+	"
+
+REQUIRES_devel="
+	haiku$secondaryArchSuffix >= $haikuVersion
+	devil$secondaryArchSuffix == $portVersion base
+	"
+
 LICENSE="GNU LGPL v2.1"
 COPYRIGHT="2009 Denton Woods"
+DESCRIPTION="
+Developer's Image Library (DevIL) is a programmer's library to develop
+applications with very powerful image loading capabilities, yet is easy for a
+developer to learn and use. Ultimate control of images is left to the
+developer, so unnecessary conversions, etc. are not performed. DevIL utilizes a
+simple, yet powerful, syntax. DevIL can load, save, convert, manipulate, filter
+and display a wide variety of image formats.
+"
--- a/media-libs/freetype/freetype-2.5.0.1.recipe
+++ b/media-libs/freetype/freetype-2.5.0.1.recipe
@@ -6,16 +6,16 @@ customizable, and portable while capable of producing high-quality output \
 "
 HOMEPAGE="http://www.freetype.org"
 LICENSE="FreeType"
-COPYRIGHT="1996-2012 David Turner, Robert Wilhelm, Werner Lemberg, et al."
-SRC_URI="http://download.savannah.gnu.org/releases/freetype/freetype-2.5.0.1.tar.bz2"
-CHECKSUM_MD5="c72e9010b1d986d556fc0b2b5fcbf31a"
+COPYRIGHT="1996-2013 David Turner, Robert Wilhelm, Werner Lemberg, et al."
+SRC_URI="http://download.savannah.gnu.org/releases/freetype/freetype-2.5.2.tar.bz2"
+CHECKSUM_MD5="10e8f4d6a019b124088d18bc26123a25"
 REVISION="1"
-ARCHITECTURES="?x86_gcc2 ?x86 ?x86_64"
-SECONDARY_ARCHITECTURES="?x86_gcc2 ?x86"
+ARCHITECTURES="x86_gcc2 x86 x86_64"
+SECONDARY_ARCHITECTURES="x86_gcc2 x86"

 PROVIDES="
 	freetype$secondaryArchSuffix = $portVersion
-	lib:libfreetype$secondaryArchSuffix = 6.8.1 compat >= 6
+	lib:libfreetype$secondaryArchSuffix = 6.11.1 compat >= 6
 	"
 REQUIRES="
 	haiku$secondaryArchSuffix >= $haikuVersion
@@ -23,32 +23,30 @@ REQUIRES="
 	lib:libpng$secondaryArchSuffix
 	"
 BUILD_REQUIRES="
+	haiku${secondaryArchSuffix}_devel >= $haikuVersion
 	devel:libz$secondaryArchSuffix
+	devel:libpng$secondaryArchSuffix
 	"
 BUILD_PREREQUIRES="
-	haiku${secondaryArchSuffix}_devel >= $haikuVersion
-	haiku_devel >= $haikuVersion
 	cmd:aclocal
 	cmd:autoconf
 	cmd:automake
 	cmd:gcc$secondaryArchSuffix
 	cmd:ld$secondaryArchSuffix
-	cmd:libtoolize
+	cmd:libtool >= 2.4.2
 	cmd:make
-	devel:libpng
+	cmd:which
 	"

 BUILD()
 {
 	./autogen.sh
-	runConfigure ./configure --without-png
+	runConfigure ./configure
 	make $jobArgs
 }

 INSTALL()
 {
-	mkdir -p $includeDir/freetype2/freetype/cache
-	mkdir -p $includeDir/freetype2/freetype/internal
 	make install

 	prepareInstalledDevelLibs libfreetype
@@ -66,7 +64,7 @@ INSTALL()
 PROVIDES_devel="
 	freetype${secondaryArchSuffix}_devel = $portVersion
 	cmd:freetype_config${secondaryArchSuffix} = $portVersion
-	devel:libfreetype${secondaryArchSuffix} = 6.8.1 compat >= 6
+	devel:libfreetype${secondaryArchSuffix} = 6.11.1 compat >= 6
 	"
 REQUIRES_devel="
 	freetype${secondaryArchSuffix} == $portVersion base
--- a/media-libs/libopus/libopus-1.1.recipe
+++ b/media-libs/libopus/libopus-1.1.recipe
@@ -0,0 +1,51 @@
+SUMMARY="Opus Interactive Audio Codec"
+DESCRIPTION="
+Opus is a totally open, royalty-free, highly versatile audio codec. Opus is \
+unmatched for interactive speech and music transmission over the Internet, but\
+is also intended for storage and streaming applications. It is standardized by\
+the Internet Engineering Task Force (IETF) as RFC 6716 which incorporated\
+technology from Skype's SILK codec and Xiph.Org's CELT codec.
+"
+HOMEPAGE="http://www.opus-codec.org"
+COPYRIGHT="2001-2014 Xiph.org"
+LICENSE="BSD (3-clause)"
+SRC_URI="http://downloads.xiph.org/releases/opus/opus-1.1.tar.gz"
+CHECKSUM_MD5="c5a8cf7c0b066759542bc4ca46817ac6"
+REVISION="1"
+ARCHITECTURES="x86_gcc2 ?x86 ?x86_64"
+SECONDARY_ARCHITECTURES="x86_gcc2 ?x86 ?x86_64"
+PROVIDES="
+	libopus$secondaryArchSuffix = $portVersion
+	lib:libopus$secondaryArchSuffix = $portVersion
+"
+REQUIRES="
+	haiku$secondaryArchSuffix >= $haikuVersion
+"
+BUILD_REQUIRES="
+	haiku${secondaryArchSuffix}_devel >= $haikuVersion
+"
+BUILD_PREREQUIRES="
+	cmd:gcc$secondaryArchSuffix
+	cmd:ld$secondaryArchSuffix
+	cmd:make
+"
+SOURCE_DIR="opus-1.1"
+
+BUILD()
+{
+	runConfigure ./configure
+	make
+}
+INSTALL()
+{
+	make install
+	prepareInstalledDevelLibs libopus
+	packageEntries devel $developDir
+}
+PROVIDES_devel="
+	libopus${secondaryArchSuffix}_devel = $portVersion
+	devel:libopus$secondaryArchSuffix = $portVersion
+"
+REQUIRES_devel="
+	lib:libopus$secondaryArchSuffix == $portVersion base
+"
--- a/media-libs/openal/openal-1.13.0.recipe
+++ b/media-libs/openal/openal-1.13.0.recipe
@@ -5,7 +5,7 @@ OpenAL - A software implementation of the OpenAL 3D audio API.
 HOMEPAGE="http://kcat.strangesoft.net/openal.html" 
 SRC_URI="http://kcat.strangesoft.net/openal-releases/openal-soft-1.13.tar.bz2"
 CHECKSUM_MD5="58b7d2809790c70681b825644c5f3614"
-REVISION="1"
+REVISION="2"
 LICENSE="GNU LGPL v2.1"
 COPYRIGHT="1999-2000 Loki Software
 	2005-2011 OpenAL Soft team"
@@ -34,24 +34,26 @@ BUILD_PREREQUIRES="
 	"

 SOURCE_DIR="openal-soft-1.13"
-        
+
+PATCHES="openal-1.13.0.patchset"
 BUILD()
 {
-	sed -i "s,RUNTIME DESTINATION bin,RUNTIME DESTINATION $relativeBinDir," CMakeLists.txt
-	cmake . -DCMAKE_INSTALL_PREFIX=$prefix \
-		-DLIB_SUFFIX="/${secondaryArchSuffix/_/}"
+	cd build
+	cmake .. -DCMAKE_INSTALL_PREFIX=$prefix -DBIN_DIR="$relativeBinDir" \
+		-DLIB_SUFFIX="/${secondaryArchSuffix/_/}" 
 	make $jobArgs
 }

 INSTALL()
 {
+	cd build
 	make install
 	
 	mkdir -p $developDir/headers
-	mkdir -p $binDir
-	mv $prefix/include $developDir/headers
-	
-	prepareInstalledDevelLibs libopenal
+	mv $prefix/include/* $developDir/headers
+	rmdir $prefix/include
+
+	prepareInstalledDevelLib libopenal
 	fixPkgconfig
 	
 	# devel package
--- a/media-libs/openal/patches/openal-1.13.0.patchset
+++ b/media-libs/openal/patches/openal-1.13.0.patchset
@@ -1,7 +1,14 @@
-diff -Naur openal-soft-1.13/Alc/ALc.c openal-soft-1.13-haiku/Alc/ALc.c
--- openal-soft-1.13/Alc/ALc.c	2011-02-09 17:52:19.006291456 -0200
-+++ openal-soft-1.13-haiku/Alc/ALc.c	2011-05-02 01:08:32.000000000 -0300
-@@ -60,6 +60,9 @@
+From b755a676e918041fe3320e5e6bfa061b3b892994 Mon Sep 17 00:00:00 2001
+From: Adrien Destugues <pulkomandy@pulkomandy.tk>
+Date: Tue, 28 Jan 2014 09:17:21 +0100
+Subject: applying patch openal-1.13.patch
+
+
+diff --git a/Alc/ALc.c b/Alc/ALc.c
+index 6bdcc66..c8b2af4 100644
+--- a/Alc/ALc.c
+++ b/Alc/ALc.c
+@@ -60,6 +60,9 @@ static BackendInfo BackendList[] = {
 #ifdef HAVE_SOLARIS
     { "solaris", alc_solaris_init, alc_solaris_deinit, alc_solaris_probe, EmptyFuncs },
 #endif
@@ -11,9 +18,11 @@ diff -Naur openal-soft-1.13/Alc/ALc.c openal-soft-1.13-haiku/Alc/ALc.c
 #ifdef HAVE_DSOUND
     { "dsound", alcDSoundInit, alcDSoundDeinit, alcDSoundProbe, EmptyFuncs },
 #endif
-diff -Naur openal-soft-1.13/Alc/haiku.cpp openal-soft-1.13-haiku/Alc/haiku.cpp
--- openal-soft-1.13/Alc/haiku.cpp	1969-12-31 21:00:00.000000000 -0300
-+++ openal-soft-1.13-haiku/Alc/haiku.cpp	2011-05-02 01:06:54.000000000 -0300
+diff --git a/Alc/haiku.cpp b/Alc/haiku.cpp
+new file mode 100644
+index 0000000..c66e99d
+--- /dev/null
+++ b/Alc/haiku.cpp
@@ -0,0 +1,214 @@
 +/**
 + * OpenAL cross platform audio library
@@ -229,10 +238,11 @@ diff -Naur openal-soft-1.13/Alc/haiku.cpp openal-soft-1.13-haiku/Alc/haiku.cpp
 +    (void)lSamples;	
 +}
 +
-diff -Naur openal-soft-1.13/CMakeLists.txt openal-soft-1.13-haiku/CMakeLists.txt
--- openal-soft-1.13/CMakeLists.txt	2011-02-15 18:05:40.000000000 -0200
-+++ openal-soft-1.13-haiku/CMakeLists.txt	2011-05-02 01:08:32.000000000 -0300
-@@ -16,10 +16,12 @@
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index 44f9ea8..ffbe13b 100644
+--- a/CMakeLists.txt
+++ b/CMakeLists.txt
+@@ -16,10 +16,12 @@ INCLUDE(CheckIncludeFiles)
 INCLUDE(CheckSymbolExists)
 INCLUDE(CheckCCompilerFlag)
 INCLUDE(CheckCSourceCompiles)
@@ -246,7 +256,7 @@ diff -Naur openal-soft-1.13/CMakeLists.txt openal-soft-1.13-haiku/CMakeLists.txt
 
 
 SET(CMAKE_ALLOW_LOOSE_LOOP_CONSTRUCTS TRUE)
-@@ -28,6 +30,7 @@
+@@ -28,6 +30,7 @@ SET(CMAKE_ALLOW_LOOSE_LOOP_CONSTRUCTS TRUE)
 OPTION(ALSA    "Check for ALSA backend"                ON)
 OPTION(OSS     "Check for OSS backend"                 ON)
 OPTION(SOLARIS "Check for Solaris backend"             ON)
@@ -254,7 +264,7 @@ diff -Naur openal-soft-1.13/CMakeLists.txt openal-soft-1.13-haiku/CMakeLists.txt
 OPTION(DSOUND  "Check for DirectSound backend"         ON)
 OPTION(WINMM   "Check for Windows Multimedia backend"  ON)
 OPTION(PORTAUDIO  "Check for PortAudio backend"        ON)
-@@ -334,6 +337,7 @@
+@@ -334,6 +337,7 @@ SET(BACKENDS "")
 SET(HAVE_ALSA       0)
 SET(HAVE_OSS        0)
 SET(HAVE_SOLARIS    0)
@@ -262,7 +272,7 @@ diff -Naur openal-soft-1.13/CMakeLists.txt openal-soft-1.13-haiku/CMakeLists.txt
 SET(HAVE_DSOUND     0)
 SET(HAVE_WINMM      0)
 SET(HAVE_PORTAUDIO  0)
-@@ -378,6 +382,24 @@
+@@ -378,6 +382,24 @@ IF(SOLARIS)
     ENDIF()
 ENDIF()
 
@@ -287,10 +297,11 @@ diff -Naur openal-soft-1.13/CMakeLists.txt openal-soft-1.13-haiku/CMakeLists.txt
 # Check DSound/MMSystem backend
 IF(DSOUND)
     CHECK_INCLUDE_FILE(dsound.h HAVE_DSOUND_H)
-diff -Naur openal-soft-1.13/OpenAL32/Include/alMain.h openal-soft-1.13-haiku/OpenAL32/Include/alMain.h
--- openal-soft-1.13/OpenAL32/Include/alMain.h	2011-02-09 17:50:49.001835008 -0200
-+++ openal-soft-1.13-haiku/OpenAL32/Include/alMain.h	2011-05-02 01:08:32.000000000 -0300
-@@ -276,6 +276,9 @@
+diff --git a/OpenAL32/Include/alMain.h b/OpenAL32/Include/alMain.h
+index 02153a8..e3b357a 100644
+--- a/OpenAL32/Include/alMain.h
+++ b/OpenAL32/Include/alMain.h
+@@ -276,6 +276,9 @@ void alc_oss_probe(int type);
 void alc_solaris_init(BackendFuncs *func_list);
 void alc_solaris_deinit(void);
 void alc_solaris_probe(int type);
@@ -300,9 +311,10 @@ diff -Naur openal-soft-1.13/OpenAL32/Include/alMain.h openal-soft-1.13-haiku/Ope
 void alcDSoundInit(BackendFuncs *func_list);
 void alcDSoundDeinit(void);
 void alcDSoundProbe(int type);
-diff -Naur openal-soft-1.13/config.h.in openal-soft-1.13-haiku/config.h.in
--- openal-soft-1.13/config.h.in	2010-06-08 05:56:28.066846720 -0300
-+++ openal-soft-1.13-haiku/config.h.in	2011-05-02 01:08:32.000000000 -0300
+diff --git a/config.h.in b/config.h.in
+index 3c1e7e6..27a19cf 100644
+--- a/config.h.in
+++ b/config.h.in
@@ -13,6 +13,9 @@
 /* Define if we have the Solaris backend */
 #cmakedefine HAVE_SOLARIS
@@ -313,3 +325,46 @@ diff -Naur openal-soft-1.13/config.h.in openal-soft-1.13-haiku/config.h.in
 /* Define if we have the DSound backend */
 #cmakedefine HAVE_DSOUND
 
+-- 
+1.8.3.4
+
+
+From af8af1218c33e188372b600c4c0bfefc616b43e6 Mon Sep 17 00:00:00 2001
+From: Adrien Destugues <pulkomandy@pulkomandy.tk>
+Date: Tue, 28 Jan 2014 09:22:49 +0100
+Subject: Make bin directory a variable.
+
+
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index ffbe13b..a060122 100644
+--- a/CMakeLists.txt
+++ b/CMakeLists.txt
+@@ -488,6 +488,7 @@ SET(libdir "\${exec_prefix}/lib${LIB_SUFFIX}")
+ SET(bindir "\${exec_prefix}/bin")
+ SET(includedir "\${prefix}/include")
+ SET(PACKAGE_VERSION "${LIB_VERSION}")
+SET(BIN_DIR "bin" CACHE STRING "relative dir where to put executables")
+ 
+ # End configuration
+ CONFIGURE_FILE(
+@@ -512,7 +513,7 @@ TARGET_LINK_LIBRARIES(${LIBNAME} ${EXTRA_LIBS})
+ 
+ # Add an install target here
+ INSTALL(TARGETS ${LIBNAME}
+-        RUNTIME DESTINATION bin
+	RUNTIME DESTINATION "${BIN_DIR}"
+         LIBRARY DESTINATION "lib${LIB_SUFFIX}"
+         ARCHIVE DESTINATION "lib${LIB_SUFFIX}"
+ )
+@@ -554,7 +555,7 @@ IF(UTILS)
+     ADD_EXECUTABLE(openal-info utils/openal-info.c)
+     TARGET_LINK_LIBRARIES(openal-info ${LIBNAME})
+     INSTALL(TARGETS openal-info
+-            RUNTIME DESTINATION bin
+		RUNTIME DESTINATION "${BIN_DIR}"
+             LIBRARY DESTINATION "lib${LIB_SUFFIX}"
+             ARCHIVE DESTINATION "lib${LIB_SUFFIX}"
+     )
+-- 
+1.8.3.4
+
--- a/media-libs/sdl_image/sdl_image-1.2.12.recipe
+++ b/media-libs/sdl_image/sdl_image-1.2.12.recipe
@@ -11,7 +11,7 @@ on both libz and libjpeg.
 HOMEPAGE="http://www.libsdl.org/projects/SDL_image" 
 SRC_URI="http://www.libsdl.org/projects/SDL_image/release/SDL_image-1.2.12.tar.gz"
 CHECKSUM_MD5="a0f9098ebe5400f0bdc9b62e60797ecb"
-REVISION="1"
+REVISION="2"
 LICENSE="Zlib"
 COPYRIGHT="1997-2012 Sam Lantinga"

@@ -34,6 +34,7 @@ REQUIRES="
 	lib:libgif$secondaryArchSuffix
 	lib:libwebp$secondaryArchSuffix
 	lib:libGL$secondaryArchSuffix
+	lib:libz$secondaryArchSuffix
 	"

 BUILD_REQUIRES="
@@ -44,6 +45,7 @@ BUILD_REQUIRES="
 #	devel:libtiff$secondaryArchSuffix
 	devel:libgif$secondaryArchSuffix
 	devel:libwebp$secondaryArchSuffix
+	devel:libz$secondaryArchSuffix
 	"
 	
 BUILD_PREREQUIRES="
@@ -53,7 +55,7 @@ BUILD_PREREQUIRES="
 	cmd:ld$secondaryArchSuffix
 	cmd:libtool
 	cmd:make
-	cmd:pkg_config
+	cmd:pkg_config$secondaryArchSuffix
 	cmd:sdl_config
 	"

@@ -65,7 +67,7 @@ BUILD()
 	aclocal --install -I acinclude
 	./autogen.sh
 	runConfigure ./configure \
-		--enable-bmp --enable-lbm --enable-pcx \
+		--enable-bmp --enable-lbm --enable-pcx --enable-png \
 		--enable-pnm --enable-tga --enable-xcf --enable-xpm --enable-xv \
 		--enable-gif --enable-jpg --disable-jpg-shared --enable-webp
 	make
--- a/media-sound/mpg123/mpg123-1.12.1.recipe
+++ b/media-sound/mpg123/mpg123-1.12.1.recipe
@@ -1,3 +1,4 @@
+SUMMARY="Fast console MPEG Audio Player and decoder library"
 DESCRIPTION="
 mpg123 is the fast and Free console based real time MPEG Audio Player for \
 Layer 1, 2 and 3.
@@ -5,24 +6,55 @@ Layer 1, 2 and 3.
 HOMEPAGE="http://www.mpg123.org/" 
 SRC_URI="http://sourceforge.net/projects/mpg123/files/mpg123/1.12.1/mpg123-1.12.1.tar.bz2/download"
 REVISION="1"
-STATUS_HAIKU="stable"
-DEPEND="media-libs/libsdl >= 1.2"
+ARCHITECTURES="x86_gcc2 x86"
+SECONDARY_ARCHITECTURES="x86"
 CHECKSUM_MD5="e7d810a75d22954169f1530a436aca4c"
+#DEPEND="media-libs/libsdl >= 1.2"
+
+PROVIDES="
+	mpg123$secondaryArchSuffix = $portVersion
+	lib:libmpg123$secondaryArchSuffix
+	cmd:mpg123$secondaryArchSuffix
+	"
+
+REQUIRES="
+	haiku$secondaryArchSuffix >= $haikuVersion
+	"
+
+BUILD_PREREQUIRES="
+	haiku${secondaryArchSuffix}_devel >= $haikuVersion
+	cmd:gcc$secondaryArchSuffix
+	cmd:ld$secondaryArchSuffix
+	cmd:make
+	"
+
+PATCHES="mpg123-1.12.1.patch"
 BUILD()
 {
-	cd mpg123-1.12.1
-	libtoolize --force --copy --install
-	aclocal
-	autoconf
-	./configure --prefix=`finddir B_COMMON_DIRECTORY` --disable-aligncheck
-	make
+#libtoolize --force --copy --install
+#	aclocal
+#	autoconf
+	LDFLAGS="-lnetwork" runConfigure ./configure --disable-aligncheck
+	make $jobArgs
 }

 INSTALL()
 {
-	cd mpg123-1.12.1
 	make install
+	prepareInstalledDevelLib libmpg123
+	packageEntries devel $developDir
 }

+PROVIDES_devel="
+	mpg123$secondaryArchSuffix = $portVersion
+	devel:libmpg123$secondaryArchSuffix
+	"
+
+REQUIRES_devel="
+	haiku$secondaryArchSuffix >= $haikuVersion
+	mpg123$secondaryArchSuffix == $portVersion base
+	"
+
+
 LICENSE="GNU LGPL v2.1"
 COPYRIGHT="1995-2009 Michael Hipp and others"
--- a/net-misc/curl/curl-7.35.0.recipe
+++ b/net-misc/curl/curl-7.35.0.recipe
@@ -0,0 +1,115 @@
+SUMMARY="A commandline-tool and library for downloading data from URLs"
+HOMEPAGE="http://curl.haxx.se"
+COPYRIGHT="1996-2014, Daniel Stenberg, <daniel@haxx.se>. All rights reserved."
+LICENSE="Curl"
+SRC_URI="http://curl.haxx.se/download/curl-7.35.0.tar.bz2"
+CHECKSUM_MD5="c18fbdd031adb0529ae09fce399f2d10"
+REVISION="1"
+ARCHITECTURES="x86_gcc2 x86"
+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
+	"
+
+BUILD()
+{
+	certsInstallDir="$portPackageLinksDir/ca_root_certificates"
+	certsDir="$certsInstallDir/$relativeDataRootDir/ssl"
+
+	libtoolize --force --copy --install
+	autoconf
+	runConfigure ./configure \
+		--enable-ipv6 \
+		--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/openssh/openssh-6.5p1.recipe
+++ b/net-misc/openssh/openssh-6.5p1.recipe
@@ -0,0 +1,136 @@
+SUMMARY="Secure Shell Client and Server (Remote Login Program)"
+DESCRIPTION="
+OpenSSH is a FREE version of the SSH connectivity tools that technical users \
+of the Internet rely on. Users of telnet, rlogin, and ftp may not realize that \
+their password is transmitted across the Internet unencrypted, but it is. \
+OpenSSH encrypts all traffic (including passwords) to effectively eliminate \
+eavesdropping, connection hijacking, and other attacks. Additionally, OpenSSH \
+provides secure tunneling capabilities and several authentication methods, and \
+supports all SSH protocol versions.
+The OpenSSH suite replaces rlogin and telnet with the ssh program, rcp with \
+scp, and ftp with sftp. Also included is sshd (the server side of the \
+package), and the other utilities like ssh-add, ssh-agent, ssh-keysign, \
+ssh-keyscan, ssh-keygen and sftp-server.
+"
+HOMEPAGE="http://www.openssh.com/"
+LICENSE="OpenSSH"
+COPYRIGHT="2005-2014 Tatu Ylonen et al."
+SRC_URI="http://openbsd.mirrorcatalogs.com/pub/OpenBSD/OpenSSH/portable/openssh-6.5p1.tar.gz"
+SRC_URI="http://openbsd.locaweb.com.br/pub/OpenBSD/OpenSSH/portable/openssh-6.5p1.tar.gz"
+#SRC_URI="http://mindrot.org/openssh_snap/openssh-SNAP-20140127.tar.gz"
+CHECKSUM_MD5="a084e7272b8cbd25afe0f5dce4802fef"
+REVISION="1"
+
+ARCHITECTURES="x86_gcc2 x86 x86_64"
+
+PATCHES="sshd_config.patch
+		pathnames.patch"
+
+ADDITIONAL_FILES="sshd_keymaker.sh"
+
+PROVIDES="
+	openssh = $portVersion compat >= 5
+	cmd:scp = $portVersion compat >= 5
+	cmd:sftp = $portVersion compat >= 5
+	cmd:sftp_server = $portVersion compat >= 5
+	cmd:slogin = $portVersion compat >= 5
+	cmd:ssh = $portVersion compat >= 5
+	cmd:ssh_add = $portVersion compat >= 5
+	cmd:ssh_agent = $portVersion compat >= 5
+	cmd:ssh_keygen = $portVersion compat >= 5
+	cmd:ssh_keyscan = $portVersion compat >= 5
+	cmd:ssh_keysign = $portVersion compat >= 5
+	cmd:ssh_pkcs11_helper = $portVersion compat >= 5
+	cmd:sshd = $portVersion compat >= 5
+	"
+REQUIRES="
+	haiku >= $haikuVersion
+	cmd:login
+	cmd:passwd
+	lib:libcrypto
+	lib:libedit
+	lib:libncurses
+	lib:libssl
+	lib:libz
+	"
+BUILD_REQUIRES="
+	devel:libcrypto
+	devel:libedit
+	devel:libncurses
+	devel:libssl
+	devel:libz
+	"
+BUILD_PREREQUIRES="
+	haiku_devel >= $haikuVersion
+	cmd:aclocal
+	cmd:autoconf
+	cmd:automake
+	cmd:gcc
+	cmd:ld
+	cmd:libtoolize
+	cmd:make
+	cmd:pkg_config
+	"
+
+GLOBAL_WRITABLE_FILES="
+	settings/ssh directory keep-old
+	"
+USER_SETTINGS_FILES="
+	settings/ssh directory
+	"
+POST_INSTALL_SCRIPTS="
+	$relativePostInstallDir/sshd_keymaker.sh
+	"
+sshdUserHomeDir="/packages/$portVersionedName-$REVISION/.self/$relativeDataDir/openssh/empty"
+PACKAGE_USERS="
+	sshd real-name \"sshd user\" home \"$sshdUserHomeDir\" shell \"/bin/true\"
+	"
+PACKAGE_GROUPS="sshd"
+
+
+PATCH()
+{
+	echo 'AC_CONFIG_MACRO_DIR([m4])' >> configure.ac
+}
+
+SOURCE_DIR="openssh"
+
+BUILD()
+{
+	mkdir -p m4
+	aclocal --install -I m4
+	libtoolize --force --copy
+	aclocal -I m4
+	autoconf
+	defaultPath=".:/boot/home/config/non-packaged/bin:/boot/home/config/bin"
+	defaultPath+=":/boot/common/non-packaged/bin:/boot/common/bin:/bin"
+	defaultPath+=":/boot/common/apps:/boot/common/preferences:/boot/system/apps"
+	defaultPath+=":/boot/system/preferences"
+
+	# Note: override sysconfdir and libexecdir since ssh doesn't create
+	# subdirectories as it should.
+	PATH_PASSWD_PROG=$portPackageLinksDir/cmd~passwd/bin/passwd \
+	LOGIN_PROGRAM=$portPackageLinksDir/cmd~login/bin/login \
+	runConfigure ./configure \
+		--sysconfdir=$sysconfDir/ssh \
+		--libexecdir=$libExecDir/openssh \
+		--with-privsep-path=$dataDir/openssh/empty \
+		--with-pid-dir=$prefix/var/run \
+		--with-default-path="$defaultPath" \
+		--with-md5-passwords \
+		--disable-utmpx \
+		--with-libedit
+	make $jobArgs
+}
+
+INSTALL()
+{
+	make install-nokeys
+	mkdir -p $postInstallDir
+	cp -f $portDir/additional-files/sshd_keymaker.sh $postInstallDir
+}
+
+TEST()
+{
+	make tests
+}
--- a/net-misc/openssh/patches/pathnames.patch
+++ b/net-misc/openssh/patches/pathnames.patch
@@ -0,0 +1,13 @@
+diff --git a/pathnames.h b/pathnames.h
+index ec89fc6..6ad1b64 100644
+--- a/pathnames.h
+++ b/pathnames.h
+@@ -59,7 +59,7 @@
+  * The directory in user's home directory in which the files reside. The
+  * directory should be world-readable (though not all files are).
+  */
+-#define _PATH_SSH_USER_DIR		".ssh"
+#define _PATH_SSH_USER_DIR		"config/settings/ssh"
+ 
+ /*
+  * Per-user file containing host keys of known hosts.  This file need not be
--- a/net-misc/openssh/patches/sshd_config.patch
+++ b/net-misc/openssh/patches/sshd_config.patch
@@ -0,0 +1,13 @@
+diff --git a/sshd_config b/sshd_config
+index e9045bc..0835873 100644
+--- a/sshd_config
+++ b/sshd_config
+@@ -51,7 +51,7 @@
+ 
+ # The default is to check both .ssh/authorized_keys and .ssh/authorized_keys2
+ # but this is overridden so installations will only check .ssh/authorized_keys
+-AuthorizedKeysFile	.ssh/authorized_keys
+AuthorizedKeysFile	config/settings/ssh/authorized_keys
+ 
+ #AuthorizedPrincipalsFile none
+ 
--- a/sys-apps/pciutils/patches/pciutils-3.2.1_git-0001-C89.patch
+++ b/sys-apps/pciutils/patches/pciutils-3.2.1_git-0001-C89.patch
@@ -0,0 +1,30 @@
+From 5791b4969c8acb81a6879035269319d3140d2bfa Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Fran=C3=A7ois=20Revol?= <revol@free.fr>
+Date: Wed, 18 Dec 2013 14:10:05 +0100
+Subject: [PATCH] C89
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+Signed-off-by: François Revol <revol@free.fr>
+---
+ ls-caps.c | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/ls-caps.c b/ls-caps.c
+index f192510..865a999 100644
+--- a/ls-caps.c
+++ b/ls-caps.c
+@@ -1260,8 +1260,8 @@ show_caps(struct device *d, int where)
+ 
+   if (get_conf_word(d, PCI_STATUS) & PCI_STATUS_CAP_LIST)
+     {
+-      where = get_conf_byte(d, where) & ~3;
+       byte been_there[256];
+      where = get_conf_byte(d, where) & ~3;
+       memset(been_there, 0, 256);
+       while (where)
+ 	{
+-- 
+1.8.3.4
+
--- a/sys-apps/pciutils/pciutils-3.2.1.recipe
+++ b/sys-apps/pciutils/pciutils-3.2.1.recipe
@@ -0,0 +1,77 @@
+SUMMARY="Various utilities dealing with the PCI bus"
+DESCRIPTION="Various utilities dealing with the PCI bus"
+HOMEPAGE="http://mj.ucw.cz/sw/pciutils/"
+SRC_URI="ftp://atrey.karlin.mff.cuni.cz/pub/linux/pci/pciutils-3.2.1.tar.gz"
+CHECKSUM_MD5="fdc92c4665bb169022ffe730b3c08313"
+REVISION="1"
+LICENSE="GNU GPL v2"
+COPYRIGHT="1997-2012 Martin Mares"
+
+ARCHITECTURES="x86_gcc2 x86 ?x86_64"
+SECONDARY_ARCHITECTURES="x86_gcc2 x86"
+
+PROVIDES="
+	pciutils${secondaryArchSuffix} = $portVersion
+	cmd:lspci${secondaryArchSuffix} = $portVersion
+	cmd:setpci${secondaryArchSuffix} = $portVersion
+	"
+REQUIRES="
+	haiku${secondaryArchSuffix} >= $haikuVersion
+	lib:libz${secondaryArchSuffix}
+	"
+BUILD_REQUIRES="
+	haiku${secondaryArchSuffix}_devel >= $haikuVersion
+	devel:libz${secondaryArchSuffix}
+	"
+BUILD_PREREQUIRES="
+	cmd:make
+	cmd:gcc${secondaryArchSuffix}
+	"
+
+PATCHES="pciutils-3.2.1_git-0001-C89.patch"
+
+BUILD()
+{
+	make \
+		ZLIB=yes \
+		PREFIX=$prefix \
+		SHAREDIR=$dataDir \
+		SBINDIR=$binDir \
+		MANDIR=$manDir \
+		INCDIR=$headersDir \
+		LIBDIR=$developLibDir
+}
+
+#TODO: SHARED=yes?
+# XXX: remove update-pciids (packages are read-only anyway)
+INSTALL()
+{
+	make \
+		ZLIB=yes \
+		PREFIX=$prefix \
+		SHAREDIR=$dataDir \
+		SBINDIR=$binDir \
+		MANDIR=$manDir \
+		INCDIR=$includeDir \
+		LIBDIR=$developLibDir \
+		install install-lib
+	rm -f $binDir/update-pciids
+	rm -f $manDir/man*/update-pciids.*
+
+    # devel package
+    packageEntries devel \
+        $developDir \
+        $manDir/man*/pcilib.*
+}
+
+PROVIDES_devel="
+	pciutils${secondaryArchSuffix}_devel = $portVersion
+	devel:pciutils$secondaryArchSuffix = $portVersion
+	devel:libpci$secondaryArchSuffix
+	"
+
+REQUIRES_devel="
+	pciutils$secondaryArchSuffix == $portVersion base
+	"
+
+
--- a/sys-apps/pciutils/pciutils-3.2.1_git.recipe
+++ b/sys-apps/pciutils/pciutils-3.2.1_git.recipe
@@ -0,0 +1,80 @@
+SUMMARY="Various utilities dealing with the PCI bus"
+DESCRIPTION="Various utilities dealing with the PCI bus"
+HOMEPAGE="http://mj.ucw.cz/sw/pciutils/"
+SRC_URI="git://git.kernel.org/pub/scm/utils/pciutils/pciutils.git"
+#CHECKSUM_MD5=""
+REVISION="1"
+LICENSE="GNU GPL v2"
+COPYRIGHT="1997-2012 Martin Mares"
+
+ARCHITECTURES="?x86_gcc2 ?x86 ?x86_64"
+SECONDARY_ARCHITECTURES="?x86_gcc2 ?x86"
+
+PROVIDES="
+	pciutils${secondaryArchSuffix} = $portVersion
+	cmd:lspci${secondaryArchSuffix} = $portVersion
+	cmd:setpci${secondaryArchSuffix} = $portVersion
+#	cmd:update-pciids${secondaryArchSuffix} = $portVersion
+#	lib:libpci${secondaryArchSuffix}
+#	devel:pciutils${secondaryArchSuffix}
+	"
+REQUIRES="
+	haiku${secondaryArchSuffix} >= $haikuVersion
+	lib:libz${secondaryArchSuffix}
+	"
+BUILD_REQUIRES="
+	haiku${secondaryArchSuffix}_devel >= $haikuVersion
+	devel:libz${secondaryArchSuffix}
+	"
+BUILD_PREREQUIRES="
+	cmd:make
+	cmd:gcc${secondaryArchSuffix}
+	"
+
+PATCHES="pciutils-3.2.1_git-0001-C89.patch"
+
+BUILD()
+{
+	make \
+		ZLIB=yes \
+		PREFIX=$prefix \
+		SHAREDIR=$dataDir \
+		SBINDIR=$binDir \
+		MANDIR=$manDir \
+		INCDIR=$headersDir \
+		LIBDIR=$developLibDir
+}
+
+#TODO: SHARED=yes?
+# XXX: remove update-pciids (packages are read-only anyway)
+INSTALL()
+{
+	make \
+		ZLIB=yes \
+		PREFIX=$prefix \
+		SHAREDIR=$dataDir \
+		SBINDIR=$binDir \
+		MANDIR=$manDir \
+		INCDIR=$includeDir \
+		LIBDIR=$developLibDir \
+		install install-lib
+	rm -f $binDir/update-pciids
+	rm -f $manDir/man*/update-pciids.*
+
+    # devel package
+    packageEntries devel \
+        $developDir \
+        $manDir/man*/pcilib.*
+}
+
+PROVIDES_devel="
+	pciutils${secondaryArchSuffix}_devel = $portVersion
+	devel:pciutils$secondaryArchSuffix = $portVersion
+	devel:libpci$secondaryArchSuffix
+	"
+
+REQUIRES_devel="
+	pciutils$secondaryArchSuffix == $portVersion base
+	"
+
+
--- a/sys-devel/gcc/gcc-4.8.2_2014_01_28.recipe
+++ b/sys-devel/gcc/gcc-4.8.2_2014_01_28.recipe
@@ -0,0 +1,157 @@
+SUMMARY="C/C++ cross-compiler for target ${effectiveTargetMachineTriple}"
+DESCRIPTION="
+Standard compiler for x86 platform.
+"
+HOMEPAGE="http://gcc.gnu.org"
+LICENSE="
+	GNU GPL v2
+	GNU LGPL v2
+	"
+COPYRIGHT="1988-2013 Free Software Foundation, Inc."
+SRC_URI="
+	git+file://$portBaseDir/../binutils/download/buildtools.git#66becd8fe7e99054b190c181b063933310718179
+	git+git://github.com/haiku/buildtools.git#66becd8fe7e99054b190c181b063933310718179
+	"
+REVISION="2"
+ARCHITECTURES="x86 x86_64"
+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="
+	gcc$secondaryArchSuffix = $portVersion compat >= 4
+	cmd:c++$secondaryArchSuffix = $portVersion compat >= 4
+	cmd:cc$secondaryArchSuffix = $portVersion compat >= 4
+	cmd:cpp$secondaryArchSuffix = $portVersion compat >= 4
+	cmd:g++$secondaryArchSuffix = $portVersion compat >= 4
+	cmd:gcc$secondaryArchSuffix = $portVersion compat >= 4
+	cmd:gcc_4.8.2$secondaryArchSuffix = $portVersion compat >= 4
+	cmd:gcov$secondaryArchSuffix = $portVersion compat >= 4
+	"
+
+REQUIRES="
+	haiku$secondaryArchSuffix >= $haikuVersion
+	cmd:as$secondaryArchSuffix
+	"
+BUILD_REQUIRES="
+	"
+BUILD_PREREQUIRES="
+	haiku${secondaryArchSuffix}_devel >= $haikuVersion
+	cmd:autoconf
+	cmd:flex
+	cmd:gcc$secondaryArchSuffix
+	cmd:ld$secondaryArchSuffix
+	cmd:make
+	cmd:makeinfo
+	cmd:sed
+	cmd:strip
+	cmd:tar
+	"
+
+SOURCE_DIR="gcc-$portVersion/gcc"
+
+sourceDir=$(pwd)
+relativeInstallDir="develop/tools$secondaryArchSubDir"
+installDir="$prefix/$relativeInstallDir"
+objectsDir=$(pwd)/../${portVersionedName}-obj
+
+BUILD()
+{
+	rm -rf $objectsDir
+
+	# Touch some files generated by bison, so that bison won't run to update
+	# them. Fixes issues with newer bison versions.
+	# And while at it, touch gperf target, too (as gperf may not be installed).
+	(cd $sourceDir/gcc; touch c-parse.c c-parse.h cexp.c cp/parse.c \
+		cp/parse.h c-gperf.h)
+
+	mkdir -p $objectsDir
+	cd $objectsDir
+
+	local additionalConfigureFlags
+	if [ -n "$secondaryArchSuffix" ]; then
+		additionalConfigureFlags="\
+			--with-hybrid-secondary=${effectiveTargetArchitecture}"
+	fi
+	if [ $effectiveTargetArchitecture == x86_64 ]; then
+		# disable multilib support, as x86_64 by default tries to build the
+		# 32-bit libraries, too, which fails as no 32-bit libroot is available
+		additionalConfigureFlags+=" --disable-multilib"
+	fi
+
+	CFLAGS="-O2 -U_FORTIFY_SOURCE" CXXFLAGS="-O2" "$sourceDir/configure" \
+		--build=$effectiveTargetMachineTriple \
+		--prefix=$installDir --libexecdir=$installDir/lib --mandir=$manDir \
+		--docdir=$docDir --enable-threads=posix \
+		--disable-nls --enable-shared --with-gnu-ld \
+		--enable-languages=c,c++ --enable-lto --enable-frame-pointer \
+		--with-pkgversion=$(echo $portVersion | cut -c 7-) \
+		$additionalConfigureFlags
+
+	make $jobArgs
+}
+
+INSTALL()
+{
+	cd $objectsDir
+
+	make install-strip
+	make install-html
+
+	### HTML documentation ####################################
+
+	echo "Organizing HTML documentation..."
+	cd $docDir
+	for dir in gmp libquadmath mpc mpfr; do
+		mv ${dir}.html $dir
+		ln -s $dir/index.html ${dir}.html
+	done
+
+	### Strip #################################################
+
+	echo "Strip debug info"
+
+	cd $installDir
+	strip --strip-debug bin/*
+	for f in cc1 cc1plus collect2 lto1; do
+		strip --strip-debug lib/gcc/$effectiveTargetMachineTriple/*/$f
+	done
+	strip --strip-debug lib/*.a
+
+	### Disable ASLR ##########################################
+
+	echo "Add SYS:ENV attribute to disable ASLR"
+
+	cd $installDir
+	for f in bin/*; do
+		if [ -r "$f" ]; then
+			addattr SYS:ENV DISABLE_ASLR=1 $f
+		fi
+	done
+	for f in cc1 cc1plus collect2 lto1; do
+		addattr SYS:ENV DISABLE_ASLR=1 \
+			lib/gcc/$effectiveTargetMachineTriple/*/$f
+	done
+
+	### Symlinks ##############################################
+
+	echo "Creating required symlinks"
+
+	# create missing cc symlink
+	ln -sf gcc $installDir/bin/cc
+
+	# make all tools available via default paths
+	mkdir -p $binDir
+	for f in c++ cc cpp g++ gcc gcov; do
+		symlinkRelative -sfn $installDir/bin/$f $binDir
+	done
+
+	### Cleanup ###############################################
+
+	echo "Cleanup"
+	rm -rf $installDir/info
+	rm -rf $installDir/share
+}
--- a/sys-devel/llvm/llvm-3.4.recipe
+++ b/sys-devel/llvm/llvm-3.4.recipe
@@ -11,12 +11,39 @@ REVISION="1"
 CHECKSUM_MD5="46ed668a1ce38985120dbf6344cf6116"
 ARCHITECTURES="x86 x86_64"
 if [ $effectiveTargetArchitecture != x86_gcc2 ]; then
-	ARCHITECTURES="$ARCHITECTURES !x86_gcc2"
+	ARCHITECTURES="$ARCHITECTURES x86_gcc2"
 fi
 SECONDARY_ARCHITECTURES="x86"

 PROVIDES="
 	llvm$secondaryArchSuffix = $portVersion
+	cmd:bugpoint
+	cmd:llc
+	cmd:lli
+	cmd:lli_child_target
+	cmd:llvm_ar
+	cmd:llvm_as
+	cmd:llvm_bcanalyzer
+	cmd:llvm_config
+	cmd:llvm_cov
+	cmd:llvm_diff
+	cmd:llvm_dis
+	cmd:llvm_dwarfdump
+	cmd:llvm_extract
+	cmd:llvm_link
+	cmd:llvm_mc
+	cmd:llvm_mcmarkup
+	cmd:llvm_nm
+	cmd:llvm_objdump
+	cmd:llvm_ranlib
+	cmd:llvm_readobj
+	cmd:llvm_rtdyld
+	cmd:llvm_size
+	cmd:llvm_stress
+	cmd:llvm_symbolizer
+	cmd:llvm_tblgen
+	cmd:macho_dump
+	cmd:opt
 	"

 REQUIRES="
--- a/sys-libs/mesa/mesa-10.0.2.recipe
+++ b/sys-libs/mesa/mesa-10.0.2.recipe
@@ -98,11 +98,11 @@ INSTALL()

 	# swpipe renderer package
 	packageEntries swpipe \
-		"$addOnsDir/opengl/Software Pipe"
+		"$addOnsDir/opengl/*Pipe"

 	# swrast renderer package
 	packageEntries swrast \
-		"$addOnsDir/opengl/Software Rasterizer"
+		"$addOnsDir/opengl/*Rasterizer"
 }

 # ----- devel package -------------------------------------------------------