[arch-commits] Commit in curl/repos (5 files)

[Dave Reisner]

    Date: Friday, November 4, 2011 @ 14:42:19
  Author: dreisner
Revision: 142037

db-move: moved curl from [testing] to [core] (i686)

Added:
  curl/repos/core-i686/PKGBUILD
    (from rev 142036, curl/repos/testing-i686/PKGBUILD)
  curl/repos/core-i686/curlbuild.h
    (from rev 142036, curl/repos/testing-i686/curlbuild.h)
Deleted:
  curl/repos/core-i686/PKGBUILD
  curl/repos/core-i686/curlbuild.h
  curl/repos/testing-i686/

-------------+
 PKGBUILD    |  124 +++++++++++++++++++++++++++++-----------------------------
 curlbuild.h |   18 ++++----
 2 files changed, 73 insertions(+), 69 deletions(-)

Deleted: core-i686/PKGBUILD
===================================================================
--- core-i686/PKGBUILD	2011-11-04 17:48:40 UTC (rev 142036)
+++ core-i686/PKGBUILD	2011-11-04 18:42:19 UTC (rev 142037)
@@ -1,60 +0,0 @@
-# $Id$
-# Maintainer: Dave Reisner <dreisner at archlinux.org>
-# Contributor: Angel Velasquez <angvp at archlinux.org>
-# Contributor: Eric Belanger <eric at archlinux.org>
-# Contributor: Lucien Immink <l.immink at student.fnt.hvu.nl>
-# Contributor: Daniel J Griffiths <ghost1227 at archlinux.us>
-
-pkgname=curl
-pkgver=7.22.0
-pkgrel=1
-pkgdesc="An URL retrival utility and library"
-arch=('i686' 'x86_64')
-url="http://curl.haxx.se"
-license=('MIT')
-depends=('zlib' 'openssl' 'bash' 'ca-certificates' 'libssh2')
-options=('!libtool')
-source=("http://curl.haxx.se/download/$pkgname-$pkgver.tar.gz"{,.asc}
-        curlbuild.h)
-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"
-
-  ./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"
-
-  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"
-}

Copied: curl/repos/core-i686/PKGBUILD (from rev 142036, curl/repos/testing-i686/PKGBUILD)
===================================================================
--- core-i686/PKGBUILD	                        (rev 0)
+++ core-i686/PKGBUILD	2011-11-04 18:42:19 UTC (rev 142037)
@@ -0,0 +1,64 @@
+# $Id$
+# Maintainer: Dave Reisner <dreisner at archlinux.org>
+# Contributor: Angel Velasquez <angvp at archlinux.org>
+# Contributor: Eric Belanger <eric at archlinux.org>
+# Contributor: Lucien Immink <l.immink at student.fnt.hvu.nl>
+# Contributor: Daniel J Griffiths <ghost1227 at archlinux.us>
+
+pkgname=curl
+pkgver=7.22.0
+pkgrel=4
+pkgdesc="An URL retrival utility and library"
+arch=('i686' 'x86_64')
+url="http://curl.haxx.se"
+license=('MIT')
+depends=('ca-certificates' 'libssh2' 'openssl' 'zlib')
+makedepends=('perl-libwww')
+options=('!libtool')
+source=("http://curl.haxx.se/download/$pkgname-$pkgver.tar.gz"{,.asc}
+        curlbuild.h)
+md5sums=('e8c36126d21c893f085aca233906b5cc'
+         '1b061c348b63ea3e90c3f2c3af6a08d6'
+         '751bd433ede935c8fae727377625a8ae')
+
+ptrsize=$(cpp <<<'__SIZEOF_POINTER__' | sed '/^#/d')
+case $ptrsize in
+  8) _curlbuild=curlbuild-64.h ;;
+  4) _curlbuild=curlbuild-32.h ;;
+  *) error "unknown pointer size for architecture: %s bytes" "$ptrsize"
+    exit 1
+    ;;
+esac
+
+build() {
+  cd "$srcdir/$pkgname-$pkgver"
+
+  ./configure \
+      --prefix=/usr \
+      --mandir=/usr/share/man \
+      --disable-dependency-tracking \
+      --disable-ldap \
+      --disable-ldaps \
+      --enable-ipv6 \
+      --enable-manual \
+      --enable-versioned-symbols \
+      --enable-threaded-resolver \
+      --without-libidn \
+      --with-random=/dev/urandom \
+      --with-ca-bundle=/etc/ssl/certs/ca-certificates.crt
+  make
+}
+
+package() {
+  cd "$srcdir/$pkgname-$pkgver"
+
+  make DESTDIR="$pkgdir" install
+
+  # license
+  install -Dm644 COPYING "$pkgdir/usr/share/licenses/$pkgname/COPYING"
+
+  # devel
+  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"
+}

Deleted: core-i686/curlbuild.h
===================================================================
--- core-i686/curlbuild.h	2011-11-04 17:48:40 UTC (rev 142036)
+++ core-i686/curlbuild.h	2011-11-04 18:42:19 UTC (rev 142037)
@@ -1,9 +0,0 @@
-#include <bits/wordsize.h>
-
-#if __WORDSIZE == 32
-#include "curlbuild-32.h"
-#elif __WORDSIZE == 64
-#include "curlbuild-64.h"
-#else
-#error "Unknown word size"
-#endif

Copied: curl/repos/core-i686/curlbuild.h (from rev 142036, curl/repos/testing-i686/curlbuild.h)
===================================================================
--- core-i686/curlbuild.h	                        (rev 0)
+++ core-i686/curlbuild.h	2011-11-04 18:42:19 UTC (rev 142037)
@@ -0,0 +1,9 @@
+#include <bits/wordsize.h>
+
+#if __WORDSIZE == 32
+#include "curlbuild-32.h"
+#elif __WORDSIZE == 64
+#include "curlbuild-64.h"
+#else
+#error "Unknown word size"
+#endif