From f75cb7f89aece74b447db4b8471e4b733b339d3f Mon Sep 17 00:00:00 2001
From: abveritas <abveritas@chakra-project.org>
Date: Thu, 17 May 2012 21:28:51 +0000
Subject: [PATCH] imagemagick rebuild to move makedeps to deps, added
 functionality, fixing grub-editor bug

---
 imagemagick/PKGBUILD  | 37 +++++++++++++++++--------------------
 libpciaccess/PKGBUILD | 11 +++++++----
 2 files changed, 24 insertions(+), 24 deletions(-)

diff --git a/imagemagick/PKGBUILD b/imagemagick/PKGBUILD
index 1da262fb3..ad73d79ea 100644
--- a/imagemagick/PKGBUILD
+++ b/imagemagick/PKGBUILD
@@ -1,30 +1,27 @@
 #
 # Chakra Packages for Chakra, part of chakra-project.org
 #
-# maintainer (i686): Phil Miller <philm[at]chakra-project[dog]org>
-# maintainer (x86_64): Manuel Tortosa <manutortosa[at]chakra-project[dot]org>
+# maintainer abveritas@chakra-project.org
 
 pkgname=imagemagick
 pkgver=6.6.6.10
-pkgrel=1
+pkgrel=2
 pkgdesc="An image viewing/manipulation program"
 arch=('i686' 'x86_64')
 url="http://www.imagemagick.org/"
 license=('custom')
 depends=('libtool' 'lcms' 'lcms2' 'libxt' 'gcc-libs' 'bzip2' 'freetype2' 'fontconfig'
-	 'libxext' 'fftw' 'liblqr')
-makedepends=('ghostscript' 'openexr' 'libwmf' 'librsvg' 'libxml2' 'jasper')
+	 'libxext' 'fftw' 'liblqr' 'libwmf' 'librsvg' 'libxml2' )
+makedepends=('ghostscript' 'openexr' 'jasper')
 optdepends=('ghostscript: for Ghostscript support' 
-            'openexr: for OpenEXR support' 
-            'libwmf: for WMF support' 
-            'librsvg: for SVG support'
-            'libxml2: for XML support'
+            'openexr: for OpenEXR support'  
             'jasper: for JPEG-2000 support')
 options=('!makeflags' '!docs')
-source=(ftp://ftp.imagemagick.org/pub/ImageMagick/ImageMagick-${pkgver%.*}-${pkgver##*.}.tar.xz \
+#source=(ftp://ftp.imagemagick.org/pub/ImageMagick/ImageMagick-${pkgver%.*}-${pkgver##*.}.tar.xz \
+source=(http://sourceforge.net/projects/imagemagick/files/old-sources/6.x/6.6/ImageMagick-6.6.6-10.tar.gz
         libpng_mmx_patch_x86_64.patch 
 	perlmagick.rpath.patch)
-md5sums=('59e2da8333ef645ade5f490c270651a1'
+md5sums=('1eead645376210cfe473ebe89c4a1b89'
 	 '069980fc2590c02aed86420996259302'
          'ff9974decbfe9846f8e347239d87e4eb')
 
@@ -32,29 +29,29 @@ build() {
 	cd ${srcdir}/ImageMagick-${pkgver%.*}-${pkgver##*.}
 
 	if [ "${CARCH}" = 'x86_64' ]; then
-		patch -Np1 < ../libpng_mmx_patch_x86_64.patch || return 1
+		patch -p1 < ../libpng_mmx_patch_x86_64.patch 
 	fi
 
-	patch -p0 < ../perlmagick.rpath.patch || return 1
+	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 || return 1
-	make || return 1
+	    --without-jbig --without-fpx --without-dps 
+	make 
 }
 
 package() {
 	cd ${srcdir}/ImageMagick-${pkgver%.*}-${pkgver##*.}
 
-	make DESTDIR=${pkgdir} install || return 1
+	make DESTDIR=${pkgdir} install 
 
-	install -Dm644 LICENSE ${pkgdir}/usr/share/licenses/${pkgname}/LICENSE || return 1
-	install -Dm644 NOTICE ${pkgdir}/usr/share/licenses/${pkgname}/NOTICE || return 1
+	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 {} \; || return 1
-	rm -f ${pkgdir}/usr/lib/*.la || return 1
+	find ${pkgdir} -name '*.bs' -exec rm {} \; 
+	rm -f ${pkgdir}/usr/lib/*.la 
 }
diff --git a/libpciaccess/PKGBUILD b/libpciaccess/PKGBUILD
index 0444c182c..c4206e560 100644
--- a/libpciaccess/PKGBUILD
+++ b/libpciaccess/PKGBUILD
@@ -1,11 +1,10 @@
 #
 # Platform Packages for Chakra, part of chakra-project.org
 #
-# maintainer (i686): Phil Miller <philm[at]chakra-project[dog]org>
-# maintainer (x86_64): Manuel Tortosa <manutortosa[at]chakra-project[dot]org>
+# maintainer abveritas@chakra-project.org
 
 pkgname=libpciaccess
-pkgver=0.12.1
+pkgver=0.13.1
 pkgrel=1
 pkgdesc="X11 PCI access library"
 arch=(i686 x86_64)
@@ -15,12 +14,16 @@ depends=('glibc')
 makedepends=('pkgconfig' 'xorg-util-macros')
 options=('!libtool')
 source=(${url}/releases/individual/lib/${pkgname}-${pkgver}.tar.bz2)
-sha1sums=('4933bda545df37395e57ff6b4bd61e17a5431770')
+sha1sums=('ae4dcf27a1b52c6a1fd90b21165fbaecae34e8ac')
 
 build() {
   cd "${srcdir}/${pkgname}-${pkgver}"
   ./configure --prefix=/usr --sysconfdir=/etc
   make
+}
+
+package() {
+  cd "${srcdir}/${pkgname}-${pkgver}"
   make DESTDIR="${pkgdir}" install
   install -m755 -d "${pkgdir}/usr/share/licenses/${pkgname}"
   install -m644 COPYING "${pkgdir}/usr/share/licenses/${pkgname}/"