Update py-curl to 7.19.0.

(change to register distutils egg-info)

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

        * Added CURLFILE, ADDRESS_SCOPE and ISSUERCERT options,
          as well as the APPCONNECT_TIME info.

        * Added PRIMARY_IP info (patch by
          Yuhui H <eyecat at gmail.com>).

        * Added support for curl_easy_reset through a
          new 'reset' method on curl objects
          (patch by Nick Pilon <npilon at oreilly.com>).

        * Added support for OPENSOCKET callbacks.
          See 'tests/test_opensocket.py' for example
          usage (patch by Thomas Hunger <teh at camvine.com>).


Version 7.18.2
--------------

        * Added REDIRECT_URL info and M_MAXCONNECTS option
          (patch by Yuhui H <eyecat at gmail.com>).

        * Added socket_action() method to CurlMulti objects.
          See 'tests/test_multi_socket_select.py' for example
          usage (patch by Yuhui H <eyecat at gmail.com>).

        * Added AUTOREFERER option.

        * Allow resetting some list operations (HTTPHEADER,
          QUOTE, POSTQUOTE, PREQUOTE) by passing an empty
          list to setopt (patch by Jim Patterson).


Version 7.18.1
--------------

        * Added POST301, SSH_HOST_PUBLIC_KEY_MD5,
          COPYPOSTFIELDS and PROXY_TRANSFER_MODE options.

        * Check for static libs in setup.py to better detect
          whether libcurl was linked with OpenSSL or GNUTLS.

        * PycURL is now dual licensed under the LGPL and
          a license similar to the cURL license (an MIT/X
          derivative).

4 files changed, 20 insertions, 17 deletions

diff --git a/www/py-curl/Makefile b/www/py-curl/Makefile
index fe753e1e3a5..9ba780155d3 100644
--- a/www/py-curl/Makefile
+++ b/www/py-curl/Makefile
@@ -1,22 +1,21 @@
-# $NetBSD: Makefile,v 1.40 2011/04/22 13:45:00 obache Exp $
+# $NetBSD: Makefile,v 1.41 2012/01/25 13:19:57 obache Exp $
 
-DISTNAME=	pycurl-7.16.4
+DISTNAME=	pycurl-7.19.0
 PKGNAME=	${PYPKGPREFIX}-${DISTNAME:S/py//}
-PKGREVISION=	3
 CATEGORIES=	www python
 MASTER_SITES=	http://pycurl.sourceforge.net/download/
 
 MAINTAINER=	pkgsrc-users@NetBSD.org
 HOMEPAGE=	http://pycurl.sourceforge.net/
 COMMENT=	Python module interface to the cURL library
+LICENSE=	gnu-lgpl-v2.1 OR mit
 
 PKG_DESTDIR_SUPPORT=	user-destdir
 
-PYDISTUTILSPKG=	# defined
 PLIST_SUBST+=	PYVERSSUFFIX=${PYVERSSUFFIX:Q}
 
-BUILDLINK_API_DEPENDS.curl+=        curl>=7.16.1
+BUILDLINK_API_DEPENDS.curl+=        curl>=7.19.0
 
 .include "../../www/curl/buildlink3.mk"
-.include "../../lang/python/extension.mk"
+.include "../../lang/python/distutils.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/www/py-curl/PLIST b/www/py-curl/PLIST
index 03210d15220..e085cf86974 100644
--- a/www/py-curl/PLIST
+++ b/www/py-curl/PLIST
@@ -1,9 +1,11 @@
-@comment $NetBSD: PLIST,v 1.8 2009/06/14 22:00:31 joerg Exp $
+@comment $NetBSD: PLIST,v 1.9 2012/01/25 13:19:57 obache Exp $
 ${PYSITELIB}/curl/__init__.py
 ${PYSITELIB}/curl/__init__.pyc
 ${PYSITELIB}/curl/__init__.pyo
+${PLIST.eggfile}${PYSITELIB}/${EGG_FILE}
 ${PYSITELIB}/pycurl.so
 share/doc/pycurl${PYVERSSUFFIX}/COPYING
+share/doc/pycurl${PYVERSSUFFIX}/COPYING2
 share/doc/pycurl${PYVERSSUFFIX}/ChangeLog
 share/doc/pycurl${PYVERSSUFFIX}/INSTALL
 share/doc/pycurl${PYVERSSUFFIX}/README
@@ -35,12 +37,14 @@ 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_socket_select.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_socketopen.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 ce5a8ce8e60..7bf941123e0 100644
--- a/www/py-curl/distinfo
+++ b/www/py-curl/distinfo
@@ -1,6 +1,6 @@
-$NetBSD: distinfo,v 1.15 2007/07/20 12:24:00 drochner Exp $
+$NetBSD: distinfo,v 1.16 2012/01/25 13:19:57 obache Exp $
 
-SHA1 (pycurl-7.16.4.tar.gz) = a06ae60030cf27953f75c4a0cd4316a12765b22f
-RMD160 (pycurl-7.16.4.tar.gz) = bc4e7f3471a0ff20e46dd0b2566e4942dccf839d
-Size (pycurl-7.16.4.tar.gz) = 68849 bytes
-SHA1 (patch-aa) = e1764035363c0c35f36e7a1c85c837de771ccf28
+SHA1 (pycurl-7.19.0.tar.gz) = 3fb59eca1461331bb9e9e8d6fe3b23eda961a416
+RMD160 (pycurl-7.19.0.tar.gz) = dab547b3db67ed30cafb556a1a383f567064de49
+Size (pycurl-7.19.0.tar.gz) = 71346 bytes
+SHA1 (patch-aa) = 2635d59e4d8aee29abb6797ffb4b46260f94be72
diff --git a/www/py-curl/patches/patch-aa b/www/py-curl/patches/patch-aa
index a00e313036d..4b9852ae6d4 100644
--- a/www/py-curl/patches/patch-aa
+++ b/www/py-curl/patches/patch-aa
@@ -1,8 +1,8 @@
-$NetBSD: patch-aa,v 1.6 2007/03/22 22:24:08 recht Exp $
+$NetBSD: patch-aa,v 1.7 2012/01/25 13:19:57 obache Exp $
 
---- 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 @@
+--- setup.py.orig	2008-09-09 17:40:34.000000000 +0000
++++ setup.py
+@@ -149,9 +149,9 @@ def get_data_files():
      # a list of tuples with (path to install to, a list of local files)
      data_files = []
      if sys.platform == "win32":
@@ -12,5 +12,5 @@ $NetBSD: patch-aa,v 1.6 2007/03/22 22:24:08 recht Exp $
 -        datadir = os.path.join("share", "doc", PACKAGE)
 +        datadir = os.path.join("share", "doc", PACKAGE  + sys.version[0:3])
      #
-     files = ["ChangeLog", "COPYING", "INSTALL", "README", "TODO",]
+     files = ["ChangeLog", "COPYING", "COPYING2", "INSTALL", "README", "TODO",]
      if files: