ImageMagick: update to 6.5.9.8, convert to subpkgs.

--HG--
extra : convert_revision : 095965c19de7b479da5d072e598b0f04de515f28

srcpkgs/ImageMagick/libmagick-devel.template

@@ -0,0 +1,47 @@
+# Template file for 'libmagick-devel'.
+#
+short_desc="ImageMagick low-level image manipulation development files"
+long_desc="${long_desc}
+
+ This package contains headers and other related development files
+ with MagickCore."
+
+Add_dependency run pkg-config
+Add_dependency run lcms-devel
+Add_dependency run tiff-devel
+Add_dependency run freetype-devel
+Add_dependency run jpeg-devel
+Add_dependency run fontconfig-devel
+Add_dependency run libXext-devel
+Add_dependency run libXt-devel
+Add_dependency run bzip2-devel
+Add_dependency run zlib-devel
+Add_dependency run glibc-devel
+Add_dependency run libltdl-devel
+Add_dependency run libSM-devel
+Add_dependency run libICE-devel
+Add_dependency run libX11-devel
+Add_dependency run libgomp
+Add_dependency run libxml2-devel
+Add_dependency run libpng-devel
+Add_dependency run librsvg-devel
+Add_dependency run gtk+-devel
+Add_dependency run cairo-devel
+Add_dependency run glib-devel
+Add_dependency run libwmf-devel
+Add_dependency run libstdc++-devel
+Add_dependency run libmagick
+
+do_install()
+{
+	mkdir -p ${DESTDIR}/usr/lib ${DESTDIR}/usr/bin \
+		${DESTDIR}/usr/share/man/man1
+
+	mv ${SRCPKGDESTDIR}/usr/include ${DESTDIR}/usr
+	mv ${SRCPKGDESTDIR}/usr/lib/*.a ${DESTDIR}/usr/lib
+	mv ${SRCPKGDESTDIR}/usr/lib/pkgconfig ${DESTDIR}/usr/lib
+	mv ${SRCPKGDESTDIR}/usr/bin/*-config ${DESTDIR}/usr/bin
+	mv ${SRCPKGDESTDIR}/usr/share/doc ${DESTDIR}/usr/share
+	mv ${SRCPKGDESTDIR}/usr/share/man/man1/*-config.1 \
+		${DESTDIR}/usr/share/man/man1
+}

srcpkgs/ImageMagick/libmagick-perl.template

@@ -0,0 +1,18 @@
+# Template file for 'libmagick-perl'.
+#
+short_desc="ImageMagick perl library bindings"
+long_desc="${long_desc}
+
+ This package contains the perl bindings for libmagick."
+
+Add_dependency run libmagick
+Add_dependency run perl
+Add_dependency run glibc
+
+do_install()
+{
+	mkdir -p ${DESTDIR}/usr/share/man ${DESTDIR}/usr/lib
+
+	mv ${SRCPKGDESTDIR}/usr/lib/perl5 ${DESTDIR}/usr/lib
+	mv ${SRCPKGDESTDIR}/usr/share/man/man3 ${DESTDIR}/usr/share/man
+}

srcpkgs/ImageMagick/libmagick.template

@@ -0,0 +1,44 @@
+# Template file for 'libmagick'.
+#
+short_desc="ImageMagick low-level image manipulation libraries"
+long_desc="${long_desc}
+
+ This package contains the C libraries needed to run executables
+ that make use of MagickCore."
+
+replaces="ImageMagick<6.5.9"
+
+Add_dependency run lcms
+Add_dependency run tiff
+Add_dependency run freetype
+Add_dependency run jpeg
+Add_dependency run libpng
+Add_dependency run fontconfig
+Add_dependency run libwmf
+Add_dependency run libXext
+Add_dependency run libXt
+Add_dependency run bzip2
+Add_dependency run librsvg
+Add_dependency run gtk+
+Add_dependency run cairo
+Add_dependency run glib
+Add_dependency run libxml2
+Add_dependency run zlib
+Add_dependency run glibc
+Add_dependency run libltdl
+Add_dependency run libSM
+Add_dependency run libICE
+Add_dependency run libX11
+Add_dependency run libgomp
+Add_dependency run libstdc++
+Add_dependency run libgcc
+
+do_install()
+{
+	mkdir -p ${DESTDIR}/usr/share ${DESTDIR}/usr/lib
+
+	mv ${SRCPKGDESTDIR}/usr/lib/libMagick*.so* ${DESTDIR}/usr/lib
+	mv ${SRCPKGDESTDIR}/usr/lib/libMagick*.la ${DESTDIR}/usr/lib
+	mv ${SRCPKGDESTDIR}/usr/lib/ImageMagick* ${DESTDIR}/usr/lib
+	mv ${SRCPKGDESTDIR}/usr/share/ImageMagick* ${DESTDIR}/usr/share
+}

srcpkgs/ImageMagick/template

@@ -1,8 +1,7 @@
 # Template file for 'ImageMagick'
 pkgname=ImageMagick
-_distver=6.5.6
-_distverpatch=10
-revision=3
+_distver=6.5.9
+_distverpatch=8
 version=${_distver}.${_distverpatch}
 wrksrc=${pkgname}-${_distver}-${_distverpatch}
 distfiles="ftp://ftp.imagemagick.org/pub/$pkgname/$pkgname-${_distver}-${_distverpatch}.tar.bz2"
@@ -10,10 +9,10 @@ build_style=gnu_configure
 configure_args="--without-gslib --without-jp2 --without-autotrace
  --without-djvu --without-dps --without-fpx --without-gvc --without-jbig
  --without-lqr --without-openexr --with-gs-font-dir=/usr/share/fonts/Type1
- --with-magick-plus-plus --enable-shared"
+ --with-magick-plus-plus --with-modules --enable-shared"
 short_desc="Package for display and interactive manipulation of images"
 maintainer="Juan RP <xtraeme@gmail.com>"
-checksum=e0bba405573ca18ca11ac37e089e13cb9cab6219e6783cfa45f9815017b0b6cb
+checksum=b9a82d457727952c8bbe8717571c34b9d3d18f83c056c7233e77da5b0d431de9
 long_desc="
  ImageMagick TM, is a package for display and interactive manipulation
  of images for the X Window System. It is written in C and interfaces
@@ -29,6 +28,7 @@ long_desc="
  completed work in the same or differing image format."
 
 keep_libtool_archives=yes
+subpackages="libmagick libmagick-devel libmagick-perl"
 
 Add_dependency run lcms
 Add_dependency run tiff
@@ -45,15 +45,7 @@ Add_dependency run libSM
 Add_dependency run libICE
 Add_dependency run libX11
 Add_dependency run libgomp
-Add_dependency run libxml2
-Add_dependency run libpng
-Add_dependency run librsvg
-Add_dependency run gtk+
-Add_dependency run cairo
-Add_dependency run glib
-Add_dependency run libwmf
-Add_dependency run libstdc++
-Add_dependency run libgcc
+Add_dependency run libmagick
 Add_dependency build pkg-config
 Add_dependency build lcms-devel
 Add_dependency build tiff-devel

srcpkgs/libmagick

@@ -0,0 +1 @@
+ImageMagick

srcpkgs/libmagick-devel

@@ -0,0 +1 @@
+ImageMagick

srcpkgs/libmagick-perl

@@ -0,0 +1 @@
+ImageMagick

xbps-src/common/mapping_shlib_binpkg.txt

@@ -293,9 +293,9 @@ liblcms.so			lcms			lcms-devel
 libgd.so			gd			gd-devel
 libcroco-0.6.so			libcroco		libcroco-devel
 libgsf-1.so.114			libgsf			libgsf-devel
-libMagickCore.so		ImageMagick
-libMagickWand.so		ImageMagick
-libMagick++.so			ImageMagick
+libMagickCore.so		libmagick		libmagick-devel
+libMagickWand.so		libmagick		libmagick-devel
+libMagick++.so			libmagick		libmagick-devel
 libltdl.so			libltdl			libltdl-devel
 libpoppler-glib.so		poppler-glib		poppler-glib-devel
 libpoppler.so			poppler			poppler-devel