all: Don't use portVersionedName for SOURCE_DIR

* portVersionedName contains the secondary architecture, so using it means secondary package builds fail. example: $portVersionedName is libwow_x86-0.0.0 when doing an x86 build on x86_gcc2
2026-04-09 05:10:05 +02:00 · 2013-12-25 17:52:56 -06:00
parent db9ff2f3f4
commit d97a2aabd9
100 changed files with 8 additions and 101 deletions
--- 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()
 {
--- 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()
 {
--- 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()
 {
--- 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()
 {
--- 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()
 {
--- 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="
--- 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
--- 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()
 {
--- 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()
 {
--- 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()
 {
--- 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
--- 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()
 {
--- 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()
 {
--- 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
--- 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"

--- 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()
 {
--- 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()
 {
--- 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()
--- 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()
--- 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
--- 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()
 {
--- 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()
 {
--- 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()
 {
--- 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()
 {
--- 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
--- 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()
 {
--- 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"

--- 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"

--- 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()
 {
--- 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()
 {
--- 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()
 {
--- 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()
 {
--- 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()
 {
--- 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()
 {
--- 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
--- 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()
 {
--- 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
--- 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="
--- 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()
 {
--- 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"

--- 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()
 {
--- 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()
 {
--- 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"
--- 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"
--- 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()
 {
--- 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="
--- 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()
 {
--- 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"
--- 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"
--- 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()
 {
--- 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()
 {
--- 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()
 {
--- 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()
 {
--- 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()
 {
--- 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()
 {
--- 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()
 {
--- 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()
 {
--- 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()
 {
--- 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()
 {
--- 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()
 {
--- 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
--- 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
--- 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()
 {
--- 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()
 {
--- 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()
 {
--- 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
--- 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() 
 {
--- 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()
 {
--- 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()
 {
--- 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()
 {
--- 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()
 {
--- 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()
 {
--- 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()
 {
--- 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()
 {
--- 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()
 {
--- 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()
 {
--- 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()
 {
--- 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()
 {
--- 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()
 {
--- 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()
 {
--- 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()
--- 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()
 {
--- 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()
 {
--- 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()
 {
--- 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()
 {
--- 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()
 {
--- 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()
 {
--- 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()
 {
--- 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)
--- 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()
 {
--- 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
--- 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()
 {
--- 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()
 {
--- 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()
 {
--- 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()
 {
--- 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()
 {
--- 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()
 {
--- 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()
 {
--- 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
--- 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"