diff --git a/dev-libs/apr/apr-1.5.0.recipe b/dev-libs/apr/apr-1.5.0.recipe
index 0982a54bf..1ef901bf7 100644
--- a/dev-libs/apr/apr-1.5.0.recipe
+++ b/dev-libs/apr/apr-1.5.0.recipe
@@ -5,7 +5,7 @@ CHECKSUM_SHA256="9879f02054cb22e99f605f6fdbf47f4c028af4cd4f351cf64186a7ee447f35d
 COPYRIGHT="2012 The Apache Software Foundation."
 LICENSE="Apache v2"
 REVISION="1"
-ARCHITECTURES="x86_gcc2 x86 x86_64"
+ARCHITECTURES="x86_gcc2 x86 ?x86_64"
 
 PATCHES="apr-1.5.0.patch"
 
diff --git a/dev-libs/apr_util/apr_util-1.5.3.recipe b/dev-libs/apr_util/apr_util-1.5.3.recipe
index c56964ed5..82b307208 100644
--- a/dev-libs/apr_util/apr_util-1.5.3.recipe
+++ b/dev-libs/apr_util/apr_util-1.5.3.recipe
@@ -1,14 +1,4 @@
 SUMMARY="Apache Portable Runtime Utility Library"
-DESCRIPTION="
-The mission of the Apache Portable Runtime (APR) project is to create and \
-maintain software libraries that provide a predictable and consistent \
-interface to underlying platform-specific implementations. The primary goal is \
-to provide an API to which software developers may code and be assured of \
-predictable if not identical behaviour regardless of the platform on which \
-their software is built, relieving them of the need to code special-case \
-conditions to work around or take advantage of platform-specific deficiencies \
-or features.
-"
 HOMEPAGE="http://apr.apache.org/"
 SRC_URI="http://archive.apache.org/dist/apr/apr-util-1.5.3.tar.gz"
 CHECKSUM_SHA256="76db34cb508e346e3bf69347c29ed1500bf0b71bcc48d54271ad9d1c25703743"
@@ -45,13 +35,13 @@ BUILD_PREREQUIRES="
 	cmd:make
 	"
 
+SOURCE_DIR="apr-util-$portVersion"
+
 PATCH()
 {
 	echo 'AM_INIT_AUTOMAKE' >> xml/expat/configure.in
 }
 
-SOURCE_DIR="apr-util-$portVersion"
-
 BUILD()
 {
 	aprInstallDir=$portPackageLinksDir/lib~libapr_1
@@ -102,6 +92,30 @@ INSTALL()
 		$developDir
 }
 
+DESCRIPTION="
+The mission of the Apache Portable Runtime (APR) project is to create and \
+maintain software libraries that provide a predictable and consistent \
+interface to underlying platform-specific implementations. The primary goal is \
+to provide an API to which software developers may code and be assured of \
+predictable if not identical behaviour regardless of the platform on which \
+their software is built, relieving them of the need to code special-case \
+conditions to work around or take advantage of platform-specific deficiencies \
+or features.
+To give a brief overview, the primary core subsystems of APR 1.x include the \
+following:
+- atomic operations
+- dynamic Shared Object loading
+- file I/O
+- locks (mutexes, condition variables, etc)
+- memory management (high performance allocators)
+- memory-mapped files
+- multicast Sockets
+- network I/O
+- shared memory
+- thread and Process management
+- various data structures (tables, hashes, priority queues, etc)
+"
+
 # ----- devel package -------------------------------------------------------
 
 PROVIDES_devel="
diff --git a/dev-libs/boost/boost-1.55.0.recipe b/dev-libs/boost/boost-1.55.0.recipe
index 290474528..d05f56c8b 100644
--- a/dev-libs/boost/boost-1.55.0.recipe
+++ b/dev-libs/boost/boost-1.55.0.recipe
@@ -11,7 +11,7 @@ CHECKSUM_SHA256="fff00023dd79486d444c8e29922f4072e1d451fc5a4d2b6075852ead7f2b7b5
 REVISION="4"
 LICENSE="Boost v1.0"
 COPYRIGHT="1998-2013 Beman Dawes, David Abrahams, Rene Rivera, et al."
