curl: update to 7.20.1, rename curl-{libs,devel} to libcurl{,-devel} respectively.

--HG--
rename : srcpkgs/curl/curl-devel.template => srcpkgs/curl/libcurl-devel.template
rename : srcpkgs/curl/curl-libs.template => srcpkgs/curl/libcurl.template

srcpkgs/curl/curl-devel.template

@@ -1,25 +0,0 @@
-# Template file for 'curl-devel'.
-#
-short_desc="curl development files"
-long_desc="${long_desc}
-
- This package contains files for development, headers, static libs, etc."
-
-revision=1
-
-Add_dependency run curl-libs
-
-do_install()
-{
-	mkdir -p ${DESTDIR}/usr/bin
-	mkdir -p ${DESTDIR}/usr/lib
-	mkdir -p ${DESTDIR}/usr/share/man/man1
-
-	mv ${SRCPKGDESTDIR}/usr/bin/curl-config ${DESTDIR}/usr/bin
-	mv ${SRCPKGDESTDIR}/usr/include ${DESTDIR}/usr
-	mv ${SRCPKGDESTDIR}/usr/lib/*.*a ${DESTDIR}/usr/lib
-	mv ${SRCPKGDESTDIR}/usr/lib/pkgconfig ${DESTDIR}/usr/lib
-	mv ${SRCPKGDESTDIR}/usr/share/man/man1/curl-config* \
-		${DESTDIR}/usr/share/man/man1
-	mv ${SRCPKGDESTDIR}/usr/share/man/man3 ${DESTDIR}/usr/share/man
-}

srcpkgs/curl/curl-libs.template

@@ -1,22 +0,0 @@
-# Template file for 'curl-libs'.
-#
-short_desc="${short_desc} (shared libraries)"
-long_desc="${long_desc}
-
- This package contains the shared libraries."
-
-revision=2
-
-Add_dependency run glibc
-Add_dependency run libidn
-Add_dependency run zlib
-Add_dependency run openssl
-Add_dependency run libldap
-Add_dependency run mit-krb5-libs
-Add_dependency run e2fsprogs-libs
-
-do_install()
-{
-	mkdir -p ${DESTDIR}/usr/lib
-	mv ${SRCPKGDESTDIR}/usr/lib/lib*.so* ${DESTDIR}/usr/lib
-}

srcpkgs/curl/libcurl-devel.template

@@ -0,0 +1,37 @@
+# Template file for 'curl-devel'.
+#
+short_desc="The multiprotocol file transfer library - development files"
+long_desc="
+ libcurl is a free and easy-to-use client-side URL transfer library,
+ supporting FTP, FTPS, HTTP, HTTPS, SCP, SFTP, TFTP, TELNET, DICT, LDAP,
+ LDAPS, FILE, IMAP, SMTP, POP3 and RTSP. libcurl supports SSL certificates,
+ HTTP POST, HTTP PUT, FTP uploading, HTTP form based upload, proxies, cookies,
+ user+password authentication (Basic, Digest, NTLM, Negotiate, Kerberos4),
+ file transfer resume, http proxy tunneling and more!
+
+ This package contains files for development, headers, static libs, etc."
+
+replaces="curl-devel<7.20.1"
+
+Add_dependency run pkg-config
+Add_dependency run libidn-devel
+Add_dependency run glibc-devel
+Add_dependency run openssl-devel
+Add_dependency run zlib-devel
+Add_dependency run libldap-devel
+Add_dependency run mit-krb5-devel
+Add_dependency run libcurl
+
+do_install()
+{
+	mkdir -p ${DESTDIR}/usr/{bin,lib}
+	mkdir -p ${DESTDIR}/usr/share/man/man1
+
+	mv ${SRCPKGDESTDIR}/usr/bin/curl-config ${DESTDIR}/usr/bin
+	mv ${SRCPKGDESTDIR}/usr/include ${DESTDIR}/usr
+	mv ${SRCPKGDESTDIR}/usr/lib/*.*a ${DESTDIR}/usr/lib
+	mv ${SRCPKGDESTDIR}/usr/lib/pkgconfig ${DESTDIR}/usr/lib
+	mv ${SRCPKGDESTDIR}/usr/share/man/man1/curl-config* \
+		${DESTDIR}/usr/share/man/man1
+	mv ${SRCPKGDESTDIR}/usr/share/man/man3 ${DESTDIR}/usr/share/man
+}

srcpkgs/curl/libcurl.template

@@ -0,0 +1,26 @@
+# Template file for 'libcurl'.
+#
+short_desc="The multiprotocol file transfer library"
+long_desc="
+ libcurl is a free and easy-to-use client-side URL transfer library,
+ supporting FTP, FTPS, HTTP, HTTPS, SCP, SFTP, TFTP, TELNET, DICT, LDAP,
+ LDAPS, FILE, IMAP, SMTP, POP3 and RTSP. libcurl supports SSL certificates,
+ HTTP POST, HTTP PUT, FTP uploading, HTTP form based upload, proxies, cookies,
+ user+password authentication (Basic, Digest, NTLM, Negotiate, Kerberos4),
+ file transfer resume, http proxy tunneling and more!"
+
+replaces="curl-libs<7.20.1"
+
+Add_dependency run glibc
+Add_dependency run libidn
+Add_dependency run zlib
+Add_dependency run openssl
+Add_dependency run libldap
+Add_dependency run mit-krb5-libs
+Add_dependency run e2fsprogs-libs
+
+do_install()
+{
+	mkdir -p ${DESTDIR}/usr/lib
+	mv ${SRCPKGDESTDIR}/usr/lib/lib*.so* ${DESTDIR}/usr/lib
+}

srcpkgs/curl/template

@@ -1,13 +1,12 @@
 # Template build file for 'curl'.
 pkgname=curl
-version=7.20.0
+version=7.20.1
-revision=1
 distfiles="http://curl.haxx.se/download/$pkgname-$version.tar.bz2"
 build_style=gnu_configure
 configure_args="--enable-ldaps --with-gssapi=/usr --with-ca-path=/etc/ssl/certs"
 short_desc="Client that groks URLs"
 maintainer="Juan RP <xtraeme@gmail.com>"
-checksum=eb516915da615d8f6b2b855004d5d4b19c468f080e3736d7a73c5599b9acab11
+checksum=70664da8e2a8c84327abd10ed30d5a3fc9fa2151def9ee5b75f27e3538554e56
 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
@@ -16,10 +15,11 @@ long_desc="
  kerberos...), file transfer resume, proxy tunneling and a busload of other
  useful tricks."
 
-subpackages="$pkgname-devel $pkgname-libs"
+subpackages="libcurl libcurl-devel"
+
 Add_dependency run glibc
 Add_dependency run zlib
-Add_dependency run curl-libs
+Add_dependency run libcurl
 
 Add_dependency build pkg-config
 Add_dependency build libidn-devel

srcpkgs/libcurl

@@ -0,0 +1 @@
+curl

srcpkgs/libcurl-devel

@@ -0,0 +1 @@
+curl

xbps-src/common/mapping_shlib_binpkg.txt

@@ -325,7 +325,7 @@ libmozjs.so			xulrunner		xulrunner-devel
 libdbusservice.so		xulrunner		xulrunner-devel
 libimgicon.so			xulrunner		xulrunner-devel
 libxpcom.so			xulrunner		xulrunner-devel
-libcurl.so			curl-libs		curl-devel
+libcurl.so			libcurl			libcurl-devel
 libcompizconfig.so		libcompizconfig		libcompizconfig-devel
 libpyglib-2.0-python.so		pygobject
 libdaemon.so			libdaemon		libdaemon-devel