diff --git a/app-arch/bzip2/bzip2-1.0.6.recipe b/app-arch/bzip2/bzip2-1.0.6.recipe
index b13574a48..f9ffdcfcb 100644
--- a/app-arch/bzip2/bzip2-1.0.6.recipe
+++ b/app-arch/bzip2/bzip2-1.0.6.recipe
@@ -44,7 +44,6 @@ BUILD_PREREQUIRES="
 	cmd:sed
 	"
 
-#SOURCE_DIR="$portVersionedName"
 
 BUILD()
 {
diff --git a/app-arch/libarchive/libarchive-3.1.2.recipe b/app-arch/libarchive/libarchive-3.1.2.recipe
index 4443a094d..ea29f56d2 100644
--- a/app-arch/libarchive/libarchive-3.1.2.recipe
+++ b/app-arch/libarchive/libarchive-3.1.2.recipe
@@ -94,7 +94,6 @@ REQUIRES_devel="
 
 PATCHES="libarchive-3.1.2.patchset"
 
-#SOURCE_DIR="$portVersionedName"
 
 BUILD()
 {
diff --git a/app-arch/tar/tar-1.26.recipe b/app-arch/tar/tar-1.26.recipe
index 4bb2b7dd7..8f5dcc2a0 100644
--- a/app-arch/tar/tar-1.26.recipe
+++ b/app-arch/tar/tar-1.26.recipe
@@ -43,7 +43,6 @@ BUILD_PREREQUIRES="
 defineDebugInfoPackage tar \
 	$binDir/tar
 
-SOURCE_DIR="$portVersionedName"
 
 BUILD()
 {
diff --git a/app-doc/doxygen/doxygen-1.6.3.recipe b/app-doc/doxygen/doxygen-1.6.3.recipe
index cc4ac12bf..b71b257ab 100644
--- a/app-doc/doxygen/doxygen-1.6.3.recipe
+++ b/app-doc/doxygen/doxygen-1.6.3.recipe
@@ -39,7 +39,6 @@ BUILD_PREREQUIRES="
 	cmd:sed
 	"
 
-SOURCE_DIR="$portVersionedName"
 
 PATCH()
 {
diff --git a/app-editors/nano/nano-2.2.6.recipe b/app-editors/nano/nano-2.2.6.recipe
index 168ac8b4c..a820e115c 100644
--- a/app-editors/nano/nano-2.2.6.recipe
+++ b/app-editors/nano/nano-2.2.6.recipe
@@ -39,7 +39,6 @@ BUILD_PREREQUIRES="
 	cmd:make
 	"
 
-SOURCE_DIR="$portVersionedName"
 
 BUILD()
 {
diff --git a/app-misc/colordiff/colordiff-1.0.13.recipe b/app-misc/colordiff/colordiff-1.0.13.recipe
index e28644734..c31aa1735 100644
--- a/app-misc/colordiff/colordiff-1.0.13.recipe
+++ b/app-misc/colordiff/colordiff-1.0.13.recipe
@@ -11,7 +11,6 @@ REVISION="1"
 ARCHITECTURES="any"
 LICENSE="GNU GPL v2"
 COPYRIGHT="2002-2012  Dave Ewart"
-SOURCE_DIR="$portVersionedName"
 PATCHES="colordiff-1.0.13.patch"
 
 PROVIDES="
diff --git a/app-misc/getopt/getopt-1.1.5.recipe b/app-misc/getopt/getopt-1.1.5.recipe
index 8cd7bf544..920f38b8d 100644
--- a/app-misc/getopt/getopt-1.1.5.recipe
+++ b/app-misc/getopt/getopt-1.1.5.recipe
@@ -22,7 +22,6 @@ LICENSE="GNU GPL v2"
 COPYRIGHT="1997-2012 Frodo Looijaard"
 ARCHITECTURES="x86 x86_gcc2"
 
-SOURCE_DIR="$portVersionedName"
 
 PROVIDES="
 	getopt = $portVersion
diff --git a/app-shells/zsh/zsh-5.0.2.recipe b/app-shells/zsh/zsh-5.0.2.recipe
index 95f01ab0e..b3c0a5f82 100644
--- a/app-shells/zsh/zsh-5.0.2.recipe
+++ b/app-shells/zsh/zsh-5.0.2.recipe
@@ -36,7 +36,6 @@ BUILD_PREREQUIRES="
 	cmd:make
 	"
 
-SOURCE_DIR="$portVersionedName"
 
 BUILD()
 {
diff --git a/app-text/asciidoc/asciidoc-8.6.8.recipe b/app-text/asciidoc/asciidoc-8.6.8.recipe
index b95ef81bf..cd4e26ef0 100644
--- a/app-text/asciidoc/asciidoc-8.6.8.recipe
+++ b/app-text/asciidoc/asciidoc-8.6.8.recipe
@@ -30,7 +30,6 @@ BUILD_PREREQUIRES="
 	cmd:sed
 	"
 
-SOURCE_DIR="$portVersionedName"
 
 PATCH()
 {
diff --git a/app-text/aspell/aspell-0.60.6.1.recipe b/app-text/aspell/aspell-0.60.6.1.recipe
index f58de8e60..04f7afdf2 100644
--- a/app-text/aspell/aspell-0.60.6.1.recipe
+++ b/app-text/aspell/aspell-0.60.6.1.recipe
@@ -65,7 +65,6 @@ REQUIRES_devel="
 	aspell == $portVersion
 	"
 
-SOURCE_DIR="$portVersionedName"
 
 PATCH()
 {
diff --git a/app-text/discount/discount-2.1.3.recipe b/app-text/discount/discount-2.1.3.recipe
index 01a6664bf..44a76bbae 100644
--- a/app-text/discount/discount-2.1.3.recipe
+++ b/app-text/discount/discount-2.1.3.recipe
@@ -14,7 +14,6 @@ LICENSE="BSD (4-clause)"
 COPYRIGHT="2007-2012 David Loren Parsons"
 ARCHITECTURES="x86 x86_gcc2"
 CHECKSUM_MD5="a1a4eade44f8141e38f2be7f2ed56c98"
-SOURCE_DIR="$portVersionedName"
 
 PROVIDES="
 	discount = $portVersion compat >= 2
diff --git a/app-text/dos2unix/dos2unix-1.0.recipe b/app-text/dos2unix/dos2unix-1.0.recipe
index da241b4d2..b4cc9e89a 100644
--- a/app-text/dos2unix/dos2unix-1.0.recipe
+++ b/app-text/dos2unix/dos2unix-1.0.recipe
@@ -24,7 +24,6 @@ BUILD_PREREQUIRES="
 	cmd:gcc
 	"
 
-SOURCE_DIR="$portVersionedName"
 
 BUILD()
 {
diff --git a/app-text/htmldoc/htmldoc-1.8.27.recipe b/app-text/htmldoc/htmldoc-1.8.27.recipe
index f597e02da..a8849a6f8 100644
--- a/app-text/htmldoc/htmldoc-1.8.27.recipe
+++ b/app-text/htmldoc/htmldoc-1.8.27.recipe
@@ -38,7 +38,6 @@ BUILD_PREREQUIRES="
 	cmd:sed
 	"
 
-SOURCE_DIR="$portVersionedName"
 
 BUILD()
 {
diff --git a/app-text/mdocml/mdocml-1.12.2.recipe b/app-text/mdocml/mdocml-1.12.2.recipe
index 8455c8fdb..46e834274 100644
--- a/app-text/mdocml/mdocml-1.12.2.recipe
+++ b/app-text/mdocml/mdocml-1.12.2.recipe
@@ -13,7 +13,6 @@ COPYRIGHT="2008-2013 Ingo Schwarze, Kristaps Dzonsons"
 LICENSE="ISC"
 REVISION="1"
 ARCHITECTURES="x86 x86_gcc2"
-SOURCE_DIR="$portVersionedName"
 
 PROVIDES="
 	mdocml = $portVersion
diff --git a/app-text/rman/rman-3.2.recipe b/app-text/rman/rman-3.2.recipe
index 8eedc8590..22fb11fd4 100644
--- a/app-text/rman/rman-3.2.recipe
+++ b/app-text/rman/rman-3.2.recipe
@@ -9,7 +9,6 @@ COPYRIGHT="2003 Thomas A. Phelps"
 SRC_URI="http://downloads.sourceforge.net/project/polyglotman/polyglotman/3.2/rman-3.2.tar.gz"
 CHECKSUM_MD5="6d1d67641c6d042595a96a62340d3cc6"
 PATCHES="rman-3.2.patch"
-SOURCE_DIR="$portVersionedName"
 REVISION="1"
 ARCHITECTURES="x86_gcc2 ?x86"
 
diff --git a/app-text/texi2html/texi2html-1.82.recipe b/app-text/texi2html/texi2html-1.82.recipe
index 60e23953b..4c2ebd478 100644
--- a/app-text/texi2html/texi2html-1.82.recipe
+++ b/app-text/texi2html/texi2html-1.82.recipe
@@ -33,7 +33,6 @@ BUILD_PREREQUIRES="
 	cmd:perl
 	"
 
-SOURCE_DIR="$portVersionedName"
 
 BUILD()
 {
diff --git a/dev-lang/nasm/nasm-2.08.01.recipe b/dev-lang/nasm/nasm-2.08.01.recipe
index 7c47d5cab..0c4664f23 100644
--- a/dev-lang/nasm/nasm-2.08.01.recipe
+++ b/dev-lang/nasm/nasm-2.08.01.recipe
@@ -27,7 +27,6 @@ BUILD_PREREQUIRES="
 	cmd:perl
 	"
 	
-SOURCE_DIR="$portVersionedName"
 
 BUILD()
 {
diff --git a/dev-lang/perl/perl-5.10.1.recipe b/dev-lang/perl/perl-5.10.1.recipe
index 586b5b5af..28cafe29d 100644
--- a/dev-lang/perl/perl-5.10.1.recipe
+++ b/dev-lang/perl/perl-5.10.1.recipe
@@ -85,7 +85,6 @@ GLOBAL_WRITABLE_FILES="
 	non-packaged/lib/perl5/site_perl/5.10.1/BePC-haiku directory
 	"
 
-SOURCE_DIR="$portVersionedName"
 BUILD_PACKAGE_ACTIVATION_PHASE=INSTALL
 
 BUILD()
diff --git a/dev-lang/perl/perl-5.18.1.recipe b/dev-lang/perl/perl-5.18.1.recipe
index fbdf7710c..a1f39b5df 100644
--- a/dev-lang/perl/perl-5.18.1.recipe
+++ b/dev-lang/perl/perl-5.18.1.recipe
@@ -97,7 +97,6 @@ GLOBAL_WRITABLE_FILES="
 	non-packaged/lib/perl5/site_perl/$portVersion/$perlArchName directory keep-old
 	"
 
-SOURCE_DIR="$portVersionedName"
 BUILD_PACKAGE_ACTIVATION_PHASE=INSTALL
 
 BUILD()
diff --git a/dev-lang/swig/swig-2.0.11.recipe b/dev-lang/swig/swig-2.0.11.recipe
index b746c7c55..c7a1652eb 100644
--- a/dev-lang/swig/swig-2.0.11.recipe
+++ b/dev-lang/swig/swig-2.0.11.recipe
@@ -28,7 +28,6 @@ CHECKSUM_MD5="291ba57c0acd218da0b0916c280dcbae"
 REVISION="1"
 ARCHITECTURES="?x86 ?x86_gcc2"
 
-SOURCE_DIR="$portVersionedName"
 
 PROVIDES="
 	swig = $portVersion
diff --git a/dev-lang/yasm/yasm-1.1.0.recipe b/dev-lang/yasm/yasm-1.1.0.recipe
index 4ae067250..3bd64ea40 100644
--- a/dev-lang/yasm/yasm-1.1.0.recipe
+++ b/dev-lang/yasm/yasm-1.1.0.recipe
@@ -31,7 +31,6 @@ BUILD_PREREQUIRES="
 	cmd:make
 	"
 
-SOURCE_DIR="$portVersionedName"
 
 BUILD()
 {
diff --git a/dev-lang/yasm/yasm-1.2.0.recipe b/dev-lang/yasm/yasm-1.2.0.recipe
index 70e7758f5..72376125f 100644
--- a/dev-lang/yasm/yasm-1.2.0.recipe
+++ b/dev-lang/yasm/yasm-1.2.0.recipe
@@ -33,7 +33,6 @@ BUILD_PREREQUIRES="
 	cmd:make
 	"
 
-SOURCE_DIR="$portVersionedName"
 
 BUILD()
 {
diff --git a/dev-libs/apr/apr-1.4.6.recipe b/dev-libs/apr/apr-1.4.6.recipe
index 2e532b2bb..12ff0d6bd 100644
--- a/dev-libs/apr/apr-1.4.6.recipe
+++ b/dev-libs/apr/apr-1.4.6.recipe
@@ -28,7 +28,6 @@ BUILD_PREREQUIRES="
 	cmd:make
 	"
 
-SOURCE_DIR="$portVersionedName"
 
 BUILD()
 {
diff --git a/dev-libs/apr_util/apr_util-1.3.10.recipe b/dev-libs/apr_util/apr_util-1.3.10.recipe
index d54f98417..eac650587 100644
--- a/dev-libs/apr_util/apr_util-1.3.10.recipe
+++ b/dev-libs/apr_util/apr_util-1.3.10.recipe
@@ -31,7 +31,6 @@ BUILD_PREREQUIRES="
 	cmd:make
 	"
 
-SOURCE_DIR="$portVersionedName"
 
 BUILD()
 {
diff --git a/dev-libs/gmp/gmp-5.1.1.recipe b/dev-libs/gmp/gmp-5.1.1.recipe
index 8edc663a3..ae82b8f71 100644
--- a/dev-libs/gmp/gmp-5.1.1.recipe
+++ b/dev-libs/gmp/gmp-5.1.1.recipe
@@ -22,8 +22,6 @@ BUILD_REQUIRES="
 	cmd:make
 	"
 
-SOURE_DIR="$portVersionedName"
-
 BUILD()
 {
 	libtoolize --force --copy --install
diff --git a/dev-libs/libcss/libcss-0.2.0_git.recipe b/dev-libs/libcss/libcss-0.2.0_git.recipe
index 37944be56..95c448e3b 100644
--- a/dev-libs/libcss/libcss-0.2.0_git.recipe
+++ b/dev-libs/libcss/libcss-0.2.0_git.recipe
@@ -37,7 +37,6 @@ BUILD_PREREQUIRES="
 	cmd:pkg_config
 	"
 
-SOURCE_DIR="$portVersionedName"
 
 BUILD()
 {
diff --git a/dev-libs/libevent/libevent-1.4.14b.recipe b/dev-libs/libevent/libevent-1.4.14b.recipe
index 3681bbc1a..854e20439 100644
--- a/dev-libs/libevent/libevent-1.4.14b.recipe
+++ b/dev-libs/libevent/libevent-1.4.14b.recipe
@@ -38,7 +38,7 @@ BUILD_PREREQUIRES="
 	cmd:libtoolize
 	cmd:make
 	"
-SOURCE_DIR="$portVersionedName-stable"
+SOURCE_DIR="libevent-${portVersion}-stable"
 
 PATCHES="libevent-1.4.14b.patch"
 
diff --git a/dev-libs/libevent/libevent-2.0.21.recipe b/dev-libs/libevent/libevent-2.0.21.recipe
index adde785c0..4091668cc 100644
--- a/dev-libs/libevent/libevent-2.0.21.recipe
+++ b/dev-libs/libevent/libevent-2.0.21.recipe
@@ -50,7 +50,7 @@ BUILD_PREREQUIRES="
 	cmd:libtoolize
 	cmd:make
 	"
-SOURCE_DIR="$portVersionedName-stable"
+SOURCE_DIR="libevent-${portVersion}-stable"
 
 PATCHES="libevent-2.0.21.patch"
 
diff --git a/dev-libs/libparserutils/libparserutils-0.1.2_git.recipe b/dev-libs/libparserutils/libparserutils-0.1.2_git.recipe
index cd3f2e789..773612158 100644
--- a/dev-libs/libparserutils/libparserutils-0.1.2_git.recipe
+++ b/dev-libs/libparserutils/libparserutils-0.1.2_git.recipe
@@ -34,7 +34,6 @@ BUILD_PREREQUIRES="
 	cmd:perl
 	"
 
-SOURCE_DIR="$portVersionedName"
 
 BUILD()
 {
diff --git a/dev-libs/libsolv/libsolv-0.3.0_haiku_2013_04_18.recipe b/dev-libs/libsolv/libsolv-0.3.0_haiku_2013_04_18.recipe
index 522d04a76..921e0572a 100644
--- a/dev-libs/libsolv/libsolv-0.3.0_haiku_2013_04_18.recipe
+++ b/dev-libs/libsolv/libsolv-0.3.0_haiku_2013_04_18.recipe
@@ -23,7 +23,6 @@ BUILD_PREREQUIRES="haiku_devel >= $haikuVersion
 	cmd:sed
 	"
 
-SOURCE_DIR="$portVersionedName"
 
 BUILD()
 {
diff --git a/dev-libs/libsolv/libsolv-0.3.0_haiku_2013_05_20.recipe b/dev-libs/libsolv/libsolv-0.3.0_haiku_2013_05_20.recipe
index 9f14ce4ff..1a7e22288 100644
--- a/dev-libs/libsolv/libsolv-0.3.0_haiku_2013_05_20.recipe
+++ b/dev-libs/libsolv/libsolv-0.3.0_haiku_2013_05_20.recipe
@@ -23,7 +23,6 @@ BUILD_PREREQUIRES="haiku_devel >= $haikuVersion
 	cmd:sed
 	"
 
-SOURCE_DIR="$portVersionedName"
 
 BUILD()
 {
diff --git a/dev-libs/libsolv/libsolv-0.3.0_haiku_2013_05_30.recipe b/dev-libs/libsolv/libsolv-0.3.0_haiku_2013_05_30.recipe
index 3d86900af..1f19d399e 100644
--- a/dev-libs/libsolv/libsolv-0.3.0_haiku_2013_05_30.recipe
+++ b/dev-libs/libsolv/libsolv-0.3.0_haiku_2013_05_30.recipe
@@ -27,7 +27,6 @@ BUILD_PREREQUIRES="haiku_devel >= $haikuVersion
 	cmd:sed
 	"
 
-SOURCE_DIR="$portVersionedName"
 
 BUILD()
 {
diff --git a/dev-libs/libwapcaplet/libwapcaplet-0.2.0_git.recipe b/dev-libs/libwapcaplet/libwapcaplet-0.2.0_git.recipe
index 137b0efeb..5dc1ad5cb 100644
--- a/dev-libs/libwapcaplet/libwapcaplet-0.2.0_git.recipe
+++ b/dev-libs/libwapcaplet/libwapcaplet-0.2.0_git.recipe
@@ -31,7 +31,6 @@ BUILD_PREREQUIRES="
 	cmd:make
 	"
 
-SOURCE_DIR="$portVersionedName"
 
 BUILD()
 {
diff --git a/dev-libs/openssl/openssl-1.0.0d.recipe b/dev-libs/openssl/openssl-1.0.0d.recipe
index 5bc4a71bd..8003a24bd 100644
--- a/dev-libs/openssl/openssl-1.0.0d.recipe
+++ b/dev-libs/openssl/openssl-1.0.0d.recipe
@@ -50,7 +50,6 @@ BUILD_PREREQUIRES="
 	cmd:sed
 	"
 
-SOURCE_DIR="$portVersionedName"
 
 BUILD()
 {
diff --git a/dev-python/docutils/docutils-0.11.recipe b/dev-python/docutils/docutils-0.11.recipe
index 1843e0372..56bf9de62 100644
--- a/dev-python/docutils/docutils-0.11.recipe
+++ b/dev-python/docutils/docutils-0.11.recipe
@@ -17,7 +17,6 @@ LICENSE="Public Domain
 	Python"
 REVISION="1"
 ARCHITECTURES="x86 x86_gcc2"
-SOURCE_DIR="$portVersionedName"
 
 PROVIDES="
 	docutils = $portVersion
diff --git a/dev-python/dulwich/dulwich-0.9.1.recipe b/dev-python/dulwich/dulwich-0.9.1.recipe
index a0f4383a6..ef14719da 100644
--- a/dev-python/dulwich/dulwich-0.9.1.recipe
+++ b/dev-python/dulwich/dulwich-0.9.1.recipe
@@ -34,7 +34,6 @@ BUILD_PREREQUIRES="
 	cmd:gcc
 	"
 
-SOURCE_DIR="$portVersionedName"
 
 BUILD()
 {
diff --git a/dev-python/ordereddict/ordereddict-1.1.recipe b/dev-python/ordereddict/ordereddict-1.1.recipe
index 283e6ba3f..113e0e55e 100644
--- a/dev-python/ordereddict/ordereddict-1.1.recipe
+++ b/dev-python/ordereddict/ordereddict-1.1.recipe
@@ -13,7 +13,6 @@ LICENSE="MIT"
 REVISION="1"
 ARCHITECTURES="x86 x86_gcc2"
 
-SOURCE_DIR="$portVersionedName"
 
 PROVIDES="
 	ordereddict = $portVersion
diff --git a/dev-scheme/chicken/chicken-4.8.0.5.recipe b/dev-scheme/chicken/chicken-4.8.0.5.recipe
index fd6eff435..a79f72325 100644
--- a/dev-scheme/chicken/chicken-4.8.0.5.recipe
+++ b/dev-scheme/chicken/chicken-4.8.0.5.recipe
@@ -8,7 +8,6 @@ LICENSE="BSD (2-clause)"
 COPYRIGHT="2008-2013 The Chicken Team
 		2000-2007 Felix L. Winkelmann"
 
-SOURCE_DIR="$portVersionedName"
 ARCHITECTURES="?x86 ?x86_gcc2"
 
 PROVIDES="
diff --git a/dev-util/cmake/cmake-2.8.5.recipe b/dev-util/cmake/cmake-2.8.5.recipe
index bb36e152c..1aeea4b7c 100644
--- a/dev-util/cmake/cmake-2.8.5.recipe
+++ b/dev-util/cmake/cmake-2.8.5.recipe
@@ -31,7 +31,6 @@ BUILD_PREREQUIRES="
 	cmd:sed
 	"
 
-SOURCE_DIR="$portVersionedName"
 
 BUILD()
 {
diff --git a/dev-util/cscope/cscope-15.7a.recipe b/dev-util/cscope/cscope-15.7a.recipe
index af4f32cdd..8636e606d 100644
--- a/dev-util/cscope/cscope-15.7a.recipe
+++ b/dev-util/cscope/cscope-15.7a.recipe
@@ -18,7 +18,6 @@ ARCHITECTURES="x86 x86_gcc2"
 LICENSE="BSD (3-clause)"
 COPYRIGHT="1998-2000 The Santa Cruz Operation"
 
-SOURCE_DIR="$portVersionedName"
 
 PATCHES="cscope-15.7a.patch"
 
diff --git a/dev-util/ctags/ctags-5.8.recipe b/dev-util/ctags/ctags-5.8.recipe
index ada66ce26..2316e3d98 100644
--- a/dev-util/ctags/ctags-5.8.recipe
+++ b/dev-util/ctags/ctags-5.8.recipe
@@ -25,7 +25,6 @@ BUILD_PREREQUIRES="
 	cmd:sed
 	"
 
-SOURCE_DIR="$portVersionedName"
 
 BUILD()
 {
diff --git a/dev-util/fastdep/fastdep-0.16.recipe b/dev-util/fastdep/fastdep-0.16.recipe
index 8b20c2e5b..27460178e 100644
--- a/dev-util/fastdep/fastdep-0.16.recipe
+++ b/dev-util/fastdep/fastdep-0.16.recipe
@@ -28,7 +28,6 @@ BUILD_PREREQUIRES="
 	cmd:make
 	"
 
-SOURCE_DIR="$portVersionedName"
 
 BUILD()
 {
diff --git a/dev-util/global/global-6.2.9.recipe b/dev-util/global/global-6.2.9.recipe
index d2871ddb8..e6ea3dc58 100644
--- a/dev-util/global/global-6.2.9.recipe
+++ b/dev-util/global/global-6.2.9.recipe
@@ -17,7 +17,6 @@ LICENSE="GNU GPL v3"
 COPYRIGHT="2000-2013 Tama Communications Corporation
 		2007-2013 Free Software Foundation, Inc."
 
-SOURCE_DIR="$portVersionedName"
 ARCHITECTURES="x86 x86_gcc2"
 
 PATCHES="global-6.2.9.patch"
diff --git a/dev-util/idutils/idutils-4.6.recipe b/dev-util/idutils/idutils-4.6.recipe
index 6dfc6310f..0f120bac7 100644
--- a/dev-util/idutils/idutils-4.6.recipe
+++ b/dev-util/idutils/idutils-4.6.recipe
@@ -19,7 +19,6 @@ CHECKSUM_MD5="99b572536377fcddb4d38e86a3c215fd"
 REVISION="2"
 LICENSE="GNU GPL v2"
 COPYRIGHT="1986-2012 Free Software Foundation, Inc."
-SOURCE_DIR="$portVersionedName"
 ARCHITECTURES="x86 x86_gcc2"
 
 PATCHES="idutils-4.6.patchset"
diff --git a/dev-util/netsurf_buildsystem/netsurf_buildsystem-1.0_git.recipe b/dev-util/netsurf_buildsystem/netsurf_buildsystem-1.0_git.recipe
index 7bdcadc5e..7ecec7633 100644
--- a/dev-util/netsurf_buildsystem/netsurf_buildsystem-1.0_git.recipe
+++ b/dev-util/netsurf_buildsystem/netsurf_buildsystem-1.0_git.recipe
@@ -27,7 +27,6 @@ BUILD_PREREQUIRES="
 	cmd:make
 	"
 
-SOURCE_DIR="$portVersionedName"
 
 BUILD()
 {
diff --git a/dev-util/patchutils/patchutils-0.3.3.recipe b/dev-util/patchutils/patchutils-0.3.3.recipe
index 04e7517c7..9dcb4698c 100644
--- a/dev-util/patchutils/patchutils-0.3.3.recipe
+++ b/dev-util/patchutils/patchutils-0.3.3.recipe
@@ -28,7 +28,6 @@ CHECKSUM_MD5="b640b6b8af6183f83eacf7bd6d2460cb"
 REVISION="1"
 LICENSE="GNU GPL v2"
 COPYRIGHT="2001-2013 Tim Waugh"
-SOURCE_DIR="$portVersionedName"
 ARCHITECTURES="x86 x86_gcc2"
 
 PROVIDES="
diff --git a/dev-vcs/cvs/cvs-1.12.13.1.recipe b/dev-vcs/cvs/cvs-1.12.13.1.recipe
index 90733f849..86927afbf 100644
--- a/dev-vcs/cvs/cvs-1.12.13.1.recipe
+++ b/dev-vcs/cvs/cvs-1.12.13.1.recipe
@@ -47,7 +47,6 @@ BUILD_PREREQUIRES="
 	cmd:nano
 	"
 
-SOURCE_DIR="$portVersionedName"
 
 BUILD()
 {
diff --git a/dev-vcs/git/git-1.7.10.2.recipe b/dev-vcs/git/git-1.7.10.2.recipe
index 59acbc1d9..1f4011927 100644
--- a/dev-vcs/git/git-1.7.10.2.recipe
+++ b/dev-vcs/git/git-1.7.10.2.recipe
@@ -15,7 +15,6 @@ COPYRIGHT="2005-2012 Git Authors (see git web site for list)"
 
 SRC_URI="http://git-core.googlecode.com/files/git-1.7.10.2.tar.gz"
 CHECKSUM_MD5="2e2ee53243ab8e7cf10f15c5229c3fce"
-SOURCE_DIR="$portVersionedName"
 PATCHES="git-1.7.10.2.patch"
 
 SRC_URI_2="http://git-core.googlecode.com/files/git-manpages-1.7.10.2.tar.gz"
diff --git a/dev-vcs/git/git-1.8.3.4.recipe b/dev-vcs/git/git-1.8.3.4.recipe
index 29cdc9ed1..a49785a80 100644
--- a/dev-vcs/git/git-1.8.3.4.recipe
+++ b/dev-vcs/git/git-1.8.3.4.recipe
@@ -15,7 +15,6 @@ COPYRIGHT="2005-2012 Git Authors (see git web site for list)"
 
 SRC_URI="http://git-core.googlecode.com/files/git-1.8.3.4.tar.gz"
 CHECKSUM_MD5="80eec3201a5d012913d287b85adaee8e"
-SOURCE_DIR="$portVersionedName"
 PATCHES="git-1.8.3.4.patchset"
 
 SRC_URI_2="http://git-core.googlecode.com/files/git-manpages-1.8.3.4.tar.gz"
diff --git a/dev-vcs/mercurial/mercurial-2.2.2.recipe b/dev-vcs/mercurial/mercurial-2.2.2.recipe
index 8439a5fa0..67e316361 100644
--- a/dev-vcs/mercurial/mercurial-2.2.2.recipe
+++ b/dev-vcs/mercurial/mercurial-2.2.2.recipe
@@ -34,7 +34,6 @@ BUILD_PREREQUIRES="
 	cmd:make
 	"
 
-SOURCE_DIR="$portVersionedName"
 
 BUILD()
 {
diff --git a/dev-vcs/subversion/subversion-1.6.15.recipe b/dev-vcs/subversion/subversion-1.6.15.recipe
index 7f65e4efa..0fe86df65 100644
--- a/dev-vcs/subversion/subversion-1.6.15.recipe
+++ b/dev-vcs/subversion/subversion-1.6.15.recipe
@@ -64,7 +64,6 @@ BUILD_PREREQUIRES="
 	cmd:make
 	"
 
-SOURCE_DIR="$portVersionedName"
 
 BUILD()
 {
diff --git a/dev-vcs/subversion/subversion-1.6.18.recipe b/dev-vcs/subversion/subversion-1.6.18.recipe
index 310f8886f..b8f994d95 100644
--- a/dev-vcs/subversion/subversion-1.6.18.recipe
+++ b/dev-vcs/subversion/subversion-1.6.18.recipe
@@ -80,7 +80,6 @@ USER_SETTINGS_FILES="
 	settings/subversion directory
 	"
 
-SOURCE_DIR="$portVersionedName"
 
 PATCH()
 {
diff --git a/haiku-apps/armyknife/armyknife-66.recipe b/haiku-apps/armyknife/armyknife-66.recipe
index ba8558809..740b2f82c 100644
--- a/haiku-apps/armyknife/armyknife-66.recipe
+++ b/haiku-apps/armyknife/armyknife-66.recipe
@@ -24,7 +24,6 @@ BUILD_PREREQUIRES="
 	cmd:make
 	cmd:unzip
 	"
-SOURCE_DIR="$portVersionedName"
 
 BUILD()
 {
diff --git a/haiku-apps/keymapswitcher/keymapswitcher-1.2.7.10.recipe b/haiku-apps/keymapswitcher/keymapswitcher-1.2.7.10.recipe
index 174a7daa3..6411277fe 100644
--- a/haiku-apps/keymapswitcher/keymapswitcher-1.2.7.10.recipe
+++ b/haiku-apps/keymapswitcher/keymapswitcher-1.2.7.10.recipe
@@ -24,7 +24,6 @@ BUILD_PREREQUIRES="
 	cmd:mkdepend
 	"
 
-SOURCE_DIR="$portVersionedName"
 
 PATCH()
 {
diff --git a/haiku-apps/keymapswitcher/keymapswitcher-1.2.7.11.recipe b/haiku-apps/keymapswitcher/keymapswitcher-1.2.7.11.recipe
index e0d8b7520..682fca82e 100644
--- a/haiku-apps/keymapswitcher/keymapswitcher-1.2.7.11.recipe
+++ b/haiku-apps/keymapswitcher/keymapswitcher-1.2.7.11.recipe
@@ -24,7 +24,6 @@ BUILD_PREREQUIRES="
 	cmd:mkdepend
 	"
 
-SOURCE_DIR="$portVersionedName"
 
 PATCH()
 {
diff --git a/haiku-apps/keymapswitcher/keymapswitcher-1.2.7.9.recipe b/haiku-apps/keymapswitcher/keymapswitcher-1.2.7.9.recipe
index d73ddd84a..aa7ce58fe 100644
--- a/haiku-apps/keymapswitcher/keymapswitcher-1.2.7.9.recipe
+++ b/haiku-apps/keymapswitcher/keymapswitcher-1.2.7.9.recipe
@@ -24,7 +24,6 @@ BUILD_PREREQUIRES="
 	cmd:mkdepend
 	"
 
-SOURCE_DIR="$portVersionedName"
 
 PATCH()
 {
diff --git a/haiku-apps/mkdepend/mkdepend-1.7.recipe b/haiku-apps/mkdepend/mkdepend-1.7.recipe
index d79500d01..d3caf177a 100644
--- a/haiku-apps/mkdepend/mkdepend-1.7.recipe
+++ b/haiku-apps/mkdepend/mkdepend-1.7.recipe
@@ -24,7 +24,6 @@ BUILD_PREREQUIRES="
 	cmd:ld
 	"
 
-SOURCE_DIR="$portVersionedName"
 
 BUILD()
 {
diff --git a/haiku-apps/pe/pe-2.4.3_hg602.recipe b/haiku-apps/pe/pe-2.4.3_hg602.recipe
index 12c5e075b..7b63d0768 100644
--- a/haiku-apps/pe/pe-2.4.3_hg602.recipe
+++ b/haiku-apps/pe/pe-2.4.3_hg602.recipe
@@ -43,7 +43,6 @@ USER_SETTINGS_FILES="
 	settings/pe directory
 	"
 
-SOURCE_DIR="$portVersionedName"
 
 BUILD()
 {
diff --git a/haiku-apps/pe/pe-2.4.3_hg606.recipe b/haiku-apps/pe/pe-2.4.3_hg606.recipe
index 3b8507d15..03276a6b2 100644
--- a/haiku-apps/pe/pe-2.4.3_hg606.recipe
+++ b/haiku-apps/pe/pe-2.4.3_hg606.recipe
@@ -43,7 +43,6 @@ USER_SETTINGS_FILES="
 	settings/pe directory
 	"
 
-SOURCE_DIR="$portVersionedName"
 
 BUILD()
 {
diff --git a/haiku-apps/pe/pe-2.4.3_hg610.recipe b/haiku-apps/pe/pe-2.4.3_hg610.recipe
index cd5e867e4..8d59f898a 100644
--- a/haiku-apps/pe/pe-2.4.3_hg610.recipe
+++ b/haiku-apps/pe/pe-2.4.3_hg610.recipe
@@ -41,7 +41,6 @@ USER_SETTINGS_FILES="
 	settings/pe directory
 	"
 
-SOURCE_DIR="$portVersionedName"
 
 BUILD()
 {
diff --git a/haiku-apps/pe/pe-2.4.3_hg611.recipe b/haiku-apps/pe/pe-2.4.3_hg611.recipe
index 22439f93f..170f6020e 100644
--- a/haiku-apps/pe/pe-2.4.3_hg611.recipe
+++ b/haiku-apps/pe/pe-2.4.3_hg611.recipe
@@ -45,7 +45,6 @@ USER_SETTINGS_FILES="
 	settings/pe directory
 	"
 
-SOURCE_DIR="$portVersionedName"
 
 PATCHES="
 	pe-2.4.3_hg611.patch
diff --git a/haiku-apps/pe/pe-2.4.3_hg614.recipe b/haiku-apps/pe/pe-2.4.3_hg614.recipe
index bf1a6eb7a..7a18426da 100644
--- a/haiku-apps/pe/pe-2.4.3_hg614.recipe
+++ b/haiku-apps/pe/pe-2.4.3_hg614.recipe
@@ -45,7 +45,6 @@ USER_SETTINGS_FILES="
 	settings/pe directory
 	"
 
-SOURCE_DIR="$portVersionedName"
 
 PATCHES="
 	pe-2.4.3_hg611.patch3
diff --git a/haiku-apps/quicklaunch/quicklaunch-0.9.6.recipe b/haiku-apps/quicklaunch/quicklaunch-0.9.6.recipe
index 903c58163..2c7d52b42 100644
--- a/haiku-apps/quicklaunch/quicklaunch-0.9.6.recipe
+++ b/haiku-apps/quicklaunch/quicklaunch-0.9.6.recipe
@@ -32,7 +32,6 @@ BUILD_PREREQUIRES="
 	cmd:unzip
 	cmd:xres
 	"
-SOURCE_DIR="$portVersionedName"
 
 BUILD()
 {
diff --git a/haiku-apps/vision/vision-0.9.7.r947.recipe b/haiku-apps/vision/vision-0.9.7.r947.recipe
index 4a899e921..3143c09b1 100644
--- a/haiku-apps/vision/vision-0.9.7.r947.recipe
+++ b/haiku-apps/vision/vision-0.9.7.r947.recipe
@@ -32,7 +32,6 @@ USER_SETTINGS_FILES="
 	settings/Vision directory
 	"
 
-SOURCE_DIR="$portVersionedName"
 
 BUILD()
 {
diff --git a/media-gfx/graphviz/graphviz-2.26.3.recipe b/media-gfx/graphviz/graphviz-2.26.3.recipe
index eb05ab454..db569ac21 100644
--- a/media-gfx/graphviz/graphviz-2.26.3.recipe
+++ b/media-gfx/graphviz/graphviz-2.26.3.recipe
@@ -34,7 +34,6 @@ BUILD_PREREQUIRES="
 	cmd:make
 	"
 
-SOURCE_DIR="$portVersionedName"
 
 BUILD()
 {
diff --git a/media-gfx/pngcrush/pngcrush-1.7.67.recipe b/media-gfx/pngcrush/pngcrush-1.7.67.recipe
index c35be6463..e1e8590a9 100644
--- a/media-gfx/pngcrush/pngcrush-1.7.67.recipe
+++ b/media-gfx/pngcrush/pngcrush-1.7.67.recipe
@@ -17,7 +17,7 @@ COPYRIGHT="1998-2009 Glenn Randers-Pehrson
 	2005 Greg Roelofs"
 ARCHITECTURES="x86 x86_gcc2"
 
-SOURCE_DIR="${portVersionedName}-nolib"
+SOURCE_DIR="pngcrush-${portVersion}-nolib"
 
 PROVIDES="
 	pngcrush = $portVersion compat >= 1.7
diff --git a/media-libs/taglib/taglib-1.7.2.recipe b/media-libs/taglib/taglib-1.7.2.recipe
index 28059eae7..422954734 100644
--- a/media-libs/taglib/taglib-1.7.2.recipe
+++ b/media-libs/taglib/taglib-1.7.2.recipe
@@ -33,7 +33,6 @@ BUILD_PREREQUIRES="
 	cmd:make
 	"
 
-#SOURCE_DIR="$portVersionedName"
 
 BUILD() 
 {
diff --git a/media-sound/lame/lame-3.99.5.recipe b/media-sound/lame/lame-3.99.5.recipe
index 5f6b8b0b3..b7acf7cf8 100644
--- a/media-sound/lame/lame-3.99.5.recipe
+++ b/media-sound/lame/lame-3.99.5.recipe
@@ -33,7 +33,6 @@ BUILD_REQUIRES="
 	"
 	
 PATCHES="lame-3.99.5.patch"
-SOURCE_DIR="$portVersionedName"
 
 BUILD()
 {
diff --git a/net-misc/neon/neon-0.29.6.recipe b/net-misc/neon/neon-0.29.6.recipe
index 19118733b..6b71d573e 100644
--- a/net-misc/neon/neon-0.29.6.recipe
+++ b/net-misc/neon/neon-0.29.6.recipe
@@ -59,7 +59,6 @@ BUILD_PREREQUIRES="
 	cmd:make
 	"
 
-SOURCE_DIR="$portVersionedName"
 
 BUILD()
 {
diff --git a/net-misc/openssh/openssh-5.8p2.recipe b/net-misc/openssh/openssh-5.8p2.recipe
index 8b0c28a9f..b149e3b18 100644
--- a/net-misc/openssh/openssh-5.8p2.recipe
+++ b/net-misc/openssh/openssh-5.8p2.recipe
@@ -50,7 +50,6 @@ BUILD_PREREQUIRES="
 	cmd:make
 	"
 
-SOURCE_DIR="$portVersionedName"
 
 PATCH()
 {
diff --git a/net-misc/openssh/openssh-6.0p1.recipe b/net-misc/openssh/openssh-6.0p1.recipe
index 7bb7085e7..b8316422b 100644
--- a/net-misc/openssh/openssh-6.0p1.recipe
+++ b/net-misc/openssh/openssh-6.0p1.recipe
@@ -70,7 +70,6 @@ PACKAGE_USERS="
 	"
 PACKAGE_GROUPS="sshd"
 
-SOURCE_DIR="$portVersionedName"
 
 PATCH()
 {
diff --git a/net-misc/rsync/rsync-3.1.0.recipe b/net-misc/rsync/rsync-3.1.0.recipe
index 3af0133bf..44c28ca89 100644
--- a/net-misc/rsync/rsync-3.1.0.recipe
+++ b/net-misc/rsync/rsync-3.1.0.recipe
@@ -39,7 +39,6 @@ BUILD_PREREQUIRES="
 	cmd:make
 	"
 
-SOURCE_DIR="$portVersionedName"
 
 BUILD()
 {
diff --git a/net-wireless/wpa_supplicant/wpa_supplicant-0.7.3.recipe b/net-wireless/wpa_supplicant/wpa_supplicant-0.7.3.recipe
index e6dd12837..a13ea3c74 100644
--- a/net-wireless/wpa_supplicant/wpa_supplicant-0.7.3.recipe
+++ b/net-wireless/wpa_supplicant/wpa_supplicant-0.7.3.recipe
@@ -30,7 +30,7 @@ BUILD_PREREQUIRES="
 	cmd:make
 	"
 
-SOURCE_DIR="$portVersionedName/wpa_supplicant"
+SOURCE_DIR="wpa_supplicant-${portVersion}/wpa_supplicant"
 
 BUILD()
 {
diff --git a/net-wireless/wpa_supplicant/wpa_supplicant-2.0.recipe b/net-wireless/wpa_supplicant/wpa_supplicant-2.0.recipe
index e40f8f37e..e9a67a6a5 100644
--- a/net-wireless/wpa_supplicant/wpa_supplicant-2.0.recipe
+++ b/net-wireless/wpa_supplicant/wpa_supplicant-2.0.recipe
@@ -31,7 +31,6 @@ BUILD_PREREQUIRES="
 	cmd:make
 	"
 
-SOURCE_DIR="$portVersionedName"
 
 BUILD()
 {
diff --git a/sys-apps/diffutils/diffutils-3.3.recipe b/sys-apps/diffutils/diffutils-3.3.recipe
index 5391d5f56..583fc5da9 100644
--- a/sys-apps/diffutils/diffutils-3.3.recipe
+++ b/sys-apps/diffutils/diffutils-3.3.recipe
@@ -46,7 +46,6 @@ BUILD_PREREQUIRES="
 
 PATCHES="diffutils-3.3.patchset"
 
-SOURCE_DIR="$portVersionedName"
 
 BUILD()
 {
diff --git a/sys-apps/dtc/dtc-1.4.0.recipe b/sys-apps/dtc/dtc-1.4.0.recipe
index 907703ff7..387681a71 100644
--- a/sys-apps/dtc/dtc-1.4.0.recipe
+++ b/sys-apps/dtc/dtc-1.4.0.recipe
@@ -33,7 +33,7 @@ BUILD_PREREQUIRES="
 	cmd:make
 	"
 
-PATCHES="${portVersionedName}.patch"
+PATCHES="dtc-${portVersion}.patch"
 
 BUILD()
 {
diff --git a/sys-apps/ed/ed-1.7.recipe b/sys-apps/ed/ed-1.7.recipe
index 1ce1ffa25..d1352e658 100644
--- a/sys-apps/ed/ed-1.7.recipe
+++ b/sys-apps/ed/ed-1.7.recipe
@@ -25,7 +25,6 @@ BUILD_REQUIRES="
 	cmd:sed
 	"
 
-SOURCE_DIR="$portVersionedName"
 
 BUILD()
 {
diff --git a/sys-apps/file/file-5.15.recipe b/sys-apps/file/file-5.15.recipe
index 6878f1668..b2f370b93 100644
--- a/sys-apps/file/file-5.15.recipe
+++ b/sys-apps/file/file-5.15.recipe
@@ -52,7 +52,6 @@ REQUIRES_devel="
 
 PATCHES="file-5.15.patch"
 
-SOURCE_DIR="$portVersionedName"
 
 BUILD()
 {
diff --git a/sys-apps/gawk/gawk-3.1.8.recipe b/sys-apps/gawk/gawk-3.1.8.recipe
index 0b1fe50e5..e2e5a4cdf 100644
--- a/sys-apps/gawk/gawk-3.1.8.recipe
+++ b/sys-apps/gawk/gawk-3.1.8.recipe
@@ -36,7 +36,6 @@ BUILD_PREREQUIRES="
     cmd:sed
 	"
 
-SOURCE_DIR="$portVersionedName"
 
 BUILD()
 {
diff --git a/sys-apps/grep/grep-2.14.recipe b/sys-apps/grep/grep-2.14.recipe
index 07bed6a21..fc3a7c32e 100644
--- a/sys-apps/grep/grep-2.14.recipe
+++ b/sys-apps/grep/grep-2.14.recipe
@@ -45,7 +45,6 @@ defineDebugInfoPackage grep \
 	$binDir/fgrep \
 	$binDir/grep
 
-SOURCE_DIR="$portVersionedName"
 
 BUILD()
 {
diff --git a/sys-apps/groff/groff-1.20.1.recipe b/sys-apps/groff/groff-1.20.1.recipe
index 66cbd7eb0..49639b32d 100644
--- a/sys-apps/groff/groff-1.20.1.recipe
+++ b/sys-apps/groff/groff-1.20.1.recipe
@@ -68,7 +68,6 @@ BUILD_PREREQUIRES="
 	cmd:sed
 	"
 
-SOURCE_DIR="$portVersionedName"
 
 DEPEND=""
 BUILD()
diff --git a/sys-apps/man/man-1.6g.recipe b/sys-apps/man/man-1.6g.recipe
index 2a0a618aa..b4c8456c4 100644
--- a/sys-apps/man/man-1.6g.recipe
+++ b/sys-apps/man/man-1.6g.recipe
@@ -62,7 +62,6 @@ GLOBAL_WRITABLE_FILES="
 	settings/man.conf keep-old
 "
 
-SOURCE_DIR="$portVersionedName"
 
 BUILD()
 {
diff --git a/sys-apps/sed/sed-4.2.1.recipe b/sys-apps/sed/sed-4.2.1.recipe
index 7038c8e07..d7f82e46d 100644
--- a/sys-apps/sed/sed-4.2.1.recipe
+++ b/sys-apps/sed/sed-4.2.1.recipe
@@ -38,7 +38,6 @@ BUILD_PREREQUIRES="
 defineDebugInfoPackage sed \
 	$binDir/sed
 
-SOURCE_DIR="$portVersionedName"
 
 BUILD()
 {
diff --git a/sys-devel/autoconf/autoconf-2.68.recipe b/sys-devel/autoconf/autoconf-2.68.recipe
index 9065d079d..70b5deb7b 100644
--- a/sys-devel/autoconf/autoconf-2.68.recipe
+++ b/sys-devel/autoconf/autoconf-2.68.recipe
@@ -45,7 +45,6 @@ BUILD_PREREQUIRES="
 	"
 
 BUILD_PACKAGE_ACTIVATION_PHASE=INSTALL
-SOURCE_DIR="$portVersionedName"
 
 BUILD()
 {
diff --git a/sys-devel/autoconf/autoconf-2.69.recipe b/sys-devel/autoconf/autoconf-2.69.recipe
index d754e0e88..8e56bcf97 100644
--- a/sys-devel/autoconf/autoconf-2.69.recipe
+++ b/sys-devel/autoconf/autoconf-2.69.recipe
@@ -49,7 +49,6 @@ BUILD_PREREQUIRES="
 	"
 
 BUILD_PACKAGE_ACTIVATION_PHASE=INSTALL
-SOURCE_DIR="$portVersionedName"
 
 BUILD()
 {
diff --git a/sys-devel/automake/automake-1.11.1.recipe b/sys-devel/automake/automake-1.11.1.recipe
index 41723ca7c..bfa7103d1 100644
--- a/sys-devel/automake/automake-1.11.1.recipe
+++ b/sys-devel/automake/automake-1.11.1.recipe
@@ -39,7 +39,6 @@ BUILD_PREREQUIRES="
 	cmd:sed
 	"
 
-SOURCE_DIR="$portVersionedName"
 
 BUILD()
 {
diff --git a/sys-devel/automake/automake-1.12.2.recipe b/sys-devel/automake/automake-1.12.2.recipe
index c91eb34bc..d70818f7e 100644
--- a/sys-devel/automake/automake-1.12.2.recipe
+++ b/sys-devel/automake/automake-1.12.2.recipe
@@ -42,7 +42,6 @@ BUILD_PREREQUIRES="
 	cmd:sed
     "
 
-SOURCE_DIR="$portVersionedName"
 
 BUILD()
 {
diff --git a/sys-devel/automake/automake-1.13.1.recipe b/sys-devel/automake/automake-1.13.1.recipe
index 2b271b2b6..3195941f6 100644
--- a/sys-devel/automake/automake-1.13.1.recipe
+++ b/sys-devel/automake/automake-1.13.1.recipe
@@ -42,7 +42,6 @@ BUILD_PREREQUIRES="
 	cmd:sed
     "
 
-SOURCE_DIR="$portVersionedName"
 
 BUILD()
 {
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 384391eaa..4b17e93a7 100644
--- a/sys-devel/binutils/binutils-2.17_2013_04_21.recipe
+++ b/sys-devel/binutils/binutils-2.17_2013_04_21.recipe
@@ -50,7 +50,7 @@ BUILD_PREREQUIRES="
 	cmd:tar
 	"
 
-SOURCE_DIR="$portVersionedName/legacy/binutils"
+SOURCE_DIR="binutils-$portVersion/legacy/binutils"
 BUILD_PACKAGE_ACTIVATION_PHASE=INSTALL
 
 binutilsDir=$(pwd)
diff --git a/sys-devel/bison/bison-2.4.3.recipe b/sys-devel/bison/bison-2.4.3.recipe
index 1263bfbda..c6da80506 100644
--- a/sys-devel/bison/bison-2.4.3.recipe
+++ b/sys-devel/bison/bison-2.4.3.recipe
@@ -42,7 +42,6 @@ BUILD_PREREQUIRES="
 	cmd:sed
 	"
 
-SOURCE_DIR="$portVersionedName"
 
 BUILD()
 {
diff --git a/sys-devel/bison/bison-2.5.recipe b/sys-devel/bison/bison-2.5.recipe
index 2d61f06b9..c82ef16fc 100644
--- a/sys-devel/bison/bison-2.5.recipe
+++ b/sys-devel/bison/bison-2.5.recipe
@@ -20,7 +20,7 @@ REVISION="1"
 
 ARCHITECTURES="?x86"
 
-PATCHES="${portVersionedName}.patch"
+PATCHES="bison-${portVersion}.patch"
 
 PROVIDES="
 	bison = $portVersion compat >= 2.5
diff --git a/sys-devel/flex/flex-2.5.35.recipe b/sys-devel/flex/flex-2.5.35.recipe
index 3a5ac50a0..e568bb789 100644
--- a/sys-devel/flex/flex-2.5.35.recipe
+++ b/sys-devel/flex/flex-2.5.35.recipe
@@ -37,7 +37,6 @@ BUILD_PREREQUIRES="
 	cmd:makeinfo
 	"
 
-SOURCE_DIR="$portVersionedName"
 
 BUILD()
 {
diff --git a/sys-devel/jam/jam-2.5_2012_10_12.recipe b/sys-devel/jam/jam-2.5_2012_10_12.recipe
index 713fa098f..37e98f628 100644
--- a/sys-devel/jam/jam-2.5_2012_10_12.recipe
+++ b/sys-devel/jam/jam-2.5_2012_10_12.recipe
@@ -42,7 +42,7 @@ BUILD_PREREQUIRES="
 	cmd:ld
 	"
 
-SOURCE_DIR="$portVersionedName/jam"
+SOURCE_DIR="jam-${portVersion}/jam"
 
 BUILD()
 {
diff --git a/sys-devel/libtool/libtool-2.4.recipe b/sys-devel/libtool/libtool-2.4.recipe
index cec49589f..e9f5a42c3 100644
--- a/sys-devel/libtool/libtool-2.4.recipe
+++ b/sys-devel/libtool/libtool-2.4.recipe
@@ -45,7 +45,6 @@ BUILD_PREREQUIRES="
 	cmd:sed
 	"
 
-SOURCE_DIR="$portVersionedName"
 
 BUILD()
 {
diff --git a/sys-devel/m4/m4-1.4.16.recipe b/sys-devel/m4/m4-1.4.16.recipe
index 31d1cf934..e3c3a4491 100644
--- a/sys-devel/m4/m4-1.4.16.recipe
+++ b/sys-devel/m4/m4-1.4.16.recipe
@@ -41,7 +41,6 @@ BUILD_PREREQUIRES="
 	cmd:sed
 	"
 
-SOURCE_DIR="$portVersionedName"
 
 BUILD()
 {
diff --git a/sys-devel/make/make-3.82.recipe b/sys-devel/make/make-3.82.recipe
index 67c416f55..192519546 100644
--- a/sys-devel/make/make-3.82.recipe
+++ b/sys-devel/make/make-3.82.recipe
@@ -36,7 +36,6 @@ BUILD_PREREQUIRES="
 	cmd:sed
 	"
 
-SOURCE_DIR="$portVersionedName"
 
 BUILD()
 {
diff --git a/sys-devel/patch/patch-2.7.1.recipe b/sys-devel/patch/patch-2.7.1.recipe
index 43966cda9..37388be0e 100644
--- a/sys-devel/patch/patch-2.7.1.recipe
+++ b/sys-devel/patch/patch-2.7.1.recipe
@@ -27,7 +27,6 @@ BUILD_PREREQUIRES="
 	cmd:gcc
 	"
 
-SOURCE_DIR="$portVersionedName"
 
 BUILD()
 {
diff --git a/sys-libs/readline/readline-6.2.recipe b/sys-libs/readline/readline-6.2.recipe
index a261402a2..7526a15f9 100644
--- a/sys-libs/readline/readline-6.2.recipe
+++ b/sys-libs/readline/readline-6.2.recipe
@@ -34,7 +34,6 @@ BUILD_PREREQUIRES="
 	cmd:make
 	"
 
-SOURCE_DIR="$portVersionedName"
 
 BUILD()
 {
diff --git a/sys-libs/slang/slang-2.2.4.recipe b/sys-libs/slang/slang-2.2.4.recipe
index 5fd2852d7..45cd8e32a 100644
--- a/sys-libs/slang/slang-2.2.4.recipe
+++ b/sys-libs/slang/slang-2.2.4.recipe
@@ -51,7 +51,6 @@ BUILD_PREREQUIRES="
 	cmd:ncurses5_config
 	"
 
-SOURCE_DIR="$portVersionedName"
 
 GLOBAL_WRITABLE_FILES="
         settings/slsh.rc keep-old
diff --git a/www-client/w3m/w3m-0.5.3.recipe b/www-client/w3m/w3m-0.5.3.recipe
index 01a25beed..64abaf33e 100644
--- a/www-client/w3m/w3m-0.5.3.recipe
+++ b/www-client/w3m/w3m-0.5.3.recipe
@@ -14,7 +14,6 @@ LICENSE="W3M"
 COPYRIGHT="1994-2011 Akinori ITO
 		2002-2011 Hironori SAKAMOTO
 		2002-2011 Fumitoshi UKAI"
-SOURCE_DIR="$portVersionedName"
 
 PATCHES="w3m-0.5.3.patch"