Merge branch 'testing' of ssh://git.chakraos.org:22/platform into testing

indilib/PKGBUILD

@@ -1,32 +1,26 @@
-#
-# 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>
-
-# include global config
-source ../_buildscripts/${current_repo}-${_arch}-cfg.conf
-
 pkgname=indilib
-pkgver=0.8
+pkgver=1.1.0
 pkgrel=1
 pkgdesc="INDI is an instrument neutral distributed interface control protocol that aims to provide backend driver support and automation for a wide range of Astronomical devices (telescopes, focusers, CCDs..etc)."
 url="http://indi.sourceforge.net/"
 license=('GPL2')
-arch=('i686' 'x86_64')
-depends=('gcc-libs' 'zlib' 'libnova>=0.13.0')
-makedepends=('pkgconfig' 'cmake' 'cfitsio')
-source=(http://downloads.sourceforge.net/project/indi/indilib/${pkgver}/libindi_$pkgver.tar.gz)
-options=(!libtool)
-md5sums=('ca2b7c56431eb5e08218929e5eb72150')
+arch=('x86_64')
+depends=('zlib' 'libnova' 'libjpeg-turbo' 'gsl')
+makedepends=('cmake' 'cfitsio')
+source=(http://downloads.sourceforge.net/project/indi/libindi_${pkgver}.tar.gz)
+md5sums=('0002e231177e382e1aacd6369044db22')
 
 build() {
-        cd $srcdir
-	mkdir -p build
-	cd build
-	cmake ../libindi-$pkgver \
+        cd ${srcdir}
+	mkdir -p build && cd build
+	cmake ../libindi_${pkgver} \
 		-DCMAKE_BUILD_TYPE=Release \
-		-DCMAKE_INSTALL_PREFIX=/usr || return 1
-	make || return 1
-	make DESTDIR=$pkgdir install
+		-DCMAKE_INSTALL_PREFIX=/usr
+	make
+}
+
+package() {
+	cd ${srcdir}/build
+	
+	make DESTDIR=${pkgdir} install
 }

libnova/PKGBUILD

@@ -1,22 +1,22 @@
-# $Id: PKGBUILD 62101 2010-01-02 09:15:25Z tpowa $
-# Maintainer: Tobias Powalowski <tpowa@archlinux.org>
-
 pkgname=libnova
-pkgver=0.13.0
+pkgver=0.15.0
 pkgrel=1
 pkgdesc="libnova is a general purpose, double precision, celestial mechanics, astrometry and astrodynamics library."
 url="http://libnova.sourceforge.net/"
 license=('GPL2')
-arch=('i686' 'x86_64')
+arch=('x86_64')
 depends=('glibc')
-makedepends=('pkgconfig')
 source=(http://downloads.sourceforge.net/sourceforge/libnova/$pkgname-$pkgver.tar.gz)
-options=(!libtool)
+sha1sums=('4b8d04cfca0be8d49c1ef7c3607d405a7a8b167d')
 
 build() {
-        cd $srcdir/$pkgname-$pkgver
-         ./configure --prefix=/usr
-        make || return 1
-        make DESTDIR=$pkgdir/ install
+	cd ${srcdir}/${pkgname}-${pkgver}
+	autoreconf -i
+	./configure --prefix=/usr
+	make
+}
+
+package() {
+        cd ${srcdir}/${pkgname}-${pkgver}
+	make DESTDIR=${pkgdir} install
 }
-md5sums=('32f67b1ae28372582da7fe4e6f554dcd')