[arch-commits] Commit in cfitsio/repos (extra-i686 extra-i686/PKGBUILD)

[Eric Bélanger]

    Date: Tuesday, February 17, 2009 @ 03:32:02
  Author: eric
Revision: 27242

Merged revisions 356,27237 via svnmerge from 
svn+ssh://svn.archlinux.org/srv/svn-packages/cfitsio/trunk

........
  r356 | aaron | 2008-04-18 18:56:27 -0400 (Fri, 18 Apr 2008) | 1 line
  
  Added svn:keywords to all PKGBUILDs
........
  r27237 | eric | 2009-02-17 02:57:50 -0500 (Tue, 17 Feb 2009) | 2 lines
  
  upgpkg: cfitsio 3130-1
      upstream update
........

Modified:
  cfitsio/repos/extra-i686/	(properties)
  cfitsio/repos/extra-i686/PKGBUILD

----------+
 PKGBUILD |   19 ++++++++-----------
 1 file changed, 8 insertions(+), 11 deletions(-)


Property changes on: cfitsio/repos/extra-i686
___________________________________________________________________
Modified: svnmerge-integrated
   - /cfitsio/trunk:1
   + /cfitsio/trunk:1-27241

Modified: extra-i686/PKGBUILD
===================================================================
--- extra-i686/PKGBUILD	2009-02-17 08:31:08 UTC (rev 27241)
+++ extra-i686/PKGBUILD	2009-02-17 08:32:02 UTC (rev 27242)
@@ -2,23 +2,20 @@
 # Maintainer: Tobias Powalowski <tpowa at archlinux.org>
 
 pkgname=cfitsio
-pkgver=3060
-pkgrel=2
+pkgver=3130
+pkgrel=1
 pkgdesc="CFITSIO is a library of C and Fortran subroutines for reading and writing data files in FITS (Flexible Image Transport System) data format."
+arch=('i686' 'x86_64')
 url="http://heasarc.gsfc.nasa.gov/docs/software/fitsio/fitsio.html"
 license=('GPL2')
-arch=('i686' 'x86_64')
 makedepends=('pkgconfig')
+options=('!libtool')
 source=(ftp://heasarc.gsfc.nasa.gov/software/fitsio/c/${pkgname}${pkgver}.tar.gz)
-options=(!libtool)
-md5sums=('b7ab291d227c60b17a19a1c028dc649c')
+md5sums=('a353503755f57610d22a6b6c158b02d0')
 
 build() {
-  cd ${startdir}/src/${pkgname}
-  ./configure --prefix=/usr
+  cd ${srcdir}/${pkgname}
+  ./configure --prefix=/usr || return 1
   make || return 1
-  #fix Makefile for install dir
-  sed -i -e "s#/usr#${startdir}/pkg/usr#g" Makefile
-  mkdir -p ${startdir}/pkg/usr/lib/pkgconfig
-  make install || return 1
+  make DESTDIR=${pkgdir} install || return 1
 }