-ARCHITECTURES="x86 x86_64"
+ARCHITECTURES="x86 ?x86_64"
 if [ $effectiveTargetArchitecture != x86_gcc2 ]; then
 	ARCHITECTURES="$ARCHITECTURES x86_gcc2"
 else
diff --git a/dev-util/gtk_doc/gtk_doc-1.20.recipe b/dev-util/gtk_doc/gtk_doc-1.20.recipe
index 9a1efdc94..7bfe26a8b 100644
--- a/dev-util/gtk_doc/gtk_doc-1.20.recipe
+++ b/dev-util/gtk_doc/gtk_doc-1.20.recipe
@@ -8,7 +8,7 @@ HOMEPAGE="http://www.gtk.org/gtk-doc/"
 SRC_URI="http://ftp.gnome.org/pub/GNOME/sources/gtk-doc/$portVersion/gtk-doc-$portVersion.tar.xz"
 CHECKSUM_SHA256="3e6ecf134dbf92a74c24d79848fea3a48e59ab95408a38c6405905d95a293011"
 REVISION="1"
-ARCHITECTURES="x86_gcc2 x86 x86_64"
+ARCHITECTURES="x86_gcc2"
 PROVIDES="
 	gtk_doc = $portVersion
 	cmd:gtkdoc_check
@@ -27,7 +27,7 @@ PROVIDES="
 "
 
 BUILD_REQUIRES="
-	docbook_xml_dtd >= 4.3
+	docbook_xml_dtd == 4.3
 	docbook_xsl_stylesheets
 "
 
diff --git a/dev-util/itstool/itstool-2.0.2.recipe b/dev-util/itstool/itstool-2.0.2.recipe
index 6186d45a2..5f2700da1 100644
--- a/dev-util/itstool/itstool-2.0.2.recipe
+++ b/dev-util/itstool/itstool-2.0.2.recipe
@@ -22,7 +22,7 @@ HOMEPAGE="http://itstool.org/"
 SRC_URI="http://files.itstool.org/itstool/itstool-$portVersion.tar.bz2"
 CHECKSUM_SHA256="bf909fb59b11a646681a8534d5700fec99be83bb2c57badf8c1844512227033a"
 REVISION="1"
-ARCHITECTURES="x86_gcc2 x86 x86_64"
+ARCHITECTURES="x86_gcc2"
 PROVIDES="
 	itstool = $portVersion
 	cmd:itstool
@@ -39,7 +39,7 @@ BUILD_REQUIRES="
 BUILD_PREREQUIRES="
 	cmd:awk
 	cmd:make
-	cmd:python
+	cmd:python >= 2.6
 "
 
 BUILD()
diff --git a/media-gfx/tuxpaint/tuxpaint-0.9.22.recipe b/media-gfx/tuxpaint/tuxpaint-0.9.22.recipe
index 0c526dc84..9a1b2b8c8 100644
--- a/media-gfx/tuxpaint/tuxpaint-0.9.22.recipe
+++ b/media-gfx/tuxpaint/tuxpaint-0.9.22.recipe
@@ -27,6 +27,8 @@ REQUIRES="
 	lib:libSDL_image
 	lib:libSDL_mixer
 	lib:libfribidi
+	lib:freetype
+	lib:gettext
 	lib:libpng
 	lib:libiconv
 	lib:libz
@@ -40,6 +42,8 @@ BUILD_REQUIRES="
 	devel:libSDL_image
 	devel:libSDL_mixer
 	devel:libfribidi
+#	devel:freetype
+#	devel:gettext
 	devel:libpng
 	devel:libz
 	devel:libiconv
diff --git a/media-libs/ilmbase/ilmbase-2.2.0.recipe b/media-libs/ilmbase/ilmbase-2.2.0.recipe
index ecf083f35..340a7a2c9 100644
--- a/media-libs/ilmbase/ilmbase-2.2.0.recipe
+++ b/media-libs/ilmbase/ilmbase-2.2.0.recipe
@@ -14,12 +14,16 @@ SRC_URI="http://download.savannah.nongnu.org/releases/openexr/ilmbase-$portVersi
 CHECKSUM_SHA256="ecf815b60695555c1fbc73679e84c7c9902f4e8faa6e8000d2f905b8b86cedc7"
 REVISION="1"
 
