diff --git a/app-arch/zip/zip-3.0.recipe b/app-arch/zip/zip-3.0.recipe
index ab36b1ce5..9680e4ed4 100644
--- a/app-arch/zip/zip-3.0.recipe
+++ b/app-arch/zip/zip-3.0.recipe
@@ -24,8 +24,10 @@ PROVIDES="
 	"
 REQUIRES="
 	haiku >= $haikuVersion
+	lib:libz
 	"
 BUILD_REQUIRES="
+	devel:libz
 	"
 BUILD_PREREQUIRES="
 	haiku_devel >= $haikuVersion
diff --git a/dev-libs/glib/glib-1.2.10.recipe b/dev-libs/glib/glib-1.2.10.recipe
index 2e34bc13b..d63a721d4 100644
--- a/dev-libs/glib/glib-1.2.10.recipe
+++ b/dev-libs/glib/glib-1.2.10.recipe
@@ -22,8 +22,13 @@ COPYRIGHT="1995-1997  Peter Mattis, Spencer Kimball and Josh MacDonald
 
 REVISION="1"
 
-ARCHITECTURES="?x86_gcc2 x86"
-SECONDARY_ARCHITECTURES="?x86_gcc2 x86"
+ARCHITECTURES="x86"
+if [ $effectiveTargetArchitecture != x86_gcc2 ]; then
+	ARCHITECTURES="x86_gcc2 $ARCHITECTURES"
+else
+	ARCHITECTURES="!x86_gcc2 $ARCHITECTURES"
+fi
+SECONDARY_ARCHITECTURES="x86"
 
 PROVIDES="
 	glib$secondaryArchSuffix = $portVersion compat >= 1
diff --git a/dev-libs/libffi/libffi-3.2.1.recipe b/dev-libs/libffi/libffi-3.2.1.recipe
index e5b624282..80d18f53f 100644
--- a/dev-libs/libffi/libffi-3.2.1.recipe
+++ b/dev-libs/libffi/libffi-3.2.1.recipe
@@ -6,8 +6,8 @@ HOMEPAGE="http://sourceware.org/libffi"
 LICENSE="MIT"
 REVISION="2"
 
-ARCHITECTURES="x86_gcc2 x86 x86_64"
-SECONDARY_ARCHITECTURES="x86_gcc2 x86"
+ARCHITECTURES="!x86_gcc2 x86 x86_64"
+SECONDARY_ARCHITECTURES="!x86_gcc2 x86"
 
 SRC_URI="ftp://sourceware.org/pub/libffi/libffi-$portVersion.tar.gz"
 CHECKSUM_SHA256="d06ebb8e1d9a22d19e38d63fdb83954253f39bedc5d46232a05645685722ca37"
diff --git a/dev-libs/libidl/libidl-0.6.8.recipe b/dev-libs/libidl/libidl-0.6.8.recipe
index af0895bf4..e5c3ed859 100644
--- a/dev-libs/libidl/libidl-0.6.8.recipe
+++ b/dev-libs/libidl/libidl-0.6.8.recipe
@@ -12,8 +12,13 @@ CHECKSUM_SHA256="50e8f7674815e42a6e8be32610838d9b7da91b3043784d2b69d17b79c7203e7
 COPYRIGHT="1998-1999 Andrew T. Veliath"
 LICENSE="GNU LGPL v2"
 REVISION="1"
-ARCHITECTURES="x86 ?x86_gcc2"
-SECONDARY_ARCHITECTURES="x86 ?x86_gcc2"
+ARCHITECTURES="x86"
+if [ $effectiveTargetArchitecture != x86_gcc2 ]; then
+	ARCHITECTURES="x86_gcc2 $ARCHITECTURES"
+else
+	ARCHITECTURES="!x86_gcc2 $ARCHITECTURES"
+fi
+SECONDARY_ARCHITECTURES="x86"
 
 PROVIDES="
 	libidl$secondaryArchSuffix = $portVersion
@@ -23,7 +28,7 @@ PROVIDES="
 
 REQUIRES="
 	haiku$secondaryArchSuffix >= $haikuVersion
-	lib:libglib
+	lib:libglib$secondaryArchSuffix
 	"
 
 BUILD_REQUIRES="
