From 5c7b41cf75aa722893cde5002792b8b9dcb90a0d Mon Sep 17 00:00:00 2001
From: Alexander von Gluck IV <kallisti5@unixzen.com>
Date: Tue, 26 Nov 2013 22:56:24 -0600
Subject: [PATCH] multi: Add some needed ${secondaryArchSuffix} and clean up
 requires

---
 media-libs/a52dec/a52dec-0.7.4.recipe                | 4 ++--
 media-libs/lcms/lcms-2.5.recipe                      | 3 ++-
 media-libs/libart_lgpl/libart_lgpl-2.3.21.recipe     | 4 ++--
 media-libs/libdvdcss/libdvdcss-1.2.12.recipe         | 4 ++--
 media-libs/libdvdnav/libdvdnav-4.2.0.recipe          | 4 ++--
 media-libs/libdvdread/libdvdread-4.2.0.recipe        | 4 ++--
 media-libs/libmikmod/libmikmod-3.1.14.recipe         | 3 ++-
 media-libs/libmkv/libmkv-0.6.5.1.recipe              | 4 ++--
 media-libs/libmpeg2/libmpeg2-0.5.1.recipe            | 4 ++--
 media-libs/libsdl2/libsdl2-2.0.0.recipe              | 4 ++--
 media-libs/portaudio/portaudio-19.recipe             | 8 ++++----
 media-libs/sdl2_gfx/sdl2_gfx-2.0.x_svn.recipe        | 6 +++---
 media-libs/sdl2_ttf/sdl2_ttf-2.0.12.recipe           | 3 ++-
 media-sound/lame/lame-3.99.5.recipe                  | 4 ++--
 media-sound/milkytracker/milkytracker-0.90.86.recipe | 5 +++--
 media-sound/vorbis_tools/vorbis_tools-1.4.0.recipe   | 5 +++--
 16 files changed, 37 insertions(+), 32 deletions(-)

diff --git a/media-libs/a52dec/a52dec-0.7.4.recipe b/media-libs/a52dec/a52dec-0.7.4.recipe
index af8ea7128..55d062582 100644
--- a/media-libs/a52dec/a52dec-0.7.4.recipe
+++ b/media-libs/a52dec/a52dec-0.7.4.recipe
@@ -28,8 +28,8 @@ BUILD_REQUIRES="
 
 BUILD_PREREQUIRES="
 	haiku${secondaryArchSuffix}_devel >= $haikuVersion
-	cmd:gcc
-	cmd:ld
+	cmd:gcc${secondaryArchSuffix}
+	cmd:ld${secondaryArchSuffix}
 	cmd:make
 	cmd:libtoolize
 	cmd:aclocal
diff --git a/media-libs/lcms/lcms-2.5.recipe b/media-libs/lcms/lcms-2.5.recipe
index b8c919ded..f8874d21a 100644
--- a/media-libs/lcms/lcms-2.5.recipe
+++ b/media-libs/lcms/lcms-2.5.recipe
@@ -34,7 +34,8 @@ BUILD_REQUIRES="
 
 BUILD_PREREQUIRES="
 	haiku_devel
-	cmd:gcc
+	cmd:gcc${secondaryArchSuffix}
+	cmd:ld${secondaryArchSuffix}
 	cmd:libtoolize
 	cmd:aclocal
 	cmd:autoconf
diff --git a/media-libs/libart_lgpl/libart_lgpl-2.3.21.recipe b/media-libs/libart_lgpl/libart_lgpl-2.3.21.recipe
index 83ef89b8e..40dfb8b7c 100644
--- a/media-libs/libart_lgpl/libart_lgpl-2.3.21.recipe
+++ b/media-libs/libart_lgpl/libart_lgpl-2.3.21.recipe
@@ -25,8 +25,8 @@ BUILD_PREREQUIRES="
 	cmd:autoreconf
 	cmd:libtool
 	cmd:make
