Adjust recipes to separation of buildhost and target packages

media-libs/freetype/freetype-2.4.9.recipe

@@ -17,6 +17,10 @@ REQUIRES="
 	lib:libz >= 1
 	"
 BUILD_REQUIRES="
+	devel:libz
+	"
+BUILD_PREREQUIRES="
+	haiku_devel >= $haikuVersion
 	cmd:aclocal
 	cmd:autoconf
 	cmd:automake
@@ -24,10 +28,6 @@ BUILD_REQUIRES="
 	cmd:ld
 	cmd:libtoolize
 	cmd:make
-	devel:libz
-	"
-BUILD_PREREQUIRES="
-	haiku_devel >= $haikuVersion
 	"
 
 SOURCE_DIR="$portVersionedName"

media-libs/jpeg/jpeg-9.recipe

@@ -26,7 +26,9 @@ REQUIRES="
 	haiku >= $haikuVersion
 	"
 BUILD_REQUIRES="
-	$REQUIRES
+	"
+BUILD_PREREQUIRES="
+	haiku_devel >= $haikuVersion
 	cmd:aclocal
 	cmd:autoconf
 	cmd:automake
@@ -36,9 +38,6 @@ BUILD_REQUIRES="
 	cmd:libtoolize
 	cmd:make
 	"
-BUILD_PREREQUIRES="
-	haiku_devel >= $haikuVersion
-	"
 
 SOURCE_DIR="$portVersionedName"
 

media-libs/libogg/libogg-1.3.0.recipe

@@ -24,6 +24,9 @@ REQUIRES="
 	haiku >= $haikuVersion
 	"
 BUILD_REQUIRES="
+	"
+BUILD_PREREQUIRES="
+	haiku_devel >= $haikuVersion
 	cmd:aclocal
 	cmd:autoconf
 	cmd:automake
@@ -32,9 +35,6 @@ BUILD_REQUIRES="
 	cmd:libtoolize
 	cmd:make
 	"
-BUILD_PREREQUIRES="
-	haiku_devel >= $haikuVersion
-	"
 
 SOURCE_DIR="$portVersionedName"
 

media-libs/libpng/libpng-1.5.12.recipe

@@ -24,6 +24,10 @@ REQUIRES="
 	lib:libz
 	"
 BUILD_REQUIRES="
+	devel:libz >= 1.0.4
+	"
+BUILD_PREREQUIRES="
+	haiku_devel >= $haikuVersion
 	cmd:aclocal
 	cmd:autoconf
 	cmd:automake
@@ -31,10 +35,6 @@ BUILD_REQUIRES="
 	cmd:ld
 	cmd:libtoolize
 	cmd:make
-	devel:libz >= 1.0.4
-	"
-BUILD_PREREQUIRES="
-	haiku_devel >= $haikuVersion
 	"
 
 SOURCE_DIR="$portVersionedName"

media-libs/libtheora/libtheora-1.1.1.recipe

@@ -25,6 +25,12 @@ REQUIRES="
 	lib:libogg
 	"
 BUILD_REQUIRES="
+	devel:libogg
+	"
+	# Note: The build system also looks for libvorbis and SDL, but that seems
+	# to be needed only for building the sample player, which we don't need.
+BUILD_PREREQUIRES="
+	haiku_devel >= $haikuVersion
 	cmd:aclocal
 	cmd:autoconf
 	cmd:gcc
@@ -32,12 +38,6 @@ BUILD_REQUIRES="
 	cmd:libtoolize
 	cmd:make
 	cmd:pkg_config
-	devel:libogg
-	"
-	# Note: The build system also looks for libvorbis and SDL, but that seems
-	# to be needed only for building the sample player, which we don't need.
-BUILD_PREREQUIRES="
-	haiku_devel >= $haikuVersion
 	"
 
 SOURCE_DIR="$portVersionedName"

media-libs/libvorbis/libvorbis-1.3.2.recipe

@@ -23,6 +23,10 @@ REQUIRES="
 	lib:libogg
 	"
 BUILD_REQUIRES="
+	devel:libogg
+	"
+BUILD_PREREQUIRES="
+	haiku_devel >= $haikuVersion
 	cmd:aclocal
 	cmd:autoconf
 	cmd:automake
@@ -31,10 +35,6 @@ BUILD_REQUIRES="
 	cmd:libtoolize
 	cmd:make
 	cmd:pkg_config
-	devel:libogg
-	"
-BUILD_PREREQUIRES="
-	haiku_devel >= $haikuVersion
 	"
 
 SOURCE_DIR="$portVersionedName"

media-libs/libvpx/libvpx-1.0.0.recipe

@@ -27,16 +27,16 @@ REQUIRES="
 	haiku >= $haikuVersion
 	"
 BUILD_REQUIRES="
-	cmd:gcc
-	cmd:ld
-	cmd:make
-	cmd:perl
-	cmd:yasm
 	"
 	# Note: The build system also looks for libvorbis and SDL, but that seems
 	# to be needed only for building the sample player, which we don't need.
 BUILD_PREREQUIRES="
 	haiku_devel >= $haikuVersion
+	cmd:gcc
+	cmd:ld
+	cmd:make
+	cmd:perl
+	cmd:yasm
 	"
 
 SOURCE_DIR="libvpx-v1.0.0"

media-libs/speex/speex-1.2~rc1.recipe

@@ -30,6 +30,10 @@ REQUIRES="
 	lib:libogg
 	"
 BUILD_REQUIRES="
+	devel:libogg
+	"
+BUILD_PREREQUIRES="
+	haiku_devel >= $haikuVersion
 	cmd:aclocal
 	cmd:autoconf
 	cmd:automake
@@ -38,10 +42,6 @@ BUILD_REQUIRES="
 	cmd:libtoolize
 	cmd:make
 	cmd:pkg_config
-	devel:libogg
-	"
-BUILD_PREREQUIRES="
-	haiku_devel >= $haikuVersion
 	"
 
 SOURCE_DIR="speex-1.2rc1"