From 64797684df210eb3cfbc2f5c375a22ffbb126dbc Mon Sep 17 00:00:00 2001
From: Scott McCreary <scottmc2@gmail.com>
Date: Thu, 19 Dec 2013 03:25:40 -0800
Subject: [PATCH] Added secondaryArchSuffix support to vorbis-tools

---
 .../vorbis_tools/vorbis_tools-1.4.0.recipe    | 63 ++++++++++---------
 1 file changed, 33 insertions(+), 30 deletions(-)

diff --git a/media-sound/vorbis_tools/vorbis_tools-1.4.0.recipe b/media-sound/vorbis_tools/vorbis_tools-1.4.0.recipe
index 1f289b92a..cb78c7dc7 100644
--- a/media-sound/vorbis_tools/vorbis_tools-1.4.0.recipe
+++ b/media-sound/vorbis_tools/vorbis_tools-1.4.0.recipe
@@ -7,59 +7,62 @@ REVISION="1"
 LICENSE="GNU GPL v2"
 COPYRIGHT="2000-2005 Michael Smith, Stan Seibert and other contributers"
 
-ARCHITECTURES="x86 x86_gcc2"
+ARCHITECTURES="x86_gcc2 x86 x86_64"
+SECONDARY_ARCHITECTURES="x86_gcc2 x86"
 
 PROVIDES="
-	vorbis_tools = 1.4.0 compat >= 1
-	cmd:oggenc
-	cmd:oggdec
-	cmd:ogginfo
-	cmd:vcut
-	cmd:vorbiscomment
+	vorbis_tools = $portVersion compat >= 1
+	cmd:oggenc$secondaryArchSuffix
+	cmd:oggdec$secondaryArchSuffix
+	cmd:ogginfo$secondaryArchSuffix
+	cmd:vcut$secondaryArchSuffix
+	cmd:vorbiscomment$secondaryArchSuffix
 	"
 
 REQUIRES="
-	haiku${secondaryArchSuffix} >= $haikuVersion
-	lib:libvorbis
-	lib:libflac
-	lib:speex
-	lib:libao
-	lib:libogg
-	lib:libvorbis
-	lib:libcurl
-	lib:libvorbisfile
-	lib:libvorbisenc
-	lib:libFLAC
+	haiku$secondaryArchSuffix >= $haikuVersion
+	lib:libvorbis$secondaryArchSuffix
+	lib:libflac$secondaryArchSuffix
+	lib:libspeex$secondaryArchSuffix
+	lib:libao$secondaryArchSuffix
+	lib:libogg$secondaryArchSuffix
+	lib:libvorbis$secondaryArchSuffix
+	lib:libcurl$secondaryArchSuffix
+	lib:libvorbisfile$secondaryArchSuffix
+	lib:libvorbisenc$secondaryArchSuffix
 	"
 	
 BUILD_REQUIRES="
+	haiku${secondaryArchSuffix}_devel >= $haikuVersion
+	devel:libvorbis$secondaryArchSuffix
+#	devel:libflac$secondaryArchSuffix
+	devel:libspeex$secondaryArchSuffix
+#	devel:libao$secondaryArchSuffix
+	devel:libogg$secondaryArchSuffix
+	devel:libvorbis$secondaryArchSuffix
+	devel:libcurl$secondaryArchSuffix
+	devel:libvorbisfile$secondaryArchSuffix
+	devel:libvorbisenc$secondaryArchSuffix
 	"
 
-SOURCE_DIR="vorbis-tools-$portVersion"	
-
 BUILD_PREREQUIRES="
-	cmd:gcc${secondaryArchSuffix}
-	cmd:ld${secondaryArchSuffix}
+	cmd:gcc$secondaryArchSuffix
+	cmd:ld$secondaryArchSuffix
 	cmd:libtoolize
 	cmd:aclocal
 	cmd:autoconf
 	cmd:automake
 	cmd:make
 	cmd:pkg_config
-	devel:libogg
-	devel:libvorbis
-	devel:libflac
 	"
 
-PATCH="vorbis_tools-1.4.0.patch"
+PATCHES="vorbis_tools-1.4.0.patch"
 
-PATCH()
-{
-	sed -i 's/AM_CONFIG_HEADER/AC_CONFIG_HEADERS/' configure.ac
-}
+SOURCE_DIR="vorbis-tools-$portVersion"	
 
 BUILD()
 {
+	sed -i 's/AM_CONFIG_HEADER/AC_CONFIG_HEADERS/' configure.ac	
 	libtoolize --force --copy --install
 	aclocal -I m4
 	automake