-	cmd:ld
-	cmd:gcc
+	cmd:ld${secondaryArchSuffix}
+	cmd:gcc${secondaryArchSuffix}
 	"
 BUILD()
 {
diff --git a/media-libs/libdvdcss/libdvdcss-1.2.12.recipe b/media-libs/libdvdcss/libdvdcss-1.2.12.recipe
index caea7ece8..9797b55fb 100644
--- a/media-libs/libdvdcss/libdvdcss-1.2.12.recipe
+++ b/media-libs/libdvdcss/libdvdcss-1.2.12.recipe
@@ -26,8 +26,8 @@ BUILD_REQUIRES="
 
 BUILD_PREREQUIRES="
 	haiku${secondaryArchSuffix}_devel >= $haikuVersion
-	cmd:gcc
-	cmd:ld
+	cmd:gcc${secondaryArchSuffix}
+	cmd:ld${secondaryArchSuffix}
 	cmd:make
 	cmd:libtoolize
 	cmd:aclocal
diff --git a/media-libs/libdvdnav/libdvdnav-4.2.0.recipe b/media-libs/libdvdnav/libdvdnav-4.2.0.recipe
index aec0ad3d9..6fc8559d5 100644
--- a/media-libs/libdvdnav/libdvdnav-4.2.0.recipe
+++ b/media-libs/libdvdnav/libdvdnav-4.2.0.recipe
@@ -34,8 +34,8 @@ BUILD_PREREQUIRES="
 	haiku${secondaryArchSuffix}_devel >= $haikuVersion
 	libdvdread${secondaryArchSuffix}_devel
 	libdvdcss${secondaryArchSuffix}_devel
-	cmd:gcc
-	cmd:ld
+	cmd:gcc${secondaryArchSuffix}
+	cmd:ld${secondaryArchSuffix}
 	cmd:make
 	cmd:libtoolize
 	cmd:aclocal
diff --git a/media-libs/libdvdread/libdvdread-4.2.0.recipe b/media-libs/libdvdread/libdvdread-4.2.0.recipe
index ff50eee91..a12d094a5 100644
--- a/media-libs/libdvdread/libdvdread-4.2.0.recipe
+++ b/media-libs/libdvdread/libdvdread-4.2.0.recipe
@@ -33,8 +33,8 @@ BUILD_REQUIRES="
 
 BUILD_PREREQUIRES="
 	haiku${secondaryArchSuffix}_devel >= $haikuVersion
-	cmd:gcc
-	cmd:ld
+	cmd:gcc${secondaryArchSuffix}
+	cmd:ld${secondaryArchSuffix}
 	cmd:make
 	cmd:libtoolize
 	cmd:aclocal
diff --git a/media-libs/libmikmod/libmikmod-3.1.14.recipe b/media-libs/libmikmod/libmikmod-3.1.14.recipe
index ad3cdfe0d..e0ed19c9d 100644
--- a/media-libs/libmikmod/libmikmod-3.1.14.recipe
+++ b/media-libs/libmikmod/libmikmod-3.1.14.recipe
@@ -23,7 +23,8 @@ BUILD_REQUIRES="
 	
 BUILD_PREREQUIRES="
 	haiku_devel
-	cmd:gcc
+	cmd:gcc${secondaryArchSuffix}
+	cmd:ld${secondaryArchSuffix}
 	cmd:libtool
 	cmd:aclocal
 	cmd:autoconf
diff --git a/media-libs/libmkv/libmkv-0.6.5.1.recipe b/media-libs/libmkv/libmkv-0.6.5.1.recipe
index 225bfb056..b7e0c7c4c 100644
--- a/media-libs/libmkv/libmkv-0.6.5.1.recipe
+++ b/media-libs/libmkv/libmkv-0.6.5.1.recipe
@@ -24,8 +24,8 @@ BUILD_REQUIRES="
 
 BUILD_PREREQUIRES="
 	haiku${secondaryArchSuffix}_devel >= $haikuVersion
-	cmd:gcc
-	cmd:ld
+	cmd:gcc${secondaryArchSuffix}
+	cmd:ld${secondaryArchSuffix}
 	cmd:make
 	cmd:libtoolize
 	cmd:aclocal
diff --git a/media-libs/libmpeg2/libmpeg2-0.5.1.recipe b/media-libs/libmpeg2/libmpeg2-0.5.1.recipe
index bef722e2f..db59078c8 100644
--- a/media-libs/libmpeg2/libmpeg2-0.5.1.recipe
+++ b/media-libs/libmpeg2/libmpeg2-0.5.1.recipe
@@ -29,8 +29,8 @@ BUILD_REQUIRES="
 
 BUILD_PREREQUIRES="
 	haiku${secondaryArchSuffix}_devel >= $haikuVersion
-	cmd:gcc
-	cmd:ld
+	cmd:gcc${secondaryArchSuffix}
+	cmd:ld${secondaryArchSuffix}
 	cmd:make
 	cmd:libtoolize
 	cmd:aclocal
diff --git a/media-libs/libsdl2/libsdl2-2.0.0.recipe b/media-libs/libsdl2/libsdl2-2.0.0.recipe
index e1f94e449..54eb28a40 100644
--- a/media-libs/libsdl2/libsdl2-2.0.0.recipe
+++ b/media-libs/libsdl2/libsdl2-2.0.0.recipe
@@ -38,8 +38,8 @@ BUILD_PREREQUIRES="
 	cmd:libtool
 	cmd:aclocal
 	cmd:make
-	cmd:gcc
-	cmd:ld
+	cmd:gcc${secondaryArchSuffix}
+	cmd:ld${secondaryArchSuffix}
 	"
 
 SOURCE_DIR="SDL2-$portVersion"
diff --git a/media-libs/portaudio/portaudio-19.recipe b/media-libs/portaudio/portaudio-19.recipe
index 675e2d86a..7639b2708 100644
--- a/media-libs/portaudio/portaudio-19.recipe
+++ b/media-libs/portaudio/portaudio-19.recipe
@@ -21,15 +21,15 @@ REQUIRES="
 	"
 
 BUILD_PREREQUIRES="
-	haiku_devel >= $haikuVersion
+	haiku${secondaryArchSuffix}_devel >= $haikuVersion
 	cmd:cmake
-	cmd:gcc
-	cmd:ld
+	cmd:gcc${secondaryArchSuffix}
+	cmd:ld${secondaryArchSuffix}
 	cmd:make
 	"
 
 BUILD_REQUIRES="
-	cmd:gcc
+	cmd:gcc${secondaryArchSuffix}
 	cmd:cmake
 	cmd:make
 	"
diff --git a/media-libs/sdl2_gfx/sdl2_gfx-2.0.x_svn.recipe b/media-libs/sdl2_gfx/sdl2_gfx-2.0.x_svn.recipe
index 85b324c8d..e5f5fbee7 100644
--- a/media-libs/sdl2_gfx/sdl2_gfx-2.0.x_svn.recipe
+++ b/media-libs/sdl2_gfx/sdl2_gfx-2.0.x_svn.recipe
@@ -26,11 +26,11 @@ BUILD_REQUIRES="
 	"
 	
 BUILD_PREREQUIRES="
-	haiku_devel
+	haiku${secondaryArchSuffix}_devel >= $haikuVersion
 	cmd:aclocal
 	cmd:autoconf
-	cmd:gcc
-	cmd:ld
+	cmd:gcc${secondaryArchSuffix}
+	cmd:ld${secondaryArchSuffix}
 	cmd:libtool
 	cmd:make
 	cmd:pkg_config
diff --git a/media-libs/sdl2_ttf/sdl2_ttf-2.0.12.recipe b/media-libs/sdl2_ttf/sdl2_ttf-2.0.12.recipe
index a8ded08ac..4e4931e00 100644
--- a/media-libs/sdl2_ttf/sdl2_ttf-2.0.12.recipe
+++ b/media-libs/sdl2_ttf/sdl2_ttf-2.0.12.recipe
@@ -22,7 +22,8 @@ BUILD_REQUIRES="
 	cmd:libtool
 	cmd:aclocal
 	cmd:make
-	cmd:gcc
+	cmd:gcc${secondaryArchSuffix}
+	cmd:ld${secondaryArchSuffix}
 	"
 
 BUILD_PREREQUIRES="
diff --git a/media-sound/lame/lame-3.99.5.recipe b/media-sound/lame/lame-3.99.5.recipe
index d170f4601..5f6b8b0b3 100644
--- a/media-sound/lame/lame-3.99.5.recipe
+++ b/media-sound/lame/lame-3.99.5.recipe
@@ -23,8 +23,8 @@ BUILD_REQUIRES="
 	cmd:aclocal
 	cmd:autoconf
 	cmd:automake
-	cmd:gcc
-	cmd:ld
+	cmd:gcc${secondaryArchSuffix}
+	cmd:ld${secondaryArchSuffix}
 	cmd:libtoolize
 	cmd:make
 	cmd:m4
diff --git a/media-sound/milkytracker/milkytracker-0.90.86.recipe b/media-sound/milkytracker/milkytracker-0.90.86.recipe
index 3458fc77c..53478d38c 100644
--- a/media-sound/milkytracker/milkytracker-0.90.86.recipe
+++ b/media-sound/milkytracker/milkytracker-0.90.86.recipe
@@ -32,7 +32,7 @@ PROVIDES="
 	"
 
 REQUIRES="
-	haiku >= $haikuVersion
+	haiku${secondaryArchSuffix} >= $haikuVersion
 	zlib >= 1.2.3
 	"
 BUILD_REQUIRES="
@@ -40,7 +40,8 @@ BUILD_REQUIRES="
 	"
 BUILD_PREREQUIRES="
 	haiku_devel >= $haikuVersion
-	cmd:gcc
+	cmd:gcc${secondaryArchSuffix}
+	cmd:ld${secondaryArchSuffix}
 	cmd:jam
 	"
 
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 f3e3e3430..1f289b92a 100644
--- a/media-sound/vorbis_tools/vorbis_tools-1.4.0.recipe
+++ b/media-sound/vorbis_tools/vorbis_tools-1.4.0.recipe
@@ -19,7 +19,7 @@ PROVIDES="
 	"
 
 REQUIRES="
-	haiku
+	haiku${secondaryArchSuffix} >= $haikuVersion
 	lib:libvorbis
 	lib:libflac
 	lib:speex
@@ -38,7 +38,8 @@ BUILD_REQUIRES="
 SOURCE_DIR="vorbis-tools-$portVersion"	
 
 BUILD_PREREQUIRES="
-	cmd:gcc
+	cmd:gcc${secondaryArchSuffix}
+	cmd:ld${secondaryArchSuffix}
 	cmd:libtoolize
 	cmd:aclocal
 	cmd:autoconf