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

[Ronald van Haren]

    Date: Wednesday, December 15, 2010 @ 16:12:17
  Author: ronald
Revision: 103149

upgpkg: octave 3.2.4-2
imread patch for graphicsmagick 1.3.12

Modified:
  octave/trunk/PKGBUILD

----------+
 PKGBUILD |   21 ++++++++++++++-------
 1 file changed, 14 insertions(+), 7 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2010-12-15 21:11:48 UTC (rev 103148)
+++ PKGBUILD	2010-12-15 21:12:17 UTC (rev 103149)
@@ -5,7 +5,7 @@
 
 pkgname=octave
 pkgver=3.2.4
-pkgrel=1
+pkgrel=2
 pkgdesc="A high-level language, primarily intended for numerical computations."
 arch=('i686' 'x86_64')
 url="http://www.octave.org"
@@ -16,19 +16,21 @@
             'gnuplot: alternative plotting'
 	    'umfpack: LU decomposition of some large sparse matrices')
 source=("ftp://ftp.octave.org/pub/octave/octave-$pkgver.tar.bz2"
-	'octave-3.2.0_as_needed.patch'  'octave-3.2.0_parallel_make.patch')
+	'octave-3.2.0_as_needed.patch'  'octave-3.2.0_parallel_make.patch' 'imread.patch')
 options=('!emptydirs')
 install=octave.install
 md5sums=('608196657f4fa010420227b77333bb71'
          '33c8886cd908ace40f8b60334df1c34f'
-         'd59d783a8d7e8d8306caed4b2b8671a4')
+         'd59d783a8d7e8d8306caed4b2b8671a4'
+         '72d33ba1a862244f970cf259923815d9')
 
 build() {
   cd ${srcdir}/${pkgname}-${pkgver}
 
   # gentoo patches
-  patch -Np1 -i ${srcdir}/octave-3.2.0_as_needed.patch || return 1
-  patch -Np1 -i ${srcdir}/octave-3.2.0_parallel_make.patch || return 1
+  patch -Np1 -i ${srcdir}/octave-3.2.0_as_needed.patch
+  patch -Np1 -i ${srcdir}/octave-3.2.0_parallel_make.patch 
+  patch -Np0 -i ${srcdir}/imread.patch
   
   # http://www.nabble.com/Random-rounding-errors-td16010966.html
   FFLAGS="-O -ffloat-store" \
@@ -36,7 +38,12 @@
   ./configure --prefix=/usr --libexecdir=/usr/lib \
   --enable-shared --disable-static
 
-  make || return 1
-  make DESTDIR="${pkgdir}" install || return 1
+  make
+}
 
+package(){
+  cd ${srcdir}/${pkgname}-${pkgver}
+
+  make DESTDIR="${pkgdir}" install
+
 }