[arch-commits] Commit in cfitsio/repos (6 files)
Antonio Rojas
arojas at archlinux.org
Sat Dec 3 09:41:23 UTC 2016
Date: Saturday, December 3, 2016 @ 09:41:22
Author: arojas
Revision: 282787
archrelease: copy trunk to extra-i686, extra-x86_64
Added:
cfitsio/repos/extra-i686/PKGBUILD
(from rev 282786, cfitsio/trunk/PKGBUILD)
cfitsio/repos/extra-x86_64/PKGBUILD
(from rev 282786, cfitsio/trunk/PKGBUILD)
Deleted:
cfitsio/repos/extra-i686/PKGBUILD
cfitsio/repos/extra-i686/cfitsio-3.400-fix-build.patch
cfitsio/repos/extra-x86_64/PKGBUILD
cfitsio/repos/extra-x86_64/cfitsio-3.400-fix-build.patch
--------------------------------------------+
/PKGBUILD | 82 +++++++++++++++++++++++++++
extra-i686/PKGBUILD | 47 ---------------
extra-i686/cfitsio-3.400-fix-build.patch | 38 ------------
extra-x86_64/PKGBUILD | 47 ---------------
extra-x86_64/cfitsio-3.400-fix-build.patch | 38 ------------
5 files changed, 82 insertions(+), 170 deletions(-)
Deleted: extra-i686/PKGBUILD
===================================================================
--- extra-i686/PKGBUILD 2016-12-03 09:40:52 UTC (rev 282786)
+++ extra-i686/PKGBUILD 2016-12-03 09:41:22 UTC (rev 282787)
@@ -1,47 +0,0 @@
-# $Id$
-# Maintainer:
-# Contributor: Andrea Scarpino <andrea at archlinux.org>
-# Contributor: Tobias Powalowski <tpowa at archlinux.org>
-
-pkgname=cfitsio
-pkgver=3.400
-pkgrel=1
-pkgdesc="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/fitsio/"
-license=(custom)
-depends=(glibc)
-source=("ftp://heasarc.gsfc.nasa.gov/software/fitsio/c/${pkgname}${pkgver/./}.tar.gz" cfitsio-3.400-fix-build.patch)
-sha512sums=('e54efb5c7a5a19ae354b202644cf2fcac946997bc0d14a3dc0b609af8725050604df167b4211586868a90b1d5098c1efdf167d6ce842c79b494e154544f3441a'
- '931579603417c55922d02cdcb9aec9deb79e3aca2c36e15e697e6c371749291aec52873f7bdc188f3a4aabe849655be4172b3edbcba1c529d5bfed265f26fc38')
-
-prepare() {
- cd $pkgname
- patch -p1 -i ../cfitsio-3.400-fix-build.patch
-}
-
-build() {
- cd $pkgname
- ./configure --prefix=/usr \
- --enable-reentrant
- make shared
- make utils
-}
-
-check() {
- cd $pkgname
- LD_LIBRARY_PATH=. ./testprog > testprog.lis
- [[ -z $(diff testprog.lis testprog.out) ]] || return 1
- [[ -z $(cmp testprog.fit testprog.std) ]] || return 1
-}
-
-package() {
- cd $pkgname
- make DESTDIR="$pkgdir" install
-
- install -D -m644 License.txt \
- "$pkgdir"/usr/share/licenses/$pkgname/LICENSE
-
-# Fix conflicts with ccfits and smem
- rm "$pkgdir"/usr/bin/{cookbook,smem,testprog}
-}
Copied: cfitsio/repos/extra-i686/PKGBUILD (from rev 282786, cfitsio/trunk/PKGBUILD)
===================================================================
--- extra-i686/PKGBUILD (rev 0)
+++ extra-i686/PKGBUILD 2016-12-03 09:41:22 UTC (rev 282787)
@@ -0,0 +1,41 @@
+# $Id$
+# Maintainer:
+# Contributor: Andrea Scarpino <andrea at archlinux.org>
+# Contributor: Tobias Powalowski <tpowa at archlinux.org>
+
+pkgname=cfitsio
+pkgver=3.410
+pkgrel=1
+pkgdesc="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/fitsio/"
+license=(custom)
+depends=(glibc)
+source=("ftp://heasarc.gsfc.nasa.gov/software/fitsio/c/${pkgname}${pkgver/./}.tar.gz")
+sha512sums=('b2ac31ab17e19eeeb4f1601f42f348402c0a4ab03725dbf74fe75eaabbee2f44f64f0c0ee7f0b2688bd93a9cc0dccf29f07e73b9148fff97fc78bebdbb5f6f0f')
+
+build() {
+ cd $pkgname
+ ./configure --prefix=/usr \
+ --enable-reentrant
+ make shared
+ make utils
+}
+
+check() {
+ cd $pkgname
+ LD_LIBRARY_PATH=. ./testprog > testprog.lis
+ [[ -z $(diff testprog.lis testprog.out) ]] || return 1
+ [[ -z $(cmp testprog.fit testprog.std) ]] || return 1
+}
+
+package() {
+ cd $pkgname
+ make DESTDIR="$pkgdir" install
+
+ install -D -m644 License.txt \
+ "$pkgdir"/usr/share/licenses/$pkgname/LICENSE
+
+# Fix conflicts with ccfits and smem
+ rm "$pkgdir"/usr/bin/{cookbook,smem,testprog}
+}
Deleted: extra-i686/cfitsio-3.400-fix-build.patch
===================================================================
--- extra-i686/cfitsio-3.400-fix-build.patch 2016-12-03 09:40:52 UTC (rev 282786)
+++ extra-i686/cfitsio-3.400-fix-build.patch 2016-12-03 09:41:22 UTC (rev 282787)
@@ -1,38 +0,0 @@
---- a/speed.c 2016-11-22 22:43:25.336155948 +0000
-+++ b/speed.c 2016-11-22 22:43:38.266122647 +0000
-@@ -457,7 +457,6 @@
- double telapse;
- time_t temp;
- struct timeval tv;
-- struct timezone tz;
-
- temp = time(0);
-
-@@ -478,7 +477,7 @@
- telapse = difftime( start, temp );
- }
- */
-- gettimeofday (&tv, &tz);
-+ gettimeofday (&tv, NULL);
-
- startsec = tv.tv_sec;
- startmilli = tv.tv_usec/1000;
-@@ -489,12 +488,11 @@
- int gettime(double *elapse, float *elapscpu, int *status)
- {
- struct timeval tv;
-- struct timezone tz;
- int stopmilli;
- long stopsec;
-
-
-- gettimeofday (&tv, &tz);
-+ gettimeofday (&tv, NULL);
- ecpu = clock();
- finish = time(0);
-
-@@ -509,3 +507,4 @@
-
- return( *status );
- }
-+
Deleted: extra-x86_64/PKGBUILD
===================================================================
--- extra-x86_64/PKGBUILD 2016-12-03 09:40:52 UTC (rev 282786)
+++ extra-x86_64/PKGBUILD 2016-12-03 09:41:22 UTC (rev 282787)
@@ -1,47 +0,0 @@
-# $Id$
-# Maintainer:
-# Contributor: Andrea Scarpino <andrea at archlinux.org>
-# Contributor: Tobias Powalowski <tpowa at archlinux.org>
-
-pkgname=cfitsio
-pkgver=3.400
-pkgrel=1
-pkgdesc="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/fitsio/"
-license=(custom)
-depends=(glibc)
-source=("ftp://heasarc.gsfc.nasa.gov/software/fitsio/c/${pkgname}${pkgver/./}.tar.gz" cfitsio-3.400-fix-build.patch)
-sha512sums=('e54efb5c7a5a19ae354b202644cf2fcac946997bc0d14a3dc0b609af8725050604df167b4211586868a90b1d5098c1efdf167d6ce842c79b494e154544f3441a'
- '931579603417c55922d02cdcb9aec9deb79e3aca2c36e15e697e6c371749291aec52873f7bdc188f3a4aabe849655be4172b3edbcba1c529d5bfed265f26fc38')
-
-prepare() {
- cd $pkgname
- patch -p1 -i ../cfitsio-3.400-fix-build.patch
-}
-
-build() {
- cd $pkgname
- ./configure --prefix=/usr \
- --enable-reentrant
- make shared
- make utils
-}
-
-check() {
- cd $pkgname
- LD_LIBRARY_PATH=. ./testprog > testprog.lis
- [[ -z $(diff testprog.lis testprog.out) ]] || return 1
- [[ -z $(cmp testprog.fit testprog.std) ]] || return 1
-}
-
-package() {
- cd $pkgname
- make DESTDIR="$pkgdir" install
-
- install -D -m644 License.txt \
- "$pkgdir"/usr/share/licenses/$pkgname/LICENSE
-
-# Fix conflicts with ccfits and smem
- rm "$pkgdir"/usr/bin/{cookbook,smem,testprog}
-}
Copied: cfitsio/repos/extra-x86_64/PKGBUILD (from rev 282786, cfitsio/trunk/PKGBUILD)
===================================================================
--- extra-x86_64/PKGBUILD (rev 0)
+++ extra-x86_64/PKGBUILD 2016-12-03 09:41:22 UTC (rev 282787)
@@ -0,0 +1,41 @@
+# $Id$
+# Maintainer:
+# Contributor: Andrea Scarpino <andrea at archlinux.org>
+# Contributor: Tobias Powalowski <tpowa at archlinux.org>
+
+pkgname=cfitsio
+pkgver=3.410
+pkgrel=1
+pkgdesc="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/fitsio/"
+license=(custom)
+depends=(glibc)
+source=("ftp://heasarc.gsfc.nasa.gov/software/fitsio/c/${pkgname}${pkgver/./}.tar.gz")
+sha512sums=('b2ac31ab17e19eeeb4f1601f42f348402c0a4ab03725dbf74fe75eaabbee2f44f64f0c0ee7f0b2688bd93a9cc0dccf29f07e73b9148fff97fc78bebdbb5f6f0f')
+
+build() {
+ cd $pkgname
+ ./configure --prefix=/usr \
+ --enable-reentrant
+ make shared
+ make utils
+}
+
+check() {
+ cd $pkgname
+ LD_LIBRARY_PATH=. ./testprog > testprog.lis
+ [[ -z $(diff testprog.lis testprog.out) ]] || return 1
+ [[ -z $(cmp testprog.fit testprog.std) ]] || return 1
+}
+
+package() {
+ cd $pkgname
+ make DESTDIR="$pkgdir" install
+
+ install -D -m644 License.txt \
+ "$pkgdir"/usr/share/licenses/$pkgname/LICENSE
+
+# Fix conflicts with ccfits and smem
+ rm "$pkgdir"/usr/bin/{cookbook,smem,testprog}
+}
Deleted: extra-x86_64/cfitsio-3.400-fix-build.patch
===================================================================
--- extra-x86_64/cfitsio-3.400-fix-build.patch 2016-12-03 09:40:52 UTC (rev 282786)
+++ extra-x86_64/cfitsio-3.400-fix-build.patch 2016-12-03 09:41:22 UTC (rev 282787)
@@ -1,38 +0,0 @@
---- a/speed.c 2016-11-22 22:43:25.336155948 +0000
-+++ b/speed.c 2016-11-22 22:43:38.266122647 +0000
-@@ -457,7 +457,6 @@
- double telapse;
- time_t temp;
- struct timeval tv;
-- struct timezone tz;
-
- temp = time(0);
-
-@@ -478,7 +477,7 @@
- telapse = difftime( start, temp );
- }
- */
-- gettimeofday (&tv, &tz);
-+ gettimeofday (&tv, NULL);
-
- startsec = tv.tv_sec;
- startmilli = tv.tv_usec/1000;
-@@ -489,12 +488,11 @@
- int gettime(double *elapse, float *elapscpu, int *status)
- {
- struct timeval tv;
-- struct timezone tz;
- int stopmilli;
- long stopsec;
-
-
-- gettimeofday (&tv, &tz);
-+ gettimeofday (&tv, NULL);
- ecpu = clock();
- finish = time(0);
-
-@@ -509,3 +507,4 @@
-
- return( *status );
- }
-+
More information about the arch-commits
mailing list