[arch-commits] Commit in imagemagick/trunk (PKGBUILD)

[Eric Bélanger]

    Date: Tuesday, March 13, 2012 @ 21:50:03
  Author: eric
Revision: 153439

upgpkg: imagemagick 6.7.6.0-1

Upstream update, Remove unneeded perl library linking (close FS#28776), Clean up depends and makedepends, Update backup array, Remove !makeflags option, Add !emptydirs option

Modified:
  imagemagick/trunk/PKGBUILD

----------+
 PKGBUILD |   17 ++++++++---------
 1 file changed, 8 insertions(+), 9 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2012-03-13 23:17:57 UTC (rev 153438)
+++ PKGBUILD	2012-03-14 01:50:03 UTC (rev 153439)
@@ -3,16 +3,16 @@
 
 pkgbase=imagemagick
 pkgname=('imagemagick' 'imagemagick-doc')
-pkgver=6.7.5.3
+pkgver=6.7.6.0
 pkgrel=1
 arch=('i686' 'x86_64')
 url="http://www.imagemagick.org/"
 license=('custom')
-depends=('perl' 'libltdl' 'lcms2' 'libxt' 'fontconfig' 'libxext' 'libjpeg-turbo')
-makedepends=('ghostscript' 'openexr' 'libwmf' 'librsvg' 'libxml2' 'jasper' 'libpng')
+makedepends=('libltdl' 'lcms2' 'libxt' 'fontconfig' 'libxext' 'ghostscript' \
+             'openexr' 'libwmf' 'librsvg' 'libxml2' 'jasper')
 source=(ftp://ftp.imagemagick.org/pub/ImageMagick/ImageMagick-${pkgver%.*}-${pkgver##*.}.tar.xz \
         perlmagick.rpath.patch)
-sha1sums=('b6cee59cb380f38572ec40769c438901dcc7500e'
+sha1sums=('878c264d070c70debc514d7da9f4feb7728bfe9f'
           '23405f80904b1de94ebd7bd6fe2a332471b8c283')
 
 build() {
@@ -22,8 +22,7 @@
   autoreconf
   patch -p0 -i ../perlmagick.rpath.patch
 
-  LIBS="$LIBS -L/usr/lib/perl5/core_perl/CORE -lperl" \
-    ./configure --prefix=/usr --sysconfdir=/etc --with-modules --disable-static \
+  ./configure --prefix=/usr --sysconfdir=/etc --with-modules --disable-static \
     --enable-openmp --with-wmf --with-openexr --with-xml --with-lcms2 --with-jp2 \
     --with-gslib --with-gs-font-dir=/usr/share/fonts/Type1 \
     --with-perl --with-perl-options="INSTALLDIRS=vendor" \
@@ -39,6 +38,7 @@
 
 package_imagemagick() {
   pkgdesc="An image viewing/manipulation program"
+  depends=('perl' 'libltdl' 'lcms2' 'libxt' 'fontconfig' 'libxext')
   optdepends=('ghostscript: for Ghostscript support' 
               'openexr: for OpenEXR support' 
               'libwmf: for WMF support' 
@@ -53,13 +53,14 @@
           'etc/ImageMagick/magic.xml'
           'etc/ImageMagick/mime.xml'
           'etc/ImageMagick/policy.xml'
+          'etc/ImageMagick/quantization-table.xml'
           'etc/ImageMagick/sRGB.icc'
           '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' 'libtool')
+  options=('!docs' 'libtool' '!emptydirs')
 
   cd "${srcdir}"/ImageMagick-${pkgver%.*}-${pkgver##*.}
   make DESTDIR="${pkgdir}" install
@@ -74,8 +75,6 @@
 
 package_imagemagick-doc() {
   pkgdesc="The ImageMagick documentation (utilities manuals and libraries API)"
-  depends=()
-  options=('!makeflags')
 
   cd "${srcdir}"/ImageMagick-${pkgver%.*}-${pkgver##*.}
   make DESTDIR="${pkgdir}" install-data-html