-ARCHITECTURES="x86_gcc2 x86 x86_64"
-SECONDARY_ARCHITECTURES="x86 x86_gcc2"
-
-if [ $effectiveTargetArchitecture == x86_gcc2 ]; then
-	PATCHES="ilmbase-$portVersion.patchset"
+ARCHITECTURES="x86 x86_64"
+if [ $effectiveTargetArchitecture != x86_gcc2 ]; then
+	# x86_gcc2 is fine as primary target architecture as long as we're building
+	# for a different secondary architecture.
+	ARCHITECTURES="$ARCHITECTURES x86_gcc2"
+else
+	ARCHITECTURES="$ARCHITECTURES !x86_gcc2"
 fi
+SECONDARY_ARCHITECTURES="x86"
+
 PROVIDES="
 	ilmbase$secondaryArchSuffix = $portVersion
 	lib:libHalf$secondaryArchSuffix = 12.0.0 compat >= 12
@@ -31,6 +35,7 @@ PROVIDES="
 
 REQUIRES="
 	haiku$secondaryArchSuffix >= $haikuVersion
+	lib:libstdc++$secondaryArchSuffix
 	"
 BUILD_REQUIRES="
 	haiku${secondaryArchSuffix}_devel >= $haikuVersion
@@ -48,9 +53,6 @@ BUILD_PREREQUIRES="
 BUILD()
 {
 	./bootstrap
-	if [ $effectiveTargetArchitecture = x86_gcc2 ]; then
-		export CPPFLAGS="-Dios_base=ios -ftemplate-depth-24"
-	fi
 	runConfigure ./configure
 	make
 }
diff --git a/media-libs/openexr/openexr-2.2.0.recipe b/media-libs/openexr/openexr-2.2.0.recipe
index 175a10ff8..af325ff8b 100644
--- a/media-libs/openexr/openexr-2.2.0.recipe
+++ b/media-libs/openexr/openexr-2.2.0.recipe
@@ -21,11 +21,9 @@ if [ $effectiveTargetArchitecture != x86_gcc2 ]; then
 	# for a different secondary architecture.
 	ARCHITECTURES="$ARCHITECTURES x86_gcc2"
 else
-	ARCHITECTURES="$ARCHITECTURES x86_gcc2"
+	ARCHITECTURES="$ARCHITECTURES !x86_gcc2"
 fi
-SECONDARY_ARCHITECTURES="x86 x86_gcc2"
-
-PATCHES="openexr-$portVersion.patchset"
+SECONDARY_ARCHITECTURES="x86"
 
 PROVIDES="
 	openexr$secondaryArchSuffix = $portVersion
@@ -83,9 +81,6 @@ ${pathSecondaryArchSuffix}/pkgconfig/IlmBase.pc | sed s/IlmBase\.pc//g)
 	export PKG_CONFIG_PATH+=:$IlmBasePkgconfig
 	
 	./bootstrap
-	if [ $effectiveTargetArchitecture = x86_gcc2 ]; then
-		export CPPFLAGS="-Dios_base=ios -ftemplate-depth-24"
-	fi
 	runConfigure ./configure
 	make $jobArgs
 }
