proj update

proj/PKGBUILD

@@ -1,35 +1,33 @@
-#
-# Apps Packages for Chakra, part of chakra-project.org
-#
+# Platform Packages for Chakra, part of chakra-project.org
 # maintainer (x86_64): Giuseppe Calà <jiveaxe@gmail.com>
-
-# include global config
-source ../_buildscripts/${current_repo}-${_arch}-cfg.conf
+#contributions from Arch:
 
 pkgname=proj
-pkgver=4.7.0
+pkgver=4.8.0
 pkgrel=1
 pkgdesc="Cartographic Projections library"
-arch=('i686' 'x86_64')
+arch=('x86_64')
 url="http://trac.osgeo.org/proj/"
 license=('MIT')
 options=('!libtool')
 source=(http://download.osgeo.org/proj/$pkgname-$pkgver.tar.gz
 	http://download.osgeo.org/proj/$pkgname-datumgrid-1.5.zip
-        http://www.swisstopo.admin.ch/internet/swisstopo/en/home/topics/survey/lv03-lv95/chenyx06/distortion_grids.parsys.65772.downloadList.94632.DownloadFile.tmp/chenyx06antv2.zip)
-md5sums=('927d34623b52e0209ba2bfcca18fe8cd'
+        chenyx06a.zip::http://www.swisstopo.admin.ch/internet/swisstopo/en/home/products/software/products/chenyx06.parsys.00011.downloadList.70576.DownloadFile.tmp/chenyx06ntv2.zip)
+md5sums=('d815838c92a29179298c126effbb1537'
          'f5bf28a2a9c6afe9a3f670f0c0adb783'
          'fbbfe2b6bcbc41168fe3bdc4a6c1082a')
 
-
 build() {
   bsdtar -xzvf ${srcdir}/${pkgname}-datumgrid-1.5.zip -C ${srcdir}/proj-${pkgver}/nad
-  bsdtar -xzvf ${srcdir}/chenyx06antv2.zip -C ${srcdir}/proj-${pkgver}/nad CHENYX06a.gsb
-
+  bsdtar -xzvf "${srcdir}/chenyx06a.zip" -C "${srcdir}/proj-${pkgver}/nad" CHENYX06a.gsb
   cd ${srcdir}/proj-${pkgver}
 
   ./configure --prefix=/usr
-  make || return 1
+  make
+}
+
+package() {
+  cd ${srcdir}/proj-${pkgver}
   make DESTDIR=${pkgdir} install
 
   install -D COPYING ${pkgdir}/usr/share/licenses/${pkgname}/LICENSE