From f9643bf626051ceec5fda89df2e8aeacb70a310f Mon Sep 17 00:00:00 2001
From: Scott McCreary <scottmc2@gmail.com>
Date: Wed, 6 Nov 2013 02:07:33 -0800
Subject: [PATCH] Further cleanup of sdl_image, sdl_mixer and smpeg recipes.

---
 media-libs/sdl_image/sdl_image-1.2.12.recipe | 25 ++++++++++----------
 media-libs/sdl_mixer/sdl_mixer-1.2.12.recipe |  4 ++--
 media-libs/smpeg/smpeg-0.4.5.recipe          |  7 ++----
 3 files changed, 16 insertions(+), 20 deletions(-)

diff --git a/media-libs/sdl_image/sdl_image-1.2.12.recipe b/media-libs/sdl_image/sdl_image-1.2.12.recipe
index f09a20aec..aeac4f4c7 100644
--- a/media-libs/sdl_image/sdl_image-1.2.12.recipe
+++ b/media-libs/sdl_image/sdl_image-1.2.12.recipe
@@ -19,17 +19,20 @@ PROVIDES="
 REQUIRES="
 	haiku$secondaryArchSuffix
 	libsdl$secondaryArchSuffix
-	lib:libjpeg
+	lib:libjpeg$secondaryArchSuffix
+	lib:libpng$secondaryArchSuffix
+	lib:libtiff
+#	lib:giflib	
+#	lib:libwebp
 	"
 
 BUILD_REQUIRES="
 	devel:libsdl$secondaryArchSuffix
-	lib:libjpeg
-	lib:libpng
-	lib:libtiff
-#	lib:giflib
-#	lib:libwebp
-	"
+	devel:libpng$secondaryArchSuffix
+	devel:libjpeg$secondaryArchSuffix
+#	devel:libtiff
+#	devel:giflib
+#	devel:libwebp	"
 	
 BUILD_PREREQUIRES="
 	haiku${secondaryArchSuffix}_devel >= $haikuVersion
@@ -40,11 +43,7 @@ BUILD_PREREQUIRES="
 	cmd:libtool
 	cmd:make
 	cmd:pkg_config
-	cmd:sdl_config$secondaryArchSuffix
-	devel:libpng
-	devel:libjpeg
-#	devel:libtiff
-#	devel:libwebp
+	cmd:sdl_config
 	"
 
 SOURCE_DIR="SDL_image-1.2.12"
@@ -74,7 +73,7 @@ INSTALL()
 }
 
 PROVIDES_devel="
-	sdl_image${secondaryArchSuffix} = $portVersion compat >= 1.2
+	sdl_image${secondaryArchSuffix}_devel = $portVersion compat >= 1.2
 	devel:sdl_image$secondaryArchSuffix = 0.8.4 compat >= 0
 	devel:libSDL_image$secondaryArchSuffix = 1.2_0.8.4 compat >= 0
 	devel:libSDL_image_1.2$secondaryArchSuffix = 0.8.4 compat >= 0
diff --git a/media-libs/sdl_mixer/sdl_mixer-1.2.12.recipe b/media-libs/sdl_mixer/sdl_mixer-1.2.12.recipe
index d6fadbcd5..c77097041 100644
--- a/media-libs/sdl_mixer/sdl_mixer-1.2.12.recipe
+++ b/media-libs/sdl_mixer/sdl_mixer-1.2.12.recipe
@@ -20,7 +20,7 @@ REQUIRES="
 	haiku$secondaryArchSuffix >= $haikuVersion
 	libsdl$secondaryArchSuffix
 	flac$secondaryArchSuffix
-#	fluidsynth
+#	fluidsynth$secondaryArchSuffix
 	libmad$secondaryArchSuffix
 	libvorbis$secondaryArchSuffix
 	libogg$secondaryArchSuffix
@@ -46,7 +46,7 @@ BUILD_PREREQUIRES="
 	cmd:libmikmod_config$secondaryArchSuffix
 	devel:libogg$secondaryArchSuffix
 	devel:flac$secondaryArchSuffix
-#	devel:fluidsynth
+#	devel:fluidsynth$secondaryArchSuffix
 	devel:libmad$secondaryArchSuffix
 	devel:libvorbis$secondaryArchSuffix
 	devel:libogg$secondaryArchSuffix
diff --git a/media-libs/smpeg/smpeg-0.4.5.recipe b/media-libs/smpeg/smpeg-0.4.5.recipe
index ee31c4045..918b4c4e5 100644
--- a/media-libs/smpeg/smpeg-0.4.5.recipe
+++ b/media-libs/smpeg/smpeg-0.4.5.recipe
@@ -25,13 +25,12 @@ REQUIRES="
 	"
 	
 BUILD_REQUIRES="
-	haiku${secondaryArchSupport}_devel >= $haikuVersion
 	devel:libsdl$secondaryArchSupport
 	devel:libglu$secondaryArchSupport
 	"
 	
 BUILD_PREREQUIRES="
-	haiku$secondaryArchSupport
+	haiku${secondaryArchSupport}_devel >= $haikuVersion
 	cmd:gcc$secondaryArchSupport
 	cmd:libtoolize
 	cmd:aclocal
@@ -74,10 +73,8 @@ INSTALL()
 # ----- devel package -------------------------------------------------------
 
 PROVIDES_devel="
-	smpeg_devel$secondaryArchSupport = $portVersion
+	smpeg${secondaryArchSupport}_devel = $portVersion
 	cmd:smpeg_config
-	devel:smpeg$secondaryArchSupport = 0.4_0.1.4 compat >= 0.4_0
-	devel:smpeg_0.4$secondaryArchSupport = 0.4.5 compat >= 0
 	devel:libsmpeg$secondaryArchSupport = 0.4_0.1.4 compat >= 0.4_0
 	devel:libsmpeg_0.4$secondaryArchSupport = 0.4.5 compat >= 0
 	"