Merge branch 'master' of ssh://vparabola/home/parabola/abslibre-pre-mips64el

Conflicts:
	community-testing/llvm/PKGBUILD
	community/dsniff/PKGBUILD
	community/ngrep/PKGBUILD
	community/virtualbox/PKGBUILD
	extra/gstreamer0.10-good/PKGBUILD
	extra/lirc/PKGBUILD
	extra/mc/PKGBUILD
	extra/mesa/PKGBUILD
	extra/xfburn/PKGBUILD
	testing/gnome-panel/PKGBUILD

1 files changed, 24 insertions, 12 deletions

diff --git a/extra/imagemagick/PKGBUILD b/extra/imagemagick/PKGBUILD
index 2f6ecc501..e2d60340b 100644
--- a/extra/imagemagick/PKGBUILD
+++ b/extra/imagemagick/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 117332 2011-03-31 05:07:13Z eric $
+# $Id: PKGBUILD 119490 2011-04-11 18:49:40Z jgc $
 # Maintainer: Eric Bélanger <eric@archlinux.org>
 
 pkgbase=imagemagick
 pkgname=('imagemagick' 'imagemagick-doc')
-pkgver=6.6.9.1
+pkgver=6.6.9.4
 pkgrel=1
 arch=('i686' 'x86_64' 'mips64el')
 url="http://www.imagemagick.org/"
@@ -13,24 +13,26 @@ depends=('libtool' 'lcms' 'libxt' 'gcc-libs' 'bzip2' 'xz' 'freetype2' 'fontconfi
 makedepends=('ghostscript' 'openexr' 'libwmf' 'librsvg' 'libxml2' 'jasper' 'libpng')
 source=(ftp://ftp.imagemagick.org/pub/ImageMagick/ImageMagick-${pkgver%.*}-${pkgver##*.}.tar.xz \
         libpng_mmx_patch_x86_64.patch perlmagick.rpath.patch)
-md5sums=('b8c7dfbad2eb9b9c39666af07cb6db83'
+md5sums=('e9355aa38daa1d2c42d7e37108bc0dfa'
          '069980fc2590c02aed86420996259302'
          'ff9974decbfe9846f8e347239d87e4eb')
-sha1sums=('924e1841a1518bf394f5a18d4fd25414bdf9f63d'
+sha1sums=('e3cbf6d61bf29ec8be6796c89b04f10495a6e52d'
           'e42f3acbe85b6098af75c5cecc9a254baaa0482c'
           '23405f80904b1de94ebd7bd6fe2a332471b8c283')
 
-
 build() {
   cd "${srcdir}"/ImageMagick-${pkgver%.*}-${pkgver##*.}
 
   if [ "${CARCH}" = 'x86_64' ]; then
-    patch -Np1 < ../libpng_mmx_patch_x86_64.patch
+    patch -Np1 -i ../libpng_mmx_patch_x86_64.patch
   fi
 
-  patch -p0 < ../perlmagick.rpath.patch
+  patch -Np0 -i ../perlmagick.rpath.patch
+  sed '/AC_PATH_XTRA/d' -i configure.ac
+  autoreconf
+
   ./configure --prefix=/usr --sysconfdir=/etc --with-modules --disable-static \
-    --enable-openmp --with-x --with-wmf --with-openexr --with-xml \
+    --enable-openmp --with-wmf --with-openexr --with-xml \
     --with-gslib --with-gs-font-dir=/usr/share/fonts/Type1 \
     --with-perl --with-perl-options="INSTALLDIRS=vendor" \
     --without-gvc --without-djvu --without-autotrace --with-jp2 \
@@ -47,9 +49,19 @@ package_imagemagick() {
               'libxml2: for XML support' 
               'jasper: for JPEG-2000 support' 
               'libpng: for PNG support')
-  backup=('etc/ImageMagick/colors.xml' 'etc/ImageMagick/log.xml' 'etc/ImageMagick/policy.xml'
-          'etc/ImageMagick/type-dejavu.xml' 'etc/ImageMagick/type-ghostscript.xml'
-          'etc/ImageMagick/type-windows.xml' 'etc/ImageMagick/type.xml')
+  backup=('etc/ImageMagick/coder.xml'
+          'etc/ImageMagick/colors.xml'
+          'etc/ImageMagick/delegates.xml'
+          'etc/ImageMagick/log.xml'
+          'etc/ImageMagick/magic.xml'
+          'etc/ImageMagick/mime.xml'
+          'etc/ImageMagick/policy.xml'
+          'etc/ImageMagick/sRGB.icm'
+          'etc/ImageMagick/thresholds.xml'
+          'etc/ImageMagick/type.xml'
+          'etc/ImageMagick/type-dejavu.xml'
+          'etc/ImageMagick/type-ghostscript.xml'
+          'etc/ImageMagick/type-windows.xml')
   options=('!makeflags' '!docs')
 
   cd "${srcdir}"/ImageMagick-${pkgver%.*}-${pkgver##*.}
@@ -58,7 +70,7 @@ package_imagemagick() {
   install -Dm644 NOTICE "${pkgdir}/usr/share/licenses/imagemagick/NOTICE"
 
 #Cleaning
-  find "${pkgdir}" -name '*.bs' -exec rm {} \;
+  find "${pkgdir}" -name '*.bs' -delete
   rm -f "${pkgdir}"/usr/lib/*.la
 }