imagemagick: fix recipe and update to current version.

media-gfx/imagemagick/imagemagick-6.6.1_10.recipe

@@ -1,38 +0,0 @@
-DESCRIPTION="ImageMagick - A collection of tools and libraries for many image formats" 
-HOMEPAGE="A collection of tools and libraries for many image formats" 
-SRC_URI="http://www.imagemagick.org/download/legacy/ImageMagick-6.6.1-10.tar.gz"
-REVISION="1"
-STATUS_HAIKU="stable"
-DEPEND="media-libs/libpng,
-		media-libs/tiff,
-		media-libs/jpeg,
-		media-libs/jasper,
-		media-libs/openexr,
-		dev-lang/perl,
-		dev-libs/libxml2,
-		media-libs/lcms,
-		media-libs/freetype"
-CHECKSUM_MD5="fa42577f4d9ab23171bc6824b515ca13"
-BUILD()
-{
-	cd ImageMagick-6.6.1-10
-	libtoolize --force
-	aclocal -I m4
-	autoconf
-	automake
-	./configure --prefix=`finddir B_COMMON_DIRECTORY` \
-	--enable-shared \
-	--enable-fast-install \
-	--with-modules=yes \
-	--with-ltdl-lib=${libdir}
-	make
-}
-
-INSTALL()
-{
-	cd ImageMagick-6.6.1-10
-	make install
-}
-
-LICENSE="IMAGEMAGICK"
-COPYRIGHT="1999-2010 ImageMagick Studio LLC"

media-gfx/imagemagick/imagemagick-6.8.9_8.recipe

