[arch-commits] Commit in curl/trunk (PKGBUILD)

[Dave Reisner]

    Date: Tuesday, September 13, 2011 @ 16:49:09
  Author: dreisner
Revision: 137980

upgpkg: curl 7.22.0-1

upstream release 7.22.0

Modified:
  curl/trunk/PKGBUILD

----------+
 PKGBUILD |   63 +++++++++++++++++++++++++++++++++----------------------------
 1 file changed, 35 insertions(+), 28 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2011-09-13 20:01:54 UTC (rev 137979)
+++ PKGBUILD	2011-09-13 20:49:09 UTC (rev 137980)
@@ -6,7 +6,7 @@
 # Contributor: Daniel J Griffiths <ghost1227 at archlinux.us>
 
 pkgname=curl
-pkgver=7.21.7
+pkgver=7.22.0
 pkgrel=1
 pkgdesc="An URL retrival utility and library"
 arch=('i686' 'x86_64')
@@ -14,40 +14,47 @@
 license=('MIT')
 depends=('zlib' 'openssl' 'bash' 'ca-certificates' 'libssh2')
 options=('!libtool')
-source=(http://curl.haxx.se/download/${pkgname}-${pkgver}.tar.bz2
+source=("http://curl.haxx.se/download/$pkgname-$pkgver.tar.gz"{,.asc}
         curlbuild.h)
-
-[[ $CARCH == "x86_64" ]] && _curlbuild=curlbuild-64.h
-[[ $CARCH == "i686" ]] && _curlbuild=curlbuild-32.h
-md5sums=('5f6d50c4d4ee38c57fe37e3cff75adbd'
+md5sums=('e8c36126d21c893f085aca233906b5cc'
+         '1b061c348b63ea3e90c3f2c3af6a08d6'
          '751bd433ede935c8fae727377625a8ae')
 
+
+case $(cpp <<<'__SIZEOF_POINTER__' | sed '/^#/d') in
+  8) _curlbuild=curlbuild-64.h ;;
+  4) _curlbuild=curlbuild-32.h ;;
+  *) error "unsupported architecture: %s" "$CARCH"
+    exit 1
+    ;;
+esac
+
 build() {
-    cd ${srcdir}/${pkgname}-${pkgver}
+  cd "$srcdir/$pkgname-$pkgver"
 
-    ./configure \
-        --with-random=/dev/urandom \
-        --prefix=/usr \
-        --mandir=/usr/share/man \
-        --disable-dependency-tracking \
-        --enable-ipv6 \
-        --disable-ldaps \
-        --disable-ldap \
-        --enable-manual \
-        --enable-versioned-symbols \
-        --with-ca-bundle=/etc/ssl/certs/ca-certificates.crt \
-        --without-libidn \
-        --enable-threaded-resolver
-    make
+  ./configure \
+      --with-random=/dev/urandom \
+      --prefix=/usr \
+      --mandir=/usr/share/man \
+      --disable-dependency-tracking \
+      --enable-ipv6 \
+      --disable-ldaps \
+      --disable-ldap \
+      --enable-manual \
+      --enable-versioned-symbols \
+      --with-ca-bundle=/etc/ssl/certs/ca-certificates.crt \
+      --without-libidn \
+      --enable-threaded-resolver
+  make
 }
 
 package() {
-    cd "$srcdir/$pkgname-$pkgver"
+  cd "$srcdir/$pkgname-$pkgver"
 
-    make DESTDIR="$pkgdir" install
-    install -Dm644 COPYING "$pkgdir/usr/share/licenses/$pkgname/COPYING"
-    install -Dm644 docs/libcurl/libcurl.m4 \
-        "$pkgdir/usr/share/aclocal/libcurl.m4"
-    mv "$pkgdir/usr/include/curl/curlbuild.h" "$pkgdir/usr/include/curl/$_curlbuild"
-    install -m644 "$srcdir/curlbuild.h" "$pkgdir/usr/include/curl/curlbuild.h"
+  make DESTDIR="$pkgdir" install
+
+  install -Dm644 COPYING "$pkgdir/usr/share/licenses/$pkgname/COPYING"
+  install -Dm644 docs/libcurl/libcurl.m4 "$pkgdir/usr/share/aclocal/libcurl.m4"
+  mv "$pkgdir/usr/include/curl/curlbuild.h" "$pkgdir/usr/include/curl/$_curlbuild"
+  install -m644 "$srcdir/curlbuild.h" "$pkgdir/usr/include/curl/curlbuild.h"
 }