From 0cab1fdffb879ccc36ee927fbf53c486c2c9cfcf Mon Sep 17 00:00:00 2001
From: Juan RP <xtraeme@gmail.com>
Date: Fri, 25 May 2012 22:52:50 +0200
Subject: [PATCH] curl: update to 7.26.0.

---
 srcpkgs/curl/libcurl-devel.template |  6 ++----
 srcpkgs/curl/libcurl.rshlibs        |  2 --
 srcpkgs/curl/libcurl.template       |  3 +--
 srcpkgs/curl/template               | 11 ++++-------
 4 files changed, 7 insertions(+), 15 deletions(-)

diff --git a/srcpkgs/curl/libcurl-devel.template b/srcpkgs/curl/libcurl-devel.template
index 8036eddffa..d705019ed4 100644
--- a/srcpkgs/curl/libcurl-devel.template
+++ b/srcpkgs/curl/libcurl-devel.template
@@ -1,6 +1,7 @@
 # Template file for 'curl-devel'.
 #
-depends="libidn-devel openssl-devel libldap-devel mit-krb5-devel libcurl"
+replaces="curl-devel<7.20.1"
+depends="libidn-devel openssl-devel libldap-devel mit-krb5-devel libcurl>=$version"
 short_desc="The multiprotocol file transfer library - development files"
 long_desc="
  libcurl is a free and easy-to-use client-side URL transfer library,
@@ -12,9 +13,6 @@ long_desc="
 
  This package contains files for development, headers, static libs, etc."
 
-replaces="curl-devel<7.20.1"
-
-
 do_install() {
 	vmove usr/bin/curl-config usr/bin
 	vmove "usr/share/man/man1/curl-config*" usr/share/man/man1
diff --git a/srcpkgs/curl/libcurl.rshlibs b/srcpkgs/curl/libcurl.rshlibs
index 130bd69fde..d418e5844b 100644
--- a/srcpkgs/curl/libcurl.rshlibs
+++ b/srcpkgs/curl/libcurl.rshlibs
@@ -5,10 +5,8 @@ libgssapi_krb5.so.2
 libkrb5.so.3
 libk5crypto.so.3
 libcom_err.so.2
-libresolv.so.2
 libssl.so.1
 libcrypto.so.1
-libdl.so.2
 libz.so.1
 libc.so.6
 liblber-2.4.so.2
diff --git a/srcpkgs/curl/libcurl.template b/srcpkgs/curl/libcurl.template
index 08f8a6e763..a9347b6740 100644
--- a/srcpkgs/curl/libcurl.template
+++ b/srcpkgs/curl/libcurl.template
@@ -1,5 +1,6 @@
 # Template file for 'libcurl'.
 #
+replaces="curl-libs<7.20.1"
 short_desc="The multiprotocol file transfer library"
 long_desc="
  libcurl is a free and easy-to-use client-side URL transfer library,
@@ -9,8 +10,6 @@ long_desc="
  user+password authentication (Basic, Digest, NTLM, Negotiate, Kerberos4),
  file transfer resume, http proxy tunneling and more!"
 
-replaces="curl-libs<7.20.1"
-
 do_install() {
 	vmove "usr/lib/*.so*" usr/lib
 }
diff --git a/srcpkgs/curl/template b/srcpkgs/curl/template
index 638549eb8b..94cea78556 100644
--- a/srcpkgs/curl/template
+++ b/srcpkgs/curl/template
@@ -1,17 +1,18 @@
 # Template build file for 'curl'.
 pkgname=curl
-version=7.24.0
+version=7.26.0
 homepage="http://curl.haxx.se"
 distfiles="$homepage/download/$pkgname-$version.tar.bz2"
 build_style=gnu-configure
 configure_args="--enable-ldaps --with-gssapi=/usr
 --with-ca-bundle=/etc/ssl/certs/ca-certificates.crt"
 depends="ca-certificates"
-makedepends="pkg-config perl>=0 groff libidn-devel glibc-devel openssl-devel zlib-devel libldap-devel mit-krb5-devel"
+makedepends="pkg-config perl groff libidn-devel openssl-devel libldap-devel mit-krb5-devel"
+subpackages="libcurl libcurl-devel"
 short_desc="Client that groks URLs"
 maintainer="Juan RP <xtraeme@gmail.com>"
 license="MIT"
-checksum=ebdb111088ff8b0e05b1d1b075e9f1608285e8105cc51e21caacf33d01812c16
+checksum=fced262f16eb6bfcdcea15e04a7905ffcb5ff04b14a19ca35b9df86d6720d26a
 long_desc="
  Curl is a command line tool for transferring files with URL syntax, supporting
  FTP, FTPS, HTTP, HTTPS, GOPHER, TELNET, DICT, FILE and LDAP. Curl supports
@@ -19,7 +20,3 @@ long_desc="
  proxies, cookies, user+password authentication (Basic, Digest, NTLM, Negotiate,
  kerberos...), file transfer resume, proxy tunneling and a busload of other
  useful tricks."
-
-subpackages="libcurl libcurl-devel"
-
-