expat: support secondary architecture build

dev-libs/expat/expat-2.0.1.recipe

@@ -8,31 +8,35 @@ COPYRIGHT="
 LICENSE="MIT"
 SRC_URI="http://iweb.dl.sourceforge.net/project/expat/expat/2.0.1/expat-2.0.1.tar.gz"
 CHECKSUM_MD5="ee8b492592568805593f81f8cdf2a04c"
-REVISION="6"
-ARCHITECTURES="x86_gcc2 ?x86"
+REVISION="7"
+ARCHITECTURES="x86_gcc2 x86"
+SECONDARY_ARCHITECTURES="x86_gcc2 x86"
 
 PROVIDES="
-	expat = $portVersion compat >= 2.0
-	cmd:xmlwf = $portVersion compat >= 2.0
-	lib:libexpat = 1.5.2 compat >= 1
+	expat$secondaryArchSuffix = $portVersion compat >= 2.0
+	lib:libexpat$secondaryArchSuffix = 1.5.2 compat >= 1
 	"
+if [ -z "$secondaryArchSuffix" ]; then
+	PROVIDES="$PROVIDES
+		cmd:xmlwf = $portVersion compat >= 2.0
+		"
+fi
+
 REQUIRES="
-	haiku >= $haikuVersion
+	haiku$secondaryArchSuffix >= $haikuVersion
 	"
 BUILD_REQUIRES="
 	"
 BUILD_PREREQUIRES="
-	haiku_devel >= $haikuVersion
+	haiku${secondaryArchSuffix}_devel >= $haikuVersion
 	cmd:aclocal
 	cmd:autoconf
-	cmd:gcc
-	cmd:ld
+	cmd:gcc$secondaryArchSuffix
+	cmd:ld$secondaryArchSuffix
 	cmd:libtoolize
 	cmd:make
 	"
 
-SOURCE_DIR="$portVersionedName"
-
 PATCH()
 {
 	echo "AC_CONFIG_MACRO_DIR([m4])" >> configure.in
@@ -53,6 +57,11 @@ INSTALL()
 {
 	make install
 
+	# remove command for secondary architecture
+	if [ -n "$secondaryArchSuffix" ]; then
+		rm -rf $binDir
+	fi
+
 	# prepare develop/lib
 	prepareInstalledDevelLibs libexpat
 
@@ -63,11 +72,10 @@ INSTALL()
 
 # ----- devel package -------------------------------------------------------
 
-SUMMARY_devel="The expat development files"
 PROVIDES_devel="
-	expat_devel = $portVersion
-	devel:libexpat = 1.5.2 compat >= 1
+	expat${secondaryArchSuffix}_devel = $portVersion
+	devel:libexpat${secondaryArchSuffix} = 1.5.2 compat >= 1
 	"
 REQUIRES_devel="
-	expat == $portVersion base
+	expat${secondaryArchSuffix} == $portVersion base
 	"