Merge branch 'master' of ssh://vparabola/home/parabola/abslibre-pre-mips64el

Conflicts:
	community/pigeonhole/PKGBUILD
	community/pv/PKGBUILD
	community/python-gnupginterface/PKGBUILD
	community/tdl/PKGBUILD
	extra/clisp/PKGBUILD
	extra/expect/PKGBUILD
	extra/gtkpod/PKGBUILD
	extra/hspell/PKGBUILD
	extra/id3lib/PKGBUILD
	extra/imake/PKGBUILD
	extra/libfontenc/PKGBUILD
	extra/libice/PKGBUILD
	extra/libsm/PKGBUILD
	extra/libspectre/PKGBUILD
	extra/libtasn1/PKGBUILD
	extra/libxau/PKGBUILD
	extra/libxaw/PKGBUILD
	extra/libxxf86dga/PKGBUILD
	extra/mp3splt/PKGBUILD
	extra/multitail/PKGBUILD
	extra/nss_ldap/PKGBUILD
	extra/pam_ldap/PKGBUILD
	extra/recode/PKGBUILD
	extra/ruby/PKGBUILD
	extra/squid/PKGBUILD
	extra/ssmtp/PKGBUILD
	extra/umfpack/PKGBUILD
	extra/xorg-xbacklight/PKGBUILD
	extra/xorg-xbiff/PKGBUILD
	extra/xorg-xcalc/PKGBUILD
	extra/xorg-xconsole/PKGBUILD
	extra/xorg-xedit/PKGBUILD
	extra/xorg-xeyes/PKGBUILD
	extra/xorg-xvinfo/PKGBUILD

1 files changed, 29 insertions, 32 deletions

diff --git a/extra/umfpack/PKGBUILD b/extra/umfpack/PKGBUILD
index d2e8aa764..ad7bfd249 100644
--- a/extra/umfpack/PKGBUILD
+++ b/extra/umfpack/PKGBUILD
@@ -4,13 +4,13 @@
 # Contributor: iKevin <kellwood at ameritech dot net>
 
 pkgname=umfpack
-pkgver=5.5.0
-_ufcfgver=3.5.0
-_amdver=2.2.1
-_cholmodver=1.7.1
-_colamdver=2.7.2
-_ccolamdver=2.7.2
-pkgrel=1.1
+pkgver=5.5.2
+_ufcfgver=3.7.0
+_amdver=2.2.3
+_cholmodver=1.7.4
+_colamdver=2.7.4
+_ccolamdver=2.7.4
+pkgrel=1
 pkgdesc="A multifrontal direct solver for unsymmetric linear systems (AMD/${_amdver}, UFConfig/${_ufcgfgver})"
 arch=('i686' 'x86_64' 'mips64el')
 url="http://www.cise.ufl.edu/research/sparse/umfpack"
@@ -24,35 +24,32 @@ source=(http://www.cise.ufl.edu/research/sparse/umfpack/UMFPACK-$pkgver.tar.gz
 	http://www.cise.ufl.edu/research/sparse/amd/AMD-${_amdver}.tar.gz
 	http://www.cise.ufl.edu/research/sparse/cholmod/CHOLMOD-${_cholmodver}.tar.gz
 	http://www.cise.ufl.edu/research/sparse/colamd/COLAMD-${_colamdver}.tar.gz
-	http://www.cise.ufl.edu/research/sparse/ccolamd/CCOLAMD-${_ccolamdver}.tar.gz
-	UFconfig.mk)
-md5sums=('19f5d8b4231ec9114718641ce51cce6e'
-         '526413bbbc94f987cf79619d9110bab4'
-         'b3e9679ba20635ac4847f01c01d6e992'
-         '9032c5724bee43ccd8f4546338a29fac'
-         '2b4e43c8ef33dacfade6d1ec49542ac1'
-         '79d813d5b54951060fc264172bfb5ca6'
-         'ce9731da58d58923a3cdc3fbef724c4e')
+	http://www.cise.ufl.edu/research/sparse/ccolamd/CCOLAMD-${_ccolamdver}.tar.gz)
+md5sums=('07eaa6ae3de176e5b3681032c10c76be'
+         'ab8c355d683e8c5597a0824b32704c70'
+         '4d2a7db82406f880e7686fbd2df5a3bf'
+         'c2088078a86ca1a88e64037f80ae6540'
+         '186d692ab7211e79f9b727d8192635f7'
+         'bb55f6b4b9358160eaba1a57f863c65e')
 
 build() {
-  cd "$srcdir/UMFPACK"
-  cp -rf "$srcdir/UFconfig/xerbla" .
-  cp -L ../UFconfig.mk $startdir/src/UFconfig
-  [ $CARCH != "i686" ] && sed -i 's#CFLAGS = -O3 -fexceptions#CFLAGS = -O3 -fexceptions -fPIC#' $srcdir/UFconfig/UFconfig.mk
-  make library || return 1
-  install -d "$pkgdir/usr/lib" "$pkgdir/usr/include"
+  CFLAGS+=" -DNCHOLMOD"
+  cd "$srcdir"
+  cp -rf UFconfig/xerbla UMFPACK
+  make -C UMFPACK library
+  make -C AMD library  
+}
 
-  install -D -m644 Lib/libumfpack.a "$pkgdir/usr/lib/libumfpack.a"
-  cp $startdir/src/UMFPACK/Include/*.h $startdir/pkg/usr/include
+package() {
+  cd "$srcdir"
+  
+  install -dm755 "$pkgdir"/usr/{include,lib}
 
-  install -D -m644 "$srcdir/AMD/Lib/libamd.a" "$pkgdir/usr/lib/libamd.a"
-  cp $startdir/src/AMD/Include/*.h $startdir/pkg/usr/include
+  install -m644 $srcdir/UMFPACK/Lib/libumfpack.a "$pkgdir/usr/lib/"
+  install -m644 $srcdir/UMFPACK/Include/*.h $pkgdir/usr/include
 
-  install -m644 "$srcdir/UFconfig/UFconfig.h" "$pkgdir/usr/include" || return 1
+  install -m644 "$srcdir/AMD/Lib/libamd.a" "$pkgdir/usr/lib/"
+  install -m644 $srcdir/AMD/Include/*.h $pkgdir/usr/include
 
-  # Fix permissions
-  cd $startdir/pkg/usr/include
-  chmod oug+r *
-  cd $startdir/pkg/usr/lib
-  chmod oug+r *
+  install -m644 "$srcdir/UFconfig/UFconfig.h" "$pkgdir/usr/include"
 }