Updated zsh recipe to use the B_USER_SETTINGS_DIRECTORY

app-shells/zsh/zsh-5.0.7.recipe

@@ -7,41 +7,48 @@ HOMEPAGE="http://www.zsh.org"
 COPYRIGHT="1992-2014, Paul Falstad, Richard Coleman, Zoltán Hidvégi, \
 Andrew Main, Peter Stephenson, Sven Wishnowsky, and others"
 LICENSE="ZSH"
-REVISION="1"
+REVISION="2"
 SOURCE_URI="http://sourceforge.net/projects/zsh/files/zsh/$portVersion/zsh-$portVersion.tar.bz2"
 CHECKSUM_SHA256="544e27de81740286b916d1d77c9f48ad7c26ad7943ed96d278abee67cf6704b3"
 PATCHES="zsh-$portVersion.patchset"
 
 ARCHITECTURES="x86_gcc2 x86 x86_64"
+SECONDARY_ARCHITECTURES="x86"
 
 PROVIDES="
-	zsh = $portVersion compat >= 5
-	cmd:zsh = $portVersion compat >= 5
-	cmd:zsh_$portVersion = $portVersion compat >= 5
-	cmd:sh
+	zsh$secondaryArchSuffix = $portVersion compat >= 5
+	cmd:zsh$secondaryArchSuffix = $portVersion compat >= 5
+	cmd:zsh_$portVersion$secondaryArchSuffix = $portVersion compat >= 5
+	cmd:sh$secondaryArchSuffix
 	"
 REQUIRES="
-	haiku
-	lib:libncurses
-	lib:libpcre
+	haiku$secondaryArchSuffix
+	lib:libncurses$secondaryArchSuffix
+	lib:libpcre$secondaryArchSuffix
+	lib:libiconv$secondaryArchSuffix
 	"
 
 BUILD_REQUIRES="
-	haiku_devel
-	devel:libncurses
-	devel:libpcre
+	haiku${secondaryArchSuffix}_devel
+	devel:libncurses$secondaryArchSuffix
+	devel:libpcre$secondaryArchSuffix
+	devel:libiconv$secondaryArchSuffix
 	"
 BUILD_PREREQUIRES="
 	cmd:autoconf
 	cmd:find
-	cmd:gcc
+	cmd:gcc$secondaryArchSuffix
 	cmd:ld
 	cmd:make
 	"
 
 BUILD()
 {
-	runConfigure ./configure
+	autoreconf -fi
+	runConfigure ./configure \
+		--enable-zshrc=`finddir B_USER_SETTINGS_DIRECTORY`/zsh/.zshrc \
+		--sysconfdir=`finddir B_USER_SETTINGS_DIRECTORY`/zsh \
+		--enable-etcdir=`finddir B_USER_SETTINGS_DIRECTORY`/zsh
 	make $jobArgs
 }