diff --git a/app-admin/keepassx/keepassx-2.0a4.git.recipe b/app-admin/keepassx/keepassx-2.0a4.git.recipe
index 736ea893b..1cd686d36 100644
--- a/app-admin/keepassx/keepassx-2.0a4.git.recipe
+++ b/app-admin/keepassx/keepassx-2.0a4.git.recipe
@@ -30,12 +30,12 @@ COPYRIGHT="
 	"
 
 LICENSE="GNU GPL v2"
-REVISION="1"
+REVISION="2"
 ARCHITECTURES="x86"
 
 PROVIDES="
 	keepassx = $portVersion
-	cmd:keepassx = $portVersion
+	app:keepassx = $portVersion
 	"
 
 REQUIRES="
@@ -83,6 +83,7 @@ BUILD()
 INSTALL()
 {
 	make install
-
-	addAppDeskbarSymlink $binDir/keepassx KeePassX
+	mkdir -p $appsDir
+	mv $binDir/keepassx $appsDir/KeePassX
+	addAppDeskbarSymlink $appsDir/KeePassX KeePassX
 }
diff --git a/dev-java/ant_core/ant_core-1.9.2.recipe b/dev-java/ant_core/ant_core-1.9.2.recipe
new file mode 100644
index 000000000..02040e7ae
--- /dev/null
+++ b/dev-java/ant_core/ant_core-1.9.2.recipe
@@ -0,0 +1,66 @@
+SUMMARY="Java-based build tool similar to 'make' that uses XML configuration files"
+DESCRIPTION="Apache Ant is a Java library and command-line tool whose mission is to drive processes described in build files as targets and extension points dependent upon each other. The main known usage of Ant is the build of Java applications. Ant supplies a number of built-in tasks allowing to compile, assemble, test and run Java applications. Ant can also be used effectively to build non Java applications, for instance C or C++ applications. More generally, Ant can be used to pilot any type of process which can be described in terms of targets and tasks.
+
+Ant is written in Java. Users of Ant can develop their own "antlibs" containing Ant tasks and types, and are offered a large number of ready-made commercial or open-source "antlibs".
+
+Ant is extremely flexible and does not impose coding conventions or directory layouts to the Java projects which adopt it as a build tool.
+
+Software development projects looking for a solution combining build tool and dependency management can use Ant in combination with Apache Ivy.
+
+The Apache Ant project is part of the Apache Software Foundation."
+HOMEPAGE="http://ant.apache.org/"
+COPYRIGHT="1999-2013 The Apache Software Foundation"
+LICENSE="Apache v2"
+
+REVISION="1"
+ARCHITECTURES="any"
+
+SRC_URI="http://archive.apache.org/dist/ant/source/apache-ant-1.9.2-src.tar.bz2"
+CHECKSUM_MD5="8f610c1a0183507c2beebbf230f456af"
+SOURCE_DIR="apache-ant-$portVersion"
+
+PROVIDES="
+	ant_core = $portVersion compat >= 1
+	cmd:ant = $portVersion compat >= 1
+	"
+
+REQUIRES="
+	haiku >= $haikuVersion
+	cmd:java
+	"
+
+BUILD_REQUIRES="
+	"
+
+BUILD_PREREQUIRES="
+	cmd:java
+	cmd:java_config
+	cmd:javac
+	"
+
+PATCH()
+{
+	sed -i 's/depends=\"jars,test-jar\"/depends=\"jars\"/' build.xml
+}
+
+BUILD()
+{
+	export JAVA_HOME=$(java-config -H)
+	ANT_HOME= ./build.sh
+}
+
+INSTALL()
+{
+	export JAVA_HOME=$(java-config -H)
+	export ANT_HOME=$libDir/ant
+	./build.sh install-lite
+
+	# symlink the executable to binDir
+	mkdir -p $binDir
+	symlinkRelative -s $ANT_HOME/bin/ant $binDir
+
+	# create a profile.d file that sets up ANT_HOME
+	mkdir -p $dataDir/profile.d
+	echo ANT_HOME=$ANT_HOME > $dataDir/profile.d/ant.sh
+	echo "export ANT_HOME" >> $dataDir/profile.d/ant.sh
+}
diff --git a/dev-lang/openjdk/openjdk-1.7.recipe b/dev-lang/openjdk/openjdk-1.7.recipe
index 97d23b285..151eeb701 100644
--- a/dev-lang/openjdk/openjdk-1.7.recipe
+++ b/dev-lang/openjdk/openjdk-1.7.recipe
@@ -8,7 +8,8 @@ DEPEND="app-arch/cpio 	= 2.10
 
 CHECKSUM_MD5="e38b939c34b04427336245397fa43c9c"
 
-BUILD {
+BUILD()
+{
 	OPENJDK_DIR=`haikuporter -t`/dev-lang/openjdk/work
 
 	# Get and build Apache Ant.
@@ -161,7 +162,8 @@ BUILD {
 #	fi
 }
 
-INSTALL {
+INSTALL()
+{
 	# install
 	mkdir -p `finddir B_COMMON_DIRECTORY`/jdk
 	cp -r -f -v output/j2sdk-image/* `finddir B_COMMON_DIRECTORY`/jdk
@@ -175,7 +177,8 @@ INSTALL {
 	cp -f $(haikuporter -t)/dev-lang/openjdk/openjdk_setup_env.sh ${DESTDIR}/boot/common/boot/post_install
 }
 
-TEST {
+TEST()
+{
 	echo "OpenJDK tests are not yet ported to Haiku."
 }
 
diff --git a/dev-lang/openjdk/openjdk-1.7_2013_11_08.recipe b/dev-lang/openjdk/openjdk-1.7_2013_11_08.recipe
index a04ce485c..39f1085dd 100644
--- a/dev-lang/openjdk/openjdk-1.7_2013_11_08.recipe
+++ b/dev-lang/openjdk/openjdk-1.7_2013_11_08.recipe
@@ -54,6 +54,7 @@ PROVIDES="
 	cmd:jar = $portVersion compat >= 1
 	cmd:jarsigner = $portVersion compat >= 1
 	cmd:java = $portVersion compat >= 1
+	cmd:java_config = $portVersion compat >= 1
 	cmd:javac = $portVersion compat >= 1
 	cmd:javadoc = $portVersion compat >= 1
 	cmd:javah = $portVersion compat >= 1
@@ -171,6 +172,12 @@ export ALT_JDK_IMPORT_PATH=$ALT_BOOTDIR
 	# Build.
 	cd jdk
 	make
+
+	# The build system is broken in that it doesn't pick up all auto-generated
+	# java sources (it uses "find ... -name '*.java'" too early). Unfortunately
+	# that isn't easy to fix, so we just run a second make, which will pick up
+	# the then already existing files.
+	make
 }
 
 INSTALL()
@@ -185,4 +192,16 @@ INSTALL()
 	mkdir -p $binDir
 	symlinkRelative -s $jdkDir/bin/* $binDir
 		# TODO: We should probably link only a subset.
+
+	# create a java-config script in binDir
+	javaConfig=$binDir/java-config
+	sed -e "s,%JAVA_HOME%,$jdkDir," $portDir/sources/java-config.in \
+		> $javaConfig
+	chmod a+x $javaConfig
+
+	# create a profile.d file that sets up JAVA_HOME
+	jdkProfile=$dataDir/profile.d/openjdk.sh
+	mkdir -p $(dirname $jdkProfile)
+	echo JAVA_HOME=`java-config -H` > $jdkProfile
+	echo "export JAVA_HOME" >> $jdkProfile
 }
diff --git a/dev-lang/openjdk/patches/openjdk-1.7_2013_11_08-source8.patchset b/dev-lang/openjdk/patches/openjdk-1.7_2013_11_08-source8.patchset
index 10b680b0f..6ebc6e320 100644
--- a/dev-lang/openjdk/patches/openjdk-1.7_2013_11_08-source8.patchset
+++ b/dev-lang/openjdk/patches/openjdk-1.7_2013_11_08-source8.patchset
@@ -1,4 +1,4 @@
-From 2a98aa8f929d5018f35ac90064ebbbf2a64dc27a Mon Sep 17 00:00:00 2001
+From 5cca79ee50fbf704e67d337a16adf66877a976cd Mon Sep 17 00:00:00 2001
 From: Ingo Weinhold <ingo_weinhold@gmx.de>
 Date: Sat, 9 Nov 2013 02:30:27 +0100
 Subject: Defs-haiku.gmk: Fix Haiku specific *_PATH variables
@@ -67,7 +67,7 @@ index c1cc440..134e128 100644
 1.8.3.4
 
 
-From 60b48baf8bd582d783bc12df7d968c166297617b Mon Sep 17 00:00:00 2001
+From cab8b76a94407e51e0a9c665b53f28588e003a8b Mon Sep 17 00:00:00 2001
 From: Ingo Weinhold <ingo_weinhold@gmx.de>
 Date: Sat, 9 Nov 2013 02:35:20 +0100
 Subject: PLATFORM_API_HaikuOS_PCM.cpp: Fix SoundConsumer include
@@ -91,7 +91,7 @@ index ec111fc..d69c6a9 100644
 1.8.3.4
 
 
-From 4da954b7d748decbf8120cb4953a67babbc2ab96 Mon Sep 17 00:00:00 2001
+From f8a888057bba2123556300ca7cb200ff6b0f3186 Mon Sep 17 00:00:00 2001
 From: Ingo Weinhold <ingo_weinhold@gmx.de>
 Date: Sat, 9 Nov 2013 14:52:36 +0100
 Subject: Fix freetype paths for Haiku
@@ -116,7 +116,7 @@ index a478f97..c0dc0d0 100644
 1.8.3.4
 
 
-From 99858f834541b5934ca8b34b30c8c43adf2f98f8 Mon Sep 17 00:00:00 2001
+From aad23df8dd37db1f0b5c3cd82cb90bb3f23e303f Mon Sep 17 00:00:00 2001
 From: Ingo Weinhold <ingo_weinhold@gmx.de>
 Date: Sat, 9 Nov 2013 14:53:56 +0100
 Subject: HaikuFontManager: Use BPathFinder API to find font dirs
@@ -165,7 +165,7 @@ index a645d00..66af9ab 100644
 1.8.3.4
 
 
-From 8951c824cd602b066bb51895be71c407c86a8578 Mon Sep 17 00:00:00 2001
+From dcfb77462ec97c8b72c746dcb3d18bf2d488fe62 Mon Sep 17 00:00:00 2001
 From: Ingo Weinhold <ingo_weinhold@gmx.de>
 Date: Tue, 26 Nov 2013 17:50:46 +0100
 Subject: Make use of $ORIGIN in rpath now supported in Haiku
@@ -233,3 +233,27 @@ index bb0db1e..74e744e 100644
 -- 
 1.8.3.4
 
+
+From d71b1d303b0b6681b76c7557eec6e581734e0a7c Mon Sep 17 00:00:00 2001
+From: Ingo Weinhold <ingo_weinhold@gmx.de>
+Date: Wed, 4 Dec 2013 03:23:53 +0100
+Subject: make/java/java/Makefile: Missing generated classes
+
+Add AUTO_FILES_JAVA_DIRS, so that the auto-generated classes are
+picked up.
+
+diff --git a/make/java/java/Makefile b/make/java/java/Makefile
+index 93878e6..bd94e8f 100644
+--- a/make/java/java/Makefile
++++ b/make/java/java/Makefile
+@@ -59,6 +59,7 @@ endif
+ include FILES_c.gmk
+ include FILES_java.gmk
+ include Exportedfiles.gmk
++AUTO_FILES_JAVA_DIRS = java/lang
+ 
+ ifeq ($(PLATFORM),windows)
+ FILES_java += 	java/io/Win32FileSystem.java \
+-- 
+1.8.3.4
+
diff --git a/dev-lang/openjdk/sources/java-config.in b/dev-lang/openjdk/sources/java-config.in
new file mode 100644
index 000000000..cd2f1b4c9
--- /dev/null
+++ b/dev-lang/openjdk/sources/java-config.in
@@ -0,0 +1,37 @@
+#!/bin/sh
+
+
+javaHome="%JAVA_HOME%"
+
+
+printUsage()
+{
+	cat <<EOF
+Usage: java-config <option>
+Print java configuration values.
+
+Options:
+  -h, --help  - Print this help text.
+  -H          - Print Java home path.
+EOF
+}
+
+
+if [ $# -ne 1 ]; then
+	printUsage >&2
+	exit 1
+fi
+
+case "$1" in
+	-H)
+		echo $javaHome
+		;;
+	-h|--help)
+		printUsage
+		exit 0
+		;;
+	*)
+		printUsage >&2
+		exit 1
+		;;
+esac
diff --git a/dev-libs/glib/glib-2.38.1.recipe b/dev-libs/glib/glib-2.38.1.recipe
index 7c08ac00c..d59d3791c 100644
--- a/dev-libs/glib/glib-2.38.1.recipe
+++ b/dev-libs/glib/glib-2.38.1.recipe
@@ -43,11 +43,10 @@ PROVIDES="
 
 REQUIRES="
 	haiku$secondaryArchSuffix >= $haikuVersion
-	lib:gettext
+	gettext
 	lib:libiconv
 	lib:libz
 	lib:libffi$secondaryArchSuffix
-	lib:gettext
 	lib:libintl
 	"
 
@@ -72,20 +71,13 @@ BUILD_PREREQUIRES="
 
 PATCHES="glib-2.38.1.patch"
 
-PATCH()
-{
-	sed -i 's/#error No _g_get_unix_mounts() implementation for system/\/* #error No _g_get_unix_mounts() implementation for system *\//' gio/gunixmounts.c
-	sed -i 's/#error No g_get_mount_table() implementation for system/\/* #error No g_get_mount_table() implementation for system *\//' gio/gunixmounts.c
-}
-
-
 BUILD()
 {
 	libtoolize --force --copy --install
 	aclocal
 	autoconf
 	runConfigure ./configure
-	make
+	make $jobArgs
 }
 
 INSTALL()
@@ -97,13 +89,15 @@ INSTALL()
 					libgmodule-2.0 \
 					libgobject-2.0 \
 					libgthread-2.0
+
+	# move the glibconfig header into devel as well
+	mv $libDir/glib-2.0 $developLibDir
+
 	fixPkgconfig
 
 	# devel package
 	packageEntries devel \
-#		$binDir \
-		$developDir \
-		$manDir/man3
+		$developDir
 }
 
 # ----- devel package -------------------------------------------------------
diff --git a/dev-libs/glib/patches/glib-2.38.1.patch b/dev-libs/glib/patches/glib-2.38.1.patch
index ba2696037..2c0beba7e 100644
--- a/dev-libs/glib/patches/glib-2.38.1.patch
+++ b/dev-libs/glib/patches/glib-2.38.1.patch
@@ -1,5 +1,5 @@
 diff --git a/configure.ac b/configure.ac
-index f0840d5..856fac7 100644
+index f0840d5..f7df259 100644
 --- a/configure.ac
 +++ b/configure.ac
 @@ -122,6 +122,10 @@ case $host in
@@ -24,15 +24,17 @@ index f0840d5..856fac7 100644
         ;;
      *-solaris*)
        # These compiler/linker flags work with both Sun Studio and gcc
-@@ -2232,7 +2236,7 @@ if test "x$G_THREAD_LIBS" = xerror; then
+@@ -2232,8 +2236,8 @@ if test "x$G_THREAD_LIBS" = xerror; then
  fi
  
  case $host in
 -  *-*-beos*)
+-    G_THREAD_LIBS="-lbe -lroot -lglib-2.0 "
 +  *-*-beos*|*-*-haiku*)
-     G_THREAD_LIBS="-lbe -lroot -lglib-2.0 "
++    G_THREAD_LIBS="-lbe -lroot"
      G_THREAD_LIBS_EXTRA="-L\$(top_builddir_full)/.libs"
      ;;
+   *)
 @@ -3574,6 +3578,9 @@ case $host in
    *-*-beos*)
      glib_os="#define G_OS_BEOS"
@@ -43,10 +45,227 @@ index f0840d5..856fac7 100644
    *-*-cygwin*)
      glib_os="#define G_OS_UNIX
  #define G_PLATFORM_WIN32
+diff --git a/gio/data-to-c.pl b/gio/data-to-c.pl
+index 20ba2fb..539b7e0 100755
+--- a/gio/data-to-c.pl
++++ b/gio/data-to-c.pl
+@@ -1,4 +1,4 @@
+-#!/usr/bin/perl
++#!/usr/bin/env perl
+ 
+ # Copyright © 2011 Red Hat, Inc
+ #
+diff --git a/gio/gapplicationcommandline.c b/gio/gapplicationcommandline.c
+index 9a0840f..896a889 100644
+--- a/gio/gapplicationcommandline.c
++++ b/gio/gapplicationcommandline.c
+@@ -29,7 +29,7 @@
+ #include <string.h>
+ #include <stdio.h>
+ 
+-#ifdef G_OS_UNIX
++#if defined(G_OS_UNIX) || defined(G_OS_HAIKU)
+ #include "gunixinputstream.h"
+ #endif
+ 
+@@ -201,7 +201,7 @@ g_application_command_line_real_printerr_literal (GApplicationCommandLine *cmdli
+ static GInputStream *
+ g_application_command_line_real_get_stdin (GApplicationCommandLine *cmdline)
+ {
+-#ifdef G_OS_UNIX
++#if defined(G_OS_UNIX) || defined(G_OS_HAIKU)
+   return g_unix_input_stream_new (0, FALSE);
+ #else
+   return g_win32_input_stream_new (GetStdHandle (STD_INPUT_HANDLE), FALSE);
+diff --git a/gio/gdbusauthmechanismsha1.c b/gio/gdbusauthmechanismsha1.c
+index e4f75eb..2c70803 100644
+--- a/gio/gdbusauthmechanismsha1.c
++++ b/gio/gdbusauthmechanismsha1.c
+@@ -252,7 +252,7 @@ ensure_keyring_directory (GError **error)
+     {
+       if (g_getenv ("G_DBUS_COOKIE_SHA1_KEYRING_DIR_IGNORE_PERMISSION") == NULL)
+         {
+-#ifdef G_OS_UNIX
++#if defined(G_OS_UNIX) || defined(G_OS_HAIKU)
+           struct stat statbuf;
+           if (stat (path, &statbuf) != 0)
+             {
+@@ -947,7 +947,7 @@ mechanism_server_initiate (GDBusAuthMechanism   *mechanism,
+ 
+   if (initial_response != NULL && strlen (initial_response) > 0)
+     {
+-#ifdef G_OS_UNIX
++#if defined(G_OS_UNIX) || defined(G_OS_HAIKU)
+       gint64 uid;
+       gchar *endp;
+ 
+@@ -1114,7 +1114,7 @@ mechanism_client_initiate (GDBusAuthMechanism   *mechanism,
+ 
+   *out_initial_response_len = -1;
+ 
+-#ifdef G_OS_UNIX
++#if defined(G_OS_UNIX) || defined(G_OS_HAIKU)
+   initial_response = g_strdup_printf ("%" G_GINT64_FORMAT, (gint64) getuid ());
+ #elif defined (G_OS_WIN32)
+ initial_response = _g_dbus_win32_get_user_sid ();
+diff --git a/gio/glocalfile.c b/gio/glocalfile.c
+index 345214d..11eae36 100644
+--- a/gio/glocalfile.c
++++ b/gio/glocalfile.c
+@@ -27,7 +27,7 @@
+ #include <string.h>
+ #include <errno.h>
+ #include <fcntl.h>
+-#if G_OS_UNIX
++#if HAVE_DIRENT_H
+ #include <dirent.h>
+ #endif
+ #ifdef HAVE_UNISTD_H
+@@ -67,7 +67,7 @@
+ #include "gioerror.h"
+ #include <glib/gstdio.h>
+ #include "glibintl.h"
+-#ifdef G_OS_UNIX
++#if defined(G_OS_UNIX) || defined(G_OS_HAIKU)
+ #include "glib-unix.h"
+ #endif
+ #include "glib-private.h"
+@@ -1818,7 +1818,7 @@ _g_local_file_has_trash_dir (const char *dirname, dev_t dir_dev)
+   return res;
+ }
+ 
+-#ifdef G_OS_UNIX
++#if defined(G_OS_UNIX) || defined(G_OS_HAIKU)
+ gboolean
+ _g_local_file_is_lost_found_dir (const char *path, dev_t path_dev)
+ {
+diff --git a/gio/glocalfileinfo.h b/gio/glocalfileinfo.h
+index 6d35be5..e286098 100644
+--- a/gio/glocalfileinfo.h
++++ b/gio/glocalfileinfo.h
+@@ -58,7 +58,7 @@ typedef struct
+ 
+ gboolean   _g_local_file_has_trash_dir        (const char             *dirname,
+                                                dev_t                   dir_dev);
+-#ifdef G_OS_UNIX
++#if defined(G_OS_UNIX) || defined(G_OS_HAIKU)
+ gboolean   _g_local_file_is_lost_found_dir    (const char             *path,
+                                                dev_t                   path_dev);
+ #endif
+diff --git a/gio/gsocket.c b/gio/gsocket.c
+index 18e6137..689d3c0 100644
+--- a/gio/gsocket.c
++++ b/gio/gsocket.c
+@@ -29,7 +29,7 @@
+ 
+ #include "gsocket.h"
+ 
+-#ifdef G_OS_UNIX
++#if defined(G_OS_UNIX) || defined(G_OS_HAIKU)
+ #include "glib-unix.h"
+ #endif
+ 
+diff --git a/gio/gthreadedresolver.c b/gio/gthreadedresolver.c
+index 1ffaf15..702cf00 100644
+--- a/gio/gthreadedresolver.c
++++ b/gio/gthreadedresolver.c
+@@ -245,7 +245,7 @@ lookup_by_address_finish (GResolver     *resolver,
+ }
+ 
+ 
+-#if defined(G_OS_UNIX)
++#if defined(G_OS_UNIX) || defined(G_OS_HAIKU)
+ 
+ #ifdef __BIONIC__
+ /* Copy from bionic/libc/private/arpa_nameser_compat.h
+@@ -813,7 +813,7 @@ do_lookup_records (GTask         *task,
+   GList *records;
+   GError *error = NULL;
+ 
+-#if defined(G_OS_UNIX)
++#if defined(G_OS_UNIX) || defined(G_OS_HAIKU)
+   gint len = 512;
+   gint herr;
+   GByteArray *answer;
+diff --git a/gio/gunixmounts.c b/gio/gunixmounts.c
+index 03f1720..cb438a4 100644
+--- a/gio/gunixmounts.c
++++ b/gio/gunixmounts.c
+@@ -72,7 +72,6 @@
+ #include "glibintl.h"
+ #include "gthemedicon.h"
+ 
+-
+ #ifdef HAVE_MNTENT_H
+ static const char *_resolve_dev_root (void);
+ #endif
+@@ -716,6 +715,18 @@ _g_get_unix_mounts (void)
+ 
+   return return_list;
+ }
++#elif defined(G_OS_HAIKU)
++static char *
++get_mtab_monitor_file (void)
++{
++  return NULL;
++}
++
++static GList *
++_g_get_unix_mounts (void)
++{
++  return NULL;
++}
+ #else
+ #error No _g_get_unix_mounts() implementation for system
+ #endif
+@@ -1106,7 +1117,7 @@ _g_get_unix_mount_points (void)
+   
+   return g_list_reverse (return_list);
+ }
+-#elif defined(__INTERIX)
++#elif defined(__INTERIX) || defined(G_OS_HAIKU)
+ static GList *
+ _g_get_unix_mount_points (void)
+ {
+diff --git a/glib/gbacktrace.c b/glib/gbacktrace.c
+index 4d19d6f..1c46778 100644
+--- a/glib/gbacktrace.c
++++ b/glib/gbacktrace.c
+@@ -228,7 +228,7 @@ g_on_error_query (const gchar *prg_name)
+ void
+ g_on_error_stack_trace (const gchar *prg_name)
+ {
+-#if defined(G_OS_UNIX) || defined(G_OS_BEOS)
++#if defined(G_OS_UNIX) || defined(G_OS_BEOS) || defined(G_OS_HAIKU)
+   pid_t pid;
+   gchar buf[16];
+   gchar *args[4] = { "gdb", NULL, NULL, NULL };
+diff --git a/glib/glib-unix.h b/glib/glib-unix.h
+index 66ccf74..a03a0cf 100644
+--- a/glib/glib-unix.h
++++ b/glib/glib-unix.h
+@@ -34,7 +34,7 @@
+ 
+ #include <glib.h>
+ 
+-#ifndef G_OS_UNIX
++#if !defined(G_OS_UNIX) && !defined(G_OS_HAIKU)
+ #error "This header may only be used on UNIX"
+ #endif
+ 
 diff --git a/glib/gmain.c b/glib/gmain.c
-index 738e69c..564c6cf 100644
+index 738e69c..4f5dfab 100644
 --- a/glib/gmain.c
 +++ b/glib/gmain.c
+@@ -47,7 +47,7 @@
+ #define G_MAIN_POLL_DEBUG
+ #endif
+ 
+-#ifdef G_OS_UNIX
++#if defined(G_OS_UNIX) || defined(G_OS_HAIKU)
+ #include "glib-unix.h"
+ #include <pthread.h>
+ #ifdef HAVE_EVENTFD
 @@ -73,10 +73,11 @@
  #include <windows.h>
  #endif /* G_OS_WIN32 */
@@ -61,6 +280,82 @@ index 738e69c..564c6cf 100644
  
  #include "gmain.h"
  
+@@ -391,7 +392,7 @@ static gboolean g_child_watch_dispatch (GSource     *source,
+ 					GSourceFunc  callback,
+ 					gpointer     user_data);
+ static void     g_child_watch_finalize (GSource     *source);
+-#ifdef G_OS_UNIX
++#if defined(G_OS_UNIX) || defined(G_OS_HAIKU)
+ static void g_unix_signal_handler (int signum);
+ static gboolean g_unix_signal_watch_prepare  (GSource     *source,
+ 					      gint        *timeout);
+@@ -2259,7 +2260,7 @@ g_source_remove_by_funcs_user_data (GSourceFuncs *funcs,
+     return FALSE;
+ }
+ 
+-#ifdef G_OS_UNIX
++#if defined(G_OS_UNIX) || defined(G_OS_HAIKU)
+ /**
+  * g_source_add_unix_fd:
+  * @source: a #GSource
+@@ -2425,7 +2426,7 @@ g_source_query_unix_fd (GSource  *source,
+ 
+   return poll_fd->revents;
+ }
+-#endif /* G_OS_UNIX */
++#endif /* G_OS_UNIX || G_OS_HAIKU */
+ 
+ /**
+  * g_get_current_time:
+@@ -5471,7 +5472,7 @@ glib_worker_main (gpointer data)
+     {
+       g_main_context_iteration (glib_worker_context, TRUE);
+ 
+-#ifdef G_OS_UNIX
++#if defined(G_OS_UNIX) || defined(G_OS_HAIKU)
+       if (any_unix_signal_pending)
+         dispatch_unix_signals ();
+ #endif
+@@ -5488,7 +5489,7 @@ g_get_worker_context (void)
+   if (g_once_init_enter (&initialised))
+     {
+       /* mask all signals in the worker thread */
+-#ifdef G_OS_UNIX
++#if defined(G_OS_UNIX) || defined(G_OS_HAIKU)
+       sigset_t prev_mask;
+       sigset_t all;
+ 
+@@ -5497,7 +5498,7 @@ g_get_worker_context (void)
+ #endif
+       glib_worker_context = g_main_context_new ();
+       g_thread_new ("gmain", glib_worker_main, NULL);
+-#ifdef G_OS_UNIX
++#if defined(G_OS_UNIX) || defined(G_OS_HAIKU)
+       pthread_sigmask (SIG_SETMASK, &prev_mask, NULL);
+ #endif
+       g_once_init_leave (&initialised, TRUE);
+diff --git a/glib/gmain.h b/glib/gmain.h
+index c455353..ad7b330 100644
+--- a/glib/gmain.h
++++ b/glib/gmain.h
+@@ -471,7 +471,7 @@ void                 g_source_set_ready_time (GSource        *source,
+ GLIB_AVAILABLE_IN_2_36
+ gint64               g_source_get_ready_time (GSource        *source);
+ 
+-#ifdef G_OS_UNIX
++#if defined(G_OS_UNIX) || defined(G_OS_HAIKU)
+ GLIB_AVAILABLE_IN_2_36
+ gpointer             g_source_add_unix_fd    (GSource        *source,
+                                               gint            fd,
+@@ -606,7 +606,7 @@ void     g_main_context_invoke      (GMainContext   *context,
+ GLIB_VAR GSourceFuncs g_timeout_funcs;
+ GLIB_VAR GSourceFuncs g_child_watch_funcs;
+ GLIB_VAR GSourceFuncs g_idle_funcs;
+-#ifdef G_OS_UNIX
++#if defined(G_OS_UNIX) || defined(G_OS_HAIKU)
+ GLIB_VAR GSourceFuncs g_unix_signal_funcs;
+ GLIB_VAR GSourceFuncs g_unix_fd_source_funcs;
+ #endif
 diff --git a/glib/gstdio.c b/glib/gstdio.c
 index cca4ff5..6f4ae9c 100644
 --- a/glib/gstdio.c
@@ -75,10 +370,22 @@ index cca4ff5..6f4ae9c 100644
  #endif
  
 diff --git a/glib/gutils.c b/glib/gutils.c
-index 2620cb6..0b4ec6b 100644
+index 2620cb6..34f1edd 100644
 --- a/glib/gutils.c
 +++ b/glib/gutils.c
-@@ -421,7 +421,7 @@ g_find_program_in_path (const gchar *program)
+@@ -77,6 +77,11 @@
+ #include "gwin32.h"
+ #endif
+ 
++#if defined(G_OS_HAIKU)
++#include <FindDirectory.h>
++#include <fs_info.h>
++#endif
++
+ 
+ /**
+  * SECTION:misc_utils
+@@ -421,7 +426,7 @@ g_find_program_in_path (const gchar *program)
      }
    
    path = g_getenv ("PATH");
@@ -87,3 +394,40 @@ index 2620cb6..0b4ec6b 100644
    if (path == NULL)
      {
        /* There is no 'PATH' in the environment.  The default
+@@ -1467,6 +1472,36 @@ load_user_special_dirs (void)
+ 
+ #endif /* HAVE_CARBON */
+ 
++#if defined(G_OS_HAIKU)
++static void
++load_user_special_dirs (void)
++{
++  char path[B_PATH_NAME_LENGTH + B_FILE_NAME_LENGTH];
++
++  dev_t volume = dev_for_path("/boot");
++  if (find_directory(B_DESKTOP_DIRECTORY, volume, false, path, sizeof(path))
++      == B_OK) {
++    g_user_special_dirs[G_USER_DIRECTORY_DESKTOP] = g_strdup(path);
++    g_user_special_dirs[G_USER_DIRECTORY_DOWNLOAD] = g_strdup(path);
++  } else {
++    g_user_special_dirs[G_USER_DIRECTORY_DOCUMENTS] = NULL;
++    g_user_special_dirs[G_USER_DIRECTORY_DESKTOP] = NULL;
++  }
++
++  if (find_directory(B_USER_DIRECTORY, volume, false, path, sizeof(path))
++      == B_OK) {
++    g_user_special_dirs[G_USER_DIRECTORY_DOCUMENTS] = g_strdup(path);
++  } else
++    g_user_special_dirs[G_USER_DIRECTORY_DOWNLOAD] = NULL;
++
++  g_user_special_dirs[G_USER_DIRECTORY_MUSIC] = NULL;
++  g_user_special_dirs[G_USER_DIRECTORY_PICTURES] = NULL;
++  g_user_special_dirs[G_USER_DIRECTORY_PUBLIC_SHARE] = NULL;
++  g_user_special_dirs[G_USER_DIRECTORY_TEMPLATES] = NULL;
++  g_user_special_dirs[G_USER_DIRECTORY_VIDEOS] = NULL;
++}
++#endif /* G_OS_HAIKU */
++
+ #if defined(G_OS_WIN32)
+ static void
+ load_user_special_dirs (void)
diff --git a/dev-libs/libcss/libcss-0.2.0_HEAD.recipe b/dev-libs/libcss/libcss-0.2.0_HEAD.recipe
index bf8c96cf7..630629e2b 100644
--- a/dev-libs/libcss/libcss-0.2.0_HEAD.recipe
+++ b/dev-libs/libcss/libcss-0.2.0_HEAD.recipe
@@ -5,12 +5,14 @@ REVISION="1"
 STATUS_HAIKU="stable"
 DEPEND="dev-libs/libparserutils >= 0.1.1"
 
-BUILD {
+BUILD()
+{
 	cd libcss-0.2.0-HEAD
 	make PREFIX=/boot/common
 }
 
-INSTALL {
+INSTALL()
+{
 	cd libcss-0.2.0-HEAD
 	make install PREFIX=/boot/common
 }
diff --git a/dev-libs/libparserutils/libparserutils-0.1.2_HEAD.recipe b/dev-libs/libparserutils/libparserutils-0.1.2_HEAD.recipe
index cfe926525..f05444ead 100644
--- a/dev-libs/libparserutils/libparserutils-0.1.2_HEAD.recipe
+++ b/dev-libs/libparserutils/libparserutils-0.1.2_HEAD.recipe
@@ -5,12 +5,14 @@ REVISION="1"
 STATUS_HAIKU="stable"
 DEPEND="dev-util/buildsystem >= 0.0.1"
 
-BUILD {
+BUILD()
+{
 	cd libparserutils-0.1.2-HEAD
 	make PREFIX=/boot/common
 }
 
-INSTALL {
+INSTALL()
+{
 	cd libparserutils-0.1.2-HEAD
 	make install PREFIX=/boot/common
 }
diff --git a/dev-libs/libwapcaplet/libwapcaplet-0.2.0_HEAD.recipe b/dev-libs/libwapcaplet/libwapcaplet-0.2.0_HEAD.recipe
index 1f91e617d..24a190d2d 100644
--- a/dev-libs/libwapcaplet/libwapcaplet-0.2.0_HEAD.recipe
+++ b/dev-libs/libwapcaplet/libwapcaplet-0.2.0_HEAD.recipe
@@ -5,12 +5,14 @@ REVISION="1"
 STATUS_HAIKU="stable"
 DEPEND="dev-util/buildsystem >= 0"
 
-BUILD {
+BUILD()
+{
 	cd libwapcaplet-0.2.0-HEAD
 	make PREFIX=/boot/common
 }
 
-INSTALL {
+INSTALL()
+{
 	cd libwapcaplet-0.2.0-HEAD
 	make install PREFIX=/boot/common
 }
diff --git a/dev-util/buildsystem/buildsystem-1.0_HEAD.recipe b/dev-util/buildsystem/buildsystem-1.0_HEAD.recipe
index 7a2f6bd08..9ea205843 100644
--- a/dev-util/buildsystem/buildsystem-1.0_HEAD.recipe
+++ b/dev-util/buildsystem/buildsystem-1.0_HEAD.recipe
@@ -4,12 +4,14 @@ SRC_URI="git://git.netsurf-browser.org/buildsystem.git"
 REVISION="1"
 STATUS_HAIKU="stable"
 
-BUILD {
+BUILD()
+{
 	cd buildsystem-1.0-HEAD
 	make
 }
 
-INSTALL {
+INSTALL()
+{
 	cd buildsystem-1.0-HEAD
 	make install PREFIX=/boot/common/
 }
diff --git a/dev-util/pkgconfig/pkgconfig-0.28.recipe b/dev-util/pkgconfig/pkgconfig-0.28.recipe
index 631471ba4..1d63e08e0 100644
--- a/dev-util/pkgconfig/pkgconfig-0.28.recipe
+++ b/dev-util/pkgconfig/pkgconfig-0.28.recipe
@@ -5,7 +5,8 @@ CHECKSUM_MD5="aa3c86e67551adc3ac865160e34a2a0d"
 REVISION="1"
 STATUS_HAIKU="stable"
 DEPEND=""
-BUILD {
+BUILD()
+{
 	# because we patched configure.ac...
 	cd pkg-config-0.28/glib
 	autoreconf -i -f
@@ -22,7 +23,8 @@ BUILD {
 	make
 }
 
-INSTALL {
+INSTALL()
+{
 	cd pkg-config-0.28
 	make install
 }
diff --git a/dev-vcs/mercurial/mercurial-2.8.recipe b/dev-vcs/mercurial/mercurial-2.8.1.recipe
similarity index 81%
rename from dev-vcs/mercurial/mercurial-2.8.recipe
rename to dev-vcs/mercurial/mercurial-2.8.1.recipe
index e4fc40317..46ea1cb8c 100644
--- a/dev-vcs/mercurial/mercurial-2.8.recipe
+++ b/dev-vcs/mercurial/mercurial-2.8.1.recipe
@@ -3,36 +3,37 @@ DESCRIPTION="Mercurial is a free, distributed source control management tool."
 HOMEPAGE="http://mercurial.selenic.com/"
 COPYRIGHT="2005-2012 Matt Mackall et al."
 LICENSE="GNU GPL v2"
-SRC_URI="http://mercurial.selenic.com/release/mercurial-2.8.tar.gz"
-CHECKSUM_MD5="76b565f48000e9f331356ab107a5bcbb"
+SRC_URI="http://mercurial.selenic.com/release/mercurial-2.8.1.tar.gz"
+CHECKSUM_MD5="bede5869f9b5d09ab3269bac472495e7"
 REVISION="1"
 ARCHITECTURES="x86_gcc2 x86 x86_64"
 
-PATCHES="mercurial-2.8.patch"
+PATCHES="mercurial-2.8.1.patch"
 
 PROVIDES="
 	mercurial = $portVersion compat >= 2
 	cmd:hg = $portVersion compat >= 2
 	"
+
 REQUIRES="
 	haiku_devel >= $haikuVersion
 	cmd:python
 	cmd:nano
-	lib:libintl
 	"
+
 BUILD_REQUIRES="
-	"
-BUILD_PREREQUIRES="
 	haiku_devel >= $haikuVersion
+	"
+
+BUILD_PREREQUIRES="
 	cmd:python
 	cmd:gcc
 	cmd:gettext
 	cmd:ld
 	cmd:make
+	cmd:msgfmt
 	"
 
-SOURCE_DIR="$portVersionedName"
-
 BUILD()
 {
 	$portPackageLinksDir/cmd~python/bin/python setup.py build --force
diff --git a/dev-vcs/mercurial/patches/mercurial-2.8.patch b/dev-vcs/mercurial/patches/mercurial-2.8.1.patch
similarity index 57%
rename from dev-vcs/mercurial/patches/mercurial-2.8.patch
rename to dev-vcs/mercurial/patches/mercurial-2.8.1.patch
index 734c4b759..edfe44133 100644
--- a/dev-vcs/mercurial/patches/mercurial-2.8.patch
+++ b/dev-vcs/mercurial/patches/mercurial-2.8.1.patch
@@ -1,6 +1,6 @@
-diff -up mercurial-2.8/mercurial/ui.py.orig mercurial-2.8/mercurial/ui.py
---- mercurial-2.8/mercurial/ui.py.orig	2012-06-01 22:48:21.025690112 -0600
-+++ mercurial-2.8/mercurial/ui.py	2012-06-04 17:15:16.317980672 -0600
+diff -up mercurial-2.8.1/mercurial/ui.py.orig mercurial-2.8.1/mercurial/ui.py
+--- mercurial-2.8.1/mercurial/ui.py.orig	2012-06-01 22:48:21.025690112 -0600
++++ mercurial-2.8.1/mercurial/ui.py	2012-06-04 17:15:16.317980672 -0600
 @@ -693,7 +693,7 @@ class ui(object):
              # avoid confusion.
              editor = 'E'
diff --git a/games-engines/scummvm/patches/scummvm_haiku.diff b/games-engines/scummvm/patches/scummvm_haiku.diff
deleted file mode 100644
index 9f2d49e78..000000000
--- a/games-engines/scummvm/patches/scummvm_haiku.diff
+++ /dev/null
@@ -1,111 +0,0 @@
-Index: configure
-===================================================================
---- configure	(revision 35712)
-+++ configure	(working copy)
- -1052,11 +1052,23 @@
- 	beos*)
- 		DEFINES="$DEFINES -DUNIX -DSYSTEM_NOT_SUPPORTING_D_TYPE"
- 		# Needs -lbind -lsocket for the timidity MIDI driver
-+		LDFLAGS="-L/boot/home/config/lib"
-+		CFLAGS="-I/boot/home/config/include"
-+		CXXFLAGS="$CXXFLAGS -fhuge-objects"
- 		LIBS="$LIBS -lbind -lsocket"
- 		type_1_byte='char'
- 		type_2_byte='short'
- 		type_4_byte='long'
- 		;;	
-+	haiku*)
-+		DEFINES="$DEFINES -DUNIX -DSYSTEM_NOT_SUPPORTING_D_TYPE"
-+		# Needs -lnetwork for the timidity MIDI driver
-+		LIBS="$LIBS -lnetwork"
-+		CXXFLAGS="$CXXFLAGS -fhuge-objects"
-+		type_1_byte='char'
-+		type_2_byte='short'
-+		type_4_byte='long'
-+		;;	
- 	solaris*)
- 		DEFINES="$DEFINES -DUNIX -DSOLARIS -DSYSTEM_NOT_SUPPORTING_D_TYPE"
- 		# Needs -lbind -lsocket for the timidity MIDI driver
-Index: gui/ThemeData.h
-===================================================================
---- gui/ThemeData.h	(revision 35712)
-+++ gui/ThemeData.h	(working copy)
- -27,6 +27,7 @@
- #define GUI_THEME_DATA_H
- 
- #include "gui/ThemeEngine.h"
-+#include "graphics/VectorRenderer.h"
- 
- namespace GUI {
- 
-Index: config.guess
-===================================================================
---- config.guess	(revision 35712)
-+++ config.guess	(working copy)
- -1206,6 +1206,9 @@
-     BePC:BeOS:*:*)	# BeOS running on Intel PC compatible.
- 	echo i586-pc-beos
- 	exit ;;
-+    BePC:Haiku:*:*)	# BeOS running on Intel PC compatible.
-+	echo i586-pc-haiku
-+	exit ;;
-     SX-4:SUPER-UX:*:*)
- 	echo sx4-nec-superux${UNAME_RELEASE}
- 	exit ;;
-Index: config.sub
-===================================================================
---- config.sub	(revision 35712)
-+++ config.sub	(working copy)
- -1559,6 +1559,9 @@
- 			-beos*)
- 				vendor=be
- 				;;
-+			-haiku*)
-+				vendor=haiku
-+				;;
- 			-hpux*)
- 				vendor=hp
- 				;;
-Index: graphics/scaler/hq2x_i386.asm
-===================================================================
---- graphics/scaler/hq2x_i386.asm	(revision 35712)
-+++ graphics/scaler/hq2x_i386.asm	(working copy)
- -1841,7 +1841,7 @@
-     dd ..@flag0,  ..@flag0,  ..@flag0,  ..@flag0
- 
- 
--%ifidn __OUTPUT_FORMAT__,elf
--section .note.GNU-stack noalloc noexec nowrite progbits
--%endif
-+# %ifidn __OUTPUT_FORMAT__,elf
-+# section .note.GNU-stack noalloc noexec nowrite progbits
-+# %endif
- 
-Index: graphics/scaler/hq3x_i386.asm
-===================================================================
---- graphics/scaler/hq3x_i386.asm	(revision 35712)
-+++ graphics/scaler/hq3x_i386.asm	(working copy)
- -2433,7 +2433,7 @@
-     dd ..@flag0,  ..@flag0,  ..@flag0,  ..@flag0
- 
- 
--%ifidn __OUTPUT_FORMAT__,elf
--section .note.GNU-stack noalloc noexec nowrite progbits
--%endif
-+# %ifidn __OUTPUT_FORMAT__,elf
-+# section .note.GNU-stack noalloc noexec nowrite progbits
-+# %endif
- 
-Index: graphics/surface.h
-===================================================================
---- graphics/surface.h	(revision 35712)
-+++ graphics/surface.h	(working copy)
- -47,7 +47,7 @@
- 	Surface() : w(0), h(0), pitch(0), pixels(0), bytesPerPixel(0) {}
- 
- 	inline const void *getBasePtr(int x, int y) const {
--		return static_cast<const byte *>(pixels) + y * pitch + x * bytesPerPixel;
-+		return (const byte *)(pixels) + y * pitch + x * bytesPerPixel;
- 	}
- 
- 	inline void *getBasePtr(int x, int y) {
\ No newline at end of file
diff --git a/games-engines/scummvm/scummvm-1.6.0.recipe b/games-engines/scummvm/scummvm-1.6.0.recipe
new file mode 100644
index 000000000..35eb39b2b
--- /dev/null
+++ b/games-engines/scummvm/scummvm-1.6.0.recipe
@@ -0,0 +1,55 @@
+SUMMARY="Script Creation Utility for Maniac Mansion Virtual Machine"
+DESCRIPTION="ScummVM is a program which allows you to run certain classic graphical point-and-click adventure games, provided you already have their data files. The clever part about this: ScummVM just replaces the executables shipped with the games, allowing you to play them on systems for which they were never designed!
+"
+HOMEPAGE="http://scummvm.org"
+SRC_URI="http://prdownloads.sourceforge.net/scummvm/scummvm-1.6.0.tar.bz2?download"
+CHECKSUM_MD5="473c151ff44e3db7b603ecacd800a0d2"
+REVISION="1"
+LICENSE="GNU GPL v2"
+COPYRIGHT="2001-2013 ScummVM Team"
+
+ARCHITECTURES="x86 ?x86_64"
+SECONDARY_ARCHITECTURES="x86 ?x86_64"
+
+PROVIDES="
+	scummvm = $portVersion
+	app:scummvm = $portVersion
+"
+REQUIRES="
+	haiku$secondaryArchSuffix >= $haikuVersion
+	lib:libSDL$secondaryArchSuffix
+	lib:libz$secondaryArchSuffix
+	lib:libogg$secondaryArchSuffix
+	lib:libvorbis$secondaryArchSuffix
+"
+BUILD_REQUIRES="
+	haiku${secondaryArchSuffix}_devel >= $haikuVersion
+	devel:libSDL$secondaryArchSuffix
+	devel:libz$secondaryArchSuffix
+	devel:libogg$secondaryArchSuffix
+	devel:libvorbis$secondaryArchSuffix
+	devel:libglu$secondaryArchSuffix
+"
+BUILD_PREREQUIRES="
+	cmd:make
+	cmd:gcc$secondaryArchSuffix
+	cmd:ld$secondaryArchSuffix
+	cmd:nasm$secondaryArchSuffix
+	cmd:libtoolize
+"
+
+SOURCE_DIR="scummvm-1.6.0"
+
+BUILD()
+{
+	libtoolize --force --copy --install
+	./configure --prefix=$prefix --bindir=$appsDir --libdir=$libDir --datarootdir=$dataDir --mandir=$manDir --docdir=$docDir \
+		--enable-release
+	make
+}
+INSTALL()
+{
+	make install
+	
+	addAppDeskbarSymlink $appsDir/scummvm
+}
diff --git a/haiku-apps/a_book/a_book-1.1.recipe b/haiku-apps/a_book/a_book-1.1.recipe
index ea824cf2b..6beaec2c8 100644
--- a/haiku-apps/a_book/a_book-1.1.recipe
+++ b/haiku-apps/a_book/a_book-1.1.recipe
@@ -1,14 +1,18 @@
-DESCRIPTION="A small calendar application with reminders. You can use this app to organize your time. The application supports the addition to each day tasks with the appropriate hours and browse all of them. Your job will be saved to a file when the application is closed."
 SUMMARY="A small calendar application with reminders."
+DESCRIPTION="
+A small calendar application with reminders. You can use this app to
+organize your time. The application supports the addition to each day
+tasks with the appropriate hours and browse all of them. Your job will
+be saved to a file when the application is closed."
 HOMEPAGE="https://github.com/HaikuArchives/A-Book"
-SRC_URI="git+https://github.com/HaikuArchives/A-Book.git"
-REVISION="1"
+SRC_URI="git+https://github.com/HaikuArchives/A-Book.git#fe6c66c631"
+REVISION="2"
 
 COPYRIGHT="2002 Maurice Michalski"
 
 LICENSE="MIT"
 
-ARCHITECTURES="x86_gcc2 ?x86 ?x86_64"
+ARCHITECTURES="x86_gcc2 x86 ?x86_64"
 
 PROVIDES="
 	a_book = $portVersion
@@ -19,22 +23,28 @@ REQUIRES="
 	haiku >= $haikuVersion
 	"
 
-BUILD_PREREQUIRES="
+BUILD_REQUIRES="
 	haiku_devel >= $haikuVersion
+	"
+
+BUILD_PREREQUIRES="
 	makefile_engine
 	cmd:gcc
 	cmd:make
 	cmd:mkdepend
 	"
 
+PATCHES="a_book-1.1.patchset"
+
 BUILD()
 {
-	make BUILDHOME=`finddir B_SYSTEM_DEVELOP_DIRECTORY`
+	make OBJ_DIR=objects \
+		BUILDHOME=`finddir B_SYSTEM_DEVELOP_DIRECTORY`
 }
 
 INSTALL()
 {
 	mkdir -p $appsDir
-	cp objects.x86-gcc2-release/A-Book $appsDir
+	cp -a objects/A-Book $appsDir
 	addAppDeskbarSymlink $appsDir/A-Book
 }
diff --git a/haiku-apps/a_book/patches/a_book-1.1.patchset b/haiku-apps/a_book/patches/a_book-1.1.patchset
new file mode 100644
index 000000000..b126dbe85
--- /dev/null
+++ b/haiku-apps/a_book/patches/a_book-1.1.patchset
@@ -0,0 +1,22 @@
+From 2c7f24af4d3a0336d40a48155556527cdfc6362a Mon Sep 17 00:00:00 2001
+From: Chris Roberts <cpr420@gmail.com>
+Date: Mon, 2 Dec 2013 17:30:53 -0700
+Subject: Fix makefile stdc++ libs
+
+
+diff --git a/makefile b/makefile
+index a28bcd4..1c0d18d 100644
+--- a/makefile
++++ b/makefile
+@@ -56,7 +56,7 @@ RSRCS=
+ #		naming scheme you need to specify the path to the library
+ #		and it's name
+ #		library: my_lib.a entry: my_lib.a or path/my_lib.a
+-LIBS=be
++LIBS=be $(STDCPPLIBS)
+ 
+ #	specify additional paths to directories following the standard
+ #	libXXX.so or libXXX.a naming scheme.  You can specify full paths
+-- 
+1.8.3.4
+
diff --git a/haiku-apps/album/album-0.9.2.recipe b/haiku-apps/album/album-0.9.2.recipe
index 2418f3592..284b0c929 100644
--- a/haiku-apps/album/album-0.9.2.recipe
+++ b/haiku-apps/album/album-0.9.2.recipe
@@ -1,18 +1,20 @@
-SUMMARY="An image viewer/organiser designed for BeOS-compatible operating systems."
-DESCRIPTION="Album is a file browsing and tagging utility for BeOS and compatibles. It
-started out with a goal of the ultimate image organiser (code named Aberration), but ended
-up as something much more modest and BeOS-specific. The idea is to have a work pad for
-pictures from different locations where they can be previewed and tagged in one place. The
-program is not limited to picture files and BFS (Be File System) volumes, although that
-further limits whatever the usefulness since much of the functionality has to do with file
+SUMMARY="An image viewer/organiser designed for BeOS-compatible systems."
+DESCRIPTION="
+Album is a file browsing and tagging utility for BeOS and compatibles.
+It started out with a goal of the ultimate image organiser (code
+named Aberration), but ended up as something much more modest and
+BeOS-specific. The idea is to have a work pad for pictures from
+different locations where they can be previewed and tagged in one
+place. The program is not limited to picture files and BFS (Be File
+System) volumes, although that further limits whatever the usefulness
+since much of the functionality has to do with file
 attributes."
 HOMEPAGE="http://users.volja.net/mkovac1/proj/album/"
-SRC_URI="git://github.com/HaikuArchives/Album"
-#CHECKSUM_MD5=" "
+SRC_URI="git://github.com/HaikuArchives/Album#64aa3371a9"
 LICENSE="MIT"
 COPYRIGHT="2006-2009 by Matjaž Kovač"
-REVISION="2"
-ARCHITECTURES="x86_gcc2 ?x86 ?x86_64"
+REVISION="3"
+ARCHITECTURES="x86_gcc2 x86 ?x86_64"
 PROVIDES="
 	Album = $portVersion
 	app:Album = $portVersion
@@ -22,34 +24,33 @@ REQUIRES="
 	haiku >= $haikuVersion
 	"
 
-BUILD_REQUIRES=" "
+BUILD_REQUIRES="
+	haiku_devel >= $haikuVersion
+	"
 
 BUILD_PREREQUIRES="
-	haiku_devel >= $haikuVersion
 	makefile_engine
 	cmd:gcc
 	cmd:make
 	cmd:mkdepend
 	"
 
-PATCHES="album-0.9.2.patch"
+PATCHES="album-0.9.2.patchset"
+
 USER_SETTINGS_FILES="
 	settings/Album_settings
 	"
 
-SOURCE_DIR="$portVersionedName/src"
-
 BUILD()
 {
-	make BUILDHOME=`finddir B_SYSTEM_DEVELOP_DIRECTORY`
+	cd src
+	make OBJ_DIR=objects \
+		BUILDHOME=`finddir B_SYSTEM_DEVELOP_DIRECTORY`
 }
 
 INSTALL()
 {
-	albumDir=$appsDir/Album
-	mkdir -p $albumDir
-
-	cp -a objects.x86-gcc2-debug/Album $albumDir
-
-	addAppDeskbarSymlink $albumDir/Album
+	mkdir -p $appsDir
+	cp -a src/objects/Album $appsDir
+	addAppDeskbarSymlink $appsDir/Album
 }
diff --git a/haiku-apps/album/patches/album-0.9.2.patch b/haiku-apps/album/patches/album-0.9.2.patch
deleted file mode 100644
index 71f819683..000000000
--- a/haiku-apps/album/patches/album-0.9.2.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-diff --git a/MainWindow.cpp b/MainWindow.cpp
-index 4fcb98a..66ed596 100644
---- a/MainWindow.cpp
-+++ b/MainWindow.cpp
-@@ -142,7 +142,7 @@ MainWindow::MainWindow(BRect frame, const char *title):
- 	
- 	// Create a tempory repository for negotiated drops from image ditors etc.
- 	BPath path;
--	if (find_directory(B_COMMON_TEMP_DIRECTORY, &path) == B_OK) {
-+	if (find_directory(B_SYSTEM_TEMP_DIRECTORY, &path) == B_OK) {
- 		path.Append("Album");
- 		if (create_directory(path.Path(), 0x777) == B_OK) {
- 			fRepository.SetTo(path.Path());
diff --git a/haiku-apps/album/patches/album-0.9.2.patchset b/haiku-apps/album/patches/album-0.9.2.patchset
new file mode 100644
index 000000000..14fffeab6
--- /dev/null
+++ b/haiku-apps/album/patches/album-0.9.2.patchset
@@ -0,0 +1,45 @@
+From 47be97d358d8db50026e107d94a63d15f39e7fb1 Mon Sep 17 00:00:00 2001
+From: Chris Roberts <cpr420@gmail.com>
+Date: Mon, 2 Dec 2013 17:23:41 -0700
+Subject: applying patch album-0.9.2.patch
+
+
+diff --git a/src/MainWindow.cpp b/src/MainWindow.cpp
+index 4fcb98a..66ed596 100644
+--- a/src/MainWindow.cpp
++++ b/src/MainWindow.cpp
+@@ -142,7 +142,7 @@ MainWindow::MainWindow(BRect frame, const char *title):
+ 	
+ 	// Create a tempory repository for negotiated drops from image ditors etc.
+ 	BPath path;
+-	if (find_directory(B_COMMON_TEMP_DIRECTORY, &path) == B_OK) {
++	if (find_directory(B_SYSTEM_TEMP_DIRECTORY, &path) == B_OK) {
+ 		path.Append("Album");
+ 		if (create_directory(path.Path(), 0x777) == B_OK) {
+ 			fRepository.SetTo(path.Path());
+-- 
+1.8.3.4
+
+
+From 8f2c953908de0b0e23ae027802902072b153c686 Mon Sep 17 00:00:00 2001
+From: Chris Roberts <cpr420@gmail.com>
+Date: Mon, 2 Dec 2013 17:27:22 -0700
+Subject: Fix makefile stdc++ libs
+
+
+diff --git a/src/makefile b/src/makefile
+index 02e892f..38f0454 100644
+--- a/src/makefile
++++ b/src/makefile
+@@ -63,7 +63,7 @@ RSRCS= Album.rsrc
+ #		naming scheme you need to specify the path to the library
+ #		and it's name
+ #		library: my_lib.a entry: my_lib.a or path/my_lib.a
+-LIBS=root be translation iptcdata
++LIBS=be translation iptcdata $(STDCPPLIBS)
+ 
+ #	specify additional paths to directories following the standard
+ #	libXXX.so or libXXX.a naming scheme.  You can specify full paths
+-- 
+1.8.3.4
+
diff --git a/haiku-apps/aplayer/aplayer-4.0_svn.recipe b/haiku-apps/aplayer/aplayer-4.0_svn.recipe
new file mode 100644
index 000000000..d886efaa0
--- /dev/null
+++ b/haiku-apps/aplayer/aplayer-4.0_svn.recipe
@@ -0,0 +1,57 @@
+SUMMARY="APlayer is a module player and can play a lot of different music file formats, from Amiga and elsewhere."
+DESCRIPTION="APlayer is a module player and can play a lot of different music file formats, from Amiga and elsewhere."
+HOMEPAGE="http://pulkomandy.tk/projects/APlayer"
+SRC_URI="svn://pulkomandy.tk/APlayer/trunk"
+REVISION="1"
+LICENSE="Artistic"
+COPYRIGHT="
+	1994-2002 Polycode
+	2011-2012 Adrien Destugues
+"
+
+ARCHITECTURES="x86_gcc2 ?x86 ?x86_64"
+SECONDARY_ARCHITECTURES="x86_gcc2 ?x86 ?x86_64"
+
+PROVIDES="
+	aplayer$secondaryArchSuffix = $portVersion
+	app:aplayer$secondaryArchSuffix = $portVersion
+	lib:PolyKit = $portVersion
+	lib:APlayerKit = $portVersion
+"
+REQUIRES="
+	haiku$secondaryArchSuffix >= $haikuVersion
+"
+BUILD_REQUIRES="
+	haiku${secondaryArchSuffix}_devel >= $haikuVersion
+"
+BUILD_PREREQUIRES="
+	cmd:g++$secondaryArchSuffix
+	cmd:ld$secondaryArchSuffix
+	cmd:make
+	cmd:nasm$secondaryArchSuffix
+"
+SOURCE_DIR="trunk"
+
+PATCHES="
+	aplayer.patch
+	aplayer_2.patch
+"
+BUILD()
+{
+	cd Master
+	make
+	cd ..
+}
+
+INSTALL()
+{
+	mkdir -p $appsDir
+	mkdir -p $libDir
+	mkdir -p $addOnsDir
+	
+	cp APlayer/bin/BeOS_/APlayer $appsDir/APlayer
+	cp APlayer/bin/BeOS_/lib/APlayerKit.so $libDir
+	cp -r APlayer/bin/BeOS_/add-ons/* $addOnsDir
+	cp PolyKit/bin/BeOS/PolyKit.so $libDir
+	addAppDeskbarSymlink $appsDir/APlayer
+}
diff --git a/haiku-apps/aplayer/patches/aplayer.patch b/haiku-apps/aplayer/patches/aplayer.patch
new file mode 100644
index 000000000..6e13e6c8c
--- /dev/null
+++ b/haiku-apps/aplayer/patches/aplayer.patch
@@ -0,0 +1,268 @@
+diff --git a/APlayer/Players/GameMusic/libgme/Gbs_Emu.cpp b/APlayer/Players/GameMusic/libgme/Gbs_Emu.cpp
+index 05a0b99..c35c22f 100644
+--- a/APlayer/Players/GameMusic/libgme/Gbs_Emu.cpp
++++ b/APlayer/Players/GameMusic/libgme/Gbs_Emu.cpp
+@@ -18,10 +18,8 @@ Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */
+ 
+ #include "blargg_source.h"
+ 
+-Gbs_Emu::equalizer_t const Gbs_Emu::handheld_eq   =
+-	Music_Emu::make_equalizer( -47.0, 2000 );
+-Gbs_Emu::equalizer_t const Gbs_Emu::headphones_eq =
+-	Music_Emu::make_equalizer( 0.0, 300 );
++Gbs_Emu::equalizer_t const Gbs_Emu::handheld_eq   ( -47.0, 2000 );
++Gbs_Emu::equalizer_t const Gbs_Emu::headphones_eq (   0.0,  300 );
+ 
+ Gbs_Emu::Gbs_Emu()
+ {
+@@ -40,8 +38,8 @@ Gbs_Emu::Gbs_Emu()
+ 	set_silence_lookahead( 6 );
+ 	set_max_initial_silence( 21 );
+ 	set_gain( 1.2 );
+-	
+-	set_equalizer( make_equalizer( -1.0, 120 ) );
++	static equalizer_t const eq ( -1.0, 120 );
++	set_equalizer( eq );
+ }
+ 
+ Gbs_Emu::~Gbs_Emu() { }
+diff --git a/APlayer/Players/GameMusic/libgme/Gbs_Emu.h b/APlayer/Players/GameMusic/libgme/Gbs_Emu.h
+index b233a2b..c9054cc 100644
+--- a/APlayer/Players/GameMusic/libgme/Gbs_Emu.h
++++ b/APlayer/Players/GameMusic/libgme/Gbs_Emu.h
+@@ -41,7 +41,9 @@ public:
+ 	
+ public:
+ 	// deprecated
+-	using Music_Emu::load;
++	#if !defined(__GNUC__) || __GNUC__ > 2
++	Music_Emu::load;
++	#endif
+ 	blargg_err_t load( header_t const& h, Data_Reader& in ) // use Remaining_Reader
+ 			{ return load_remaining_( &h, sizeof h, in ); }
+ 
+diff --git a/APlayer/Players/GameMusic/libgme/Gym_Emu.h b/APlayer/Players/GameMusic/libgme/Gym_Emu.h
+index 1e4ed8b..d11440e 100644
+--- a/APlayer/Players/GameMusic/libgme/Gym_Emu.h
++++ b/APlayer/Players/GameMusic/libgme/Gym_Emu.h
+@@ -34,7 +34,9 @@ public:
+ 	
+ public:
+ 	// deprecated
+-	using Music_Emu::load;
++	#if !defined(__GNUC__) || __GNUC__ > 2
++	Music_Emu::load;
++	#endif
+ 	blargg_err_t load( header_t const& h, Data_Reader& in ) // use Remaining_Reader
+ 			{ return load_remaining_( &h, sizeof h, in ); }
+ 	enum { gym_rate = 60 }; 
+diff --git a/APlayer/Players/GameMusic/libgme/Music_Emu.cpp b/APlayer/Players/GameMusic/libgme/Music_Emu.cpp
+index 942e86e..065e42b 100644
+--- a/APlayer/Players/GameMusic/libgme/Music_Emu.cpp
++++ b/APlayer/Players/GameMusic/libgme/Music_Emu.cpp
+@@ -24,8 +24,7 @@ int const silence_threshold = 0x10;
+ long const fade_block_size = 512;
+ int const fade_shift = 8; // fade ends with gain at 1.0 / (1 << fade_shift)
+ 
+-Music_Emu::equalizer_t const Music_Emu::tv_eq =
+-	Music_Emu::make_equalizer( -8.0, 180 );
++Music_Emu::equalizer_t const Music_Emu::tv_eq ( -8.0, 180 );
+ 
+ void Music_Emu::clear_track_vars()
+ {
+@@ -50,6 +49,7 @@ void Music_Emu::unload()
+ }
+ 
+ Music_Emu::Music_Emu()
++	: equalizer_(-1.0, 60)
+ {
+ 	effects_buffer = 0;
+ 	
+@@ -62,8 +62,6 @@ Music_Emu::Music_Emu()
+ 	max_initial_silence = 2;
+ 	silence_lookahead   = 3;
+ 	ignore_silence_     = false;
+-	equalizer_.treble   = -1.0;
+-	equalizer_.bass     = 60;
+ 	
+ 	static const char* const names [] = {
+ 		"Voice 1", "Voice 2", "Voice 3", "Voice 4",
+diff --git a/APlayer/Players/GameMusic/libgme/Music_Emu.h b/APlayer/Players/GameMusic/libgme/Music_Emu.h
+index d98f7ce..0a8bc0a 100644
+--- a/APlayer/Players/GameMusic/libgme/Music_Emu.h
++++ b/APlayer/Players/GameMusic/libgme/Music_Emu.h
+@@ -64,7 +64,11 @@ public:
+ 	void ignore_silence( bool disable = true );
+ 	
+ 	// Info for current track
+-	using Gme_File::track_info;
++	#if (!defined(__GNUC__) || (__GNUC__ > 2))
++	Gme_File::track_info;
++	#else
++	blargg_err_t track_info( track_info_t* out, int k ) const {return Gme_File::track_info(out,k); }
++	#endif
+ 	blargg_err_t track_info( track_info_t* out ) const;
+ 	
+ // Sound customization
+@@ -199,7 +203,7 @@ struct Gme_Info_ : Music_Emu
+ 
+ inline blargg_err_t Music_Emu::track_info( track_info_t* out ) const
+ {
+-	return track_info( out, current_track_ );
++	return Gme_File::track_info( out, current_track_ );
+ }
+ 
+ inline long Music_Emu::sample_rate() const          { return sample_rate_; }
+diff --git a/APlayer/Players/GameMusic/libgme/Nsf_Emu.cpp b/APlayer/Players/GameMusic/libgme/Nsf_Emu.cpp
+index eab4bfb..0de854a 100644
+--- a/APlayer/Players/GameMusic/libgme/Nsf_Emu.cpp
++++ b/APlayer/Players/GameMusic/libgme/Nsf_Emu.cpp
+@@ -31,10 +31,8 @@ int const fme7_flag  = 0x20;
+ 
+ long const clock_divisor = 12;
+ 
+-Nsf_Emu::equalizer_t const Nsf_Emu::nes_eq     =
+-	Music_Emu::make_equalizer( -1.0, 80 );
+-Nsf_Emu::equalizer_t const Nsf_Emu::famicom_eq =
+-	Music_Emu::make_equalizer( -15.0, 80 );
++Nsf_Emu::equalizer_t const Nsf_Emu::nes_eq     (  -1.0, 80 );
++Nsf_Emu::equalizer_t const Nsf_Emu::famicom_eq ( -15.0, 80 );
+ 
+ int Nsf_Emu::pcm_read( void* emu, nes_addr_t addr )
+ {
+diff --git a/APlayer/Players/GameMusic/libgme/Nsf_Emu.h b/APlayer/Players/GameMusic/libgme/Nsf_Emu.h
+index 0b00168..08b987a 100644
+--- a/APlayer/Players/GameMusic/libgme/Nsf_Emu.h
++++ b/APlayer/Players/GameMusic/libgme/Nsf_Emu.h
+@@ -44,7 +44,11 @@ public:
+ 	
+ public:
+ 	// deprecated
+-	using Music_Emu::load;
++	#if (!defined(__GNUC__) || (__GNUC__ > 2))
++		Music_Emu::load;
++	#else
++		blargg_err_t load( Data_Reader& r) {return Music_Emu::load(r);}
++	#endif
+ 	blargg_err_t load( header_t const& h, Data_Reader& in ) // use Remaining_Reader
+ 			{ return load_remaining_( &h, sizeof h, in ); }
+ 
+diff --git a/APlayer/Players/GameMusic/libgme/Spc_Emu.h b/APlayer/Players/GameMusic/libgme/Spc_Emu.h
+index 09063f1..5f08719 100644
+--- a/APlayer/Players/GameMusic/libgme/Spc_Emu.h
++++ b/APlayer/Players/GameMusic/libgme/Spc_Emu.h
+@@ -48,7 +48,9 @@ public:
+ 	
+ public:
+ 	// deprecated
+-	using Music_Emu::load;
++	#if !defined(__GNUC__) || __GNUC__ > 2
++	Music_Emu::load;
++	#endif
+ 	blargg_err_t load( header_t const& h, Data_Reader& in ) // use Remaining_Reader
+ 			{ return load_remaining_( &h, sizeof h, in ); }
+ 	byte const* trailer() const; // use track_info()
+diff --git a/APlayer/Players/GameMusic/libgme/Vgm_Emu.cpp b/APlayer/Players/GameMusic/libgme/Vgm_Emu.cpp
+index 5c6bc7c..bfc42d8 100644
+--- a/APlayer/Players/GameMusic/libgme/Vgm_Emu.cpp
++++ b/APlayer/Players/GameMusic/libgme/Vgm_Emu.cpp
+@@ -35,8 +35,8 @@ Vgm_Emu::Vgm_Emu()
+ 	set_voice_types( types );
+ 	
+ 	set_silence_lookahead( 1 ); // tracks should already be trimmed
+-	
+-	set_equalizer( make_equalizer( -14.0, 80 ) );
++	static equalizer_t const eq( -14.0, 80 );
++	set_equalizer( eq);
+ }
+ 
+ Vgm_Emu::~Vgm_Emu() { }
+diff --git a/APlayer/Players/GameMusic/libgme/Vgm_Emu.h b/APlayer/Players/GameMusic/libgme/Vgm_Emu.h
+index 65895af..4a1f778 100644
+--- a/APlayer/Players/GameMusic/libgme/Vgm_Emu.h
++++ b/APlayer/Players/GameMusic/libgme/Vgm_Emu.h
+@@ -51,7 +51,9 @@ public:
+ 	
+ public:
+ 	// deprecated
+-	using Music_Emu::load;
++	#if (!defined(__GNUC__) || (__GNUC__ > 2))
++	Music_Emu::load;
++	#endif
+ 	blargg_err_t load( header_t const& h, Data_Reader& in ) // use Remaining_Reader
+ 			{ return load_remaining_( &h, sizeof h, in ); }
+ 	byte const* gd3_data( int* size_out = 0 ) const; // use track_info()
+diff --git a/APlayer/Players/GameMusic/libgme/gme.cpp b/APlayer/Players/GameMusic/libgme/gme.cpp
+index 4770984..98fee50 100644
+--- a/APlayer/Players/GameMusic/libgme/gme.cpp
++++ b/APlayer/Players/GameMusic/libgme/gme.cpp
+@@ -359,9 +359,7 @@ BLARGG_EXPORT void      gme_set_equalizer  ( Music_Emu* me, gme_equalizer_t cons
+ 
+ BLARGG_EXPORT void gme_equalizer( Music_Emu const* me, gme_equalizer_t* out )
+ {
+-	gme_equalizer_t e = gme_equalizer_t(); // Default-init all fields to 0.0f
+-	e.treble = me->equalizer().treble;
+-	e.bass   = me->equalizer().bass;
++	gme_equalizer_t e(me->equalizer().treble, me->equalizer().bass);
+ 	*out = e;
+ }
+ 
+diff --git a/APlayer/Players/GameMusic/libgme/gme.h b/APlayer/Players/GameMusic/libgme/gme.h
+index 8eb952e..666538e 100644
+--- a/APlayer/Players/GameMusic/libgme/gme.h
++++ b/APlayer/Players/GameMusic/libgme/gme.h
+@@ -143,6 +143,8 @@ typedef struct gme_equalizer_t
+ 	double bass;   /* 1 = full bass, 90 = average, 16000 = almost no bass */
+ 	
+ 	double d2,d3,d4,d5,d6,d7,d8,d9; /* reserved */
++
++	gme_equalizer_t(double t, double b) {treble = t; bass = b;};
+ } gme_equalizer_t;
+ 
+ /* Get current frequency equalizater parameters */
+diff --git a/Master/Makefile b/Master/Makefile
+index 7ac0424..f8ad52f 100644
+--- a/Master/Makefile
++++ b/Master/Makefile
+@@ -5,20 +5,20 @@ VERSION := 4.0.1
+ #build date is not currently used.
+ BUILDDATE := $(shell date +%b_%d_%Y)
+ 
+-ARCH := $(shell setgcc | cut -d' ' -f3)
++ARCH := $(shell setg++ | cut -d' ' -f3)
+ OBJDIR := __OBJ_$(ARCH)
+ DEPDIR := __DEP_$(ARCH)
+ RULESDIR := __RULES_$(ARCH)
+ MAKEFILEDIR := makefiles_x86
+ 
+-CC := gcc -c -pipe
+-LD := gcc
++CC := g++ -c -pipe
++LD := g++
+ 
+ #Dependency generator
+-#DEP := gcc -M -DBEOS_BUILD
++#DEP := g++ -M -DBEOS_BUILD
+ #Ignores system headers. A bit faster, but might give
+ #small problems if local headers are used with <> insetad of "".
+-DEP := gcc -MM -DBEOS_BUILD
++DEP := g++ -MM -DBEOS_BUILD
+ 
+ BUILD_DEBUG=TRUE
+ #BUILD_DEBUG=FALSE
+diff --git a/Master/makefiles_x86/makefile.APlayer b/Master/makefiles_x86/makefile.APlayer
+index 6b93ba8..aa75bb3 100644
+--- a/Master/makefiles_x86/makefile.APlayer
++++ b/Master/makefiles_x86/makefile.APlayer
+@@ -20,9 +20,9 @@ $(NAME)_TYPE := APP
+ $(NAME)_LIBS := $(APLAYER_LIBS) be root
+ 
+ ifeq ($(findstring gcc2,$(ARCH)),gcc2)
+-$(NAME)_LIBS += stdc++.r4
++$(NAME)_LIBS += stdc++.r4.r4
+ else
+-$(NAME)_LIBS += stdc++
++$(NAME)_LIBS += stdc++.r4
+ endif
+ 
+ $(NAME)_RSRCS := $(ROOTDIR)/BeOS/Server_x86.rsrc
diff --git a/haiku-apps/aplayer/patches/aplayer_2.patch b/haiku-apps/aplayer/patches/aplayer_2.patch
new file mode 100644
index 000000000..6fe4a518c
--- /dev/null
+++ b/haiku-apps/aplayer/patches/aplayer_2.patch
@@ -0,0 +1,34 @@
+diff --git a/APlayer/Players/GameMusic/libgme/Music_Emu.h b/APlayer/Players/GameMusic/libgme/Music_Emu.h
+index 0a8bc0a..fd5dbc1 100644
+--- a/APlayer/Players/GameMusic/libgme/Music_Emu.h
++++ b/APlayer/Players/GameMusic/libgme/Music_Emu.h
+@@ -107,14 +107,6 @@ public:
+ 	
+ 	// Set frequency equalizer parameters
+ 	void set_equalizer( equalizer_t const& );
+-
+-	// Construct equalizer of given treble/bass settings
+-	static const equalizer_t make_equalizer( double treble, double bass )
+-	{
+-	    const Music_Emu::equalizer_t e = { treble, bass,
+-		0.0, 0.0, 0.0, 0.0, 0.0, 0.0, 0.0, 0.0 };
+-	    return e;
+-	}
+ 	
+ 	// Equalizer settings for TV speaker
+ 	static equalizer_t const tv_eq;
+diff --git a/APlayer/Players/GameMusic/libgme/Nsfe_Emu.h b/APlayer/Players/GameMusic/libgme/Nsfe_Emu.h
+index 32b05d5..880b951 100644
+--- a/APlayer/Players/GameMusic/libgme/Nsfe_Emu.h
++++ b/APlayer/Players/GameMusic/libgme/Nsfe_Emu.h
+@@ -46,7 +46,9 @@ public:
+ public:
+ 	// deprecated
+ 	struct header_t { char tag [4]; };
+-	using Music_Emu::load;
++	#ifdef (!defined(__GNUC__) || (__GNUC__ > 2))
++	Music_Emu::load;
++	#endif
+ 	blargg_err_t load( header_t const& h, Data_Reader& in ) // use Remaining_Reader
+ 			{ return load_remaining_( &h, sizeof h, in ); }
+ 	void disable_playlist( bool = true ); // use clear_playlist()
diff --git a/haiku-apps/artpaint/artpaint-339.recipe b/haiku-apps/artpaint/artpaint-339.recipe
deleted file mode 100644
index 3a80a0bdb..000000000
--- a/haiku-apps/artpaint/artpaint-339.recipe
+++ /dev/null
@@ -1,20 +0,0 @@
-DESCRIPTION="Artpaint is a painting and image processing program" 
-HOMEPAGE="http://dev.osdrawer.net/projects/artpaint" 
-SRC_URI="svn+http://svn.osdrawer.net/artpaint/trunk"
-REVISION="1"
-STATUS_HAIKU="broken"
-DEPEND=""
-#CHECKSUM_MD5=""
-BUILD()
-{
-	echo "Need to figure out how to build this still"
-}
-
-INSTALL()
-{
-	echo "Need to figure out how to install this still"
-}
-
-LICENSE="MIT"
-COPYRIGHT="2003, Heikki Suhonen
-	2008-2009 ArtPaint Maintainers"
diff --git a/haiku-apps/backup/backup-0.0.1.recipe b/haiku-apps/backup/backup-0.0.1.recipe
index 83e7cdec1..7d4fbfc7e 100644
--- a/haiku-apps/backup/backup-0.0.1.recipe
+++ b/haiku-apps/backup/backup-0.0.1.recipe
@@ -1,38 +1,40 @@
-DESCRIPTION="backup - A backup application for Haiku"
+DESCRIPTION="A backup application for Haiku"
 SUMMARY="A backup application for Haiku"
+COPYRIGHT="2013 Alexander von Gluck IV"
+LICENSE="MIT"
 HOMEPAGE="https://github.com/kallisti5/backup" 
-SRC_URI="git+https://github.com/kallisti5/backup"
-REVISION="1"
+SRC_URI="git+https://github.com/kallisti5/backup#34e156f64d"
+REVISION="2"
 
-ARCHITECTURES="x86_gcc2 ?x86 ?x86_64"
+ARCHITECTURES="x86_gcc2 x86 ?x86_64"
 
 PROVIDES="
 	backup = $portVersion
 	app:backup = $portVersion
 	"
 
-BUILD_PREREQUIRES="
+BUILD_REQUIRES="
 	haiku_devel >= $haikuVersion
+	"
+
+BUILD_PREREQUIRES="
 	makefile_engine
 	cmd:gcc
 	cmd:make
-	cmd:mkdepend"
+	cmd:mkdepend
+	"
 		
 PATCHES="backup-0.0.1.patch"
 
-COPYRIGHT="2013 Alexander von Gluck IV"
-LICENSE="MIT"
-
 BUILD()
 {
-	make BUILDHOME=`finddir B_SYSTEM_DEVELOP_DIRECTORY`
+	make OBJ_DIR=objects \
+		BUILDHOME=`finddir B_SYSTEM_DEVELOP_DIRECTORY`
 }
 
 INSTALL()
 {
-	architecture=$(echo $buildArchitecture | sed 's/_/-/g')
 	mkdir -p $appsDir
-	cp objects.$architecture-release/backup $appsDir/Backup
-	
+	cp objects/backup $appsDir/Backup
 	addAppDeskbarSymlink $appsDir/Backup
 }
diff --git a/haiku-apps/bafx/bafx-0.0.1.recipe b/haiku-apps/bafx/bafx-0.0.1.recipe
index b4d0ff8da..329a3494f 100644
--- a/haiku-apps/bafx/bafx-0.0.1.recipe
+++ b/haiku-apps/bafx/bafx-0.0.1.recipe
@@ -1,38 +1,39 @@
 DESCRIPTION="BAfx is a file manager for Haiku."
 SUMMARY="A file manager for Haiku."
 HOMEPAGE="https://github.com/marbocub/BAfx"
-SRC_URI="git+https://github.com/marbocub/BAfx"
+SRC_URI="git+https://github.com/marbocub/BAfx#4b14a8ba4c"
 COPYRIGHT="2012 @marbocub"
 LICENSE="MIT"
-
-REVISION="1"
-
-ARCHITECTURES="x86_gcc2 ?x86 ?x86_64"
+REVISION="2"
+ARCHITECTURES="x86_gcc2 x86 ?x86_64"
 
 PROVIDES="
 	bafx = $portVersion
-	app:bafx = $portVersion"
+	app:bafx = $portVersion
+	"
+
+BUILD_REQUIRES="
+	haiku_devel >= $haikuVersion
+	"
 
 BUILD_PREREQUIRES="
-	haiku_devel >= $haikuVersion
 	makefile_engine
 	cmd:gcc
 	cmd:make
-	cmd:mkdepend"
+	cmd:mkdepend
+	"
+
+PATCHES="bafx-0.0.1.patchset"
 
 BUILD()
 {
-	make BUILDHOME=`finddir B_SYSTEM_DEVELOP_DIRECTORY`
+	make OBJ_DIR=objects \
+		BUILDHOME=`finddir B_SYSTEM_DEVELOP_DIRECTORY`
 }
 
 INSTALL()
 {
-	architecture=$(echo $buildArchitecture | sed 's/_/-/g')
-	
-	cd objects.$architecture-release
-	
-	mkdir -p $appsDir/BAfx
-	cp -a BAfx $appsDir/BAfx
-	
-	addAppDeskbarSymlink $appsDir/BAfx/BAfx
+	mkdir -p $appsDir
+	cp -a objects/BAfx $appsDir
+	addAppDeskbarSymlink $appsDir/BAfx
 }
diff --git a/haiku-apps/bafx/patches/bafx-0.0.1.patchset b/haiku-apps/bafx/patches/bafx-0.0.1.patchset
new file mode 100644
index 000000000..f5c0c7ee4
--- /dev/null
+++ b/haiku-apps/bafx/patches/bafx-0.0.1.patchset
@@ -0,0 +1,22 @@
+From 7c5605074b639c6daa54275d1ced9720555da3d1 Mon Sep 17 00:00:00 2001
+From: Chris Roberts <cpr420@gmail.com>
+Date: Mon, 2 Dec 2013 17:37:11 -0700
+Subject: Fix makefile stdc++ libs
+
+
+diff --git a/Makefile b/Makefile
+index 6f14782..50893a9 100755
+--- a/Makefile
++++ b/Makefile
+@@ -56,7 +56,7 @@ RSRCS=
+ #		naming scheme you need to specify the path to the library
+ #		and it's name
+ #		library: my_lib.a entry: my_lib.a or path/my_lib.a
+-LIBS= be
++LIBS= be $(STDCPPLIBS)
+ 
+ #	specify additional paths to directories following the standard
+ #	libXXX.so or libXXX.a naming scheme.  You can specify full paths
+-- 
+1.8.3.4
+
diff --git a/haiku-apps/bdhcalc/bdhcalc-1.1.recipe b/haiku-apps/bdhcalc/bdhcalc-1.1.recipe
new file mode 100644
index 000000000..74dc8f769
--- /dev/null
+++ b/haiku-apps/bdhcalc/bdhcalc-1.1.recipe
@@ -0,0 +1,48 @@
+SUMMARY="Fully functunal 64bit calculator"
+DESCRIPTION="BDH Calc is a fully functional 64bit calculator, supporting
+	common arithmetic operations like adding, subtracting, dividing and
+	multiplying as well as bitwise operators. You can choose the word
+	size and whether the sign is considered to simulate any integral
+	data type. Moreover the calculator supports binary, decimal and
+	hexadecimal conversion.
+	"
+HOMEPAGE="http://haikuware.com/directory/view-details/science-math/calculators/bdh-calc-for-haiku"
+SRC_URI="git://github.com/ThomasCompix/BDH-Calc.git#4a6865932ae0e95244ed0149b6e8c4f437ea742a"
+REVISION="1"
+LICENSE="Undetermined"
+COPYRIGHT="1999 Scott Hammond"
+
+ARCHITECTURES="x86 x86_gcc2 !ppc"
+
+PROVIDES="
+	bdhcalc = $portVersion
+	app:bdhcalc = $portVersion
+	"
+REQUIRES="
+	haiku >= $haikuVersion
+	"
+
+BUILD_REQUIRES="
+	haiku_devel >= $haikuVersion
+	"
+
+BUILD_PREREQUIRES="
+	cmd:gcc
+	cmd:make
+	"
+
+BUILD()
+{
+	g++ -c src/bdh_main.cpp -o bdh_main.o
+	g++ -c src/bdh_view.cpp -o bdh_view.o
+	g++ -lbe bdh_main.o bdh_view.o -o bdhcalc
+	xres bdhcalc Ressources/bdh.rsrc
+	mimeset -f bdhcalc
+}
+
+INSTALL()
+{
+	mkdir -p $appsDir
+	mv bdhcalc $appsDir/bdhcalc
+	addAppDeskbarSymlink $appsDir/bdhcalc "BDH Calc"
+}
diff --git a/haiku-apps/beezer/beezer-0.99.hg.recipe b/haiku-apps/beezer/beezer-0.99.hg.recipe
new file mode 100644
index 000000000..833eb3d04
--- /dev/null
+++ b/haiku-apps/beezer/beezer-0.99.hg.recipe
@@ -0,0 +1,62 @@
+SUMMARY="Beezer is an archive manager for Haiku, similar to winzip" 
+DESCRIPTION="
+	Beezer is an archive manager for Haiku. It can extract and browse,
+	create and add to archive files. In addition, Beezer can split and rejoin
+	files.
+
+	It can extract 7zip, arj, bzip2, gzip, lha, rar, tar, xz and zip files.
+	It can create 7zip, bzip2, gzip, tar and zip files.
+	"
+HOMEPAGE="https://bitbucket.org/cpr/beezer" 
+SRC_URI="hg+https://bitbucket.org/cpr/beezer"
+LICENSE="BSD (3-clause)"
+COPYRIGHT="
+	2009 Ramshankar (aka Teknomancer)
+	2011-2012 Chris Roberts
+	"
+REVISION="2"
+ARCHITECTURES="x86_gcc2 x86 ?x86_64"
+
+PROVIDES="
+	beezer = $portVersion
+	app:beezer = $portVersion
+	"
+
+REQUIRES="
+	haiku >= $haikuVersion
+	"
+
+BUILD_REQUIRES="
+	haiku_devel >= $haikuVersion
+	"
+
+BUILD_PREREQUIRES="
+	cmd:cmake >= 2.8
+	cmd:gcc
+	cmd:make
+	"
+
+PATCHES="
+	beezer-0.99.hg.patch
+	"
+
+BUILD()
+{
+	cd Source
+ 	cmake .
+ 	make $jobArgs
+}
+
+INSTALL()
+{
+	cd Source/build
+
+	mkdir -p $appsDir/Beezer
+	cp Beezer $appsDir/Beezer
+	cp -a add-ons $appsDir/Beezer
+	cp -a ../Beezer/docs $appsDir/Beezer
+	addAppDeskbarSymlink $appsDir/Beezer/Beezer
+	
+	mkdir -p $addOnsDir/Tracker
+	cp -a TrackerAddOn/BeezerAddOn $addOnsDir/Tracker
+}
diff --git a/haiku-apps/beezer/beezer-1.recipe b/haiku-apps/beezer/beezer-1.recipe
deleted file mode 100644
index 7b9dbb02f..000000000
--- a/haiku-apps/beezer/beezer-1.recipe
+++ /dev/null
@@ -1,28 +0,0 @@
-DESCRIPTION="beezer, an archiving tool for the Haiku operating system, similar to winzip" 
-HOMEPAGE="https://bitbucket.org/cpr/beezer" 
-SRC_URI="https://bitbucket.org/cpr/beezer/get/82199f683571.zip"
-REVISION="1"
-STATUS_HAIKU="stable"
-CHECKSUM_MD5="b27479b8a8afc1bc105ad9a6d8911f74"
-DEPEND="cmake >= 2.8"
-BUILD()
-{
-	cd cpr-beezer-82199f683571/Source
- 	cmake .
- 	make
-}
-
-INSTALL()
-{
-	cd cpr-beezer-82199f683571/Source/build
-	BEEZER_DIR=${DESTDIR}/`finddir B_APPS_DIRECTORY`/Beezer
-	mkdir -p $BEEZER_DIR/add-ons
-	cp -a Beezer $BEEZER_DIR
-	cp -a add-ons/* $BEEZER_DIR/add-ons
-	mkdir -p ${DESTDIR}/`finddir B_USER_ADDONS_DIRECTORY`/Tracker
-	cp -a TrackerAddOn/BeezerAddOn ${DESTDIR}/`finddir B_USER_ADDONS_DIRECTORY`/Tracker
-}
-
-LICENSE="BSD (3-clause)"
-COPYRIGHT="2009 Ramshankar (aka Teknomancer)
-	2011-2012 Chris Roberts"
diff --git a/haiku-apps/beezer/patches/beezer-0.99.hg.patch b/haiku-apps/beezer/patches/beezer-0.99.hg.patch
new file mode 100644
index 000000000..638f8e7e2
--- /dev/null
+++ b/haiku-apps/beezer/patches/beezer-0.99.hg.patch
@@ -0,0 +1,57 @@
+From 3728835e4083c862c9b03dd5ffdb5941f34f9da5 Mon Sep 17 00:00:00 2001
+From: Luke <noryb009@gmail.com>
+Date: Sun, 1 Dec 2013 12:22:29 +0000
+Subject: [PATCH] Remove references to B_COMMON_
+
+---
+ Source/Archiver/Archiver.cpp      | 13 +------------
+ Source/Beezer/FSUtils/FSUtils.cpp |  2 +-
+ 2 files changed, 2 insertions(+), 13 deletions(-)
+
+diff --git a/Source/Archiver/Archiver.cpp b/Source/Archiver/Archiver.cpp
+index c272333..7b57313 100644
+--- a/Source/Archiver/Archiver.cpp
++++ b/Source/Archiver/Archiver.cpp
+@@ -625,7 +625,7 @@ status_t Archiver::SetComment(char* commentStr, const char* tempDirPath)
+ bool Archiver::IsBinaryFound(char* filePath, const char* fileName) const
+ {
+     // Check if the given fileName exists in the given dir, if so copy the full path of fileName to filePath
+-    // Path priority  <appdir>/workers -> B_SYSTEM_BIN_DIRECTORY -> B_COMMON_BIN_DIRECTORY
++    // Path priority  <appdir>/workers -> B_SYSTEM_BIN_DIRECTORY
+     BPath binPath;
+     app_info appInfo;
+     be_app->GetAppInfo(&appInfo);
+@@ -652,17 +652,6 @@ bool Archiver::IsBinaryFound(char* filePath, const char* fileName) const
+         }
+     }
+ 
+-    if (find_directory(B_COMMON_BIN_DIRECTORY, &binPath) == B_OK)
+-    {
+-        binPath.Append(fileName);
+-        BEntry entry(binPath.Path(), true);
+-        if (entry.Exists())
+-        {
+-            strcpy(filePath, binPath.Path());
+-            return true;
+-        }
+-    }
+-
+     // TODO full search of $PATH
+ 
+     filePath = '\0';
+diff --git a/Source/Beezer/FSUtils/FSUtils.cpp b/Source/Beezer/FSUtils/FSUtils.cpp
+index a651c58..8fbb01d 100644
+--- a/Source/Beezer/FSUtils/FSUtils.cpp
++++ b/Source/Beezer/FSUtils/FSUtils.cpp
+@@ -177,7 +177,7 @@ BString CreateTempDirectory(const char* prefix, BDirectory** createdDir, bool cr
+         prefixStr << prefix << "_";
+ 
+     BPath tmpPath;
+-    find_directory(B_COMMON_TEMP_DIRECTORY, &tmpPath, true);
++    find_directory(B_SYSTEM_TEMP_DIRECTORY, &tmpPath, true);
+     BString tempDirName = tempnam(const_cast<char*>(tmpPath.Path()), const_cast<char*>(prefixStr.String()));
+ 
+     // Further random the dir name (the below number is a prime)
+-- 
+1.8.3.4
+
diff --git a/haiku-apps/beget/beget-1.2.3.recipe b/haiku-apps/beget/beget-1.2.3.recipe
index 6eb28ba74..945cc8ed0 100644
--- a/haiku-apps/beget/beget-1.2.3.recipe
+++ b/haiku-apps/beget/beget-1.2.3.recipe
@@ -1,35 +1,38 @@
 SUMMARY="A GUI frontend to the command-line downloader wget"
-DESCRIPTION="BeGet is a easy-to-use download manager for the popular command line tool wget.
-BeGet can also accept more than one link at the same time. BeGet saves your downloaded files to /home/Downloads
+DESCRIPTION="
+BeGet is a easy-to-use download manager for the popular command line
+tool wget.  BeGet can also accept more than one link at the same time.
+BeGet saves your downloaded files to /home/Downloads
 "
 HOMEPAGE="http://github.com/HaikuArchives/BeGet"
-SRC_URI="git://github.com/HaikuArchives/BeGet"
-REVISION="2"
+SRC_URI="git://github.com/HaikuArchives/BeGet#fe8db7ccb6"
+REVISION="3"
 LICENSE="GNU GPL v2"
 COPYRIGHT="1999-2001 Atsushi Takamatsu"
 
-ARCHITECTURES="x86_gcc2 x86 x86_64"
-SECONDARY_ARCHITECTURES="x86_gcc2 x86 x86_64"
+ARCHITECTURES="x86_gcc2 !x86 !x86_64"
+SECONDARY_ARCHITECTURES="x86_gcc2 !x86 !x86_64"
 
 PROVIDES="
 	beget = $portVersion
 	app:beget = $portVersion
-"
+	"
+
 REQUIRES="
 	haiku$secondaryArchSuffix >= $haikuVersion
 	cmd:wget$secondaryArchSuffix
-"
+	"
+
 BUILD_REQUIRES="
 	haiku${secondaryArchSuffix}_devel >= $haikuVersion
-"
+	"
+
 BUILD_PREREQUIRES="
-	haiku${secondaryArchSuffix}_devel >= $haikuVersion
 	cmd:cmake
 	cmd:make
 	cmd:gcc$secondaryArchSuffix
 	cmd:ld$secondaryArchSuffix
-"
-SOURCE_DIR="BeGet-master"
+	"
 
 BUILD()
 {
@@ -40,7 +43,6 @@ BUILD()
 INSTALL()
 {
 	mkdir -p $appsDir
-	cp BeGet $appsDir
-	
+	cp BeGet $appsDir	
 	addAppDeskbarSymlink $appsDir/BeGet
 }
diff --git a/haiku-apps/bepdf/bepdf-1.1.1~beta5_2013_04_28.recipe b/haiku-apps/bepdf/bepdf-1.1.1~beta5_2013_04_28.recipe
index 1298a0371..cf30e99b3 100644
--- a/haiku-apps/bepdf/bepdf-1.1.1~beta5_2013_04_28.recipe
+++ b/haiku-apps/bepdf/bepdf-1.1.1~beta5_2013_04_28.recipe
@@ -13,22 +13,25 @@ COPYRIGHT="
 	1999-2000 Hubert Figuiere
 	2000-2010 Michael Pfeiffer"
 LICENSE="GNU GPL v2"
-REVISION="1"
+REVISION="2"
 ARCHITECTURES="x86_gcc2 x86"
 
 PROVIDES="
 	bepdf = $portVersion
-	cmd:BePDF = $portVersion
+	app:BePDF = $portVersion
 	"
+
 REQUIRES="
 	haiku >= $haikuVersion
 	lib:liblayout
 	"
+
 BUILD_REQUIRES="
+	haiku_devel >= $haikuVersion
 	devel:liblayout
 	"
+
 BUILD_PREREQUIRES="
-	haiku_devel >= $haikuVersion
 	cmd:gcc
 	cmd:jam
 	cmd:htmldoc
@@ -36,8 +39,6 @@ BUILD_PREREQUIRES="
 	cmd:sed
 	"
 
-SOURCE_DIR="$portVersionedName"
-
 PATCHES="bepdf-1.1.1~beta5_2013_04_28.patchset"
 
 PATCH()
diff --git a/haiku-apps/bescreencapture/bescreencapture-1.9.1.recipe b/haiku-apps/bescreencapture/bescreencapture-1.9.1.recipe
index 05965ae52..a0bfb4b3a 100644
--- a/haiku-apps/bescreencapture/bescreencapture-1.9.1.recipe
+++ b/haiku-apps/bescreencapture/bescreencapture-1.9.1.recipe
@@ -14,39 +14,38 @@ LICENSE="
 	MIT
 	"
 COPYRIGHT="2013 Stefano Ceccherini"
-REVISION="1"
-ARCHITECTURES="x86_gcc2 ?x86 ?x86_64"
+REVISION="2"
+ARCHITECTURES="x86_gcc2 x86 ?x86_64"
 
 PROVIDES="
 	bescreencapture = $portVersion
-	cmd:bescreencapture = $portVersion
+	app:bescreencapture = $portVersion
 	"
 
 REQUIRES="
 	haiku >= $haikuVersion
 	"
 
-BUILD_REQUIRES=""
-BUILD_PREREQUIRES="
+BUILD_REQUIRES="
 	haiku_devel >= $haikuVersion
+	"
+
+BUILD_PREREQUIRES="
 	makefile_engine
 	cmd:make
 	cmd:gcc
+	cmd:mkdepend
 	"
 
-SOURCE_DIR="$portName-87886da2972fd4bbabb3fc5caae301c6dc14e7fd"
-
 BUILD()
 {
-	rc BeScreenCapture.rdef
-	make BUILDHOME=`finddir B_SYSTEM_DEVELOP_DIRECTORY`
+	make OBJ_DIR=objects \
+		BUILDHOME=`finddir B_SYSTEM_DEVELOP_DIRECTORY`
 }
 
 INSTALL()
 {
-	architecture=${buildArchitecture/_/-}
-	
 	mkdir -p $appsDir
-	cp -a objects.$architecture-release/BeScreenCapture $appsDir
+	cp -a objects/BeScreenCapture $appsDir
 	addAppDeskbarSymlink $appsDir/BeScreenCapture
 }
diff --git a/haiku-apps/binary_clock/binary_clock-2.0.recipe b/haiku-apps/binary_clock/binary_clock-2.0.recipe
index 44060dfbd..ea7108c12 100644
--- a/haiku-apps/binary_clock/binary_clock-2.0.recipe
+++ b/haiku-apps/binary_clock/binary_clock-2.0.recipe
@@ -1,13 +1,16 @@
 SUMMARY="A binary clock application and screensaver"
 DESCRIPTION="What Is This:
-A Binary Clock.  And yes, you really can use this to tell time!  I have found it quite enjoyable to reprogram my brain to learn to read it at a glance.  It just takes a little getting used to.  Detailed directions on how to read it are included at the end of this file."
+A Binary Clock.  And yes, you really can use this to tell time!  I
+have found it quite enjoyable to reprogram my brain to learn to read
+it at a glance.  It just takes a little getting used to.  Detailed
+directions on how to read it are included at the end of this file."
 HOMEPAGE="http://github.com/HaikuArchives/BinaryClock"
-SRC_URI="git://github.com/HaikuArchives/BinaryClock"
-REVISION="1"
+SRC_URI="git://github.com/HaikuArchives/BinaryClock#5d04da1137"
+REVISION="2"
 LICENSE="GNU GPL v2"
 COPYRIGHT="2000 David Enderson"
 
-ARCHITECTURES="x86_gcc2 x86 x86_64"
+ARCHITECTURES="x86_gcc2 !x86 !x86_64"
 
 PROVIDES="
 	app:binary_clock = $portVersion
@@ -23,29 +26,26 @@ BUILD_REQUIRES="
 	"
 
 BUILD_PREREQUIRES="
-	haiku_devel >= $haikuVersion
 	cmd:make
 	cmd:gcc
 	cmd:ld
 	"
 
 USER_SETTINGS_FILES="
-	settings/BinaryClock_2.xx "directory"
+	settings/BinaryClock_2.xx
 	"
 
-SOURCE_DIR="BinaryClock-master"
-
 BUILD()
 {
 	cd Application
 	g++ -o BinaryClock *.cpp -lbe -ltranslation
 	xres -o BinaryClock BinaryClock.rsrc
+	mimeset -f BinaryClock
 }
+
 INSTALL()
 {
-	mkdir -p $appsDir
-	
-	cd Application
-	cp BinaryClock $appsDir
+	mkdir -p $appsDir	
+	cp Application/BinaryClock $appsDir
 	addAppDeskbarSymlink $appsDir/BinaryClock "Binary Clock"
 }
diff --git a/haiku-apps/bowser/bowser-1.1.1_cvs.recipe b/haiku-apps/bowser/bowser-1.1.1_cvs.recipe
deleted file mode 100644
index 4a127a126..000000000
--- a/haiku-apps/bowser/bowser-1.1.1_cvs.recipe
+++ /dev/null
@@ -1,19 +0,0 @@
-DESCRIPTION="bowser"
-HOMEPAGE="http://bowser.sourceforge.net" 
-SRC_URI="cvs://:pserver:anonymous@bowser.cvs.sourceforge.net:/cvsroot/bowser/Bowser"
-REVISION="1"
-STATUS_HAIKU="stable"
-DEPEND=""
-		
-BUILD()
-{
-	true
-}
-
-INSTALL()
-{
-	true
-}
-
-#COPYRIGHT=""
-#LICENSE="
diff --git a/haiku-apps/burnitnow/burnitnow-trunk.recipe b/haiku-apps/burnitnow/burnitnow-trunk.recipe
new file mode 100644
index 000000000..98d226421
--- /dev/null
+++ b/haiku-apps/burnitnow/burnitnow-trunk.recipe
@@ -0,0 +1,50 @@
+SUMMARY="A utility for burning CD"
+DESCRIPTION="BurnItNow is a CD burning utility application for Haiku"
+HOMEPAGE="https://github.com/HaikuArchives/BurnItNow"
+SRC_URI="git+https://github.com/HaikuArchives/BurnItNow#5036e55"
+REVISION="1"
+COPYRIGHT="
+	2010-2013 BurnItNow Team
+	2005-2007 Ingo Weinhold <bonefish@users.sf.net>
+	2007 Haiku, Inc.
+	1991-2000 Be Incorporated
+	"
+LICENSE="MIT"
+
+
+ARCHITECTURES="x86_gcc2 ?x86 ?x86_64"
+
+PROVIDES="
+	burnitnow = $portVersion
+	app:burnintnow = $portVersion
+	"
+
+REQUIRES="
+	cmd:cdrecord
+	"
+
+BUILD_PREREQUIRES="
+	makefile_engine
+	cmd:cmake
+	cmd:make
+	cmd:gcc
+	"
+	
+BUILD_REQUIRES="
+	haiku_devel >= $haikuVersion
+	"
+
+SOURCE_DIR="$portName/trunk"
+		
+BUILD()
+{
+	cmake .
+	make
+}
+
+INSTALL()
+{
+	mkdir -p $appsDir/BurnItNow
+	cp BurnItNow $appsDir/BurnItNow
+	addAppDeskbarSymlink $appsDir/BurnItNow/BurnItNow
+}
diff --git a/haiku-apps/capitalbe/capitalbe-1.0.recipe b/haiku-apps/capitalbe/capitalbe-1.0.recipe
new file mode 100644
index 000000000..5ea70bdf6
--- /dev/null
+++ b/haiku-apps/capitalbe/capitalbe-1.0.recipe
@@ -0,0 +1,42 @@
+SUMMARY="A finance manager"
+DESCRIPTION="Capital Be is a finance manager for Haiku. Easily track where your
+	money is going. View reports, reconcile accounts and more! Like other
+	programs published by the same author, Capital Be focuses on keeping easy
+	jobs easy and making tough ones easier."
+HOMEPAGE="http://github.com/HaikuArchives/CapitalBe"
+SRC_URI="git://github.com/HaikuArchives/CapitalBe.git#eb8d7f92bbaa1594dddeb07c64f90442de106a3e"
+REVISION="1"
+LICENSE="MIT"
+COPYRIGHT="2009 DarkWyrm"
+ARCHITECTURES="?x86 x86_gcc2 ?ppc"
+PROVIDES="
+	capitalbe = $portVersion
+	app:capitalbe = $portVersion
+	"
+REQUIRES="
+	haiku >= $haikuVersion
+	"
+BUILD_REQUIRES="
+	haiku_devel >= $haikuVersion
+	devel:libsqlite3
+	"
+BUILD_PREREQUIRES="
+	cmd:gcc
+	"
+	
+BUILD()
+{
+	g++ -lbe -ltracker -ltranslation -lsqlite3 src/*.cpp -o capitalbe
+	rc -o capitalbe.rsrc src/capitalbe.rdef
+	xres -o capitalbe capitalbe.rsrc
+	mimeset -f capitalbe
+}
+
+INSTALL()
+{
+	mkdir -p $appsDir/capitalbe
+	mkdir -p $appsDir/capitalbe/helpfiles
+	cp -r src/helpfiles/* $appsDir/capitalbe/helpfiles/
+	mv capitalbe $appsDir/capitalbe/capitalbe
+	addAppDeskbarSymlink $appsDir/capitalbe/capitalbe "Capital Be"
+}
diff --git a/haiku-apps/caya/caya-236.recipe b/haiku-apps/caya/caya-236.recipe
deleted file mode 100644
index adb7367fc..000000000
--- a/haiku-apps/caya/caya-236.recipe
+++ /dev/null
@@ -1,35 +0,0 @@
-DESCRIPTION="Caya is a multiprotocol IM client." 
-HOMEPAGE="http://dev.osdrawer.net/projects/caya" 
-SRC_URI="svn+http://svn.osdrawer.net/caya/trunk#236"
-REVISION="1"
-STATUS_HAIKU="stable"
-DEPEND="net-misc/curl >= 7.21.6"
-#CHECKSUM_MD5=""
-MESSAGE="This port only builds with gcc4."
-BUILD()
-{
-	cd caya-236
-	./configure
-	jam
-}
-
-INSTALL()
-{
-	cd caya-236
-	mkdir -p ${DESTDIR}/`finddir B_APPS_DIRECTORY`/Caya
-	mkdir -p ${DESTDIR}/`finddir B_APPS_DIRECTORY`/Caya/smileys
-	mkdir -p ${DESTDIR}/`finddir B_APPS_DIRECTORY`/Caya/protocols
-	mkdir -p ${DESTDIR}/`finddir B_COMMON_DIRECTORY`/include/caya/
-
-	cp generated/distro-haiku-x86-gcc4-debug/Caya ${DESTDIR}/`finddir B_APPS_DIRECTORY`/Caya
-	cp generated/distro-haiku-x86-gcc4-debug/aim ${DESTDIR}/`finddir B_APPS_DIRECTORY`/Caya/protocols
-	cp smileys/*.gif smileys/settings.xml ${DESTDIR}/`finddir B_APPS_DIRECTORY`/Caya/smileys
-	cp application/CayaProtocol.h ${DESTDIR}/`finddir B_COMMON_DIRECTORY`/include/caya/
-	cp application/CayaConstants.h ${DESTDIR}/`finddir B_COMMON_DIRECTORY`/include/caya/
-	cp application/CayaProtocolMessages.h ${DESTDIR}/`finddir B_COMMON_DIRECTORY`/include/caya/
-}
-
-LICENSE="MIT"
-COPYRIGHT="2009-2011 Andrea Anzani
-	2009-2011 Pierluigi Fiorini
-	2010-2011 Oliver Ruiz Dorantes"
diff --git a/haiku-apps/caya/caya-240.recipe b/haiku-apps/caya/caya-240.recipe
deleted file mode 100644
index 78f0e79d5..000000000
--- a/haiku-apps/caya/caya-240.recipe
+++ /dev/null
@@ -1,35 +0,0 @@
-DESCRIPTION="Caya is a multiprotocol IM client." 
-HOMEPAGE="http://dev.osdrawer.net/projects/caya" 
-SRC_URI="svn+http://svn.osdrawer.net/caya/trunk#240"
-REVISION="1"
-STATUS_HAIKU="stable"
-DEPEND="net-misc/curl >= 7.21.6"
-#CHECKSUM_MD5=""
-MESSAGE="This port only builds with gcc4."
-BUILD()
-{
-	cd caya-240
-	./configure
-	jam
-}
-
-INSTALL()
-{
-	cd caya-240
-	mkdir -p ${DESTDIR}/`finddir B_APPS_DIRECTORY`/Caya
-	mkdir -p ${DESTDIR}/`finddir B_APPS_DIRECTORY`/Caya/smileys
-	mkdir -p ${DESTDIR}/`finddir B_APPS_DIRECTORY`/Caya/protocols
-	mkdir -p ${DESTDIR}/`finddir B_COMMON_DIRECTORY`/include/caya/
-
-	cp generated/distro-haiku-x86-gcc4-debug/Caya ${DESTDIR}/`finddir B_APPS_DIRECTORY`/Caya
-	cp generated/distro-haiku-x86-gcc4-debug/aim ${DESTDIR}/`finddir B_APPS_DIRECTORY`/Caya/protocols
-	cp smileys/*.gif smileys/settings.xml ${DESTDIR}/`finddir B_APPS_DIRECTORY`/Caya/smileys
-	cp application/CayaProtocol.h ${DESTDIR}/`finddir B_COMMON_DIRECTORY`/include/caya/
-	cp application/CayaConstants.h ${DESTDIR}/`finddir B_COMMON_DIRECTORY`/include/caya/
-	cp application/CayaProtocolMessages.h ${DESTDIR}/`finddir B_COMMON_DIRECTORY`/include/caya/
-}
-
-LICENSE="MIT"
-COPYRIGHT="2009-2011 Andrea Anzani
-	2009-2011 Pierluigi Fiorini
-	2010-2011 Oliver Ruiz Dorantes"
diff --git a/haiku-apps/caya/caya-264.recipe b/haiku-apps/caya/caya-264.recipe
deleted file mode 100644
index c7a92ce6d..000000000
--- a/haiku-apps/caya/caya-264.recipe
+++ /dev/null
@@ -1,36 +0,0 @@
-DESCRIPTION="Caya is a multiprotocol IM client." 
-HOMEPAGE="http://dev.osdrawer.net/projects/caya" 
-SRC_URI="svn+http://svn.osdrawer.net/caya/trunk#264"
-REVISION="1"
-STATUS_HAIKU="stable"
-DEPEND="dev-libs/expat >= 2.0.1"
-#CHECKSUM_MD5=""
-MESSAGE="This port only builds with gcc4."
-BUILD()
-{
-	cd caya-264
-	./configure
-	jam
-}
-
-INSTALL()
-{
-	cd caya-264
-	mkdir -p ${DESTDIR}/`finddir B_APPS_DIRECTORY`/Caya
-	mkdir -p ${DESTDIR}/`finddir B_APPS_DIRECTORY`/Caya/smileys
-	mkdir -p ${DESTDIR}/`finddir B_APPS_DIRECTORY`/Caya/protocols
-	mkdir -p ${DESTDIR}/`finddir B_COMMON_DIRECTORY`/include/caya/
-
-	cp generated/distro-haiku-x86-gcc4-debug/Caya ${DESTDIR}/`finddir B_APPS_DIRECTORY`/Caya
-	cp generated/distro-haiku-x86-gcc4-debug/aim ${DESTDIR}/`finddir B_APPS_DIRECTORY`/Caya/protocols
-	cp smileys/*.gif smileys/settings.xml ${DESTDIR}/`finddir B_APPS_DIRECTORY`/Caya/smileys
-	cp application/CayaProtocol.h ${DESTDIR}/`finddir B_COMMON_DIRECTORY`/include/caya/
-	cp application/CayaConstants.h ${DESTDIR}/`finddir B_COMMON_DIRECTORY`/include/caya/
-	cp application/CayaProtocolMessages.h ${DESTDIR}/`finddir B_COMMON_DIRECTORY`/include/caya/
-}
-
-LICENSE="MIT"
-COPYRIGHT="2009-2011 Andrea Anzani
-	2009-2011 Pierluigi Fiorini
-	2010-2011 Oliver Ruiz Dorantes
-	2011-2012 Casalinuovo Dario"
diff --git a/haiku-apps/caya/caya-278.recipe b/haiku-apps/caya/caya-278.recipe
deleted file mode 100644
index ced844436..000000000
--- a/haiku-apps/caya/caya-278.recipe
+++ /dev/null
@@ -1,36 +0,0 @@
-DESCRIPTION="Caya is a multiprotocol IM client." 
-HOMEPAGE="http://dev.osdrawer.net/projects/caya" 
-SRC_URI="svn+http://svn.osdrawer.net/caya/trunk#278"
-REVISION="1"
-STATUS_HAIKU="stable"
-DEPEND="dev-libs/expat >= 2.0.1"
-#CHECKSUM_MD5=""
-MESSAGE="This port only builds with gcc4."
-BUILD()
-{
-	cd caya-278
-	./configure
-	jam
-}
-
-INSTALL()
-{
-	cd caya-278
-	mkdir -p ${DESTDIR}/`finddir B_APPS_DIRECTORY`/Caya
-	mkdir -p ${DESTDIR}/`finddir B_APPS_DIRECTORY`/Caya/smileys
-	mkdir -p ${DESTDIR}/`finddir B_APPS_DIRECTORY`/Caya/protocols
-	mkdir -p ${DESTDIR}/`finddir B_COMMON_DIRECTORY`/include/caya/
-
-	cp generated/distro-haiku-x86-gcc4-debug/Caya ${DESTDIR}/`finddir B_APPS_DIRECTORY`/Caya
-	cp generated/distro-haiku-x86-gcc4-debug/aim ${DESTDIR}/`finddir B_APPS_DIRECTORY`/Caya/protocols
-	cp smileys/*.gif smileys/settings.xml ${DESTDIR}/`finddir B_APPS_DIRECTORY`/Caya/smileys
-	cp application/CayaProtocol.h ${DESTDIR}/`finddir B_COMMON_DIRECTORY`/include/caya/
-	cp application/CayaConstants.h ${DESTDIR}/`finddir B_COMMON_DIRECTORY`/include/caya/
-	cp application/CayaProtocolMessages.h ${DESTDIR}/`finddir B_COMMON_DIRECTORY`/include/caya/
-}
-
-LICENSE="MIT"
-COPYRIGHT="2009-2011 Andrea Anzani
-	2009-2011 Pierluigi Fiorini
-	2010-2011 Oliver Ruiz Dorantes
-	2011-2012 Casalinuovo Dario"
diff --git a/haiku-apps/caya/caya-279.recipe b/haiku-apps/caya/caya-279.recipe
deleted file mode 100644
index 87fce694e..000000000
--- a/haiku-apps/caya/caya-279.recipe
+++ /dev/null
@@ -1,36 +0,0 @@
-DESCRIPTION="Caya is a multiprotocol IM client." 
-HOMEPAGE="http://dev.osdrawer.net/projects/caya" 
-SRC_URI="svn+http://svn.osdrawer.net/caya/trunk#279"
-REVISION="1"
-STATUS_HAIKU="stable"
-DEPEND="dev-libs/expat >= 2.0.1"
-#CHECKSUM_MD5=""
-MESSAGE="This port only builds with gcc4."
-BUILD()
-{
-	cd caya-279
-	./configure
-	jam
-}
-
-INSTALL()
-{
-	cd caya-279
-	mkdir -p ${DESTDIR}/`finddir B_APPS_DIRECTORY`/Caya
-	mkdir -p ${DESTDIR}/`finddir B_APPS_DIRECTORY`/Caya/smileys
-	mkdir -p ${DESTDIR}/`finddir B_APPS_DIRECTORY`/Caya/protocols
-	mkdir -p ${DESTDIR}/`finddir B_COMMON_DIRECTORY`/include/caya/
-
-	cp generated/distro-haiku-x86-gcc4-debug/Caya ${DESTDIR}/`finddir B_APPS_DIRECTORY`/Caya
-	cp generated/distro-haiku-x86-gcc4-debug/aim ${DESTDIR}/`finddir B_APPS_DIRECTORY`/Caya/protocols
-	cp smileys/*.gif smileys/settings.xml ${DESTDIR}/`finddir B_APPS_DIRECTORY`/Caya/smileys
-	cp application/CayaProtocol.h ${DESTDIR}/`finddir B_COMMON_DIRECTORY`/include/caya/
-	cp application/CayaConstants.h ${DESTDIR}/`finddir B_COMMON_DIRECTORY`/include/caya/
-	cp application/CayaProtocolMessages.h ${DESTDIR}/`finddir B_COMMON_DIRECTORY`/include/caya/
-}
-
-LICENSE="MIT"
-COPYRIGHT="2009-2011 Andrea Anzani
-	2009-2011 Pierluigi Fiorini
-	2010-2011 Oliver Ruiz Dorantes
-	2011-2012 Casalinuovo Dario"
diff --git a/haiku-apps/caya/caya-293.recipe b/haiku-apps/caya/caya-293.recipe
deleted file mode 100644
index fbf25e70e..000000000
--- a/haiku-apps/caya/caya-293.recipe
+++ /dev/null
@@ -1,60 +0,0 @@
-SUMMARY="Caya is a multiprotocol IM client." 
-HOMEPAGE="http://dev.osdrawer.net/projects/caya" 
-SRC_URI="svn+http://svn.osdrawer.net/caya/trunk#293"
-REVISION="2"
-ARCHITECTURES="x86 x86_gcc2"
-
-PROVIDES="
-	caya = $portVersion
-	lib:libexpat
-	"
-
-REQUIRES="
-	haiku >= $haikuVersion
-	"
-BUILD_REQUIRES="
-	devel:libexpat
-	"
-BUILD_PREREQUIRES="
-	haiku_devel >= $haikuVersion
-	cmd:gcc
-	cmd:ld
-	cmd:jam
-	cmd:which
-	"
-
-BUILD()
-{
-	mkdir -p $sourceDir/generated/objects-haiku-x86-gcc2-debug/application
-	echo $portVersion > $sourceDir/generated/objects-haiku-x86-gcc2-debug/application/svn_revision
-	./configure
-	jam
-}
-
-INSTALL()
-{
-	mkdir -p $appsDir/Caya
-	mkdir -p $appsDir/Caya/smileys
-	mkdir -p $appsDir/Caya/protocols
-	mkdir -p $includeDir/caya/
-
-	cp generated/distro-haiku-*-debug/Caya $appsDir/Caya
-	cp generated/distro-haiku-*-debug/aim $appsDir/Caya/protocols
-	cp smileys/*.gif smileys/settings.xml $appsDir/Caya/smileys
-	cp application/Caya.h $includeDir/caya/
-	cp application/CayaProtocol.h $includeDir/caya/
-	cp application/CayaConstants.h $includeDir/caya/
-	cp application/CayaProtocolMessages.h $includeDir/caya/
-}
-
-LICENSE="MIT"
-COPYRIGHT="
-	2009-2011 Andrea Anzani
-	2009-2011 Pierluigi Fiorini
-	2010-2011 Oliver Ruiz Dorantes
-	2011-2012 Casalinuovo Dario
-	"
-DESCRIPTION="
-	Caya is a multiprotocol chat client for Haiku. It supports msn, aim, jabber,
-	google talk, and facebook.
-	"
diff --git a/haiku-apps/caya/patches/caya-293.patchset b/haiku-apps/caya/patches/caya-293.patchset
deleted file mode 100644
index 05202ecd3..000000000
--- a/haiku-apps/caya/patches/caya-293.patchset
+++ /dev/null
@@ -1,49 +0,0 @@
-From abd4aac88a07ea0a9967be553833a121bf98ccf9 Mon Sep 17 00:00:00 2001
-From: Adrien Destugues <pulkomandy@pulkomandy.tk>
-Date: Sat, 5 Oct 2013 13:17:26 +0200
-Subject: Fix gcc4 detection
-
-
-diff --git a/build/jam/CheckRules b/build/jam/CheckRules
-index 6fbc213..294fab7 100644
---- a/build/jam/CheckRules
-+++ b/build/jam/CheckRules
-@@ -14,7 +14,7 @@ rule CheckGccPlatform
- 		# /boot/develop/lib/x86 to judge whether this is a BeOS compatible and thus
- 		# gcc 2 platform. This is not entirely correct, but should be good enough
- 		# for the time being.
--		local haveLibStdC++.R4 = [ Glob /boot/develop/lib/x86 : libstdc++.r4.so ] ;
-+		local haveLibStdC++.R4 = [ Glob /boot/system/develop/tools/lib : libstdc++.r4.so ] ;
- 		if ! $(haveLibStdC++.R4) {
- 			IS_GCC4_PLATFORM = 1 ;
- 			Echo Using GCC4 platform ;
--- 
-1.8.3.4
-
-
-From db90c28cb36b59a010abec5406f77c1c4135f378 Mon Sep 17 00:00:00 2001
-From: Adrien Destugues <pulkomandy@pulkomandy.tk>
-Date: Sat, 5 Oct 2013 13:19:23 +0200
-Subject: Let haikuporter compute the version
-
- * The .svn dir isn't available in the chroot, so there is no way it can
-be used to detect the SVN revision.
-
-diff --git a/build/jam/MainBuildRules b/build/jam/MainBuildRules
-index 292a2a5..314c4d7 100644
---- a/build/jam/MainBuildRules
-+++ b/build/jam/MainBuildRules
-@@ -368,9 +368,7 @@ rule CreateSVNRevisionFile file
- {
- 	# CreateSVNRevisionFile <file>
- 
--	local svnEntries = <svn>entries ;
--	SEARCH on $(svnEntries) = [ FDirName $(TOP) .svn ] ;
--	Depends $(file) : $(svnEntries) ;
-+	# Let haikuporter do it as the .svn dir is removed on checkout
- }
- 	
- actions CreateSVNRevisionFile
--- 
-1.8.3.4
-
diff --git a/haiku-apps/caya_gpl_protocols/caya_gpl_protocols-0.HEAD.recipe b/haiku-apps/caya_gpl_protocols/caya_gpl_protocols-0.HEAD.recipe
deleted file mode 100644
index 225624b42..000000000
--- a/haiku-apps/caya_gpl_protocols/caya_gpl_protocols-0.HEAD.recipe
+++ /dev/null
@@ -1,31 +0,0 @@
-DESCRIPTION="GPL Plugins for Caya, protocols MSN and XMPP" 
-HOMEPAGE="http://dev.osdrawer.net/projects/caya-gpl-protocols" 
-SRC_URI="svn+http://svn.osdrawer.net/caya-gpl-protocols/trunk"
-REVISION="1"
-STATUS_HAIKU="stable"
-DEPEND="caya"
-#CHECKSUM_MD5=""
-BUILD()
-{
-	cd caya-gpl-protocols-0.HEAD
-	./configure
-	jam
-}
-
-INSTALL()
-{
-	cd caya-gpl-protocols-0.HEAD
-	mkdir -p ${DESTDIR}/`finddir B_APPS_DIRECTORY`/Caya/protocols
-	PLATFORM=`setgcc|tr / -|cut -f3 -d' '`
-	cp generated/distro-haiku-$PLATFORM-debug/msn ${DESTDIR}/`finddir B_APPS_DIRECTORY`/Caya/protocols
-	cp generated/distro-haiku-$PLATFORM-debug/gtalk ${DESTDIR}/`finddir B_APPS_DIRECTORY`/Caya/protocols
-	cp generated/distro-haiku-$PLATFORM-debug/facebook ${DESTDIR}/`finddir B_APPS_DIRECTORY`/Caya/protocols
-	cp generated/distro-haiku-$PLATFORM-debug/jabber ${DESTDIR}/`finddir B_APPS_DIRECTORY`/Caya/protocols
-	cp generated/distro-haiku-$PLATFORM-debug/yahoo ${DESTDIR}/`finddir B_APPS_DIRECTORY`/Caya/protocols
-}
-
-LICENSE="GNU GPL v2"
-COPYRIGHT="2010-2011 Casalinuovo Dario
-	2009-2011 Pierluigi Fiorini
-	2010-2011 Oliver Ruiz Dorantes"
-
diff --git a/haiku-apps/caya_gpl_protocols/caya_gpl_protocols-19.recipe b/haiku-apps/caya_gpl_protocols/caya_gpl_protocols-19.recipe
deleted file mode 100644
index 93816baed..000000000
--- a/haiku-apps/caya_gpl_protocols/caya_gpl_protocols-19.recipe
+++ /dev/null
@@ -1,30 +0,0 @@
-DESCRIPTION="GPL Plugins for Caya, protocols MSN and XMPP" 
-HOMEPAGE="http://dev.osdrawer.net/projects/caya-gpl-protocols" 
-SRC_URI="svn+http://svn.osdrawer.net/caya-gpl-protocols/trunk#19"
-REVISION="1"
-STATUS_HAIKU="stable"
-DEPEND="caya"
-#CHECKSUM_MD5=""
-MESSAGE="This port only builds with gcc4."
-BUILD()
-{
-	cd caya-gpl-protocols-19
-	./configure
-	jam
-}
-
-INSTALL()
-{
-	cd caya-gpl-protocols-19
-	mkdir -p ${DESTDIR}/`finddir B_APPS_DIRECTORY`/Caya/protocols
-	cp generated/distro-haiku-x86-gcc4-debug/msn ${DESTDIR}/`finddir B_APPS_DIRECTORY`/Caya/protocols
-	cp generated/distro-haiku-x86-gcc4-debug/gtalk ${DESTDIR}/`finddir B_APPS_DIRECTORY`/Caya/protocols
-	cp generated/distro-haiku-x86-gcc4-debug/facebook ${DESTDIR}/`finddir B_APPS_DIRECTORY`/Caya/protocols
-	cp generated/distro-haiku-x86-gcc4-debug/jabber ${DESTDIR}/`finddir B_APPS_DIRECTORY`/Caya/protocols
-}
-
-LICENSE="GNU GPL v2"
-COPYRIGHT="2010-2011 Casalinuovo Dario
-	2009-2011 Pierluigi Fiorini
-	2010-2011 Oliver Ruiz Dorantes"
-
diff --git a/haiku-apps/caya_gpl_protocols/caya_gpl_protocols-24.recipe b/haiku-apps/caya_gpl_protocols/caya_gpl_protocols-24.recipe
deleted file mode 100644
index e6c00dd27..000000000
--- a/haiku-apps/caya_gpl_protocols/caya_gpl_protocols-24.recipe
+++ /dev/null
@@ -1,31 +0,0 @@
-DESCRIPTION="GPL Plugins for Caya, protocols MSN and XMPP" 
-HOMEPAGE="http://dev.osdrawer.net/projects/caya-gpl-protocols" 
-SRC_URI="svn+http://svn.osdrawer.net/caya-gpl-protocols/trunk#24"
-REVISION="1"
-STATUS_HAIKU="stable"
-DEPEND="caya"
-#CHECKSUM_MD5=""
-MESSAGE="This port only builds with gcc4."
-BUILD()
-{
-	cd caya-gpl-protocols-24
-	./configure
-	jam
-}
-
-INSTALL()
-{
-	cd caya-gpl-protocols-24
-	mkdir -p ${DESTDIR}/`finddir B_APPS_DIRECTORY`/Caya/protocols
-	cp generated/distro-haiku-x86-gcc4-debug/msn ${DESTDIR}/`finddir B_APPS_DIRECTORY`/Caya/protocols
-	cp generated/distro-haiku-x86-gcc4-debug/gtalk ${DESTDIR}/`finddir B_APPS_DIRECTORY`/Caya/protocols
-	cp generated/distro-haiku-x86-gcc4-debug/facebook ${DESTDIR}/`finddir B_APPS_DIRECTORY`/Caya/protocols
-	cp generated/distro-haiku-x86-gcc4-debug/jabber ${DESTDIR}/`finddir B_APPS_DIRECTORY`/Caya/protocols
-	cp generated/distro-haiku-x86-gcc4-debug/yahoo ${DESTDIR}/`finddir B_APPS_DIRECTORY`/Caya/protocols
-}
-
-LICENSE="GNU GPL v2"
-COPYRIGHT="2010-2011 Casalinuovo Dario
-	2009-2011 Pierluigi Fiorini
-	2010-2011 Oliver Ruiz Dorantes"
-
diff --git a/haiku-apps/caya_gpl_protocols/caya_gpl_protocols-35.recipe b/haiku-apps/caya_gpl_protocols/caya_gpl_protocols-35.recipe
deleted file mode 100644
index f6df24bd5..000000000
--- a/haiku-apps/caya_gpl_protocols/caya_gpl_protocols-35.recipe
+++ /dev/null
@@ -1,31 +0,0 @@
-DESCRIPTION="GPL Plugins for Caya, protocols MSN and XMPP" 
-HOMEPAGE="http://dev.osdrawer.net/projects/caya-gpl-protocols" 
-SRC_URI="svn+http://svn.osdrawer.net/caya-gpl-protocols/trunk#35"
-REVISION="1"
-STATUS_HAIKU="stable"
-DEPEND="caya"
-#CHECKSUM_MD5=""
-MESSAGE="This port only builds with gcc4."
-BUILD()
-{
-	cd caya-gpl-protocols-35
-	./configure
-	jam
-}
-
-INSTALL()
-{
-	cd caya-gpl-protocols-35
-	mkdir -p ${DESTDIR}/`finddir B_APPS_DIRECTORY`/Caya/protocols
-	cp generated/distro-haiku-x86-gcc4-debug/msn ${DESTDIR}/`finddir B_APPS_DIRECTORY`/Caya/protocols
-	cp generated/distro-haiku-x86-gcc4-debug/gtalk ${DESTDIR}/`finddir B_APPS_DIRECTORY`/Caya/protocols
-	cp generated/distro-haiku-x86-gcc4-debug/facebook ${DESTDIR}/`finddir B_APPS_DIRECTORY`/Caya/protocols
-	cp generated/distro-haiku-x86-gcc4-debug/jabber ${DESTDIR}/`finddir B_APPS_DIRECTORY`/Caya/protocols
-	cp generated/distro-haiku-x86-gcc4-debug/yahoo ${DESTDIR}/`finddir B_APPS_DIRECTORY`/Caya/protocols
-}
-
-LICENSE="GNU GPL v2"
-COPYRIGHT="2010-2011 Casalinuovo Dario
-	2009-2011 Pierluigi Fiorini
-	2010-2011 Oliver Ruiz Dorantes"
-
diff --git a/haiku-apps/caya_gpl_protocols/patches/caya_gpl_protocols-0.HEAD.patch b/haiku-apps/caya_gpl_protocols/patches/caya_gpl_protocols-0.HEAD.patch
deleted file mode 100644
index a45bd230b..000000000
--- a/haiku-apps/caya_gpl_protocols/patches/caya_gpl_protocols-0.HEAD.patch
+++ /dev/null
@@ -1,214 +0,0 @@
-Index: libs/libmsn/msnobject.cpp
-===================================================================
---- libs/libmsn/msnobject.cpp	(revision 36)
-+++ libs/libmsn/msnobject.cpp	(working copy)
-@@ -30,7 +30,7 @@
- {
-     void MSNObject::addMSNObject(std::string filename, int Type)
-     {
--        std::ifstream::pos_type size;
-+        std::streampos size;
-         char * memblock;
-         SHA_CTX  ctx;
-         unsigned char digest[SHA_DIGEST_LENGTH];
-Index: libs/libmsn/Jamfile
-===================================================================
---- libs/libmsn/Jamfile	(revision 36)
-+++ libs/libmsn/Jamfile	(working copy)
-@@ -2,6 +2,7 @@
- 
- SubDirSysHdrs [ FDirName $(TOP) ] ;
- SubDirSysHdrs [ FDirName $(TOP) libs ] ;
-+SubDirSysHdrs [ FDirName $(TOP) libs libmsn ] ;
- 
- SubDirSysHdrs [ FDirName $(OPENSSL_INCLUDE_DIR) ] ;
- 
-Index: libs/libmsn/connection.h
-===================================================================
---- libs/libmsn/connection.h	(revision 36)
-+++ libs/libmsn/connection.h	(working copy)
-@@ -29,6 +29,7 @@
- #include <vector>
- #include <map>
- #include <stdexcept>
-+#include <sstream>
- 
- #ifdef _MSC_VER
- #pragma warning( disable : 4290 )
-Index: libs/libmsn/util.cpp
-===================================================================
---- libs/libmsn/util.cpp	(revision 36)
-+++ libs/libmsn/util.cpp	(working copy)
-@@ -146,8 +146,8 @@
-              it1 != s1.end() && it2 != s2.end();
-              ++it1, ++it2)
-         { 
--            if (std::toupper(*it1) != std::toupper(*it2)) 
--                return std::toupper(*it1) - std::toupper(*it2);
-+            if (toupper(*it1) != toupper(*it2)) 
-+                return toupper(*it1) - toupper(*it2);
-         }
-         size_t size1 = s1.size(), size2 = s2.size(); 
-         return (int) (size1 - size2);
-@@ -358,11 +358,11 @@
-     int FileSize(const char* sFileName)
-     {
-         std::ifstream f;
--        f.open(sFileName, std::ios_base::binary | std::ios_base::in);
-+        f.open(sFileName, std::ios::binary | std::ios::in);
-         if (!f.good() || f.eof() || !f.is_open()) { return 0; }
--        f.seekg(0, std::ios_base::beg);
--        std::ifstream::pos_type begin_pos = f.tellg();
--        f.seekg(0, std::ios_base::end);
-+        f.seekg(0, std::ios::beg);
-+        std::streampos begin_pos = f.tellg();
-+        f.seekg(0, std::ios::end);
-         return static_cast<int>(f.tellg() - begin_pos);
-     }
- 
-Index: libs/libmsn/message.cpp
-===================================================================
---- libs/libmsn/message.cpp	(revision 36)
-+++ libs/libmsn/message.cpp	(working copy)
-@@ -124,7 +124,7 @@
-     {
-         std::string color = this->getFormatInfo()["CO"];
-         assert(color.size() <= 6 && color.size() >= 0);
--        color.insert(0U, 6 - color.size(), '0');
-+        color.insert((size_t)0, (size_t)(6 - color.size()), '0');
-         int r = 0, g = 0, b = 0;
-         
-         b = strtol(color.substr(0, 2).c_str(), NULL, 16);
-@@ -167,7 +167,7 @@
-     
-     void Message::setColor(std::string color)
-     {
--        color.insert(0U, 6 - color.size(), '0');
-+        color.insert((size_t)0, (size_t)(6 - color.size()), '0');
-         int r = 0, g = 0, b = 0;
-         
-         r = strtol(color.substr(0, 2).c_str(), NULL, 16);
-Index: libs/libyahoo2/yahoo_httplib.c
-===================================================================
---- libs/libyahoo2/yahoo_httplib.c	(revision 36)
-+++ libs/libyahoo2/yahoo_httplib.c	(working copy)
-@@ -29,19 +29,7 @@
- #include <stdio.h>
- #include <stdlib.h>
- 
--#if STDC_HEADERS
- # include <string.h>
--#else
--# if !HAVE_STRCHR
--#  define strchr index
--#  define strrchr rindex
--# endif
--char *strchr(), *strrchr();
--# if !HAVE_MEMCPY
--#  define memcpy(d, s, n) bcopy ((s), (d), (n))
--#  define memmove(d, s, n) bcopy ((s), (d), (n))
--# endif
--#endif
- 
- #include <errno.h>
- #if HAVE_UNISTD_H
-@@ -374,7 +362,6 @@
- void yahoo_http_head(int id, const char *url, const char *cookies, int len,
- 	char *payload, yahoo_get_fd_callback callback, void *data)
- {
--	printf("yahoo_http_read\n");
- 	char host[255];
- 	int port = 80;
- 	char path[255];
-Index: libs/libgloox/parser.cpp
-===================================================================
---- libs/libgloox/parser.cpp	(revision 36)
-+++ libs/libgloox/parser.cpp	(working copy)
-@@ -141,7 +141,7 @@
-   {
-     if( pos + needle.length() <= data.length() )
-     {
--      if( !data.compare( pos, needle.length(), needle ) )
-+      if( !data.compare(pos, needle.length(), needle ) )
-       {
-         pos += needle.length() - 1;
-         return ForwardFound;
-Index: libs/libgloox/siprofileft.cpp
-===================================================================
---- libs/libgloox/siprofileft.cpp	(revision 36)
-+++ libs/libgloox/siprofileft.cpp	(working copy)
-@@ -84,11 +84,11 @@
-     DataFormField* dff = df.addField( DataFormField::TypeListSingle, "stream-method" );
-     StringMultiMap sm;
-     if( streamTypes & FTTypeS5B )
--      sm.insert( std::make_pair( "s5b", XMLNS_BYTESTREAMS ) );
-+      sm.insert( std::make_pair<const char*, std::string>( "s5b", XMLNS_BYTESTREAMS ) );
-     if( streamTypes & FTTypeIBB )
--      sm.insert( std::make_pair( "ibb", XMLNS_IBB ) );
-+      sm.insert( std::make_pair<const char*, std::string>( "ibb", XMLNS_IBB ) );
-     if( streamTypes & FTTypeOOB )
--      sm.insert( std::make_pair( "oob", XMLNS_IQ_OOB ) );
-+      sm.insert( std::make_pair<const char*, std::string>( "oob", XMLNS_IQ_OOB ) );
-     dff->setOptions( sm );
-     feature->addChild( df.tag() );
- 
-Index: libs/libgloox/connectionbosh.cpp
-===================================================================
---- libs/libgloox/connectionbosh.cpp	(revision 36)
-+++ libs/libgloox/connectionbosh.cpp	(working copy)
-@@ -303,7 +303,7 @@
- 
-   bool ci_equal( char ch1, char ch2 )
-   {
--    return std::toupper( (unsigned char)ch1 ) == std::toupper( (unsigned char)ch2 );
-+    return toupper( (unsigned char)ch1 ) == toupper( (unsigned char)ch2 );
-   }
- 
-   std::string::size_type ci_find( const std::string& str1, const std::string& str2 )
-Index: libs/libgloox/gloox.h
-===================================================================
---- libs/libgloox/gloox.h	(revision 36)
-+++ libs/libgloox/gloox.h	(working copy)
-@@ -1214,7 +1214,7 @@
-   /**
-    * A multimap of strings.
-    */
--  typedef std::multimap<std::string, std::string> StringMultiMap;
-+  typedef std::multimap<const std::string, const std::string> StringMultiMap;
- 
-   class StanzaExtension;
-   /**
-Index: protocols/msn/MSN.cpp
-===================================================================
---- protocols/msn/MSN.cpp	(revision 36)
-+++ protocols/msn/MSN.cpp	(working copy)
-@@ -52,7 +52,7 @@
- const uint32 kAvatarCheckMessage = 'AVMs';
- 
- struct pollfd* kPollSockets = NULL;
--struct ssl {
-+struct Ssl {
- 	bool isSSL;
- 	bool isConnected;
- 	SSL *ssl;
-@@ -718,7 +718,7 @@
- 			return;
- 		}
- 
--		kSocketsSsl = (struct ssl*) realloc(kSocketsSsl, (kSocketsAvailable + 10) * sizeof(struct ssl));
-+		kSocketsSsl = (struct Ssl*) realloc(kSocketsSsl, (kSocketsAvailable + 10) * sizeof(struct Ssl));
- 		if (kSocketsSsl == NULL) {
- 			Error("Memory Error!!\n", NULL);
- 			return;
-Index: protocols/xmpp/Jamfile
-===================================================================
---- protocols/xmpp/Jamfile	(revision 36)
-+++ protocols/xmpp/Jamfile	(working copy)
-@@ -2,6 +2,7 @@
- 
- SubDirSysHdrs [ FDirName $(TOP) ] ;
- SubDirSysHdrs [ FDirName $(TOP) libs ] ;
-+SubDirSysHdrs [ FDirName $(TOP) libs libgloox ] ;
- SubDirSysHdrs [ FDirName $(OPENSSL_INCLUDE_DIR) ] ;
- SubDirSysHdrs [ FDirName $(CAYA_INCLUDE_DIR) ] ;
- 
diff --git a/haiku-apps/converttolf/converttolf-0.0.0.recipe b/haiku-apps/converttolf/converttolf-0.0.0.recipe
new file mode 100644
index 000000000..e24a0eec9
--- /dev/null
+++ b/haiku-apps/converttolf/converttolf-0.0.0.recipe
@@ -0,0 +1,51 @@
+SUMMARY="A small tool to turn CRLF into LF without fuss!"
+DESCRIPTION="
+	ConvertToLF is a filter that removes the carriage returns used in the
+	end of file markers on some operating systems. Haiku uses just a line
+	feed to mark the end of line, and gcc, the Haiku compiler and StyledEdit
+	don't function properly with carriage returns in source code / text files.
+	" # Taken from the homepage
+
+HOMEPAGE="https://github.com/HaikuArchives/ConvertToLF/"
+SRC_URI="git://github.com/HaikuArchives/ConvertToLF.git#d8ec50f92a65d9fd1058adf98fe2515fbafa243c"
+
+REVISION="1"
+
+COPYRIGHT="
+	2001 fReT
+	"
+
+LICENSE="GNU GPL v2"
+
+ARCHITECTURES="x86_gcc2 x86 ?x86_64"
+
+PROVIDES="
+	ConvertToLF = $portVersion
+	app:ConvertToLF = $portVersion
+	"
+
+REQUIRES="
+	haiku >= $haikuVersion
+	"
+
+BUILD_PREREQUIRES="
+	cmd:gcc
+	cmd:xres
+	"
+
+BUILD_REQUIRES="
+	haiku_devel >= $haikuVersion
+	"
+BUILD()
+{
+	g++ -lbe -ltracker -o ConvertToLF Source/Strip.cpp
+	rc -o ConvertToLF.rsrc Source/ConvertToLF.rdef
+	xres -o ConvertToLF ConvertToLF.rsrc
+	mimeset -f ConvertToLF
+}
+
+INSTALL()
+{
+	mkdir -p $addOnsDir/Tracker
+	cp ConvertToLF $addOnsDir/Tracker
+}
diff --git a/haiku-apps/dockbert/dockbert-1.0.2b1.recipe b/haiku-apps/dockbert/dockbert-1.0.2b1.recipe
index 2a9b0db16..9dd4a60ef 100644
--- a/haiku-apps/dockbert/dockbert-1.0.2b1.recipe
+++ b/haiku-apps/dockbert/dockbert-1.0.2b1.recipe
@@ -1,13 +1,13 @@
 DESCRIPTION="DockBert is a Deskbar modification. It adds a dock to your deskbar where you may have shortcuts organized in "tabs", a tab of the running apps and some other general eyecandy."
 SUMMARY="DockBert adds a dock to your deskbar"
 HOMEPAGE="https://github.com/HaikuArchives/DockBert"
-SRC_URI="git+https://github.com/HaikuArchives/DockBert"
+SRC_URI="git+https://github.com/HaikuArchives/DockBert#057c54674d"
 COPYRIGHT="2005 yellowTAB GmbH"
 LICENSE="BSD (3-clause)"
 
-REVISION="1"
+REVISION="2"
 
-ARCHITECTURES="x86_gcc2 ?x86 ?x86_64"
+ARCHITECTURES="x86_gcc2 x86 ?x86_64"
 
 PROVIDES="
 	dockbert = $portVersion
@@ -19,30 +19,28 @@ REQUIRES="
 	"
 
 BUILD_REQUIRES="
+	haiku_devel >= $haikuVersion
 	"
 
 BUILD_PREREQUIRES="
-	haiku_devel >= $haikuVersion
 	makefile_engine
 	cmd:gcc
 	cmd:make
 	cmd:mkdepend
 	"
 
+PATCHES="dockbert-1.0.2b1.patchset"
+
 BUILD()
 {
 	cd trunk
-	make BUILDHOME=`finddir B_SYSTEM_DEVELOP_DIRECTORY`
+	make OBJ_DIR=objects \
+		BUILDHOME=`finddir B_SYSTEM_DEVELOP_DIRECTORY`
 }
 
 INSTALL()
-{
-	architecture=$(echo $buildArchitecture | sed 's/_/-/g')
-	
-	cd trunk/objects.$architecture-debug
-	
-	mkdir -p $appsDir/Dock
-	cp -a Dock $appsDir/Dock
-	
-	addAppDeskbarSymlink $appsDir/Dock/Dock
+{	
+	mkdir -p $appsDir
+	cp -a trunk/objects/Dock $appsDir/Dock
+	addAppDeskbarSymlink $appsDir/Dock
 }
diff --git a/haiku-apps/dockbert/patches/dockbert-1.0.2b1.patchset b/haiku-apps/dockbert/patches/dockbert-1.0.2b1.patchset
new file mode 100644
index 000000000..7d7c88028
--- /dev/null
+++ b/haiku-apps/dockbert/patches/dockbert-1.0.2b1.patchset
@@ -0,0 +1,22 @@
+From c7dd365b426c78ef62bfb1b1b8ba149e9b6a7afb Mon Sep 17 00:00:00 2001
+From: Chris Roberts <cpr420@gmail.com>
+Date: Mon, 2 Dec 2013 18:12:54 -0700
+Subject: Fix makefile stdc++ libs
+
+
+diff --git a/trunk/Makefile b/trunk/Makefile
+index fa6193c..748e5fd 100644
+--- a/trunk/Makefile
++++ b/trunk/Makefile
+@@ -60,7 +60,7 @@ RSRCS= dockbert.rsrc
+ #		naming scheme you need to specify the path to the library
+ #		and it's name
+ #		library: my_lib.a entry: my_lib.a or path/my_lib.a
+-LIBS= be tracker stdc++.r4 locale localestub
++LIBS= be tracker $(STDCPPLIBS) localestub
+ 
+ #	specify additional paths to directories following the standard
+ #	libXXX.so or libXXX.a naming scheme.  You can specify full paths
+-- 
+1.8.3.4
+
diff --git a/haiku-apps/documentviewer/documentviewer-0.3.2.recipe b/haiku-apps/documentviewer/documentviewer-0.3.2.recipe
index f1ea0c856..439e422c4 100644
--- a/haiku-apps/documentviewer/documentviewer-0.3.2.recipe
+++ b/haiku-apps/documentviewer/documentviewer-0.3.2.recipe
@@ -5,7 +5,7 @@ COPYRIGHT="2010-2012 Haiku, Inc"
 HOMEPAGE="http://haiku.bplaced.net/" 
 SRC_URI="http://haiku.bplaced.net/DocumentViewer/sources/documentviewer-0.3.2.zip"
 CHECKSUM_MD5="1fddc4292ecb14f343eb18b0bf723b13"
-REVISION="1"
+REVISION="2"
 ARCHITECTURES="x86"
 if [ $effectiveTargetArchitecture != x86_gcc2 ]; then
 	# x86_gcc2 is fine as primary target architecture as long as we're building
@@ -32,6 +32,7 @@ REQUIRES="
 	"
 
 BUILD_REQUIRES="
+	haiku${secondaryArchSuffix}_devel >= $haikuVersion
 	devel:libdjvulibre
 	devel:libfitz
 	devel:libfreetype
@@ -42,7 +43,6 @@ BUILD_REQUIRES="
 	"
 
 BUILD_PREREQUIRES="
-	haiku${secondaryArchSuffix}_devel >= $haikuVersion
 	cmd:jam
 	cmd:g++$secondaryArchSuffix
 	"
@@ -58,6 +58,5 @@ INSTALL()
 {
 	mkdir -p $appsDir
 	cp application/DocumentViewer $appsDir
-
 	addAppDeskbarSymlink $appsDir/DocumentViewer
 }
diff --git a/haiku-apps/filecropper/filecropper-1.recipe b/haiku-apps/filecropper/filecropper-1.recipe
index 58ebaec8b..421a5d542 100644
--- a/haiku-apps/filecropper/filecropper-1.recipe
+++ b/haiku-apps/filecropper/filecropper-1.recipe
@@ -1,32 +1,38 @@
 DESCRIPTION="About FileCropper:
-Truncates files of any kind. Cuts off everything from a given offset (bytes) to the end of the file. (GUI app)."
-SUMMARY="Truncates files of any kind. Cuts off everything from a given offset (bytes) to the end of the file. (GUI app)."
+Truncates files of any kind. Cuts off everything from a given offset
+(bytes) to the end of the file. (GUI app)."
+SUMMARY="Truncates files of any kind."
+COPYRIGHT="2002 Maurice Michalski"
+LICENSE="MIT"
 HOMEPAGE="https://github.com/HaikuArchives/FileCropper"
-SRC_URI="git+git://github.com/HaikuArchives/FileCropper.git"
-REVISION="1"
+SRC_URI="git://github.com/HaikuArchives/FileCropper.git#0dde0f752a"
+REVISION="2"
 
-ARCHITECTURES="x86_gcc2 ?x86 ?x86_64"
+ARCHITECTURES="x86_gcc2 x86 ?x86_64"
 
 PROVIDES="
 	filecropper = $portVersion
-	app:filecropper = $portVersion"
-
-BUILD_PREREQUIRES="
-	haiku_devel >= $haikuVersion
-	cmd:gcc
-	cmd:xres"
+	app:filecropper = $portVersion
+	"
 
 REQUIRES="
-	haiku >= $haikuVersion"
+	haiku >= $haikuVersion
+	"
 
-COPYRIGHT="2002 Maurice Michalski"
+BUILD_REQUIRES="
+	haiku_devel >= $haikuVersion
+	"
 
-LICENSE="MIT"
+BUILD_PREREQUIRES="
+	cmd:gcc
+	cmd:xres
+	"
 
 BUILD()
 {
 	g++ app.cpp mainWindow.cpp -lbe -o FileCropper
 	xres -o FileCropper FileCropper.rsrc
+	mimeset -f FileCropper
 }
 
 INSTALL()
diff --git a/haiku-apps/filer/filer-1.0.0beta3.recipe b/haiku-apps/filer/filer-1.0.0beta3.recipe
new file mode 100644
index 000000000..8d4257244
--- /dev/null
+++ b/haiku-apps/filer/filer-1.0.0beta3.recipe
@@ -0,0 +1,56 @@
+SUMMARY="An automated file management system to copy, rename, move and modify files in an automated fashion"
+
+DESCRIPTION="
+	The Filer is a powerful, flexible automatic file organizer. It is an implementation of the
+	Sorting Chute idea conceived on the Glass Elevator mailing list for Haiku.
+	Just drag and drop files onto its icon, use the Terminal, or send it files via the Open With menu.
+	It can even automatically file items in folders you specify. Simple enough for the novice user,
+	powerful enough for developers. It automates file management according to a set of rules you determine
+	and is pretty much limited only by your imagination. Powerful on its own, it can also be extended by shell scripting.
+	" # Taken from homepage
+
+HOMEPAGE="http://darkwyrm.beemulated.net/apps/filer.htm"
+SRC_URI="git://github.com/HaikuArchives/Filer.git#4618b2ae9d7238254860cf3633701dd4f52dad37"
+REVISION="1"
+
+LICENSE="MIT"
+COPYRIGHT="2008 DarkWyrm"
+
+ARCHITECTURES="x86 x86_gcc2"
+
+
+PROVIDES="
+	filer = $portVersion
+	app:filer = $portVersion
+	"
+
+REQUIRES="
+	haiku >= $haikuVersion
+	lib:libsqlite3
+	"
+
+BUILD_PREREQUIRES="
+	cmd:gcc
+	cmd:xres
+	"
+
+BUILD_REQUIRES="
+	haiku_devel >= $haikuVersion
+	devel:libsqlite3
+	"
+
+BUILD()
+{
+	cd sources/Filer
+	gcc -lbe -lsqlite3 -ltranslation -o ../FilerApp *.cpp
+	rc -o Filer.rsrc Filer.rdef
+	xres -o ../FilerApp Filer.rsrc
+	mimeset -f ../FilerApp
+}
+
+INSTALL()
+{
+	mkdir -p $appsDir
+	cp sources/FilerApp $appsDir/Filer
+	addAppDeskbarSymlink $appsDir/Filer
+}
diff --git a/haiku-apps/filwip/filwip-1.0.0.recipe b/haiku-apps/filwip/filwip-1.0.0.recipe
new file mode 100644
index 000000000..948658a13
--- /dev/null
+++ b/haiku-apps/filwip/filwip-1.0.0.recipe
@@ -0,0 +1,60 @@
+SUMMARY="An app to clean all temporary and unwanted files"
+
+DESCRIPTION="
+	It cleans your hard disk of all unwanted files such as left-over temporary files,
+	cache files of internet sessions, logs, history files and the like. It works with
+	easy to write text files that include information about where the files to delete are.
+	" 
+
+HOMEPAGE="https://sites.google.com/site/appfilwip/home"
+SRC_URI="git://github.com/HaikuArchives/FilWip.git#8ec265e771019d31ed63be69cb8cc0d8a271f19b"
+REVISION="2"
+
+LICENSE="SPL"
+COPYRIGHT="2002 Ramshankar"
+
+ARCHITECTURES="x86 x86_gcc2"
+
+
+PROVIDES="
+	filwip = $portVersion
+	app:filwip = $portVersion
+	cmd:filwip = $portVersion
+	"
+
+REQUIRES="
+	haiku >= $haikuVersion
+	"
+
+BUILD_PREREQUIRES="
+	cmd:g++
+	cmd:xres
+	"
+BUILD_REQUIRES="
+	haiku_devel >= $haikuVersion
+	"
+
+USER_SETTINGS_FILES="
+	settings/FilWip_settings
+	"
+
+BUILD()
+{
+	cd Source
+	g++ -o ../FilWip -lbe -ltranslation -ltracker *.cpp */*.cpp
+	rc -o ../FilWip.rsrc FilWip.rdef
+	xres -o ../FilWip ../FilWip.rsrc
+	mimeset -f ../FilWip
+}
+
+INSTALL()
+{
+	mkdir -p $appsDir/FilWip
+	mkdir -p $binDir
+
+	cp -rf Plugins $appsDir/FilWip/Plugins
+	cp FilWip $appsDir/FilWip/FilWip
+
+	addAppDeskbarSymlink $appsDir/FilWip/FilWip
+	ln -s $appsDir/FilWip/FilWip $binDir/FilWip
+}
diff --git a/haiku-apps/filwip/licenses/SPL b/haiku-apps/filwip/licenses/SPL
new file mode 100644
index 000000000..c21379288
--- /dev/null
+++ b/haiku-apps/filwip/licenses/SPL
@@ -0,0 +1,202 @@
+===================
+Somebody Public License (SPL)
+===================
+
+Copyright 2002-2003 Ramshankar
+All rights reserved.
+
+1. Definitions
+
+	1. The term "Software" refers to BeConverter program that
+	   accompanies this license, all associated data files including
+	   but not limited to documentation, pictures and source code
+	   and all files associated with the source code. Any exclusions
+	   that does not belong to the term "Software" will be explicitly
+	   stated in the appropriate section of this License, eg: source
+	   files that are written by third party users etc.
+
+	2. The term "Author" refers to the individual V.Ramshankar,
+   	   who wrote the Software and holds the copyright. Section 5
+	   of this License defines the owner(s) of this Software.
+
+	3. The term "Commercial Use" or "Commercial distribution"
+	   means distribution of the Software, or parts thereof, for
+	   monetary benefits to any entity including but not limited
+	   to companies.
+
+	4. The term "License" means this document.
+
+	5. The term "Original Code" refers to the source code for the
+	   Software written fully by the Author. If the source code
+	   contains third-party source code, they do not fall under this
+	   license. When the Author makes changes to the Original
+	   code, the changed code thereof is referred as Original Code.
+	   Thus any code written by the Author is referred to as
+	   Original Code.
+
+	6. The term "Modifications" means any addition or deletion
+	   from the substance or structure of the Original Code by any
+	   entity other than the Author. The modified source code will
+	   thereof not be called Original Code as it was not modified by
+	   the Author.
+	
+	7. The term "Source Code" means those files that are either
+	   compiled and/or linked by a compiler/linker to produce the
+	   final binary file which can be executed by the Operating
+	   System. The Source Code can either be in compressed or
+	   archival form, provided the appropriate decompression or
+	   de-archiving program is widely available for no charge.
+		   
+	8. The term "You" or "Your" means an individual or a legal
+	   entity exercising rights under, and complying with all of
+	   the terms of, this License or a future version of this
+	   License. For legal entities, "You" includes any entity which
+	   controls, is controlled by, or is under common control with
+	   You. For purposes of this definition, "control" means (a)
+	   the power, direct or indirect, to cause the direction or
+	   management of such entity, whether by contract or
+	   otherwise, or (b) ownership of more than fifty percent
+	   (50%) of the outstanding shares or beneficial ownership
+	   of such entity.
+
+2. Source Code License
+
+	This section is only applicable if the source code is distributed by
+	the Author. Otherwise just ignore section 2 of this agreement.
+
+	This section of the license does not apply to source code written
+	by third parties included with and/or used by the Software. These
+	include libraries, components and/or other third party modules'
+	source code. All third party code fall under their respective licenses
+	defined in "License.txt" of that particular code component. The
+	term "Code" or "Source Code" refers to the source code and/or
+	parts thereof, of the Software.
+
+	2.1.1 Using the Source Code in freeware programs
+	You are allowed to use parts of the Code in your program/s
+	provided the program is distributed totally free of cost. In this case
+	you must give credit to the Author in your program's interactive
+	mode (i.e. viewable by the end-user). Notification about the use
+	of the Code to the Author would be appreciated but not needed.
+
+	2.1.2. Using the Source Code in Commercial/Paid softwares
+	You are allowed to use the Code and parts thereof in commercial
+	or shareware programs provided you adhere to the following 
+	condition:
+		The Author receives a free copy of ever major
+		version of the commercial/paid software through download
+		from a website,	in the latter case the Author must be given
+		the details of where to download.
+
+	2.2.1 Modifying the Source Code
+	You are allowed to modify the Source Code in any manner and
+	distribute it, provided you disclaim the Author from any and all
+	responsibilities and/or liabilities and you explicitly state that the
+	modified distribution is not an original distribution made by the
+	Author and that it is in fact a modified version of the Source
+	Code. This modified code can be used as the Source Code/Code
+	in Sections 2.1.1 and 2.1.2 of this License.
+	
+	2.2.2 Public distribution in websites etc.
+	Publishing the Source Code, or parts thereof and/or modified
+	versions of the Source Code, or parts thereof, in public mediums
+	such as CD-ROMs, floppy disks, DVDs and/or the Internet or in
+	other mediums such as books, journals etc. are allowed. If the
+	medium and/or viewing of the medium is commercial (providing
+	monetary gains to one or more entities) the Author must
+	be contacted to negotiate a premium. If the medium and/or
+	viewing of the medium is completely free of cost to the public,
+	informing the Author about such a medium would be appreciated.
+
+3. Program License
+	You are permitted to copy and distribute the Software any
+	number of times, provided you include this License and all
+	other License agreements (if any) that you received along with
+	this Software. You also must keep any and all documentation
+	intact. You may or may not distribute the Source Code
+	but if you are distributing the Source Code, it must be in
+	accord with Section 2 of thise License. For any enquiries with
+	this clause please contact the Author for clarification. Any and
+	all distributions here forth will be in accord to Section 3 of the License.
+
+	3.1.1 Bundling in Commercial distributions.
+	You are allowed to "bundle" this Software or parts thereof,
+	in a commercial or shareware distribution provided You give
+	credit to the Author as viewable by the end-user/customer.
+	And You must contact the Author for negotiating a premium
+	for such a distribution. The premium amount if any at all will
+	be determined by the Author. The amount will be in accord to
+	the cost of purchase of the distribution.
+
+	3.1.2. Bundling in Freeware distributions.
+	You are allowed to "bundle" this Software in any non-
+	commercial (freeware) distribution, meaning the distributor/s
+	do not gain any monetary benefits of any kind. Prior
+	permission must be obtained from the Author, and credit for
+	the Software must be explicitly mentioned as viewable by the
+	end-users of the package.
+
+4. Term and Termination
+	This License is effective until terminated. If you install the
+	Software and/or parts thereof, it implies you have read this
+	License and agreed to and will comply with all the terms and
+	conditions of this License.
+
+	If you do not agree to any of the terms and conditions of this
+	License, you are not permitted to install the Software or
+	parts thereof, and this License will be terminated and be
+	void. In which case, You must remove all copies of the
+	Software and its install program from your all	Your computer
+	system/s. Additionally, you may terminate this License at
+	any time by destroying the Software and all copies and parts
+	thereof in computer system/s owned by You. This License
+	automatically terminates if you fail to comply with all its
+	terms and conditions. You agree that, upon such termination,
+	you will destroy (permanently erase) all copies of the
+	Software and parts thereof, including but not limited to
+	documentation and data files.
+
+5. Ownership
+	You agree that you neither own nor hereby acquire any
+	claim or right of ownership of the Software or to any related
+	patents, copyrights, trademarks or other intellectual property.
+	You only own the magnetic or other physical media on which
+	the Software is recorded or fixed. The Author retains all right,
+	title and interest in and to all copies of the Software as recorded
+	on the original media and all subsequent copies of the Software
+	at all times, regardless of the form or media or media in or on
+	which the original or other copies my subsequently exist. The
+	License is not a sale of the original or any subsequent copy.
+
+6. Disclaimer
+	THIS SOFTWARE IS PROVIDED BY THE AUTHOR "AS IS" AND
+	ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT
+	NOT LIMITED TO, THE IMPLIED WARRANTIES OF TITLE,
+	NON-INFRINGEMENT, MERCHANTABILITY AND FITNESS FOR
+	A PARTICULAR PURPOSE ARE DISCLAIMED.  IN NO EVENT
+	SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT,
+	INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+	DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT
+	OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
+	PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED
+	AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT,
+	STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
+	OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+	SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH
+	DAMAGE.    
+
+7. Additional Information
+	If you have questions about this License, or if you wish to
+	contact the author for any reason, you may write to following
+	e-mail address:
+		
+		ramshankar@bemail.org
+		ramshankar@themail.com
+	
+	Or visit the following website for the latest info on how
+	to contact the author:
+
+		http://www.geocities.com/ram_beos/
+
+All cited trademarks and registered trademarks are the property
+of their respective owners.
diff --git a/haiku-apps/fortuna/fortuna-1.0.0.recipe b/haiku-apps/fortuna/fortuna-1.0.0.recipe
index 8410ae72b..a64b8da0e 100644
--- a/haiku-apps/fortuna/fortuna-1.0.0.recipe
+++ b/haiku-apps/fortuna/fortuna-1.0.0.recipe
@@ -28,22 +28,25 @@ REQUIRES="
 	haiku >= $haikuVersion
 	"
 
-BUILD_REQUIRES="
-	haiku_devel >= $haikuVersion
+BUILD_PREREQUIRES="
 	cmd:gcc
 	cmd:xres
 	"
 
+BUILD_REQUIRES="
+	haiku_devel >= $haikuVersion
+	"
+
 BUILD()
 {
-	gcc -o Fortuna -lbe src/main.cpp src/FortuneWindow.cpp src/FortuneFunctions.cpp
+	g++ -o Fortuna -lbe src/main.cpp src/FortuneWindow.cpp src/FortuneFunctions.cpp
 	xres -o Fortuna src/Fortuna.rsrc
 	mimeset -f Fortuna
 }
 
 INSTALL()
 {
-	mkdir -p $appsDir/Fortuna
-	cp Fortuna $appsDir/Fortuna
-	addAppDeskbarSymlink $appsDir/Fortuna/Fortuna
+	mkdir -p $appsDir
+	cp Fortuna $appsDir
+	addAppDeskbarSymlink $appsDir/Fortuna
 }
diff --git a/haiku-apps/ftppositive/ftppositive-1.0.recipe b/haiku-apps/ftppositive/ftppositive-1.0.recipe
index 7e4997c61..9ad712d8e 100644
--- a/haiku-apps/ftppositive/ftppositive-1.0.recipe
+++ b/haiku-apps/ftppositive/ftppositive-1.0.recipe
@@ -1,20 +1,28 @@
 DESCRIPTION="FtpPositive is a simple graphical FTP client."
 SUMMARY="A simple graphical FTP client"
 HOMEPAGE="https://github.com/HaikuArchives/FtpPositive"
-SRC_URI="git+https://github.com/HaikuArchives/FtpPositive"
+SRC_URI="git+https://github.com/HaikuArchives/FtpPositive#442f47a22f"
 COPYRIGHT="2007 momoziro"
 LICENSE="FtpPositive"
 
-REVISION="1"
+REVISION="2"
 
-ARCHITECTURES="x86_gcc2 ?x86 ?x86_64"
+ARCHITECTURES="x86_gcc2 x86 ?x86_64"
 
 PROVIDES="
 	ftppositive = $portVersion
-	app:ftppositive = $portVersion"
+	app:ftppositive = $portVersion
+	"
+
+REQUIRES="
+	haiku >= $haikuVersion
+	"
+
+BUILD_REQUIRES="
+	haiku_devel >= $haikuVersion
+	"
 
 BUILD_PREREQUIRES="
-	haiku_devel >= $haikuVersion
 	cmd:gcc
 	cmd:jam"
 
@@ -22,14 +30,14 @@ BUILD()
 {
 	cd src
 	jam
+
+	#too lazy to fix the jamfile
+	mimeset -f FtpPositive
 }
 
 INSTALL()
 {
-	cd src
-	
-	mkdir -p $appsDir/FtpPositive
-	cp -a FtpPositive $appsDir/FtpPositive
-	
-	addAppDeskbarSymlink $appsDir/FtpPositive/FtpPositive
+	mkdir -p $appsDir
+	cp -a src/FtpPositive $appsDir
+	addAppDeskbarSymlink $appsDir/FtpPositive
 }
diff --git a/haiku-apps/hare/hare-beta1_git.recipe b/haiku-apps/hare/hare-beta1_git.recipe
index 2b914b37f..d6ff3eb19 100644
--- a/haiku-apps/hare/hare-beta1_git.recipe
+++ b/haiku-apps/hare/hare-beta1_git.recipe
@@ -10,13 +10,15 @@ COPYRIGHT="2000 FlipSide Software
 
 REVISION="1"
 
-ARCHITECTURES="x86_gcc2 x86 ?x86_64"
+ARCHITECTURES="x86_gcc2 !x86 !x86_64"
 
 PROVIDES="
 	Hare = $portVersion
+	app:Hare = $portVersion
 	"
 
 REQUIRES="
+	haiku >= $haikuVersion
 #	lib:liblame
 #	lib:liboggenc
 #	lib:libflac
@@ -25,19 +27,16 @@ REQUIRES="
 	"
 
 BUILD_REQUIRES="
-	haiku >= $haikuVersion
+	haiku${secondaryArchSuffix}_devel >= $haikuVersion
 	devel:libtag$secondaryArchSuffix
 	"
 
 BUILD_PREREQUIRES="
-	haiku${secondaryArchSuffix}_devel >= $haikuVersion
 	cmd:gcc$secondaryArchSuffix
 	cmd:cmake
 	cmd:make
 	"
 
-SOURCE_DIRECTORY="hare-beta1_git"
-
 BUILD()
 {
 	cmake .
@@ -48,7 +47,6 @@ INSTALL()
 {
 	mkdir -p $appsDir/Hare
 	cp -r build/* $appsDir/Hare
-
 	addAppDeskbarSymlink $appsDir/Hare/Hare Hare
 }
 
diff --git a/haiku-apps/jammin/jammin-0.1.0.recipe b/haiku-apps/jammin/jammin-0.1.0.recipe
index 4713577fa..920ae8ccd 100644
--- a/haiku-apps/jammin/jammin-0.1.0.recipe
+++ b/haiku-apps/jammin/jammin-0.1.0.recipe
@@ -1,41 +1,49 @@
 DESCRIPTION="The JamMin manages your jamfiles.
-Jamfiles are the thing that is most important to the user, bacause they declare the targets that should be built. Jamfiles are also used for organizing targets— each Jamfile is a separate project that can be built independently from the other projects."
+Jamfiles are the thing that is most important to the user, bacause
+they declare the targets that should be built. Jamfiles are also used
+for organizing targets— each Jamfile is a separate project that can be
+built independently from the other projects."
 SUMMARY="The Jamfile Administrator"
 HOMEPAGE="https://github.com/HaikuArchives/JamMin"
-SRC_URI="git+https://github.com/HaikuArchives/JamMin.git"
-REVISION="1"
-
+SRC_URI="git+https://github.com/HaikuArchives/JamMin.git#681e87d6d4"
+REVISION="2"
 COPYRIGHT="2003 Guido Casiraghi"
-
 LICENSE="MIT"
 
-ARCHITECTURES="x86_gcc2 ?x86 ?x86_64"
+ARCHITECTURES="x86_gcc2 !x86 !x86_64"
 
 PROVIDES="
 	JamMin = $portVersion
-	app:JamMin = $portVersion"
+	app:JamMin = $portVersion
+	"
+
+BUILD_REQUIRES="
+	haiku_devel >= $haikuVersion
+	"
 
 BUILD_PREREQUIRES="
-	haiku_devel >= $haikuVersion
 	makefile_engine
 	cmd:gcc
 	cmd:make
-	cmd:mkdepend"
+	cmd:mkdepend
+	"
 
 REQUIRES="
-	haiku >= $haikuVersion"
+	haiku >= $haikuVersion
+	"
 
 PATCHES="jampatch-1.patch"
 
 
 BUILD()
 {
-	make BUILDHOME=`finddir B_SYSTEM_DEVELOP_DIRECTORY`
+	make OBJ_DIR=objects \
+		BUILDHOME=`finddir B_SYSTEM_DEVELOP_DIRECTORY`
 }
 
 INSTALL()
 {
 	mkdir -p $appsDir
-	cp objects.x86-gcc2-release/JamApp $appsDir
+	cp objects/JamApp $appsDir
 	addAppDeskbarSymlink $appsDir/JamApp
 }
diff --git a/haiku-apps/nightandday/nightsandday-0.1.2.recipe b/haiku-apps/nightandday/nightsandday-0.1.2.recipe
index 0cb397820..63abe693d 100644
--- a/haiku-apps/nightandday/nightsandday-0.1.2.recipe
+++ b/haiku-apps/nightandday/nightsandday-0.1.2.recipe
@@ -1,29 +1,38 @@
-DESCRIPTION="This program was inspired by the 'TaveDesktop' program by the Tave Software Group. I think that 'TaveDesktop' was a good idea, but I wanted to be able to choose my own colors, since the 'TaveDesktop' colors looks bad on an 8bpp display.
-This program should be self-explanatory. You'll find a small Popup menu when clicking the small screen at the top-right corner of the window."
-SUMMARY="Automatic desktop color changer"
-HOMEPAGE="https://github.com/HaikuArchives/NightAndDay"
-SRC_URI="git+git://github.com/HaikuArchives/NightAndDay.git"
-REVISION="1"
+DESCRIPTION="
+This program was inspired by the 'TaveDesktop' program by the Tave
+Software Group. I think that 'TaveDesktop' was a good idea, but I
+wanted to be able to choose my own colors, since the 'TaveDesktop'
+colors looks bad on an 8bpp display.
 
-ARCHITECTURES="x86_gcc2 ?x86 ?x86_64"
+This program should be self-explanatory. You'll find a small Popup
+menu when clicking the small screen at the top-right corner of the
+window."
+SUMMARY="Automatic desktop color changer"
+COPYRIGHT="1998-1999 Jean-Baptiste M. Queru"
+LICENSE="GNU GPL v2"
+HOMEPAGE="https://github.com/HaikuArchives/NightAndDay"
+SRC_URI="git+git://github.com/HaikuArchives/NightAndDay.git#3bcc1a5a39"
+REVISION="2"
+
+ARCHITECTURES="x86_gcc2 !x86 !x86_64"
 
 PROVIDES="
-        nightanddays = $portVersion
-        app:nightanddays = $portVersion"
+	nightanddays = $portVersion
+	app:nightanddays = $portVersion
+	"
+
+BUILD_REQUIRES="
+	haiku_devel >= $haikuVersion
+	"
 
 BUILD_PREREQUIRES="
-        haiku_devel >= $haikuVersion
-        cmd:gcc
-        cmd:ld"
+	cmd:gcc
+	cmd:ld
+	"
 
 REQUIRES="
-	haiku >= $haikuVersion"
-
-COPYRIGHT="1998-1999 Jean-Baptiste M. Queru"
-
-LICENSE="GNU GPL v2"
-
-SOURCE_DIR="src"
+	haiku >= $haikuVersion
+	"
 
 BUILD()
 {
@@ -33,9 +42,9 @@ BUILD()
 
 INSTALL()
 {
-	NDDir=$appsDir/NightAndDay
-	mkdir -p $NDDir
-	cp src/NightAndDay $NDDir/NightAndDay
-	cp ReadMe $NDDir/ReadMe
-	addAppDeskbarSymlink $NDDir/NightAndDay
+	mkdir -p $appsDir
+	cp src/NightAndDay $appsDir
+	mkdir -p $docDir
+	cp ReadMe $docDir
+	addAppDeskbarSymlink $appsDir/NightAndDay
 }
diff --git a/haiku-apps/organizer/organizer-0.1.recipe b/haiku-apps/organizer/organizer-0.1.recipe
index d33820b3e..bb3d4e6ac 100644
--- a/haiku-apps/organizer/organizer-0.1.recipe
+++ b/haiku-apps/organizer/organizer-0.1.recipe
@@ -1,39 +1,45 @@
-DESCRIPTION="organizer - An organizer that helps you keep track on your appointments, notes and stuff."
+DESCRIPTION="An organizer that helps you keep track on your appointments, notes and stuff."
 SUMMARY="An organizer that helps you keep track on your appointments, notes and stuff."
+COPYRIGHT="2013 Marius Stene"
+LICENSE="Public Domain"
 HOMEPAGE="https://github.com/HaikuArchives/Organizer"
-SRC_URI="git+https://github.com/HaikuArchives/Organizer"
-REVISION="1"
+SRC_URI="git+https://github.com/HaikuArchives/Organizer#a534f0e992"
+REVISION="2"
 
-ARCHITECTURES="x86_gcc2 ?x86 ?x86_64"
+ARCHITECTURES="x86_gcc2 x86 ?x86_64"
 
 PROVIDES="
 	organizer = $portVersion
 	app:organizer = $portVersion
-	lib:libfSub"
+	lib:libfSub
+	"
+
+BUILD_REQUIRES="
+	haiku_devel >= $haikuVersion
+	"
 
 BUILD_PREREQUIRES="
-	haiku_devel >= $haikuVersion
 	makefile_engine
 	cmd:gcc
 	cmd:make
-	cmd:mkdepend"
+	cmd:mkdepend
+	"
 
 REQUIRES="
-	haiku >= $haikuVersion"
+	haiku >= $haikuVersion
+	"
 
 PATCHES="organizer-0.1.patch"
 
 USER_SETTINGS_FILES="
 	settings/fSub directory"
 
-COPYRIGHT="2013 Marius Stene"
-LICENSE="Public Domain"
+PATCHES="organizer-0.1.patchset"
 
 BUILD()
 {
 	cd Source
-	mkdir lib/lib
-	make BUILDHOME=`finddir B_SYSTEM_DEVELOP_DIRECTORY`
+	make OBJ_DIR=objects BUILDHOME=`finddir B_SYSTEM_DEVELOP_DIRECTORY`
 }
 
 INSTALL()
diff --git a/haiku-apps/organizer/patches/organizer-0.1.patch b/haiku-apps/organizer/patches/organizer-0.1.patch
deleted file mode 100644
index 91741f39f..000000000
--- a/haiku-apps/organizer/patches/organizer-0.1.patch
+++ /dev/null
@@ -1,258 +0,0 @@
-diff -ur Organizer/Source/App/calenderView.cpp Organizer-fix/Source/App/calenderView.cpp
---- Organizer/Source/App/calenderView.cpp	2013-11-22 11:46:04.618659840 +0000
-+++ Organizer-fix/Source/App/calenderView.cpp	2013-11-22 11:46:00.566755328 +0000
-@@ -55,7 +55,7 @@
- //Load Settings
- MSave load("load");
- 
--find_directory(B_COMMON_SETTINGS_DIRECTORY, &Path);
-+find_directory(B_SYSTEM_SETTINGS_DIRECTORY, &Path);
- String.SetTo(Path.Path());
- String.Append(SAVE_SETTINGS_PATH);
- Path.SetTo(String.String());
-diff -ur Organizer/Source/App/editScriptView.cpp Organizer-fix/Source/App/editScriptView.cpp
---- Organizer/Source/App/editScriptView.cpp	2013-11-22 11:46:04.629669888 +0000
-+++ Organizer-fix/Source/App/editScriptView.cpp	2013-11-22 11:46:00.575143936 +0000
-@@ -145,7 +145,7 @@
- BString tempString3;
- BString FilePath;
- 
--find_directory(B_COMMON_SETTINGS_DIRECTORY, &fPath);
-+find_directory(B_SYSTEM_SETTINGS_DIRECTORY, &fPath);
- tempString.SetTo(fPath.Path());
- tempString.Append(SAVE_HISTORY_PATH);
- fPath = tempString.String();
-@@ -183,7 +183,7 @@
- int ItemNumber = 1;
- MSave Save("Save");
- 
--find_directory(B_COMMON_SETTINGS_DIRECTORY, &Path);
-+find_directory(B_SYSTEM_SETTINGS_DIRECTORY, &Path);
- tempString.SetTo(Path.Path());
- tempString.Append(SAVE_HISTORY_PATH);
- 	for (int a = 1; a <= INT_MAXFILES; a++)
-diff -ur Organizer/Source/App/editWindow.cpp Organizer-fix/Source/App/editWindow.cpp
---- Organizer/Source/App/editWindow.cpp	2013-11-22 11:46:04.633864192 +0000
-+++ Organizer-fix/Source/App/editWindow.cpp	2013-11-22 11:46:00.578027520 +0000
-@@ -302,7 +302,7 @@
- 	MSave Save("save");
- 		if(!strcmp(fPath.String(), ""))
- 		{
--		find_directory(B_COMMON_SETTINGS_DIRECTORY, &Path);
-+		find_directory(B_SYSTEM_SETTINGS_DIRECTORY, &Path);
- 		fPath.SetTo(Path.Path());
- 		fPath.Append(SAVE_NOTE_PATH);
- 		Path = fPath.String();
-@@ -359,7 +359,7 @@
- 	MSave Save("save");
- 		if(!strcmp(fPath.String(), ""))
- 		{
--		find_directory(B_COMMON_SETTINGS_DIRECTORY, &Path);
-+		find_directory(B_SYSTEM_SETTINGS_DIRECTORY, &Path);
- 		fPath.SetTo(Path.Path());
- 		fPath.Append(SAVE_NOTE_PATH);
- 		Path = fPath.String();
-@@ -430,7 +430,7 @@
- 	MSave Save("save");
- 		if(!strcmp(fPath.String(), ""))
- 		{
--		find_directory(B_COMMON_SETTINGS_DIRECTORY, &Path);
-+		find_directory(B_SYSTEM_SETTINGS_DIRECTORY, &Path);
- 		fPath.SetTo(Path.Path());
- 		fPath.Append(SAVE_HISTORY_PATH);
- 		Path = fPath.String();
-@@ -509,7 +509,7 @@
- 	MSave Save("save");
- 		if(!strcmp(fPath.String(), ""))
- 		{
--		find_directory(B_COMMON_SETTINGS_DIRECTORY, &Path);
-+		find_directory(B_SYSTEM_SETTINGS_DIRECTORY, &Path);
- 		fPath.SetTo(Path.Path());
- 		fPath.Append(SAVE_NOTE_PATH);
- 		Path = fPath.String();
-diff -ur Organizer/Source/App/exportWindow.cpp Organizer-fix/Source/App/exportWindow.cpp
---- Organizer/Source/App/exportWindow.cpp	2013-11-22 11:46:04.641466368 +0000
-+++ Organizer-fix/Source/App/exportWindow.cpp	2013-11-22 11:46:00.583794688 +0000
-@@ -114,7 +114,7 @@
- BEntry Entry("/boot/home");
- MSave Load("Load");
- 
--find_directory(B_COMMON_SETTINGS_DIRECTORY, &Path);
-+find_directory(B_SYSTEM_SETTINGS_DIRECTORY, &Path);
- fFolderPath.SetTo(Path.Path());
- fFolderPath.Append(SAVE_NOTE_PATH);
- 
-diff -ur Organizer/Source/App/main.cpp Organizer-fix/Source/App/main.cpp
---- Organizer/Source/App/main.cpp	2013-11-22 11:46:04.650641408 +0000
-+++ Organizer-fix/Source/App/main.cpp	2013-11-22 11:46:00.590086144 +0000
-@@ -11,7 +11,7 @@
- BPath path;
- BString tmp;
- MSave savefile("savefile");
--find_directory(B_COMMON_SETTINGS_DIRECTORY, &path);
-+find_directory(B_SYSTEM_SETTINGS_DIRECTORY, &path);
- tmp.SetTo(path.Path());
- tmp.Append(SAVE_SETTINGS_PATH);
- path.SetTo(tmp.String());
-@@ -62,7 +62,7 @@
- 								\Notes
- *********************************************/
- //Make sure all the folders are there
--find_directory(B_COMMON_SETTINGS_DIRECTORY, &path);
-+find_directory(B_SYSTEM_SETTINGS_DIRECTORY, &path);
- //Make fSub folder
- tmp.SetTo("mkdir ");
- tmp.Append(path.Path());
-@@ -364,7 +364,7 @@
- 					BString tempString;
- 					BString tempString2;
- 					BPath Path;
--					find_directory(B_COMMON_SETTINGS_DIRECTORY, &Path);
-+					find_directory(B_SYSTEM_SETTINGS_DIRECTORY, &Path);
- 					tempString.SetTo(path.Path());
- 					tempString.Append(SAVE_SETTINGS_PATH);
- 					save.FindString(tempString.String(), SAVE_FILE_NAME, NAME_EXEC_DIR, &tempString2, "M_ERROR");
-@@ -476,7 +476,7 @@
- mApp::CheckForUpdateThread_static(void *data)
- {
- 	mApp *check4updates = (mApp *)data;
--	check4updates->CheckForUpdateThread();
-+	//check4updates->CheckForUpdateThread();
- 	return 0;
- }
- 
-@@ -577,7 +577,7 @@
- 	tmpString << _mWindow->_CalenderView->mCalender->ThisYear();
- 	_mWindow->Unlock();
- 	
--	find_directory(B_COMMON_SETTINGS_DIRECTORY, &Path);
-+	find_directory(B_SYSTEM_SETTINGS_DIRECTORY, &Path);
- 	FolderPath.SetTo(Path.Path());
- 	FolderPath << SAVE_NOTE_PATH;
- 		for (int a = 1; a <= INT_MAXFILES; a++)
-@@ -631,7 +631,7 @@
- 					if (NowMinute == TodayMinute && NowHour == TodayHour)
- 					{
- 					Save.FindString(FolderPath.String(), FileName.String(), SAVE_FILE_NOTE, &tmpString, "M_ERROR");
--					find_directory(B_COMMON_SETTINGS_DIRECTORY, &Path);
-+					find_directory(B_SYSTEM_SETTINGS_DIRECTORY, &Path);
- 					FolderPath.SetTo(Path.Path());
- 					FolderPath << SAVE_PATH_PART_1 << SAVE_PATH_PART_2;
- 					FileName.SetTo("TempRunScript");
-diff -ur Organizer/Source/App/makefile Organizer-fix/Source/App/makefile
---- Organizer/Source/App/makefile	2013-11-22 11:46:04.654835712 +0000
-+++ Organizer-fix/Source/App/makefile	2013-11-22 11:46:00.593231872 +0000
-@@ -29,7 +29,7 @@
- 	translation \
- 	fSub
- DEFINES= 
--LIBPATHS= ../../lib
-+LIBPATHS= ../lib
- 
- SYSTEM_INCLUDE_PATHS = 
- LOCAL_INCLUDE_PATHS = 
-diff -ur Organizer/Source/App/mWindow.cpp Organizer-fix/Source/App/mWindow.cpp
---- Organizer/Source/App/mWindow.cpp	2013-11-22 11:46:04.646184960 +0000
-+++ Organizer-fix/Source/App/mWindow.cpp	2013-11-22 11:46:00.586940416 +0000
-@@ -339,7 +339,7 @@
- {
- BPath Path;
- BString string;
--find_directory(B_COMMON_SETTINGS_DIRECTORY, &Path);
-+find_directory(B_SYSTEM_SETTINGS_DIRECTORY, &Path);
- string.SetTo(Path.Path());
- string.Append(SAVE_SETTINGS_PATH);
- path->SetTo(string.String());
-@@ -358,7 +358,7 @@
- BString FilePath;
- BEntry Entry("/boot/home");
- 
--find_directory(B_COMMON_SETTINGS_DIRECTORY, &fPath);
-+find_directory(B_SYSTEM_SETTINGS_DIRECTORY, &fPath);
- tempString.SetTo(fPath.Path());
- tempString.Append(SAVE_NOTE_PATH);
- fPath = tempString.String();
-diff -ur Organizer/Source/App/obsolete/Language.cpp Organizer-fix/Source/App/obsolete/Language.cpp
---- Organizer/Source/App/obsolete/Language.cpp	2013-11-22 11:46:04.667942912 +0000
-+++ Organizer-fix/Source/App/obsolete/Language.cpp	2013-11-22 11:46:00.659292160 +0000
-@@ -201,7 +201,7 @@
- {
- BPath Path;
- BString string;
--find_directory(B_COMMON_SETTINGS_DIRECTORY, &Path);
-+find_directory(B_SYSTEM_SETTINGS_DIRECTORY, &Path);
- string.SetTo(Path.Path());
- string.Append(SAVE_SETTINGS_PATH);
- path->SetTo(string.String());
-diff -ur Organizer/Source/App/preferencesView.cpp Organizer-fix/Source/App/preferencesView.cpp
---- Organizer/Source/App/preferencesView.cpp	2013-11-22 11:46:04.678428672 +0000
-+++ Organizer-fix/Source/App/preferencesView.cpp	2013-11-22 11:46:00.665583616 +0000
-@@ -49,7 +49,7 @@
- 
- MSave load("load");
- 
--find_directory(B_COMMON_SETTINGS_DIRECTORY, &Path);
-+find_directory(B_SYSTEM_SETTINGS_DIRECTORY, &Path);
- String.SetTo(Path.Path());
- String.Append(SAVE_SETTINGS_PATH);
- Path.SetTo(String.String());
-diff -ur Organizer/Source/App/preferencesWindow.cpp Organizer-fix/Source/App/preferencesWindow.cpp
---- Organizer/Source/App/preferencesWindow.cpp	2013-11-22 11:46:04.681836544 +0000
-+++ Organizer-fix/Source/App/preferencesWindow.cpp	2013-11-22 11:46:00.668729344 +0000
-@@ -39,7 +39,7 @@
- 		BPath Path;
- 		BString String;
- 		
--		find_directory(B_COMMON_SETTINGS_DIRECTORY, &Path);
-+		find_directory(B_SYSTEM_SETTINGS_DIRECTORY, &Path);
- 		String.SetTo(Path.Path());
- 		String.Append(SAVE_SETTINGS_PATH);
- 		String.Append(SAVE_FILE_NAME);
-diff -ur Organizer/Source/App/Secret/glView.cpp Organizer-fix/Source/App/Secret/glView.cpp
---- Organizer/Source/App/Secret/glView.cpp	2013-11-22 11:46:04.602669056 +0000
-+++ Organizer-fix/Source/App/Secret/glView.cpp	2013-11-22 11:46:00.556531712 +0000
-@@ -22,7 +22,7 @@
- // Constructor/destructor
- TutGLView::TutGLView( Wind *owner_wind, BRect frame, const char *name, 
- 					  int32 mode, int32 flags )
--	: BGLView( frame, const_cast<char *>( name ), mode, flags, 
-+	: BGLView( frame, name, mode, flags,
- 			   BGL_RGB | BGL_DOUBLE | BGL_DEPTH ),
- 	  pad_x( 1.0 ),
- 	  pad_y(-2.0),
-@@ -131,7 +131,7 @@
- 	// out.  You'll have to run the application from a Terminal to see
- 	// these.
- 	fprintf( stderr, "Unexpected error occured (%ld):\n", err );
--	fprintf( stderr, "\t%s\n", gluErrorString( err ) );
-+	//fprintf( stderr, "\t%s\n", gluErrorString( err ) );
- }
- 
- void TutGLView::Render( void )
-@@ -164,7 +164,7 @@
- 	glMatrixMode( GL_PROJECTION );
- 	glLoadIdentity();
- 	BRect r = Bounds();
--	gluPerspective( 45.0, r.Width() / r.Height(), 0.1, 100.0 );
-+	//gluPerspective( 45.0, r.Width() / r.Height(), 0.1, 100.0 );
- 	glMatrixMode( GL_MODELVIEW );
- }
- 
-@@ -178,7 +178,7 @@
- 	glViewport( 0, 0, width, height );
- 	glMatrixMode( GL_PROJECTION );
- 	glLoadIdentity();
--	gluPerspective( 45.0, (float)width/(float)height, 0.1, 100.0 );
-+	//gluPerspective( 45.0, (float)width/(float)height, 0.1, 100.0 );
- 	glMatrixMode( GL_MODELVIEW );
- }
- 
-diff -ur Organizer/Source/lib/makefile Organizer-fix/Source/lib/makefile
---- Organizer/Source/lib/makefile	2013-11-22 11:46:04.719585280 +0000
-+++ Organizer-fix/Source/lib/makefile	2013-11-22 11:46:00.701235200 +0000
-@@ -1,4 +1,4 @@
--NAME= ../../../lib/libfSub.so
-+NAME= ../libfSub.so
- TYPE= SHARED
- SRCS= Bitmap.cpp \
- 	Bubble.cpp \
diff --git a/haiku-apps/organizer/patches/organizer-0.1.patchset b/haiku-apps/organizer/patches/organizer-0.1.patchset
new file mode 100644
index 000000000..3bf5d9b7d
--- /dev/null
+++ b/haiku-apps/organizer/patches/organizer-0.1.patchset
@@ -0,0 +1,562 @@
+From 9c4c954831ab5388dfc2bd18b1a220ca8b6e3b47 Mon Sep 17 00:00:00 2001
+From: Chris Roberts <cpr420@gmail.com>
+Date: Mon, 2 Dec 2013 18:52:50 -0700
+Subject: applying patch organizer-0.1.patch
+
+
+diff --git a/Source/App/Secret/glView.cpp b/Source/App/Secret/glView.cpp
+index 96ef6c5..931e9a6 100644
+--- a/Source/App/Secret/glView.cpp
++++ b/Source/App/Secret/glView.cpp
+@@ -22,7 +22,7 @@
+ // Constructor/destructor
+ TutGLView::TutGLView( Wind *owner_wind, BRect frame, const char *name, 
+ 					  int32 mode, int32 flags )
+-	: BGLView( frame, const_cast<char *>( name ), mode, flags, 
++	: BGLView( frame, name, mode, flags,
+ 			   BGL_RGB | BGL_DOUBLE | BGL_DEPTH ),
+ 	  pad_x( 1.0 ),
+ 	  pad_y(-2.0),
+@@ -131,7 +131,7 @@ void TutGLView::ErrorCallback( GLenum err )
+ 	// out.  You'll have to run the application from a Terminal to see
+ 	// these.
+ 	fprintf( stderr, "Unexpected error occured (%ld):\n", err );
+-	fprintf( stderr, "\t%s\n", gluErrorString( err ) );
++	//fprintf( stderr, "\t%s\n", gluErrorString( err ) );
+ }
+ 
+ void TutGLView::Render( void )
+@@ -164,7 +164,7 @@ void TutGLView::gInit( void )
+ 	glMatrixMode( GL_PROJECTION );
+ 	glLoadIdentity();
+ 	BRect r = Bounds();
+-	gluPerspective( 45.0, r.Width() / r.Height(), 0.1, 100.0 );
++	//gluPerspective( 45.0, r.Width() / r.Height(), 0.1, 100.0 );
+ 	glMatrixMode( GL_MODELVIEW );
+ }
+ 
+@@ -178,7 +178,7 @@ void TutGLView::gReshape( int width, int height )
+ 	glViewport( 0, 0, width, height );
+ 	glMatrixMode( GL_PROJECTION );
+ 	glLoadIdentity();
+-	gluPerspective( 45.0, (float)width/(float)height, 0.1, 100.0 );
++	//gluPerspective( 45.0, (float)width/(float)height, 0.1, 100.0 );
+ 	glMatrixMode( GL_MODELVIEW );
+ }
+ 
+diff --git a/Source/App/calenderView.cpp b/Source/App/calenderView.cpp
+index 54f6930..d72b47e 100644
+--- a/Source/App/calenderView.cpp
++++ b/Source/App/calenderView.cpp
+@@ -55,7 +55,7 @@ mCalender->SetDay(mCalender->ThisDay());
+ //Load Settings
+ MSave load("load");
+ 
+-find_directory(B_COMMON_SETTINGS_DIRECTORY, &Path);
++find_directory(B_SYSTEM_SETTINGS_DIRECTORY, &Path);
+ String.SetTo(Path.Path());
+ String.Append(SAVE_SETTINGS_PATH);
+ Path.SetTo(String.String());
+diff --git a/Source/App/editScriptView.cpp b/Source/App/editScriptView.cpp
+index a4df6d3..70a2cd4 100644
+--- a/Source/App/editScriptView.cpp
++++ b/Source/App/editScriptView.cpp
+@@ -145,7 +145,7 @@ BString tempString2;
+ BString tempString3;
+ BString FilePath;
+ 
+-find_directory(B_COMMON_SETTINGS_DIRECTORY, &fPath);
++find_directory(B_SYSTEM_SETTINGS_DIRECTORY, &fPath);
+ tempString.SetTo(fPath.Path());
+ tempString.Append(SAVE_HISTORY_PATH);
+ fPath = tempString.String();
+@@ -183,7 +183,7 @@ BPath Path;
+ int ItemNumber = 1;
+ MSave Save("Save");
+ 
+-find_directory(B_COMMON_SETTINGS_DIRECTORY, &Path);
++find_directory(B_SYSTEM_SETTINGS_DIRECTORY, &Path);
+ tempString.SetTo(Path.Path());
+ tempString.Append(SAVE_HISTORY_PATH);
+ 	for (int a = 1; a <= INT_MAXFILES; a++)
+diff --git a/Source/App/editWindow.cpp b/Source/App/editWindow.cpp
+index 6684829..1feb57e 100644
+--- a/Source/App/editWindow.cpp
++++ b/Source/App/editWindow.cpp
+@@ -302,7 +302,7 @@ BString FilePath;
+ 	MSave Save("save");
+ 		if(!strcmp(fPath.String(), ""))
+ 		{
+-		find_directory(B_COMMON_SETTINGS_DIRECTORY, &Path);
++		find_directory(B_SYSTEM_SETTINGS_DIRECTORY, &Path);
+ 		fPath.SetTo(Path.Path());
+ 		fPath.Append(SAVE_NOTE_PATH);
+ 		Path = fPath.String();
+@@ -359,7 +359,7 @@ BEntry Entry("/boot/home");
+ 	MSave Save("save");
+ 		if(!strcmp(fPath.String(), ""))
+ 		{
+-		find_directory(B_COMMON_SETTINGS_DIRECTORY, &Path);
++		find_directory(B_SYSTEM_SETTINGS_DIRECTORY, &Path);
+ 		fPath.SetTo(Path.Path());
+ 		fPath.Append(SAVE_NOTE_PATH);
+ 		Path = fPath.String();
+@@ -430,7 +430,7 @@ BEntry Entry("/boot/home");
+ 	MSave Save("save");
+ 		if(!strcmp(fPath.String(), ""))
+ 		{
+-		find_directory(B_COMMON_SETTINGS_DIRECTORY, &Path);
++		find_directory(B_SYSTEM_SETTINGS_DIRECTORY, &Path);
+ 		fPath.SetTo(Path.Path());
+ 		fPath.Append(SAVE_HISTORY_PATH);
+ 		Path = fPath.String();
+@@ -509,7 +509,7 @@ BString FilePath;
+ 	MSave Save("save");
+ 		if(!strcmp(fPath.String(), ""))
+ 		{
+-		find_directory(B_COMMON_SETTINGS_DIRECTORY, &Path);
++		find_directory(B_SYSTEM_SETTINGS_DIRECTORY, &Path);
+ 		fPath.SetTo(Path.Path());
+ 		fPath.Append(SAVE_NOTE_PATH);
+ 		Path = fPath.String();
+diff --git a/Source/App/exportWindow.cpp b/Source/App/exportWindow.cpp
+index 1ed3d33..0db456b 100644
+--- a/Source/App/exportWindow.cpp
++++ b/Source/App/exportWindow.cpp
+@@ -114,7 +114,7 @@ BPath Path;
+ BEntry Entry("/boot/home");
+ MSave Load("Load");
+ 
+-find_directory(B_COMMON_SETTINGS_DIRECTORY, &Path);
++find_directory(B_SYSTEM_SETTINGS_DIRECTORY, &Path);
+ fFolderPath.SetTo(Path.Path());
+ fFolderPath.Append(SAVE_NOTE_PATH);
+ 
+diff --git a/Source/App/mWindow.cpp b/Source/App/mWindow.cpp
+index 597f4ad..426bf83 100644
+--- a/Source/App/mWindow.cpp
++++ b/Source/App/mWindow.cpp
+@@ -339,7 +339,7 @@ void mWindow::GetSettingsPath(BPath *path)
+ {
+ BPath Path;
+ BString string;
+-find_directory(B_COMMON_SETTINGS_DIRECTORY, &Path);
++find_directory(B_SYSTEM_SETTINGS_DIRECTORY, &Path);
+ string.SetTo(Path.Path());
+ string.Append(SAVE_SETTINGS_PATH);
+ path->SetTo(string.String());
+@@ -358,7 +358,7 @@ BString tempString4;
+ BString FilePath;
+ BEntry Entry("/boot/home");
+ 
+-find_directory(B_COMMON_SETTINGS_DIRECTORY, &fPath);
++find_directory(B_SYSTEM_SETTINGS_DIRECTORY, &fPath);
+ tempString.SetTo(fPath.Path());
+ tempString.Append(SAVE_NOTE_PATH);
+ fPath = tempString.String();
+diff --git a/Source/App/main.cpp b/Source/App/main.cpp
+index 88a0269..aaf47e6 100644
+--- a/Source/App/main.cpp
++++ b/Source/App/main.cpp
+@@ -11,7 +11,7 @@ int main(int32 argc, char** argv)
+ BPath path;
+ BString tmp;
+ MSave savefile("savefile");
+-find_directory(B_COMMON_SETTINGS_DIRECTORY, &path);
++find_directory(B_SYSTEM_SETTINGS_DIRECTORY, &path);
+ tmp.SetTo(path.Path());
+ tmp.Append(SAVE_SETTINGS_PATH);
+ path.SetTo(tmp.String());
+@@ -62,7 +62,7 @@ RunNotification = true;
+ 								\Notes
+ *********************************************/
+ //Make sure all the folders are there
+-find_directory(B_COMMON_SETTINGS_DIRECTORY, &path);
++find_directory(B_SYSTEM_SETTINGS_DIRECTORY, &path);
+ //Make fSub folder
+ tmp.SetTo("mkdir ");
+ tmp.Append(path.Path());
+@@ -364,7 +364,7 @@ void mApp::MessageReceived(BMessage *message)
+ 					BString tempString;
+ 					BString tempString2;
+ 					BPath Path;
+-					find_directory(B_COMMON_SETTINGS_DIRECTORY, &Path);
++					find_directory(B_SYSTEM_SETTINGS_DIRECTORY, &Path);
+ 					tempString.SetTo(path.Path());
+ 					tempString.Append(SAVE_SETTINGS_PATH);
+ 					save.FindString(tempString.String(), SAVE_FILE_NAME, NAME_EXEC_DIR, &tempString2, "M_ERROR");
+@@ -476,7 +476,7 @@ int32
+ mApp::CheckForUpdateThread_static(void *data)
+ {
+ 	mApp *check4updates = (mApp *)data;
+-	check4updates->CheckForUpdateThread();
++	//check4updates->CheckForUpdateThread();
+ 	return 0;
+ }
+ 
+@@ -577,7 +577,7 @@ BEntry Entry("/boot/home");
+ 	tmpString << _mWindow->_CalenderView->mCalender->ThisYear();
+ 	_mWindow->Unlock();
+ 	
+-	find_directory(B_COMMON_SETTINGS_DIRECTORY, &Path);
++	find_directory(B_SYSTEM_SETTINGS_DIRECTORY, &Path);
+ 	FolderPath.SetTo(Path.Path());
+ 	FolderPath << SAVE_NOTE_PATH;
+ 		for (int a = 1; a <= INT_MAXFILES; a++)
+@@ -631,7 +631,7 @@ BEntry Entry("/boot/home");
+ 					if (NowMinute == TodayMinute && NowHour == TodayHour)
+ 					{
+ 					Save.FindString(FolderPath.String(), FileName.String(), SAVE_FILE_NOTE, &tmpString, "M_ERROR");
+-					find_directory(B_COMMON_SETTINGS_DIRECTORY, &Path);
++					find_directory(B_SYSTEM_SETTINGS_DIRECTORY, &Path);
+ 					FolderPath.SetTo(Path.Path());
+ 					FolderPath << SAVE_PATH_PART_1 << SAVE_PATH_PART_2;
+ 					FileName.SetTo("TempRunScript");
+diff --git a/Source/App/makefile b/Source/App/makefile
+index 40cc7b6..dd0b811 100644
+--- a/Source/App/makefile
++++ b/Source/App/makefile
+@@ -29,7 +29,7 @@ LIBS= root \
+ 	translation \
+ 	fSub
+ DEFINES= 
+-LIBPATHS= ../../lib
++LIBPATHS= ../lib
+ 
+ SYSTEM_INCLUDE_PATHS = 
+ LOCAL_INCLUDE_PATHS = 
+diff --git a/Source/App/obsolete/Language.cpp b/Source/App/obsolete/Language.cpp
+index 0c23228..89aa24b 100644
+--- a/Source/App/obsolete/Language.cpp
++++ b/Source/App/obsolete/Language.cpp
+@@ -201,7 +201,7 @@ void mWindow::SetSettingsPath(BPath *path)
+ {
+ BPath Path;
+ BString string;
+-find_directory(B_COMMON_SETTINGS_DIRECTORY, &Path);
++find_directory(B_SYSTEM_SETTINGS_DIRECTORY, &Path);
+ string.SetTo(Path.Path());
+ string.Append(SAVE_SETTINGS_PATH);
+ path->SetTo(string.String());
+diff --git a/Source/App/preferencesView.cpp b/Source/App/preferencesView.cpp
+index 4b45894..e5ad788 100644
+--- a/Source/App/preferencesView.cpp
++++ b/Source/App/preferencesView.cpp
+@@ -49,7 +49,7 @@ AddChild(mSettingsBox);
+ 
+ MSave load("load");
+ 
+-find_directory(B_COMMON_SETTINGS_DIRECTORY, &Path);
++find_directory(B_SYSTEM_SETTINGS_DIRECTORY, &Path);
+ String.SetTo(Path.Path());
+ String.Append(SAVE_SETTINGS_PATH);
+ Path.SetTo(String.String());
+diff --git a/Source/App/preferencesWindow.cpp b/Source/App/preferencesWindow.cpp
+index f93ebfa..7b0f391 100644
+--- a/Source/App/preferencesWindow.cpp
++++ b/Source/App/preferencesWindow.cpp
+@@ -39,7 +39,7 @@ void PreferencesWindow::MessageReceived(BMessage *message)
+ 		BPath Path;
+ 		BString String;
+ 		
+-		find_directory(B_COMMON_SETTINGS_DIRECTORY, &Path);
++		find_directory(B_SYSTEM_SETTINGS_DIRECTORY, &Path);
+ 		String.SetTo(Path.Path());
+ 		String.Append(SAVE_SETTINGS_PATH);
+ 		String.Append(SAVE_FILE_NAME);
+diff --git a/Source/lib/makefile b/Source/lib/makefile
+index 0e9b9fb..0758c08 100644
+--- a/Source/lib/makefile
++++ b/Source/lib/makefile
+@@ -1,4 +1,4 @@
+-NAME= ../../../lib/libfSub.so
++NAME= ../libfSub.so
+ TYPE= SHARED
+ SRCS= Bitmap.cpp \
+ 	Bubble.cpp \
+-- 
+1.8.3.4
+
+
+From f6aca393df0895574cec3aac1c03cda254085b84 Mon Sep 17 00:00:00 2001
+From: Chris Roberts <cpr420@gmail.com>
+Date: Mon, 2 Dec 2013 19:16:30 -0700
+Subject: Misc fixes
+
+
+diff --git a/Source/App/Constants.h b/Source/App/Constants.h
+index 3e709f9..6d1172e 100644
+--- a/Source/App/Constants.h
++++ b/Source/App/Constants.h
+@@ -6,7 +6,7 @@
+ #include <SupportKit.h>
+ #include <InterfaceKit.h>
+ #include <StorageKit.h>
+-#include <iostream.h>
++#include <iostream>
+ #include <stdio.h>
+ #include <stdlib.h>
+ #include <OS.h>
+diff --git a/Source/App/Secret/glView.cpp b/Source/App/Secret/glView.cpp
+index 931e9a6..11cb5e7 100644
+--- a/Source/App/Secret/glView.cpp
++++ b/Source/App/Secret/glView.cpp
+@@ -7,7 +7,7 @@
+ #include "glWindow.h"
+ 
+ #include <opengl/GL/gl.h>
+-#include <opengl/GL/glu.h>
++//#include <opengl/GL/glu.h>
+ #include <app/Application.h>
+ #include <interface/InterfaceDefs.h>
+ #include <interface/Bitmap.h>
+diff --git a/Source/App/exportWindow.cpp b/Source/App/exportWindow.cpp
+index 0db456b..5971456 100644
+--- a/Source/App/exportWindow.cpp
++++ b/Source/App/exportWindow.cpp
+@@ -210,7 +210,7 @@ fContent << "</body>\n</html>";
+ fSaveTo.Append("/");
+ fSaveTo.Append(_ExportView->mFileNameControl->Text());
+ FILE* file = fopen(fSaveTo.String(), "w");
+-cout << fSaveTo.String() << endl;
++std::cout << fSaveTo.String() << std::endl;
+ fprintf(file, fContent.String());
+ fclose(file);
+ }
+diff --git a/Source/App/main.cpp b/Source/App/main.cpp
+index aaf47e6..aa6d86d 100644
+--- a/Source/App/main.cpp
++++ b/Source/App/main.cpp
+@@ -409,16 +409,16 @@ void mApp::MessageReceived(BMessage *message)
+ //-----------------------------------------------------------------
+ void mApp::RefsReceived(BMessage *message)
+ {
+-cout << "REFS RECIEVED!! " << endl;
++std::cout << "REFS RECIEVED!! " << std::endl;
+ //Get Filepanelpath
+ int32	count = 0;
+ uint32	type = 0;
+ message->GetInfo("refs", &type, &count);
+-cout << "type is " << type << "count is " << count << endl;
++std::cout << "type is " << type << "count is " << count << std::endl;
+ 	for (int32 i = 0; i < count; i++) 
+ 	{
+ 	entry_ref	ref;
+-	cout << " asd its " << i << endl;
++	std::cout << " asd its " << i <<std::endl;
+ 		if (message->FindRef("refs", i, &ref) == B_NO_ERROR) 
+ 		{
+ 		BEntry entry(&ref);
+@@ -432,12 +432,12 @@ cout << "type is " << type << "count is " << count << endl;
+ 			}
+ 			else
+ 			{
+-			cout << "2_" << endl;
++			std::cout << "2_" << std::endl;
+ 			}
+ 		}
+ 		else
+ 		{
+-		cout << "1_" << endl;
++		std::cout << "1_" << std::endl;
+ 		}
+ 	}
+ }
+diff --git a/Source/App/makefile b/Source/App/makefile
+index dd0b811..7db6791 100644
+--- a/Source/App/makefile
++++ b/Source/App/makefile
+@@ -20,9 +20,8 @@ SRCS=aboutWindow.cpp \
+ 	Secret/glView.cpp \
+ 	Secret/glWindow.cpp
+ RSRCS= Project.rsrc
+-LIBS= root \
+-	be \
+-	stdc++.r4 \
++LIBS= be \
++	$(STDCPPLIBS) \
+ 	game \
+ 	GL \
+ 	tracker \
+@@ -38,7 +37,7 @@ DRIVER_PATH =
+ APP_VERSION = 
+ DEBUGGER = 
+ LINKER_FLAGS = 
+-COMPILER_FLAGS = 
++CFLAGS= -fpermissive
+ SYMBOLS = 
+ WARNINGS = 
+ 
+diff --git a/Source/lib/Alert.cpp b/Source/lib/Alert.cpp
+index b079d5e..1de9b04 100644
+--- a/Source/lib/Alert.cpp
++++ b/Source/lib/Alert.cpp
+@@ -52,7 +52,7 @@ Button1_Text.SetTo(button1_text);
+ 	
+ 
+ _SetupEverything();	
+-cout << "Setup everything" << endl;
++std::cout << "Setup everything" << std::endl;
+ }
+ 
+ //-----------------------------------------------------------------
+@@ -124,7 +124,7 @@ SetTitle(Alert_Name.String());
+ 		}
+ 		else
+ 		{
+-		cout << "only one button" << endl;
++		std::cout << "only one button" << std::endl;
+ 		TempFrame.Set(ButtonPostItsFrame3.left, ButtonPostItsFrame3.top, ButtonPostItsFrame3.right, ButtonPostItsFrame3.bottom);
+ 		}
+ 		if (fButton3Enabled)
+@@ -143,7 +143,7 @@ SetTitle(Alert_Name.String());
+ 			}
+ 			else
+ 			{
+-			cout << "Only two buttons" << endl;
++			std::cout << "Only two buttons" << std::endl;
+ 			TempFrame.Set(ButtonPostItsFrame3.left, ButtonPostItsFrame3.top, ButtonPostItsFrame3.right, ButtonPostItsFrame3.bottom);
+ 			}
+ 		AlertButton2 = new BButton(TempFrame, "AlertButton2", Button2_Text.String(), new BMessage(MSG_BUTTON2));
+@@ -153,7 +153,7 @@ SetTitle(Alert_Name.String());
+ 	//3
+ 		if (fButton3Enabled)
+ 		{
+-		cout << "OMG, three buttons" << endl;
++		std::cout << "OMG, three buttons" << std::endl;
+ 		TempFrame.Set(ButtonPostItsFrame3.left, ButtonPostItsFrame3.top, ButtonPostItsFrame3.right, ButtonPostItsFrame3.bottom);
+ 		AlertButton3 = new BButton(TempFrame, "AlertButton3", Button3_Text.String(), new BMessage(MSG_BUTTON3));
+ 		AlertButton3->MakeDefault(true);
+diff --git a/Source/lib/Alert.h b/Source/lib/Alert.h
+index ae91d88..8b87263 100644
+--- a/Source/lib/Alert.h
++++ b/Source/lib/Alert.h
+@@ -6,7 +6,7 @@
+ #include <StorageKit.h>
+ #include <SupportKit.h>
+ #include <TranslationKit.h>
+-#include <iostream.h>
++#include <iostream>
+ 
+ #define MSG_BUTTON1		'1001'
+ #define MSG_BUTTON2		'1002'
+diff --git a/Source/lib/Bubble.h b/Source/lib/Bubble.h
+index 6c0e3e9..7b13a91 100644
+--- a/Source/lib/Bubble.h
++++ b/Source/lib/Bubble.h
+@@ -6,7 +6,7 @@
+ #include <StorageKit.h>
+ #include <SupportKit.h>
+ #include <TranslationKit.h>
+-#include <iostream.h>
++#include <iostream>
+ 
+ 
+ class _EXPORT MBubble	
+diff --git a/Source/lib/Calender.cpp b/Source/lib/Calender.cpp
+index 2918439..5d2a89f 100644
+--- a/Source/lib/Calender.cpp
++++ b/Source/lib/Calender.cpp
+@@ -266,7 +266,7 @@ _SetBoxBounds();
+ 	//We dont take your false dates around here
+ 	if (fYear < 2000 || fMonthNumber > 12 || fMonthNumber < 1 || fDayNumber > 31 || fDayNumber < 1)
+ 	{
+-	cout << "Date doesnt exist" << endl;
++	std::cout << "Date doesnt exist" << std::endl;
+ 	}
+ 	//If American style, add one more day (they are stupid and begin the week with a sunday)
+ 	if (fCalenderIsAmericaStyle)
+diff --git a/Source/lib/Calender.h b/Source/lib/Calender.h
+index c9aacb1..0c62dc5 100644
+--- a/Source/lib/Calender.h
++++ b/Source/lib/Calender.h
+@@ -9,7 +9,7 @@
+ #include <StorageKit.h>
+ #include <SupportKit.h>
+ #include <TranslationKit.h>
+-#include <iostream.h>
++#include <iostream>
+ 
+ // Project Includes ------------------------------------------------------------
+ 
+@@ -122,4 +122,4 @@ BString						fDayNumberString;
+ 
+ };
+ 
+-#endif
+\ No newline at end of file
++#endif
+diff --git a/Source/lib/CustomListItem.h b/Source/lib/CustomListItem.h
+index d252ad1..9609697 100644
+--- a/Source/lib/CustomListItem.h
++++ b/Source/lib/CustomListItem.h
+@@ -9,7 +9,7 @@
+ #include <StorageKit.h>
+ #include <SupportKit.h>
+ #include <TranslationKit.h>
+-#include <iostream.h>
++#include <iostream>
+ 
+ //----------------------- Global includes  ----------------------
+ 
+diff --git a/Source/lib/Postit.h b/Source/lib/Postit.h
+index 84a9650..2eb8c58 100644
+--- a/Source/lib/Postit.h
++++ b/Source/lib/Postit.h
+@@ -6,7 +6,7 @@
+ #include <StorageKit.h>
+ #include <SupportKit.h>
+ #include <TranslationKit.h>
+-#include <iostream.h>
++#include <iostream>
+ 
+ #define MSG_BUTTON1		'1001'
+ #define MSG_BUTTON2		'1002'
+diff --git a/Source/lib/Save.h b/Source/lib/Save.h
+index c3604a8..a7770b3 100644
+--- a/Source/lib/Save.h
++++ b/Source/lib/Save.h
+@@ -6,7 +6,7 @@
+ #include <StorageKit.h>
+ #include <SupportKit.h>
+ #include <TranslationKit.h>
+-#include <iostream.h>
++#include <iostream>
+ 
+ 
+ class _EXPORT MSave	: public BMessage	{
+@@ -130,4 +130,4 @@ class _EXPORT MSave	: public BMessage	{
+ 
+ };
+ 
+-#endif
+\ No newline at end of file
++#endif
+diff --git a/Source/lib/makefile b/Source/lib/makefile
+index 0758c08..04c355e 100644
+--- a/Source/lib/makefile
++++ b/Source/lib/makefile
+@@ -7,9 +7,8 @@ SRCS= Bitmap.cpp \
+ 	FlickerFreeStringView.cpp \
+ 	Postit.cpp \
+ 	Save.cpp
+-LIBS= root \
+-	be \
+-	stdc++.r4
++LIBS= be \
++	$(STDCPPLIBS)
+ RSRCS= 
+ DEFINES= 
+ LIBPATHS= 
+@@ -21,7 +20,7 @@ DRIVER_PATH =
+ APP_VERSION = 
+ DEBUGGER = 
+ LINKER_FLAGS = 
+-COMPILER_FLAGS = 
++CFLAGS= -fpermissive
+ SYMBOLS = 
+ WARNINGS = 
+ 
+-- 
+1.8.3.4
+
diff --git a/haiku-apps/phantomlimb/phantomlimb-1.recipe b/haiku-apps/phantomlimb/phantomlimb-1.recipe
index 4cfcb7062..df0ba729c 100644
--- a/haiku-apps/phantomlimb/phantomlimb-1.recipe
+++ b/haiku-apps/phantomlimb/phantomlimb-1.recipe
@@ -1,48 +1,59 @@
-DESCRIPTION="PhantomLimb is a little program to generate tones, and test your discrimination of frequency deltas.  I wrote it for a friend of mine who is suffering from tinnitus ('ringing in the ears') due to an ear infection.  (the infection destroyed some nerve cells in his inner ear, and the lack of signals from the destroyed nerve cells is what causes the ringing--similar to the 'phantom limb'  sensations experienced by amputees.  Hence the name of this program) By practicing discriminating between the sound of the tinnitus and 'nearby' sounds, he hopes to be able to train his brain to discriminate between the 'phantom' sound and other, real sounds."
-
 SUMMARY="PhantomLimb is a little program to generate tones, and test your discrimination of frequency deltas."
-HOMEPAGE="https://github.com/HaikuArchives/PhantomLimb"
-SRC_URI="git+git://github.com/HaikuArchives/PhantomLimb.git"
-REVISION="1"
-
-ARCHITECTURES="x86_gcc2 ?x86 ?x86_64"
-
-PROVIDES="
-	phantomlimb = $portVersion
-	app:phantomlimb = $portVersion"
-
-BUILD_PREREQUIRES="
-	haiku_devel >= $haikuVersion
-	cmd:g++
-	cmd:xres"
-
-REQUIRES="
-	haiku >= $haikuVersion"
-
+DESCRIPTION="
+PhantomLimb is a little program to generate tones, and test your
+discrimination of frequency deltas.  I wrote it for a friend of mine
+who is suffering from tinnitus ('ringing in the ears') due to an ear
+infection.  (the infection destroyed some nerve cells in his inner
+ear, and the lack of signals from the destroyed nerve cells is what
+causes the ringing--similar to the 'phantom limb'  sensations
+experienced by amputees.  Hence the name of this program) By
+practicing discriminating between the sound of the tinnitus and
+'nearby' sounds, he hopes to be able to train his brain to
+discriminate between the 'phantom' sound and other, real sounds."
 COPYRIGHT="
 	2001 Ben Loftis
 	2013 Jeremy Friesner"
-
 LICENSE="Public Domain"
+HOMEPAGE="https://github.com/HaikuArchives/PhantomLimb"
+SRC_URI="git+git://github.com/HaikuArchives/PhantomLimb.git#5444867ac9"
+REVISION="2"
+
+ARCHITECTURES="x86_gcc2 x86 ?x86_64"
+
+PROVIDES="
+	phantomlimb = $portVersion
+	app:phantomlimb = $portVersion
+	"
+
+BUILD_REQUIRES="
+	haiku_devel >= $haikuVersion
+	"
+
+BUILD_PREREQUIRES="
+	cmd:g++
+	cmd:xres
+	"
+
+REQUIRES="
+	haiku >= $haikuVersion
+	"
 
 BUILD()
 {
 	cd source
-	gcc    -c -o PhantomApp.o PhantomApp.cpp
-	gcc    -c -o PhantomWindow.o PhantomWindow.cpp
-	gcc    -c -o PhantomPlayer.o PhantomPlayer.cpp -D PI=3.141592
-	gcc    -c -o PhantomView.o PhantomView.cpp
-	gcc    -c -o LRUEntry.o LRUEntry.cpp
-	gcc  -o PhantomLimb PhantomApp.o PhantomWindow.o PhantomPlayer.o PhantomView.o LRUEntry.o -lbe -lmedia
+	gcc -c -o PhantomApp.o PhantomApp.cpp
+	gcc -c -o PhantomWindow.o PhantomWindow.cpp
+	gcc -c -o PhantomPlayer.o PhantomPlayer.cpp -D PI=3.141592
+	gcc -c -o PhantomView.o PhantomView.cpp
+	gcc -c -o LRUEntry.o LRUEntry.cpp
+	g++ -o PhantomLimb PhantomApp.o PhantomWindow.o PhantomPlayer.o PhantomView.o LRUEntry.o -lbe -lmedia
 	xres -o PhantomLimb Phantom.rsrc
-	cd ..
+	mimeset -f PhantomLimb
 }
 
 INSTALL()
 {
-	cd source
 	mkdir -p $appsDir
-	cp PhantomLimb $appsDir
+	cp source/PhantomLimb $appsDir
 	addAppDeskbarSymlink $appsDir/PhantomLimb
-	cd ..
 }
diff --git a/haiku-apps/puri/puri-0.3.9.1.recipe b/haiku-apps/puri/puri-0.3.9.1.recipe
deleted file mode 100644
index 272c4df9d..000000000
--- a/haiku-apps/puri/puri-0.3.9.1.recipe
+++ /dev/null
@@ -1,29 +0,0 @@
-DESCRIPTION="Puri is a 2D and 3D chess game. Playing online is also supported" 
-HOMEPAGE="http://haiku.bplaced.net/" 
-SRC_URI="http://haiku.bplaced.net/puri/sources/puri-0.3.9.1.zip"
-REVISION="1"
-STATUS_HAIKU="stable"
-DEPEND=""
-CHECKSUM_MD5="6e0a48e31dae972ccb010437a2d72dd8"
-MESSAGE="This port only builds with gcc4."
-BUILD()
-{
-	cd puri-0.3.9.1
-	jam
-}
-
-INSTALL()
-{
-	puri=${DESTDIR}/`finddir B_APPS_DIRECTORY`/Puri
-	mkdir -p ${puri}
-	mkdir -p ${puri}/data/
-	mkdir -p ${puri}/Engines/
-	cd puri-0.3.9.1
-	cp Puri ${puri}
-	cp -R ./data/* ${puri}/data
-	cp ./Engines/* ${puri}/Engines
-	chmod 755 ${puri}/Engines/stockfish
-}
-
-LICENSE="MIT"
-COPYRIGHT="2010-2012 Haiku inc."
diff --git a/haiku-apps/querywatcher/patches/querywatcher-1.4.patchset b/haiku-apps/querywatcher/patches/querywatcher-1.4.patchset
new file mode 100644
index 000000000..3dbf69223
--- /dev/null
+++ b/haiku-apps/querywatcher/patches/querywatcher-1.4.patchset
@@ -0,0 +1,109 @@
+From 88d1ebaf009131526657d0e848495b46bc001aee Mon Sep 17 00:00:00 2001
+From: Chris Roberts <cpr420@gmail.com>
+Date: Mon, 2 Dec 2013 19:32:02 -0700
+Subject: Misc gcc4 fixes
+
+
+diff --git a/src/App.cpp b/src/App.cpp
+index 6dd6ad8..25a4bac 100644
+--- a/src/App.cpp
++++ b/src/App.cpp
+@@ -41,7 +41,7 @@ const char *kTrackerQueryVolume = "_trk/qryvol1";
+ #include <be/kernel/fs_info.h>
+ 
+ // Yes, globals are bad. But, sssh!
+-typedef list<entry_ref> reflist;
++typedef std::list<entry_ref> reflist;
+ reflist gIgnoreList;
+ BPath gSettingsPath;
+ 
+@@ -57,7 +57,7 @@ struct query_load_info
+ 	BRect 			rect;	
+ };
+ 
+-typedef list<BVolume> vollist;
++typedef std::list<BVolume> vollist;
+ 
+ char *ReadAttribute(BNode node, const char *attribute, int32 *length = NULL) {
+ 	attr_info info;
+@@ -583,7 +583,7 @@ QueryView::ShouldIgnore( BMessage * msg )
+ 				ref.node = node;
+ 				ref.device = device;
+ 				
+-				list<node_ref>::iterator iter;
++				std::list<node_ref>::iterator iter;
+ 				iter = find(fIgnoredMatches.begin(), fIgnoredMatches.end(), ref);
+ 				
+ 				if ( iter == fIgnoredMatches.end() )
+@@ -601,7 +601,7 @@ QueryView::ShouldIgnore( BMessage * msg )
+ 		if ( !result )
+ 		{
+ 			// remove node from ignore list if present
+-			list<node_ref>::iterator iter;
++			std::list<node_ref>::iterator iter;
+ 			
+ 			node_ref ref;
+ 			ref.node = node;
+@@ -619,7 +619,7 @@ QueryView::ShouldIgnore( BMessage * msg )
+ 	if ( opcode == B_ENTRY_REMOVED )
+ 	{
+ 		// remove from fIgnoredMatches if there
+-		list<node_ref>::iterator iter;
++		std::list<node_ref>::iterator iter;
+ 		
+ 		node_ref ref;
+ 		ref.node = node;
+@@ -653,7 +653,7 @@ QueryView::MessageReceived(BMessage* msg)
+ 				msg->FindInt32("device",&node.device);
+ 				msg->FindInt64("node",&node.node);
+ 				
+-				list<node_ref>::iterator iter;
++				std::list<node_ref>::iterator iter;
+ 				
+ 				iter = find(fIgnoredMatches.begin(),fIgnoredMatches.end(),node);
+ 				
+diff --git a/src/App.h b/src/App.h
+index fe5e49c..765eabe 100644
+--- a/src/App.h
++++ b/src/App.h
+@@ -28,7 +28,7 @@ class LabelView;
+ class ColorView;
+ 
+ // slaad
+-typedef list<BQuery *> querylist;
++typedef std::list<BQuery *> querylist;
+ 
+ class App : public BApplication
+ {
+@@ -104,7 +104,7 @@ private:
+ 	BString			fPredicate;
+ 	
+ 	// eiman
+-	list<node_ref>	fIgnoredMatches;
++	std::list<node_ref>	fIgnoredMatches;
+ };
+ 
+ IMPEXP class LabelView : public BStringView
+diff --git a/src/makefile b/src/makefile
+index 07ea621..ac5d9b2 100644
+--- a/src/makefile
++++ b/src/makefile
+@@ -47,7 +47,7 @@ SRCS := \
+ #		naming scheme you need to specify the path to the library
+ #		and it's name
+ #		library: my_lib.a entry: my_lib.a or path/my_lib.a
+-LIBS= be
++LIBS= be $(STDCPPLIBS)
+ 
+ #	specify additional paths to directories following the standard
+ #	libXXX.so or libXXX.a naming scheme.  You can specify full paths
+@@ -149,4 +149,4 @@ else
+   LIBS += zeta tracker
+ endif
+ 
+-include $(BUILDHOME)/etc/makefile-engine
+\ No newline at end of file
++include $(BUILDHOME)/etc/makefile-engine
+-- 
+1.8.3.4
+
diff --git a/haiku-apps/querywatcher/querywatcher-1.4.recipe b/haiku-apps/querywatcher/querywatcher-1.4.recipe
index c82279f28..b7df8c79b 100644
--- a/haiku-apps/querywatcher/querywatcher-1.4.recipe
+++ b/haiku-apps/querywatcher/querywatcher-1.4.recipe
@@ -1,43 +1,54 @@
 SUMMARY="An application that monitors Tracker queries."
-DESCRIPTION="This is a tiny little GUI application that monitors any regular Tracker queries and displays miniature indicator lights for the presence of results."
+DESCRIPTION="
+This is a tiny little GUI application that monitors any regular
+Tracker queries and displays miniature indicator lights for the
+presence of results."
 HOMEPAGE="https://github.com/HaikuArchives/QueryWatcher"
-SRC_URI="git://github.com/HaikuArchives/QueryWatcher.git"
+SRC_URI="git://github.com/HaikuArchives/QueryWatcher.git#64b66ee9e9"
 LICENSE="Public Domain"
 COPYRIGHT="
 	2003-2004 Michael Armida	
 	2004 Mikael Eiman
 	2004 Michael Davidson
 	"
-													 				  	
-REVISION="1"
+REVISION="2"
+ARCHITECTURES="x86_gcc2 x86 ?x86_64"
 
-ARCHITECTURES="x86_gcc2 ?x86 ?x86_64"
-PROVIDES="app:QueryWatcher = $portVersion"
+PROVIDES="
+	QueryWatcher = $portVersion
+	app:QueryWatcher = $portVersion
+	"
 
 REQUIRES="
 	haiku >= $haikuVersion
 	"
 
-BUILD_REQUIRES=""
+BUILD_REQUIRES="
+	haiku_devel >= $haikuVersion
+	"
 
 BUILD_PREREQUIRES="
-	haiku_devel >= $haikuVersion
 	makefile_engine
 	cmd:gcc
 	cmd:make
 	cmd:mkdepend
 	"
 
-SOURCE_DIR="src/src"
+PATCHES="querywatcher-1.4.patchset"
 
 BUILD()
 {
-	make BUILDHOME=`finddir B_SYSTEM_DEVELOP_DIRECTORY`
+	cd src
+	make OBJ_DIR=objects \
+		BUILDHOME=`finddir B_SYSTEM_DEVELOP_DIRECTORY`
 }
 
 INSTALL()
 {
-	mkdir -p $appsDir	/QueryWatcher
-	cp -a objects.x86-gcc2-release/QueryWatcher $appsDir/QueryWatcher 
+	mkdir -p $appsDir
+	cp -a src/objects/QueryWatcher $appsDir
 	addAppDeskbarSymlink $appsDir/QueryWatcher
+
+	mkdir -p $docDir
+	cp README $docDir
 }
diff --git a/haiku-apps/resourcer/resourcer-1.0.recipe b/haiku-apps/resourcer/resourcer-1.0.recipe
index 4df073f17..17ea2d7e2 100644
--- a/haiku-apps/resourcer/resourcer-1.0.recipe
+++ b/haiku-apps/resourcer/resourcer-1.0.recipe
@@ -1,17 +1,25 @@
-DESCRIPTION="Resourcer is an all-purpose resource and attribute editor with a full-featured interface editor. It also contains plug-in editors for 31 other data types, including images, cursors, sounds, movies, text, and icons."
-SUMMARY="Resourcer is an all-purpose resource and attribute editor with a full-featured interface editor."
+SUMMARY="A resource and attribute editor with a full-featured interface editor."
+DESCRIPTION="
+Resourcer is an all-purpose resource and attribute editor with a
+full-featured interface editor. It also contains plug-in editors for
+31 other data types, including images, cursors, sounds, movies, text,
+and icons."
+COPYRIGHT="2000 Nathan Whitehorn"	
+LICENSE="BSD (3-clause)"
 HOMEPAGE="https://gitorious.org/desknotes/resourcer"
-SRC_URI="git+https://git.gitorious.org/desknotes/resourcer.git"
-REVISION="1"
+SRC_URI="git+https://git.gitorious.org/desknotes/resourcer.git#b93cb9e"
+REVISION="2"
 
-ARCHITECTURES="x86_gcc2 ?x86 ?x86_64"
+ARCHITECTURES="?x86_gcc2 ?x86 ?x86_64"
 
 PROVIDES="
 	resourcer = $portVersion
-	app:resourcer = $portVersion"
+	app:resourcer = $portVersion
+	"
 	
 REQUIRES="
-	haiku >= $haikuVersion"
+	haiku >= $haikuVersion
+	"
 
 BUILD_PREREQUIRES="
 	makefile_engine
@@ -20,17 +28,14 @@ BUILD_PREREQUIRES="
 	cmd:mkdepend"
 	
 BUILD_REQUIRES="
-	haiku_devel >= $haikuVersion"
-		
-COPYRIGHT="
-	2000 Nathan Whitehorn"
-	
-LICENSE="BSD (3-clause)"
+	haiku_devel >= $haikuVersion
+	"
 
 BUILD()
 {
 	cd main
-	make BUILDHOME=`finddir B_SYSTEM_DEVELOP_DIRECTORY`
+	make OBJ_DIR=objects \
+		BUILDHOME=`finddir B_SYSTEM_DEVELOP_DIRECTORY`
 	
 	# The two next steps might not be required
 	# The first one probably isn't, because according to the description
@@ -38,10 +43,12 @@ BUILD()
 	# but I'm not really sure about the second one
 	
 	cd ../editors
-	make BUILDHOME=`finddir B_SYSTEM_DEVELOP_DIRECTORY`
+	make OBJ_DIR=objects \
+		BUILDHOME=`finddir B_SYSTEM_DEVELOP_DIRECTORY`
 	
 	cd ../reslib
-	make BUILDHOME=`finddir B_SYSTEM_DEVELOP_DIRECTORY`
+	make OBJ_DIR=objects \
+		BUILDHOME=`finddir B_SYSTEM_DEVELOP_DIRECTORY`
 }
 
 INSTALL()
@@ -50,13 +57,8 @@ INSTALL()
 	# because I can't figure out how the files in the other directories
 	# should be installed
 	
-	cd main
-	
-	architecture=`echo $buildArchitecture | sed 's/_/-/g'`
-	
-	cd objects.$architecture-release
 	mkdir -p $appsDir
-	cp -a Resourcer $appsDir
+	cp -a main/objects/Resourcer $appsDir
 	
 	addAppDeskbarSymlink $appsDir/Resourcer	
 }
diff --git a/haiku-apps/runprogram/patches/runprogram-1.0rc1.patch b/haiku-apps/runprogram/patches/runprogram-1.0rc1.patchset
similarity index 57%
rename from haiku-apps/runprogram/patches/runprogram-1.0rc1.patch
rename to haiku-apps/runprogram/patches/runprogram-1.0rc1.patchset
index 9c7c0a011..0a2c636eb 100644
--- a/haiku-apps/runprogram/patches/runprogram-1.0rc1.patch
+++ b/haiku-apps/runprogram/patches/runprogram-1.0rc1.patchset
@@ -1,11 +1,8 @@
-From fc9ee0911f7ea1881eed295c0cca7470b1c35a14 Mon Sep 17 00:00:00 2001
-From: Luke <noryb009@gmail.com>
-Date: Mon, 25 Nov 2013 21:02:41 +0000
-Subject: [PATCH] COMMON -> SYSTEM
+From 6b3517facc71d33974bfd81a78a7567704a94554 Mon Sep 17 00:00:00 2001
+From: Chris Roberts <cpr420@gmail.com>
+Date: Mon, 2 Dec 2013 19:41:16 -0700
+Subject: applying patch runprogram-1.0rc1.patch
 
----
- src/ExeBox.cpp | 6 +++---
- 1 file changed, 3 insertions(+), 3 deletions(-)
 
 diff --git a/src/ExeBox.cpp b/src/ExeBox.cpp
 index b4ee544..b3c3bb2 100644
@@ -41,3 +38,26 @@ index b4ee544..b3c3bb2 100644
 -- 
 1.8.3.4
 
+
+From 522d633b7593a3009fbccf0da8efd3943cceb31b Mon Sep 17 00:00:00 2001
+From: Chris Roberts <cpr420@gmail.com>
+Date: Mon, 2 Dec 2013 19:46:25 -0700
+Subject: Fix includes for building with gcc4
+
+
+diff --git a/src/ExeBox.cpp b/src/ExeBox.cpp
+index b3c3bb2..4d154bb 100644
+--- a/src/ExeBox.cpp
++++ b/src/ExeBox.cpp
+@@ -13,6 +13,8 @@
+ #include <VolumeRoster.h>
+ #include <Query.h>
+ 
++#include <stdio.h>
++
+ static BObjectList<entry_ref> *sPathData = NULL;
+ BLocker sPathDataLock;
+ thread_id sThreadID = -1;
+-- 
+1.8.3.4
+
diff --git a/haiku-apps/runprogram/runprogram-1.0rc1.recipe b/haiku-apps/runprogram/runprogram-1.0rc1.recipe
index 51ea61570..7f3a50bc7 100644
--- a/haiku-apps/runprogram/runprogram-1.0rc1.recipe
+++ b/haiku-apps/runprogram/runprogram-1.0rc1.recipe
@@ -11,32 +11,33 @@ HOMEPAGE="https://github.com/HaikuArchives/RunProgram"
 SRC_URI="git+git://github.com/HaikuArchives/RunProgram.git#a8fe29319e8dde884d8634a0c5a82838a3706563"
 LICENSE="MIT"
 COPYRIGHT="2008 DarkWyrm"
-REVISION="1"
-ARCHITECTURES="x86_gcc2 ?x86 ?x86_64"
+REVISION="2"
+ARCHITECTURES="x86_gcc2 x86 ?x86_64"
 
 PROVIDES="
 	RunProgram = $portVersion
+	app:RunProgram = $portVersion
 	"
 
 REQUIRES="
 	haiku >= $haikuVersion
 	"
 
-BUILD_REQUIRES=""
-BUILD_PREREQUIRES="
+BUILD_REQUIRES="
 	haiku_devel >= $haikuVersion
+	"
+
+BUILD_PREREQUIRES="
 	cmd:gcc
+	cmd:xres
 	"
 
-PATCHES="
-	runprogram-1.0rc1.patch
-	"
-
-SOURCE_DIR="$portName-a8fe29319e8dde884d8634a0c5a82838a3706563"
+PATCHES="runprogram-1.0rc1.patchset"
 
 BUILD()
 {
 	cd src
+	rm -f ObjectList.h
 	g++ -o RunProgram -lbe \
 		AutoTextControl.cpp \
 		ExeBox.cpp \
@@ -44,6 +45,7 @@ BUILD()
 		RunWindow.cpp \
 		TextFile.cpp
 	xres -o RunProgram "Run Program.rsrc"
+	mimeset -f RunProgram
 }
 
 INSTALL()
diff --git a/haiku-apps/sum_it/sum_it-0.2beta.recipe b/haiku-apps/sum_it/sum_it-0.2beta.recipe
index cacd46b2e..a16aaf719 100644
--- a/haiku-apps/sum_it/sum_it-0.2beta.recipe
+++ b/haiku-apps/sum_it/sum_it-0.2beta.recipe
@@ -1,8 +1,18 @@
 SUMMARY="Sum-It is a native spreadsheet for BeOS" 
+DESCRIPTION="
+Sum-It is a spreadsheet for BeOS (Download BeOS for free). This is Open Sum-It,
+the open source version of Maarten Hekkelman's Sum-It application.
+Sum-It has many features, including a plug-in architecture for formulas and
+graphs. This product includes software developed by Hekkelman Programmatuur B.V.
+"
+LICENSE="BSD (4-clause)"
+COPYRIGHT="1996-1998, 2000	Hekkelman Programmatuur B.V.  All rights reserved.
+	1999-2000 Tim Vernum. All rights reserved."
 HOMEPAGE="https://github.com/HaikuArchives/OpenSumIt" 
-SRC_URI="git+https://github.com/HaikuArchives/OpenSumIt.git"
-REVISION="1"
-ARCHITECTURES="x86 x86_gcc2"
+SRC_URI="git+https://github.com/HaikuArchives/OpenSumIt.git#cdab184a27"
+REVISION="2"
+ARCHITECTURES="!x86 x86_gcc2"
+
 PROVIDES="
 	sum_it = $portVersion
 	app:sum_it = $portVersion
@@ -10,11 +20,15 @@ PROVIDES="
 
 BUILD_REQUIRES="
 	haiku_devel >= $haikuVersion
+	"
+
+BUILD_PREREQUIRES="
 	cmd:make
 	cmd:gcc
 	cmd:flex
 	cmd:bison
 	"
+
 BUILD()
 {
 	pushd bsl
@@ -36,16 +50,5 @@ INSTALL()
 {
 	mkdir -p $appsDir
 	cp sum-it/OpenSum-It $appsDir/Sum-It
-
 	addAppDeskbarSymlink $appsDir/Sum-It
 }
-
-LICENSE="BSD (4-clause)"
-COPYRIGHT="1996-1998, 2000	Hekkelman Programmatuur B.V.  All rights reserved.
-	1999-2000 Tim Vernum. All rights reserved."
-DESCRIPTION="
-Sum-It is a spreadsheet for BeOS (Download BeOS for free). This is Open Sum-It,
-the open source version of Maarten Hekkelman's Sum-It application.
-Sum-It has many features, including a plug-in architecture for formulas and
-graphs. This product includes software developed by Hekkelman Programmatuur B.V.
-"
diff --git a/haiku-apps/systeminfo/systeminfo-2.recipe b/haiku-apps/systeminfo/systeminfo-2.recipe
index 444fbee8f..145a760c7 100644
--- a/haiku-apps/systeminfo/systeminfo-2.recipe
+++ b/haiku-apps/systeminfo/systeminfo-2.recipe
@@ -1,3 +1,4 @@
+SUMMARY="A system monitor for Haiku"
 DESCRIPTION="It is an little application through which we can see some statistics about our system.
 It currently only shows:
 -CPU 0 usage
@@ -5,34 +6,40 @@ It currently only shows:
 -Memory usage
 -Boot disk used space
 -Uptime"
-SUMMARY="A system monitor for Haiku"
-HOMEPAGE="https://github.com/disreali/SystemInfo"
-SRC_URI="git+git://github.com/disreali/SystemInfo.git"
-REVISION="1"
-
-ARCHITECTURES="x86_gcc2 ?x86 ?x86_64"
-
-PROVIDES="
-	SystemInfo = $portVersion
-	app:SystemInfo = $portVersion"
-
-BUILD_PREREQUIRES="
-	haiku_devel >= $haikuVersion
-	cmd:gcc"
-
-REQUIRES="
-	haiku >= $haikuVersion"
-
 COPYRIGHT="
 	2002 Brent Miszalski
 	2012 Disreali"
-
 LICENSE="MIT"
+HOMEPAGE="https://github.com/disreali/SystemInfo"
+SRC_URI="git+git://github.com/disreali/SystemInfo.git#ae36df9999"
+REVISION="2"
+
+ARCHITECTURES="x86_gcc2 x86 ?x86_64"
+
+PROVIDES="
+	SystemInfo = $portVersion
+	app:SystemInfo = $portVersion
+	"
+
+REQUIRES="
+	haiku >= $haikuVersion
+	"
+
+BUILD_REQUIRES="
+	haiku_devel >= $haikuVersion
+	"
+
+BUILD_PREREQUIRES="
+	cmd:gcc
+	cmd:xres
+	"
 
 BUILD()
 {
 	echo "const uint32 CP_CHANGE_BG = 'CPBG'; const uint32 CP_CHANGE_FG = 'CPFG';"  > ./DigitalView.h
 	g++ CPUPercent.cpp ColourPrefs.cpp ImageView.cpp MemUsage.cpp SIReplicant.cpp main.cpp -o SystemInfo -lbe
+	xres -o SystemInfo SystemInfo.rsrc
+	mimeset -f SystemInfo
 }
 
 INSTALL()
diff --git a/haiku-apps/takenotes/patches/takenotes-1.0.0.patchset b/haiku-apps/takenotes/patches/takenotes-1.0.0.patchset
new file mode 100644
index 000000000..42bc9ba6e
--- /dev/null
+++ b/haiku-apps/takenotes/patches/takenotes-1.0.0.patchset
@@ -0,0 +1,36 @@
+From 06e5cb378bf63d5352a90605d2cd80ee5200d456 Mon Sep 17 00:00:00 2001
+From: Chris Roberts <cpr420@gmail.com>
+Date: Mon, 2 Dec 2013 19:59:47 -0700
+Subject: Misc gcc4 fixes
+
+
+diff --git a/ChoiceView.cpp b/ChoiceView.cpp
+index f33aa88..4293e22 100644
+--- a/ChoiceView.cpp
++++ b/ChoiceView.cpp
+@@ -31,8 +31,8 @@
+ #define BUTTON_UNDO		'btun'
+ 
+ // Constructor
+-ChoiceView :: ChoiceView(BRect rect, char *name,BHandler *handler)
+-	   	  : BView(rect, name, B_FOLLOW_ALL, B_WILL_DRAW | B_FRAME_EVENTS | B_FULL_UPDATE_ON_RESIZE){
++ChoiceView :: ChoiceView(BRect rect, char *vname,BHandler *handler)
++	   	  : BView(rect, vname, B_FOLLOW_ALL, B_WILL_DRAW | B_FRAME_EVENTS | B_FULL_UPDATE_ON_RESIZE){
+ 	   	  
+ 	// Variables
+ 	BStringView 	*instructions;
+diff --git a/NoteWindow.h b/NoteWindow.h
+index a07ffe7..38e7ce3 100644
+--- a/NoteWindow.h
++++ b/NoteWindow.h
+@@ -31,6 +31,7 @@
+ #include <MenuBar.h>
+ #include <MenuItem.h>
+ #include <Message.h>
++#include <FilePanel.h>
+ 
+ /* == DATA STRUCTURE ==
+  * Structure containing all the informations about the current post-it
+-- 
+1.8.3.4
+
diff --git a/haiku-apps/takenotes/takenotes-1.0.0.recipe b/haiku-apps/takenotes/takenotes-1.0.0.recipe
index 80aa965a0..0be698752 100644
--- a/haiku-apps/takenotes/takenotes-1.0.0.recipe
+++ b/haiku-apps/takenotes/takenotes-1.0.0.recipe
@@ -9,39 +9,44 @@ DESCRIPTION="
   	- Tag your note for easy search
   	- Set an alarm to reminds you date, appointments and so on
   	"
+COPYRIGHT="Copyright 2009, Ilio Catallo, Stefano Celentano, Eleonora Ciceri, all rights reserved"
+LICENSE="GNU GPL v2"
 HOMEPAGE="https://github.com/HaikuArchives/TakeNotes"
-SRC_URI="git+https://github.com/HaikuArchives/TakeNotes"
-REVISION="1"
-ARCHITECTURES="x86_gcc2 ?x86 ?x86_64"
+SRC_URI="git+https://github.com/HaikuArchives/TakeNotes#3ee7d80b53"
+REVISION="2"
+ARCHITECTURES="x86_gcc2 x86 ?x86_64"
+
 PROVIDES="
 	takenotes=$portVersion
 	app:takenotes=$portVersion
 	"
+
 REQUIRES="
 	haiku >= $haikuVersion
 	"
-BUILD_REQUIRES=""
-BUILD_PREREQUIRES="
+
+BUILD_REQUIRES="
 	haiku_devel >= $haikuVersion
+	"
+
+BUILD_PREREQUIRES="
 	makefile_engine
 	cmd:gcc
 	cmd:make
 	cmd:mkdepend
 	"
-COPYRIGHT="Copyright 2009, Ilio Catallo, Stefano Celentano, Eleonora Ciceri, all rights reserved"
-LICENSE="GNU GPL v2"
-SOURCE_DIR="$portVersionedName"
+
+PATCHES="takenotes-1.0.0.patchset"
 
 BUILD()
 {
-	make BUILDHOME=`finddir B_SYSTEM_DEVELOP_DIRECTORY`
+	make OBJ_DIR=objects \
+		BUILDHOME=`finddir B_SYSTEM_DEVELOP_DIRECTORY`
 }
 
 INSTALL()
 {
-	architecture=$(echo $buildArchitecture | sed 's/_/-/g')
 	mkdir -p $appsDir
-	cp objects.$architecture-release/TakeNotes $appsDir/TakeNotes
-	
+	cp objects/TakeNotes $appsDir
 	addAppDeskbarSymlink $appsDir/TakeNotes
 }
diff --git a/haiku-apps/thememanager/thememanager-0_svn.recipe b/haiku-apps/thememanager/thememanager-0_svn.recipe
deleted file mode 100644
index 69eb763d7..000000000
--- a/haiku-apps/thememanager/thememanager-0_svn.recipe
+++ /dev/null
@@ -1,20 +0,0 @@
-DESCRIPTION="ThemeManager" 
-HOMEPAGE="http://dev.osdrawer.net/projects/thememanager/" 
-SRC_URI="http://svn.osdrawer.net/thememanager/trunk"
-REVISION="1"
-STATUS_HAIKU="stable"
-DEPEND=""
-#CHECKSUM_MD5=""
-BUILD()
-{
-	cd trunk
-	make
-}
-
-INSTALL()
-{
-	cd trunk
-}
-
-LICENSE="MIT"
-COPYRIGHT="2000-2012 François Revol"
diff --git a/haiku-apps/thememanager/thememanager-1.0_git.recipe b/haiku-apps/thememanager/thememanager-1.0_git.recipe
new file mode 100644
index 000000000..b3ba3e182
--- /dev/null
+++ b/haiku-apps/thememanager/thememanager-1.0_git.recipe
@@ -0,0 +1,43 @@
+SUMMARY="Manages Haiku themes."
+DESCRIPTION="The Haiku Theme Manager is compatible with the one
+that shipped with ZETA. Users can choose which part of a theme to apply or
+save. It can also import BeTheme themes, and to some degree, MS Plus
+themes. It is add-ons based, so it can be extended." 
+HOMEPAGE="https://github.com/HaikuArchives/HaikuThemeManager" 
+SRC_URI="git://github.com/HaikuArchives/HaikuThemeManager.git#400a0ff17173a2510e24bf737df0bb218a9c531c"
+# 20 October 2013 commit
+LICENSE="MIT"
+COPYRIGHT="2000-2012 François Revol"
+REVISION="1"
+ARCHITECTURES="x86_gcc2 ?x86 ?x86_64"
+PROVIDES="
+	thememanager = $portVersion
+	app:thememanager = $portVersion
+"
+REQUIRES="
+	haiku >= $haikuVersion
+"
+BUILD_REQUIRES="
+	haiku_devel >= $haikuVersion
+"
+BUILD_PREREQUIRES="
+	makefile_engine
+	cmd:git
+	cmd:gcc
+	cmd:make
+	cmd:mkdepend
+	cmd:ld
+"
+
+BUILD()
+{
+	cd src
+	make OBJ_DIR=objects BUILDHOME=/boot/system/develop $jobArgs
+}
+
+INSTALL()
+{
+	cd src
+	make OBJ_DIR=objects BUILDHOME=/boot/system/develop INSTALL_DIR=$preferencesDir install
+	addPreferencesDeskbarSymlink $preferencesDir/ThemeManager
+}
diff --git a/haiku-apps/tolmach/patches/tolmach-1.1.0.patch b/haiku-apps/tolmach/patches/tolmach-1.1.0.patch
new file mode 100644
index 000000000..00afa60d2
--- /dev/null
+++ b/haiku-apps/tolmach/patches/tolmach-1.1.0.patch
@@ -0,0 +1,13 @@
+diff --git a/TolmachApp.cpp b/TolmachApp.cpp
+index acfacb1..c7c190a 100644
+--- a/TolmachApp.cpp
++++ b/TolmachApp.cpp
+@@ -421,7 +421,7 @@ void
+ TolmachApplication::LoadDictList()
+ {
+   BPath pathDicts;
+-  find_directory(B_COMMON_DATA_DIRECTORY, &pathDicts);
++  find_directory(B_USER_DATA_DIRECTORY, &pathDicts);
+   pathDicts.Append(cszDictionariesDir);
+   BDirectory dir(pathDicts.Path());
+   BEntry entry;
diff --git a/haiku-apps/tolmach/tolmach-1.1.0.recipe b/haiku-apps/tolmach/tolmach-1.1.0.recipe
new file mode 100644
index 000000000..110916f4c
--- /dev/null
+++ b/haiku-apps/tolmach/tolmach-1.1.0.recipe
@@ -0,0 +1,50 @@
+DESCRIPTION="This program is a BeOS port of KDictionary translation program for Linux by Ivan V. Murasko. It follows the main concept of original linux program but mainly is a real BeOS program."
+SUMMARY="A dictionary for Haiku"
+COPYRIGHT="1999 Ivan V. Murasko"
+LICENSE="GNU GPL v2"
+HOMEPAGE="https://gitorious.org/desknotes/tolmach"
+SRC_URI="git+https://gitorious.org/desknotes/tolmach.git#dcddbac"
+REVISION="1"
+
+ARCHITECTURES="x86_gcc2 x86 ?x86_64"
+
+PROVIDES="
+	tolmach = $portVersion
+	app:tolmach = $portVersion
+	lib:libfSub
+	"
+
+BUILD_REQUIRES="
+	haiku_devel >= $haikuVersion
+	"
+
+BUILD_PREREQUIRES="
+	makefile_engine
+	cmd:gcc
+	cmd:make
+	cmd:mkdepend
+	"
+
+PATCHES="tolmach-1.1.0.patch"
+
+USER_SETTINGS_FILES="
+	settings/Tolmach_Preferences directory"
+
+BUILD()
+{
+	make BUILDHOME=`finddir B_SYSTEM_DEVELOP_DIRECTORY`
+}
+
+INSTALL()
+{
+	architecture=`echo $buildArchitecture | sed 's/_/-/g'`
+	
+	mkdir -p $appsDir/Tolmach $dataDir/Tolmach
+	
+	cd objects.$architecture-release
+	cp Tolmach $appsDir/Tolmach
+	addAppDeskbarSymlink $appsDir/Tolmach/Tolmach
+	
+	cd ../Dictionaries
+	cp *.pgb $dataDir/Tolmach
+}
diff --git a/haiku-apps/trackergrep/patches/trackergrep-5.1.patchset b/haiku-apps/trackergrep/patches/trackergrep-5.1.patchset
new file mode 100644
index 000000000..01fd9988e
--- /dev/null
+++ b/haiku-apps/trackergrep/patches/trackergrep-5.1.patchset
@@ -0,0 +1,49 @@
+From c02a072f11683914ce9dbe77adf0b478f613885e Mon Sep 17 00:00:00 2001
+From: Chris Roberts <cpr420@gmail.com>
+Date: Mon, 2 Dec 2013 20:22:01 -0700
+Subject: Fix directory and include issues
+
+
+diff --git a/source/Grepper.cpp b/source/Grepper.cpp
+index d2e5c58..71befc8 100644
+--- a/source/Grepper.cpp
++++ b/source/Grepper.cpp
+@@ -139,8 +139,10 @@ int32 Grepper::GrepperThread()
+ 	char command[B_PATH_NAME_LENGTH + 32];
+ 
+ 	BPath tempFile;
+-	sprintf(fileName, "/boot/var/tmp/TrackerGrep%ld", fThreadId);
+-	tempFile.SetTo(fileName);
++	if (find_directory(B_SYSTEM_TEMP_DIRECTORY, &tempFile, true) != B_OK)
++		return -1;
++	sprintf(fileName, "TrackerGrep%ld", fThreadId);
++	tempFile.Append(fileName);
+ 
+ 	while (!fMustQuit && GetNextName(fileName)) {
+ 		message.MakeEmpty();
+@@ -159,8 +161,9 @@ int32 Grepper::GrepperThread()
+ 
+ 		EscapeSpecialChars(fileName);
+ 
++		//assume that grep is already in $PATH
+ 		sprintf(
+-			command, "/boot/beos/bin/grep -hn %s %s \"%s\" > \"%s\"",
++			command, "grep -hn %s %s \"%s\" > \"%s\"",
+ 			fModel->fCaseSensitive ? "" : "-i", fPattern, fileName, 
+ 			tempFile.Path());
+ 
+diff --git a/source/Model.h b/source/Model.h
+index a73d801..8ec1d24 100644
+--- a/source/Model.h
++++ b/source/Model.h
+@@ -30,6 +30,7 @@
+ #include <Message.h>
+ #include <Entry.h>
+ #include <FindDirectory.h>
++#include <File.h>
+ #include <Rect.h>
+ 
+ #define PREFS_FILE    "TrackerGrepSettings"
+-- 
+1.8.3.4
+
diff --git a/haiku-apps/trackergrep/trackergrep-5.1.recipe b/haiku-apps/trackergrep/trackergrep-5.1.recipe
index 039b84e3a..4f9bd20b2 100644
--- a/haiku-apps/trackergrep/trackergrep-5.1.recipe
+++ b/haiku-apps/trackergrep/trackergrep-5.1.recipe
@@ -1,41 +1,54 @@
-DESCRIPTION="Tracker Grep is a simple Tracker add-on that lets you search through text files. Haiku already comes with a tool that lets you do that, grep, but you need to use it from a Terminal window. Gone are those days of command-line trouble, because from now on Tracker Grep lets you run grep directly from the Tracker."
-
-SUMMARY="Tracker Grep is a simple Tracker add-on that lets you search through text files."
+SUMMARY="A simple Tracker add-on that lets you search through text files."
+DESCRIPTION="
+Tracker Grep is a simple Tracker add-on that lets you search through
+text files. Haiku already comes with a tool that lets you do that,
+grep, but you need to use it from a Terminal window. Gone are those
+days of command-line trouble, because from now on Tracker Grep lets
+you run grep directly from the Tracker."
 HOMEPAGE="https://github.com/HaikuArchives/TrackerGrep/"
-SRC_URI="git+git://github.com/HaikuArchives/TrackerGrep.git"
-REVISION="1"
-
+SRC_URI="git://github.com/HaikuArchives/TrackerGrep.git#001a0b68be"
+REVISION="2"
 COPYRIGHT="
 	1998-2006 Matthijs Hollemans
 	2007 Jonas Sundström."
-
 LICENSE="MIT"
 
-ARCHITECTURES="x86_gcc2 ?x86 ?x86_64"
+ARCHITECTURES="x86_gcc2 x86 ?x86_64"
 
 PROVIDES="
 	TrackerGrep = $portVersion
-	app:TrackerGrep = $portVersion"
+	app:TrackerGrep = $portVersion
+	"
 
 REQUIRES="
-	haiku >= $haikuVersion"
+	haiku >= $haikuVersion
+	"
+
+BUILD_REQUIRES="
+	haiku_devel >= $haikuVersion
+	"
 
 BUILD_PREREQUIRES="
-	haiku_devel >= $haikuVersion
 	cmd:gcc
-	cmd:xres"
+	cmd:xres
+	"
+
+PATCHES="trackergrep-5.1.patchset"
 
 BUILD()
 {
 	cd source
-	g++ -o TrackerGrep GrepApp.cpp GrepWindow.cpp Model.cpp TrackerGrep.cpp Grepper.cpp GrepListView.cpp -lbe -ltracker -ltextencoding
+	g++ -o TrackerGrep GrepApp.cpp GrepWindow.cpp Model.cpp \
+		TrackerGrep.cpp Grepper.cpp GrepListView.cpp -fpermissive \
+		-lbe -ltracker -ltextencoding
 	xres -o TrackerGrep TrackerGrep.rsrc
+	mimeset -f TrackerGrep
 }
 
 INSTALL()
 {
 	cd source
-	mkdir -p $appsDir
-	cp TrackerGrep $appsDir
+	mkdir -p $addOnsDir/Tracker
+	cp TrackerGrep $addOnsDir/Tracker
 	addAppDeskbarSymlink $appsDir/TrackerGrep
 }
diff --git a/haiku-apps/ubertuber/patches/ubertuber-0.9.7.patchset b/haiku-apps/ubertuber/patches/ubertuber-0.9.7.patchset
new file mode 100644
index 000000000..ea63fb80c
--- /dev/null
+++ b/haiku-apps/ubertuber/patches/ubertuber-0.9.7.patchset
@@ -0,0 +1,22 @@
+From bc2604eee4490c94747cbfb268e9a6cdf72d2052 Mon Sep 17 00:00:00 2001
+From: Chris Roberts <cpr420@gmail.com>
+Date: Mon, 2 Dec 2013 20:33:29 -0700
+Subject: Misc fixes for gcc4
+
+
+diff --git a/Makefile b/Makefile
+index 8b2ae37..9af3924 100644
+--- a/Makefile
++++ b/Makefile
+@@ -2,7 +2,7 @@ NAME= UberTuber
+ TYPE= APP
+ SRCS= App.cpp MainWindow.cpp Settings.cpp
+ RDEFS= UberTuber.rdef
+-LIBS= /boot/system/lib/libroot.so /boot/system/lib/libbe.so /boot/system/lib/libtracker.so
++LIBS= be tracker $(STDCPPLIBS)
+ LIBPATHS=
+ SYSTEM_INCLUDE_PATHS= $(BUILDHOME)/headers/be $(BUILDHOME)/headers/cpp $(BUILDHOME)/headers/posix ~/config/include
+ LOCAL_INCLUDE_PATHS=
+-- 
+1.8.3.4
+
diff --git a/haiku-apps/ubertuber/ubertuber-0.9.7.recipe b/haiku-apps/ubertuber/ubertuber-0.9.7.recipe
index 33462ab5f..60b874083 100644
--- a/haiku-apps/ubertuber/ubertuber-0.9.7.recipe
+++ b/haiku-apps/ubertuber/ubertuber-0.9.7.recipe
@@ -1,25 +1,31 @@
 SUMMARY="A tool to play back online videos in MediaPlayer"
-DESCRIPTION="UberTuber grabs clips from various sites and opens them in your media player while they're being downloaded.
-	"
+DESCRIPTION="
+UberTuber grabs clips from various sites and opens them in your media
+player while they're being downloaded.
+"
 HOMEPAGE="http://sourceforge.net/projects/ubertuber/"
 SRC_URI="git://git.code.sf.net/p/ubertuber/code#7971df0e58a145d7357261600442116321257065"
 LICENSE="MIT"
 COPYRIGHT="2013 Humdinger"
-REVISION="1"
-ARCHITECTURES="x86_gcc2 ?x86"
+REVISION="2"
+ARCHITECTURES="x86_gcc2 x86"
 
 PROVIDES="
 	ubertuber = $portVersion
+	app:ubertuber = $portVersion
 	"
+
 REQUIRES="
 	haiku >= $haikuVersion
 	cmd:python
 	"
+
 BUILD_REQUIRES="
+	haiku_devel >= $haikuVersion
 	makefile_engine
 	"
+
 BUILD_PREREQUIRES="
-	haiku_devel >= $haikuVersion
 	cmd:gcc
 	cmd:ld
 	cmd:make
@@ -27,11 +33,13 @@ BUILD_PREREQUIRES="
 	cmd:unzip
 	cmd:xres
 	"
-SOURCE_DIR="$portVersionedName"
+
+PATCHES="ubertuber-0.9.7.patchset"
 
 BUILD()
 {
-	make OBJ_DIR=objects BUILDHOME=/boot/system/develop
+	make OBJ_DIR=objects \
+		BUILDHOME=`finddir B_SYSTEM_DEVELOP_DIRECTORY`
 }
 
 INSTALL()
diff --git a/haiku-apps/waveview/waveview-1.0.recipe b/haiku-apps/waveview/waveview-1.0.recipe
index 42dbc3415..58593cb72 100644
--- a/haiku-apps/waveview/waveview-1.0.recipe
+++ b/haiku-apps/waveview/waveview-1.0.recipe
@@ -1,16 +1,11 @@
-SUMMARY="A data acquisition Software"
-DESCRIPTION="waveview"
+SUMMARY="A simple audio wave viewer"
+DESCRIPTION="simple audio wave viewer"
 HOMEPAGE="https://github.com/aldeck/waveview"
-LICENSE="
-	MIT
-	"
-COPYRIGHT="
-	2011 Alexandre Deckner (alex@zappotek.com)
-	"
-
-SRC_URI="git+https://github.com/aldeck/waveview"
-REVISION="1"
-ARCHITECTURES="x86_gcc2"
+LICENSE="MIT"
+COPYRIGHT="2011 Alexandre Deckner (alex@zappotek.com)"
+SRC_URI="git+https://github.com/aldeck/waveview#fce091e76a"
+REVISION="2"
+ARCHITECTURES="x86_gcc2 x86"
  
 PROVIDES="
 	waveview = $portVersion
@@ -24,12 +19,12 @@ REQUIRES="
 	"
 
 BUILD_REQUIRES="
-	devel:libpcre >= 1
-	devel:libpcreposix >= 1
+	haiku_devel >= $haikuVersion
+	devel:libpcre
+	devel:libpcreposix
 	"
  
 BUILD_PREREQUIRES="
-	haiku_devel >= $haikuVersion
 	makefile_engine
 	cmd:bison
 	cmd:flex
@@ -44,20 +39,15 @@ REQUIRES="
 	haiku >= $haikuVersion
 	"
 
-SOURCE_DIR="waveview-1.0"
-
 BUILD()
 {
-	pwd
-	ls /etc
-	make BUILDHOME=`finddir B_SYSTEM_DEVELOP_DIRECTORY`
+	make OBJ_DIR=objects \
+		BUILDHOME=`finddir B_SYSTEM_DEVELOP_DIRECTORY`
 }
 
 INSTALL()
 {
-	waveviewDir=$appsDir/WaveView
-	mkdir -p $waveviewDir
-	cp -a objects.x86-gcc2-release/WaveView $waveviewDir
-
-	addAppDeskbarSymlink $waveviewDir/WaveView
+	mkdir -p $appsDir
+	cp -a objects/WaveView $appsDir
+	addAppDeskbarSymlink $appsDir/WaveView
 }
diff --git a/haiku-games/puri/puri-0.3.9.1.recipe b/haiku-games/puri/puri-0.3.9.1.recipe
new file mode 100644
index 000000000..1ee54bf89
--- /dev/null
+++ b/haiku-games/puri/puri-0.3.9.1.recipe
@@ -0,0 +1,65 @@
+SUMMARY="Puri is a 2D and 3D chess game."
+DESCRIPTION="
+	Puri is a 2D and 3D chess game. You can play against a computer,
+	or play online against other people.
+	"
+HOMEPAGE="https://gitorious.org/puri-master-of-chess/puri/"
+SRC_URI="https://gitorious.org/puri-master-of-chess/puri/archive/59b5db4b337fc432b64a7d099f7b7e0fc8ece3c7.tar.gz"
+CHECKSUM_MD5="467d00355e3450e9d3b1d126afcf06a6"
+LICENSE="MIT"
+COPYRIGHT="2010-2012 Haiku Inc."
+REVISION="1"
+ARCHITECTURES="?x86 ?x86_64"
+SECONDARY_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
+
+PROVIDES="
+	Puri$secondaryArchSuffix = $portVersion
+	app:Puri$secondaryArchSuffix = $portVersion
+	"
+
+REQUIRES="
+	haiku$secondaryArchSuffix >= $haikuVersion
+	lib:libpng$secondaryArchSuffix
+	lib:libglu$secondaryArchSuffix
+	"
+
+BUILD_REQUIRES="
+	haiku${secondaryArchSuffix}_devel >= $haikuVersion
+	devel:libglu$secondaryArchSuffix
+	devel:libpng$secondaryArchSuffix
+	"
+BUILD_PREREQUIRES="
+	gcc$secondaryArchSuffix
+	cmd:jam
+	cmd:ar$secondaryArchSuffix
+	cmd:as$secondaryArchSuffix
+	cmd:ld$secondaryArchSuffix
+	cmd:ranlib$secondaryArchSuffix
+	"
+
+SOURCE_DIR="puri-master-of-chess-puri"
+
+BUILD()
+{
+	jam
+}
+
+INSTALL()
+{
+	cd source
+	
+	mkdir -p $appsDir/Puri
+	
+	cp Puri $appsDir/Puri
+	addAppDeskbarSymlink $appsDir/Puri/Puri
+	
+	cp -R data $appsDir/Puri/data
+	cp -R Engines $appsDir/Puri/Engines
+	chmod 755 $appsDir/Puri/Engines/stockfish
+}
+
diff --git a/media-libs/aalib/aalib-1.4rc4.recipe b/media-libs/aalib/aalib-1.4rc4.recipe
index 29a13d8cb..aade064cd 100644
--- a/media-libs/aalib/aalib-1.4rc4.recipe
+++ b/media-libs/aalib/aalib-1.4rc4.recipe
@@ -1,31 +1,85 @@
-DESCRIPTION="aalib is an ASCII rendering 2D library" 
+SUMMARY="aalib is an ASCII rendering 2D library"
+DESCRIPTION="aalib is a software library which allows applications to
+	automatically convert still and moving images into ASCII art.
+"
 HOMEPAGE="http://aa-project.sourceforge.net/aalib/" 
 SRC_URI="http://prdownloads.sourceforge.net/aa-project/aalib-1.4rc4.tar.gz"
-#CHECKSUM_MD5="fddc3c704c5489de2a3cf0fedfec59db"
-REVISION="1"
-STATUS_HAIKU="stable"
-DEPEND=""
+SOURCE_DIR="aalib-1.4.0"
+CHECKSUM_MD5="d5aa8e9eae07b7441298b5c30490f6a6"
+REVISION="2"
+LICENSE="Public Domain"
+COPYRIGHT="1997 by Jam Hubicka"
+
+ARCHITECTURES="x86_gcc2 ?x86 ?x86_64"
+SECONDARY_ARCHITECTURES="x86_gcc2 x86"
+
+PROVIDES="
+	aalib$secondaryArchSuffix = $portVersion  compat >= 1
+	lib:libaa$secondaryArchSuffix = 1.0.4 compat >= 1
+"
+
+
+REQUIRES="
+	haiku >= $haikuVersion
+"
+
+BUILD_REQUIRES="
+	haiku${secondaryArchSuffix}_devel >= $haikuVersion
+"
+
+BUILD_PREREQUIRES="
+	cmd:gcc$secondaryArchSuffix
+	cmd:ld$secondaryArchSuffix
+	cmd:make
+	cmd:libtoolize
+	cmd:aclocal
+	cmd:autoconf
+	cmd:automake
+	cmd:makeinfo
+"
+
+PATCHES="
+	aalib-1.4rc4.patch
+"
+
 BUILD()
 {
-	cd aalib-1.4.0
 	libtoolize --force --copy --install
-#	aclocal
-#	autoconf
-#	automake
-	MANDIR=`finddir B_COMMON_DOCUMENTATION_DIRECTORY`/man
-	LIBDIR=`finddir B_COMMON_LIB_DIRECTORY`
-	./configure --prefix=`finddir B_COMMON_DIRECTORY` \
-		--libdir=$LIBDIR \
-		--mandir=$MANDIR \
-		--enable-static
-	make
+	aclocal
+	autoconf
+	automake --add-missing
+	runConfigure ./configure
+	make $jobArgs
 }
 
 INSTALL()
 {
-	cd aalib-1.4.0
 	make install
+	prepareInstalledDevelLibs libaa
+	fixPkgconfig
+
+	# devel package
+	packageEntries devel \
+				$binDir \
+				$developDir \
+				$manDir/man3
 }
 
-LICENSE="Public Domain"
-#COPYRIGHT=""
+# ----- devel package -------------------------------------------------------
+
+PROVIDES_devel="
+	libaa${secondaryArchSuffix}_devel = $portVersion compat >= 1
+	cmd:aafire${secondaryArchSuffix} = $portVersion compat >= 1
+	cmd:aainfo${secondaryArchSuffix} = $portVersion compat >= 1
+	cmd:aalib_config${secondaryArchSuffix} = $portVersion compat >= 1
+	cmd:aasavefont${secondaryArchSuffix} = $portVersion compat >= 1
+	cmd:aatest${secondaryArchSuffix} = $portVersion compat >= 1
+	devel:libaa$secondaryArchSuffix = $portVersion compat >= 1
+"
+
+REQUIRES_devel="
+	libaa$secondaryArchSuffix == $portVersion base
+	lib:libaa$secondaryArchSuffix >= 1.0.4 compat >= 1
+	lib:libroot$secondaryArchSuffix >= $haikuVersion
+"
+
diff --git a/media-libs/aalib/patches/aalib-1.4rc4.patch b/media-libs/aalib/patches/aalib-1.4rc4.patch
new file mode 100644
index 000000000..52cf48b45
--- /dev/null
+++ b/media-libs/aalib/patches/aalib-1.4rc4.patch
@@ -0,0 +1,10 @@
+--- aalib-1.4.0/configure.in	2001-04-24 14:00:02.060293120 +0000
++++ aalib-1.4.0-haiku/configure.in	2013-11-29 18:22:31.000000000 +0000
+@@ -4,6 +4,6 @@
+ AC_CANONICAL_HOST
+ AC_CANONICAL_TARGET
+
+-AM_CONFIG_HEADER(src/config.h)
++AC_CONFIG_HEADERS(src/config.h)
+
+ dnl Initialize the compiler and linker flags for AALIB applications
diff --git a/media-libs/libiptcdata/libiptcdata-1.0.4.recipe b/media-libs/libiptcdata/libiptcdata-1.0.4.recipe
new file mode 100644
index 000000000..072e6f95e
--- /dev/null
+++ b/media-libs/libiptcdata/libiptcdata-1.0.4.recipe
@@ -0,0 +1,67 @@
+SUMMARY="Library for IPTC metadata manipulation"
+DESCRIPTION="libiptcdata is a library, written in C, for manipulating the International Press Telecommunications Council (IPTC) metadata stored within multimedia files such as images. This metadata can include captions and keywords, often used by popular photo management applications. The library provides routines for parsing, viewing, modifying, and saving this metadata."
+HOMEPAGE="http://libiptcdata.sourceforge.net/"
+COPYRIGHT="
+	2005 David Moore
+	"
+LICENSE="GNU LGPL v2.1"
+SRC_URI="http://prdownloads.sourceforge.net/libiptcdata/libiptcdata-1.0.4.tar.gz?download"
+CHECKSUM_MD5="af886556ecb129b694f2d365d03d95a8"
+REVISION="1"
+ARCHITECTURES="x86_gcc2 ?x86 ?x86_64"
+
+PROVIDES="
+	libiptcdata = $portVersion
+	cmd:iptc = $portVersion
+	lib:libiptcdata = 0.3.3
+	"
+REQUIRES="
+	haiku >= $haikuVersion
+	lib:libiconv
+	lib:libintl
+	"
+BUILD_REQUIRES="
+	haiku_devel >= $haikuVersion
+	devel:libiconv
+	"
+BUILD_PREREQUIRES="
+	cmd:gcc
+	cmd:ld
+	cmd:make
+	cmd:libtool
+	cmd:autoconf 
+	cmd:automake
+	"
+PATCHES="libiptcdata-1.0.4.patch"
+
+BUILD()
+{
+	libtoolize --force --copy --install
+	aclocal -I m4
+	autoconf
+	automake
+	runConfigure ./configure --disable-gtk-doc --enable-static --enable-shared
+	make $jobArgs
+}
+
+INSTALL()
+{
+	make install
+
+	prepareInstalledDevelLibs libiptcdata
+	fixPkgconfig
+
+	# devel package
+	packageEntries devel \
+		$developDir
+}
+
+# ----- devel package -------------------------------------------------------
+
+PROVIDES_devel="
+	libiptcdata_devel = $portVersion
+	devel:libiptcdata = 0.3.3
+	"
+REQUIRES_devel="
+	libiptcdata == $portVersion base
+	"
diff --git a/media-libs/libiptcdata/patches/libiptcdata-1.0.4.patch b/media-libs/libiptcdata/patches/libiptcdata-1.0.4.patch
new file mode 100644
index 000000000..d29456cd1
--- /dev/null
+++ b/media-libs/libiptcdata/patches/libiptcdata-1.0.4.patch
@@ -0,0 +1,45 @@
+diff --git a/configure.in b/configure.in
+index a1c58ab..2d8a3b1 100644
+--- a/configure.in
++++ b/configure.in
+@@ -1,6 +1,6 @@
+ AC_PREREQ(2.50)
+ AC_INIT(libiptcdata/iptc-data.h)
+-AM_CONFIG_HEADER(config.h)
++AC_CONFIG_HEADERS(config.h)
+ AM_INIT_AUTOMAKE(libiptcdata, 1.0.4)
+ AM_MAINTAINER_MODE
+
+@@ -75,7 +75,7 @@ dnl Check for headers (Mac OSX often doesn't have them)
+ AC_CHECK_HEADERS([getopt.h wchar.h iconv.h])
+
+
+-GTK_DOC_CHECK([1.0])
++dnl GTK_DOC_CHECK([1.0])
+
+
+ dnl ---------------------------------------------------------------------------
+diff --git a/Makefile.am b/Makefile.am
+index 192529a..504ed54 100644
+--- a/Makefile.am
++++ b/Makefile.am
+@@ -7,4 +7,4 @@ SUBDIRS = m4 libiptcdata po iptc docs win $(MAYBE_PYTHONLIB)
+ EXTRA_DIST = @PACKAGE@.spec
+
+ ACLOCAL_AMFLAGS = -I m4
+-DISTCHECK_CONFIGURE_FLAGS = --enable-gtk-doc
++DISTCHECK_CONFIGURE_FLAGS =
+diff --git a/docs/reference/Makefile.am b/docs/reference/Makefile.am
+index f91793a..1f52449 100644
+--- a/docs/reference/Makefile.am
++++ b/docs/reference/Makefile.am
+@@ -42,7 +42,7 @@ content_files = \
+ 	libjpeg.sgml \
+ 	overview.sgml
+
+-include $(top_srcdir)/gtk-doc.make
++include
+
+-EXTRA_DIST += \
++EXTRA_DIST = \
+ 	version.xml.in
diff --git a/media-libs/libnsbmp/libnsbmp-0.1.0_HEAD.recipe b/media-libs/libnsbmp/libnsbmp-0.1.0_HEAD.recipe
index e392561f2..a0bd99208 100644
--- a/media-libs/libnsbmp/libnsbmp-0.1.0_HEAD.recipe
+++ b/media-libs/libnsbmp/libnsbmp-0.1.0_HEAD.recipe
@@ -5,12 +5,14 @@ REVISION="1"
 STATUS_HAIKU="stable"
 DEPEND="dev-util/buildsystem >= 0.0.1"
 
-BUILD {
+BUILD()
+{
 	cd libnsbmp-0.1.0-HEAD
 	make PREFIX=/boot/common
 }
 
-INSTALL {
+INSTALL()
+{
 	cd libnsbmp-0.1.0-HEAD
 	make install PREFIX=/boot/common
 }
diff --git a/media-libs/libnsgif/libnsgif-0.1.0_HEAD.recipe b/media-libs/libnsgif/libnsgif-0.1.0_HEAD.recipe
index 9075a54e4..391fc33b7 100644
--- a/media-libs/libnsgif/libnsgif-0.1.0_HEAD.recipe
+++ b/media-libs/libnsgif/libnsgif-0.1.0_HEAD.recipe
@@ -5,12 +5,14 @@ REVISION="1"
 STATUS_HAIKU="stable"
 DEPEND="dev-util/buildsystem >= 0.0.1"
 
-BUILD {
+BUILD()
+{
 	cd libnsgif-0.1.0-HEAD
 	make PREFIX=/boot/common
 }
 
-INSTALL {
+INSTALL()
+{
 	cd libnsgif-0.1.0-HEAD
 	make install PREFIX=/boot/common
 }
diff --git a/media-libs/libsvgtiny/libsvgtiny-0.1.0_HEAD.recipe b/media-libs/libsvgtiny/libsvgtiny-0.1.0_HEAD.recipe
index 69d217a5a..b9afbdabe 100644
--- a/media-libs/libsvgtiny/libsvgtiny-0.1.0_HEAD.recipe
+++ b/media-libs/libsvgtiny/libsvgtiny-0.1.0_HEAD.recipe
@@ -7,12 +7,14 @@ DEPEND="dev-util/gperf >= 3.0.4
 	dev-libs/libwapcaplet >= 0.1.1-HEAD
 	net-libs/libdom >= 0"
 #CHECKSUM_MD5=""
-BUILD {
+BUILD()
+{
 	cd libsvgtiny-0-HEAD
 	make PREFIX=/boot/common
 }
 
-INSTALL {
+INSTALL()
+{
 	cd libsvgtiny-0-HEAD
 	make install PREFIX=/boot/common
 }
diff --git a/media-libs/libvpx/patches/libvpx-1.0.0.patch b/media-libs/libvpx/patches/libvpx-1.0.0.patch
deleted file mode 100644
index da04b72ff..000000000
--- a/media-libs/libvpx/patches/libvpx-1.0.0.patch
+++ /dev/null
@@ -1,66 +0,0 @@
-diff -ruN libvpx-v1.0.0/build/make/configure.sh libvpx-v1.0.0-haiku/build/make/configure.sh
---- libvpx-v1.0.0/build/make/configure.sh	2012-01-27 18:36:39.038535168 +0000
-+++ libvpx-v1.0.0-haiku/build/make/configure.sh	2012-03-14 00:47:54.780926976 +0000
-@@ -579,6 +579,9 @@
-             *solaris2.10)
-                 tgt_os=solaris
-                 ;;
-+			*haiku*)
-+				tgt_os=haiku
-+				;;
-         esac
- 
-         if [ -n "$tgt_isa" ] && [ -n "$tgt_os" ]; then
-@@ -909,8 +912,8 @@
-                 esac
-                 ;;
-             gcc*)
--                add_cflags  -m${bits}
--                add_ldflags -m${bits}
-+                enabled haiku || add_cflags  -m${bits}
-+                enabled haiku || add_ldflags -m${bits}
-                 link_with_cc=gcc
-                 tune_cflags="-march="
-             setup_gnu_toolchain
-@@ -939,7 +942,7 @@
-                 add_asflags -f x64
-                 enabled debug && add_asflags -g cv8
-             ;;
--            linux*|solaris*)
-+            linux*|solaris*|haiku*)
-                 add_asflags -f elf${bits}
-                 enabled debug && [ "${AS}" = yasm ] && add_asflags -g dwarf2
-                 enabled debug && [ "${AS}" = nasm ] && add_asflags -g
-@@ -1019,6 +1022,7 @@
-         case ${toolchain} in
-             *-win*);;
-             *-android-gcc);;
-+            *-haiku*);;
-             *) check_header pthread.h && add_extralibs -lpthread
-         esac
-     fi
-diff -ruN libvpx-v1.0.0/configure libvpx-v1.0.0-haiku/configure
---- libvpx-v1.0.0/configure	2012-01-27 18:36:39.039583744 +0000
-+++ libvpx-v1.0.0-haiku/configure	2012-03-14 00:46:37.182976512 +0000
-@@ -107,6 +107,7 @@
- all_platforms="${all_platforms} x86-darwin9-gcc"
- all_platforms="${all_platforms} x86-darwin9-icc"
- all_platforms="${all_platforms} x86-darwin10-gcc"
-+all_platforms="${all_platforms} x86-haiku-gcc"
- all_platforms="${all_platforms} x86-linux-gcc"
- all_platforms="${all_platforms} x86-linux-icc"
- all_platforms="${all_platforms} x86-solaris-gcc"
-diff -ruN libvpx-v1.0.0/examples.mk libvpx-v1.0.0-haiku/examples.mk
---- libvpx-v1.0.0/examples.mk	2012-01-27 18:36:39.040108032 +0000
-+++ libvpx-v1.0.0-haiku/examples.mk	2012-03-14 00:46:37.187432960 +0000
-@@ -113,7 +113,9 @@
- # We should not link to math library (libm) on RVCT
- # when building for bare-metal targets
- ifeq ($(CONFIG_OS_SUPPORT), yes)
--CODEC_EXTRA_LIBS-$(CONFIG_VP8)         += m
-+	ifneq ($(TOOLCHAIN),x86-haiku-gcc)
-+	CODEC_EXTRA_LIBS-$(CONFIG_VP8)         += m
-+	endif
- else
-     ifeq ($(CONFIG_GCC), yes)
-     CODEC_EXTRA_LIBS-$(CONFIG_VP8)         += m
diff --git a/media-libs/libvpx/patches/libvpx-1.0.0.patchset b/media-libs/libvpx/patches/libvpx-1.0.0.patchset
index eba3dc397..24eb0181d 100644
--- a/media-libs/libvpx/patches/libvpx-1.0.0.patchset
+++ b/media-libs/libvpx/patches/libvpx-1.0.0.patchset
@@ -1,4 +1,4 @@
-From 0c31cfc2c7429f81129c3403d9bc03bd245db71c Mon Sep 17 00:00:00 2001
+From 98f5dcd5f2dba828f545dac2a534c90d0c5e6c53 Mon Sep 17 00:00:00 2001
 From: korli <jerome.duval@gmail.com>
 Date: Wed, 14 Mar 2012 00:15:38 +0000
 Subject: patch for 1.0.0
@@ -74,10 +74,10 @@ index f6c9045..ab9657f 100644
      ifeq ($(CONFIG_GCC), yes)
      CODEC_EXTRA_LIBS-$(CONFIG_VP8)         += m
 -- 
-1.7.5
+1.8.3.4
 
 
-From dd76984687465e457d9e3dcd0b4bdc4bd46225dd Mon Sep 17 00:00:00 2001
+From 9a194ee7b8498467e5700e2c4e39bc6a30c95714 Mon Sep 17 00:00:00 2001
 From: Ingo Weinhold <ingo_weinhold@gmx.de>
 Date: Tue, 11 Jun 2013 21:09:11 +0200
 Subject: configure: enable shared library building for Haiku
@@ -97,10 +97,10 @@ index eb8a359..a2ef98d 100755
      if [ -z "$CC" ]; then
          echo "Bypassing toolchain for environment detection."
 -- 
-1.7.5
+1.8.3.4
 
 
-From 87b2816834bb2bbfc1e13765084a0c21eb46cf13 Mon Sep 17 00:00:00 2001
+From 238a1625cbbb75a1a84c112bacd3e6afee54a919 Mon Sep 17 00:00:00 2001
 From: Ingo Weinhold <ingo_weinhold@gmx.de>
 Date: Tue, 11 Jun 2013 21:09:28 +0200
 Subject: libs.mk: no -lm or -lpthread on Haiku
@@ -128,5 +128,41 @@ index 79a1d00..d88cfa7 100644
      $(if $(LIPO_LIBS),$(eval $(call lipo_bin_template,$(bin))))\
  
 -- 
-1.7.5
+1.8.3.4
+
+
+From 214d6e14250d72980faf3798501efe5808562854 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?J=C3=A9r=C3=B4me=20Duval?= <jerome.duval@gmail.com>
+Date: Tue, 3 Dec 2013 22:18:36 +0000
+Subject: x86_64 support
+
+* configure, amples.mk
+
+diff --git a/configure b/configure
+index a2ef98d..4b671ee 100755
+--- a/configure
++++ b/configure
+@@ -118,6 +118,7 @@ all_platforms="${all_platforms} x86-win32-vs9"
+ all_platforms="${all_platforms} x86_64-darwin9-gcc"
+ all_platforms="${all_platforms} x86_64-darwin10-gcc"
+ all_platforms="${all_platforms} x86_64-darwin11-gcc"
++all_platforms="${all_platforms} x86_64-haiku-gcc"
+ all_platforms="${all_platforms} x86_64-linux-gcc"
+ all_platforms="${all_platforms} x86_64-linux-icc"
+ all_platforms="${all_platforms} x86_64-solaris-gcc"
+diff --git a/examples.mk b/examples.mk
+index ab9657f..947a645 100644
+--- a/examples.mk
++++ b/examples.mk
+@@ -113,7 +113,7 @@ vp8_multi_resolution_encoder.DESCRIPTION  = VP8 Multiple-resolution Encoding
+ # We should not link to math library (libm) on RVCT
+ # when building for bare-metal targets
+ ifeq ($(CONFIG_OS_SUPPORT), yes)
+-	ifneq ($(TOOLCHAIN),x86-haiku-gcc)
++	ifeq (,$(findstring haiku,$(TOOLCHAIN)))
+ 	CODEC_EXTRA_LIBS-$(CONFIG_VP8)         += m
+ 	endif
+ else
+-- 
+1.8.3.4
 
diff --git a/media-libs/sdl_image/sdl_image-1.2.12.recipe b/media-libs/sdl_image/sdl_image-1.2.12.recipe
index d8b4018d0..b96f04700 100644
--- a/media-libs/sdl_image/sdl_image-1.2.12.recipe
+++ b/media-libs/sdl_image/sdl_image-1.2.12.recipe
@@ -27,16 +27,16 @@ REQUIRES="
 	"
 
 BUILD_REQUIRES="
+	haiku${secondaryArchSuffix}_devel >= $haikuVersion
 	devel:libsdl$secondaryArchSuffix
 	devel:libjpeg$secondaryArchSuffix
 	devel:libpng$secondaryArchSuffix
-	devel:libtiff$secondaryArchSuffix
+#	devel:libtiff$secondaryArchSuffix
 	devel:libgif$secondaryArchSuffix
 	devel:libwebp$secondaryArchSuffix
 	"
 	
 BUILD_PREREQUIRES="
-	haiku${secondaryArchSuffix}_devel >= $haikuVersion
 	cmd:aclocal
 	cmd:autoconf
 	cmd:gcc$secondaryArchSuffix
diff --git a/media-libs/sdl_mixer/patches/sdl_mixer-1.2.12.patch b/media-libs/sdl_mixer/patches/sdl_mixer-1.2.12.patch
new file mode 100644
index 000000000..0640f3a47
--- /dev/null
+++ b/media-libs/sdl_mixer/patches/sdl_mixer-1.2.12.patch
@@ -0,0 +1,50 @@
+diff --git a/Makefile.in b/Makefile.in
+index 1468e92..367fd69 100644
+--- a/Makefile.in
++++ b/Makefile.in
+@@ -39,7 +39,7 @@ VERSION_OBJECTS = @VERSION_OBJECTS@
+ PLAYWAVE_OBJECTS = @PLAYWAVE_OBJECTS@
+ PLAYMUS_OBJECTS = @PLAYMUS_OBJECTS@
+ 
+-DIST = Android.mk CHANGES COPYING CWProjects.sea.bin MPWmake.sea.bin Makefile.in SDL_mixer.pc.in README SDL_mixer.h SDL_mixer.qpg.in SDL_mixer.spec SDL_mixer.spec.in VisualC Watcom-OS2.zip Xcode Xcode-iOS acinclude autogen.sh build-scripts configure configure.in dynamic_flac.c dynamic_flac.h dynamic_fluidsynth.c dynamic_fluidsynth.h dynamic_mod.c dynamic_mod.h dynamic_mp3.c dynamic_mp3.h dynamic_ogg.c dynamic_ogg.h effect_position.c effect_stereoreverse.c effects_internal.c effects_internal.h fluidsynth.c fluidsynth.h gcc-fat.sh libmikmod-3.1.12.zip load_aiff.c load_aiff.h load_flac.c load_flac.h load_ogg.c load_ogg.h load_voc.c load_voc.h mixer.c music.c music_cmd.c music_cmd.h music_flac.c music_flac.h music_mad.c music_mad.h music_mod.c music_mod.h music_modplug.c music_modplug.h music_ogg.c music_ogg.h native_midi playmus.c timidity wavestream.c wavestream.h version.rc
++DIST = Android.mk CHANGES COPYING CWProjects.sea.bin MPWmake.sea.bin Makefile.in SDL_mixer.pc.in README SDL_mixer.h SDL_mixer.qpg.in SDL_mixer.spec SDL_mixer.spec.in VisualC Watcom-OS2.zip Xcode Xcode-iOS acinclude autogen.sh build-scripts configure configure.in dynamic_flac.c dynamic_flac.h dynamic_fluidsynth.c dynamic_fluidsynth.h dynamic_mod.c dynamic_mod.h dynamic_mp3.c dynamic_mp3.h dynamic_ogg.c dynamic_ogg.h effect_position.c effect_stereoreverse.c effects_internal.c effects_internal.h fluidsynth.c fluidsynth.h gcc-fat.sh libmikmod-3.1.12.zip load_aiff.c load_aiff.h load_flac.c load_flac.h load_ogg.c load_ogg.h load_voc.c load_voc.h mixer.c music.c music_cmd.c music_cmd.h music_flac.c music_flac.h music_mad.c music_mad.h music_mod.c music_mod.h music_modplug.c music_modplug.h music_ogg.c music_ogg.h native_midi timidity wavestream.c wavestream.h version.rc
+ 
+ LT_AGE      = @LT_AGE@
+ LT_CURRENT  = @LT_CURRENT@
+@@ -47,7 +47,7 @@ LT_RELEASE  = @LT_RELEASE@
+ LT_REVISION = @LT_REVISION@
+ LT_LDFLAGS  = -no-undefined -rpath $(libdir) -release $(LT_RELEASE) -version-info $(LT_CURRENT):$(LT_REVISION):$(LT_AGE)
+ 
+-all: $(srcdir)/configure Makefile $(objects) $(objects)/$(TARGET) $(objects)/playmus$(EXE)
++all: $(srcdir)/configure Makefile $(objects) $(objects)/$(TARGET)
+ 
+ $(srcdir)/configure: $(srcdir)/configure.in
+ 	@echo "Warning, configure.in is out of date"
+@@ -65,9 +65,6 @@ $(objects):
+ $(objects)/$(TARGET): $(OBJECTS) $(VERSION_OBJECTS)
+ 	$(LIBTOOL) --mode=link $(CC) -o $@ $(OBJECTS) $(VERSION_OBJECTS) $(LDFLAGS) $(EXTRA_LDFLAGS) $(LT_LDFLAGS)
+ 
+-$(objects)/playmus$(EXE): $(objects)/playmus.lo $(objects)/$(TARGET)
+-	$(LIBTOOL) --mode=link $(CC) -o $@ $(objects)/playmus.lo $(SDL_CFLAGS) $(SDL_LIBS) $(objects)/$(TARGET)
+-
+ install: all install-hdrs install-lib #install-bin
+ install-hdrs:
+ 	$(SHELL) $(auxdir)/mkinstalldirs $(includedir)/SDL
+@@ -82,7 +79,6 @@ install-lib: $(objects) $(objects)/$(TARGET)
+ 	$(LIBTOOL) --mode=install $(INSTALL) $(objects)/$(TARGET) $(libdir)/$(TARGET)
+ install-bin:
+ 	$(SHELL) $(auxdir)/mkinstalldirs $(bindir)
+-	$(LIBTOOL) --mode=install $(INSTALL) -m 755 $(objects)/playmus$(EXE) $(bindir)/playmus$(EXE)
+ 
+ uninstall: uninstall-hdrs uninstall-lib uninstall-bin
+ uninstall-hdrs:
+@@ -96,7 +92,8 @@ uninstall-hdrs:
+ uninstall-lib:
+ 	$(LIBTOOL) --mode=uninstall rm -f $(libdir)/$(TARGET)
+ uninstall-bin:
+-	rm -f $(bindir)/playmus$(EXE)
++	touch playmus
++	rm -f playmus
+ 
+ clean:
+ 	rm -rf $(objects)
diff --git a/media-libs/sdl_mixer/sdl_mixer-1.2.12.recipe b/media-libs/sdl_mixer/sdl_mixer-1.2.12.recipe
index 1f50a77f2..e91763b9c 100644
--- a/media-libs/sdl_mixer/sdl_mixer-1.2.12.recipe
+++ b/media-libs/sdl_mixer/sdl_mixer-1.2.12.recipe
@@ -44,6 +44,7 @@ BUILD_PREREQUIRES="
 	haiku${secondaryArchSuffix}_devel >= $haikuVersion
 	cmd:aclocal
 	cmd:autoconf
+	cmd:automake
 	cmd:gcc$secondaryArchSuffix
 	cmd:ld$secondaryArchSuffix
 	cmd:libtool
@@ -56,6 +57,8 @@ BUILD_PREREQUIRES="
 
 SOURCE_DIR="SDL_mixer-$portVersion"
 
+PATCHES="sdl_mixer-1.2.12.patch"
+
 BUILD()
 {
 	libtoolize --force --copy --install
diff --git a/media-sound/bladeenc/bladeenc-0.94.2.recipe b/media-sound/bladeenc/bladeenc-0.94.2.recipe
index 24e084884..e35ea82eb 100644
--- a/media-sound/bladeenc/bladeenc-0.94.2.recipe
+++ b/media-sound/bladeenc/bladeenc-0.94.2.recipe
@@ -1,25 +1,54 @@
-DESCRIPTION="BladeEnc is a free cross-platform MP3 encoder released under the LGPL." 
+SUMMARY="BladeEnc is a free cross-platform MP3 encoder"
+DESCRIPTION="BladeEnc is a free, cross-platform, console-based MP3 encoder,
+		based on the ISO reference code. It is mostly intended for high quality
+		encoding in high bitrates.
+"
 HOMEPAGE="http://bladeenc.mp3.no/" 
 SRC_URI="ftp://ftp.free.fr/.mirrors1/ftp.gentoo.org/distfiles/bladeenc-0.94.2-src-stable.tar.gz"
 CHECKSUM_MD5="9b9f6eafe1637a48a67f0a0f8f6e71ad"
-REVISION="1"
-STATUS_HAIKU="stable"
-DEPEND=""
+REVISION="2"
+LICENSE="GNU LGPL v2.1"
+COPYRIGHT="1998-2000 Tord Jansson"
+
+ARCHITECTURES="x86_gcc2 ?x86 ?x86_64"
+
+PROVIDES="
+	bladeenc = $portVersion
+	cmd:bladeenc
+"
+
+REQUIRES="
+	haiku >= $haikuVersion
+"
+
+BUILD_REQUIRES="
+	haiku_devel >= $haikuVersion
+"
+
+BUILD_PREREQUIRES="
+	cmd:gcc
+	cmd:make
+	cmd:libtoolize
+	cmd:aclocal
+	cmd:automake
+	cmd:autoconf
+"
+
+PATCHES="
+	bladeenc-0.94.2.patch
+"
+
 BUILD()
 {
-	cd bladeenc-0.94.2
 	libtoolize --force --copy --install
 	aclocal
 	automake --add-missing
 	autoconf
-	./configure --prefix=`finddir B_COMMON_DIRECTORY`
+	runConfigure ./configure
 	make
 }
 
 INSTALL()
 {
-	cd bladeenc-0.94.2
 	make install
 }
-LICENSE="GNU LGPL v2.1"
-COPYRIGHT="1998-2000 Tord Jansson"
diff --git a/media-sound/bladeenc/patches/bladeenc-0.94.2.patch b/media-sound/bladeenc/patches/bladeenc-0.94.2.patch
index 48ed25fb9..db7f02391 100644
--- a/media-sound/bladeenc/patches/bladeenc-0.94.2.patch
+++ b/media-sound/bladeenc/patches/bladeenc-0.94.2.patch
@@ -19,4 +19,16 @@ diff -urN bladeenc-0.94.2/bladeenc/system.h bladeenc-0.94.2-haiku/bladeenc/syste
 +#	if defined __BEOS__ || defined __HAIKU__
  #		define		SYSTEM		BEOS
  #	endif
+
+diff -aurN bladeenc-0.94.2/configure.in bladeenc-0.94.2-haiku/configure.in
+--- bladeenc-0.94.2/configure.in	2001-05-03 10:32:44.040894464 +0000
++++ bladeenc-0.94.2-haiku/configure.in	2013-11-30 16:49:17.864026624 +0000
+@@ -1,7 +1,7 @@
+ dnl Process this file with autoconf to produce a configure script.
+ AC_INIT(Makefile.am)
+
+-AM_CONFIG_HEADER(config.h)
++AC_CONFIG_HEADERS(config.h)
+
+ AM_INIT_AUTOMAKE(bladeenc,0.94.2)
  
diff --git a/media-video/ffmpeg/ffmpeg-0.10.2.recipe b/media-video/ffmpeg/ffmpeg-0.10.2.recipe
index f26d636b9..59e376e96 100644
--- a/media-video/ffmpeg/ffmpeg-0.10.2.recipe
+++ b/media-video/ffmpeg/ffmpeg-0.10.2.recipe
@@ -11,11 +11,13 @@ COPYRIGHT="
 	"
 SRC_URI="http://www.ffmpeg.org/releases/ffmpeg-0.10.2.tar.bz2"
 CHECKSUM_MD5="de1bd5fc4bbf3ef730a5361ee596fedd"
-REVISION="4"
+REVISION="5"
 ARCHITECTURES="x86_gcc2 x86 x86_64"
 SECONDARY_ARCHITECTURES="x86_gcc2 x86"
 
-PATCHES="ffmpeg-0.10.2-gcc2.patch"
+if [ $targetArchitecture == x86_gcc2 ]; then
+	PATCHES="ffmpeg-0.10.2-gcc2.patch"
+fi
 
 PROVIDES="
 	ffmpeg$secondaryArchSuffix = $portVersion compat >= 0.10
@@ -37,6 +39,7 @@ fi
 
 REQUIRES="
 	haiku$secondaryArchSuffix >= $haikuVersion
+	lib:libbz2$secondaryArchSuffix
 	lib:libogg$secondaryArchSuffix
 	lib:libspeex$secondaryArchSuffix
 	lib:libtheoradec$secondaryArchSuffix
@@ -47,6 +50,7 @@ REQUIRES="
 	lib:libz$secondaryArchSuffix
 	"
 BUILD_REQUIRES="
+	devel:libbz2$secondaryArchSuffix
 	devel:libogg$secondaryArchSuffix
 	devel:libspeex$secondaryArchSuffix
 	devel:libtheora$secondaryArchSuffix
diff --git a/net-irc/quassel/quassel-0.9.2.recipe b/net-irc/quassel/quassel-0.9.2.recipe
new file mode 100644
index 000000000..d9b7e1d46
--- /dev/null
+++ b/net-irc/quassel/quassel-0.9.2.recipe
@@ -0,0 +1,93 @@
+SUMMARY="Quassel IRC."
+DESCRIPTION="
+Quassel IRC is a modern, cross-platform, distributed IRC client, 
+meaning that one (or multiple) client(s) can attach to and detach
+from a central core -- much like the popular combination of screen
+and a text-based IRC client such as WeeChat, but graphical. In
+addition to this unique feature, we aim to bring a pleasurable,
+comfortable chatting experience to all major platforms (including
+Linux, Windows, and MacOS X as well as Android smartphones), making
+communication with your peers not only convenient, but also
+ubiquitous available.
+	"
+HOMEPAGE="http://quassel-irc.org"
+SRC_URI="http://quassel-irc.org/pub/quassel-0.9.2.tar.bz2"
+CHECKSUM_MD5="4ed88d288f60290f4459d3e68d61b037"
+REVISION="2"
+LICENSE="
+	GNU GPL v2
+	GNU GPL v3
+	"
+COPYRIGHT="2005-2009, the Quassel IRC Team"
+
+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="
+	quassel${secondaryArchSuffix} = $portVersion
+	cmd:quassel${secondaryArchSuffix}
+	cmd:quasselcore${secondaryArchSuffix}
+	cmd:quasselclient${secondaryArchSuffix}
+	"
+
+REQUIRES="
+	haiku${secondaryArchSuffix} >= $haikuVersion
+	lib:libQtCore$secondaryArchSuffix >= 4.8
+	lib:libQtGui$secondaryArchSuffix >= 4.8
+	"
+
+BUILD_PREREQUIRES="
+	cmd:cmake
+	cmd:g++${secondaryArchSuffix}
+	cmd:make
+	cmd:qmake$secondaryArchSuffix
+	cmd:moc$secondaryArchSuffix
+	cmd:pkg_config
+	"	
+        
+BUILD_REQUIRES="
+	haiku${secondaryArchSuffix}_devel >= $haikuVersion
+	devel:libQtCore$secondaryArchSuffix >= 4.8
+	devel:libQtGui$secondaryArchSuffix >= 4.8
+	"
+
+BUILD()
+{		
+	mkdir -p build
+	cd build
+	cmake -DCMAKE_INSTALL_PREFIX=$prefix \
+	-DCMAKE_C_COMPILER="gcc" -DCMAKE_CXX_COMPILER="g++" \
+	-DCMAKE_BUILD_TYPE=Release ..
+	make $jobArgs
+}
+
+INSTALL()
+{
+	cd build
+
+	# Optional: strip the binaries before installing.
+	# To be updated/removed whenever resources are added.
+	echo "Stripping binaries ..."
+	strip quassel
+	strip quasselcore
+	strip quasselclient
+
+	echo "Copying binaries to ${appsDir} ..."
+	mkdir -p ${appsDir}/Quassel
+	cp quassel ${appsDir}/Quassel
+	cp quasselcore ${appsDir}/Quassel
+	cp quasselclient ${appsDir}/Quassel
+	
+	DIR_QUASSEL_DESKBAR="${dataDir}/deskbar/menu/Applications/Quassel"
+	mkdir -p ${DIR_QUASSEL_DESKBAR}	
+	echo "Making links for Deskbar in ${DIR_QUASSEL_DESKBAR} ..."		
+	addAppDeskbarSymlink ${appsDir}/Quassel/quassel "Quassel/Quassel"
+	addAppDeskbarSymlink ${appsDir}/Quassel/quasselcore "Quassel/Quassel Core"
+	addAppDeskbarSymlink ${appsDir}/Quassel/quasselclient "Quassel/Quassel Client"
+}
diff --git a/net-libs/hubbub/hubbub-0.2.0_HEAD.recipe b/net-libs/hubbub/hubbub-0.2.0_HEAD.recipe
index 949484858..933be4ec9 100644
--- a/net-libs/hubbub/hubbub-0.2.0_HEAD.recipe
+++ b/net-libs/hubbub/hubbub-0.2.0_HEAD.recipe
@@ -5,12 +5,14 @@ REVISION="1"
 STATUS_HAIKU="stable"
 DEPENDS="dev-util/buildsystem >= 0.0.1"
 
-BUILD {
+BUILD()
+{
 	cd hubbub-0.2.0-HEAD
 	make PREFIX=/boot/common
 }
 
-INSTALL {
+INSTALL()
+{
 	cd hubbub-0.2.0-HEAD
 	make install PREFIX=/boot/common
 }
diff --git a/net-libs/libdom/libdom-0.0.1_HEAD.recipe b/net-libs/libdom/libdom-0.0.1_HEAD.recipe
index f114cd6c2..b67298668 100644
--- a/net-libs/libdom/libdom-0.0.1_HEAD.recipe
+++ b/net-libs/libdom/libdom-0.0.1_HEAD.recipe
@@ -5,12 +5,14 @@ REVISION="1"
 STATUS_HAIKU="stable"
 DEPEND="net-libs/hubbub >= 0.2.0-HEAD"
 
-BUILD {
+BUILD()
+{
 	cd libdom-0.0.1-HEAD
 	make PREFIX=/boot/common
 }
 
-INSTALL {
+INSTALL()
+{
 	cd libdom-0.0.1-HEAD
 	make install PREFIX=/boot/common
 }
diff --git a/net-misc/berdp/berdp-1.recipe b/net-misc/berdp/berdp-1.recipe
new file mode 100644
index 000000000..69afb62fc
--- /dev/null
+++ b/net-misc/berdp/berdp-1.recipe
@@ -0,0 +1,50 @@
+DESCRIPTION="
+	BeRDP is a project dedicated to bringing the RDP protocol to the BeOS
+	platform utilizing the rdesktop project. RDP is a protocol designed by
+	Microsoft to remotely administer / run a session on Windows 2000/2003
+	Servers / Windows XP Professional workstations.
+	"
+SUMMARY="BeRDP is a project dedicated to bringing the RDP protocol to the BeOS"
+HOMEPAGE="https://github.com/HaikuArchives/BeRDP/"
+SRC_URI="git+https://github.com/HaikuArchives/BeRDP.git#8d73363b567361a5f14bf36173bf68f01260013a"
+COPYRIGHT="2003-2004 Sikos"
+LICENSE="BSD (4-clause)"
+REVISION="1"
+ARCHITECTURES="x86_gcc2 ?x86 ?x86_64"
+
+PROVIDES="
+	berdp = $portVersion
+	app:BeRDP = $portVersion
+	"
+
+BUILD_PREREQUIRES="
+	makefile_engine
+	cmd:gcc
+	cmd:make
+	cmd:mkdepend
+	"
+
+
+BUILD_REQUIRES="
+	haiku_devel >= $haikuVersion 
+	"
+	
+REQUIRES="
+	haiku >= $haikuVersion
+	cmd:rdesktop
+	"
+
+
+BUILD()
+{
+	cd Source
+	make
+}
+
+INSTALL()
+{
+	mkdir -p $appsDir/BeRDP
+	objDir=Source/objects.$(echo $buildArchitecture|sed -r s/_/-/g)-release
+	cp $objDir/BeRDP $appsDir/BeRDP
+	addAppDeskbarSymlink $appsDir/BeRDP/BeRDP
+}
diff --git a/net-misc/rdesktop/rdesktop-1.8.0.recipe b/net-misc/rdesktop/rdesktop-1.8.0.recipe
new file mode 100644
index 000000000..c45c74b94
--- /dev/null
+++ b/net-misc/rdesktop/rdesktop-1.8.0.recipe
@@ -0,0 +1,54 @@
+DESCRIPTION="
+	rdesktop is an open source client for Windows Remote Desktop Services,
+	capable of natively speaking Remote Desktop Protocol (RDP) in order to
+	present the user's Windows desktop. rdesktop is known to work with
+	Windows versions such as NT 4 Terminal Server, 2000, XP, 2003,
+	2003 R2, Vista, 2008, 7, and 2008 R2.
+	"	
+SUMMARY="An open source client for Windows Remote Desktop Services."
+HOMEPAGE="http://rdesktop.org/" 
+SRC_URI="git+https://github.com/threedeyes/rdesktop.git#dc04b43ccb443f8245e5cda69ab063624e0d6f8c"
+COPYRIGHT="1999-2013 Matthew Chapman"
+LICENSE="GNU GPL v3"
+REVISION="1"
+ARCHITECTURES="x86_gcc2 ?x86 ?x86_64"
+
+PROVIDES="
+	rdesktop = $portVersion
+	cmd:rdesktop = $portVersion
+	"
+
+BUILD_PREREQUIRES="
+	makefile_engine
+	cmd:gcc
+	cmd:make
+	cmd:mkdepend
+	"
+
+BUILD_REQUIRES="
+	haiku_devel >= $haikuVersion
+	devel:libssl
+	"
+
+REQUIRES="
+	haiku >= $haikuVersion
+	lib:libcrypto
+	lib:libssl
+	"
+
+
+BUILD()
+{
+	cd haiku
+	makefile=makefile_gcc4
+	if [[ "$buildArchitecture" == *gcc2* ]]; then
+		makefile=makefile_gcc2
+	fi
+	make -f $makefile
+}
+
+INSTALL()
+{
+	mkdir -p $binDir
+	cp haiku/rdesktop $binDir
+}
diff --git a/sys-devel/bc/bc-1.06.recipe b/sys-devel/bc/bc-1.06.recipe
index cf88b843d..be5c4fb85 100644
--- a/sys-devel/bc/bc-1.06.recipe
+++ b/sys-devel/bc/bc-1.06.recipe
@@ -1,31 +1,56 @@
-DESCRIPTION="Handy console-based calculator utility" 
+SUMMARY="Handy console-based calculator utility"
+DESCRIPTION="bc is an arbitrary precision numeric processing language.
+	Syntax is similar to C, but differs in many substantial areas. It
+	supports interactive execution of statements. bc is a utility included
+	in the POSIX P1003.2/D11 draft standard.
+"
 HOMEPAGE="http://www.gnu.org/software/bc/bc.html" 
 SRC_URI="http://ftp.gnu.org/gnu/bc/bc-1.06.tar.gz"
-REVISION="1"
-STATUS_HAIKU="stable"
-DEPEND=""
 CHECKSUM_MD5="d44b5dddebd8a7a7309aea6c36fda117"
+REVISION="2"
+LICENSE="GNU GPL v2
+	GNU LGPL v2.1"
+COPYRIGHT="1991-2000 Free Software Foundation, Inc."
+
+ARCHITECTURES="x86_gcc2 ?x86 ?x86_64"
+
+PROVIDES="
+	bc = $portVersion
+	cmd:bc
+	cmd:dc
+"
+
+REQUIRES="
+	haiku >= $haikuVersion
+"
+
+BUILD_REQUIRES="
+	haiku_devel >= $haikuVersion
+"
+
+BUILD_PREREQUIRES="
+	cmd:gcc
+	cmd:make
+	cmd:flex
+	cmd:bison
+"
+
+PATCHES="
+	bc-1.06.patch
+"
+
 BUILD()
 {
-	cd bc-1.06
-	./configure --prefix=`finddir B_COMMON_DIRECTORY` \
-		--infodir=`finddir B_COMMON_DOCUMENTATION_DIRECTORY`/info \
-		--mandir=`finddir B_COMMON_DOCUMENTATION_DIRECTORY`/man 
-	make
+	runConfigure --omit-dirs "docDir dataRootDir" ./configure
+	make $jobArgs
 }
 
 INSTALL()
 {
-	cd bc-1.06
-	make install DESTDIR=${DESTDIR}
+	make install 
 }
 
 TEST()
 {
-	cd bc-1.06/Test
 	timetest
 }
-
-LICENSE="GNU GPL v2
-	GNU LGPL v2.1"
-COPYRIGHT="1991-2000 Free Software Foundation, Inc."
diff --git a/sys-fs/fatsort/fatsort-0.9.17.269.recipe b/sys-fs/fatsort/fatsort-0.9.17.269.recipe
index 699daffaa..bbea62c96 100644
--- a/sys-fs/fatsort/fatsort-0.9.17.269.recipe
+++ b/sys-fs/fatsort/fatsort-0.9.17.269.recipe
@@ -6,12 +6,14 @@ REVISION="1"
 STATUS_HAIKU="stable"
 DEPEND=""
 
-BUILD {
+BUILD()
+{
 	cd fatsort-0.9.17.269
 	make CFLAGS="-include /boot/develop/headers/posix/stdint.h" LDFLAGS=-ltextencoding
 }
 
-INSTALL {
+INSTALL()
+{
 	cd fatsort-0.9.17.269
 	make install MANDIR=/boot/common/documentation/man/man1 SBINDIR=/boot/common/bin
 }
diff --git a/www-client/netsurf/netsurf-3.1git.recipe b/www-client/netsurf/netsurf-3.1git.recipe
index 9bfd94afd..45bbaa837 100644
--- a/www-client/netsurf/netsurf-3.1git.recipe
+++ b/www-client/netsurf/netsurf-3.1git.recipe
@@ -17,12 +17,14 @@ DEPEND="media-libs/libmng > 1.0.10
 	dev-perl/HTML-Entities >= 3.70
 	"
 
-BUILD {
+BUILD()
+{
 	cd netsurf-3.1-HEAD
 	make
 }
 
-INSTALL {
+INSTALL()
+{
 	cd netsurf-3.1-HEAD
 	make install
 }
diff --git a/www-client/qupzilla/patches/qupzilla-1.4.x.patchset b/www-client/qupzilla/patches/qupzilla-1.4.x.patchset
new file mode 100644
index 000000000..9b9b2c806
--- /dev/null
+++ b/www-client/qupzilla/patches/qupzilla-1.4.x.patchset
@@ -0,0 +1,119 @@
+From 49c386fa4bd03dfe7e102c1d0635743d966b75b7 Mon Sep 17 00:00:00 2001
+From: "Arfonzo J. Coward" <art@poorcoding.com>
+Date: Thu, 5 Dec 2013 00:04:04 +0000
+Subject: QupZilla sources and build definitions modified for Haiku.
+
+
+diff --git a/src/defines.pri b/src/defines.pri
+index 18a234a..7c33ba5 100644
+--- a/src/defines.pri
++++ b/src/defines.pri
+@@ -19,6 +19,13 @@ win32-msvc* {
+     LIBS += User32.lib Ole32.lib Shell32.lib ShlWapi.lib Gdi32.lib ComCtl32.lib
+ }
+ 
++#DEFINES *= QUPZILLA_PREFIX="`finddir B_USER_APPS_DIRECTORY`/QupZilla/"
++DEFINES *= QUPZILLA_PREFIX="/boot/home/config/apps/QupZilla/"
++DEFINES *= DISABLE_DBUS
++DEFINES *= NO_SYSTEM_DATAPATH
++DEFINES *= NO_X11
++
++
+ # Check for pkg-config availability
+ !mac:unix:system(pkg-config --version > /dev/null) {
+     isEqual(QT_MAJOR_VERSION, 5) {
+diff --git a/src/lib/3rdparty/processinfo.cpp b/src/lib/3rdparty/processinfo.cpp
+index 6131d62..ba96c63 100644
+--- a/src/lib/3rdparty/processinfo.cpp
++++ b/src/lib/3rdparty/processinfo.cpp
+@@ -30,6 +30,10 @@
+ #include <cstdarg>
+ #endif
+ 
++#ifdef __HAIKU__
++#define DT_DIR	4
++#endif
++
+ ProcessInfo::ProcessInfo(const QString &name)
+     : m_name(name)
+ {
+@@ -75,7 +79,8 @@ pid_t ProcessInfo::GetPIDbyName(const char* cchrptr_ProcessName) const
+     }
+ 
+     // Loop while not NULL
+-    while ((de_DirEntity = readdir(dir_proc))) {
++    while ((de_DirEntity = readdir(dir_proc))) {    	
++#ifndef __HAIKU__    
+         if (de_DirEntity->d_type == DT_DIR) {
+             if (IsNumeric(de_DirEntity->d_name)) {
+                 strcpy(chrarry_CommandLinePath, "/proc/") ;
+@@ -104,6 +109,7 @@ pid_t ProcessInfo::GetPIDbyName(const char* cchrptr_ProcessName) const
+                 }
+             }
+         }
++#endif          
+     }
+ 
+     closedir(dir_proc) ;
+diff --git a/src/main/main.cpp b/src/main/main.cpp
+index e6a56ea..e4ac880 100644
+--- a/src/main/main.cpp
++++ b/src/main/main.cpp
+@@ -20,10 +20,12 @@
+ 
+ #include <QMessageBox> // For QT_REQUIRE_VERSION
+ 
+-#if defined(Q_OS_LINUX) || defined(__GLIBC__)
++#if defined(Q_OS_LINUX) || defined(__GLIBC__) || defined(__HAIKU__)
+ #include <iostream>
+ #include <signal.h>
++#ifndef __HAIKU__
+ #include <execinfo.h>
++#endif
+ 
+ #include "qupzilla.h"
+ 
+@@ -56,6 +58,7 @@ void qupzilla_signal_handler(int s)
+         }
+         sigSegvServed = true;
+ 
++#ifndef __HAIKU__
+         std::cout << "QupZilla: Crashed :( Saving backtrace in " << qPrintable(mApp->PROFILEDIR) << "crashlog ..." << std::endl;
+ 
+         void* array[100];
+@@ -105,6 +108,9 @@ void qupzilla_signal_handler(int s)
+         file.close();
+ 
+         std::cout << "Backtrace successfuly saved in " << qPrintable(dir.absoluteFilePath(file.fileName())) << std::endl;
++#else
++		std::cout << "QupZilla: Crashed :(" << std::endl;
++#endif        
+     }
+ 
+     default:
+-- 
+1.8.3.4
+
+
+From 002f7d5e1da83f0e0db8129ae05ebf805abec4fe Mon Sep 17 00:00:00 2001
+From: "Arfonzo J. Coward" <art@poorcoding.com>
+Date: Thu, 5 Dec 2013 08:00:47 +0000
+Subject: Remove QUPZILLA_PREFIX definition. We set thisbuild time instead.
+
+
+diff --git a/src/defines.pri b/src/defines.pri
+index 7c33ba5..96093af 100644
+--- a/src/defines.pri
++++ b/src/defines.pri
+@@ -19,8 +19,6 @@ win32-msvc* {
+     LIBS += User32.lib Ole32.lib Shell32.lib ShlWapi.lib Gdi32.lib ComCtl32.lib
+ }
+ 
+-#DEFINES *= QUPZILLA_PREFIX="`finddir B_USER_APPS_DIRECTORY`/QupZilla/"
+-DEFINES *= QUPZILLA_PREFIX="/boot/home/config/apps/QupZilla/"
+ DEFINES *= DISABLE_DBUS
+ DEFINES *= NO_SYSTEM_DATAPATH
+ DEFINES *= NO_X11
+-- 
+1.8.3.4
+
diff --git a/www-client/qupzilla/qupzilla-1.4.x.recipe b/www-client/qupzilla/qupzilla-1.4.x.recipe
new file mode 100644
index 000000000..f49c354ff
--- /dev/null
+++ b/www-client/qupzilla/qupzilla-1.4.x.recipe
@@ -0,0 +1,79 @@
+SUMMARY="QupZilla, a lightweight Qt WebKit web browser."
+DESCRIPTION="
+	QupZilla is a lightweight multiplatform web browser based on
+	libqtwebkit.
+	
+	It provides:	
+	- A unified interface for bookmarks, history and RSS reading.
+	- A themeable interface.
+	- Integrated AdBlock.
+	- Speed Dial.
+	- Multiplatform support.
+	"
+HOMEPAGE="http://www.qupzilla.com"
+
+SRC_URI="git://github.com/QupZilla/qupzilla.git#4f3aba95ff4194c9b756d196f54d50ff30161f46"
+
+REVISION="1"
+LICENSE="GNU GPL v3"
+COPYRIGHT="2010-2013 David Rosca"
+
+ARCHITECTURES="x86"
+if [ $effectiveTargetArchitecture != x86_gcc2 ]; then
+	ARCHITECTURES="$ARCHITECTURES x86_gcc2"
+fi
+SECONDARY_ARCHITECTURES="x86"
+
+PROVIDES="
+	qupzilla${secondaryArchSuffix} = $portVersion
+	app:qupzilla${secondaryArchSuffix} = $portVersion
+	"
+
+# TODO: update requirements to be more specific about which Qt 
+# libraries are required.	
+REQUIRES="
+	haiku${secondaryArchSuffix} >= $haikuVersion
+	qtcore${secondaryArchSuffix} >= 4.8.0
+	"
+
+BUILD_PREREQUIRES="
+	cmd:qmake${secondaryArchSuffix}
+	cmd:make
+	cmd:g++${secondaryArchSuffix}
+	"
+        
+BUILD_REQUIRES="
+	haiku${secondaryArchSuffix}_devel >= $haikuVersion
+	openssl${secondaryArchSuffix}_devel
+	qtcore${secondaryArchSuffix} >= 4.8.0
+	qtcore${secondaryArchSuffix}_devel >= 4.8.0
+	"
+        
+PATCHES="
+	qupzilla-1.4.x.patchset
+	"
+
+BUILD()
+{	
+	qmake QUPZILLA_PREFIX=${appsDir}/QupZilla
+	make $jobArgs
+}
+
+INSTALL()
+{
+	echo "Installing QupZilla..."
+	
+	mkdir -p ${appsDir}/QupZilla/
+	mkdir -p ${appsDir}/QupZilla/lib/
+		
+	cd bin/
+	
+	cp qupzilla ${appsDir}/QupZilla/
+	cp -R locale ${appsDir}/QupZilla/
+	cp -R plugins ${appsDir}/QupZilla/
+	cp -R themes ${appsDir}/QupZilla/
+	cp libQupZilla.* ${appsDir}/QupZilla/lib/
+	
+	echo "Linking QupZilla..."
+	addAppDeskbarSymlink ${appsDir}/QupZilla/qupzilla "QupZilla"
+}
diff --git a/x11-libs/pixman/pixman-0.20.0.recipe b/x11-libs/pixman/pixman-0.20.0.recipe
index ffa1be8dd..e0ccec93a 100644
--- a/x11-libs/pixman/pixman-0.20.0.recipe
+++ b/x11-libs/pixman/pixman-0.20.0.recipe
@@ -1,32 +1,8 @@
+SUMMARY="pixman"
 DESCRIPTION="Pixman - The pixel-manipulation library for X and cairo" 
 HOMEPAGE="http://cgit.freedesktop.org/pixman/" 
 SRC_URI="http://cairographics.org/releases/pixman-0.20.0.tar.gz"
 CHECKSUM_MD5="c1a31d5cedfa97c5af7148a2d1fd4356"
-REVISION="1"
-STATUS_HAIKU="stable"
-DEPEND=""
-BUILD()
-{
-	cd pixman-0.20.0
-	libtoolize --force --copy --install
-	aclocal
-	autoconf
-	./configure --prefix=`finddir B_COMMON_DIRECTORY`
-	make 
-}
-
-INSTALL()
-{
-	cd pixman-0.20.0
-	make install
-}
-
-TEST()
-{
-	cd pixman-0.20.0
-	make check
-}
-
 LICENSE="MIT"
 COPYRIGHT="1987-1998  The Open Group
 	1987-1989 Digital Equipment Corporation
@@ -34,3 +10,73 @@ COPYRIGHT="1987-1998  The Open Group
 	2004-2010 Red Hat, Inc.
 	2009-2010 Sun Microsystems, Inc.
 	and many others"
+
+REVISION="1"
+
+ARCHITECTURES="x86"
+SECONDARY_ARCHITECTURES="x86"
+
+PROVIDES="
+	pixman$secondaryArchSuffix = $portVersion
+	lib:libpixman_1$secondaryArchSuffix = $portVersion
+	"
+
+PROVIDES_devel="
+	pixman${secondaryArchSuffix}_devel = $portVersion
+	devel:libpixman_1$secondaryArchSuffix = $portVersion
+	"
+
+REQUIRES="
+	haiku$secondaryArchSuffix >= $haikuVersion
+	"
+
+REQUIRES_devel="
+	pixman$secondaryArchSuffix == $portVersion base
+	"
+
+BUILD_REQUIRES="
+	"
+
+BUILD_PREREQUIRES="
+	haiku${secondaryArchSuffix}_devel >= $haikuVersion
+	cmd:aclocal
+	cmd:autoconf
+	cmd:gcc$secondaryArchSuffix
+	cmd:ld$secondaryArchSuffix
+	cmd:libtoolize
+	cmd:make
+	cmd:perl
+	cmd:pkg_config
+	"
+
+PATCH()
+{
+	sed -i 's/AM_CONFIG_HEADER/AC_CONFIG_HEADERS/g' configure.ac
+}
+
+BUILD()
+{
+	aclocal
+	libtoolize --force --copy --install
+	automake --add-missing
+	autoconf
+	runConfigure ./configure
+	make $jobArgs
+}
+
+INSTALL()
+{
+	make install
+
+	prepareInstalledDevelLibs libpixman-1
+
+	fixPkgconfig
+
+	packageEntries devel \
+		$developDir
+}
+
+TEST()
+{
+	make check
+}