update to pycurl-7.16.1

Version 7.16.1 [requires libcurl-7.16.1 or better]
--------------

        * Added constants for all libcurl (error) return codes.  They
          are named the same as the macro constants in curl.h but prefixed
          with E_ instead of CURLE.  Return codes for the multi API are
          prefixed with M_ instead of CURLM.

        * Added CURLOPT_FTP_SSL_CCC, CURLOPT_SSH_PUBLIC_KEYFILE,
          CURLOPT_SSH_PRIVATE_KEYFILE, CURLOPT_SSH_AUTH_TYPES.

        * Removed CLOSEPOLICY and friends since this option is now
          deprecated in libcurl.

        * Set the _use_datetime attribute on the CURLTransport class
          to unbreak xmlrpc_curl.py on Python 2.5.


Version 7.16.0 [no public release]
--------------

        * Added CURLOPT_SSL_SESSIONID_CACHE.

        * Removed SOURCE_* options since they are no longer
          supported by libcurl.


Version 7.15.5.1
----------------

        * Added test for basic ftp usage (tests/test_ftp.py).

        * Fix broken ssl mutex lock function when using
          GNU TLS (Debian bug #380156, fix by Bastian Kleineidam)


Version 7.15.5
--------------

        * Added CURLOPT_FTP_ALTERNATIVE_TO_USER,
          CURLOPT_MAX_SEND_SPEED_LARGE,
          and CURLOPT_MAX_RECV_SPEED_LARGE.


Version 7.15.4.2
----------------

        * Use SSL locking callbacks, fixes random
          crashes for multithreaded SSL connections
          (patch by Jayne <corvine at gmail.com>).


Version 7.15.4.1
----------------

        * Fixed compilation problem with C compilers
          not allowing declarations in the middle of
          code blocks (patch by
          K.S.Sreeram <sreeram at tachyontech.net>).

        * Fixed bug in curl_multi_fdset wrapping,
          max_fd < 0 is not an error (patch by
          K.S.Sreeram <sreeram at tachyontech.net>).


Version 7.15.4
--------------

        * Added support for libcurl shares, patch from
        Victor Lascurain <bittor at eleka.net>.  See the
        file tests/test_share.py for example usage.

        * Added support for CURLINFO_FTP_ENTRY_PATH.


Version 7.15.2
--------------

        * Added CURLOPT_CONNECT_ONLY, CURLINFO_LASTSOCKET,
          CURLOPT_LOCALPORT and CURLOPT_LOCALPORTRANGE.


Version 7.15.1
--------------

2006-01-31 Kjetil Jacobsen <kjetilja>

        * Fixed memory leak for getinfo calls that return a
          list as result.  Patch by Paul Pacheco.


Version 7.15.0
--------------

2005-10-18  Kjetil Jacobsen  <kjetilja>

        * Added CURLOPT_FTP_SKIP_PASV_IP.


Version 7.14.1
--------------

2005-09-05  Kjetil Jacobsen  <kjetilja>

        * Added CURLOPT_IGNORE_CONTENT_LENGTH, CURLOPT_COOKIELIST as
          COOKIELIST and CURLINFO_COOKIELIST as INFO_COOKIELIST.


Version 7.14.0
--------------

2005-05-18  Kjetil Jacobsen  <kjetilja>

        * Added missing information returned from the info() method
          in the high-level interface.

        * Added the FORM_FILENAME option to the CURLFORM API
          with HTTPPOST.


Version 7.13.2
--------------

2005-03-30  Kjetil Jacobsen  <kjetilja>

        * Unbreak tests/test_gtk.py and require pygtk >= 2.0.

2005-03-15  Kjetil Jacobsen  <kjetilja>

        * Cleaned up several of the examples.

2005-03-11  Kjetil Jacobsen  <kjetilja>

        * WARNING: multi.select() now requires the previously optional
          timeout parameter.  Updated the tests and examples to reflect
          this change.  If the timeout is not set, select could block
          infinitely and cause problems for the internal timeout handling
          in the multi stack.  The problem was identified by
          <unknownsoldier93 at yahoo.com>.


Version 7.13.1
--------------

2005-03-04  Kjetil Jacobsen  <kjetilja>

        * Use METH_NOARGS where appropriate.

2005-03-03  Kjetil Jacobsen  <kjetilja>

        * Added support for CURLFORM API with HTTPPOST: Supports a
          a tuple with pairs of options and values instead of just
          supporting string contents.  See tests/test_post2.py
          for example usage.  Options are FORM_CONTENTS, FORM_FILE and
          FORM_CONTENTTYPE, corresponding to the CURLFORM_* options,
          and values are strings.

2005-02-13  Markus F.X.J. Oberhumer <mfx>

        * Read callbacks (pycurl.READFUNCTION) can now return
          pycurl.READFUNC_ABORT to immediately abort the current transfer.

        * The INFILESIZE, MAXFILESIZE, POSTFIELDSIZE and RESUME_FROM
          options now automatically use the largefile version to handle
          files > 2GB.

        * Added missing pycurl.PORT constant.


Version 7.13.0
--------------

2005-02-10  Kjetil Jacobsen  <kjetilja>

        * Added file_upload.py to examples, shows how to upload
          a file.

        * Added CURLOPT_IOCTLFUNCTION/DATA.

        * Added options from libcurl 7.13.0: FTP_ACCOUNT, SOURCE_URL,
          SOURCE_QUOTE.

        * Obsoleted options: SOURCE_HOST, SOURCE_PATH, SOURCE_PORT,
          PASV_HOST.


Version 7.12.3
--------------

2004-12-22  Markus F.X.J. Oberhumer <mfx>

        * Added CURLINFO_NUM_CONNECTS and CURLINFO_SSL_ENGINES.

        * Added some other missing constants.

        * Updated pycurl.version_info() to return a 12-tuple
          instead of a 9-tuple.


Version 7.12.2
--------------

2004-10-15  Kjetil Jacobsen  <kjetilja>

        * Added CURLOPT_FTPSSLAUTH (and CURLFTPAUTH_*).

        * Added CURLINFO_OS_ERRNO.

2004-08-17 Kjetil Jacobsen <kjetilja>

        * Use LONG_LONG instead of PY_LONG_LONG to make pycurl compile
          on Python versions < 2.3 (fix from Domenico Andreoli
          <cavok at libero.it>).

4 files changed, 19 insertions, 15 deletions

diff --git a/www/py-curl/Makefile b/www/py-curl/Makefile
index c0cbf4a5573..a513cf8573d 100644
--- a/www/py-curl/Makefile
+++ b/www/py-curl/Makefile
@@ -1,8 +1,7 @@
-# $NetBSD: Makefile,v 1.30 2007/01/31 00:04:13 wiz Exp $
+# $NetBSD: Makefile,v 1.31 2007/03/22 22:24:08 recht Exp $
 
-DISTNAME=	pycurl-7.13.2
+DISTNAME=	pycurl-7.16.1
 PKGNAME=	${PYPKGPREFIX}-${DISTNAME:S/py//}
-PKGREVISION=	2
 CATEGORIES=	www python
 MASTER_SITES=	http://pycurl.sourceforge.net/download/
 
@@ -14,10 +13,10 @@ BROKEN_IN=		pkgsrc-2006Q4
 
 PYDISTUTILSPKG=	# defined
 PYBINMODULE=	# defined
-PYTHON_VERSIONS_ACCEPTED=	23 22
+PYTHON_VERSIONS_ACCEPTED=	24 23 22
 PLIST_SUBST+=	PYVERSSUFFIX=${PYVERSSUFFIX:Q}
 
-BUILDLINK_API_DEPENDS.curl+=        curl>=7.12.1
+BUILDLINK_API_DEPENDS.curl+=        curl>=7.16.1
 
 .include "../../www/curl/buildlink3.mk"
 .include "../../lang/python/extension.mk"
diff --git a/www/py-curl/PLIST b/www/py-curl/PLIST
index ed281a4fcfa..09f488d9181 100644
--- a/www/py-curl/PLIST
+++ b/www/py-curl/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.6 2005/05/17 13:30:09 adam Exp $
+@comment $NetBSD: PLIST,v 1.7 2007/03/22 22:24:08 recht Exp $
 ${PYSITELIB}/curl/__init__.py
 ${PYSITELIB}/curl/__init__.pyc
 ${PYSITELIB}/curl/__init__.pyo
@@ -18,10 +18,12 @@ share/doc/pycurl${PYVERSSUFFIX}/examples/xmlrpc_curl.py
 share/doc/pycurl${PYVERSSUFFIX}/html/callbacks.html
 share/doc/pycurl${PYVERSSUFFIX}/html/curlmultiobject.html
 share/doc/pycurl${PYVERSSUFFIX}/html/curlobject.html
+share/doc/pycurl${PYVERSSUFFIX}/html/curlshareobject.html
 share/doc/pycurl${PYVERSSUFFIX}/html/pycurl.html
 share/doc/pycurl${PYVERSSUFFIX}/tests/test.py
 share/doc/pycurl${PYVERSSUFFIX}/tests/test_cb.py
 share/doc/pycurl${PYVERSSUFFIX}/tests/test_debug.py
+share/doc/pycurl${PYVERSSUFFIX}/tests/test_ftp.py
 share/doc/pycurl${PYVERSSUFFIX}/tests/test_getinfo.py
 share/doc/pycurl${PYVERSSUFFIX}/tests/test_gtk.py
 share/doc/pycurl${PYVERSSUFFIX}/tests/test_internals.py
@@ -32,10 +34,13 @@ share/doc/pycurl${PYVERSSUFFIX}/tests/test_multi3.py
 share/doc/pycurl${PYVERSSUFFIX}/tests/test_multi4.py
 share/doc/pycurl${PYVERSSUFFIX}/tests/test_multi5.py
 share/doc/pycurl${PYVERSSUFFIX}/tests/test_multi6.py
+share/doc/pycurl${PYVERSSUFFIX}/tests/test_multi_socket.py
+share/doc/pycurl${PYVERSSUFFIX}/tests/test_multi_timer.py
 share/doc/pycurl${PYVERSSUFFIX}/tests/test_multi_vs_thread.py
 share/doc/pycurl${PYVERSSUFFIX}/tests/test_post.py
 share/doc/pycurl${PYVERSSUFFIX}/tests/test_post2.py
 share/doc/pycurl${PYVERSSUFFIX}/tests/test_post3.py
+share/doc/pycurl${PYVERSSUFFIX}/tests/test_share.py
 share/doc/pycurl${PYVERSSUFFIX}/tests/test_stringio.py
 share/doc/pycurl${PYVERSSUFFIX}/tests/test_xmlrpc.py
 share/doc/pycurl${PYVERSSUFFIX}/tests/util.py
diff --git a/www/py-curl/distinfo b/www/py-curl/distinfo
index 669a4bf2c1a..9766a0461c8 100644
--- a/www/py-curl/distinfo
+++ b/www/py-curl/distinfo
@@ -1,6 +1,6 @@
-$NetBSD: distinfo,v 1.12 2005/05/17 13:30:09 adam Exp $
+$NetBSD: distinfo,v 1.13 2007/03/22 22:24:08 recht Exp $
 
-SHA1 (pycurl-7.13.2.tar.gz) = 72e004b304260a80d8eaaabeb807628bd27cf407
-RMD160 (pycurl-7.13.2.tar.gz) = 30459fe653aab4ff8b1629c2e2fb15f1cd83f1ea
-Size (pycurl-7.13.2.tar.gz) = 61891 bytes
-SHA1 (patch-aa) = d376cb4d435441316f434d3d5f00a40a5f45837d
+SHA1 (pycurl-7.16.1.tar.gz) = 17437459c38938993e3dd676b5583a803e3196aa
+RMD160 (pycurl-7.16.1.tar.gz) = 3a63c6b0321887207971585597fe2a74bcee9749
+Size (pycurl-7.16.1.tar.gz) = 68194 bytes
+SHA1 (patch-aa) = e1764035363c0c35f36e7a1c85c837de771ccf28
diff --git a/www/py-curl/patches/patch-aa b/www/py-curl/patches/patch-aa
index b53731e06bf..a00e313036d 100644
--- a/www/py-curl/patches/patch-aa
+++ b/www/py-curl/patches/patch-aa
@@ -1,8 +1,8 @@
-$NetBSD: patch-aa,v 1.5 2005/05/17 13:30:09 adam Exp $
+$NetBSD: patch-aa,v 1.6 2007/03/22 22:24:08 recht Exp $
 
---- setup.py.orig	2005-04-06 12:48:22.000000000 +0000
-+++ setup.py
-@@ -136,9 +136,9 @@ def get_data_files():
+--- setup.py.orig	2007-03-04 20:26:59.000000000 +0100
++++ setup.py	2007-03-22 23:13:42.000000000 +0100
+@@ -146,9 +146,9 @@
      # a list of tuples with (path to install to, a list of local files)
      data_files = []
      if sys.platform == "win32":