Update pcr/imagemagick-srv as pcr/imagemagick-nox

2 files changed, 40 insertions, 23 deletions

diff --git a/pcr/imagemagick-srv/PKGBUILD b/pcr/imagemagick-nox/PKGBUILD
index 68cd9e607..403e8d84d 100644
--- a/pcr/imagemagick-srv/PKGBUILD
+++ b/pcr/imagemagick-nox/PKGBUILD
@@ -1,26 +1,30 @@
-# $Id$
+# $Id: PKGBUILD 215482 2014-06-26 17:44:45Z eric $
 # Maintainer (Arch): Eric Bélanger <eric@archlinux.org>
 # Maintainer: Márcio Silva <coadde@parabola.nu>
+# Contributor: Luke Shumaker <lukeshu@sbcglobal.net>
 
-pkgbase=imagemagick
-pkgname=imagemagick-srv
-pkgver=6.8.8.9
+_pkgname=imagemagick
+pkgname=imagemagick-nox
+pkgver=6.8.9.4
 pkgrel=1
 arch=('i686' 'x86_64' 'mips64el')
 url="http://www.imagemagick.org/"
 license=('custom')
-provides=("$pkgbase=$pkgver")
-conflicts=($pkgbase)
-makedepends=('libltdl' 'lcms2' 'libxt' 'fontconfig' 'libxext' 'ghostscript' \
-             'openexr' 'libwmf' 'librsvg' 'libxml2' 'jasper' 'liblqr' \
-             'libwebp') # libcl opencl-headers
+# Remove libxt, libxext, opencl-headers, libcl
+makedepends=('libltdl' 'lcms2' 'fontconfig' 'ghostscript'
+             'openexr' 'libwmf' 'librsvg' 'libxml2' 'liblqr' 'openjpeg2'
+             'libwebp' 'subversion')
 #source=(http://www.imagemagick.org/download/ImageMagick-${pkgver%.*}-${pkgver##*.}.tar.xz{,.asc}
 source=(ftp://ftp.sunet.se/pub/multimedia/graphics/ImageMagick/ImageMagick-${pkgver%.*}-${pkgver##*.}.tar.xz{,.asc}
         perlmagick.rpath.patch)
-sha1sums=('3ad2deadbc7e7c6e61eb5590fcc49d71fd96b247'
+sha1sums=('b3aa7b95f8db8a863602fa4c205420ad1d5a69b7'
           'SKIP'
           'e143cf9d530fabf3b58023899b5cc544ba93daec')
 
+provides=("$_pkgname=$pkgver")
+conflicts=("$_pkgname")
+replaces=("imagemagick-srv")
+
 prepare() {
   cd ImageMagick-${pkgver%.*}-${pkgver##*.}
   sed '/AC_PATH_XTRA/d' -i configure.ac
@@ -33,30 +37,34 @@ build() {
   [[ $CARCH = "i686" ]] && EXTRAOPTS="--with-gcc-arch=i686"
   [[ $CARCH = "x86_64" ]] && EXTRAOPTS="--with-gcc-arch=x86-64"
   [[ $CARCH = "mips64el" ]] && EXTRAOPTS="--with-gcc-arch=mips64el"
-  ./configure --prefix=/usr --sysconfdir=/etc --with-modules --disable-static \
-    --disable-hdri --with-wmf --with-openexr --with-xml --with-lcms2 --with-jp2 \
+
+  no_x=yes with_x=no \
+  ./configure --prefix=/usr --sysconfdir=/etc --with-modules \
+    --enable-hdri --with-wmf --with-openexr --with-xml --with-lcms2 \
     --with-webp --with-gslib --with-gs-font-dir=/usr/share/fonts/Type1 \
     --with-perl --with-perl-options="INSTALLDIRS=vendor" --with-lqr --with-rsvg \
-    --disable-opencl --without-gvc --without-djvu --without-autotrace \
+    --disable-opencl --with-openjp2 --without-gvc --without-djvu --without-autotrace \
     --without-jbig --without-fpx --without-dps --without-fftw $EXTRAOPTS
   make
 }
 
-#check() {
-#  cd ImageMagick-${pkgver%.*}-${pkgver##*.}
+check() {
+  cd ImageMagick-${pkgver%.*}-${pkgver##*.}
 #  make check
-#}
+}
 
-package_imagemagick-srv() {
-  pkgdesc="An image viewing/manipulation program (for web servers)"
-  depends=('perl' 'libltdl' 'lcms2' 'libxt' 'fontconfig' 'libxext' 'liblqr') # 'libcl')
+package() {
+  pkgdesc="An image viewing/manipulation program"
+  pkgdesc+=" (without X11; for servers)"
+  # Remove libxt, libxext, libcl
+  depends=('perl' 'libltdl' 'lcms2' 'fontconfig' 'liblqr')
   optdepends=('imagemagick-doc: for additional information'
-              'ghostscript: for Ghostscript support'
+              'ghostscript: for Ghostscript support' 
               'openexr: for OpenEXR support' 
+	      'openjpeg2: for JP2 support' 
               'libwmf: for WMF support' 
               'librsvg: for SVG support' 
               'libxml2: for XML support' 
-              'jasper: for JPEG-2000 support' 
               'libpng: for PNG support' 
 	      'libwebp: for WEBP support')
   backup=("etc/ImageMagick-${pkgver%%.*}/coder.xml"
@@ -76,9 +84,18 @@ package_imagemagick-srv() {
 
   cd ImageMagick-${pkgver%.*}-${pkgver##*.}
   make -j1 DESTDIR="${pkgdir}" install
-  install -Dm644 LICENSE "${pkgdir}/usr/share/licenses/imagemagick/LICENSE"
-  install -Dm644 NOTICE "${pkgdir}/usr/share/licenses/imagemagick/NOTICE"
+  install -Dm644 LICENSE "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE"
+  install -Dm644 NOTICE "${pkgdir}/usr/share/licenses/${pkgname}/NOTICE"
 
 #Cleaning
   rm -f "${pkgdir}"/usr/lib/*.la
 }
+
+package_imagemagick-doc() {
+  pkgdesc="The ImageMagick documentation (utilities manuals and libraries API)"
+
+  cd ImageMagick-${pkgver%.*}-${pkgver##*.}
+  make DESTDIR="${pkgdir}" install-data-html
+  install -Dm644 LICENSE "${pkgdir}/usr/share/licenses/imagemagick-doc/LICENSE"
+  install -Dm644 NOTICE "${pkgdir}/usr/share/licenses/imagemagick-doc/NOTICE"
+}
diff --git a/pcr/imagemagick-srv/perlmagick.rpath.patch b/pcr/imagemagick-nox/perlmagick.rpath.patch
index a5b1a82e2..a5b1a82e2 100644
--- a/pcr/imagemagick-srv/perlmagick.rpath.patch
+++ b/pcr/imagemagick-nox/perlmagick.rpath.patch