im,cd,lua: more work towards hybrid mode packages

* Do not rebuild libz and freetype from CD sources, use the system
ones.
 * I had to force a dependency on as$secondaryArchSuffix, otherwise
binutils 2.17 is included in the chroot instead of the gcc4 version.
 * The policy checker complains that the packages don't depend on
libstdc++.so, but this should be provided by haiku_x86.hpkg ?
 * The patch for IUP fails to apply. I guess this is because of line
ending problems as we work from a zipped source archive. Using "git
apply" manually works, however.

media-libs/im/im-3.8.recipe

@@ -24,29 +24,35 @@ PROVIDES="
 	lib:libimlua_jp252$secondaryArchSuffix = $portVersion
 	lib:libimlua_process52$secondaryArchSuffix = $portVersion
 	lib:libimlua_process_omp52$secondaryArchSuffix = $portVersion
-	"
+"
 
 REQUIRES="
 	haiku$secondaryArchSuffix >= $haikuVersion
 	lib:libz$secondaryArchSuffix
-	"
+"
 
 BUILD_REQUIRES="
-	haiku${secondaryArchSuffix}_devel >= $haikuVersion
-	cmd:make
-	cmd:gcc$secondaryArchSuffix
-	cmd:as$secondaryArchSuffix
-	cmd:which
 	devel:liblua$secondaryArchSuffix
 	devel:libz$secondaryArchSuffix
 "
 
+BUILD_PREREQUIRES="
+	haiku${secondaryArchSuffix}_devel >= $haikuVersion
+	cmd:gcc$secondaryArchSuffix
+	cmd:as$secondaryArchSuffix
+	cmd:make
+	cmd:which
+"
+
 SOURCE_DIR="im"
 PATCHES="im-3.8.patchset"
 BUILD()
 {
 	cd src
 	make
+
+	# The build system rebuilds libz, but let's use the system one.
+	rm ../lib/Haiku11/libz.*
 }
 
 INSTALL()
@@ -55,7 +61,6 @@ INSTALL()
 	mkdir -p $libDir
 	mkdir -p $includeDir
 
-	rm lib/Haiku11/libz.*
 	cp lib/Haiku11/* $libDir
 	cp include/* $includeDir
 
@@ -88,6 +93,10 @@ PROVIDES_devel="
 	devel:libimlua_process_omp52$secondaryArchSuffix = $portVersion
 "
 
+REQUIRES_devel="
+	im$secondaryArchSuffix == $portVersion base
+"
+
 LICENSE="MIT"
 COPYRIGHT="1994-2012 Tecgraf, PUC-Rio."
 DESCRIPTION="IM is a toolkit for Digital Imaging. IM is based on 4 concepts: Image Representation, Storage, Processing and Capture. Image Visualization is a task that it is left for a graphics library.