Date: Saturday, November 21, 2015 @ 20:42:54 Author: arojas Revision: 147347
archrelease: copy trunk to community-i686, community-x86_64 Added: astrometry.net/repos/ astrometry.net/repos/community-i686/ astrometry.net/repos/community-i686/PKGBUILD (from rev 147346, astrometry.net/trunk/PKGBUILD) astrometry.net/repos/community-i686/system-gsl.patch (from rev 147346, astrometry.net/trunk/system-gsl.patch) astrometry.net/repos/community-x86_64/ astrometry.net/repos/community-x86_64/PKGBUILD (from rev 147346, astrometry.net/trunk/PKGBUILD) astrometry.net/repos/community-x86_64/system-gsl.patch (from rev 147346, astrometry.net/trunk/system-gsl.patch) -----------------------------------+ community-i686/PKGBUILD | 45 ++++++++++++++++++++++++++++++++++++ community-i686/system-gsl.patch | 11 ++++++++ community-x86_64/PKGBUILD | 45 ++++++++++++++++++++++++++++++++++++ community-x86_64/system-gsl.patch | 11 ++++++++ 4 files changed, 112 insertions(+) Copied: astrometry.net/repos/community-i686/PKGBUILD (from rev 147346, astrometry.net/trunk/PKGBUILD) =================================================================== --- repos/community-i686/PKGBUILD (rev 0) +++ repos/community-i686/PKGBUILD 2015-11-21 19:42:54 UTC (rev 147347) @@ -0,0 +1,45 @@ +# $Id$ +# Maintainer: Antonio Rojas <aro...@archlinux.org> +# Contributor: Peter Strapp <peter at strapp.co.uk> + +pkgname=astrometry.net +pkgver=0.64 +pkgrel=1 +pkgdesc="Astrometry.net plate-solving" +url="http://astrometry.net/" +license=(GPL3) +arch=(i686 x86_64) +depends=(gsl netpbm cairo libjpeg-turbo python2-astropy) +source=("http://astrometry.net/downloads/$pkgname-$pkgver.tar.gz" system-gsl.patch) +sha1sums=('59dd740ede5e2e031167056c912748ff6d0b1580' + 'f5ddaff14e437f6ca727825c9c87faed5ad97687') + +prepare() { + cd $pkgname-$pkgver + sed -e 's/python/python2/' -i util/makefile.common blind/Makefile util/Makefile sdss/Makefile + +# Use system gsl + patch -p1 -i ../system-gsl.patch +} + +build() { + cd $pkgname-$pkgver + make +} + +package() { + cd $pkgname-$pkgver + + make INSTALL_DIR="$pkgdir"/usr \ + ETC_INSTALL_DIR="$pkgdir"/etc \ + EXAMPLE_INSTALL_DIR="$pkgdir"/usr/share/astrometry/examples \ + DATA_INSTALL_DIR="$pkgdir"/usr/share/astrometry/data \ + PY_BASE_INSTALL_DIR="$pkgdir"/usr/lib/python2.7/astrometry \ + PY_BASE_LINK_DIR='../lib/python2.7/astrometry' \ + install + + cd "$pkgdir" + grep -r -l "/usr/bin/env python" . | xargs sed -i 's|/usr/bin/env python|/usr/bin/env python2|' + sed -e "s|"$pkgdir"/usr/data|/usr/share/astrometry/data|" -i "$pkgdir"/etc/astrometry.cfg + rm -r "$pkgdir"/usr/doc +} Copied: astrometry.net/repos/community-i686/system-gsl.patch (from rev 147346, astrometry.net/trunk/system-gsl.patch) =================================================================== --- repos/community-i686/system-gsl.patch (rev 0) +++ repos/community-i686/system-gsl.patch 2015-11-21 19:42:54 UTC (rev 147347) @@ -0,0 +1,11 @@ +--- astrometry.net-0.64/Makefile.orig 2015-11-21 20:36:45.915734989 +0100 ++++ astrometry.net-0.64/Makefile 2015-11-21 20:37:06.019071691 +0100 +@@ -67,7 +67,7 @@ + + # Detect GSL -- this minimum version was chosen to match the version in gsl-an. + # Earlier versions would probably work fine. +-SYSTEM_GSL ?= $(shell (pkg-config --atleast-version=1.14 gsl && echo "yes") || echo "no") ++SYSTEM_GSL := yes + + ifneq ($(SYSTEM_GSL),yes) + thirdparty: gsl-an Copied: astrometry.net/repos/community-x86_64/PKGBUILD (from rev 147346, astrometry.net/trunk/PKGBUILD) =================================================================== --- repos/community-x86_64/PKGBUILD (rev 0) +++ repos/community-x86_64/PKGBUILD 2015-11-21 19:42:54 UTC (rev 147347) @@ -0,0 +1,45 @@ +# $Id$ +# Maintainer: Antonio Rojas <aro...@archlinux.org> +# Contributor: Peter Strapp <peter at strapp.co.uk> + +pkgname=astrometry.net +pkgver=0.64 +pkgrel=1 +pkgdesc="Astrometry.net plate-solving" +url="http://astrometry.net/" +license=(GPL3) +arch=(i686 x86_64) +depends=(gsl netpbm cairo libjpeg-turbo python2-astropy) +source=("http://astrometry.net/downloads/$pkgname-$pkgver.tar.gz" system-gsl.patch) +sha1sums=('59dd740ede5e2e031167056c912748ff6d0b1580' + 'f5ddaff14e437f6ca727825c9c87faed5ad97687') + +prepare() { + cd $pkgname-$pkgver + sed -e 's/python/python2/' -i util/makefile.common blind/Makefile util/Makefile sdss/Makefile + +# Use system gsl + patch -p1 -i ../system-gsl.patch +} + +build() { + cd $pkgname-$pkgver + make +} + +package() { + cd $pkgname-$pkgver + + make INSTALL_DIR="$pkgdir"/usr \ + ETC_INSTALL_DIR="$pkgdir"/etc \ + EXAMPLE_INSTALL_DIR="$pkgdir"/usr/share/astrometry/examples \ + DATA_INSTALL_DIR="$pkgdir"/usr/share/astrometry/data \ + PY_BASE_INSTALL_DIR="$pkgdir"/usr/lib/python2.7/astrometry \ + PY_BASE_LINK_DIR='../lib/python2.7/astrometry' \ + install + + cd "$pkgdir" + grep -r -l "/usr/bin/env python" . | xargs sed -i 's|/usr/bin/env python|/usr/bin/env python2|' + sed -e "s|"$pkgdir"/usr/data|/usr/share/astrometry/data|" -i "$pkgdir"/etc/astrometry.cfg + rm -r "$pkgdir"/usr/doc +} Copied: astrometry.net/repos/community-x86_64/system-gsl.patch (from rev 147346, astrometry.net/trunk/system-gsl.patch) =================================================================== --- repos/community-x86_64/system-gsl.patch (rev 0) +++ repos/community-x86_64/system-gsl.patch 2015-11-21 19:42:54 UTC (rev 147347) @@ -0,0 +1,11 @@ +--- astrometry.net-0.64/Makefile.orig 2015-11-21 20:36:45.915734989 +0100 ++++ astrometry.net-0.64/Makefile 2015-11-21 20:37:06.019071691 +0100 +@@ -67,7 +67,7 @@ + + # Detect GSL -- this minimum version was chosen to match the version in gsl-an. + # Earlier versions would probably work fine. +-SYSTEM_GSL ?= $(shell (pkg-config --atleast-version=1.14 gsl && echo "yes") || echo "no") ++SYSTEM_GSL := yes + + ifneq ($(SYSTEM_GSL),yes) + thirdparty: gsl-an