Removed old core and extra from repo. Renamed -testing to core/extra. This will setup the base for the testing branch.

1 files changed, 49 insertions, 44 deletions

diff --git a/abs/core/imagemagick/PKGBUILD b/abs/core/imagemagick/PKGBUILD
index e79c46b..2a797c7 100644
--- a/abs/core/imagemagick/PKGBUILD
+++ b/abs/core/imagemagick/PKGBUILD
@@ -1,53 +1,58 @@
-# $Id: PKGBUILD 28186 2009-02-28 05:23:34Z eric $
-# Maintainer: Eric Belanger <eric@archlinux.org>
-
-# NOTE: ImageMagick builds against an existing installation
-# uninstall ImageMagick before building, or build it, install it, build it.
-
-# NOTE 2: To circumvent linking problems (FS#10574), this package must now be built the following way:
-# install old package, build new package, install new package, rebuild
+# $Id: PKGBUILD 90849 2010-09-18 00:00:00Z eric $
+# Contributor: Eric Belanger <eric@archlinux.org>
+# Maintainer: DAniel J Griffiths <ghost1227@archlinux.us>
 
 pkgname=imagemagick
-pkgver=6.4.9.10
-pkgrel=6
+pkgver=6.6.4.3
+pkgrel=1
 pkgdesc="An image viewing/manipulation program"
 arch=('i686' 'x86_64')
 url="http://www.imagemagick.org/"
 license=('custom')
-depends=('libjpeg' 'lcms' 'libwmf' 'librsvg' 'libxt' 'gcc-libs' 'ghostscript' 'openexr>=1.6.1' 'libtool>=2.2' 'heimdal>=1.2.1' 'bzip2' 'libxml2' 'jasper')
-#makedepends=('ghostscript' 'openexr')
-options=('!makeflags' '!docs')
-source=(ftp://ftp.fifi.org/pub/ImageMagick/legacy/ImageMagick-${pkgver%.*}-${pkgver##*.}.tar.bz2
-	#ftp://ftp.imagemagick.org/pub/ImageMagick/ImageMagick-${pkgver%.*}-${pkgver##*.}.tar.bz2 \
-        libpng_mmx_patch_x86_64.patch add_delegate.patch)
+depends=('libtool' 'lcms' 'libxt' 'gcc-libs' 'bzip2' 'freetype2' 'fontconfig' 'libxext')
+makedepends=('ghostscript' 'openexr' 'libwmf' 'librsvg' 'libxml2' 'jasper')
+optdepends=('ghostscript: for Ghostscript support' 
+            'openexr: for OpenEXR support' 
+            'libwmf: for WMF support' 
+            'librsvg: for SVG support'
+            'libxml2: for XML support'
+            'jasper: for JPEG-2000 support')
+options=('!makeflags' '!docs' 'force')
+source=(ftp://ftp.imagemagick.org/pub/ImageMagick/ImageMagick-${pkgver%.*}-${pkgver##*.}.tar.xz \
+        libpng_mmx_patch_x86_64.patch 
+	perlmagick.rpath.patch)
+md5sums=('be87050ec143205326f2e9fbbc7da03a' '069980fc2590c02aed86420996259302'\
+         'ff9974decbfe9846f8e347239d87e4eb')
+sha1sums=('9f6c800560998b6a5e96b1a62d2b13140de9d1d7' 'e42f3acbe85b6098af75c5cecc9a254baaa0482c'\
+         '23405f80904b1de94ebd7bd6fe2a332471b8c283')
 
 build() {
-  cd ${srcdir}/ImageMagick-${pkgver%.*}-${pkgver##*.}
-
-  if [ "${CARCH}" = "x86_64" ]; then
-    patch -Np1 < ../libpng_mmx_patch_x86_64.patch || return 1
-  fi
-
-  patch -p0 < ../add_delegate.patch || return 1
-  sed -i "s/with_autotrace='no'/with_autotrace='yes'/" configure || return 1
-
- # When there is a soname bump, remove 'LIBS=-lMagickWand' from configure line and build/install. Then, readd 'LIBS=-lMagickWand' and build/install twice.
-  LIBS=-lMagickWand ./configure --prefix=/usr --without-modules --disable-static --enable-openmp \
-              --with-x --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 --with-jp2 \
-              --without-jbig --without-fpx --without-dps || return 1
-
-  make || return 1
-  make DESTDIR=${pkgdir} install || return 1
-  install -D -m644 LICENSE ${pkgdir}/usr/share/licenses/${pkgname}/LICENSE || return 1
-  install -D -m644 NOTICE ${pkgdir}/usr/share/licenses/${pkgname}/NOTICE || return 1
-
-  #Cleaning
-  find ${pkgdir} -name '*.bs' -exec rm {} \; || return 1
-  find ${pkgdir} -name '.packlist' -exec rm {} \; || return 1
-  find ${pkgdir} -name 'perllocal.pod' -exec rm {} \; || return 1
-
-  rm -f ${pkgdir}/usr/lib/*.la || return 1
+	cd "${srcdir}"/ImageMagick-${pkgver%.*}-${pkgver##*.}
+
+	if [ "${CARCH}" = 'x86_64' ]; then
+		patch -Np1 < ../libpng_mmx_patch_x86_64.patch
+	fi
+
+	patch -p0 < ../perlmagick.rpath.patch
+
+	./configure --prefix=/usr --with-modules --disable-static \
+	    --enable-openmp --with-x --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 \
+	    --without-jbig --without-fpx --without-dps
+	make
+}
+
+package() {
+	cd "${srcdir}"/ImageMagick-${pkgver%.*}-${pkgver##*.}
+
+	make DESTDIR="${pkgdir}" install
+
+	install -Dm644 LICENSE "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE"
+	install -Dm644 NOTICE "${pkgdir}/usr/share/licenses/${pkgname}/NOTICE"
+
+	#Cleaning
+	find "${pkgdir}" -name '*.bs' -exec rm {} \;
+	rm -f "${pkgdir}"/usr/lib/*.la
 }