@@ -0,0 +1,127 @@
+SUMMARY="Convert, edit, or compose bitmap images"
+DESCRIPTION="ImageMagick® is a software suite to create, edit, compose, or \
+convert bitmap images. It can read and write images in a variety of formats \
+(over 100) including DPX, EXR, GIF, JPEG, JPEG-2000, PDF, PNG, Postscript, \
+SVG, and TIFF. Use ImageMagick to resize, flip, mirror, rotate, distort, shear \
+and transform images, adjust image colors, apply various special effects, or \
+draw text, lines, polygons, ellipses and Bézier curves."
+HOMEPAGE="http://www.imagemagick.org"
+ARCHITECTURES="x86_gcc2"
+SECONDARY_ARCHITECTURES="x86"
+LICENSE="IMAGEMAGICK"
+COPYRIGHT="1999-2014 ImageMagick Studio LLC"
+REVISION="1"
+
+SRC_URI="http://www.imagemagick.org/download/releases/ImageMagick-6.8.9-8.tar.gz"
+CHECKSUM_SHA256="31e14dc50c65947c3eb75fd540d94b8bbecba9e5f9a0b11a917bb01290491a5f"
+SOURCE_DIR="ImageMagick-6.8.9-8"
+PATCHES="imagemagick-6.8.9_8.patchset"
+
+PROVIDES="
+	imagemagick$secondaryArchSuffix = $portVersion
+	cmd:Magick++_config
+	cmd:Magick_config
+	cmd:MagickCore_config
+	cmd:MagickWand_config
+	cmd:Wand_config
+	cmd:animate
+	cmd:compare
+	cmd:composite
+	cmd:conjure
+	cmd:convert
+	cmd:display
+	cmd:identify
+	cmd:import
+	cmd:mogrify
+	cmd:montage
+	cmd:stream
+	lib:libMagick++_6.Q16 = 5.0.0 compat >= 5
+	lib:libMagickCore_6.Q16 = 2.0.0 compat >= 2
+	lib:libMagickWand_6.Q16 = 2.0.0 compat >= 2
+"
+
+REQUIRES="
+	haiku >= $haikuVersion
+	lib:libbz2
+	lib:libfreetype
+	lib:libjpeg
+	lib:libltdl
+	lib:libpng15
+	lib:libtiff
+	lib:libwebp
+	lib:libz
+"
+
+BUILD_REQUIRES="
+	devel:libbz2$secondaryArchSuffix
+	devel:libfreetype$secondaryArchSuffix
+	devel:libjpeg$secondaryArchSuffix
+	devel:libltdl$secondaryArchSuffix
+	devel:libpng$secondaryArchSuffix
+	devel:libtiff$secondaryArchSuffix
+	devel:libwebp$secondaryArchSuffix
+	devel:libxml2$secondaryArchSuffix
+	devel:libz$secondaryArchSuffix
+"
+#	devel:libopenexr
+#	devel:libcms
+
+BUILD_PREREQUIRES="
+	haiku${secondaryArchSuffix}_devel >= $haikuVersion
+	cmd:aclocal
+	cmd:autoconf
+	cmd:automake
+	cmd:gcc$secondaryArchSuffix
+	cmd:libtoolize
+	cmd:make
+	cmd:perl
+	cmd:pkg_config$secondaryArchSuffix
+	cmd:sed
+	cmd:svnversion
+"
+
+GLOBAL_WRITABLE_FILES="
+	settings/ImageMagick-6/coder.xml keep-old
+	settings/ImageMagick-6/colors.xml keep-old
+	settings/ImageMagick-6/delegates.xml keep-old
+	settings/ImageMagick-6/log.xml keep-old
+	settings/ImageMagick-6/magic.xml keep-old
+	settings/ImageMagick-6/mime.xml keep-old
+	settings/ImageMagick-6/policy.xml keep-old
+	settings/ImageMagick-6/quantization-table.xml keep-old
+	settings/ImageMagick-6/thresholds.xml keep-old
+	settings/ImageMagick-6/type-dejavu.xml keep-old
+	settings/ImageMagick-6/type-ghostscript.xml keep-old
+	settings/ImageMagick-6/type-windows.xml keep-old
+	settings/ImageMagick-6/type.xml keep-old
+"
+
+BUILD()
+{
+	export LDFLAGS="-lnetwork"
+	autoconf
+	automake
+	runConfigure ./configure --enable-shared --without-modules
+	make $jobArgs
+}
+
+INSTALL()
+{
+	make install
+
+	prepareInstalledDevelLibs libMagick++-6.Q16 libMagickCore-6.Q16 \
+		libMagickWand-6.Q16
+
+	packageEntries devel $developDir
+}
+
+PROVIDES_devel="
+	imagemagick${secondaryArchSuffix}_devel = $portVersion
+	devel:libMagick++_6.Q16 = 5.0.0 compat >= 5
+	devel:libMagickCore_6.Q16 = 2.0.0 compat >= 2
+	devel:libMagickWand_6.Q16 = 2.0.0 compat >= 2
+"
+
+REQUIRES_devel="
+	imagemagick${secondaryArchSuffix} == $portVersion base
+"

media-gfx/imagemagick/patches/imagemagick-6.6.1-10.patch

@@ -1,12 +0,0 @@
-diff -urN ImageMagick-6.6.1-10/configure.ac ImageMagick-6.6.1-10-haiku/configure.ac
---- ImageMagick-6.6.1-10/configure.ac	2010-04-26 00:45:55.061865984 +0000
-+++ ImageMagick-6.6.1-10-haiku/configure.ac	2010-05-21 04:07:59.830472192 +0000
-@@ -2556,7 +2556,7 @@
- AC_SUBST(EXECUTABLE_PATH)
- 
- # Path to ImageMagick lib
--LIBRARY_PATH="${LIB_DIR}/${LIBRARY_RELATIVE_PATH}"
-+LIBRARY_PATH="${LIB_DIR}/${LIBRARY_RELATIVE_PATH}:${LIBRARY_PATH}"
- DEFINE_LIBRARY_PATH="${LIB_DIR}/${LIBRARY_RELATIVE_PATH}/"
- case "${build_os}" in
-   mingw* )