diff --git a/dev-python/pathtools/python_pathtools-0.1.2.recipe b/dev-python/pathtools/python_pathtools-0.1.2.recipe
new file mode 100644
index 000000000..744a02110
--- /dev/null
+++ b/dev-python/pathtools/python_pathtools-0.1.2.recipe
@@ -0,0 +1,56 @@
+SUMMARY="HTTP library for human beings"
+DESCRIPTION="
+	Requests is an Apache2 Licensed HTTP library, written in Python, \
+	for human beings.
+"
+HOMEPAGE="
+	http://python-requests.org/
+	http://pypi.python.org/pypi/requests
+	"
+SRC_URI="https://pypi.python.org/packages/source/p/pathtools/pathtools-0.1.2.tar.gz"
+CHECKSUM_SHA256="7c35c5421a39bb82e58018febd90e3b6e5db34c5443aaaf742b3f33d4655f1c0"
+LICENSE="MIT"
+COPYRIGHT="2010 Yesudeep Mangalapilly"
+REVISION="1"
+
+ARCHITECTURES="x86 x86_gcc2 x86_64"
+
+SOURCE_DIR="pathtools-$portVersion"
+
+PROVIDES="
+	python_pathtools = $portVersion
+	"
+
+REQUIRES="
+	haiku >= $haikuVersion
+	cmd:python
+	"
+
+BUILD_REQUIRES="
+	haiku_devel >= $haikuVersion
+	python_setuptools
+	"
+
+BUILD_PREREQUIRES="
+	cmd:python
+	cmd:gcc
+	"
+
+BUILD()
+{
+	$portPackageLinksDir/cmd~python/bin/python setup.py build
+}
+
+INSTALL()
+{
+	# GENERIC: all python_setuptools-based installs need this
+	python=$portPackageLinksDir/cmd~python/bin/python
+	pythonVersion=$($python --version 2>&1 | sed 's/Python //' | head -c3)
+	installLocation=$prefix/lib/python$pythonVersion/vendor-packages/
+	export PYTHONPATH=$installLocation:$PYTHONPATH
+	mkdir -p $installLocation
+
+	$python setup.py install \
+		--single-version-externally-managed \
+		--root=/ --prefix=$prefix
+}
diff --git a/dev-util/indent/indent-2.2.10.recipe b/dev-util/indent/indent-2.2.10.recipe
new file mode 100644
index 000000000..8330b4660
--- /dev/null
+++ b/dev-util/indent/indent-2.2.10.recipe
@@ -0,0 +1,78 @@
+SUMMARY="Indent program source files"
+DESCRIPTION="The indent program can be used to make code easier to read.
+	It can also convert from one style of writing C to another. indent
+	understands a substantial amount about the syntax of C, but it also
+	attempts to cope with incomplete and misformed syntax.
+	"
+HOMEPAGE="https://www.gnu.org/software/indent/" 
+REVISION="2"
+ARCHITECTURES="x86 x86_gcc2"
+LICENSE="GNU GPL v3"
+COPYRIGHT="Copyright (c) 1999, 2000 Carlo Wood.  All rights reserved. 
+	Copyright (c) 1994, 1996, 1997 Joseph Arceneaux.  All rights reserved.
+	Copyright (c) 1992, 2002, 2008 Free Software Foundation, Inc.  All rights reserved.
+	Copyright (c) 1980 The Regents of the University of California.
+	Copyright (c) 1976 Board of Trustees of the University of Illinois. All rights reserved.
+	Copyright (c) 1985 Sun Microsystems, Inc.1998-2000 The Santa Cruz Operation
+	"
+
+SRC_URI="http://mirror.keystealth.org/gnu/indent/indent-2.2.10.tar.gz"
+CHECKSUM_SHA256="8a9b41be5bfcab5d8c1be74204b10ae78789fc3deabea0775fdced8677292639"
+
+ARCHITECTURES="x86 x86_64 arm ppc"
+
+PROVIDES="
+	indent = $portVersion
+	cmd:indent = $portVersion
+	cmd:texinfo2man = $portVersion
+	"
+
+REQUIRES="
+	haiku >= $haikuVersion
+    lib:libiconv$secondaryArchSuffix
+    lib:libintl$secondaryArchSuffix
+    "
+
+BUILD_REQUIRES="
+    haiku${secondaryArchSuffix}_devel >= $haikuVersion
+	gettext$secondaryArchSuffix
+    "
+
+BUILD_PREREQUIRES="
+	haiku_devel >= $haikuVersion
+	cmd:aclocal
+	cmd:autoconf
+	cmd:automake
+	cmd:autopoint
+	cmd:autoreconf
+	cmd:awk
+	cmd:gcc
+	cmd:ld
+	cmd:libtoolize
+	cmd:make
+	cmd:find
+	"
+
+BUILD()
+{
+	libtoolize --force --copy --install
+	./bootstrap
+	runConfigure ./configure
+	make $jobArgs
+}
+
+INSTALL()
+{
+	make install
+
+	# Clean up improperly placed documentation
+	mkdir -p $docDir/html
+	mv $prefix/doc/indent/* $docDir/html/
+	rm -rf $prefix/doc
+}
+
+TEST()
+{
+	make test
+	make check
+}
diff --git a/dev-util/indent/indent-2.2.11.recipe b/dev-util/indent/indent-2.2.11.recipe
deleted file mode 100644
index bcc2e7068..000000000
--- a/dev-util/indent/indent-2.2.11.recipe
+++ /dev/null
@@ -1,39 +0,0 @@
-DESCRIPTION="Indent program source files" 
-HOMEPAGE="http://indent.isidore-it.eu/beautify.html" 
-SRC_URI="http://indent.isidore-it.eu/indent-2.2.11.tar.gz"
-REVISION="1"
-STATUS_HAIKU="stable"
-DEPEND="sys-devel/gettext >= 0.17
-	net-misc/rsync >= 3.0.7
-	app-text/texi2html >= 1.82"
-CHECKSUM_MD5="98beafca62472805a3739d3867d5d70f"
-BUILD()
-{
-	cd indent-2.2.11
-	libtoolize --force --copy --install
-	./bootstrap
-	./configure --prefix=`finddir B_COMMON_DIRECTORY`
-	make
-}
-
-INSTALL()
-{
-	cd indent-2.2.11
-	make install DESTDIR=${DESTDIR}
-}
-
-TEST()
-{
-	cd indent-2.2.11
-#	make test
-#	make check
-}
-
-LICENSE="BSD (3-clause)"
-COPYRIGHT="1999-2000 Carlo Wood.  All rights reserved
-	1994, 1996-1997 Joseph Arceneaux All rights reserved.
-	1992, 2002, 2008 Free Software Foundation, Inc.  All rights reserved.
-	1985 Sun Microsystems, Inc.
-	1980 The Regents of the University of California.
-	1976 Board of Trustees of the University of Illinois. All rights reserved.
-	"
diff --git a/games-emulation/visualboyadvance/visualboyadvance-1.8.recipe b/games-emulation/visualboyadvance/visualboyadvance-1.8.recipe
index 29173fec3..ffd5e7a50 100644
--- a/games-emulation/visualboyadvance/visualboyadvance-1.8.recipe
+++ b/games-emulation/visualboyadvance/visualboyadvance-1.8.recipe
@@ -34,7 +34,7 @@ BUILD_REQUIRES="
 	devel:libpng$secondaryArchSuffix
 "
 BUILD_PREREQUIRES="
-	cmd:nasm$secondaryArchSuffix
+	cmd:nasm
 	cmd:make
 	cmd:gcc$secondaryArchSuffix
 	cmd:ld$secondaryArchSuffix
diff --git a/games-strategy/homeworld_sdl/homeworld_sdl-0.6.recipe b/games-strategy/homeworld_sdl/homeworld_sdl-0.6.recipe
new file mode 100644
index 000000000..8b688b187
--- /dev/null
+++ b/games-strategy/homeworld_sdl/homeworld_sdl-0.6.recipe
@@ -0,0 +1,74 @@
+SUMMARY="Homeworld is a space real-time strategy computer game."
+DESCRIPTION="
+Homeworld is a real-time strategy computer \
+game, set and played in a 3D space environment. \
+Developed by Relic Entertainment, it was released \
+for the PC in 1998 to worldwide acclaim, winning \
+multiple awards for its novel gameplay and strong \
+single-player story. Relic Entertainment later released \
+the source code to the public under licence. 
+"
+HOMEPAGE="http://www.homeworldsdl.org/"
+COPYRIGHT="1999-2000 Sierra On-Line, Inc."
+LICENSE="RE-INC-EULA"
+SRC_URI="git+https://bitbucket.org/extrowerk/homeworld-sdl-haiku.git"
+REVISION="1"
+ARCHITECTURES="x86_gcc2 x86"
+SECONDARY_ARCHITECTURES="x86"
+
+PROVIDES="
+	homeworld_sdl$secondaryArchSuffix = $portVersion
+	app:homeworld_sdl$secondaryArchSuffix = $portVersion
+	"
+
+REQUIRES="
+	haiku$secondaryArchSuffix >= $haikuVersion
+	lib:libsdl$secondaryArchSuffix
+	lib:libGL$secondaryArchSuffix
+	lib:libglu$secondaryArchSuffix
+	#lib:mesa_swrast
+	"
+BUILD_REQUIRES="
+	haiku${secondaryArchSuffix}_devel >= $haikuVersion
+	devel:libsdl$secondaryArchSuffix
+	devel:libglu$secondaryArchSuffix
+	"
+BUILD_PREREQUIRES="
+	cmd:gcc$secondaryArchSuffix
+	cmd:ld$secondaryArchSuffix
+	cmd:make
+	cmd:autoconf
+	cmd:aclocal
+	cmd:libtool
+	cmd:yacc$secondaryArchSuffix
+	cmd:flex
+	"
+	
+SOURCE_DIR="homeworld-sdl-haiku"
+
+BUILD()
+{
+	cd Haiku
+	echo "Bootstrapping Homewold_SDL"
+	bash ./bootstrap
+	echo "Configuring Homeworld_SDL"
+	runConfigure ../configure -C --bindir=$appsDir/Homeworld_SDL
+	echo "Building Homeworld_SDL"
+	make $jobArgs
+}
+
+INSTALL()
+{
+	cd Haiku/src
+	echo "Striping debug symbols"
+	strip homeworld
+	echo "Creating bin directory for packaging Homeworld_SDL"
+	mkdir -p $appsDir/Homeworld_SDL
+	echo "Moving binary into the bin directory"
+	cp homeworld $appsDir/Homeworld_SDL/homeworld_sdl
+	cd ..
+	unzip ./Haiku_Extra/Homeworld_Haiku_Start.sh.zip
+	cp Homeworld_Haiku_Start.sh $appsDir/Homeworld_SDL/Start_Homeworld_SDL.sh
+	echo "Adding Homeworld_SDL to the Deskbar"
+	addAppDeskbarSymlink $appsDir/Start_Homeworld_SDL.sh Homeworld_SDL
+}
diff --git a/games-strategy/homeworld_sdl/licenses/RE-INC-EULA b/games-strategy/homeworld_sdl/licenses/RE-INC-EULA
new file mode 100644
index 000000000..38dcd1ff2
--- /dev/null
+++ b/games-strategy/homeworld_sdl/licenses/RE-INC-EULA
@@ -0,0 +1,261 @@
+Homeworld © 1999-2000 Sierra On-Line, Inc.  All Rights Reserved.
+Homeworld is a registered trademark, and Sierra and Sierra Studios are
+registered trademarks of Sierra On-Line, Inc.  Relic is a trademark of Relic
+Entertainment, Inc.
+
+------------------------------------------------------------------------------
+
+This port of Homeworld is based on the original Homeworld source code released
+by Relic Entertainment through the Relic Developers Network.  It has been
+edited for content and formatted to fit your OS.
+
+The original Homeworld source code in its entirety is available from the Relic
+Developers Network website at http://www.relic.com/rdn/
+
+This file contains a copy of the end-user license agreement presented with the
+Homeworld source code from the Relic Developers Network.  If you are using a
+pre-built version of Homeworld, other pre-built libraries have been included
+with the distribution which utilize their own licenses (particularly the GPL
+and LGPL).  Copies of these licenses have been included in additional
+"COPYING_*" files with the pre-built package.
+
+Simple DirectMedia Layer (SDL) is licensed under the LGPL.  The source code to
+SDL is available at http://www.libsdl.org/
+
+Headers for Glide 2 have also been thrown into the source package.  They are
+taken from the open-source Glide 2 library, which is licensed under the 3dfx
+Glide General Public License.  A copy of the license is included in the
+"include/glide2" directory in the source package.
+
+------------------------------------------------------------------------------
+
+                         Relic Entertainment Inc. TM
+
+                        END-USER LICENSE AGREEMENT FOR
+                 RELIC ENTERTAINMENT INC. ("RELIC") SOFTWARE
+
+                          IMPORTANT-READ CAREFULLY:
+
+
+This RELIC End-User License Agreement (the "Agreement") is a legal agreement
+between you (either an individual or a single entity) and RELIC, for the use
+of one or more elements of RELIC proprietary software, which may at RELIC's
+discretion include computer code related to Homeworld 1 TM, tools or other
+material related to creating content related to Homeworld 2 TM and/or
+Impossible Creatures TM including without limitation associated media, printed
+materials, and "online" or electronic documentation (individually or
+collectively referred to as the "SOFTWARE PRODUCT").  The SOFTWARE PRODUCT may
+also include any updates and supplements to the original SOFTWARE PRODUCT
+provided to you by RELIC.  Any software provided along with the SOFTWARE
+PRODUCT that is associated with a separate end-user license agreement is
+licensed to you under the terms of that license agreement.
+
+BY CLICKING "AGREE" BELOW, AND/OR BY INSTALLING, COPYING, DOWNLOADING,
+ACCESSING OR OTHERWISE USING THE SOFTWARE PRODUCT, YOU AGREE TO BE BOUND BY
+THE TERMS OF THIS AGREEMENT.  IF YOU DO NOT AGREE TO THE TERMS OF THIS
+AGREEMENT, DO NOT INSTALL OR USE THE SOFTWARE PRODUCT.
+
+This Agreement is made by and between you (the "LICENSEE") and RELIC.
+
+WHEREAS, RELIC is a game development company that owns certain tools, game
+engines and other technology used to develop interactive entertainment
+software games; and
+
+WHEREAS, LICENSEE wishes to utilize the SOFTWARE PRODUCT for non-commercial
+purposes in accordance with the terms set forth herein; and
+
+WHEREAS, LICENSEE wishes to license from RELIC and RELIC wishes to license to
+LICENSEE, the SOFTWARE PRODUCT and other information as deemed from time to
+time appropriate by RELIC, all on the terms set forth herein;
+
+NOW, THEREFORE, in consideration of the mutual promises made herein, the
+receipt and sufficiency of which is hereby acknowledged, the parties agree as
+follows:
+
+
+1. License
+
+1.1 License Grant. Provided that the LICENSEE complies with the terms set
+forth herein, RELIC hereby grants LICENSEE a limited purpose, nonexclusive,
+royalty-free, terminable, worldwide, non-transferable license to:
+
+  (a) use, reproduce and modify the SOFTWARE PRODUCT and the MODIFIED SOFTWARE
+(as defined in section 2.1) solely for non-commercial purposes; and
+
+  (b) distribute the SOFTWARE PRODUCT and the MODIFIED SOFTWARE, solely for
+non-commercial purposes, and only to registered members of RDN-RELIC
+Developer's Network who have agreed to abide by the terms of this Agreement.
+
+For greater certainty, the term "for non-commercial purposes" as used in this
+Agreement means that the use, reproduction, modification and/or distribution
+of the SOFTWARE PRODUCT and/or MODIFIED SOFTWARE must be made free of any and
+all charges or payments and, without limitation, must not entitle, directly or
+indirectly, the LICENSEE, any related parties or third parties to receive any
+financial consideration or compensation related to such use, reproduction,
+modification and/or distribution.
+
+1.2 Updates. RELIC may from time to time, in its sole discretion, and without
+any obligation on the part of RELIC, provide updates, error corrections, and
+future versions of SOFTWARE PRODUCT to LICENSEE.  Upon delivery, such updates,
+error corrections and future versions shall be deemed part of the SOFTWARE
+PRODUCT, as applicable, and governed by the terms and conditions of this
+Agreement.
+
+1.3 Reservation of Rights. RELIC reserves all rights not explicitly granted
+herein.
+
+1.4 Indemnity. LICENSEE hereby agrees that it is solely responsible for any
+and all liability, claims, damages or losses arising, directly or indirectly,
+from any and all LICENSEE use, reproduction, modification and distribution of
+the SOFTWARE PRODUCT.  LICENSEE shall defend, indemnify, and hold harmless
+RELIC, its officers, directors, employees and agents against any and all
+claims, damages, losses, or liabilities whatsoever arising out of LICENSEE's
+use, reproduction, modification and/or distribution of the SOFTWARE PRODUCT.
+
+1.5 Trademarks. LICENSEE acknowledges and agrees that this Agreement does not
+grant LICENSEE any right to use any trademarks or trade names of RELIC or
+their licensors.  All such marks shall remain the property of the respective
+owner.
+
+
+2. Intellectual Property
+
+2.1 Ownership. The LICENSEE acknowledges and agrees that if the SOFTWARE
+PROGRAM is improved, modified, developed or otherwise amended by the LICENSEE
+("MODIFIED SOFTWARE") the LICENSEE shall have, save and except for the limited
+license granted to the LICENSEE pursuant to the terms and conditions of this
+Agreement, no right, title or interest in and to the MODIFIED SOFTWARE as
+modified or altered, whether modified by the LICENSEE or RELIC and whether or
+not such modifications are authorized pursuant to this Agreement.
+Specifically, the LICENSEE hereby assigns all right, title and interest
+arising out of any such MODIFIED SOFTWARE to RELIC or any other entity as
+RELIC shall require and the LICENSEE will execute such further and other
+documents and do such further and other acts as may be necessary, in the sole
+opinion of RELIC, to transfer all such right, title and interest in and to the
+MODIFIED SOFTWARE from the LICENSEE to RELIC.  If, to the extent that it may
+be deemed that an assignment or grant of right under this section cannot be
+made until after relevant works are in existence, the LICENSEE's acceptance of
+the terms and conditions of this Agreement shall constitute an irrevocable
+assignment of all right, title and interest in and to all complete or
+incomplete works that make up the MODIFIED SOFTWARE.  The LICENSEE hereby
+irrevocably waives in whole any and all moral rights arising under the
+Copyright Act (Canada), as amended from time to time, or other similar
+legislation in any jurisdiction or at common law, which the LICENSEE may have
+in the MODIFIED SOFTWARE.
+
+
+3. Term
+
+3.1 Term. This Agreement shall become effective as of the date LICENSEE
+downloads or installs the SOFTWARE PRODUCT and shall expire five (5) years
+after such date.
+
+3.2 Termination. RELIC may, at its sole discretion and authority, terminate
+this Agreement immediately upon notice including without limitation notice via
+email to LICENSEE.  The Agreement will terminate automatically upon LICENSEE's
+breach of any term of this Agreement.  Any notice sent or transmitted by RELIC
+to the LICENSEE's last known or registered address will be deemed to have been
+sent by RELIC and received by LICENSEE one (1) day after such sending or
+transmission by RELIC.  In the event that this Agreement is terminated for any
+reason, the LICENSEE shall immediately and permanently cease use,
+reproduction, modification or distribution of the SOFTWARE PRODUCT and
+MODIFIED SOFTWARE and will destroy any and all software, code, associated
+media and printed materials related to, directly or indirectly, the SOFTWARE
+PRODUCT and/or the MODIFIED SOFTWARE.
+
+3.3 Survival. Sections 1.4, 1.5, 2.1, 3.2, 3.3, 4.1, 4.2, 5.1 and 7 shall
+survive any expiration or termination of this Agreement.
+
+
+4. Disclaimers, Warranties and Limitation of Liability
+
+4.1 NO WARRANTIES. RELIC AND ITS SUPPLIERS DISCLAIM ANY AND ALL WARRANTIES
+WITH RESPECT TO THE SOFTWARE PRODUCT, EITHER EXPRESS OR IMPLIED, INCLUDING,
+BUT NOT LIMITED TO, IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A
+PARTICULAR PURPOSE.  THE LICENSEE ACKNOWLEDGES THAT IT HAS NOT RELIED ON ANY
+WARRANTY MADE BY RELIC OR ITS SUPPLIERS.  THE SOFTWARE PRODUCT IS PROVIDED ON
+AN "AS IS" BASIS WITH NO WARRANTY, EXPRESS OR IMPLIED AND RELIC HAS NO
+OBLIGATION TO PROVIDE MAINTENANCE, SUPPORT, UPDATES, ENHANCEMENTS OR
+MODIFICATIONS WITH RESPECT TO THE SOFTWARE PRODUCT TO THE LICENSEE.
+
+4.2 LIMITATION OF LIABILITY. IN NO EVENT SHALL RELIC OR ITS SUPPLIERS BE
+LIABLE FOR ANY DAMAGES SUFFERED OR INCURRED BY THE LICENSEE OR ANY OTHER
+PERSON OR ENTITY INCLUDING, WITHOUT LIMITATION, ANY SPECIAL, INCIDENTAL,
+INDIRECT, PUNITIVE OR CONSEQUENTIAL DAMAGES WHATSOEVER (INCLUDING, WITHOUT
+LIMITATION, DAMAGES FOR LOSS OF BUSINESS PROFITS, LOSS OF REVENUE, BUSINESS
+INTERRUPTION, LOSS OF BUSINESS INFORMATION, OR ANY OTHER PECUNIARY LOSS)
+ARISING OUT OF THE USE OF OR INABILITY TO USE THE SOFTWARE PRODUCT, EVEN IF
+RELIC HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGES.
+
+
+5.
+
+5.1 COPYRIGHT. All title and copyrights in and to the SOFTWARE PRODUCT
+(including but not limited to any images, photographs, animations, video,
+audio, music, text, and "applets" incorporated into the SOFTWARE PRODUCT), the
+accompanying printed materials, and any copies of the SOFTWARE PRODUCT are
+owned by RELIC or its suppliers.  All title and intellectual property rights
+in and to the content which may be accessed through use of the SOFTWARE
+PRODUCT is the property of the respective content owner and may be protected
+by applicable copyright or other intellectual property laws and treaties.
+This Agreement grants LICENSEE no rights to use such content.  If this
+SOFTWARE PRODUCT contains documentation, which is provided only in electronic
+form, LICENSEE may print one copy of such electronic documentation.  LICENSEE
+may not copy the printed materials accompanying the SOFTWARE PRODUCT.
+
+5.2 COPY PROTECTION. Use of the SOFTWARE PRODUCT may require additional RELIC
+software for use of the SOFTWARE PRODUCT which may employ copy protection
+technology to prevent the unauthorized copying of the SOFTWARE PRODUCT and/or
+additional RELIC software.  It is illegal to make unauthorized copies of the
+SOFTWARE PRODUCT and/or additional RELIC software or circumvent any copy protection technology employed by RELIC.
+
+
+6. No Exclusivity
+
+Nothing in this Agreement nor the license of the SOFTWARE PRODUCT shall
+constitute or imply any promise to or intention to make any purchase of
+products or services by either party or its affiliated companies or any
+commitment by either party or its affiliated companies with respect to the
+present or future marketing of any product or service or any commitment to
+enter into any other business relationship.
+
+
+7. General
+
+7.1 Modification. No amendment or modification of this Agreement shall be
+valid or binding on RELIC unless made in writing and signed on behalf of RELIC
+by its respective duly authorized officers or representatives.  RELIC may,
+without notice to the LICENSEE, modify, alter or vary the terms of this
+Agreement without the consent of the LICENSEE, however, such modification,
+alteration or variance shall be displayed on the RELIC website located at
+www.relic.com .
+
+7.2 Assignment. LICENSEE may not assign this Agreement without the prior
+written consent of RELIC.  Subject to the limitations set forth in this
+Agreement, this Agreement will inure to the benefit of and be binding upon the
+parties, their successors and permitted assigns.
+
+7.3 Separation of Components. The SOFTWARE PRODUCT is licensed as a single
+product.  Its component parts may not be separated for use license,
+distribution or replacement by the LICENSEE.
+
+7.4 Severability. If any provision of this Agreement shall be held by a court
+of competent jurisdiction to be illegal, invalid or unenforceable, the
+remaining provisions will not be affected and will be deemed to be in full
+force and effect.
+
+7.5 Governing Law, Jurisdiction and Venue. This Agreement shall be governed by
+the laws of the Province of British Columbia.  Each of the parties hereto
+submits and attorns to the exclusive jurisdiction and venue in the provincial
+and federal courts sitting in Vancouver, BC.
+
+7.6 Entire Agreement. This Agreement constitutes the entire understanding
+between the parties hereto and supersedes all previous communications,
+representations and understandings, oral or written, between the parties, with
+respect to the subject matter of this Agreement.
+
+7.7 The LICENSEE agrees that RELIC would be irreparably injured by breach of
+this Agreement by LICENSEE and that RELIC shall be entitled to equitable
+relief, including injunctive relief and specific performance, in addition to
+any and all monetary damages, in the event of any breach of the provisions of
+this Agreement by the LICENSEE.
diff --git a/haiku-apps/beezer/beezer-0.99.hg.recipe b/haiku-apps/beezer/beezer-0.99.hg.recipe
index 599cc74c2..2ef33aedc 100644
--- a/haiku-apps/beezer/beezer-0.99.hg.recipe
+++ b/haiku-apps/beezer/beezer-0.99.hg.recipe
@@ -12,7 +12,7 @@ COPYRIGHT="
 	2009 Ramshankar (aka Teknomancer)
 	2011-2012 Chris Roberts
 	"
-REVISION="2"
+REVISION="3"
 ARCHITECTURES="x86_gcc2 x86 ?x86_64"
 
 PROVIDES="
@@ -29,15 +29,11 @@ BUILD_REQUIRES="
 	"
 
 BUILD_PREREQUIRES="
-	cmd:cmake >= 2.8
+	cmd:cmake
 	cmd:gcc
 	cmd:make
 	"
 
-PATCHES="
-	beezer-0.99.hg.patch
-	"
-
 BUILD()
 {
 	cd Source
diff --git a/haiku-apps/beezer/patches/beezer-0.99.hg.patch b/haiku-apps/beezer/patches/beezer-0.99.hg.patch
deleted file mode 100644
index 638f8e7e2..000000000
--- a/haiku-apps/beezer/patches/beezer-0.99.hg.patch
+++ /dev/null
@@ -1,57 +0,0 @@
-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/digiclock/digiclock-1.0.recipe b/haiku-apps/digiclock/digiclock-1.0.recipe
index ca0b5e730..a4f72a619 100644
--- a/haiku-apps/digiclock/digiclock-1.0.recipe
+++ b/haiku-apps/digiclock/digiclock-1.0.recipe
@@ -1,30 +1,34 @@
 SUMMARY="DigiClock Screensaver"
-DESCRIPTION="Based on BinaryClock by David Enderson. DigiClock uses filled rectangles and random colors."
-
-HOMEPAGE="https://github.com/bbjimmy/DigiClock"
-SRC_URI="git+https://github.com/bbjimmy/DigiClock.git#7c49eb1ec29b1eb1046f9d7911646e2d5f5e6def"
+DESCRIPTION="Based on BinaryClock by David Enderson. DigiClock uses filled rectangles and\
+ random colors."
+HOMEPAGE="http://www.fatelk.com"
+SRC_URI="https://github.com/bbjimmy/DigiClock/archive/1.0.tar.gz"
+CHECKSUM_SHA512="24ab1ed06a4b13d63fbca87708a9e98b53b5737d12fee22663549132e6434b61e789326231e0168447f46f609eb4a296497f98418db41874cc712756f118daa8"
+SOURCE_DIR="DigiClock-1.0"
 
 LICENSE="GNU GPL v2"
 COPYRIGHT="2012 Jim Saxton, Fat Elk Software"
 
+REVISION="2"
+
 ARCHITECTURES="x86_gcc2 x86 ?x86_64"
 
 PROVIDES="
 	digiclock = $portVersion
-	app:digiclock = $portVersion"
-
-REVISION="1"
+	app:digiclock = $portVersion
+	"
 
 REQUIRES="
-	haiku$secondaryArchSuffix >= $haikuVersion"
+	haiku >= $haikuVersion"
 
 BUILD_REQUIRES="
-	haiku${secondaryArchSuffix}_devel >= $haikuVersion"
+	haiku_devel >= $haikuVersion"
 
 BUILD_PREREQUIRES="
-	cmd:gcc$secondaryArchSuffix
+	cmd:gcc
 	cmd:make
-	makefile_engine"
+	makefile_engine
+	"
 
 BUILD()
 {
diff --git a/haiku-apps/rename/rename-3.9.0.recipe b/haiku-apps/rename/rename-3.9.0.recipe
new file mode 100644
index 000000000..0ad131b77
--- /dev/null
+++ b/haiku-apps/rename/rename-3.9.0.recipe
@@ -0,0 +1,50 @@
+SUMMARY="A Tracker add-on that provides you with a way to rename multiple files at once."
+DESCRIPTION="
+ReName! is a Tracker Add-On for HAIKU users. It provides you with a way to\
+rename multiple files at once. ReName! allows you to add, remove or change file\
+extensions. It also allows you to change the capitialization of your files, and\
+do a search and replace on your file names. ReName! also allows you to prepend\
+or append text to multiple file names!
+"
+HOMEPAGE="https://github.com/bbjimmy/ReName_for_HAIKU"
+SRC_URI="https://github.com/bbjimmy/ReName_for_HAIKU/archive/1.0.tar.gz"
+CHECKSUM_SHA512="f13f3a022dab3305c35af0a149711e9e304b00082835115aea3ca8eafa7026cf15613e8f932466e16050dc8282fdcdc16ea3b0d4dc257db09442e16a69c939ae"
+SOURCE_DIR="ReName_for_HAIKU-1.0"
+REVISION="1"
+LICENSE="Public Domain"
+COPYRIGHT="
+	 2000 FlipSide Software
+	"
+ARCHITECTURES="x86_gcc2 x86 ?x86_64"
+
+PROVIDES="
+	rename= $portVersion
+	app:rename = $portVersion
+	"
+REQUIRES="
+	haiku >= $haikuVersion
+	"
+BUILD_PREREQUIRES="
+	cmd:gcc
+	cmd:make
+	makefile_engine
+	"
+BUILD_REQUIRES="
+	haiku_devel >= $haikuVersion
+	"
+
+BUILD()
+{
+	cd source
+	make $jobArgs BUILDHOME=`finddir B_SYSTEM_DEVELOP_DIRECTORY`
+}
+
+INSTALL()
+{
+	mkdir -p $addOnsDir/Tracker
+	cp source/ReName $addOnsDir/Tracker/ReName!
+	mkdir -p $documentationDir/ReName
+	cd documentation
+	cp -r * $documentationDir/ReName
+	
+}
diff --git a/haiku-apps/scriptureguide/scriptureguide-0.9.0.recipe b/haiku-apps/scriptureguide/scriptureguide-0.9.0.recipe
new file mode 100644
index 000000000..c059d28ec
--- /dev/null
+++ b/haiku-apps/scriptureguide/scriptureguide-0.9.0.recipe
@@ -0,0 +1,69 @@
+SUMMARY="Bible study tool that supports a wide variety of Bibles"
+DESCRIPTION="ScriptureGuide is a Bible study tool. It supports all of the \
+features you'd expect: search, setting the font, taking notes, etc. Through \
+the accompanying ScriptureGuideManager app, you can download hundereds of free \
+copies of various Bibles, commentaries, and related books."
+COPYRIGHT="2014 ScriptureGuide Team"
+LICENSE="GNU GPL v2"
+HOMEPAGE="https://github.com/HaikuArchives/ScriptureGuide" 
+SRC_URI="https://github.com/HaikuArchives/ScriptureGuide/archive/v0.9.0.tar.gz"
+CHECKSUM_SHA256="63b36186eaf4be130f333e62fa0fb283dbff90149a14763e96c157d9950777b5"
+SOURCE_DIR="ScriptureGuide-$portVersion"
+REVISION="2"
+
+ARCHITECTURES="x86 ?x86_64"
+if [ $effectiveTargetArchitecture != x86_gcc2 ]; then
+	# x86_gcc2 is fine as primary target architecture as long as we're building
+	# for a different secondary architecture.
+	ARCHITECTURES="$ARCHITECTURES x86_gcc2"
+fi
+SECONDARY_ARCHITECTURES="x86"
+
+PROVIDES="
+	scriptureguide$secondaryArchSuffix = $portVersion
+	app:ScriptureGuide = $portVersion
+	app:ScriptureGuideManager = $portVersion
+	"
+
+REQUIRES="
+	haiku$secondaryArchSuffix >= $haikuVersion
+	cmd:awk
+	cmd:wget
+	cmd:unzip
+	lib:libsword$secondaryArchSuffix
+	lib:libz$secondaryArchSuffix
+	icu$secondaryArchSuffix
+	"
+
+BUILD_REQUIRES="
+	haiku${secondaryArchSuffix}_devel >= $haikuVersion
+	devel:libsword$secondaryArchSuffix
+	devel:libz$secondaryArchSuffix
+	icu${secondaryArchSuffix}_devel
+	"
+
+BUILD_PREREQUIRES="
+	makefile_engine
+	cmd:gcc$secondaryArchSuffix
+	cmd:ld$secondaryArchSuffix
+	cmd:make
+	cmd:mkdepend
+	"
+
+BUILD()
+{
+	cd ScriptureGuide
+	make $jobArgs
+	cd ../ScriptureGuideManager
+	make $jobArgs
+}
+
+INSTALL()
+{
+	mkdir -p $appsDir
+	cp -R App $appsDir
+	mv $appsDir/App $appsDir/ScriptureGuide
+	
+	addAppDeskbarSymlink $appsDir/ScriptureGuide/ScriptureGuide
+	addAppDeskbarSymlink $appsDir/ScriptureGuide/ScriptureGuideManager
+}
diff --git a/haiku-apps/scrittore/licenses/Scintilla b/haiku-apps/scrittore/licenses/Scintilla
new file mode 100644
index 000000000..cbe25b2fc
--- /dev/null
+++ b/haiku-apps/scrittore/licenses/Scintilla
@@ -0,0 +1,20 @@
+License for Scintilla and SciTE
+
+Copyright 1998-2003 by Neil Hodgson <neilh@scintilla.org>
+
+All Rights Reserved 
+
+Permission to use, copy, modify, and distribute this software and its 
+documentation for any purpose and without fee is hereby granted, 
+provided that the above copyright notice appear in all copies and that 
+both that copyright notice and this permission notice appear in 
+supporting documentation. 
+
+NEIL HODGSON DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS 
+SOFTWARE, INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY 
+AND FITNESS, IN NO EVENT SHALL NEIL HODGSON BE LIABLE FOR ANY 
+SPECIAL, INDIRECT OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES 
+WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, 
+WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER 
+TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE 
+OR PERFORMANCE OF THIS SOFTWARE. 
\ No newline at end of file
diff --git a/haiku-apps/scrittore/scrittore-git.recipe b/haiku-apps/scrittore/scrittore-git.recipe
new file mode 100644
index 000000000..adb4634a7
--- /dev/null
+++ b/haiku-apps/scrittore/scrittore-git.recipe
@@ -0,0 +1,36 @@
+SUMMARY="A Scintilla-based text editor."
+DESCRIPTION="Based on the popular framework for code highlighting, Scrittore provides a simplistic programmer's text editor."
+REVISION="1"
+LICENSE="Scintilla"
+SRC_URI="git+https://github.com/HaikuArchives/Scrittore.git"
+COPYRIGHT="
+       1998-2003 Scintilla authors.
+       2011-2013 Haiku authors.
+       "
+
+HOMEPAGE="https://github.com/HaikuArchives/Scrittore"
+PROVIDES="
+       Scrittore
+       app:Scrittore
+       "
+
+ARCHITECTURES="x86 !x86_64 ?arm ?ppc"
+
+BUILD_PREREQUIRES="
+       cmd:make
+       cmd:g++
+       haiku_devel
+       "
+
+BUILD()
+{
+       cd scintilla/haiku
+       make
+}
+
+INSTALL()
+{
+       mkdir -p $appsDir
+       cp bin/scintilla-haiku $appsDir/Scrittore
+       addAppDeskbarSymlink $appsDir/Scrittore
+}
diff --git a/haiku-apps/sortsave/sortsave-1.0.recipe b/haiku-apps/sortsave/sortsave-1.0.recipe
index fac5b256b..68fa57e09 100644
--- a/haiku-apps/sortsave/sortsave-1.0.recipe
+++ b/haiku-apps/sortsave/sortsave-1.0.recipe
@@ -3,17 +3,21 @@ DESCRIPTION="Just like the Borg, bringing order to chaos. SortSave is a re-creat
 old program that I used for a screensaver on my old Tandy 1000 computer. \
 The original was programmed in BASIC and compiled to run on MS Dos."
 HOMEPAGE="https://github.com/bbjimmy/Sort-Save"
-SRC_URI="git+https://github.com/bbjimmy/Sort-Save.git#1.0"
+SRC_URI="https://github.com/bbjimmy/Sort-Save/archive/1.0.tar.gz"
+CHECKSUM_SHA512="794b3d582667b627ea00654e28ede1a0fde59164cbda87bb05ca8ba8327b98bd4bd726dec013098101ce6ac69fc8b3a86311198829b4ba18f6a55528f6f83d8e"
+SOURCE_DIR="Sort-Save-1.0"
+
 LICENSE="SortSave"
 COPYRIGHT="2013 Jim Saxton, Fat Elk Software"
 
+REVISION="1"
+
 ARCHITECTURES="x86_gcc2 x86 ?x86_64"
 
 PROVIDES="
 	sortsave = $portVersion
-	app:sortsave = $portVersion"
-
-REVISION="1"
+	app:sortsave = $portVersion
+	"
 
 REQUIRES="
 	haiku >= $haikuVersion"
@@ -24,7 +28,8 @@ BUILD_REQUIRES="
 BUILD_PREREQUIRES="
 	cmd:gcc
 	cmd:make
-	makefile_engine"
+	makefile_engine
+	"
 
 BUILD()
 {
diff --git a/haiku-apps/virtualbelive/virtualbelive-20140718.recipe b/haiku-apps/virtualbelive/virtualbelive-20140718.recipe
new file mode 100644
index 000000000..485ac883d
--- /dev/null
+++ b/haiku-apps/virtualbelive/virtualbelive-20140718.recipe
@@ -0,0 +1,46 @@
+SUMMARY="Video editing software."
+DESCRIPTION="
+VirtualBeLive is a software for video editing. It supports basic transitions, \
+cutting and a few effects.
+"
+HOMEPAGE="https://github.com/HaikuArchives/VirtualBeLive"
+SRC_URI="git+https://github.com/HaikuArchives/VirtualBeLive#23bea51"
+REVISION="1"
+LICENSE="Public Domain"
+COPYRIGHT="Public Domain"
+
+ARCHITECTURES="x86_gcc2"
+
+PROVIDES="
+	virtualbelive = $portVersion
+	app:VirtualBeLive = $portVersion
+	"
+
+REQUIRES="
+	haiku >= $haikuVersion
+	"
+
+BUILD_PREREQUIRES="
+	makefile_engine
+	cmd:mkdepend
+	cmd:make
+	cmd:g++
+	cmd:xres
+	cmd:grep
+	"
+
+BUILD_REQUIRES="
+	haiku_devel >= $haikuVersion
+	"
+
+BUILD()
+{
+	make $jobArgs OBJ_DIR=objects
+}
+
+INSTALL()
+{
+	mkdir -p $appsDir
+	cp objects/VirtualBeLive $appsDir/VirtualBeLive
+	addAppDeskbarSymlink $appsDir/VirtualBeLive
+}
diff --git a/media-fonts/ahem/ahem-1.0.recipe b/media-fonts/ahem/ahem-1.0.recipe
new file mode 100644
index 000000000..215eef282
--- /dev/null
+++ b/media-fonts/ahem/ahem-1.0.recipe
@@ -0,0 +1,46 @@
+SUMMARY="A font developed to help test writers develop predictable tests"
+DESCRIPTION="The Ahem font was developed by Todd Fahrner to help test writers \
+develop predictable tests. The font's em square is exactly square. \
+Its ascent and descent is exactly the size of the em square. This \
+means that the font's extent is exactly the same as its line-height, \
+meaning that it can be exactly aligned with padding, borders, margins, \
+and so forth.
+The font's alphabetic baseline is 0.2em above its bottom, and 0.8em \
+below its top. The font has an x-height of 0.8em.
+The font has four glyphs:
+  \'X\' U+0058 A square exactly 1em in height and width.
+  \'p\' U+0070 A rectangle exactly 0.2em high, 1em wide, and aligned so \
+               that its top is flush with the baseline.
+  \'É\' U+00C9 A rectangle exactly 0.8em high, 1em wide, and aligned so \
+               that its bottom is flush with the baseline.
+  \' \' U+0020 A transparent space exactly 1em high and wide.
+Most other US-ASCII characters in the font have the same glyph as X."
+HOMEPAGE="http://github.com/Kozea/Ahem"
+SRC_URI="https://github.com/Kozea/Ahem/archive/1.0.tar.gz"
+CHECKSUM_SHA256="bae33954780217ea0e8e517f51e5a84c525ff22b39a508d50ab49e2d5cef7530"
+LICENSE="Public Domain"
+COPYRIGHT="Late-90s Todd Fahrner"
+REVISION="1"
+SOURCE_DIR="Ahem-1.0"
+
+ARCHITECTURES="any"
+DISABLE_SOURCE_PACKAGE="yes"
+
+PROVIDES="
+        ahem = $portVersion
+        "
+
+REQUIRES=""
+BUILD_REQUIRES=""
+BUILD_PREREQUIRES="coreutils"
+
+BUILD()
+{
+	true
+}
+
+INSTALL()
+{
+	mkdir -p $fontsDir/ahem
+	cp Ahem.ttf README $fontsDir/ahem
+}
diff --git a/media-fonts/lohit/lohit-2.3.8.recipe b/media-fonts/lohit/lohit-2.3.8.recipe
index f1da927e3..2ebdbdbfe 100644
--- a/media-fonts/lohit/lohit-2.3.8.recipe
+++ b/media-fonts/lohit/lohit-2.3.8.recipe
@@ -21,7 +21,9 @@ DISABLE_SOURCE_PACKAGE=yes
 PROVIDES="lohit = $portVersion"
 REQUIRES=""
 BUILD_REQUIRES=""
-BUILD_PREREQUIRES="coreutils"
+BUILD_PREREQUIRES="
+	cmd:find
+"
 
 SOURCE_DIR="lohit-fonts-2.3.8"
 
diff --git a/media-fonts/paratype/paratype-1.0.recipe b/media-fonts/paratype/paratype-1.0.recipe
new file mode 100644
index 000000000..af546807b
--- /dev/null
+++ b/media-fonts/paratype/paratype-1.0.recipe
@@ -0,0 +1,39 @@
+SUMMARY="ParaType font collection for languages of Russia"
+DESCRIPTION="ParaType is a font collection designed for use with minority \
+languages of Russia."
+HOMEPAGE="http://www.paratype.com/public"
+SRC_URI_1="http://www.paratype.com/uni/public/PTSansOFL.zip"
+SRC_URI_2="http://www.paratype.com/uni/public/PTSerifOFL.zip"
+SRC_URI_3="http://www.paratype.com/uni/public/PTMonoOFL.zip"
+CHECKSUM_SHA256_1="57448741b709c5f022127134ffd49506e3925242bd06f73a039e070765d1d637"
+CHECKSUM_SHA256_2="e7a2a27ed0481d20973f0d3b589362d055269082e3fc4d96f81dacd58bad8dcc"
+CHECKSUM_SHA256_3="e34e729f9509cf85acc52caadf68e96db90457b7164ba45719967d53e7a20dcc"
+LICENSE="SIL Open Font License v1.1"
+COPYRIGHT="2009 ParaType"
+REVISION="1"
+SOURCE_DIR=""
+
+ARCHITECTURES="any"
+DISABLE_SOURCE_PACKAGE="yes"
+
+PROVIDES="
+        paratype = $portVersion
+        "
+
+REQUIRES=""
+BUILD_REQUIRES=""
+BUILD_PREREQUIRES="coreutils"
+
+BUILD()
+{
+	true
+}
+
+INSTALL()
+{
+	mkdir -p $fontsDir/paratype
+	cp *.ttf $fontsDir/paratype
+	cp ../sources-2/*.ttf $fontsDir/paratype
+	cp ../sources-3/*.ttf $fontsDir/paratype
+}
+
diff --git a/media-fonts/symbola/symbola-7.18.recipe b/media-fonts/symbola/symbola-7.18.recipe
new file mode 100644
index 000000000..ffa56b1af
--- /dev/null
+++ b/media-fonts/symbola/symbola-7.18.recipe
@@ -0,0 +1,30 @@
+SUMMARY="Unicode font for ancient scripts"
+DESCRIPTION="Basic Latin, Greek, Cyrillic, and many Symbol blocks of The \
+Unicode Standard, Version 7.0"
+HOMEPAGE="http://users.teilar.gr/~g1951d"
+SRC_URI="http://users.teilar.gr/~g1951d/Symbola.zip"
+CHECKSUM_SHA256="4e98df630002a95da59970916cab05a2229874066871f12f2ad0b547b9c260b6"
+LICENSE="Public Domain"
+COPYRIGHT="None"
+REVISION="1"
+
+ARCHITECTURES="any"
+DISABLE_SOURCE_PACKAGE="yes"
+
+PROVIDES="symbola = $portVersion"
+REQUIRES=""
+BUILD_REQUIRES=""
+BUILD_PREREQUIRES="coreutils"
+
+SOURCE_DIR=""
+
+BUILD()
+{
+	true
+}
+
+INSTALL()
+{
+	mkdir -p $fontsDir/ttfonts
+	cp *.ttf $fontsDir/ttfonts
+}
diff --git a/media-fonts/vl_gothic/vl_gothic-20141206.recipe b/media-fonts/vl_gothic/vl_gothic-20141206.recipe
new file mode 100644
index 000000000..08ba3b550
--- /dev/null
+++ b/media-fonts/vl_gothic/vl_gothic-20141206.recipe
@@ -0,0 +1,43 @@
+SUMMARY="A modern gothic font including Japanese, as well as Latin and Greek glyphs"
+DESCRIPTION="This package includes the VL Gothic (monospace) and VL PGothic \
+(proportional) fonts. Originally developed for the Vine Linux project, they \
+include glyphs suitable for rendering Japanese text, as well as Latin and Greek \
+alphabets.
+The fonts are based on the M+ fonts and the Sazanami fonts."
+HOMEPAGE="http://vlgothic.dicey.org/"
+SRC_URI="http://sourceforge.jp/frs/redir.php?m=jaist&f=%2Fvlgothic%2F62375%2FVLGothic-20141206.tar.xz"
+CHECKSUM_SHA256="982040db2f9cb73d7c6ab7d9d163f2ed46d1180f330c9ba2fae303649bf8102d"
+LICENSE="BSD (3-clause)
+	M+ Fonts Project
+	Sazanami Gothic Font
+"
+COPYRIGHT="1990-2003 Wada Laboratory, the University of Tokyo.
+2003-2004 Electronic Font Open Laboratory (/efont/).
+2002-2014 M+ FONTS PROJECT
+2006-2014 Daisuke SUZUKI <daisuke@vinelinux.org>.
+2006-2014 Project Vine <Vine@vinelinux.org>.
+"
+REVISION="1"
+
+ARCHITECTURES="any"
+DISABLE_SOURCE_PACKAGE=yes
+
+PROVIDES="vl_gothic = $portVersion"
+REQUIRES=""
+BUILD_REQUIRES=""
+BUILD_PREREQUIRES="coreutils"
+
+SOURCE_DIR="VLGothic"
+
+BUILD()
+{
+	true
+}
+
+INSTALL()
+{
+	FONTDIR=$fontsDir/ttfonts/
+	mkdir -p ${FONTDIR}
+	cp VL-Gothic-Regular.ttf ${FONTDIR}
+	cp VL-PGothic-Regular.ttf ${FONTDIR}
+}
diff --git a/net-proxy/privoxy/patches/privoxy-3.0.19.patch b/net-proxy/privoxy/patches/privoxy-3.0.19.patch
deleted file mode 100644
index 1be72de1c..000000000
--- a/net-proxy/privoxy/patches/privoxy-3.0.19.patch
+++ /dev/null
@@ -1,72 +0,0 @@
-diff -Naur privoxy-3.0.19-stable/configure.in privoxy-3.0.19-stable-haiku/configure.in
---- privoxy-3.0.19-stable/configure.in	2012-09-12 20:00:37.292814848 -0400
-+++ privoxy-3.0.19-stable-haiku/configure.in	2012-09-12 22:21:25.287309824 -0400
-@@ -160,7 +160,7 @@
- dnl =================================================================
- 
- 
--if test "$EMXOS2" = yes; then
-+if test "$EMXOS2" = yes || test "$host_os" = haiku; then
-   echo "Skipping user and group validity stuff.";
- 
- else
-@@ -677,6 +677,26 @@
- AC_SUBST(AMIGAOS_ONLY)
- 
- dnl =================================================================
-+dnl Haiku specific
-+dnl =================================================================
-+
-+if test "$host_os" = haiku; then
-+  # Omit the "-pthread" flag to gcc, even when building with gcc 2.95
-+  SPECIAL_CFLAGS=
-+
-+  # Haiku's pthreads implementation exists in its system library,
-+  # libroot, not in a separate pthreads library
-+  PTHREAD_LIB=
-+
-+  # Networking code exists in libnetwork
-+  SOCKET_LIB=-lnetwork
-+
-+  # Search Haiku's common-library folder to find its pcre and
-+  # pcreposix libraries
-+  LIBS="-L/boot/common/lib $LIBS"
-+fi
-+
-+dnl =================================================================
- dnl Check for standard compiler stuff
- dnl =================================================================
- 
-diff -Naur privoxy-3.0.19-stable/filters.c privoxy-3.0.19-stable-haiku/filters.c
---- privoxy-3.0.19-stable/filters.c	2012-09-12 20:00:37.720371712 -0400
-+++ privoxy-3.0.19-stable-haiku/filters.c	2012-09-12 22:21:28.150470656 -0400
-@@ -1095,6 +1095,11 @@
-    char *new_url = NULL;
-    char *tmp;
- 
-+   char *url_segment = NULL;
-+   char **url_segments;
-+   size_t max_segments;
-+   int segments;
-+
-    assert(subject);
-    assert(redirect_mode);
- 
-@@ -1117,14 +1122,13 @@
-        * and look for a URL in the decoded result.
-        * Stop the search after the first match.
-        */
--      char *url_segment = NULL;
-+
-       /*
-        * XXX: This estimate is guaranteed to be high enough as we
-        *      let ssplit() ignore empty fields, but also a bit wasteful.
-        */
--      size_t max_segments = strlen(subject) / 2;
--      char **url_segments = malloc(max_segments * sizeof(char *));
--      int segments;
-+      max_segments = strlen(subject) / 2;
-+      url_segments = malloc(max_segments * sizeof(char *));
- 
-       if (NULL == url_segments)
-       {
diff --git a/net-proxy/privoxy/privoxy-3.0.19.recipe b/net-proxy/privoxy/privoxy-3.0.19.recipe
deleted file mode 100644
index 5696770bb..000000000
--- a/net-proxy/privoxy/privoxy-3.0.19.recipe
+++ /dev/null
@@ -1,34 +0,0 @@
-DESCRIPTION="
-A web proxy with advanced filtering capabilities for protecting privacy \
-against Internet junk.
-"
-HOMEPAGE="http://www.privoxy.org/"
-SRC_URI="http://sourceforge.net/projects/ijbswa/files/Sources/3.0.19%20%28stable%29/privoxy-3.0.19-stable-src.tar.gz/download"
-REVISION="1"
-STATUS_HAIKU="stable"
-DEPEND=""
-CHECKSUM_MD5="57acc79059565cc42eda67982842785d"
-
-BUILD()
-{
-	cd privoxy-3.0.19-stable
-	autoheader
-	autoconf
-	./configure --prefix=`finddir B_COMMON_DIRECTORY` \
-		--sbindir=`finddir B_COMMON_BIN_DIRECTORY` \
-		--sysconfdir=`finddir B_COMMON_ETC_DIRECTORY`/privoxy \
-		--localstatedir=`finddir B_COMMON_VAR_DIRECTORY` \
-		--datarootdir=`finddir B_COMMON_DOCUMENTATION_DIRECTORY` \
-		--infodir=`finddir B_COMMON_DOCUMENTATION_DIRECTORY`/info \
-		--mandir=`finddir B_COMMON_DOCUMENTATION_DIRECTORY`/man
-	make
-}
-
-INSTALL()
-{
-	cd privoxy-3.0.19-stable
-	make install
-}
-
-LICENSE="GNU GPL v2"
-COPYRIGHT="2001-2011 Privoxy Developers"
diff --git a/net-proxy/privoxy/privoxy-3.0.21.recipe b/net-proxy/privoxy/privoxy-3.0.21.recipe
new file mode 100644
index 000000000..9021345ae
--- /dev/null
+++ b/net-proxy/privoxy/privoxy-3.0.21.recipe
@@ -0,0 +1,56 @@
+SUMMARY="A web proxy with advanced filtering capabilities for protecting privacy against Internet junk."
+DESCRIPTION="
+	Privoxy is a non-caching web proxy with advanced filtering
+	capabilities for enhancing privacy, modifying web page data and
+	HTTP headers, controlling access, and removing ads and other
+	obnoxious Internet junk. Privoxy has a flexible configuration and
+	can be customized to suit individual needs and tastes. It has
+	application for both stand-alone systems and multi-user
+	networks.
+    "
+HOMEPAGE="http://www.privoxy.org/"
+SRC_URI="http://sourceforge.net/projects/ijbswa/files/Sources/3.0.21%20%28stable%29/privoxy-3.0.21-stable-src.tar.gz"
+SOURCE_DIR="privoxy-3.0.21-stable"
+REVISION="1"
+ARCHITECTURES="x86_gcc2 x86 !ppc"
+CHECKSUM_SHA256="5ec7e601948d2bd0ebf0ebe90eed7d49e7663c395ce16d0403e91ea2d459ddb8"
+
+REQUIRES="
+	haiku >= $haikuVersion 
+"
+
+BUILD_REQUIRES="
+	haiku_devel >= $haikuVersion
+"
+
+BUILD_PREREQUIRES="
+	cmd:autoheader
+	cmd:autoconf
+	cmd:make
+	cmd:grep
+	cmd:sed
+	cmd:g++
+	cmd:find
+"
+
+PROVIDES="
+	cmd:privoxy = $portVersion
+	"
+
+BUILD()
+{
+	host_os=haiku
+	autoheader
+	autoconf
+	runConfigure ./configure
+	make
+}
+
+INSTALL()
+{
+	host_os=haiku
+	make install USER=privoxy
+}
+
+LICENSE="GNU GPL v2"
+COPYRIGHT="2001-2011 Privoxy Developers"
diff --git a/sys-apps/texinfo/texinfo-4.13a.recipe b/sys-apps/texinfo/texinfo-4.13a.recipe
index eabd45d6b..bed916683 100644
--- a/sys-apps/texinfo/texinfo-4.13a.recipe
+++ b/sys-apps/texinfo/texinfo-4.13a.recipe
@@ -35,6 +35,7 @@ BUILD_PREREQUIRES="
 	cmd:ld
 	cmd:libtoolize
 	cmd:make
+	cmd:grep
 	cmd:sed
 	"
 
diff --git a/sys-devel/binutils/binutils-2.17_2013_04_21.recipe b/sys-devel/binutils/binutils-2.17_2013_04_21.recipe
index 9869f3fd2..301bf5b90 100644
--- a/sys-devel/binutils/binutils-2.17_2013_04_21.recipe
+++ b/sys-devel/binutils/binutils-2.17_2013_04_21.recipe
@@ -41,6 +41,7 @@ BUILD_REQUIRES="
 BUILD_PREREQUIRES="
 	haiku${secondaryArchSuffix}_devel >= $haikuVersion
 	cmd:autoconf
+	cmd:find
 	cmd:flex
 	cmd:gcc$secondaryArchSuffix
 	cmd:ld$secondaryArchSuffix
@@ -48,6 +49,7 @@ BUILD_PREREQUIRES="
 	cmd:makeinfo
 	cmd:sed
 	cmd:tar
+	cmd:xargs
 	"
 
 SOURCE_DIR="binutils-$portVersion/legacy/binutils"
diff --git a/sys-devel/gcc/gcc-2.95.3_2014_10_14.recipe b/sys-devel/gcc/gcc-2.95.3_2014_10_14.recipe
index c7c31b985..0d873ad8e 100644
--- a/sys-devel/gcc/gcc-2.95.3_2014_10_14.recipe
+++ b/sys-devel/gcc/gcc-2.95.3_2014_10_14.recipe
@@ -8,6 +8,7 @@ LICENSE="
 	GNU LGPL v2
 	"
 COPYRIGHT="1988-2000 Free Software Foundation, Inc."
+CHECKSUM_SHA256="9eef41dcd1582b84e677f3dcb14faa2dd42707352556d05860470e2a99b7e505"
 srcGitRev="d86116d57a09505802ed6a38adc43ef294f7f364"
 SRC_URI="https://github.com/haiku/buildtools/archive/$srcGitRev.tar.gz"
 SRC_FILENAME="gcc-$portVersion.tar.gz"
diff --git a/sys-devel/m4/m4-1.4.16.recipe b/sys-devel/m4/m4-1.4.16.recipe
index aaaeb554e..fc3888bd4 100644
--- a/sys-devel/m4/m4-1.4.16.recipe
+++ b/sys-devel/m4/m4-1.4.16.recipe
@@ -36,6 +36,7 @@ BUILD_PREREQUIRES="
 	cmd:gcc
 	cmd:ld
 	cmd:make
+	cmd:awk
 	cmd:sed
 	cmd:grep
 	"