faac: fix build and enable secondary arch

media-libs/faac/faac-1.28.recipe

@@ -1,18 +1,16 @@
 SUMMARY="An MPEG-4 and MPEG-2 AAC encoder"
-DESCRIPTION="
-FAAC is an MPEG-4 and MPEG-2 AAC encoder.
-"
+DESCRIPTION="FAAC is an MPEG-4 and MPEG-2 AAC encoder."
 HOMEPAGE="http://www.audiocoding.com/"
 SOURCE_URI="http://downloads.sourceforge.net/faac/faac-1.28.tar.bz2"
 CHECKSUM_SHA256="aac475e59d38ae9e29bff760e26bf72b507ccec037a6837cc33e3ac1db3ef352"
-REVISION="2"
+REVISION="3"
 
 LICENSE="FAAC
 	GNU GPL v2"
 COPYRIGHT="2003 Krzysztof Nikiel"
 
 ARCHITECTURES="x86_gcc2 ?x86 x86_64"
-SECONDARY_ARCHITECTURES="x86_gcc2 ?x86"
+SECONDARY_ARCHITECTURES="x86_gcc2 x86"
 
 PROVIDES="
 	faac${secondaryArchSuffix} = $portVersion
@@ -30,9 +28,8 @@ BUILD_REQUIRES="
 BUILD_PREREQUIRES="
 	haiku${secondaryArchSuffix}_devel
 	cmd:libtool
-	cmd:aclocal
+	cmd:aclocal_1.13
 	cmd:autoconf
-	cmd:automake
 	cmd:gcc$secondaryArchSuffix
 	cmd:ld$secondaryArchSuffix
 	cmd:make
@@ -46,7 +43,7 @@ PATCH()
 {
 	sed -i 's/AM_CONFIG_HEADER/AC_CONFIG_HEADERS/g' configure.in
 
-	if [ "$targetArchitecture" = x86_gcc2 ]; then
+	if [ $effectiveTargetArchitecture = "x86_gcc2" ]; then
 		sed -i 's/-lstdc++/-lstdc++.r4/' configure.in frontend/Makefile.am
 	fi
 }
@@ -54,7 +51,7 @@ PATCH()
 BUILD()
 {
 	libtoolize --force --copy --install
-	aclocal
+	aclocal-1.13
 	autoconf
 
 	runConfigure ./configure