diff --git a/media-sound/mpd/patches/mpd-0.18.12_git.patchset b/media-sound/mpd/patches/mpd-0.18.12_git.patchset
index 1cc959c63..1ef40bd2d 100644
--- a/media-sound/mpd/patches/mpd-0.18.12_git.patchset
+++ b/media-sound/mpd/patches/mpd-0.18.12_git.patchset
@@ -1,3 +1,86 @@
+From ef779aef81d2463f7ace973849b7308b51397b3a Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Fran=C3=A7ois=20Revol?= <revol@free.fr>
+Date: Sun, 13 Jul 2014 01:29:05 +0200
+Subject: [PATCH 01/11] configure.ac: check for socket() in libnetwork for
+ Haiku
+
+---
+ configure.ac | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/configure.ac b/configure.ac
+index dbbb5a5..5ff995f 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -198,7 +198,7 @@ AC_SEARCH_LIBS([clock_gettime], [rt])
+ AC_SEARCH_LIBS([syslog], [bsd socket inet],
+ 	[AC_DEFINE(HAVE_SYSLOG, 1, [Define if syslog() is available])])
+ 
+-AC_SEARCH_LIBS([socket], [socket])
++AC_SEARCH_LIBS([socket], [network socket])
+ AC_SEARCH_LIBS([gethostbyname], [nsl])
+ 
+ if test x$host_is_linux = xyes; then
+-- 
+1.8.3.4
+
+
+From 538cc30e408668dc81299137b3771c5e7999ab81 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Fran=C3=A7ois=20Revol?= <revol@free.fr>
+Date: Sun, 13 Jul 2014 01:29:39 +0200
+Subject: [PATCH 02/11] output: make sure AudioOutput::mixer is initialized
+
+Avoids crashing when libao fails to initialize.
+---
+ src/output/Init.cxx | 1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/src/output/Init.cxx b/src/output/Init.cxx
+index eafcec4..79ef4f9 100644
+--- a/src/output/Init.cxx
++++ b/src/output/Init.cxx
+@@ -48,6 +48,7 @@
+ 
+ AudioOutput::AudioOutput(const AudioOutputPlugin &_plugin)
+ 	:plugin(_plugin),
++	 mixer(nullptr),
+ 	 enabled(true), really_enabled(false),
+ 	 open(false),
+ 	 pause(false),
+-- 
+1.8.3.4
+
+
+From 4ed5e354d778792ed4a0dbc647655865e13de59a Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Fran=C3=A7ois=20Revol?= <revol@free.fr>
+Date: Mon, 14 Jul 2014 23:10:02 +0200
+Subject: [PATCH 03/11] unix: define WCOREDUMP() for platforms that don't
+ support it
+
+Haiku does not dump core, it just starts the debugger.
+---
+ src/unix/Daemon.cxx | 4 ++++
+ 1 file changed, 4 insertions(+)
+
+diff --git a/src/unix/Daemon.cxx b/src/unix/Daemon.cxx
+index 490b2de..49ad394 100644
+--- a/src/unix/Daemon.cxx
++++ b/src/unix/Daemon.cxx
+@@ -37,6 +37,10 @@
+ #include <grp.h>
+ #endif
+ 
++#ifndef WCOREDUMP
++#define WCOREDUMP(v) 0
++#endif
++
+ static constexpr Domain daemon_domain("daemon");
+ 
+ #ifndef WIN32
+-- 
+1.8.3.4
+
+
 From aabca27705ed851d637b5a16c913f056983ba3ce Mon Sep 17 00:00:00 2001
 From: =?UTF-8?q?Fran=C3=A7ois=20Revol?= <revol@free.fr>
 Date: Mon, 14 Jul 2014 23:12:03 +0200
diff --git a/sys-devel/bison/bison-2.6.5.recipe b/sys-devel/bison/bison-2.6.5.recipe
index 1725e15f0..6de2a61f6 100644
--- a/sys-devel/bison/bison-2.6.5.recipe
+++ b/sys-devel/bison/bison-2.6.5.recipe
@@ -23,10 +23,10 @@ SECONDARY_ARCHITECTURES="x86 x86_gcc2"
 PATCHES="bison-${portVersion}.patchset"
 
 PROVIDES="
-	bison$secondaryArchSuffix = $portVersion compat >= 2.5
-	cmd:bison$secondaryArchSuffix = $portVersion compat >= 2.5
+	bison$secondaryArchSuffix = $portVersion compat >= 2.6
+	cmd:bison$secondaryArchSuffix = $portVersion compat >= 2.6
 	cmd:yacc$secondaryArchSuffix
-	devel:liby$secondaryArchSuffix = $portVersion compat >= 2.5
+	devel:liby$secondaryArchSuffix = $portVersion compat >= 2.6
 	"
 
 REQUIRES="